Makefile.def: Remove libjava.

2016-09-30  Andrew Haley  <aph@redhat.com>

	* Makefile.def: Remove libjava.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerate.
	* configure.ac: Likewise.
	* configure: Likewise.
	* gcc/java: Remove.
	* libjava: Likewise.

From-SVN: r240662

2977 files changed, 0 insertions, 237962 deletions

diff --git a/libjava/gnu/CORBA/Asynchron.h b/libjava/gnu/CORBA/Asynchron.h
deleted file mode 100644
index c1b542a..0000000
--- a/libjava/gnu/CORBA/Asynchron.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Asynchron__
-#define __gnu_CORBA_Asynchron__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Asynchron;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Request;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Asynchron : public ::java::lang::Object
-{
-
-public:
-  Asynchron();
-  virtual void send_multiple_requests_oneway(JArray< ::org::omg::CORBA::Request * > *);
-  virtual void send_multiple_requests_deferred(JArray< ::org::omg::CORBA::Request * > *);
-  virtual jboolean poll_next_response();
-  virtual ::org::omg::CORBA::Request * get_next_response();
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Asynchron__
diff --git a/libjava/gnu/CORBA/BigDecimalHelper.h b/libjava/gnu/CORBA/BigDecimalHelper.h
deleted file mode 100644
index 968a863..0000000
--- a/libjava/gnu/CORBA/BigDecimalHelper.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_BigDecimalHelper__
-#define __gnu_CORBA_BigDecimalHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class BigDecimalHelper;
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-}
-
-class gnu::CORBA::BigDecimalHelper : public ::java::lang::Object
-{
-
-public:
-  BigDecimalHelper();
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::math::BigDecimal * read(::java::io::InputStream *, jint);
-  static void write(::java::io::OutputStream *, ::java::math::BigDecimal *);
-private:
-  static ::java::math::BigDecimal * createFixed(jint, JArray< jbyte > *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_BigDecimalHelper__
diff --git a/libjava/gnu/CORBA/ByteArrayComparator.h b/libjava/gnu/CORBA/ByteArrayComparator.h
deleted file mode 100644
index f619ba8..0000000
--- a/libjava/gnu/CORBA/ByteArrayComparator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ByteArrayComparator__
-#define __gnu_CORBA_ByteArrayComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class ByteArrayComparator;
-    }
-  }
-}
-
-class gnu::CORBA::ByteArrayComparator : public ::java::lang::Object
-{
-
-public:
-  ByteArrayComparator();
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ByteArrayComparator__
diff --git a/libjava/gnu/CORBA/CDR/AbstractCdrInput.h b/libjava/gnu/CORBA/CDR/AbstractCdrInput.h
deleted file mode 100644
index a9c9adc..0000000
--- a/libjava/gnu/CORBA/CDR/AbstractCdrInput.h
+++ /dev/null
@@ -1,185 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AbstractCdrInput__
-#define __gnu_CORBA_CDR_AbstractCdrInput__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractDataInput;
-          class BufferredCdrInput;
-          class gnuRuntime;
-      }
-      namespace GIOP
-      {
-          class CodeSetServiceContext;
-      }
-        class Version;
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnySeqHolder;
-          class BooleanSeqHolder;
-          class CharSeqHolder;
-          class DoubleSeqHolder;
-          class FloatSeqHolder;
-          class LongLongSeqHolder;
-          class LongSeqHolder;
-          class ORB;
-          class Object;
-          class OctetSeqHolder;
-          class ShortSeqHolder;
-          class TypeCode;
-          class ULongLongSeqHolder;
-          class ULongSeqHolder;
-          class UShortSeqHolder;
-          class WCharSeqHolder;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AbstractCdrInput : public ::org::omg::CORBA_2_3::portable::InputStream
-{
-
-public:
-  AbstractCdrInput(::java::io::InputStream *);
-  AbstractCdrInput();
-  virtual void setBigEndian(jboolean);
-  virtual jboolean isBigEndian();
-  virtual void cloneSettings(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual void setInputStream(::java::io::InputStream *);
-  virtual void setOffset(jint) = 0;
-  virtual void setOrb(::org::omg::CORBA::ORB *);
-  virtual void setVersion(::gnu::CORBA::Version *);
-  virtual void align(jint) = 0;
-  virtual jlong gnu_read_ulong();
-  virtual jint gnu_read_ushort();
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual ::org::omg::CORBA::Object * read_Object();
-  virtual ::org::omg::CORBA::TypeCode * read_TypeCode();
-  virtual ::org::omg::CORBA::Any * read_any();
-  virtual jboolean read_boolean();
-  virtual void read_boolean_array(JArray< jboolean > *, jint, jint);
-  virtual jchar read_char();
-  virtual void read_char_array(JArray< jchar > *, jint, jint);
-  virtual jdouble read_double();
-  virtual void read_double_array(JArray< jdouble > *, jint, jint);
-  virtual ::gnu::CORBA::CDR::BufferredCdrInput * read_encapsulation();
-  virtual ::java::math::BigDecimal * read_fixed();
-  virtual jfloat read_float();
-  virtual void read_float_array(JArray< jfloat > *, jint, jint);
-  virtual jint read_long();
-  virtual void read_long_array(JArray< jint > *, jint, jint);
-  virtual jlong read_longlong();
-  virtual void read_longlong_array(JArray< jlong > *, jint, jint);
-  virtual jbyte read_octet();
-  virtual void read_octet_array(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * read_sequence();
-  virtual jshort read_short();
-  virtual void read_short_array(JArray< jshort > *, jint, jint);
-  virtual ::java::lang::String * read_string();
-  virtual jint read_ulong();
-  virtual void read_ulong_array(JArray< jint > *, jint, jint);
-  virtual jlong read_ulonglong();
-  virtual void read_ulonglong_array(JArray< jlong > *, jint, jint);
-  virtual jshort read_ushort();
-  virtual void read_ushort_array(JArray< jshort > *, jint, jint);
-  virtual jchar read_wchar();
-  virtual void read_wchar_array(JArray< jchar > *, jint, jint);
-  virtual ::java::lang::String * read_wstring();
-  virtual ::java::lang::String * read_wstring_UTF_16();
-  static jchar swap(jchar);
-  virtual void setCodeSet(::gnu::CORBA::GIOP::CodeSetServiceContext *);
-  virtual ::gnu::CORBA::GIOP::CodeSetServiceContext * getCodeSet();
-  virtual ::org::omg::CORBA::Object * read_Object(::java::lang::Class *);
-  virtual ::java::io::Serializable * read_Value();
-  virtual ::java::lang::Object * read_Abstract();
-  virtual void read_char_array(::org::omg::CORBA::CharSeqHolder *, jint, jint);
-  virtual void read_wchar_array(::org::omg::CORBA::WCharSeqHolder *, jint, jint);
-private:
-  JArray< jchar > * ensureArray(JArray< jchar > *, jint, jint);
-public:
-  virtual void read_ulong_array(::org::omg::CORBA::ULongSeqHolder *, jint, jint);
-  virtual void read_long_array(::org::omg::CORBA::LongSeqHolder *, jint, jint);
-private:
-  JArray< jint > * ensureArray(JArray< jint > *, jint, jint);
-public:
-  virtual void read_float_array(::org::omg::CORBA::FloatSeqHolder *, jint, jint);
-private:
-  JArray< jfloat > * ensureArray(JArray< jfloat > *, jint, jint);
-public:
-  virtual void read_double_array(::org::omg::CORBA::DoubleSeqHolder *, jint, jint);
-private:
-  JArray< jdouble > * ensureArray(JArray< jdouble > *, jint, jint);
-public:
-  virtual void read_short_array(::org::omg::CORBA::ShortSeqHolder *, jint, jint);
-  virtual void read_ushort_array(::org::omg::CORBA::UShortSeqHolder *, jint, jint);
-private:
-  JArray< jshort > * ensureArray(JArray< jshort > *, jint, jint);
-public:
-  virtual void read_octet_array(::org::omg::CORBA::OctetSeqHolder *, jint, jint);
-private:
-  JArray< jbyte > * ensureArray(JArray< jbyte > *, jint, jint);
-public:
-  virtual void read_longlong_array(::org::omg::CORBA::LongLongSeqHolder *, jint, jint);
-  virtual void read_ulonglong_array(::org::omg::CORBA::ULongLongSeqHolder *, jint, jint);
-private:
-  JArray< jlong > * ensureArray(JArray< jlong > *, jint, jint);
-public:
-  virtual void read_boolean_array(::org::omg::CORBA::BooleanSeqHolder *, jint, jint);
-private:
-  JArray< jboolean > * ensureArray(JArray< jboolean > *, jint, jint);
-public:
-  virtual void read_any_array(::org::omg::CORBA::AnySeqHolder *, jint, jint);
-private:
-  JArray< ::org::omg::CORBA::Any * > * ensureArray(JArray< ::org::omg::CORBA::Any * > *, jint, jint);
-public:
-  virtual JArray< ::java::lang::String * > * _truncatable_ids();
-  ::gnu::CORBA::CDR::gnuRuntime * __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::InputStream)))) runtime;
-public: // actually protected
-  static ::java::lang::String * UNEXP_EOF;
-  ::gnu::CORBA::CDR::AbstractDataInput * b;
-  ::java::io::InputStream * actual_stream;
-  ::org::omg::CORBA::ORB * orb__;
-  ::gnu::CORBA::Version * giop;
-  ::gnu::CORBA::GIOP::CodeSetServiceContext * codeset;
-private:
-  ::java::lang::String * narrow_charset;
-  ::java::lang::String * wide_charset;
-  jboolean narrow_native;
-  jboolean wide_native;
-  jboolean little_endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_AbstractCdrInput__
diff --git a/libjava/gnu/CORBA/CDR/AbstractCdrOutput.h b/libjava/gnu/CORBA/CDR/AbstractCdrOutput.h
deleted file mode 100644
index b6d328b..0000000
--- a/libjava/gnu/CORBA/CDR/AbstractCdrOutput.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AbstractCdrOutput__
-#define __gnu_CORBA_CDR_AbstractCdrOutput__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrOutput;
-          class AbstractDataOutput;
-          class BufferedCdrOutput;
-          class gnuRuntime;
-      }
-      namespace GIOP
-      {
-          class CodeSetServiceContext;
-      }
-        class Version;
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class ORB;
-          class Object;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AbstractCdrOutput : public ::org::omg::CORBA_2_3::portable::OutputStream
-{
-
-public:
-  AbstractCdrOutput(::java::io::OutputStream *);
-  AbstractCdrOutput();
-  virtual void setOffset(jint) = 0;
-  virtual void cloneSettings(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  virtual void setCodeSet(::gnu::CORBA::GIOP::CodeSetServiceContext *);
-  virtual ::gnu::CORBA::GIOP::CodeSetServiceContext * getCodeSet();
-  virtual void setOrb(::org::omg::CORBA::ORB *);
-  virtual void setOutputStream(::java::io::OutputStream *);
-  virtual void setVersion(::gnu::CORBA::Version *);
-  virtual void setBigEndian(jboolean);
-  virtual void align(jint) = 0;
-  virtual ::gnu::CORBA::CDR::AbstractCdrOutput * createEncapsulation();
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write_Context(::org::omg::CORBA::Context *, ::org::omg::CORBA::ContextList *);
-  virtual void write_Object(::org::omg::CORBA::Object *);
-  virtual void write_TypeCode(::org::omg::CORBA::TypeCode *);
-  virtual void write_any(::org::omg::CORBA::Any *);
-  virtual void write_boolean(jboolean);
-  virtual void write_boolean_array(JArray< jboolean > *, jint, jint);
-  virtual void write_char(jchar);
-  virtual void write_char_array(JArray< jchar > *, jint, jint);
-  virtual void write_double(jdouble);
-  virtual void write_double_array(JArray< jdouble > *, jint, jint);
-  virtual void write_fixed(::java::math::BigDecimal *);
-  virtual void write_float(jfloat);
-  virtual void write_float_array(JArray< jfloat > *, jint, jint);
-  virtual void write_long(jint);
-  virtual void write_long_array(JArray< jint > *, jint, jint);
-  virtual void write_longlong(jlong);
-  virtual void write_longlong_array(JArray< jlong > *, jint, jint);
-  virtual void write_octet(jbyte);
-  virtual void write_octet_array(JArray< jbyte > *, jint, jint);
-  virtual void write_sequence(JArray< jbyte > *);
-  virtual void write_sequence(::gnu::CORBA::CDR::BufferedCdrOutput *);
-  virtual void write_short(jshort);
-  virtual void write_short_array(JArray< jshort > *, jint, jint);
-  virtual void write_string(::java::lang::String *);
-  virtual void write_ulong(jint);
-  virtual void write_ulong_array(JArray< jint > *, jint, jint);
-  virtual void write_ulonglong(jlong);
-  virtual void write_ulonglong_array(JArray< jlong > *, jint, jint);
-  virtual void write_ushort(jshort);
-  virtual void write_ushort_array(JArray< jshort > *, jint, jint);
-  virtual void write_wchar(jchar);
-  virtual void write_wchar_array(JArray< jchar > *, jint, jint);
-  virtual void write_wstring(::java::lang::String *);
-  virtual void write_any_array(JArray< ::org::omg::CORBA::Any * > *, jint, jint);
-  virtual JArray< ::java::lang::String * > * _truncatable_ids();
-  virtual void write_Abstract(::java::lang::Object *);
-  virtual void write_Value(::java::io::Serializable *);
-  ::gnu::CORBA::CDR::gnuRuntime * __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::OutputStream)))) runtime;
-public: // actually protected
-  ::gnu::CORBA::CDR::AbstractDataOutput * b;
-  ::org::omg::CORBA::ORB * orb__;
-  ::gnu::CORBA::Version * giop;
-  ::gnu::CORBA::GIOP::CodeSetServiceContext * codeset;
-private:
-  ::java::lang::String * narrow_charset;
-  ::java::lang::String * wide_charset;
-  jboolean narrow_native;
-  jboolean wide_native;
-  jboolean little_endian;
-  ::java::io::OutputStream * actual_stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_AbstractCdrOutput__
diff --git a/libjava/gnu/CORBA/CDR/AbstractDataInput.h b/libjava/gnu/CORBA/CDR/AbstractDataInput.h
deleted file mode 100644
index c4c147f..0000000
--- a/libjava/gnu/CORBA/CDR/AbstractDataInput.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AbstractDataInput__
-#define __gnu_CORBA_CDR_AbstractDataInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractDataInput;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AbstractDataInput : public ::java::lang::Object
-{
-
-public:
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jchar readChar() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jint read() = 0;
-  virtual jint skipBytes(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_CDR_AbstractDataInput__
diff --git a/libjava/gnu/CORBA/CDR/AbstractDataOutput.h b/libjava/gnu/CORBA/CDR/AbstractDataOutput.h
deleted file mode 100644
index 08ba714..0000000
--- a/libjava/gnu/CORBA/CDR/AbstractDataOutput.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AbstractDataOutput__
-#define __gnu_CORBA_CDR_AbstractDataOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractDataOutput;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AbstractDataOutput : public ::java::lang::Object
-{
-
-public:
-  virtual void flush() = 0;
-  virtual void write(jint) = 0;
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write(JArray< jbyte > *) = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jint) = 0;
-  virtual void writeShort(jint) = 0;
-  virtual void writeChar(jint) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_CDR_AbstractDataOutput__
diff --git a/libjava/gnu/CORBA/CDR/AligningInput.h b/libjava/gnu/CORBA/CDR/AligningInput.h
deleted file mode 100644
index 54e8420..0000000
--- a/libjava/gnu/CORBA/CDR/AligningInput.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AligningInput__
-#define __gnu_CORBA_CDR_AligningInput__
-
-#pragma interface
-
-#include <java/io/ByteArrayInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AligningInput;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AligningInput : public ::java::io::ByteArrayInputStream
-{
-
-public:
-  AligningInput(JArray< jbyte > *);
-  virtual void setOffset(jint);
-  virtual void align(jint);
-  virtual JArray< jbyte > * getBuffer();
-  virtual jint getPosition();
-  virtual void seek(jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::io::ByteArrayInputStream)))) offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_AligningInput__
diff --git a/libjava/gnu/CORBA/CDR/AligningOutput.h b/libjava/gnu/CORBA/CDR/AligningOutput.h
deleted file mode 100644
index 2b88978..0000000
--- a/libjava/gnu/CORBA/CDR/AligningOutput.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_AligningOutput__
-#define __gnu_CORBA_CDR_AligningOutput__
-
-#pragma interface
-
-#include <java/io/ByteArrayOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AligningOutput;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::AligningOutput : public ::java::io::ByteArrayOutputStream
-{
-
-public:
-  AligningOutput();
-  AligningOutput(jint);
-  virtual void setOffset(jint);
-  virtual void align(jint);
-  virtual void skip(jint);
-  virtual jint getPosition();
-  virtual void seek(jint);
-  virtual JArray< jbyte > * getBuffer();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::io::ByteArrayOutputStream)))) offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_AligningOutput__
diff --git a/libjava/gnu/CORBA/CDR/ArrayValueHelper.h b/libjava/gnu/CORBA/CDR/ArrayValueHelper.h
deleted file mode 100644
index 2da6121..0000000
--- a/libjava/gnu/CORBA/CDR/ArrayValueHelper.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_ArrayValueHelper__
-#define __gnu_CORBA_CDR_ArrayValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class ArrayValueHelper;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::ArrayValueHelper : public ::java::lang::Object
-{
-
-public: // actually package-private
-  virtual jboolean written_as_object();
-  ArrayValueHelper(::java::lang::Class *);
-public:
-  virtual ::java::lang::String * get_id();
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::InputStream *);
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::ValueHandler * handler;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arrayClass;
-  ::java::lang::Class * component;
-  ::java::lang::String * componentId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_ArrayValueHelper__
diff --git a/libjava/gnu/CORBA/CDR/BigEndianInputStream.h b/libjava/gnu/CORBA/CDR/BigEndianInputStream.h
deleted file mode 100644
index 9feb32e..0000000
--- a/libjava/gnu/CORBA/CDR/BigEndianInputStream.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_BigEndianInputStream__
-#define __gnu_CORBA_CDR_BigEndianInputStream__
-
-#pragma interface
-
-#include <java/io/DataInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BigEndianInputStream;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::BigEndianInputStream : public ::java::io::DataInputStream
-{
-
-public:
-  BigEndianInputStream(::java::io::InputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_BigEndianInputStream__
diff --git a/libjava/gnu/CORBA/CDR/BigEndianOutputStream.h b/libjava/gnu/CORBA/CDR/BigEndianOutputStream.h
deleted file mode 100644
index 12e14d8..0000000
--- a/libjava/gnu/CORBA/CDR/BigEndianOutputStream.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_BigEndianOutputStream__
-#define __gnu_CORBA_CDR_BigEndianOutputStream__
-
-#pragma interface
-
-#include <java/io/DataOutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BigEndianOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::BigEndianOutputStream : public ::java::io::DataOutputStream
-{
-
-public:
-  BigEndianOutputStream(::java::io::OutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_BigEndianOutputStream__
diff --git a/libjava/gnu/CORBA/CDR/BufferedCdrOutput.h b/libjava/gnu/CORBA/CDR/BufferedCdrOutput.h
deleted file mode 100644
index 373a9e2..0000000
--- a/libjava/gnu/CORBA/CDR/BufferedCdrOutput.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_BufferedCdrOutput__
-#define __gnu_CORBA_CDR_BufferedCdrOutput__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/AbstractCdrOutput.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AligningOutput;
-          class BufferedCdrOutput;
-          class gnuRuntime;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::BufferedCdrOutput : public ::gnu::CORBA::CDR::AbstractCdrOutput
-{
-
-public:
-  BufferedCdrOutput(jint);
-  BufferedCdrOutput();
-  virtual void setOffset(jint);
-  virtual void align(jint);
-  virtual ::org::omg::CORBA::portable::InputStream * create_input_stream();
-  virtual void reset();
-  virtual jint getPosition();
-  virtual ::gnu::CORBA::CDR::gnuRuntime * getRunTime();
-  virtual void setRunTime(::gnu::CORBA::CDR::gnuRuntime *);
-  virtual void seek(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::gnu::CORBA::CDR::AligningOutput * __attribute__((aligned(__alignof__( ::gnu::CORBA::CDR::AbstractCdrOutput)))) buffer;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_BufferedCdrOutput__
diff --git a/libjava/gnu/CORBA/CDR/BufferredCdrInput.h b/libjava/gnu/CORBA/CDR/BufferredCdrInput.h
deleted file mode 100644
index 71a8e20..0000000
--- a/libjava/gnu/CORBA/CDR/BufferredCdrInput.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_BufferredCdrInput__
-#define __gnu_CORBA_CDR_BufferredCdrInput__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/AbstractCdrInput.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AligningInput;
-          class BufferredCdrInput;
-          class gnuRuntime;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::BufferredCdrInput : public ::gnu::CORBA::CDR::AbstractCdrInput
-{
-
-public:
-  BufferredCdrInput(JArray< jbyte > *);
-  virtual void setOffset(jint);
-  virtual void align(jint);
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual void reset();
-  virtual jint getPosition();
-  virtual void seek(jint);
-  virtual ::gnu::CORBA::CDR::gnuRuntime * getRunTime();
-  virtual void setRunTime(::gnu::CORBA::CDR::gnuRuntime *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::gnu::CORBA::CDR::AligningInput * __attribute__((aligned(__alignof__( ::gnu::CORBA::CDR::AbstractCdrInput)))) buffer;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_BufferredCdrInput__
diff --git a/libjava/gnu/CORBA/CDR/EncapsulationStream.h b/libjava/gnu/CORBA/CDR/EncapsulationStream.h
deleted file mode 100644
index 9b3a2d5..0000000
--- a/libjava/gnu/CORBA/CDR/EncapsulationStream.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_EncapsulationStream__
-#define __gnu_CORBA_CDR_EncapsulationStream__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/AbstractCdrOutput.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AligningOutput;
-          class EncapsulationStream;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::EncapsulationStream : public ::gnu::CORBA::CDR::AbstractCdrOutput
-{
-
-public:
-  EncapsulationStream(::org::omg::CORBA::portable::OutputStream *, jboolean);
-  virtual void setOffset(jint);
-  virtual void align(jint);
-  virtual void close();
-  virtual ::org::omg::CORBA::portable::InputStream * create_input_stream();
-  virtual void reset();
-  static const jbyte BIG_ENDIAN = 0;
-  static const jbyte LITTLE_ENDIAN = 1;
-  ::gnu::CORBA::CDR::AligningOutput * __attribute__((aligned(__alignof__( ::gnu::CORBA::CDR::AbstractCdrOutput)))) buffer;
-  ::org::omg::CORBA::portable::OutputStream * parent;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_EncapsulationStream__
diff --git a/libjava/gnu/CORBA/CDR/HeadlessInput.h b/libjava/gnu/CORBA/CDR/HeadlessInput.h
deleted file mode 100644
index 2cc8e85..0000000
--- a/libjava/gnu/CORBA/CDR/HeadlessInput.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_HeadlessInput__
-#define __gnu_CORBA_CDR_HeadlessInput__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferredCdrInput;
-          class HeadlessInput;
-          class gnuRuntime;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnySeqHolder;
-          class BooleanSeqHolder;
-          class CharSeqHolder;
-          class Context;
-          class DoubleSeqHolder;
-          class FloatSeqHolder;
-          class LongLongSeqHolder;
-          class LongSeqHolder;
-          class ORB;
-          class Object;
-          class OctetSeqHolder;
-          class Principal;
-          class ShortSeqHolder;
-          class TypeCode;
-          class ULongLongSeqHolder;
-          class ULongSeqHolder;
-          class UShortSeqHolder;
-          class WCharSeqHolder;
-        namespace portable
-        {
-            class BoxedValueHelper;
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::HeadlessInput : public ::org::omg::CORBA_2_3::portable::InputStream
-{
-
-public:
-  HeadlessInput(::gnu::CORBA::CDR::BufferredCdrInput *, ::org::omg::CORBA::portable::InputStream *);
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::BoxedValueHelper *);
-  virtual ::java::io::Serializable * read_value(::java::lang::String *);
-  virtual ::java::io::Serializable * read_value(::java::io::Serializable *);
-  virtual ::java::io::Serializable * read_value(::java::lang::Class *);
-  virtual jint available();
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual ::java::lang::Object * read_abstract_interface();
-  virtual ::java::lang::Object * read_abstract_interface(::java::lang::Class *);
-  virtual ::org::omg::CORBA::Any * read_any();
-  virtual void read_boolean_array(JArray< jboolean > *, jint, jint);
-  virtual jboolean read_boolean();
-  virtual void read_char_array(JArray< jchar > *, jint, jint);
-  virtual jchar read_char();
-  virtual ::org::omg::CORBA::Context * read_Context();
-  virtual void read_double_array(JArray< jdouble > *, jint, jint);
-  virtual jdouble read_double();
-  virtual ::java::math::BigDecimal * read_fixed();
-  virtual void read_float_array(JArray< jfloat > *, jint, jint);
-  virtual jfloat read_float();
-  virtual void read_long_array(JArray< jint > *, jint, jint);
-  virtual jint read_long();
-  virtual void read_longlong_array(JArray< jlong > *, jint, jint);
-  virtual jlong read_longlong();
-  virtual ::org::omg::CORBA::Object * read_Object();
-  virtual ::org::omg::CORBA::Object * read_Object(::java::lang::Class *);
-  virtual void read_octet_array(JArray< jbyte > *, jint, jint);
-  virtual jbyte read_octet();
-  virtual ::org::omg::CORBA::Principal * read_Principal();
-  virtual void read_short_array(JArray< jshort > *, jint, jint);
-  virtual jshort read_short();
-  virtual ::java::lang::String * read_string();
-  virtual ::org::omg::CORBA::TypeCode * read_TypeCode();
-  virtual void read_ulong_array(JArray< jint > *, jint, jint);
-  virtual jint read_ulong();
-  virtual void read_ulonglong_array(JArray< jlong > *, jint, jint);
-  virtual jlong read_ulonglong();
-  virtual void read_ushort_array(JArray< jshort > *, jint, jint);
-  virtual jshort read_ushort();
-  virtual ::java::io::Serializable * read_value();
-  virtual void read_wchar_array(JArray< jchar > *, jint, jint);
-  virtual jchar read_wchar();
-  virtual ::java::lang::String * read_wstring();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual void reset();
-  virtual jlong skip(jlong);
-  virtual ::java::lang::String * toString();
-  virtual JArray< ::java::lang::String * > * _truncatable_ids();
-  virtual ::java::lang::Object * read_Abstract();
-  virtual void read_any_array(::org::omg::CORBA::AnySeqHolder *, jint, jint);
-  virtual void read_boolean_array(::org::omg::CORBA::BooleanSeqHolder *, jint, jint);
-  virtual void read_char_array(::org::omg::CORBA::CharSeqHolder *, jint, jint);
-  virtual void read_double_array(::org::omg::CORBA::DoubleSeqHolder *, jint, jint);
-  virtual void read_float_array(::org::omg::CORBA::FloatSeqHolder *, jint, jint);
-  virtual void read_long_array(::org::omg::CORBA::LongSeqHolder *, jint, jint);
-  virtual void read_longlong_array(::org::omg::CORBA::LongLongSeqHolder *, jint, jint);
-  virtual void read_octet_array(::org::omg::CORBA::OctetSeqHolder *, jint, jint);
-  virtual void read_short_array(::org::omg::CORBA::ShortSeqHolder *, jint, jint);
-  virtual void read_ulong_array(::org::omg::CORBA::ULongSeqHolder *, jint, jint);
-  virtual void read_ulonglong_array(::org::omg::CORBA::ULongLongSeqHolder *, jint, jint);
-  virtual void read_ushort_array(::org::omg::CORBA::UShortSeqHolder *, jint, jint);
-  virtual ::java::io::Serializable * read_Value();
-  virtual void read_wchar_array(::org::omg::CORBA::WCharSeqHolder *, jint, jint);
-  virtual jint getPosition();
-  virtual ::gnu::CORBA::CDR::gnuRuntime * getRunTime();
-  virtual void setRunTime(::gnu::CORBA::CDR::gnuRuntime *);
-  virtual void seek(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  static const jint NONE = -1;
-public:
-  jboolean __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::InputStream)))) subsequentCalls;
-public: // actually package-private
-  ::gnu::CORBA::CDR::BufferredCdrInput * stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_HeadlessInput__
diff --git a/libjava/gnu/CORBA/CDR/IDLTypeHelper.h b/libjava/gnu/CORBA/CDR/IDLTypeHelper.h
deleted file mode 100644
index 9c97fc8..0000000
--- a/libjava/gnu/CORBA/CDR/IDLTypeHelper.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_IDLTypeHelper__
-#define __gnu_CORBA_CDR_IDLTypeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class IDLTypeHelper;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::IDLTypeHelper : public ::java::lang::Object
-{
-
-public:
-  IDLTypeHelper(::java::lang::Class *);
-  virtual ::java::lang::String * get_id();
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::InputStream *);
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-public: // actually package-private
-  virtual ::java::lang::String * msg();
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) helper;
-public: // actually package-private
-  static JArray< ::java::lang::Object * > * ARGS_ID_V;
-  static JArray< ::java::lang::Class * > * ARGS_ID;
-  static JArray< ::java::lang::Class * > * ARGS_READ;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_IDLTypeHelper__
diff --git a/libjava/gnu/CORBA/CDR/LittleEndianInputStream.h b/libjava/gnu/CORBA/CDR/LittleEndianInputStream.h
deleted file mode 100644
index d6a9a6e..0000000
--- a/libjava/gnu/CORBA/CDR/LittleEndianInputStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_LittleEndianInputStream__
-#define __gnu_CORBA_CDR_LittleEndianInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class LittleEndianInputStream;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::LittleEndianInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  LittleEndianInputStream(::java::io::InputStream *);
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual jchar readChar();
-  virtual jdouble readDouble();
-  virtual jfloat readFloat();
-  virtual void readFully(JArray< jbyte > *);
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual jint readInt();
-  virtual ::java::lang::String * readLine();
-  virtual jlong readLong();
-  virtual jshort readShort();
-  virtual jint readUnsignedByte();
-  virtual jint readUnsignedShort();
-  virtual jint skipBytes(jint);
-public: // actually protected
-  virtual jboolean convertToBoolean(jint);
-  virtual jbyte convertToByte(jint);
-  virtual jint convertToUnsignedByte(jint);
-  virtual jchar convertToChar(JArray< jbyte > *);
-  virtual jshort convertToShort(JArray< jbyte > *);
-  virtual jint convertToUnsignedShort(JArray< jbyte > *);
-  virtual jint convertToInt(JArray< jbyte > *);
-  virtual jlong convertToLong(JArray< jbyte > *);
-public:
-  virtual ::java::lang::String * readUTF();
-public: // actually package-private
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_LittleEndianInputStream__
diff --git a/libjava/gnu/CORBA/CDR/LittleEndianOutputStream.h b/libjava/gnu/CORBA/CDR/LittleEndianOutputStream.h
deleted file mode 100644
index 3fb7db5..0000000
--- a/libjava/gnu/CORBA/CDR/LittleEndianOutputStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_LittleEndianOutputStream__
-#define __gnu_CORBA_CDR_LittleEndianOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class LittleEndianOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::LittleEndianOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  LittleEndianOutputStream(::java::io::OutputStream *);
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void writeBoolean(jboolean);
-  virtual void writeByte(jint);
-  virtual void writeShort(jint);
-  virtual void writeChar(jint);
-  virtual void writeInt(jint);
-  virtual void writeLong(jlong);
-  virtual void writeFloat(jfloat);
-  virtual void writeDouble(jdouble);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_LittleEndianOutputStream__
diff --git a/libjava/gnu/CORBA/CDR/UnknownExceptionCtxHandler.h b/libjava/gnu/CORBA/CDR/UnknownExceptionCtxHandler.h
deleted file mode 100644
index 9f77414..0000000
--- a/libjava/gnu/CORBA/CDR/UnknownExceptionCtxHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_UnknownExceptionCtxHandler__
-#define __gnu_CORBA_CDR_UnknownExceptionCtxHandler__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/Vio.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-          class BufferredCdrInput;
-          class UnknownExceptionCtxHandler;
-      }
-      namespace GIOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::UnknownExceptionCtxHandler : public ::gnu::CORBA::CDR::Vio
-{
-
-public:
-  UnknownExceptionCtxHandler();
-  static JArray< ::gnu::CORBA::GIOP::ServiceContext * > * addExceptionContext(JArray< ::gnu::CORBA::GIOP::ServiceContext * > *, ::java::lang::Throwable *, ::java::lang::Object *);
-  static void write(::gnu::CORBA::CDR::BufferedCdrOutput *, ::java::lang::Throwable *);
-  static ::java::lang::Throwable * read(::gnu::CORBA::CDR::BufferredCdrInput *, JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-public: // actually package-private
-  static ::java::lang::Object * createInstance(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::String *);
-  static ::java::lang::Object * _createInstance(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_UnknownExceptionCtxHandler__
diff --git a/libjava/gnu/CORBA/CDR/VMVio.h b/libjava/gnu/CORBA/CDR/VMVio.h
deleted file mode 100644
index e8267e8..0000000
--- a/libjava/gnu/CORBA/CDR/VMVio.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_VMVio__
-#define __gnu_CORBA_CDR_VMVio__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class VMVio;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::VMVio : public ::java::lang::Object
-{
-
-public:
-  VMVio();
-  static ::java::lang::Object * allocateObject(::java::lang::Class *, ::java::lang::Class *, ::java::lang::reflect::Constructor *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_VMVio__
diff --git a/libjava/gnu/CORBA/CDR/Vio.h b/libjava/gnu/CORBA/CDR/Vio.h
deleted file mode 100644
index 367a63d..0000000
--- a/libjava/gnu/CORBA/CDR/Vio.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_Vio__
-#define __gnu_CORBA_CDR_Vio__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-          class Vio;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class WStringValueHelper;
-        namespace portable
-        {
-            class BoxedValueHelper;
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::Vio : public ::java::lang::Object
-{
-
-public:
-  Vio();
-  static ::java::io::Serializable * read(::org::omg::CORBA::portable::InputStream *);
-  static ::java::io::Serializable * read(::org::omg::CORBA::portable::InputStream *, ::java::lang::String *);
-  static ::java::io::Serializable * read(::org::omg::CORBA::portable::InputStream *, ::java::lang::Class *);
-  static ::java::lang::Object * read(::org::omg::CORBA::portable::InputStream *, ::java::lang::Object *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-  static ::java::io::Serializable * read(::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-public: // actually package-private
-  static ::java::lang::Object * read_instance(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Object *, jint, ::org::omg::CORBA::portable::BoxedValueHelper *, ::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::String *);
-private:
-  static ::gnu::CORBA::CDR::BufferedCdrOutput * createBuffer(::org::omg::CORBA::portable::InputStream *, jint);
-public:
-  static jint readNestedValue(jint, ::org::omg::CORBA::portable::InputStream *, ::gnu::CORBA::CDR::BufferedCdrOutput *, jint);
-  static ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Object *, ::org::omg::CORBA::portable::BoxedValueHelper *, ::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::String * list(JArray< ::java::lang::String * > *);
-public:
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, ::java::lang::Class *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, JArray< ::java::lang::String * > *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, ::java::lang::String *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-private:
-  static void writeString(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-public: // actually package-private
-  static void write_instance(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, ::java::lang::Object *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-  static void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-  static jboolean writeSelf(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  static ::java::io::Serializable * readIndirection(::org::omg::CORBA::portable::InputStream *);
-  static void checkTag(jint);
-  static void throwIt(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Object * createInstance(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::String *);
-  static ::java::lang::Object * _createInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * read_string(::org::omg::CORBA::portable::InputStream *);
-  static JArray< ::java::lang::String * > * read_string_array(::org::omg::CORBA::portable::InputStream *);
-  static void write_string(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static void write_string_array(::org::omg::CORBA::portable::OutputStream *, JArray< ::java::lang::String * > *);
-public:
-  static ::org::omg::CORBA::portable::BoxedValueHelper * getHelper(::java::lang::Class *, ::java::lang::Object *);
-  static ::org::omg::CORBA::portable::BoxedValueHelper * getHelper(::java::lang::Class *, ::java::lang::String *);
-public: // actually package-private
-  static ::org::omg::CORBA::portable::BoxedValueHelper * locateHelper(::java::lang::String *);
-  static jint getCurrentPosition(::org::omg::CORBA::portable::InputStream *);
-public:
-  static ::java::lang::Object * instantiateAnyWay(::java::lang::Class *);
-  static jboolean USE_CHUNKING;
-  static const jint vt_VALUE_TAG = 2147483392;
-  static const jint vf_CODEBASE = 1;
-  static const jint vf_ID = 2;
-  static const jint vf_MULTIPLE_IDS = 4;
-  static const jint vf_CHUNKING = 8;
-  static const jint vt_INDIRECTION = -1;
-  static const jint vt_NULL = 0;
-public: // actually package-private
-  static const jint INT_SIZE = 4;
-public:
-  static ::org::omg::CORBA::WStringValueHelper * m_StringValueHelper;
-public: // actually package-private
-  static ::javax::rmi::CORBA::ValueHandler * handler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_Vio__
diff --git a/libjava/gnu/CORBA/CDR/gnuRuntime$1.h b/libjava/gnu/CORBA/CDR/gnuRuntime$1.h
deleted file mode 100644
index 1cdd6c2..0000000
--- a/libjava/gnu/CORBA/CDR/gnuRuntime$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_gnuRuntime$1__
-#define __gnu_CORBA_CDR_gnuRuntime$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime;
-          class gnuRuntime$1;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::gnuRuntime$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  gnuRuntime$1(::gnu::CORBA::CDR::gnuRuntime *);
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::gnu::CORBA::CDR::gnuRuntime * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_gnuRuntime$1__
diff --git a/libjava/gnu/CORBA/CDR/gnuRuntime$Entry.h b/libjava/gnu/CORBA/CDR/gnuRuntime$Entry.h
deleted file mode 100644
index f6e1575..0000000
--- a/libjava/gnu/CORBA/CDR/gnuRuntime$Entry.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_gnuRuntime$Entry__
-#define __gnu_CORBA_CDR_gnuRuntime$Entry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime$Entry;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::gnuRuntime$Entry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  gnuRuntime$Entry();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) at;
-  ::java::lang::Object * object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_gnuRuntime$Entry__
diff --git a/libjava/gnu/CORBA/CDR/gnuRuntime$Redirection.h b/libjava/gnu/CORBA/CDR/gnuRuntime$Redirection.h
deleted file mode 100644
index b9b5863..0000000
--- a/libjava/gnu/CORBA/CDR/gnuRuntime$Redirection.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_gnuRuntime$Redirection__
-#define __gnu_CORBA_CDR_gnuRuntime$Redirection__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/gnuRuntime$Entry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime$Redirection;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::gnuRuntime$Redirection : public ::gnu::CORBA::CDR::gnuRuntime$Entry
-{
-
-public: // actually package-private
-  gnuRuntime$Redirection();
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_gnuRuntime$Redirection__
diff --git a/libjava/gnu/CORBA/CDR/gnuRuntime.h b/libjava/gnu/CORBA/CDR/gnuRuntime.h
deleted file mode 100644
index a120cba..0000000
--- a/libjava/gnu/CORBA/CDR/gnuRuntime.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_gnuRuntime__
-#define __gnu_CORBA_CDR_gnuRuntime__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::gnuRuntime : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuRuntime(::java::lang::String *, ::java::lang::Object *);
-  virtual void objectWritten(::java::lang::Object *, jint);
-  virtual jint isWrittenAt(::java::lang::Object *);
-  virtual void redirect(jint, jint);
-  virtual ::java::lang::Object * isObjectWrittenAt(jint, jint);
-  virtual void singleIdWritten(::java::lang::String *, jint);
-  virtual void multipleIdsWritten(JArray< ::java::lang::String * > *, jint);
-  virtual jint idWrittenAt(::java::lang::Object *);
-  virtual ::java::lang::String * getCodeBase();
-  virtual void addCodeBase(::java::lang::String *);
-  virtual ::java::lang::String * dump();
-private:
-  static const jlong serialVersionUID = 1LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) sh_objects;
-  ::java::util::Map * sh_ids;
-  ::java::util::Map * positions;
-  ::java::lang::String * codebase;
-public:
-  ::java::io::Serializable * target;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CDR_gnuRuntime__
diff --git a/libjava/gnu/CORBA/CDR/gnuValueStream.h b/libjava/gnu/CORBA/CDR/gnuValueStream.h
deleted file mode 100644
index 880cc61..0000000
--- a/libjava/gnu/CORBA/CDR/gnuValueStream.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CDR_gnuValueStream__
-#define __gnu_CORBA_CDR_gnuValueStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime;
-          class gnuValueStream;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CDR::gnuValueStream : public ::java::lang::Object
-{
-
-public:
-  virtual jint getPosition() = 0;
-  virtual void seek(jint) = 0;
-  virtual ::gnu::CORBA::CDR::gnuRuntime * getRunTime() = 0;
-  virtual void setRunTime(::gnu::CORBA::CDR::gnuRuntime *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_CDR_gnuValueStream__
diff --git a/libjava/gnu/CORBA/CdrEncapsCodecImpl.h b/libjava/gnu/CORBA/CdrEncapsCodecImpl.h
deleted file mode 100644
index 8bdc15b..0000000
--- a/libjava/gnu/CORBA/CdrEncapsCodecImpl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CdrEncapsCodecImpl__
-#define __gnu_CORBA_CdrEncapsCodecImpl__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-          class BufferredCdrInput;
-      }
-        class CdrEncapsCodecImpl;
-        class Version;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CdrEncapsCodecImpl : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  CdrEncapsCodecImpl(::org::omg::CORBA::ORB *, ::gnu::CORBA::Version *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::CORBA::Any * decode(JArray< jbyte > *);
-private:
-  ::gnu::CORBA::CDR::BufferredCdrInput * createEncapsulation(JArray< jbyte > *, ::gnu::CORBA::CDR::BufferredCdrInput *);
-public:
-  virtual JArray< jbyte > * encode(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::Any * decode_value(JArray< jbyte > *, ::org::omg::CORBA::TypeCode *);
-private:
-  ::org::omg::CORBA::Any * readAny(::org::omg::CORBA::TypeCode *, ::gnu::CORBA::CDR::BufferredCdrInput *);
-public:
-  virtual JArray< jbyte > * encode_value(::org::omg::CORBA::Any *);
-private:
-  ::gnu::CORBA::CDR::BufferedCdrOutput * createOutput(::org::omg::CORBA::Any *);
-  void checkTypePossibility(::java::lang::String *, ::org::omg::CORBA::TypeCode *);
-  ::gnu::CORBA::CDR::BufferredCdrInput * createInput(JArray< jbyte > *);
-public:
-  virtual jboolean hasLengthIndicator();
-  virtual void setUseLengthIndicator(jboolean);
-private:
-  static const jlong serialVersionUID = 1LL;
-  jboolean __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) noWide;
-  ::gnu::CORBA::Version * version;
-public: // actually protected
-  ::org::omg::CORBA::ORB * orb;
-private:
-  jboolean lengthIndicator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CdrEncapsCodecImpl__
diff --git a/libjava/gnu/CORBA/CollocatedOrbs.h b/libjava/gnu/CORBA/CollocatedOrbs.h
deleted file mode 100644
index 60a4755..0000000
--- a/libjava/gnu/CORBA/CollocatedOrbs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CollocatedOrbs__
-#define __gnu_CORBA_CollocatedOrbs__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CollocatedOrbs;
-        class IOR;
-        class OrbFunctional;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::CollocatedOrbs : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CollocatedOrbs();
-  static void registerOrb(::gnu::CORBA::OrbFunctional *);
-  static void unregisterOrb(::gnu::CORBA::OrbFunctional *);
-  static ::org::omg::CORBA::Object * searchLocalObject(::gnu::CORBA::IOR *);
-  static jboolean DIRECT_CALLS_ALLOWED;
-private:
-  static ::java::util::ArrayList * orbs;
-public: // actually package-private
-  static ::java::lang::String * localHost;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CollocatedOrbs__
diff --git a/libjava/gnu/CORBA/Connected_objects$cObject.h b/libjava/gnu/CORBA/Connected_objects$cObject.h
deleted file mode 100644
index bc4be45..0000000
--- a/libjava/gnu/CORBA/Connected_objects$cObject.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Connected_objects$cObject__
-#define __gnu_CORBA_Connected_objects$cObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Connected_objects;
-        class Connected_objects$cObject;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Connected_objects$cObject : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Connected_objects$cObject(::gnu::CORBA::Connected_objects *, ::org::omg::CORBA::Object *, jint, JArray< jbyte > *, ::java::lang::Object *);
-public:
-  ::org::omg::CORBA::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) object;
-  jint port;
-  JArray< jbyte > * key;
-  ::java::lang::Object * identity;
-public: // actually package-private
-  ::gnu::CORBA::Connected_objects * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Connected_objects$cObject__
diff --git a/libjava/gnu/CORBA/Connected_objects.h b/libjava/gnu/CORBA/Connected_objects.h
deleted file mode 100644
index f22aa0c..0000000
--- a/libjava/gnu/CORBA/Connected_objects.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Connected_objects__
-#define __gnu_CORBA_Connected_objects__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Connected_objects;
-        class Connected_objects$cObject;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Connected_objects : public ::java::lang::Object
-{
-
-public:
-  Connected_objects();
-  virtual ::gnu::CORBA::Connected_objects$cObject * getKey(::org::omg::CORBA::Object *);
-  virtual ::gnu::CORBA::Connected_objects$cObject * add(::org::omg::CORBA::Object *, jint);
-  virtual ::gnu::CORBA::Connected_objects$cObject * add(JArray< jbyte > *, ::org::omg::CORBA::Object *, jint, ::java::lang::Object *);
-  virtual ::gnu::CORBA::Connected_objects$cObject * get(JArray< jbyte > *);
-  virtual ::java::util::Set * entrySet();
-  virtual void remove(::org::omg::CORBA::Object *);
-  virtual void remove(JArray< jbyte > *);
-public: // actually protected
-  virtual JArray< jbyte > * generateObjectKey(::org::omg::CORBA::Object *);
-private:
-  static jlong getFreeInstanceNumber();
-public:
-  virtual jint size();
-private:
-  static jlong free_object_number;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) objects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Connected_objects__
diff --git a/libjava/gnu/CORBA/CorbaList.h b/libjava/gnu/CORBA/CorbaList.h
deleted file mode 100644
index 26e4cad..0000000
--- a/libjava/gnu/CORBA/CorbaList.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_CorbaList__
-#define __gnu_CORBA_CorbaList__
-
-#pragma interface
-
-#include <java/util/ArrayList.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CorbaList;
-    }
-  }
-}
-
-class gnu::CORBA::CorbaList : public ::java::util::ArrayList
-{
-
-public:
-  CorbaList(jint);
-  CorbaList();
-  virtual void drop(jint);
-  virtual ::java::lang::Object * item(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_CorbaList__
diff --git a/libjava/gnu/CORBA/DefaultSocketFactory.h b/libjava/gnu/CORBA/DefaultSocketFactory.h
deleted file mode 100644
index 3fe423d0..0000000
--- a/libjava/gnu/CORBA/DefaultSocketFactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DefaultSocketFactory__
-#define __gnu_CORBA_DefaultSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class DefaultSocketFactory;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-        class Socket;
-    }
-  }
-}
-
-class gnu::CORBA::DefaultSocketFactory : public ::java::lang::Object
-{
-
-public:
-  DefaultSocketFactory();
-  virtual ::java::net::Socket * createClientSocket(::java::lang::String *, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  static ::gnu::CORBA::DefaultSocketFactory * Singleton;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DefaultSocketFactory__
diff --git a/libjava/gnu/CORBA/DefinitionKindHolder.h b/libjava/gnu/CORBA/DefinitionKindHolder.h
deleted file mode 100644
index 3853f50..0000000
--- a/libjava/gnu/CORBA/DefinitionKindHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DefinitionKindHolder__
-#define __gnu_CORBA_DefinitionKindHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class DefinitionKindHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DefinitionKind;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DefinitionKindHolder : public ::java::lang::Object
-{
-
-public:
-  DefinitionKindHolder(::org::omg::CORBA::DefinitionKind *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::DefinitionKind * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DefinitionKindHolder__
diff --git a/libjava/gnu/CORBA/DuplicateNameHolder.h b/libjava/gnu/CORBA/DuplicateNameHolder.h
deleted file mode 100644
index 04e25dc..0000000
--- a/libjava/gnu/CORBA/DuplicateNameHolder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DuplicateNameHolder__
-#define __gnu_CORBA_DuplicateNameHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class DuplicateNameHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class DuplicateName;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DuplicateNameHolder : public ::java::lang::Object
-{
-
-public:
-  DuplicateNameHolder();
-  DuplicateNameHolder(::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DuplicateNameHolder__
diff --git a/libjava/gnu/CORBA/DynAn/AbstractAny.h b/libjava/gnu/CORBA/DynAn/AbstractAny.h
deleted file mode 100644
index 1234631..0000000
--- a/libjava/gnu/CORBA/DynAn/AbstractAny.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_AbstractAny__
-#define __gnu_CORBA_DynAn_AbstractAny__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class AbstractAny;
-          class ValueChangeListener;
-          class gnuDynAnyFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::AbstractAny : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  AbstractAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual ::org::omg::CORBA::Any * createAny();
-public: // actually protected
-  virtual void valueChanged();
-public: // actually package-private
-  virtual void checkType(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::java::lang::String * typeMismatch(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::java::lang::String * sizeMismatch(jint, jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) official_type;
-  ::org::omg::CORBA::TypeCode * final_type;
-  ::gnu::CORBA::DynAn::gnuDynAnyFactory * factory;
-  ::org::omg::CORBA::ORB * orb;
-public: // actually package-private
-  jshort MINOR;
-  static ::java::lang::String * EMPTY;
-  static ::java::lang::String * SIZE;
-  static ::java::lang::String * ISNULL;
-  ::gnu::CORBA::DynAn::ValueChangeListener * listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_AbstractAny__
diff --git a/libjava/gnu/CORBA/DynAn/DivideableAny.h b/libjava/gnu/CORBA/DynAn/DivideableAny.h
deleted file mode 100644
index 1222d2a..0000000
--- a/libjava/gnu/CORBA/DynAn/DivideableAny.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_DivideableAny__
-#define __gnu_CORBA_DynAn_DivideableAny__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/AbstractAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class DivideableAny;
-          class gnuDynAnyFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::DivideableAny : public ::gnu::CORBA::DynAn::AbstractAny
-{
-
-public:
-  DivideableAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual jboolean next();
-  virtual void rewind();
-  virtual jboolean seek(jint);
-public: // actually protected
-  virtual ::org::omg::DynamicAny::DynAny * focused();
-public:
-  virtual jint component_count();
-  virtual ::org::omg::CORBA::Any * get_any();
-  virtual jboolean get_boolean();
-  virtual jchar get_char();
-  virtual jdouble get_double();
-  virtual jfloat get_float();
-  virtual jint get_long();
-  virtual jlong get_longlong();
-  virtual jbyte get_octet();
-  virtual ::org::omg::CORBA::Object * get_reference();
-  virtual jshort get_short();
-  virtual ::java::lang::String * get_string();
-  virtual ::org::omg::CORBA::TypeCode * get_typecode();
-  virtual jint get_ulong();
-  virtual jlong get_ulonglong();
-  virtual jshort get_ushort();
-  virtual ::java::io::Serializable * get_val();
-  virtual jchar get_wchar();
-  virtual ::java::lang::String * get_wstring();
-  virtual void insert_any(::org::omg::CORBA::Any *);
-  virtual void insert_boolean(jboolean);
-  virtual void insert_char(jchar);
-  virtual void insert_double(jdouble);
-  virtual void insert_float(jfloat);
-  virtual void insert_long(jint);
-  virtual void insert_longlong(jlong);
-  virtual void insert_octet(jbyte);
-  virtual void insert_reference(::org::omg::CORBA::Object *);
-  virtual void insert_short(jshort);
-  virtual void insert_string(::java::lang::String *);
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
-  virtual void insert_ulong(jint);
-  virtual void insert_ulonglong(jlong);
-  virtual void insert_ushort(jshort);
-  virtual void insert_val(::java::io::Serializable *);
-  virtual void insert_wchar(jchar);
-  virtual void insert_wstring(::java::lang::String *);
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * current_component();
-  virtual void destroy();
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  JArray< ::org::omg::DynamicAny::DynAny * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::AbstractAny)))) array;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_DivideableAny__
diff --git a/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h b/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h
deleted file mode 100644
index 26a6e5b..0000000
--- a/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_NameValuePairHolder__
-#define __gnu_CORBA_DynAn_NameValuePairHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class NameValuePairHolder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class NameValuePair;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::NameValuePairHolder : public ::java::lang::Object
-{
-
-public:
-  NameValuePairHolder();
-  NameValuePairHolder(::org::omg::CORBA::NameValuePair *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::NameValuePair * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_NameValuePairHolder__
diff --git a/libjava/gnu/CORBA/DynAn/RecordAny.h b/libjava/gnu/CORBA/DynAn/RecordAny.h
deleted file mode 100644
index 77f3f5c..0000000
--- a/libjava/gnu/CORBA/DynAn/RecordAny.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_RecordAny__
-#define __gnu_CORBA_DynAn_RecordAny__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/DivideableAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class RecordAny;
-          class gnuDynAnyFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::RecordAny : public ::gnu::CORBA::DynAn::DivideableAny
-{
-
-public:
-  RecordAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CORBA::TCKind * current_member_kind();
-  virtual ::java::lang::String * current_member_name();
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * gnu_get_members_as_dyn_any();
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * gnu_get_members();
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-private:
-  void checkName(::java::lang::String *, jint);
-  void checkType(::org::omg::CORBA::TypeCode *, jint);
-public:
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-public: // actually protected
-  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *) = 0;
-public:
-  virtual ::org::omg::CORBA::Any * to_any();
-  virtual void from_any(::org::omg::CORBA::Any *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) fNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_RecordAny__
diff --git a/libjava/gnu/CORBA/DynAn/UndivideableAny.h b/libjava/gnu/CORBA/DynAn/UndivideableAny.h
deleted file mode 100644
index dd827d6..0000000
--- a/libjava/gnu/CORBA/DynAn/UndivideableAny.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_UndivideableAny__
-#define __gnu_CORBA_DynAn_UndivideableAny__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/AbstractAny.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class UndivideableAny;
-          class gnuDynAnyFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::UndivideableAny : public ::gnu::CORBA::DynAn::AbstractAny
-{
-
-public:
-  UndivideableAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual jint component_count();
-  virtual ::org::omg::DynamicAny::DynAny * current_component();
-  virtual void destroy();
-  virtual ::org::omg::CORBA::Any * get_any();
-  virtual jboolean get_boolean();
-  virtual jchar get_char();
-  virtual jdouble get_double();
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
-  virtual jfloat get_float();
-  virtual jint get_long();
-  virtual jlong get_longlong();
-  virtual jbyte get_octet();
-  virtual ::org::omg::CORBA::Object * get_reference();
-  virtual jshort get_short();
-  virtual ::java::lang::String * get_string();
-  virtual ::org::omg::CORBA::TypeCode * get_typecode();
-  virtual jint get_ulong();
-  virtual jlong get_ulonglong();
-  virtual jshort get_ushort();
-  virtual ::java::io::Serializable * get_val();
-  virtual jchar get_wchar();
-  virtual ::java::lang::String * get_wstring();
-  virtual void insert_any(::org::omg::CORBA::Any *);
-  virtual void insert_boolean(jboolean);
-  virtual void insert_char(jchar);
-  virtual void insert_double(jdouble);
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
-  virtual void insert_float(jfloat);
-  virtual void insert_long(jint);
-  virtual void insert_longlong(jlong);
-  virtual void insert_octet(jbyte);
-  virtual void insert_reference(::org::omg::CORBA::Object *);
-  virtual void insert_short(jshort);
-  virtual void insert_string(::java::lang::String *);
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
-  virtual void insert_ulong(jint);
-  virtual void insert_ulonglong(jlong);
-  virtual void insert_ushort(jshort);
-  virtual void insert_val(::java::io::Serializable *);
-  virtual void insert_wchar(jchar);
-  virtual void insert_wstring(::java::lang::String *);
-  virtual jboolean next();
-  virtual void rewind();
-  virtual jboolean seek(jint);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_UndivideableAny__
diff --git a/libjava/gnu/CORBA/DynAn/ValueChangeListener.h b/libjava/gnu/CORBA/DynAn/ValueChangeListener.h
deleted file mode 100644
index 3a106d6..0000000
--- a/libjava/gnu/CORBA/DynAn/ValueChangeListener.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_ValueChangeListener__
-#define __gnu_CORBA_DynAn_ValueChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class ValueChangeListener;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::ValueChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void changed() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_DynAn_ValueChangeListener__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynAny.h b/libjava/gnu/CORBA/DynAn/gnuDynAny.h
deleted file mode 100644
index f8e0c0f..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynAny.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynAny__
-#define __gnu_CORBA_DynAn_gnuDynAny__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/AbstractAny.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAny;
-          class gnuDynAnyFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class Object;
-          class TCKind;
-          class TypeCode;
-        namespace portable
-        {
-            class Streamable;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynAny : public ::gnu::CORBA::DynAn::AbstractAny
-{
-
-public:
-  gnuDynAny(::org::omg::CORBA::portable::Streamable *, ::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual ::org::omg::DynamicAny::DynAny * current_component();
-  virtual void destroy();
-  virtual void from_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::Any * get_any();
-  virtual jboolean get_boolean();
-  virtual jchar get_char();
-  virtual jdouble get_double();
-  virtual jfloat get_float();
-  virtual jint get_long();
-  virtual jlong get_longlong();
-  virtual jbyte get_octet();
-  virtual ::org::omg::CORBA::Object * get_reference();
-  virtual jshort get_short();
-  virtual ::java::lang::String * get_string();
-  virtual ::org::omg::CORBA::TypeCode * get_typecode();
-  virtual jint get_ulong();
-  virtual jlong get_ulonglong();
-  virtual jshort get_ushort();
-  virtual ::java::io::Serializable * get_val();
-  virtual jchar get_wchar();
-  virtual ::java::lang::String * get_wstring();
-  virtual void insert_any(::org::omg::CORBA::Any *);
-  virtual void insert_boolean(jboolean);
-  virtual void insert_char(jchar);
-  virtual void insert_double(jdouble);
-  virtual void insert_float(jfloat);
-  virtual void insert_long(jint);
-  virtual void insert_longlong(jlong);
-  virtual void insert_octet(jbyte);
-  virtual void insert_reference(::org::omg::CORBA::Object *);
-  virtual void insert_short(jshort);
-  virtual void insert_string(::java::lang::String *);
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
-  virtual void insert_ulong(jint);
-  virtual void insert_ulonglong(jlong);
-  virtual void insert_ushort(jshort);
-  virtual void insert_val(::java::io::Serializable *);
-  virtual void insert_wchar(jchar);
-  virtual void insert_wstring(::java::lang::String *);
-  virtual jboolean next();
-  virtual void rewind();
-  virtual jboolean seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-  virtual ::org::omg::CORBA::TypeCode * type();
-public: // actually protected
-  virtual jint getHashCodeSimple(jint);
-public:
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
-private:
-  void check(::org::omg::CORBA::TCKind *);
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  ::org::omg::CORBA::portable::Streamable * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::AbstractAny)))) holder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynAny__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h b/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h
deleted file mode 100644
index 6bfc5d5..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynAnyFactory__
-#define __gnu_CORBA_DynAn_gnuDynAnyFactory__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-      }
-      namespace Poa
-      {
-          class ORB_1_4;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynArray;
-          class DynEnum;
-          class DynFixed;
-          class DynSequence;
-          class DynStruct;
-          class DynUnion;
-          class DynValue;
-          class DynValueBox;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynAnyFactory : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuDynAnyFactory(::gnu::CORBA::Poa::ORB_1_4 *);
-  virtual ::gnu::CORBA::Poa::ORB_1_4 * getOrb();
-  virtual ::org::omg::DynamicAny::DynArray * create_array(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynSequence * create_sequence(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynStruct * create_structure(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynUnion * create_union(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynValue * create_value(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynValueBox * create_value_box(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynEnum * create_enumeration(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynFixed * create_fixed(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynAny * create_alias(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynAny * create_simple(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any(::org::omg::CORBA::Any *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::gnu::CORBA::Poa::ORB_1_4 * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) orb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynAnyFactory__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynArray.h b/libjava/gnu/CORBA/DynAn/gnuDynArray.h
deleted file mode 100644
index d14d9ef..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynArray.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynArray__
-#define __gnu_CORBA_DynAn_gnuDynArray__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/DivideableAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynArray;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynArray : public ::gnu::CORBA::DynAn::DivideableAny
-{
-
-public:
-  gnuDynArray(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *, jboolean);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements();
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any();
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
-  virtual ::org::omg::CORBA::Any * to_any();
-  virtual void from_any(::org::omg::CORBA::Any *);
-public: // actually protected
-  virtual void checkArrayValid(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) official_components;
-  ::org::omg::CORBA::TypeCode * final_components;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynArray__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynEnum.h b/libjava/gnu/CORBA/DynAn/gnuDynEnum.h
deleted file mode 100644
index 0aaebf6..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynEnum.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynEnum__
-#define __gnu_CORBA_DynAn_gnuDynEnum__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/UndivideableAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynEnum;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynEnum : public ::gnu::CORBA::DynAn::UndivideableAny
-{
-
-public:
-  gnuDynEnum(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  gnuDynEnum(::gnu::CORBA::DynAn::gnuDynEnum *);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-  virtual void from_any(::org::omg::CORBA::Any *);
-  virtual ::java::lang::String * get_as_string();
-  virtual jint get_as_ulong();
-  virtual void set_as_string(::java::lang::String *);
-  virtual void set_as_ulong(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::UndivideableAny)))) values;
-  jint current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynEnum__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynFixed.h b/libjava/gnu/CORBA/DynAn/gnuDynFixed.h
deleted file mode 100644
index ced924b..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynFixed.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynFixed__
-#define __gnu_CORBA_DynAn_gnuDynFixed__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/UndivideableAny.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynFixed;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynFixed : public ::gnu::CORBA::DynAn::UndivideableAny
-{
-
-public:
-  gnuDynFixed(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  gnuDynFixed(::gnu::CORBA::DynAn::gnuDynFixed *);
-  virtual ::java::lang::String * get_value();
-  virtual jboolean set_value(::java::lang::String *);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-  virtual void from_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  static ::java::math::BigDecimal * ZERO;
-  ::java::math::BigDecimal * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::UndivideableAny)))) value;
-  jint scale;
-  jint digits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynFixed__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynSequence.h b/libjava/gnu/CORBA/DynAn/gnuDynSequence.h
deleted file mode 100644
index cba3b1c..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynSequence.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynSequence__
-#define __gnu_CORBA_DynAn_gnuDynSequence__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/gnuDynArray.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynSequence;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynSequence : public ::gnu::CORBA::DynAn::gnuDynArray
-{
-
-public:
-  gnuDynSequence(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual jint get_length();
-  virtual void set_length(jint);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-public: // actually package-private
-  virtual void checkBound(jint);
-public: // actually protected
-  virtual void checkArrayValid(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::gnuDynArray)))) bound;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynSequence__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynStruct.h b/libjava/gnu/CORBA/DynAn/gnuDynStruct.h
deleted file mode 100644
index 76c32e2..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynStruct.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynStruct__
-#define __gnu_CORBA_DynAn_gnuDynStruct__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/RecordAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class RecordAny;
-          class gnuDynAnyFactory;
-          class gnuDynStruct;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynStruct : public ::gnu::CORBA::DynAn::RecordAny
-{
-
-public:
-  gnuDynStruct(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-public: // actually protected
-  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-public:
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynStruct__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynUnion.h b/libjava/gnu/CORBA/DynAn/gnuDynUnion.h
deleted file mode 100644
index a159c8c..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynUnion.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynUnion__
-#define __gnu_CORBA_DynAn_gnuDynUnion__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/DivideableAny.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynUnion;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynUnion : public ::gnu::CORBA::DynAn::DivideableAny
-{
-
-public:
-  gnuDynUnion(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CORBA::Any * to_any();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void from_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::TCKind * discriminator_kind();
-  virtual ::org::omg::DynamicAny::DynAny * get_discriminator();
-  virtual jboolean has_no_active_member();
-  virtual ::org::omg::CORBA::TCKind * member_kind();
-  virtual ::java::lang::String * member_name();
-  virtual ::org::omg::DynamicAny::DynAny * member();
-  virtual void set_discriminator(::org::omg::DynamicAny::DynAny *);
-  virtual void set_to_default_member();
-  virtual void set_to_no_active_member();
-  virtual void updateMember();
-  virtual void changed();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::org::omg::DynamicAny::DynAny * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) discriminator;
-  static ::java::lang::String * NOAM;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynUnion__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynValue.h b/libjava/gnu/CORBA/DynAn/gnuDynValue.h
deleted file mode 100644
index 852e69c..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynValue.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynValue__
-#define __gnu_CORBA_DynAn_gnuDynValue__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/RecordAny.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class RecordAny;
-          class gnuDynAnyFactory;
-          class gnuDynValue;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynValue : public ::gnu::CORBA::DynAn::RecordAny
-{
-
-public:
-  gnuDynValue(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-private:
-  void inheritFields(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind();
-  virtual ::java::lang::String * current_member_name();
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  virtual jboolean is_null();
-  virtual void set_to_null();
-  virtual void set_to_value();
-public: // actually protected
-  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-public:
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-public: // actually protected
-  virtual ::org::omg::DynamicAny::DynAny * focused();
-public:
-  virtual ::org::omg::CORBA::Any * to_any();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  virtual ::java::io::Serializable * get_val();
-  virtual void insert_val(::java::io::Serializable *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::RecordAny)))) isNull;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynValue__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h b/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h
deleted file mode 100644
index da79ceb..0000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAn_gnuDynValueBox__
-#define __gnu_CORBA_DynAn_gnuDynValueBox__
-
-#pragma interface
-
-#include <gnu/CORBA/DynAn/DivideableAny.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-          class gnuDynValueBox;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAn::gnuDynValueBox : public ::gnu::CORBA::DynAn::DivideableAny
-{
-
-public:
-  gnuDynValueBox(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual ::org::omg::DynamicAny::DynAny * current_component();
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
-  virtual void from_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::Any * get_boxed_value();
-  virtual ::org::omg::DynamicAny::DynAny * get_boxed_value_as_dyn_any();
-  virtual ::java::io::Serializable * get_val();
-  virtual void insert_val(::java::io::Serializable *);
-  virtual jboolean is_null();
-  virtual void set_boxed_value(::org::omg::CORBA::Any *);
-  virtual void set_boxed_value_as_dyn_any(::org::omg::DynamicAny::DynAny *);
-  virtual void set_to_null();
-  virtual void set_to_value();
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) content;
-  ::java::lang::String * CONTENT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAn_gnuDynValueBox__
diff --git a/libjava/gnu/CORBA/DynAnySeqHolder.h b/libjava/gnu/CORBA/DynAnySeqHolder.h
deleted file mode 100644
index 8387333..0000000
--- a/libjava/gnu/CORBA/DynAnySeqHolder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_DynAnySeqHolder__
-#define __gnu_CORBA_DynAnySeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class DynAnySeqHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::DynAnySeqHolder : public ::java::lang::Object
-{
-
-public:
-  DynAnySeqHolder();
-  DynAnySeqHolder(JArray< ::org::omg::DynamicAny::DynAny * > *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::DynamicAny::DynAny * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_DynAnySeqHolder__
diff --git a/libjava/gnu/CORBA/EmptyExceptionHolder.h b/libjava/gnu/CORBA/EmptyExceptionHolder.h
deleted file mode 100644
index d879999..0000000
--- a/libjava/gnu/CORBA/EmptyExceptionHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_EmptyExceptionHolder__
-#define __gnu_CORBA_EmptyExceptionHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class EmptyExceptionHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::EmptyExceptionHolder : public ::java::lang::Object
-{
-
-public:
-  EmptyExceptionHolder(::java::lang::Throwable *, ::org::omg::CORBA::TypeCode *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::org::omg::CORBA::TypeCode * typecode;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_EmptyExceptionHolder__
diff --git a/libjava/gnu/CORBA/ForwardRequestHelper.h b/libjava/gnu/CORBA/ForwardRequestHelper.h
deleted file mode 100644
index db52789..0000000
--- a/libjava/gnu/CORBA/ForwardRequestHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ForwardRequestHelper__
-#define __gnu_CORBA_ForwardRequestHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class ForwardRequestHelper;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class ForwardRequest;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::ForwardRequestHelper : public ::java::lang::Object
-{
-
-public:
-  ForwardRequestHelper();
-  static ::org::omg::PortableServer::ForwardRequest * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::ForwardRequest *);
-  static ::org::omg::PortableServer::ForwardRequest * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::ForwardRequest *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ForwardRequestHelper__
diff --git a/libjava/gnu/CORBA/GIOP/CancelHeader.h b/libjava/gnu/CORBA/GIOP/CancelHeader.h
deleted file mode 100644
index 14aeabf..0000000
--- a/libjava/gnu/CORBA/GIOP/CancelHeader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_CancelHeader__
-#define __gnu_CORBA_GIOP_CancelHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class CancelHeader;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::CancelHeader : public ::java::lang::Object
-{
-
-public:
-  CancelHeader();
-  virtual void read(::org::omg::CORBA::portable::InputStream *) = 0;
-  virtual void write(::org::omg::CORBA::portable::OutputStream *) = 0;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) request_id;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_CancelHeader__
diff --git a/libjava/gnu/CORBA/GIOP/CharSets_OSF.h b/libjava/gnu/CORBA/GIOP/CharSets_OSF.h
deleted file mode 100644
index afac0d3..0000000
--- a/libjava/gnu/CORBA/GIOP/CharSets_OSF.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_CharSets_OSF__
-#define __gnu_CORBA_GIOP_CharSets_OSF__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class CharSets_OSF;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::CharSets_OSF : public ::java::lang::Object
-{
-
-public:
-  CharSets_OSF();
-  static jint getCode(::java::lang::String *);
-  static ::java::lang::String * getName(jint);
-  static JArray< jint > * getSupportedCharSets();
-private:
-  static void makeMap();
-  static void put(jint, ::java::lang::String *);
-public:
-  static const jint ASCII = 65568;
-  static const jint ISO8859_1 = 65537;
-  static const jint ISO8859_2 = 65538;
-  static const jint ISO8859_3 = 65539;
-  static const jint ISO8859_4 = 65540;
-  static const jint ISO8859_5 = 65541;
-  static const jint ISO8859_6 = 65542;
-  static const jint ISO8859_7 = 65543;
-  static const jint ISO8859_8 = 65544;
-  static const jint ISO8859_9 = 65545;
-  static const jint ISO8859_15_FDIS = 65551;
-  static const jint UTF8 = 83951617;
-  static const jint UTF16 = 65801;
-  static const jint UCS2 = 65792;
-  static const jint Cp1047 = 268567575;
-  static const jint Cp1250 = 268567778;
-  static const jint Cp1251 = 268567779;
-  static const jint Cp1252 = 268567780;
-  static const jint Cp1253 = 268567781;
-  static const jint Cp1254 = 268567782;
-  static const jint Cp1255 = 268567783;
-  static const jint Cp1256 = 268567784;
-  static const jint Cp1257 = 268567785;
-  static const jint Cp1363 = 268567891;
-  static const jint Cp1363C = 268567891;
-  static const jint Cp1381 = 268567909;
-  static const jint Cp1383 = 268567911;
-  static const jint Cp1386 = 268567914;
-  static const jint Cp33722 = 268600250;
-  static const jint Cp33722C = 268600250;
-  static const jint Cp930 = 268567458;
-  static const jint Cp943 = 268567471;
-  static const jint Cp943C = 268567471;
-  static const jint Cp949 = 268567477;
-  static const jint Cp949C = 268567477;
-  static const jint Cp950 = 268567478;
-  static const jint Cp964 = 268567492;
-  static const jint Cp970 = 268567498;
-  static const jint EUC_JP = 196624;
-  static const jint EUC_KR = 262154;
-  static const jint EUC_TW = 327696;
-  static const jint NATIVE_CHARACTER = 65537;
-  static const jint NATIVE_WIDE_CHARACTER = 65801;
-private:
-  static ::java::util::Hashtable * code_to_string;
-  static ::java::util::Hashtable * string_to_code;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_CharSets_OSF__
diff --git a/libjava/gnu/CORBA/GIOP/CloseMessage.h b/libjava/gnu/CORBA/GIOP/CloseMessage.h
deleted file mode 100644
index b9700f8..0000000
--- a/libjava/gnu/CORBA/GIOP/CloseMessage.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_CloseMessage__
-#define __gnu_CORBA_GIOP_CloseMessage__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/MessageHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class CloseMessage;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::CloseMessage : public ::gnu::CORBA::GIOP::MessageHeader
-{
-
-public:
-  CloseMessage();
-  static void close(::java::io::OutputStream *);
-private:
-  static const jlong serialVersionUID = 1LL;
-  static ::gnu::CORBA::GIOP::CloseMessage * Singleton;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_CloseMessage__
diff --git a/libjava/gnu/CORBA/GIOP/CodeSetServiceContext.h b/libjava/gnu/CORBA/GIOP/CodeSetServiceContext.h
deleted file mode 100644
index 6b3f151..0000000
--- a/libjava/gnu/CORBA/GIOP/CodeSetServiceContext.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_CodeSetServiceContext__
-#define __gnu_CORBA_GIOP_CodeSetServiceContext__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/ServiceContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-          class CodeSetServiceContext;
-          class ServiceContext;
-      }
-        class IOR$CodeSets_profile;
-        class IOR$CodeSets_profile$CodeSet_component;
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::CodeSetServiceContext : public ::gnu::CORBA::GIOP::ServiceContext
-{
-
-public:
-  CodeSetServiceContext();
-  static ::gnu::CORBA::GIOP::CodeSetServiceContext * find(JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-  static ::gnu::CORBA::GIOP::CodeSetServiceContext * negotiate(::gnu::CORBA::IOR$CodeSets_profile *);
-  virtual void readContext(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-public: // actually protected
-  static jint negotiate(::gnu::CORBA::IOR$CodeSets_profile$CodeSet_component *, jint, jint);
-private:
-  ::java::lang::String * name(jint);
-public:
-  static const jint ID = 1;
-  static ::gnu::CORBA::GIOP::CodeSetServiceContext * STANDARD;
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::GIOP::ServiceContext)))) char_data;
-  jint wide_char_data;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_CodeSetServiceContext__
diff --git a/libjava/gnu/CORBA/GIOP/ContextHandler.h b/libjava/gnu/CORBA/GIOP/ContextHandler.h
deleted file mode 100644
index 80ec2af..0000000
--- a/libjava/gnu/CORBA/GIOP/ContextHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_ContextHandler__
-#define __gnu_CORBA_GIOP_ContextHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class ContextHandler;
-          class ServiceContext;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::ContextHandler : public ::java::lang::Object
-{
-
-public:
-  ContextHandler();
-  virtual void addContext(::org::omg::IOP::ServiceContext *, jboolean);
-public: // actually protected
-  static JArray< ::gnu::CORBA::GIOP::ServiceContext * > * NO_CONTEXT;
-public:
-  JArray< ::gnu::CORBA::GIOP::ServiceContext * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) service_context;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_ContextHandler__
diff --git a/libjava/gnu/CORBA/GIOP/ErrorMessage.h b/libjava/gnu/CORBA/GIOP/ErrorMessage.h
deleted file mode 100644
index 321991a..0000000
--- a/libjava/gnu/CORBA/GIOP/ErrorMessage.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_ErrorMessage__
-#define __gnu_CORBA_GIOP_ErrorMessage__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/MessageHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class ErrorMessage;
-      }
-        class IOR;
-        class Version;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::ErrorMessage : public ::gnu::CORBA::GIOP::MessageHeader
-{
-
-public:
-  ErrorMessage(::gnu::CORBA::Version *);
-  virtual void send(::gnu::CORBA::IOR *, ::org::omg::CORBA::ORB *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_ErrorMessage__
diff --git a/libjava/gnu/CORBA/GIOP/MessageHeader.h b/libjava/gnu/CORBA/GIOP/MessageHeader.h
deleted file mode 100644
index 232a5b3..0000000
--- a/libjava/gnu/CORBA/GIOP/MessageHeader.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_MessageHeader__
-#define __gnu_CORBA_GIOP_MessageHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class CancelHeader;
-          class ErrorMessage;
-          class MessageHeader;
-          class ReplyHeader;
-          class RequestHeader;
-      }
-        class Version;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::MessageHeader : public ::java::lang::Object
-{
-
-public:
-  MessageHeader();
-  MessageHeader(jint, jint);
-  virtual jboolean isBigEndian();
-  virtual jboolean moreFragmentsFollow();
-  virtual void setBigEndian(jboolean);
-  virtual jint getHeaderSize();
-  virtual ::java::lang::String * getTypeString(jint);
-  virtual ::gnu::CORBA::GIOP::ReplyHeader * create_reply_header();
-  virtual ::gnu::CORBA::GIOP::RequestHeader * create_request_header();
-  virtual ::gnu::CORBA::GIOP::CancelHeader * create_cancel_header();
-  virtual ::gnu::CORBA::GIOP::ErrorMessage * create_error_message();
-  virtual void read(::java::io::InputStream *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::java::io::OutputStream *);
-  virtual JArray< jbyte > * readMessage(::java::io::InputStream *, ::java::net::Socket *, jint, jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static const jbyte REQUEST = 0;
-  static const jbyte REPLY = 1;
-  static const jbyte CANCEL_REQUEST = 2;
-  static const jbyte LOCATE_REQUEST = 3;
-  static const jbyte LOCATE_REPLY = 4;
-  static const jbyte CLOSE_CONNECTION = 5;
-  static const jbyte MESSAGE_ERROR = 6;
-  static const jbyte FRAGMENT = 7;
-  static JArray< jbyte > * MAGIC;
-public: // actually protected
-  static JArray< ::java::lang::String * > * types;
-public:
-  ::gnu::CORBA::Version * __attribute__((aligned(__alignof__( ::java::lang::Object)))) version;
-  jbyte flags;
-  jbyte message_type;
-  jint message_size;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_MessageHeader__
diff --git a/libjava/gnu/CORBA/GIOP/ReplyHeader.h b/libjava/gnu/CORBA/GIOP/ReplyHeader.h
deleted file mode 100644
index 5c10ad8..0000000
--- a/libjava/gnu/CORBA/GIOP/ReplyHeader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_ReplyHeader__
-#define __gnu_CORBA_GIOP_ReplyHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/ContextHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-          class ReplyHeader;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::ReplyHeader : public ::gnu::CORBA::GIOP::ContextHandler
-{
-
-public:
-  ReplyHeader();
-  virtual ::java::lang::String * getStatusString();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *) = 0;
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *) = 0;
-  static const jint NO_EXCEPTION = 0;
-  static const jint USER_EXCEPTION = 1;
-  static const jint SYSTEM_EXCEPTION = 2;
-  static const jint LOCATION_FORWARD = 3;
-  static const jint LOCATION_FORWARD_PERM = 4;
-  static const jint NEEDS_ADDRESSING_MODE = 5;
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::GIOP::ContextHandler)))) reply_status;
-  jint request_id;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_ReplyHeader__
diff --git a/libjava/gnu/CORBA/GIOP/RequestHeader.h b/libjava/gnu/CORBA/GIOP/RequestHeader.h
deleted file mode 100644
index 69135b3..0000000
--- a/libjava/gnu/CORBA/GIOP/RequestHeader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_RequestHeader__
-#define __gnu_CORBA_GIOP_RequestHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/ContextHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-          class RequestHeader;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::RequestHeader : public ::gnu::CORBA::GIOP::ContextHandler
-{
-
-public:
-  RequestHeader();
-  static jint getNextId();
-  virtual void setResponseExpected(jboolean) = 0;
-  virtual jboolean isResponseExpected() = 0;
-  virtual ::java::lang::String * bytes(JArray< jbyte > *);
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *) = 0;
-private:
-  static jint freeId;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::CORBA::GIOP::ContextHandler)))) operation;
-  JArray< jbyte > * object_key;
-  JArray< jbyte > * requesting_principal;
-  jint request_id;
-public: // actually protected
-  jboolean response_expected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_RequestHeader__
diff --git a/libjava/gnu/CORBA/GIOP/ServiceContext.h b/libjava/gnu/CORBA/GIOP/ServiceContext.h
deleted file mode 100644
index 7cde097..0000000
--- a/libjava/gnu/CORBA/GIOP/ServiceContext.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_ServiceContext__
-#define __gnu_CORBA_GIOP_ServiceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::ServiceContext : public ::java::lang::Object
-{
-
-public:
-  ServiceContext();
-  ServiceContext(::org::omg::IOP::ServiceContext *);
-  static ::gnu::CORBA::GIOP::ServiceContext * read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  static JArray< ::gnu::CORBA::GIOP::ServiceContext * > * readSequence(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static void writeSequence(::gnu::CORBA::CDR::AbstractCdrOutput *, JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-  static void add(JArray< ::org::omg::IOP::ServiceContext * > *, ::org::omg::IOP::ServiceContext *, jboolean);
-  static JArray< ::gnu::CORBA::GIOP::ServiceContext * > * add(JArray< ::gnu::CORBA::GIOP::ServiceContext * > *, ::org::omg::IOP::ServiceContext *, jboolean);
-  static ::org::omg::IOP::ServiceContext * findContext(jint, JArray< ::org::omg::IOP::ServiceContext * > *);
-  static ::org::omg::IOP::ServiceContext * findContext(jint, JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-  static ::gnu::CORBA::GIOP::ServiceContext * find(jint, JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static const jint TransactionService = 0;
-  static const jint CodeSets = 1;
-  static const jint ChainBypassCheck = 2;
-  static const jint ChainBypassInfo = 3;
-  static const jint LogicalThreadId = 4;
-  static const jint BI_DIR_IIOP = 5;
-  static const jint SendingContextRunTime = 6;
-  static const jint INVOCATION_POLICIES = 7;
-  static const jint FORWARDED_IDENTITY = 8;
-  static const jint UnknownExceptionInfo = 9;
-  static const jint RTCorbaPriority = 10;
-  static const jint RTCorbaPriorityRange = 11;
-  static const jint FT_GROUP_VERSION = 12;
-  static const jint FT_REQUEST = 13;
-  static const jint ExceptionDetailMessage = 14;
-  static const jint SecurityAttributeService = 15;
-  static const jint ActivityService = 16;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) context_id;
-  JArray< jbyte > * context_data;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_ServiceContext__
diff --git a/libjava/gnu/CORBA/GIOP/v1_0/CancelHeader.h b/libjava/gnu/CORBA/GIOP/v1_0/CancelHeader.h
deleted file mode 100644
index 455da24..0000000
--- a/libjava/gnu/CORBA/GIOP/v1_0/CancelHeader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_v1_0_CancelHeader__
-#define __gnu_CORBA_GIOP_v1_0_CancelHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/CancelHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-        namespace v1_0
-        {
-            class CancelHeader;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::v1_0::CancelHeader : public ::gnu::CORBA::GIOP::CancelHeader
-{
-
-public:
-  CancelHeader();
-  virtual void read(::org::omg::CORBA::portable::InputStream *);
-  virtual void write(::org::omg::CORBA::portable::OutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_v1_0_CancelHeader__
diff --git a/libjava/gnu/CORBA/GIOP/v1_0/ReplyHeader.h b/libjava/gnu/CORBA/GIOP/v1_0/ReplyHeader.h
deleted file mode 100644
index 9c5755e..0000000
--- a/libjava/gnu/CORBA/GIOP/v1_0/ReplyHeader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_v1_0_ReplyHeader__
-#define __gnu_CORBA_GIOP_v1_0_ReplyHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/ReplyHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-        namespace v1_0
-        {
-            class ReplyHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::v1_0::ReplyHeader : public ::gnu::CORBA::GIOP::ReplyHeader
-{
-
-public:
-  ReplyHeader();
-  virtual ::java::lang::String * getStatusString();
-  virtual ::java::lang::String * contexts();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_v1_0_ReplyHeader__
diff --git a/libjava/gnu/CORBA/GIOP/v1_0/RequestHeader.h b/libjava/gnu/CORBA/GIOP/v1_0/RequestHeader.h
deleted file mode 100644
index 0b73277..0000000
--- a/libjava/gnu/CORBA/GIOP/v1_0/RequestHeader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_v1_0_RequestHeader__
-#define __gnu_CORBA_GIOP_v1_0_RequestHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/RequestHeader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-        namespace v1_0
-        {
-            class RequestHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::v1_0::RequestHeader : public ::gnu::CORBA::GIOP::RequestHeader
-{
-
-public:
-  RequestHeader();
-  virtual void setResponseExpected(jboolean);
-  virtual jboolean isResponseExpected();
-  virtual ::java::lang::String * bytes(JArray< jbyte > *);
-  virtual ::java::lang::String * contexts();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_v1_0_RequestHeader__
diff --git a/libjava/gnu/CORBA/GIOP/v1_2/ReplyHeader.h b/libjava/gnu/CORBA/GIOP/v1_2/ReplyHeader.h
deleted file mode 100644
index 633c59c..0000000
--- a/libjava/gnu/CORBA/GIOP/v1_2/ReplyHeader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_v1_2_ReplyHeader__
-#define __gnu_CORBA_GIOP_v1_2_ReplyHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/v1_0/ReplyHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-        namespace v1_2
-        {
-            class ReplyHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::v1_2::ReplyHeader : public ::gnu::CORBA::GIOP::v1_0::ReplyHeader
-{
-
-public:
-  ReplyHeader();
-  virtual ::java::lang::String * getStatusString();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_v1_2_ReplyHeader__
diff --git a/libjava/gnu/CORBA/GIOP/v1_2/RequestHeader.h b/libjava/gnu/CORBA/GIOP/v1_2/RequestHeader.h
deleted file mode 100644
index 368275c..0000000
--- a/libjava/gnu/CORBA/GIOP/v1_2/RequestHeader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GIOP_v1_2_RequestHeader__
-#define __gnu_CORBA_GIOP_v1_2_RequestHeader__
-
-#pragma interface
-
-#include <gnu/CORBA/GIOP/v1_0/RequestHeader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-        namespace v1_2
-        {
-            class RequestHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GIOP::v1_2::RequestHeader : public ::gnu::CORBA::GIOP::v1_0::RequestHeader
-{
-
-public:
-  RequestHeader();
-  virtual void setResponseExpected(jboolean);
-  virtual jboolean isResponseExpected();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static const jshort KeyAddr = 0;
-  static const jshort ProfileAddr = 1;
-  static const jshort ReferenceAddr = 2;
-  jbyte __attribute__((aligned(__alignof__( ::gnu::CORBA::GIOP::v1_0::RequestHeader)))) response_flags;
-  jshort AddressingDisposition;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GIOP_v1_2_RequestHeader__
diff --git a/libjava/gnu/CORBA/GeneralHolder.h b/libjava/gnu/CORBA/GeneralHolder.h
deleted file mode 100644
index fd3d482..0000000
--- a/libjava/gnu/CORBA/GeneralHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_GeneralHolder__
-#define __gnu_CORBA_GeneralHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-      }
-        class GeneralHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::GeneralHolder : public ::java::lang::Object
-{
-
-public:
-  GeneralHolder(::gnu::CORBA::CDR::BufferedCdrOutput *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-public: // actually package-private
-  virtual ::org::omg::CORBA::portable::InputStream * getInputStream();
-public:
-  virtual ::gnu::CORBA::GeneralHolder * Clone();
-private:
-  ::gnu::CORBA::CDR::BufferedCdrOutput * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_GeneralHolder__
diff --git a/libjava/gnu/CORBA/HolderLocator.h b/libjava/gnu/CORBA/HolderLocator.h
deleted file mode 100644
index 78c96d7..0000000
--- a/libjava/gnu/CORBA/HolderLocator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_HolderLocator__
-#define __gnu_CORBA_HolderLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class HolderLocator;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class Streamable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::HolderLocator : public ::java::lang::Object
-{
-
-public:
-  HolderLocator();
-  static ::org::omg::CORBA::portable::Streamable * createHolder(::org::omg::CORBA::TypeCode *);
-private:
-  static JArray< ::java::lang::Class * > * holders;
-  static JArray< ::java::lang::Class * > * seqHolders;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_HolderLocator__
diff --git a/libjava/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.h b/libjava/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.h
deleted file mode 100644
index 394d8a8..0000000
--- a/libjava/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IOR$CodeSets_profile$CodeSet_component__
-#define __gnu_CORBA_IOR$CodeSets_profile$CodeSet_component__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR$CodeSets_profile$CodeSet_component;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::IOR$CodeSets_profile$CodeSet_component : public ::java::lang::Object
-{
-
-public:
-  IOR$CodeSets_profile$CodeSet_component();
-  virtual void read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toStringFormatted();
-  virtual void write(::org::omg::CORBA::portable::OutputStream *);
-private:
-  ::java::lang::String * name(jint);
-public:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) conversion;
-  jint native_set;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IOR$CodeSets_profile$CodeSet_component__
diff --git a/libjava/gnu/CORBA/IOR$CodeSets_profile.h b/libjava/gnu/CORBA/IOR$CodeSets_profile.h
deleted file mode 100644
index e38bdc4..0000000
--- a/libjava/gnu/CORBA/IOR$CodeSets_profile.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IOR$CodeSets_profile__
-#define __gnu_CORBA_IOR$CodeSets_profile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-      namespace GIOP
-      {
-          class CodeSetServiceContext;
-      }
-        class IOR$CodeSets_profile;
-        class IOR$CodeSets_profile$CodeSet_component;
-    }
-  }
-}
-
-class gnu::CORBA::IOR$CodeSets_profile : public ::java::lang::Object
-{
-
-public:
-  IOR$CodeSets_profile();
-  virtual void read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static const jint TAG_CODE_SETS = 1;
-  ::gnu::CORBA::IOR$CodeSets_profile$CodeSet_component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) narrow;
-  ::gnu::CORBA::IOR$CodeSets_profile$CodeSet_component * wide;
-  ::gnu::CORBA::GIOP::CodeSetServiceContext * negotiated;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IOR$CodeSets_profile__
diff --git a/libjava/gnu/CORBA/IOR$Internet_profile.h b/libjava/gnu/CORBA/IOR$Internet_profile.h
deleted file mode 100644
index 93e149e..0000000
--- a/libjava/gnu/CORBA/IOR$Internet_profile.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IOR$Internet_profile__
-#define __gnu_CORBA_IOR$Internet_profile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrOutput;
-      }
-        class IOR;
-        class IOR$CodeSets_profile;
-        class IOR$Internet_profile;
-        class Version;
-    }
-  }
-}
-
-class gnu::CORBA::IOR$Internet_profile : public ::java::lang::Object
-{
-
-public:
-  IOR$Internet_profile(::gnu::CORBA::IOR *);
-  virtual ::java::lang::String * toString();
-  virtual void write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static const jint TAG_INTERNET_IOP = 0;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) host;
-  ::gnu::CORBA::Version * version;
-  jint port;
-  ::gnu::CORBA::IOR$CodeSets_profile * CodeSets;
-public: // actually package-private
-  ::java::util::ArrayList * components;
-  ::gnu::CORBA::IOR * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IOR$Internet_profile__
diff --git a/libjava/gnu/CORBA/IOR.h b/libjava/gnu/CORBA/IOR.h
deleted file mode 100644
index 22cb1e1..0000000
--- a/libjava/gnu/CORBA/IOR.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IOR__
-#define __gnu_CORBA_IOR__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class AbstractCdrInput;
-          class AbstractCdrOutput;
-      }
-        class IOR;
-        class IOR$Internet_profile;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TaggedComponent;
-          class TaggedProfile;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::IOR : public ::java::lang::Object
-{
-
-public:
-  IOR();
-  static ::gnu::CORBA::IOR * parse(::java::lang::String *);
-  virtual void _read(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual void _read_no_endian(::gnu::CORBA::CDR::AbstractCdrInput *);
-  virtual void _write(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  static void write_null(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  virtual void _write_no_endian(::gnu::CORBA::CDR::AbstractCdrOutput *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toStringFormatted();
-  virtual ::java::lang::String * toStringifiedReference();
-  virtual void add_ior_component(::org::omg::IOP::TaggedComponent *);
-  virtual void add_ior_component_to_profile(::org::omg::IOP::TaggedComponent *, jint);
-private:
-  static void addComponentTo(::org::omg::IOP::TaggedProfile *, ::org::omg::IOP::TaggedComponent *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  static const jint FAILED = 10;
-  ::gnu::CORBA::IOR$Internet_profile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) Internet;
-  ::java::lang::String * Id;
-  JArray< jbyte > * key;
-public: // actually package-private
-  ::java::util::ArrayList * profiles;
-public:
-  jboolean Big_Endian;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IOR__
diff --git a/libjava/gnu/CORBA/Interceptor/ClientRequestInterceptors.h b/libjava/gnu/CORBA/Interceptor/ClientRequestInterceptors.h
deleted file mode 100644
index d5dc4b1..0000000
--- a/libjava/gnu/CORBA/Interceptor/ClientRequestInterceptors.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_ClientRequestInterceptors__
-#define __gnu_CORBA_Interceptor_ClientRequestInterceptors__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class ClientRequestInterceptors;
-          class Registrator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfo;
-          class ClientRequestInterceptor;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::ClientRequestInterceptors : public ::java::lang::Object
-{
-
-public:
-  ClientRequestInterceptors(::gnu::CORBA::Interceptor::Registrator *);
-  virtual void receive_exception(::org::omg::PortableInterceptor::ClientRequestInfo *);
-  virtual void receive_other(::org::omg::PortableInterceptor::ClientRequestInfo *);
-  virtual void receive_reply(::org::omg::PortableInterceptor::ClientRequestInfo *);
-  virtual void send_poll(::org::omg::PortableInterceptor::ClientRequestInfo *);
-  virtual void send_request(::org::omg::PortableInterceptor::ClientRequestInfo *);
-  virtual void destroy();
-  virtual ::java::lang::String * name();
-private:
-  JArray< ::org::omg::PortableInterceptor::ClientRequestInterceptor * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) interceptors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_ClientRequestInterceptors__
diff --git a/libjava/gnu/CORBA/Interceptor/ForwardRequestHolder.h b/libjava/gnu/CORBA/Interceptor/ForwardRequestHolder.h
deleted file mode 100644
index c58ee59..0000000
--- a/libjava/gnu/CORBA/Interceptor/ForwardRequestHolder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_ForwardRequestHolder__
-#define __gnu_CORBA_Interceptor_ForwardRequestHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class ForwardRequestHolder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ForwardRequest;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::ForwardRequestHolder : public ::java::lang::Object
-{
-
-public:
-  ForwardRequestHolder();
-  ForwardRequestHolder(::org::omg::PortableInterceptor::ForwardRequest *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableInterceptor::ForwardRequest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_ForwardRequestHolder__
diff --git a/libjava/gnu/CORBA/Interceptor/IORInterceptors.h b/libjava/gnu/CORBA/Interceptor/IORInterceptors.h
deleted file mode 100644
index 6a2a45a..0000000
--- a/libjava/gnu/CORBA/Interceptor/IORInterceptors.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_IORInterceptors__
-#define __gnu_CORBA_Interceptor_IORInterceptors__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class IORInterceptors;
-          class Registrator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class IORInterceptor;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::IORInterceptors : public ::java::lang::Object
-{
-
-public:
-  IORInterceptors(::gnu::CORBA::Interceptor::Registrator *);
-  virtual void establish_components(::org::omg::PortableInterceptor::IORInfo *);
-  virtual void destroy();
-  virtual ::java::lang::String * name();
-  virtual void adapter_manager_state_changed(jint, jshort);
-  virtual void adapter_state_changed(JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *, jshort);
-  virtual void components_established(::org::omg::PortableInterceptor::IORInfo *);
-private:
-  JArray< ::org::omg::PortableInterceptor::IORInterceptor * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) interceptors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_IORInterceptors__
diff --git a/libjava/gnu/CORBA/Interceptor/Registrator.h b/libjava/gnu/CORBA/Interceptor/Registrator.h
deleted file mode 100644
index 8a5a3b0..0000000
--- a/libjava/gnu/CORBA/Interceptor/Registrator.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_Registrator__
-#define __gnu_CORBA_Interceptor_Registrator__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class Registrator;
-      }
-      namespace Poa
-      {
-          class ORB_1_4;
-      }
-        class gnuCodecFactory;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace IOP
-      {
-          class CodecFactory;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInterceptor;
-          class IORInterceptor;
-          class Interceptor;
-          class PolicyFactory;
-          class ServerRequestInterceptor;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::Registrator : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  Registrator(::gnu::CORBA::Poa::ORB_1_4 *, ::java::util::Properties *, JArray< ::java::lang::String * > *);
-private:
-  void checkProperties(::java::util::Properties *);
-  void checkFile(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void pre_init();
-  virtual ::java::util::Map * getRegisteredReferences();
-  virtual void post_init();
-  virtual JArray< ::org::omg::PortableInterceptor::ServerRequestInterceptor * > * getServerRequestInterceptors();
-  virtual JArray< ::org::omg::PortableInterceptor::ClientRequestInterceptor * > * getClientRequestInterceptors();
-  virtual JArray< ::org::omg::PortableInterceptor::IORInterceptor * > * getIORInterceptors();
-  virtual void add_client_request_interceptor(::org::omg::PortableInterceptor::ClientRequestInterceptor *);
-  virtual void add_ior_interceptor(::org::omg::PortableInterceptor::IORInterceptor *);
-  virtual void add_server_request_interceptor(::org::omg::PortableInterceptor::ServerRequestInterceptor *);
-  virtual jint allocate_slot_id();
-private:
-  void add(::java::util::ArrayList *, ::org::omg::PortableInterceptor::Interceptor *);
-public:
-  virtual JArray< ::java::lang::String * > * arguments();
-  virtual ::org::omg::IOP::CodecFactory * codec_factory();
-  virtual ::java::lang::String * orb_id();
-  virtual void register_initial_reference(::java::lang::String *, ::org::omg::CORBA::Object *);
-  virtual void register_policy_factory(jint, ::org::omg::PortableInterceptor::PolicyFactory *);
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *);
-  virtual jboolean hasClientRequestInterceptors();
-  virtual jboolean hasServerRequestInterceptors();
-  virtual jboolean hasIorInterceptors();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::String * m_prefix;
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) m_server;
-  ::java::util::ArrayList * m_client;
-  ::java::util::ArrayList * m_ior;
-public:
-  ::java::util::Hashtable * m_policyFactories;
-  ::java::util::TreeMap * m_references;
-  ::java::util::ArrayList * m_initializers;
-public: // actually package-private
-  ::gnu::CORBA::Poa::ORB_1_4 * orb;
-  JArray< ::java::lang::String * > * m_args;
-  ::gnu::CORBA::gnuCodecFactory * m_codecFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_Registrator__
diff --git a/libjava/gnu/CORBA/Interceptor/ServerRequestInterceptors.h b/libjava/gnu/CORBA/Interceptor/ServerRequestInterceptors.h
deleted file mode 100644
index fb78c57..0000000
--- a/libjava/gnu/CORBA/Interceptor/ServerRequestInterceptors.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_ServerRequestInterceptors__
-#define __gnu_CORBA_Interceptor_ServerRequestInterceptors__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class Registrator;
-          class ServerRequestInterceptors;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ServerRequestInfo;
-          class ServerRequestInterceptor;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::ServerRequestInterceptors : public ::java::lang::Object
-{
-
-public:
-  ServerRequestInterceptors(::gnu::CORBA::Interceptor::Registrator *);
-  virtual void receive_request_service_contexts(::org::omg::PortableInterceptor::ServerRequestInfo *);
-  virtual void receive_request(::org::omg::PortableInterceptor::ServerRequestInfo *);
-  virtual void send_exception(::org::omg::PortableInterceptor::ServerRequestInfo *);
-  virtual void send_other(::org::omg::PortableInterceptor::ServerRequestInfo *);
-  virtual void send_reply(::org::omg::PortableInterceptor::ServerRequestInfo *);
-  virtual void destroy();
-  virtual ::java::lang::String * name();
-private:
-  JArray< ::org::omg::PortableInterceptor::ServerRequestInterceptor * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) interceptors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_ServerRequestInterceptors__
diff --git a/libjava/gnu/CORBA/Interceptor/gnuClientRequestInfo.h b/libjava/gnu/CORBA/Interceptor/gnuClientRequestInfo.h
deleted file mode 100644
index 32dac2c..0000000
--- a/libjava/gnu/CORBA/Interceptor/gnuClientRequestInfo.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_gnuClientRequestInfo__
-#define __gnu_CORBA_Interceptor_gnuClientRequestInfo__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class gnuClientRequestInfo;
-      }
-        class gnuRequest;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Policy;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class TaggedComponent;
-          class TaggedProfile;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::gnuClientRequestInfo : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuClientRequestInfo(::gnu::CORBA::gnuRequest *);
-  virtual void add_request_service_context(::org::omg::IOP::ServiceContext *, jboolean);
-  virtual ::org::omg::IOP::TaggedProfile * effective_profile();
-  virtual ::org::omg::CORBA::Object * effective_target();
-  virtual ::org::omg::IOP::TaggedComponent * get_effective_component(jint);
-  virtual JArray< ::org::omg::IOP::TaggedComponent * > * get_effective_components(jint);
-  virtual ::org::omg::CORBA::Policy * get_request_policy(jint);
-  virtual ::java::lang::String * received_exception_id();
-  virtual ::org::omg::CORBA::Any * received_exception();
-  virtual ::org::omg::CORBA::Object * target();
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments();
-  virtual ::org::omg::CORBA::Any * result();
-  virtual JArray< ::java::lang::String * > * contexts();
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions();
-  virtual ::org::omg::CORBA::Object * forward_reference();
-  virtual JArray< ::java::lang::String * > * operation_context();
-  virtual ::org::omg::CORBA::Any * get_slot(jint);
-  virtual ::java::lang::String * operation();
-  virtual jshort reply_status();
-  virtual jint request_id();
-  virtual jboolean response_expected();
-  virtual jshort sync_scope();
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint);
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-  ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) request;
-public:
-  ::org::omg::CORBA::Any * m_wrapped_exception;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_gnuClientRequestInfo__
diff --git a/libjava/gnu/CORBA/Interceptor/gnuIcCurrent.h b/libjava/gnu/CORBA/Interceptor/gnuIcCurrent.h
deleted file mode 100644
index 65d85eb..0000000
--- a/libjava/gnu/CORBA/Interceptor/gnuIcCurrent.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_gnuIcCurrent__
-#define __gnu_CORBA_Interceptor_gnuIcCurrent__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Interceptor
-      {
-          class gnuIcCurrent;
-      }
-      namespace Poa
-      {
-          class ORB_1_4;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::gnuIcCurrent : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  gnuIcCurrent(::gnu::CORBA::Poa::ORB_1_4 *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual void put(::java::lang::Thread *, JArray< ::org::omg::CORBA::Any * > *);
-  virtual jboolean has(::java::lang::Thread *);
-  virtual void remove(::java::lang::Thread *);
-public: // actually package-private
-  virtual JArray< ::org::omg::CORBA::Any * > * get_slots();
-public:
-  virtual JArray< ::org::omg::CORBA::Any * > * clone_slots();
-  virtual ::org::omg::CORBA::Any * get_slot(jint);
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::gnu::CORBA::Poa::ORB_1_4 * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) orb;
-private:
-  ::java::util::Hashtable * threads;
-public: // actually package-private
-  static JArray< ::org::omg::CORBA::Any * > * NO_SLOTS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_gnuIcCurrent__
diff --git a/libjava/gnu/CORBA/Interceptor/gnuIorInfo.h b/libjava/gnu/CORBA/Interceptor/gnuIorInfo.h
deleted file mode 100644
index 8e1adcf..0000000
--- a/libjava/gnu/CORBA/Interceptor/gnuIorInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_gnuIorInfo__
-#define __gnu_CORBA_Interceptor_gnuIorInfo__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-      namespace Interceptor
-      {
-          class gnuIorInfo;
-      }
-      namespace Poa
-      {
-          class ORB_1_4;
-          class gnuPOA;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace IOP
-      {
-          class TaggedComponent;
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceFactory;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::gnuIorInfo : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuIorInfo(::gnu::CORBA::Poa::ORB_1_4 *, ::gnu::CORBA::Poa::gnuPOA *, ::gnu::CORBA::IOR *);
-  virtual void add_ior_component_to_profile(::org::omg::IOP::TaggedComponent *, jint);
-  virtual void add_ior_component(::org::omg::IOP::TaggedComponent *);
-  virtual ::org::omg::CORBA::Policy * get_effective_policy(jint);
-  virtual jshort state();
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceTemplate * adapter_template();
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceFactory * current_factory();
-  virtual void current_factory(::org::omg::PortableInterceptor::ObjectReferenceFactory *);
-  virtual jint manager_id();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::gnu::CORBA::Poa::ORB_1_4 * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) orb;
-  ::gnu::CORBA::Poa::gnuPOA * poa;
-private:
-  ::gnu::CORBA::IOR * ior;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_gnuIorInfo__
diff --git a/libjava/gnu/CORBA/Interceptor/gnuServerRequestInfo.h b/libjava/gnu/CORBA/Interceptor/gnuServerRequestInfo.h
deleted file mode 100644
index 8164ea7..0000000
--- a/libjava/gnu/CORBA/Interceptor/gnuServerRequestInfo.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Interceptor_gnuServerRequestInfo__
-#define __gnu_CORBA_Interceptor_gnuServerRequestInfo__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class ReplyHeader;
-          class RequestHeader;
-      }
-      namespace Interceptor
-      {
-          class gnuServerRequestInfo;
-      }
-      namespace Poa
-      {
-          class gnuServantObject;
-      }
-        class gnuRequest;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Policy;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Interceptor::gnuServerRequestInfo : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuServerRequestInfo(::gnu::CORBA::Poa::gnuServantObject *, ::gnu::CORBA::GIOP::RequestHeader *, ::gnu::CORBA::GIOP::ReplyHeader *);
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::Any * get_slot(jint);
-  virtual void reset();
-  virtual JArray< jbyte > * object_id();
-  virtual jboolean target_is_a(::java::lang::String *);
-  virtual JArray< jbyte > * adapter_id();
-  virtual ::org::omg::CORBA::Policy * get_server_policy(jint);
-  virtual ::java::lang::String * target_most_derived_interface();
-  virtual ::java::lang::String * operation();
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions();
-  virtual jshort reply_status();
-  virtual jint request_id();
-  virtual jboolean response_expected();
-  virtual void add_reply_service_context(::org::omg::IOP::ServiceContext *, jboolean);
-  virtual ::org::omg::CORBA::Any * sending_exception();
-  virtual ::org::omg::CORBA::Object * forward_reference();
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint);
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint);
-  virtual JArray< ::java::lang::String * > * operation_context();
-  virtual ::org::omg::CORBA::Any * result();
-  virtual JArray< ::java::lang::String * > * contexts();
-  virtual jshort sync_scope();
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments();
-  virtual JArray< ::java::lang::String * > * adapter_name();
-  virtual ::java::lang::String * orb_id();
-  virtual ::java::lang::String * server_id();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::gnu::CORBA::Poa::gnuServantObject * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) m_object;
-  static ::java::lang::String * not_available;
-  JArray< ::org::omg::CORBA::Any * > * m_slots;
-public:
-  ::gnu::CORBA::GIOP::RequestHeader * m_request_header;
-  ::gnu::CORBA::GIOP::ReplyHeader * m_reply_header;
-  ::org::omg::CORBA::Object * m_forward_reference;
-  ::java::lang::Exception * m_sys_exception;
-  ::org::omg::CORBA::Any * m_usr_exception;
-  ::gnu::CORBA::gnuRequest * m_request;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Interceptor_gnuServerRequestInfo__
diff --git a/libjava/gnu/CORBA/IorDelegate.h b/libjava/gnu/CORBA/IorDelegate.h
deleted file mode 100644
index 176cac0..0000000
--- a/libjava/gnu/CORBA/IorDelegate.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IorDelegate__
-#define __gnu_CORBA_IorDelegate__
-
-#pragma interface
-
-#include <gnu/CORBA/SimpleDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferredCdrInput;
-      }
-        class IOR;
-        class IorDelegate;
-        class StreamBasedRequest;
-        class gnuRequest;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Request;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::IorDelegate : public ::gnu::CORBA::SimpleDelegate
-{
-
-public:
-  IorDelegate(::org::omg::CORBA::ORB *, ::gnu::CORBA::IOR *);
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *);
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *, ::org::omg::CORBA::ExceptionList *, ::org::omg::CORBA::ContextList *);
-public: // actually protected
-  virtual ::gnu::CORBA::gnuRequest * getRequestInstance(::org::omg::CORBA::Object *);
-public:
-  virtual ::org::omg::CORBA::portable::InputStream * invoke(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::OutputStream *);
-public: // actually package-private
-  virtual void showException(::gnu::CORBA::StreamBasedRequest *, ::gnu::CORBA::CDR::BufferredCdrInput *);
-public:
-  virtual ::org::omg::CORBA::Request * request(::org::omg::CORBA::Object *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::portable::OutputStream * request(::org::omg::CORBA::Object *, ::java::lang::String *, jboolean);
-  virtual void release(::org::omg::CORBA::Object *);
-  virtual void setIor(::gnu::CORBA::IOR *);
-  virtual jboolean is_local(::org::omg::CORBA::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IorDelegate__
diff --git a/libjava/gnu/CORBA/IorObject.h b/libjava/gnu/CORBA/IorObject.h
deleted file mode 100644
index c3fca11..0000000
--- a/libjava/gnu/CORBA/IorObject.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IorObject__
-#define __gnu_CORBA_IorObject__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-        class IorObject;
-        class OrbFunctional;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::IorObject : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  IorObject(::org::omg::CORBA::ORB *, ::gnu::CORBA::IOR *);
-  IorObject(::gnu::CORBA::OrbFunctional *, ::java::lang::String *);
-  virtual ::gnu::CORBA::IOR * getIor();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void finalize();
-  ::gnu::CORBA::IOR * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) ior;
-  JArray< ::java::lang::String * > * id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_IorObject__
diff --git a/libjava/gnu/CORBA/IorProvider.h b/libjava/gnu/CORBA/IorProvider.h
deleted file mode 100644
index b244038..0000000
--- a/libjava/gnu/CORBA/IorProvider.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_IorProvider__
-#define __gnu_CORBA_IorProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-        class IorProvider;
-    }
-  }
-}
-
-class gnu::CORBA::IorProvider : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::CORBA::IOR * getIor() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_IorProvider__
diff --git a/libjava/gnu/CORBA/Minor.h b/libjava/gnu/CORBA/Minor.h
deleted file mode 100644
index e37bd4c..0000000
--- a/libjava/gnu/CORBA/Minor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Minor__
-#define __gnu_CORBA_Minor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Minor;
-    }
-  }
-}
-
-class gnu::CORBA::Minor : public ::java::lang::Object
-{
-
-public:
-  static const jint vendor = 1195573248;
-  static const jint Giop = 1195573249;
-  static const jint Header = 1195573250;
-  static const jint EOF = 1195573251;
-  static const jint CDR = 1195573253;
-  static const jint Value = 1195573254;
-  static const jint Forwarding = 1195573255;
-  static const jint Encapsulation = 1195573256;
-  static const jint Any = 1195573257;
-  static const jint UserException = 1195573258;
-  static const jint Inappropriate = 1195573259;
-  static const jint Negative = 1195573260;
-  static const jint Graph = 1195573262;
-  static const jint Boxed = 1195573263;
-  static const jint Instantiation = 1195573264;
-  static const jint ValueHeaderTag = 1195573265;
-  static const jint ValueHeaderFlags = 1195573266;
-  static const jint ClassCast = 1195573267;
-  static const jint Offset = 1195573268;
-  static const jint Chunks = 1195573269;
-  static const jint UnsupportedValue = 1195573270;
-  static const jint Factory = 1195573271;
-  static const jint UnsupportedAddressing = 1195573272;
-  static const jint IOR = 1195573273;
-  static const jint TargetConversion = 1195573274;
-  static const jint ValueFields = 1195573275;
-  static const jint NonSerializable = 1195573276;
-  static const jint Method = 1195573248;
-  static const jint Activation = 1195573258;
-  static const jint Policy = 1195573259;
-  static const jint Socket = 1195573260;
-  static const jint Enumeration = 1195573262;
-  static const jint PolicyType = 1195573263;
-  static const jint Ports = 1195573268;
-  static const jint Threads = 1195573269;
-  static const jint Missing_IOR = 1195573270;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_Minor__
diff --git a/libjava/gnu/CORBA/NameDynAnyPairHolder.h b/libjava/gnu/CORBA/NameDynAnyPairHolder.h
deleted file mode 100644
index ca7a5a5..0000000
--- a/libjava/gnu/CORBA/NameDynAnyPairHolder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NameDynAnyPairHolder__
-#define __gnu_CORBA_NameDynAnyPairHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class NameDynAnyPairHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameDynAnyPair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NameDynAnyPairHolder : public ::java::lang::Object
-{
-
-public:
-  NameDynAnyPairHolder();
-  NameDynAnyPairHolder(::org::omg::DynamicAny::NameDynAnyPair *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::DynamicAny::NameDynAnyPair * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NameDynAnyPairHolder__
diff --git a/libjava/gnu/CORBA/NameDynAnyPairSeqHolder.h b/libjava/gnu/CORBA/NameDynAnyPairSeqHolder.h
deleted file mode 100644
index 0ffdb87..0000000
--- a/libjava/gnu/CORBA/NameDynAnyPairSeqHolder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NameDynAnyPairSeqHolder__
-#define __gnu_CORBA_NameDynAnyPairSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class NameDynAnyPairSeqHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameDynAnyPair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NameDynAnyPairSeqHolder : public ::java::lang::Object
-{
-
-public:
-  NameDynAnyPairSeqHolder();
-  NameDynAnyPairSeqHolder(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NameDynAnyPairSeqHolder__
diff --git a/libjava/gnu/CORBA/NameValuePairHolder.h b/libjava/gnu/CORBA/NameValuePairHolder.h
deleted file mode 100644
index a8c14d0..0000000
--- a/libjava/gnu/CORBA/NameValuePairHolder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NameValuePairHolder__
-#define __gnu_CORBA_NameValuePairHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class NameValuePairHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NameValuePairHolder : public ::java::lang::Object
-{
-
-public:
-  NameValuePairHolder();
-  NameValuePairHolder(::org::omg::DynamicAny::NameValuePair *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::DynamicAny::NameValuePair * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NameValuePairHolder__
diff --git a/libjava/gnu/CORBA/NameValuePairSeqHolder.h b/libjava/gnu/CORBA/NameValuePairSeqHolder.h
deleted file mode 100644
index 4b5ef47..0000000
--- a/libjava/gnu/CORBA/NameValuePairSeqHolder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NameValuePairSeqHolder__
-#define __gnu_CORBA_NameValuePairSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class NameValuePairSeqHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NameValuePairSeqHolder : public ::java::lang::Object
-{
-
-public:
-  NameValuePairSeqHolder();
-  NameValuePairSeqHolder(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::DynamicAny::NameValuePair * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NameValuePairSeqHolder__
diff --git a/libjava/gnu/CORBA/NamingService/Binding_iterator_impl.h b/libjava/gnu/CORBA/NamingService/Binding_iterator_impl.h
deleted file mode 100644
index 68caf38..0000000
--- a/libjava/gnu/CORBA/NamingService/Binding_iterator_impl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_Binding_iterator_impl__
-#define __gnu_CORBA_NamingService_Binding_iterator_impl__
-
-#pragma interface
-
-#include <org/omg/CosNaming/_BindingIteratorImplBase.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class Binding_iterator_impl;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingHolder;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::Binding_iterator_impl : public ::org::omg::CosNaming::_BindingIteratorImplBase
-{
-
-public:
-  Binding_iterator_impl(JArray< ::org::omg::CosNaming::Binding * > *);
-  virtual void destroy();
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *);
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *);
-private:
-  static ::org::omg::CosNaming::Binding * no_more_bindings;
-  JArray< ::org::omg::CosNaming::Binding * > * __attribute__((aligned(__alignof__( ::org::omg::CosNaming::_BindingIteratorImplBase)))) bindings;
-  jint p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_Binding_iterator_impl__
diff --git a/libjava/gnu/CORBA/NamingService/Ext.h b/libjava/gnu/CORBA/NamingService/Ext.h
deleted file mode 100644
index ec385a0..0000000
--- a/libjava/gnu/CORBA/NamingService/Ext.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_Ext__
-#define __gnu_CORBA_NamingService_Ext__
-
-#pragma interface
-
-#include <org/omg/CosNaming/_NamingContextExtImplBase.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class Ext;
-          class NameTransformer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::Ext : public ::org::omg::CosNaming::_NamingContextExtImplBase
-{
-
-public:
-  Ext(::org::omg::CosNaming::NamingContext *);
-  virtual void _set_delegate(::org::omg::CORBA::portable::Delegate *);
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *);
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *);
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  virtual void destroy();
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *);
-  virtual ::org::omg::CosNaming::NamingContext * new_context();
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *);
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *);
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  virtual ::org::omg::CORBA::Object * resolve_str(::java::lang::String *);
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * to_name(::java::lang::String *);
-  virtual ::java::lang::String * to_string(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  virtual ::java::lang::String * to_url(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  ::org::omg::CosNaming::NamingContext * __attribute__((aligned(__alignof__( ::org::omg::CosNaming::_NamingContextExtImplBase)))) classic;
-  ::gnu::CORBA::NamingService::NameTransformer * converter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_Ext__
diff --git a/libjava/gnu/CORBA/NamingService/NameComponentComparator.h b/libjava/gnu/CORBA/NamingService/NameComponentComparator.h
deleted file mode 100644
index dbf3186..0000000
--- a/libjava/gnu/CORBA/NamingService/NameComponentComparator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NameComponentComparator__
-#define __gnu_CORBA_NamingService_NameComponentComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameComponentComparator;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NameComponentComparator : public ::java::lang::Object
-{
-
-  NameComponentComparator();
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-  jboolean equals(::java::lang::Object *);
-  static ::gnu::CORBA::NamingService::NameComponentComparator * singleton;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NameComponentComparator__
diff --git a/libjava/gnu/CORBA/NamingService/NameParser.h b/libjava/gnu/CORBA/NamingService/NameParser.h
deleted file mode 100644
index d5bff78..0000000
--- a/libjava/gnu/CORBA/NamingService/NameParser.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NameParser__
-#define __gnu_CORBA_NamingService_NameParser__
-
-#pragma interface
-
-#include <gnu/CORBA/NamingService/NameTransformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameParser;
-          class NameTransformer;
-      }
-        class OrbFunctional;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NameParser : public ::gnu::CORBA::NamingService::NameTransformer
-{
-
-public:
-  NameParser();
-  virtual ::org::omg::CORBA::Object * corbaloc(::java::lang::String *, ::gnu::CORBA::OrbFunctional *);
-private:
-  ::org::omg::CORBA::Object * corbaloc(::java::lang::String *, ::gnu::CORBA::OrbFunctional *, jint);
-public: // actually package-private
-  virtual ::java::lang::String * readFile(::java::lang::String *);
-  virtual ::java::lang::String * readUrl(::java::lang::String *);
-private:
-  ::org::omg::CORBA::Object * resolve(::org::omg::CORBA::Object *);
-  ::java::lang::String * readKey(::java::lang::String *);
-public: // actually package-private
-  static void corbalocT(::java::lang::String *, ::gnu::CORBA::OrbFunctional *);
-public:
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::String * pxCORBALOC;
-  static ::java::lang::String * pxCORBANAME;
-  static ::java::lang::String * pxIOR;
-  static ::java::lang::String * pxFILE;
-  static ::java::lang::String * pxFTP;
-  static ::java::lang::String * pxHTTP;
-  static ::java::lang::String * IIOP;
-  static ::java::lang::String * RIR;
-  static const jint DEFAULT_PORT = 2809;
-  static ::java::lang::String * DEFAULT_NAME;
-public: // actually package-private
-  static ::gnu::CORBA::NamingService::NameTransformer * converter;
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::NamingService::NameTransformer)))) p;
-  JArray< ::java::lang::String * > * t;
-  static ::gnu::CORBA::NamingService::NameParser * n;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NameParser__
diff --git a/libjava/gnu/CORBA/NamingService/NameTransformer.h b/libjava/gnu/CORBA/NamingService/NameTransformer.h
deleted file mode 100644
index 715ebc5..0000000
--- a/libjava/gnu/CORBA/NamingService/NameTransformer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NameTransformer__
-#define __gnu_CORBA_NamingService_NameTransformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameTransformer;
-      }
-    }
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class IntHolder;
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NameTransformer : public ::java::lang::Object
-{
-
-public:
-  NameTransformer();
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * toName(::java::lang::String *);
-  virtual ::java::lang::String * toString(JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  void appEscaping(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *);
-  void assertEndOfNode(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *);
-  ::org::omg::CosNaming::NameComponent * readNode(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *);
-  ::java::lang::String * readPart(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *);
-public:
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::String * ESCAPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NameTransformer__
diff --git a/libjava/gnu/CORBA/NamingService/NameValidator.h b/libjava/gnu/CORBA/NamingService/NameValidator.h
deleted file mode 100644
index 6ec0627..0000000
--- a/libjava/gnu/CORBA/NamingService/NameValidator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NameValidator__
-#define __gnu_CORBA_NamingService_NameValidator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameValidator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class NameComponent;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NameValidator : public ::java::lang::Object
-{
-
-public:
-  NameValidator();
-  static void check(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NameValidator__
diff --git a/libjava/gnu/CORBA/NamingService/NamingMap.h b/libjava/gnu/CORBA/NamingService/NamingMap.h
deleted file mode 100644
index 601a891..0000000
--- a/libjava/gnu/CORBA/NamingService/NamingMap.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NamingMap__
-#define __gnu_CORBA_NamingService_NamingMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NamingMap;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NamingMap : public ::java::lang::Object
-{
-
-public:
-  NamingMap();
-  virtual void bind(::org::omg::CosNaming::NameComponent *, ::org::omg::CORBA::Object *);
-  virtual jboolean containsKey(::org::omg::CosNaming::NameComponent *);
-  virtual jboolean containsValue(::org::omg::CORBA::Object *);
-  virtual ::java::util::Set * entries();
-  virtual ::org::omg::CORBA::Object * get(::org::omg::CosNaming::NameComponent *);
-  virtual void rebind(::org::omg::CosNaming::NameComponent *, ::org::omg::CORBA::Object *);
-  virtual void remove(::org::omg::CosNaming::NameComponent *);
-  virtual jint size();
-public: // actually protected
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NamingMap__
diff --git a/libjava/gnu/CORBA/NamingService/NamingServiceTransient$1.h b/libjava/gnu/CORBA/NamingService/NamingServiceTransient$1.h
deleted file mode 100644
index 97f99a4..0000000
--- a/libjava/gnu/CORBA/NamingService/NamingServiceTransient$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NamingServiceTransient$1__
-#define __gnu_CORBA_NamingService_NamingServiceTransient$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NamingServiceTransient$1;
-      }
-        class OrbFunctional;
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NamingServiceTransient$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  NamingServiceTransient$1(::gnu::CORBA::OrbFunctional *);
-public:
-  virtual void run();
-private:
-  ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) val$orb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NamingServiceTransient$1__
diff --git a/libjava/gnu/CORBA/NamingService/NamingServiceTransient.h b/libjava/gnu/CORBA/NamingService/NamingServiceTransient.h
deleted file mode 100644
index 78e2b46..0000000
--- a/libjava/gnu/CORBA/NamingService/NamingServiceTransient.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_NamingServiceTransient__
-#define __gnu_CORBA_NamingService_NamingServiceTransient__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NamingServiceTransient;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::NamingServiceTransient : public ::java::lang::Object
-{
-
-public:
-  NamingServiceTransient();
-  static JArray< jbyte > * getDefaultKey();
-  static void start(jint, ::java::lang::String *);
-  static const jint PORT = 900;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_NamingServiceTransient__
diff --git a/libjava/gnu/CORBA/NamingService/TransientContext.h b/libjava/gnu/CORBA/NamingService/TransientContext.h
deleted file mode 100644
index 1cdfe91..0000000
--- a/libjava/gnu/CORBA/NamingService/TransientContext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_NamingService_TransientContext__
-#define __gnu_CORBA_NamingService_TransientContext__
-
-#pragma interface
-
-#include <org/omg/CosNaming/_NamingContextImplBase.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NamingMap;
-          class TransientContext;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class BindingType;
-          class NameComponent;
-          class NamingContext;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::NamingService::TransientContext : public ::org::omg::CosNaming::_NamingContextImplBase
-{
-
-public:
-  TransientContext();
-  TransientContext(::gnu::CORBA::NamingService::NamingMap *, ::gnu::CORBA::NamingService::NamingMap *);
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *);
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *);
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  virtual void destroy();
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *);
-  virtual ::org::omg::CosNaming::NamingContext * new_context();
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *);
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *);
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  JArray< ::org::omg::CosNaming::NameComponent * > * getSuffix(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  ::org::omg::CosNaming::Binding * mkBinding(::java::lang::Object *, ::org::omg::CosNaming::BindingType *);
-  ::org::omg::CORBA::Object * resolveSubContext(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  static const jlong serialVersionUID = 2LL;
-public: // actually protected
-  ::gnu::CORBA::NamingService::NamingMap * __attribute__((aligned(__alignof__( ::org::omg::CosNaming::_NamingContextImplBase)))) named_contexts;
-  ::gnu::CORBA::NamingService::NamingMap * named_objects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_NamingService_TransientContext__
diff --git a/libjava/gnu/CORBA/ObjectCreator.h b/libjava/gnu/CORBA/ObjectCreator.h
deleted file mode 100644
index 5d66132..0000000
--- a/libjava/gnu/CORBA/ObjectCreator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ObjectCreator__
-#define __gnu_CORBA_ObjectCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace GIOP
-      {
-          class ServiceContext;
-      }
-        class ObjectCreator;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class SystemException;
-          class UserException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::ObjectCreator : public ::java::lang::Object
-{
-
-public:
-  ObjectCreator();
-  static ::java::lang::Object * createObject(::java::lang::String *, ::java::lang::String *);
-  static ::org::omg::CORBA::SystemException * readSystemException(::org::omg::CORBA::portable::InputStream *, JArray< ::gnu::CORBA::GIOP::ServiceContext * > *);
-  static ::org::omg::CORBA::UserException * readUserException(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *);
-  static ::java::lang::String * toHelperName(::java::lang::String *);
-  static void writeSystemException(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::SystemException *);
-public: // actually protected
-  static ::java::lang::String * toClassName(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::Class * Idl2class(::java::lang::String *);
-  static ::java::lang::Object * Idl2Object(::java::lang::String *);
-  static ::java::lang::String * getRepositoryId(::java::lang::Class *);
-  static jboolean insertWithHelper(::org::omg::CORBA::Any *, ::java::lang::Object *);
-  static jboolean insertSysException(::org::omg::CORBA::Any *, ::org::omg::CORBA::SystemException *);
-  static ::java::lang::String * getDefaultName(::java::lang::String *);
-  static void insertException(::org::omg::CORBA::Any *, ::java::lang::Throwable *);
-  static ::java::lang::Class * findHelper(::java::lang::String *);
-  static ::java::lang::Class * forName(::java::lang::String *);
-  static ::java::lang::String * OMG_PREFIX;
-  static ::java::lang::String * JAVA_PREFIX;
-  static ::java::lang::String * CLASSPATH_PREFIX;
-  static ::java::util::Map * m_names;
-  static ::java::util::Map * m_classes;
-  static ::java::util::Map * m_helpers;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ObjectCreator__
diff --git a/libjava/gnu/CORBA/OctetHolder.h b/libjava/gnu/CORBA/OctetHolder.h
deleted file mode 100644
index bfa0ca6..0000000
--- a/libjava/gnu/CORBA/OctetHolder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OctetHolder__
-#define __gnu_CORBA_OctetHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OctetHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::OctetHolder : public ::java::lang::Object
-{
-
-public:
-  OctetHolder();
-  OctetHolder(jbyte);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-private:
-  static ::org::omg::CORBA::TypeCode * t_octet;
-public:
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OctetHolder__
diff --git a/libjava/gnu/CORBA/OrbFocused.h b/libjava/gnu/CORBA/OrbFocused.h
deleted file mode 100644
index ec756ea..0000000
--- a/libjava/gnu/CORBA/OrbFocused.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFocused__
-#define __gnu_CORBA_OrbFocused__
-
-#pragma interface
-
-#include <gnu/CORBA/Poa/ORB_1_4.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-        class OrbFocused;
-        class OrbFunctional$portServer;
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::OrbFocused : public ::gnu::CORBA::Poa::ORB_1_4
-{
-
-public:
-  OrbFocused();
-  virtual void setPortRange(::java::lang::String *);
-  virtual void setPortRange(jint, jint);
-public: // actually package-private
-  virtual jint getPortFromRange(jint);
-public: // actually protected
-  virtual ::gnu::CORBA::OrbFunctional$portServer * getPortServer(jint);
-public:
-  virtual void run();
-  virtual jint getFreePort();
-  virtual void connect_1_thread(::org::omg::CORBA::Object *, JArray< jbyte > *, ::java::lang::Object *);
-  virtual void startService(::gnu::CORBA::IOR *);
-public: // actually protected
-  virtual void set_parameters(::java::applet::Applet *, ::java::util::Properties *);
-  virtual void set_parameters(JArray< ::java::lang::String * > *, ::java::util::Properties *);
-  virtual void useProperties(::java::util::Properties *);
-public:
-  static ::java::lang::String * LISTENER_PORT;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::Poa::ORB_1_4)))) m_ports_from;
-  jint m_ports_to;
-  static const jint PARALLEL = 0;
-  static const jint SEQUENTIAL = 1;
-  ::java::util::Random * m_random;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFocused__
diff --git a/libjava/gnu/CORBA/OrbFunctional$1.h b/libjava/gnu/CORBA/OrbFunctional$1.h
deleted file mode 100644
index c84857d..0000000
--- a/libjava/gnu/CORBA/OrbFunctional$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFunctional$1__
-#define __gnu_CORBA_OrbFunctional$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OrbFunctional;
-        class OrbFunctional$1;
-    }
-  }
-}
-
-class gnu::CORBA::OrbFunctional$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  OrbFunctional$1(::gnu::CORBA::OrbFunctional *, ::gnu::CORBA::OrbFunctional *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-private:
-  ::gnu::CORBA::OrbFunctional * val$THIS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFunctional$1__
diff --git a/libjava/gnu/CORBA/OrbFunctional$2.h b/libjava/gnu/CORBA/OrbFunctional$2.h
deleted file mode 100644
index 18bd701..0000000
--- a/libjava/gnu/CORBA/OrbFunctional$2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFunctional$2__
-#define __gnu_CORBA_OrbFunctional$2__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OrbFunctional;
-        class OrbFunctional$2;
-        class OrbFunctional$portServer;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::CORBA::OrbFunctional$2 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  OrbFunctional$2(::gnu::CORBA::OrbFunctional *, ::gnu::CORBA::OrbFunctional$portServer *, ::java::net::Socket *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-private:
-  ::gnu::CORBA::OrbFunctional$portServer * val$p;
-  ::java::net::Socket * val$service;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFunctional$2__
diff --git a/libjava/gnu/CORBA/OrbFunctional$portServer.h b/libjava/gnu/CORBA/OrbFunctional$portServer.h
deleted file mode 100644
index 0ea05cb..0000000
--- a/libjava/gnu/CORBA/OrbFunctional$portServer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFunctional$portServer__
-#define __gnu_CORBA_OrbFunctional$portServer__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OrbFunctional;
-        class OrbFunctional$portServer;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-  }
-}
-
-class gnu::CORBA::OrbFunctional$portServer : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  OrbFunctional$portServer(::gnu::CORBA::OrbFunctional *, jint);
-public:
-  virtual void run();
-public: // actually package-private
-  virtual void tick();
-public:
-  virtual void close_now();
-public: // actually protected
-  virtual void finalize();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Thread)))) running_threads;
-  jint s_port;
-  ::java::net::ServerSocket * service;
-  jboolean terminated;
-  ::gnu::CORBA::OrbFunctional * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFunctional$portServer__
diff --git a/libjava/gnu/CORBA/OrbFunctional$sharedPortServer.h b/libjava/gnu/CORBA/OrbFunctional$sharedPortServer.h
deleted file mode 100644
index c065896..0000000
--- a/libjava/gnu/CORBA/OrbFunctional$sharedPortServer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFunctional$sharedPortServer__
-#define __gnu_CORBA_OrbFunctional$sharedPortServer__
-
-#pragma interface
-
-#include <gnu/CORBA/OrbFunctional$portServer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OrbFunctional;
-        class OrbFunctional$sharedPortServer;
-    }
-  }
-}
-
-class gnu::CORBA::OrbFunctional$sharedPortServer : public ::gnu::CORBA::OrbFunctional$portServer
-{
-
-public: // actually package-private
-  OrbFunctional$sharedPortServer(::gnu::CORBA::OrbFunctional *, jint);
-  virtual void tick();
-  ::gnu::CORBA::OrbFunctional * __attribute__((aligned(__alignof__( ::gnu::CORBA::OrbFunctional$portServer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFunctional$sharedPortServer__
diff --git a/libjava/gnu/CORBA/OrbFunctional.h b/libjava/gnu/CORBA/OrbFunctional.h
deleted file mode 100644
index de00543..0000000
--- a/libjava/gnu/CORBA/OrbFunctional.h
+++ /dev/null
@@ -1,167 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbFunctional__
-#define __gnu_CORBA_OrbFunctional__
-
-#pragma interface
-
-#include <gnu/CORBA/OrbRestricted.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Asynchron;
-        class Connected_objects;
-        class Connected_objects$cObject;
-      namespace GIOP
-      {
-          class MessageHeader;
-          class RequestHeader;
-      }
-        class IOR;
-      namespace NamingService
-      {
-          class NameParser;
-      }
-        class OrbFunctional;
-        class OrbFunctional$portServer;
-      namespace Poa
-      {
-          class gnuForwardRequest;
-      }
-        class ResponseHandlerImpl;
-        class Version;
-      namespace interfaces
-      {
-          class SocketFactory;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-    namespace net
-    {
-        class ServerSocket;
-        class Socket;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-          class Request;
-          class SystemException;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::OrbFunctional : public ::gnu::CORBA::OrbRestricted
-{
-
-public:
-  OrbFunctional();
-  virtual void setMaxVersion(::gnu::CORBA::Version *);
-  virtual ::gnu::CORBA::Version * getMaxVersion();
-  virtual jint getFreePort();
-  static void setPort(jint);
-  virtual void connect(::org::omg::CORBA::Object *);
-  virtual void connect(::org::omg::CORBA::Object *, JArray< jbyte > *);
-  virtual void connect_1_thread(::org::omg::CORBA::Object *, JArray< jbyte > *, ::java::lang::Object *);
-  virtual void startService(::gnu::CORBA::IOR *);
-  virtual void destroy();
-  virtual void disconnect(::org::omg::CORBA::Object *);
-  virtual void identityDestroyed(::java::lang::Object *);
-  virtual ::org::omg::CORBA::Object * find_local_object(::gnu::CORBA::IOR *);
-  virtual JArray< ::java::lang::String * > * list_initial_services();
-  virtual ::java::lang::String * object_to_string(::org::omg::CORBA::Object *);
-  virtual ::gnu::CORBA::IOR * getLocalIor(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *);
-  virtual void run();
-  virtual void ensureRunning();
-  virtual void shutdown(jboolean);
-  virtual ::org::omg::CORBA::Object * string_to_object(::java::lang::String *);
-  virtual ::org::omg::CORBA::Object * ior_to_object(::gnu::CORBA::IOR *);
-public: // actually protected
-  virtual ::org::omg::CORBA::Object * getDefaultNameService();
-  virtual ::org::omg::CORBA::Object * find_connected_object(JArray< jbyte > *, jint);
-  virtual void set_parameters(::java::applet::Applet *, ::java::util::Properties *);
-  virtual void set_parameters(JArray< ::java::lang::String * > *, ::java::util::Properties *);
-  virtual ::gnu::CORBA::IOR * createIOR(::gnu::CORBA::Connected_objects$cObject *);
-  virtual void prepareObject(::org::omg::CORBA::Object *, ::gnu::CORBA::IOR *);
-private:
-  void respond_to_client(::java::io::OutputStream *, ::gnu::CORBA::GIOP::MessageHeader *, ::gnu::CORBA::GIOP::RequestHeader *, ::gnu::CORBA::ResponseHandlerImpl *, ::org::omg::CORBA::SystemException *);
-  void forward_request(::java::io::OutputStream *, ::gnu::CORBA::GIOP::MessageHeader *, ::gnu::CORBA::GIOP::RequestHeader *, ::gnu::CORBA::Poa::gnuForwardRequest *);
-public: // actually package-private
-  virtual void serve(::gnu::CORBA::OrbFunctional$portServer *, ::java::net::ServerSocket *);
-  virtual void serveStep(::java::net::Socket *, jboolean);
-public: // actually protected
-  virtual void useProperties(::java::util::Properties *);
-public:
-  virtual ::org::omg::CORBA::Request * get_next_response();
-  virtual jboolean poll_next_response();
-  virtual void send_multiple_requests_deferred(JArray< ::org::omg::CORBA::Request * > *);
-  virtual void send_multiple_requests_oneway(JArray< ::org::omg::CORBA::Request * > *);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual jint countConnectedObjects();
-  static jint DEFAULT_INITIAL_PORT;
-  static jint RANDOM_PORT_FROM;
-  static jint RANDOM_PORT_TO;
-  static jint RANDOM_PORT_ATTEMPTS;
-  static ::java::lang::String * LISTEN_ON;
-  static ::java::lang::String * REFERENCE;
-  static ::java::lang::String * NS_PORT;
-  static ::java::lang::String * NS_HOST;
-  static ::java::lang::String * NAME_SERVICE;
-  static ::java::lang::String * ORB_ID;
-  static ::java::lang::String * SERVER_ID;
-  static ::java::lang::String * START_READING_MESSAGE;
-  static ::java::lang::String * WHILE_READING;
-  static ::java::lang::String * AFTER_RECEIVING;
-  static ::java::lang::String * SERVER_ERROR_PAUSE;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::CORBA::OrbRestricted)))) LOCAL_HOST;
-  jint TOUT_START_READING_MESSAGE;
-  jint TOUT_WHILE_READING;
-  jint TOUT_AFTER_RECEIVING;
-  jint TWAIT_SERVER_ERROR_PAUSE;
-  static jint TANDEM_REQUESTS;
-  ::java::lang::String * orb_id;
-  static ::java::lang::String * server_id;
-public: // actually protected
-  ::gnu::CORBA::Connected_objects * connected_objects;
-  ::gnu::CORBA::Version * max_version;
-  jboolean running;
-  ::java::util::Map * initial_references;
-  ::java::util::ArrayList * portServers;
-private:
-  ::java::lang::String * ns_host;
-  static jint Port;
-  jint ns_port;
-public: // actually package-private
-  ::gnu::CORBA::NamingService::NameParser * nameParser;
-public: // actually protected
-  ::gnu::CORBA::Asynchron * asynchron;
-  ::java::util::LinkedList * freed_ports;
-  ::java::util::Hashtable * identities;
-private:
-  jint MAX_RUNNING_THREADS;
-public:
-  ::gnu::CORBA::interfaces::SocketFactory * socketFactory;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbFunctional__
diff --git a/libjava/gnu/CORBA/OrbRestricted.h b/libjava/gnu/CORBA/OrbRestricted.h
deleted file mode 100644
index 5f8d51e..0000000
--- a/libjava/gnu/CORBA/OrbRestricted.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_OrbRestricted__
-#define __gnu_CORBA_OrbRestricted__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/ORB.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class OrbRestricted;
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class Environment;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Request;
-          class StructMember;
-          class TCKind;
-          class TypeCode;
-          class UnionMember;
-        namespace portable
-        {
-            class OutputStream;
-            class ValueFactory;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInterceptorOperations;
-          class IORInterceptor_3_0Operations;
-          class ServerRequestInterceptorOperations;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::OrbRestricted : public ::org::omg::CORBA_2_3::ORB
-{
-
-public: // actually protected
-  OrbRestricted();
-public:
-  virtual ::org::omg::CORBA::TypeCode * create_alias_tc(::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::Any * create_any();
-  virtual ::org::omg::CORBA::TypeCode * create_array_tc(jint, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::ContextList * create_context_list();
-  virtual ::org::omg::CORBA::TypeCode * create_enum_tc(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::org::omg::CORBA::Environment * create_environment();
-  virtual ::org::omg::CORBA::ExceptionList * create_exception_list();
-  virtual ::org::omg::CORBA::TypeCode * create_exception_tc(::java::lang::String *, ::java::lang::String *, JArray< ::org::omg::CORBA::StructMember * > *);
-  virtual ::org::omg::CORBA::TypeCode * create_interface_tc(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::NVList * create_list(jint);
-  virtual ::org::omg::CORBA::NamedValue * create_named_value(::java::lang::String *, ::org::omg::CORBA::Any *, jint);
-  virtual ::org::omg::CORBA::portable::OutputStream * create_output_stream();
-  virtual ::org::omg::CORBA::TypeCode * create_sequence_tc(jint, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * create_string_tc(jint);
-  virtual ::org::omg::CORBA::TypeCode * create_struct_tc(::java::lang::String *, ::java::lang::String *, JArray< ::org::omg::CORBA::StructMember * > *);
-  virtual ::org::omg::CORBA::TypeCode * create_union_tc(::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *, JArray< ::org::omg::CORBA::UnionMember * > *);
-  virtual ::org::omg::CORBA::TypeCode * create_wstring_tc(jint);
-  virtual ::org::omg::CORBA::TypeCode * get_primitive_tc(::org::omg::CORBA::TCKind *);
-  virtual JArray< ::java::lang::String * > * list_initial_services();
-  virtual ::java::lang::String * object_to_string(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *);
-  virtual void run();
-  virtual void shutdown(jboolean);
-  virtual ::org::omg::CORBA::Object * string_to_object(::java::lang::String *);
-public: // actually protected
-  virtual void set_parameters(::java::applet::Applet *, ::java::util::Properties *);
-  virtual void set_parameters(JArray< ::java::lang::String * > *, ::java::util::Properties *);
-private:
-  void no();
-public:
-  virtual ::org::omg::CORBA::Request * get_next_response();
-  virtual jboolean poll_next_response();
-  virtual void send_multiple_requests_deferred(JArray< ::org::omg::CORBA::Request * > *);
-  virtual void send_multiple_requests_oneway(JArray< ::org::omg::CORBA::Request * > *);
-  virtual ::org::omg::CORBA::portable::ValueFactory * register_value_factory(::java::lang::String *, ::org::omg::CORBA::portable::ValueFactory *);
-  virtual void unregister_value_factory(::java::lang::String *);
-  virtual ::org::omg::CORBA::portable::ValueFactory * lookup_value_factory(::java::lang::String *);
-  virtual void destroy();
-  virtual ::org::omg::CORBA::TypeCode * create_recursive_sequence_tc(jint, jint);
-  virtual ::org::omg::CORBA::Context * get_default_context();
-  static ::org::omg::CORBA::ORB * Singleton;
-  ::org::omg::PortableInterceptor::IORInterceptor_3_0Operations * __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::ORB)))) iIor;
-  ::org::omg::PortableInterceptor::ServerRequestInterceptorOperations * iServer;
-  ::org::omg::PortableInterceptor::ClientRequestInterceptorOperations * iClient;
-  jint icSlotSize;
-public: // actually protected
-  ::java::util::Hashtable * factories;
-  ::java::util::Hashtable * policyFactories;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_OrbRestricted__
diff --git a/libjava/gnu/CORBA/Poa/AOM$Obj.h b/libjava/gnu/CORBA/Poa/AOM$Obj.h
deleted file mode 100644
index 67ee7df..0000000
--- a/libjava/gnu/CORBA/Poa/AOM$Obj.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_AOM$Obj__
-#define __gnu_CORBA_Poa_AOM$Obj__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class AOM;
-          class AOM$Obj;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class Servant;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::AOM$Obj : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AOM$Obj(::gnu::CORBA::Poa::AOM *, ::gnu::CORBA::Poa::gnuServantObject *, JArray< jbyte > *, ::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::gnuPOA *);
-public:
-  virtual void setServant(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::PortableServer::Servant * getServant();
-  virtual jboolean isDeactiveted();
-  virtual void setDeactivated(jboolean);
-  ::gnu::CORBA::Poa::gnuServantObject * __attribute__((aligned(__alignof__( ::java::lang::Object)))) object;
-  ::org::omg::PortableServer::Servant * servant;
-public: // actually package-private
-  ::org::omg::PortableServer::Servant * primary_servant;
-public:
-  ::gnu::CORBA::Poa::gnuPOA * poa;
-  JArray< jbyte > * key;
-  jboolean deactivated;
-public: // actually package-private
-  ::gnu::CORBA::Poa::AOM * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_AOM$Obj__
diff --git a/libjava/gnu/CORBA/Poa/AOM.h b/libjava/gnu/CORBA/Poa/AOM.h
deleted file mode 100644
index 3c19649..0000000
--- a/libjava/gnu/CORBA/Poa/AOM.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_AOM__
-#define __gnu_CORBA_Poa_AOM__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class AOM;
-          class AOM$Obj;
-          class ServantDelegateImpl;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace PortableServer
-      {
-          class Servant;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::AOM : public ::java::lang::Object
-{
-
-public:
-  AOM();
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findObject(::org::omg::CORBA::Object *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findServant(::org::omg::PortableServer::Servant *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findServant(::org::omg::PortableServer::Servant *, jboolean);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * add(::gnu::CORBA::Poa::gnuServantObject *, ::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::gnuPOA *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * add(JArray< jbyte > *, ::gnu::CORBA::Poa::gnuServantObject *, ::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::gnuPOA *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * add(::gnu::CORBA::Poa::ServantDelegateImpl *);
-  virtual void put(::gnu::CORBA::Poa::AOM$Obj *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * get(JArray< jbyte > *);
-  virtual ::java::util::Set * keySet();
-  virtual void remove(JArray< jbyte > *);
-public: // actually protected
-  virtual JArray< jbyte > * generateObjectKey(::org::omg::CORBA::Object *);
-public:
-  static JArray< jbyte > * getFreeId();
-private:
-  static jlong free_id;
-public: // actually package-private
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) objects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_AOM__
diff --git a/libjava/gnu/CORBA/Poa/AccessiblePolicy.h b/libjava/gnu/CORBA/Poa/AccessiblePolicy.h
deleted file mode 100644
index 54d1421..0000000
--- a/libjava/gnu/CORBA/Poa/AccessiblePolicy.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_AccessiblePolicy__
-#define __gnu_CORBA_Poa_AccessiblePolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class AccessiblePolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::AccessiblePolicy : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual jint getCode() = 0;
-  virtual ::org::omg::CORBA::Request * _create_request(::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *) = 0;
-  virtual ::org::omg::CORBA::Request * _create_request(::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *, ::org::omg::CORBA::ExceptionList *, ::org::omg::CORBA::ContextList *) = 0;
-  virtual ::org::omg::CORBA::Object * _duplicate() = 0;
-  virtual JArray< ::org::omg::CORBA::DomainManager * > * _get_domain_managers() = 0;
-  virtual ::org::omg::CORBA::Object * _get_interface_def() = 0;
-  virtual ::org::omg::CORBA::Policy * _get_policy(jint) = 0;
-  virtual jint _hash(jint) = 0;
-  virtual jboolean _is_a(::java::lang::String *) = 0;
-  virtual jboolean _is_equivalent(::org::omg::CORBA::Object *) = 0;
-  virtual jboolean _non_existent() = 0;
-  virtual void _release() = 0;
-  virtual ::org::omg::CORBA::Request * _request(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Object * _set_policy_override(JArray< ::org::omg::CORBA::Policy * > *, ::org::omg::CORBA::SetOverrideType *) = 0;
-  virtual ::org::omg::CORBA::Policy * copy() = 0;
-  virtual void destroy() = 0;
-  virtual jint policy_type() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_Poa_AccessiblePolicy__
diff --git a/libjava/gnu/CORBA/Poa/DynamicImpHandler.h b/libjava/gnu/CORBA/Poa/DynamicImpHandler.h
deleted file mode 100644
index e5750aa..0000000
--- a/libjava/gnu/CORBA/Poa/DynamicImpHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_DynamicImpHandler__
-#define __gnu_CORBA_Poa_DynamicImpHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class DynamicImpHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace PortableServer
-      {
-          class DynamicImplementation;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::DynamicImpHandler : public ::java::lang::Object
-{
-
-public:
-  DynamicImpHandler(::org::omg::PortableServer::DynamicImplementation *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  ::org::omg::PortableServer::DynamicImplementation * __attribute__((aligned(__alignof__( ::java::lang::Object)))) servant;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_DynamicImpHandler__
diff --git a/libjava/gnu/CORBA/Poa/ForwardRequestHolder.h b/libjava/gnu/CORBA/Poa/ForwardRequestHolder.h
deleted file mode 100644
index 5280da1..0000000
--- a/libjava/gnu/CORBA/Poa/ForwardRequestHolder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_ForwardRequestHolder__
-#define __gnu_CORBA_Poa_ForwardRequestHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class ForwardRequestHolder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class ForwardRequest;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::ForwardRequestHolder : public ::java::lang::Object
-{
-
-public:
-  ForwardRequestHolder();
-  ForwardRequestHolder(::org::omg::PortableServer::ForwardRequest *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::PortableServer::ForwardRequest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_ForwardRequestHolder__
diff --git a/libjava/gnu/CORBA/Poa/ForwardedServant.h b/libjava/gnu/CORBA/Poa/ForwardedServant.h
deleted file mode 100644
index 46b24050..0000000
--- a/libjava/gnu/CORBA/Poa/ForwardedServant.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_ForwardedServant__
-#define __gnu_CORBA_Poa_ForwardedServant__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class ForwardedServant;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class ObjectImpl;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::ForwardedServant : public ::org::omg::PortableServer::Servant
-{
-
-public: // actually package-private
-  ForwardedServant(::org::omg::CORBA::portable::ObjectImpl *);
-public:
-  static ::org::omg::PortableServer::Servant * create(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  virtual JArray< ::java::lang::String * > * _all_interfaces(::org::omg::PortableServer::POA *, JArray< jbyte > *);
-  ::org::omg::CORBA::portable::ObjectImpl * __attribute__((aligned(__alignof__( ::org::omg::PortableServer::Servant)))) ref;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_ForwardedServant__
diff --git a/libjava/gnu/CORBA/Poa/InvalidPolicyHolder.h b/libjava/gnu/CORBA/Poa/InvalidPolicyHolder.h
deleted file mode 100644
index 80b1533..0000000
--- a/libjava/gnu/CORBA/Poa/InvalidPolicyHolder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_InvalidPolicyHolder__
-#define __gnu_CORBA_Poa_InvalidPolicyHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class InvalidPolicyHolder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class InvalidPolicy;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::InvalidPolicyHolder : public ::java::lang::Object
-{
-
-public:
-  InvalidPolicyHolder();
-  InvalidPolicyHolder(::org::omg::PortableServer::POAPackage::InvalidPolicy *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableServer::POAPackage::InvalidPolicy * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_InvalidPolicyHolder__
diff --git a/libjava/gnu/CORBA/Poa/LocalDelegate.h b/libjava/gnu/CORBA/Poa/LocalDelegate.h
deleted file mode 100644
index 4baca2e..0000000
--- a/libjava/gnu/CORBA/Poa/LocalDelegate.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_LocalDelegate__
-#define __gnu_CORBA_Poa_LocalDelegate__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/Delegate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-      namespace Poa
-      {
-          class LocalDelegate;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Request;
-        namespace portable
-        {
-            class InputStream;
-            class InvokeHandler;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::LocalDelegate : public ::org::omg::CORBA_2_3::portable::Delegate
-{
-
-public:
-  LocalDelegate(::gnu::CORBA::Poa::gnuServantObject *, ::gnu::CORBA::Poa::gnuPOA *, JArray< jbyte > *);
-  virtual ::gnu::CORBA::IOR * getIor();
-  virtual ::org::omg::CORBA::Request * request(::org::omg::CORBA::Object *, ::java::lang::String *);
-  virtual void release(::org::omg::CORBA::Object *);
-  virtual jboolean is_equivalent(::org::omg::CORBA::Object *, ::org::omg::CORBA::Object *);
-  virtual jboolean non_existent(::org::omg::CORBA::Object *);
-  virtual jint hash(::org::omg::CORBA::Object *, jint);
-  virtual jboolean is_a(::org::omg::CORBA::Object *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::Object * duplicate(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *, ::org::omg::CORBA::ExceptionList *, ::org::omg::CORBA::ContextList *);
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *);
-  virtual ::org::omg::CORBA::Object * get_interface_def(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::portable::OutputStream * request(::org::omg::CORBA::Object *, ::java::lang::String *, jboolean);
-  virtual ::org::omg::CORBA::portable::InvokeHandler * getHandler(::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *);
-  virtual ::org::omg::CORBA::ORB * orb(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::portable::InputStream * invoke(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::OutputStream *);
-  virtual void releaseReply(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::InputStream *);
-public: // actually package-private
-  ::gnu::CORBA::Poa::gnuServantObject * __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::Delegate)))) object;
-  ::java::lang::String * operation;
-public:
-  ::gnu::CORBA::Poa::gnuPOA * poa;
-public: // actually package-private
-  JArray< jbyte > * Id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_LocalDelegate__
diff --git a/libjava/gnu/CORBA/Poa/LocalRequest.h b/libjava/gnu/CORBA/Poa/LocalRequest.h
deleted file mode 100644
index 8d78931..0000000
--- a/libjava/gnu/CORBA/Poa/LocalRequest.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_LocalRequest__
-#define __gnu_CORBA_Poa_LocalRequest__
-
-#pragma interface
-
-#include <gnu/CORBA/gnuRequest.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-      }
-      namespace GIOP
-      {
-          class MessageHeader;
-      }
-      namespace Poa
-      {
-          class LocalRequest;
-          class LocalServerRequest;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-        class StreamBasedRequest;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class InvokeHandler;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::LocalRequest : public ::gnu::CORBA::gnuRequest
-{
-
-public:
-  LocalRequest(::gnu::CORBA::Poa::gnuServantObject *, ::gnu::CORBA::Poa::gnuPOA *, JArray< jbyte > *);
-public: // actually package-private
-  virtual ::org::omg::CORBA::portable::InputStream * s_invoke(::org::omg::CORBA::portable::InvokeHandler *);
-public:
-  virtual ::org::omg::CORBA::portable::InputStream * v_invoke(::org::omg::CORBA::portable::InvokeHandler *);
-  virtual void invoke();
-  virtual ::org::omg::CORBA::portable::OutputStream * createExceptionReply();
-  virtual ::org::omg::CORBA::portable::OutputStream * createReply();
-public: // actually package-private
-  virtual ::gnu::CORBA::CDR::BufferedCdrOutput * getBuffer();
-  virtual jboolean isExceptionReply();
-private:
-  void prepareStream();
-public:
-  virtual ::gnu::CORBA::StreamBasedRequest * getParameterStream();
-  virtual JArray< jbyte > * get_object_id();
-  virtual ::org::omg::PortableServer::POA * get_POA();
-public: // actually package-private
-  ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder * __attribute__((aligned(__alignof__( ::gnu::CORBA::gnuRequest)))) cookie;
-  JArray< jbyte > * Id;
-private:
-  static ::gnu::CORBA::GIOP::MessageHeader * header;
-public: // actually package-private
-  jboolean exceptionReply;
-  ::gnu::CORBA::CDR::BufferedCdrOutput * buffer;
-  ::gnu::CORBA::Poa::gnuPOA * poa;
-  ::gnu::CORBA::Poa::gnuServantObject * object;
-  ::gnu::CORBA::Poa::LocalServerRequest * serverRequest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_LocalRequest__
diff --git a/libjava/gnu/CORBA/Poa/LocalServerRequest.h b/libjava/gnu/CORBA/Poa/LocalServerRequest.h
deleted file mode 100644
index a779429..0000000
--- a/libjava/gnu/CORBA/Poa/LocalServerRequest.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_LocalServerRequest__
-#define __gnu_CORBA_Poa_LocalServerRequest__
-
-#pragma interface
-
-#include <org/omg/CORBA/ServerRequest.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class LocalRequest;
-          class LocalServerRequest;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class NVList;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::LocalServerRequest : public ::org::omg::CORBA::ServerRequest
-{
-
-public:
-  LocalServerRequest(::gnu::CORBA::Poa::LocalRequest *);
-  virtual void params(::org::omg::CORBA::NVList *);
-  virtual ::org::omg::CORBA::Context * ctx();
-  virtual ::java::lang::String * operation();
-  virtual void arguments(::org::omg::CORBA::NVList *);
-  virtual void set_result(::org::omg::CORBA::Any *);
-  virtual ::java::lang::String * op_name();
-  virtual void set_exception(::org::omg::CORBA::Any *);
-  virtual void result(::org::omg::CORBA::Any *);
-  virtual void except(::org::omg::CORBA::Any *);
-public: // actually package-private
-  ::gnu::CORBA::Poa::LocalRequest * __attribute__((aligned(__alignof__( ::org::omg::CORBA::ServerRequest)))) request;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_LocalServerRequest__
diff --git a/libjava/gnu/CORBA/Poa/ORB_1_4.h b/libjava/gnu/CORBA/Poa/ORB_1_4.h
deleted file mode 100644
index 8e62bbe..0000000
--- a/libjava/gnu/CORBA/Poa/ORB_1_4.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_ORB_1_4__
-#define __gnu_CORBA_Poa_ORB_1_4__
-
-#pragma interface
-
-#include <gnu/CORBA/OrbFunctional.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Connected_objects$cObject;
-      namespace DynAn
-      {
-          class gnuDynAnyFactory;
-      }
-        class IOR;
-      namespace Interceptor
-      {
-          class gnuIcCurrent;
-      }
-      namespace Poa
-      {
-          class ORB_1_4;
-          class gnuPOA;
-          class gnuPoaCurrent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Policy;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::ORB_1_4 : public ::gnu::CORBA::OrbFunctional
-{
-
-public:
-  ORB_1_4();
-  virtual ::java::lang::String * object_to_string(::org::omg::CORBA::Object *);
-  virtual void destroy();
-public: // actually protected
-  virtual void registerInterceptors(::java::util::Properties *, JArray< ::java::lang::String * > *);
-  virtual ::gnu::CORBA::IOR * createIOR(::gnu::CORBA::Connected_objects$cObject *);
-public:
-  virtual ::org::omg::CORBA::Policy * create_policy(jint, ::org::omg::CORBA::Any *);
-public: // actually protected
-  virtual void set_parameters(::java::applet::Applet *, ::java::util::Properties *);
-  virtual void set_parameters(JArray< ::java::lang::String * > *, ::java::util::Properties *);
-public:
-  virtual void set_delegate(::java::lang::Object *);
-  ::gnu::CORBA::Poa::gnuPOA * __attribute__((aligned(__alignof__( ::gnu::CORBA::OrbFunctional)))) rootPOA;
-  ::gnu::CORBA::Poa::gnuPoaCurrent * currents;
-  ::gnu::CORBA::Interceptor::gnuIcCurrent * ic_current;
-  ::gnu::CORBA::DynAn::gnuDynAnyFactory * factory;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_ORB_1_4__
diff --git a/libjava/gnu/CORBA/Poa/ServantDelegateImpl.h b/libjava/gnu/CORBA/Poa/ServantDelegateImpl.h
deleted file mode 100644
index e5fbd56..0000000
--- a/libjava/gnu/CORBA/Poa/ServantDelegateImpl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_ServantDelegateImpl__
-#define __gnu_CORBA_Poa_ServantDelegateImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class ServantDelegateImpl;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::ServantDelegateImpl : public ::java::lang::Object
-{
-
-public:
-  ServantDelegateImpl(::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::gnuPOA *, JArray< jbyte > *);
-  virtual jboolean is_a(::org::omg::PortableServer::Servant *, ::java::lang::String *);
-  virtual ::org::omg::PortableServer::POA * default_POA(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::CORBA::ORB * orb(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::CORBA::Object * this_object(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::CORBA::Object * get_interface_def(::org::omg::PortableServer::Servant *);
-  virtual JArray< jbyte > * object_id(::org::omg::PortableServer::Servant *);
-  virtual jboolean non_existent(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::PortableServer::POA * poa(::org::omg::PortableServer::Servant *);
-public: // actually package-private
-  virtual void same(::org::omg::PortableServer::Servant *);
-  ::org::omg::PortableServer::Servant * __attribute__((aligned(__alignof__( ::java::lang::Object)))) servant;
-  JArray< jbyte > * servant_id;
-  ::gnu::CORBA::Poa::gnuPOA * poa__;
-  ::gnu::CORBA::Poa::gnuServantObject * object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_ServantDelegateImpl__
diff --git a/libjava/gnu/CORBA/Poa/StandardPolicies.h b/libjava/gnu/CORBA/Poa/StandardPolicies.h
deleted file mode 100644
index 6b7f920..0000000
--- a/libjava/gnu/CORBA/Poa/StandardPolicies.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_StandardPolicies__
-#define __gnu_CORBA_Poa_StandardPolicies__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class AccessiblePolicy;
-          class StandardPolicies;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::StandardPolicies : public ::java::lang::Object
-{
-
-public:
-  StandardPolicies();
-  static JArray< ::org::omg::CORBA::Policy * > * rootPoa();
-  static JArray< ::org::omg::CORBA::Policy * > * withDefault(JArray< ::org::omg::CORBA::Policy * > *);
-private:
-  static JArray< ::gnu::CORBA::Poa::AccessiblePolicy * > * rootPOASet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_StandardPolicies__
diff --git a/libjava/gnu/CORBA/Poa/gnuAdapterActivator.h b/libjava/gnu/CORBA/Poa/gnuAdapterActivator.h
deleted file mode 100644
index b190e48..0000000
--- a/libjava/gnu/CORBA/Poa/gnuAdapterActivator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuAdapterActivator__
-#define __gnu_CORBA_Poa_gnuAdapterActivator__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuAdapterActivator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuAdapterActivator : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuAdapterActivator();
-  virtual jboolean unknown_adapter(::org::omg::PortableServer::POA *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuAdapterActivator__
diff --git a/libjava/gnu/CORBA/Poa/gnuForwardRequest.h b/libjava/gnu/CORBA/Poa/gnuForwardRequest.h
deleted file mode 100644
index 4609dcd..0000000
--- a/libjava/gnu/CORBA/Poa/gnuForwardRequest.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuForwardRequest__
-#define __gnu_CORBA_Poa_gnuForwardRequest__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuForwardRequest;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class ObjectImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuForwardRequest : public ::java::lang::RuntimeException
-{
-
-public:
-  gnuForwardRequest(::org::omg::CORBA::Object *);
-private:
-  static const jlong serialVersionUID = -1LL;
-public:
-  ::org::omg::CORBA::portable::ObjectImpl * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) forward_reference;
-  jbyte forwarding_code;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuForwardRequest__
diff --git a/libjava/gnu/CORBA/Poa/gnuIdAssignmentPolicy.h b/libjava/gnu/CORBA/Poa/gnuIdAssignmentPolicy.h
deleted file mode 100644
index fd54bd3..0000000
--- a/libjava/gnu/CORBA/Poa/gnuIdAssignmentPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuIdAssignmentPolicy__
-#define __gnu_CORBA_Poa_gnuIdAssignmentPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuIdAssignmentPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class IdAssignmentPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuIdAssignmentPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuIdAssignmentPolicy(::org::omg::PortableServer::IdAssignmentPolicyValue *);
-  virtual ::org::omg::PortableServer::IdAssignmentPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuIdAssignmentPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuIdUniquenessPolicy.h b/libjava/gnu/CORBA/Poa/gnuIdUniquenessPolicy.h
deleted file mode 100644
index 563f1e3..0000000
--- a/libjava/gnu/CORBA/Poa/gnuIdUniquenessPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuIdUniquenessPolicy__
-#define __gnu_CORBA_Poa_gnuIdUniquenessPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuIdUniquenessPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class IdUniquenessPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuIdUniquenessPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuIdUniquenessPolicy(::org::omg::PortableServer::IdUniquenessPolicyValue *);
-  virtual ::org::omg::PortableServer::IdUniquenessPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuIdUniquenessPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuImplicitActivationPolicy.h b/libjava/gnu/CORBA/Poa/gnuImplicitActivationPolicy.h
deleted file mode 100644
index 229a10a..0000000
--- a/libjava/gnu/CORBA/Poa/gnuImplicitActivationPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuImplicitActivationPolicy__
-#define __gnu_CORBA_Poa_gnuImplicitActivationPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuImplicitActivationPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ImplicitActivationPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuImplicitActivationPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuImplicitActivationPolicy(::org::omg::PortableServer::ImplicitActivationPolicyValue *);
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuImplicitActivationPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuLifespanPolicy.h b/libjava/gnu/CORBA/Poa/gnuLifespanPolicy.h
deleted file mode 100644
index 6abc75b..0000000
--- a/libjava/gnu/CORBA/Poa/gnuLifespanPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuLifespanPolicy__
-#define __gnu_CORBA_Poa_gnuLifespanPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuLifespanPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class LifespanPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuLifespanPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuLifespanPolicy(::org::omg::PortableServer::LifespanPolicyValue *);
-  virtual ::org::omg::PortableServer::LifespanPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuLifespanPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuPOA$RefTemplate.h b/libjava/gnu/CORBA/Poa/gnuPOA$RefTemplate.h
deleted file mode 100644
index b7a34b0..0000000
--- a/libjava/gnu/CORBA/Poa/gnuPOA$RefTemplate.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuPOA$RefTemplate__
-#define __gnu_CORBA_Poa_gnuPOA$RefTemplate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuPOA;
-          class gnuPOA$RefTemplate;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuPOA$RefTemplate : public ::java::lang::Object
-{
-
-public: // actually package-private
-  gnuPOA$RefTemplate(::gnu::CORBA::Poa::gnuPOA *);
-public:
-  virtual JArray< ::java::lang::String * > * adapter_name();
-  virtual ::java::lang::String * orb_id();
-  virtual ::java::lang::String * server_id();
-  virtual ::org::omg::CORBA::Object * make_object(::java::lang::String *, JArray< jbyte > *);
-  virtual JArray< ::java::lang::String * > * _truncatable_ids();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m_adapter_name;
-  ::gnu::CORBA::Poa::gnuPOA * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuPOA$RefTemplate__
diff --git a/libjava/gnu/CORBA/Poa/gnuPOA.h b/libjava/gnu/CORBA/Poa/gnuPOA.h
deleted file mode 100644
index 85af424..0000000
--- a/libjava/gnu/CORBA/Poa/gnuPOA.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuPOA__
-#define __gnu_CORBA_Poa_gnuPOA__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class AOM;
-          class AOM$Obj;
-          class ORB_1_4;
-          class ServantDelegateImpl;
-          class gnuPOA;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-          class Policy;
-          class SetOverrideType;
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceFactory;
-          class ObjectReferenceTemplate;
-      }
-      namespace PortableServer
-      {
-          class AdapterActivator;
-          class IdAssignmentPolicy;
-          class IdAssignmentPolicyValue;
-          class IdUniquenessPolicy;
-          class IdUniquenessPolicyValue;
-          class ImplicitActivationPolicy;
-          class ImplicitActivationPolicyValue;
-          class LifespanPolicy;
-          class LifespanPolicyValue;
-          class POA;
-          class POAManager;
-          class RequestProcessingPolicy;
-          class RequestProcessingPolicyValue;
-          class Servant;
-          class ServantActivator;
-          class ServantLocator;
-          class ServantManager;
-          class ServantRetentionPolicy;
-          class ServantRetentionPolicyValue;
-          class ThreadPolicy;
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuPOA : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuPOA(::gnu::CORBA::Poa::gnuPOA *, ::java::lang::String *, ::org::omg::PortableServer::POAManager *, JArray< ::org::omg::CORBA::Policy * > *, ::gnu::CORBA::Poa::ORB_1_4 *);
-  virtual void waitWhileRunning();
-public: // actually protected
-  virtual void etherealizeAll();
-  virtual ::org::omg::PortableServer::POA * createPoaInstance(::java::lang::String *, ::org::omg::PortableServer::POAManager *, JArray< ::org::omg::CORBA::Policy * > *, ::gnu::CORBA::Poa::ORB_1_4 *);
-public:
-  virtual jboolean applies(::java::lang::Object *);
-  virtual void required(::java::lang::Object *);
-  virtual void excluding(::java::lang::Object *);
-  virtual ::org::omg::PortableServer::POA * find_POA(::java::lang::String *, jboolean);
-  virtual JArray< jbyte > * activate_object(::org::omg::PortableServer::Servant *);
-  virtual void activate_object_with_id(JArray< jbyte > *, ::org::omg::PortableServer::Servant *);
-  virtual void activate_object_with_id(JArray< jbyte > *, ::org::omg::PortableServer::Servant *, jboolean);
-private:
-  void locateServant(JArray< jbyte > *, ::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::AOM$Obj *, jboolean);
-public:
-  virtual void deactivate_object(JArray< jbyte > *);
-  virtual ::org::omg::CORBA::Object * create_reference(::java::lang::String *);
-  virtual ::org::omg::CORBA::Object * create_reference_with_id(JArray< jbyte > *, ::java::lang::String *);
-  virtual ::org::omg::PortableServer::POA * create_POA(::java::lang::String *, ::org::omg::PortableServer::POAManager *, JArray< ::org::omg::CORBA::Policy * > *);
-  virtual ::org::omg::PortableServer::Servant * get_servant();
-  virtual void set_servant(::org::omg::PortableServer::Servant *);
-  virtual void set_servant_manager(::org::omg::PortableServer::ServantManager *);
-  virtual ::org::omg::PortableServer::ServantManager * get_servant_manager();
-  virtual JArray< jbyte > * id();
-  virtual ::org::omg::CORBA::Object * id_to_reference(JArray< jbyte > *);
-  virtual ::org::omg::PortableServer::Servant * id_to_servant(JArray< jbyte > *);
-  virtual JArray< jbyte > * reference_to_id(::org::omg::CORBA::Object *);
-  virtual ::org::omg::PortableServer::Servant * reference_to_servant(::org::omg::CORBA::Object *);
-  virtual JArray< jbyte > * servant_to_id(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::CORBA::Object * servant_to_reference(::org::omg::PortableServer::Servant *);
-private:
-  ::org::omg::PortableServer::Servant * incarnate(::gnu::CORBA::Poa::AOM$Obj *, JArray< jbyte > *, ::org::omg::PortableServer::Servant *, jboolean);
-public:
-  virtual ::org::omg::PortableServer::POAManager * the_POAManager();
-  virtual ::org::omg::PortableServer::AdapterActivator * the_activator();
-  virtual void the_activator(::org::omg::PortableServer::AdapterActivator *);
-  virtual JArray< ::org::omg::PortableServer::POA * > * the_children();
-  virtual ::java::lang::String * the_name();
-  virtual ::org::omg::PortableServer::POA * the_parent();
-  virtual ::org::omg::PortableServer::IdAssignmentPolicy * create_id_assignment_policy(::org::omg::PortableServer::IdAssignmentPolicyValue *);
-  virtual ::org::omg::PortableServer::IdUniquenessPolicy * create_id_uniqueness_policy(::org::omg::PortableServer::IdUniquenessPolicyValue *);
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicy * create_implicit_activation_policy(::org::omg::PortableServer::ImplicitActivationPolicyValue *);
-  virtual ::org::omg::PortableServer::LifespanPolicy * create_lifespan_policy(::org::omg::PortableServer::LifespanPolicyValue *);
-  virtual ::org::omg::PortableServer::RequestProcessingPolicy * create_request_processing_policy(::org::omg::PortableServer::RequestProcessingPolicyValue *);
-  virtual ::org::omg::PortableServer::ServantRetentionPolicy * create_servant_retention_policy(::org::omg::PortableServer::ServantRetentionPolicyValue *);
-  virtual ::org::omg::PortableServer::ThreadPolicy * create_thread_policy(::org::omg::PortableServer::ThreadPolicyValue *);
-  virtual void destroy(jboolean, jboolean);
-public: // actually protected
-  virtual void finalize();
-private:
-  void unregisterFromManager();
-public:
-  virtual ::org::omg::CORBA::Policy * _get_policy(jint);
-  virtual JArray< ::org::omg::CORBA::Policy * > * getPolicyArray();
-  virtual ::org::omg::CORBA::Object * _set_policy_override(JArray< ::org::omg::CORBA::Policy * > *, ::org::omg::CORBA::SetOverrideType *);
-  virtual ::org::omg::CORBA::ORB * orb();
-private:
-  void create_and_connect(JArray< jbyte > *, ::java::lang::String *, ::gnu::CORBA::Poa::ServantDelegateImpl *);
-public: // actually package-private
-  virtual void checkDiscarding();
-public: // actually protected
-  virtual void connect_to_orb(JArray< jbyte > *, ::org::omg::CORBA::Object *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual jboolean validatePolicies(JArray< ::org::omg::CORBA::Policy * > *);
-public:
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findObject(::org::omg::CORBA::Object *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findKey(JArray< jbyte > *, JArray< jbyte > *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findIorKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * toIORKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * idFormIor(JArray< jbyte > *);
-  virtual ::gnu::CORBA::Poa::AOM$Obj * findServant(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceTemplate * getReferenceTemplate();
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceFactory * getReferenceFactory();
-  virtual void setReferenceFactory(::org::omg::PortableInterceptor::ObjectReferenceFactory *);
-  virtual ::org::omg::CORBA::Object * make_object(::java::lang::String *, JArray< jbyte > *);
-  virtual JArray< ::java::lang::String * > * _truncatable_ids();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::org::omg::PortableInterceptor::ObjectReferenceTemplate * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) refTemplate;
-  static JArray< ::java::lang::String * > * ref_template_ids;
-public:
-  ::gnu::CORBA::Poa::AOM * aom;
-public: // actually package-private
-  ::java::util::ArrayList * children;
-  ::java::lang::String * name;
-  ::org::omg::PortableServer::POA * parent;
-  static const jint SIGNATURE = 1718773093;
-  ::org::omg::PortableServer::AdapterActivator * m_activator;
-  ::org::omg::PortableServer::POAManager * m_manager;
-  ::org::omg::PortableServer::ServantActivator * servant_activator;
-  ::org::omg::PortableServer::ServantLocator * servant_locator;
-  ::org::omg::PortableServer::Servant * default_servant;
-private:
-  JArray< jbyte > * m_poa_id;
-  ::java::util::HashSet * m_policies;
-public: // actually package-private
-  JArray< ::org::omg::CORBA::Policy * > * s_policies;
-  ::gnu::CORBA::Poa::ORB_1_4 * m_orb;
-  jboolean m_inDestruction;
-public:
-  jboolean retain_servant;
-public: // actually package-private
-  ::org::omg::PortableInterceptor::ObjectReferenceFactory * m_object_factory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuPOA__
diff --git a/libjava/gnu/CORBA/Poa/gnuPOAManager.h b/libjava/gnu/CORBA/Poa/gnuPOAManager.h
deleted file mode 100644
index b94576b..0000000
--- a/libjava/gnu/CORBA/Poa/gnuPOAManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuPOAManager__
-#define __gnu_CORBA_Poa_gnuPOAManager__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuPOA;
-          class gnuPOAManager;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAManagerPackage
-        {
-            class State;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuPOAManager : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuPOAManager();
-  virtual ::org::omg::PortableServer::POAManagerPackage::State * get_state();
-  virtual void activate();
-  virtual void hold_requests(jboolean);
-  virtual void deactivate(jboolean, jboolean);
-  virtual void discard_requests(jboolean);
-  virtual void waitForIdle();
-  virtual void addPoa(::gnu::CORBA::Poa::gnuPOA *);
-  virtual void removePOA(::gnu::CORBA::Poa::gnuPOA *);
-  virtual void poaDestroyed(::gnu::CORBA::Poa::gnuPOA *);
-  virtual void notifyInterceptors(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-  ::java::util::HashSet * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) POAs;
-public: // actually package-private
-  ::org::omg::PortableServer::POAManagerPackage::State * state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuPOAManager__
diff --git a/libjava/gnu/CORBA/Poa/gnuPoaCurrent.h b/libjava/gnu/CORBA/Poa/gnuPoaCurrent.h
deleted file mode 100644
index 63c88c6..0000000
--- a/libjava/gnu/CORBA/Poa/gnuPoaCurrent.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuPoaCurrent__
-#define __gnu_CORBA_Poa_gnuPoaCurrent__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuPoaCurrent;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class CurrentOperations;
-          class POA;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuPoaCurrent : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  gnuPoaCurrent();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual JArray< jbyte > * get_object_id();
-  virtual ::org::omg::PortableServer::POA * get_POA();
-  virtual void put(::java::lang::Thread *, ::org::omg::PortableServer::CurrentOperations *);
-  virtual jboolean has(::org::omg::PortableServer::POA *);
-  virtual jboolean has(::java::lang::Thread *);
-  virtual void remove(::java::lang::Thread *);
-private:
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) threads;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuPoaCurrent__
diff --git a/libjava/gnu/CORBA/Poa/gnuRequestProcessingPolicy.h b/libjava/gnu/CORBA/Poa/gnuRequestProcessingPolicy.h
deleted file mode 100644
index 661a49b2..0000000
--- a/libjava/gnu/CORBA/Poa/gnuRequestProcessingPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuRequestProcessingPolicy__
-#define __gnu_CORBA_Poa_gnuRequestProcessingPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuRequestProcessingPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class RequestProcessingPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuRequestProcessingPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuRequestProcessingPolicy(::org::omg::PortableServer::RequestProcessingPolicyValue *);
-  virtual ::org::omg::PortableServer::RequestProcessingPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuRequestProcessingPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuServantObject.h b/libjava/gnu/CORBA/Poa/gnuServantObject.h
deleted file mode 100644
index 8b5d761..0000000
--- a/libjava/gnu/CORBA/Poa/gnuServantObject.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuServantObject__
-#define __gnu_CORBA_Poa_gnuServantObject__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-      namespace Poa
-      {
-          class ORB_1_4;
-          class gnuPOA;
-          class gnuServantObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class InvokeHandler;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class POAManager;
-          class Servant;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuServantObject : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  gnuServantObject(JArray< ::java::lang::String * > *, JArray< jbyte > *, ::gnu::CORBA::Poa::gnuPOA *, ::gnu::CORBA::Poa::ORB_1_4 *);
-  virtual ::gnu::CORBA::IOR * getIor();
-  gnuServantObject(::org::omg::PortableServer::Servant *, JArray< jbyte > *, ::gnu::CORBA::Poa::ORB_1_4 *, ::gnu::CORBA::Poa::gnuPOA *);
-  virtual void setServant(::org::omg::PortableServer::Servant *);
-  virtual ::org::omg::PortableServer::Servant * getServant();
-  virtual ::org::omg::CORBA::portable::InvokeHandler * getHandler(::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *, jboolean);
-  virtual ::org::omg::CORBA::portable::InvokeHandler * servantToHandler(::org::omg::PortableServer::Servant *);
-  gnuServantObject(::org::omg::PortableServer::Servant *, ::gnu::CORBA::Poa::gnuPOA *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::java::lang::String * toString();
-  virtual jboolean _is_local();
-  virtual jboolean _is_a(::java::lang::String *);
-  virtual ::org::omg::CORBA::ORB * _orb();
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * get_object_id();
-  virtual ::org::omg::PortableServer::POA * get_POA();
-  virtual void _release();
-  virtual void _releaseReply(::org::omg::CORBA::portable::InputStream *);
-  virtual jboolean _is_equivalent(::org::omg::CORBA::Object *);
-private:
-  ::org::omg::PortableServer::Servant * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) servant;
-public:
-  JArray< jbyte > * Id;
-  ::gnu::CORBA::Poa::gnuPOA * poa;
-  ::org::omg::PortableServer::POAManager * manager;
-  ::gnu::CORBA::Poa::ORB_1_4 * orb;
-  JArray< ::java::lang::String * > * repository_ids;
-public: // actually package-private
-  jboolean noRetain;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuServantObject__
diff --git a/libjava/gnu/CORBA/Poa/gnuServantRetentionPolicy.h b/libjava/gnu/CORBA/Poa/gnuServantRetentionPolicy.h
deleted file mode 100644
index 9ac8847..0000000
--- a/libjava/gnu/CORBA/Poa/gnuServantRetentionPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuServantRetentionPolicy__
-#define __gnu_CORBA_Poa_gnuServantRetentionPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuServantRetentionPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ServantRetentionPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuServantRetentionPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuServantRetentionPolicy(::org::omg::PortableServer::ServantRetentionPolicyValue *);
-  virtual ::org::omg::PortableServer::ServantRetentionPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuServantRetentionPolicy__
diff --git a/libjava/gnu/CORBA/Poa/gnuThreadPolicy.h b/libjava/gnu/CORBA/Poa/gnuThreadPolicy.h
deleted file mode 100644
index a52147d..0000000
--- a/libjava/gnu/CORBA/Poa/gnuThreadPolicy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Poa_gnuThreadPolicy__
-#define __gnu_CORBA_Poa_gnuThreadPolicy__
-
-#pragma interface
-
-#include <gnu/CORBA/_PolicyImplBase.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace Poa
-      {
-          class gnuThreadPolicy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::Poa::gnuThreadPolicy : public ::gnu::CORBA::_PolicyImplBase
-{
-
-public:
-  gnuThreadPolicy(::org::omg::PortableServer::ThreadPolicyValue *);
-  virtual ::org::omg::PortableServer::ThreadPolicyValue * value();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Poa_gnuThreadPolicy__
diff --git a/libjava/gnu/CORBA/RawReply.h b/libjava/gnu/CORBA/RawReply.h
deleted file mode 100644
index 65e6d4c..0000000
--- a/libjava/gnu/CORBA/RawReply.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_RawReply__
-#define __gnu_CORBA_RawReply__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferredCdrInput;
-      }
-      namespace GIOP
-      {
-          class MessageHeader;
-      }
-        class RawReply;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::RawReply : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RawReply(::org::omg::CORBA::ORB *, ::gnu::CORBA::GIOP::MessageHeader *, JArray< jbyte > *);
-  virtual ::gnu::CORBA::CDR::BufferredCdrInput * getStream();
-  ::gnu::CORBA::GIOP::MessageHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
-  ::org::omg::CORBA::ORB * orb;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_RawReply__
diff --git a/libjava/gnu/CORBA/ResponseHandlerImpl.h b/libjava/gnu/CORBA/ResponseHandlerImpl.h
deleted file mode 100644
index 99ca581..0000000
--- a/libjava/gnu/CORBA/ResponseHandlerImpl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ResponseHandlerImpl__
-#define __gnu_CORBA_ResponseHandlerImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-      }
-      namespace GIOP
-      {
-          class MessageHeader;
-          class ReplyHeader;
-          class RequestHeader;
-      }
-        class ResponseHandlerImpl;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-        namespace portable
-        {
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::ResponseHandlerImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ResponseHandlerImpl(::org::omg::CORBA::ORB *, ::gnu::CORBA::GIOP::MessageHeader *, ::gnu::CORBA::GIOP::ReplyHeader *, ::gnu::CORBA::GIOP::RequestHeader *);
-public:
-  virtual ::org::omg::CORBA::portable::OutputStream * createExceptionReply();
-  virtual ::org::omg::CORBA::portable::OutputStream * createReply();
-  virtual ::gnu::CORBA::CDR::BufferedCdrOutput * getBuffer();
-  virtual jboolean isExceptionReply();
-private:
-  void prepareStream();
-public:
-  ::gnu::CORBA::GIOP::MessageHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) message_header;
-  ::org::omg::CORBA::ORB * orb;
-  ::gnu::CORBA::GIOP::ReplyHeader * reply_header;
-  ::gnu::CORBA::GIOP::RequestHeader * request_header;
-private:
-  jboolean exceptionReply;
-  ::gnu::CORBA::CDR::BufferedCdrOutput * buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ResponseHandlerImpl__
diff --git a/libjava/gnu/CORBA/SafeForDirectCalls.h b/libjava/gnu/CORBA/SafeForDirectCalls.h
deleted file mode 100644
index 23f774c..0000000
--- a/libjava/gnu/CORBA/SafeForDirectCalls.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_SafeForDirectCalls__
-#define __gnu_CORBA_SafeForDirectCalls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class SafeForDirectCalls;
-    }
-  }
-}
-
-class gnu::CORBA::SafeForDirectCalls : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_SafeForDirectCalls__
diff --git a/libjava/gnu/CORBA/ServiceDetailHolder.h b/libjava/gnu/CORBA/ServiceDetailHolder.h
deleted file mode 100644
index 8181666..0000000
--- a/libjava/gnu/CORBA/ServiceDetailHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ServiceDetailHolder__
-#define __gnu_CORBA_ServiceDetailHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class ServiceDetailHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServiceDetail;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::ServiceDetailHolder : public ::java::lang::Object
-{
-
-public:
-  ServiceDetailHolder(::org::omg::CORBA::ServiceDetail *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::ServiceDetail * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ServiceDetailHolder__
diff --git a/libjava/gnu/CORBA/ServiceRequestAdapter.h b/libjava/gnu/CORBA/ServiceRequestAdapter.h
deleted file mode 100644
index 2fd7a37..0000000
--- a/libjava/gnu/CORBA/ServiceRequestAdapter.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_ServiceRequestAdapter__
-#define __gnu_CORBA_ServiceRequestAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-      }
-        class ServiceRequestAdapter;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServerRequest;
-        namespace portable
-        {
-            class InvokeHandler;
-            class OutputStream;
-            class Streamable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::ServiceRequestAdapter : public ::java::lang::Object
-{
-
-public:
-  ServiceRequestAdapter();
-  virtual ::org::omg::CORBA::portable::OutputStream * createExceptionReply();
-  virtual ::org::omg::CORBA::portable::OutputStream * createReply();
-  static void invoke(::org::omg::CORBA::ServerRequest *, ::org::omg::CORBA::portable::InvokeHandler *, ::org::omg::CORBA::portable::Streamable *);
-public: // actually package-private
-  ::gnu::CORBA::CDR::BufferedCdrOutput * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reply;
-  jboolean isException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_ServiceRequestAdapter__
diff --git a/libjava/gnu/CORBA/SetOverrideTypeHolder.h b/libjava/gnu/CORBA/SetOverrideTypeHolder.h
deleted file mode 100644
index 40aec98..0000000
--- a/libjava/gnu/CORBA/SetOverrideTypeHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_SetOverrideTypeHolder__
-#define __gnu_CORBA_SetOverrideTypeHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class SetOverrideTypeHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class SetOverrideType;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::SetOverrideTypeHolder : public ::java::lang::Object
-{
-
-public:
-  SetOverrideTypeHolder(::org::omg::CORBA::SetOverrideType *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::SetOverrideType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_SetOverrideTypeHolder__
diff --git a/libjava/gnu/CORBA/SimpleDelegate.h b/libjava/gnu/CORBA/SimpleDelegate.h
deleted file mode 100644
index 2efe2b8..0000000
--- a/libjava/gnu/CORBA/SimpleDelegate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_SimpleDelegate__
-#define __gnu_CORBA_SimpleDelegate__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/Delegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-        class SimpleDelegate;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Request;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::SimpleDelegate : public ::org::omg::CORBA::portable::Delegate
-{
-
-public:
-  SimpleDelegate(::org::omg::CORBA::ORB *, ::gnu::CORBA::IOR *);
-  virtual void setIor(::gnu::CORBA::IOR *);
-  virtual ::gnu::CORBA::IOR * getIor();
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *);
-  virtual ::org::omg::CORBA::Request * create_request(::org::omg::CORBA::Object *, ::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *, ::org::omg::CORBA::ExceptionList *, ::org::omg::CORBA::ContextList *);
-  virtual ::org::omg::CORBA::Object * duplicate(::org::omg::CORBA::Object *);
-  virtual jboolean equals(::org::omg::CORBA::Object *, ::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Object * get_interface_def(::org::omg::CORBA::Object *);
-  virtual jint hash(::org::omg::CORBA::Object *, jint);
-  virtual jint hashCode(::org::omg::CORBA::Object *);
-  virtual jboolean is_a(::org::omg::CORBA::Object *, ::java::lang::String *);
-  virtual jboolean is_equivalent(::org::omg::CORBA::Object *, ::org::omg::CORBA::Object *);
-  virtual jboolean is_local(::org::omg::CORBA::Object *);
-  virtual jboolean non_existent(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::ORB * orb(::org::omg::CORBA::Object *);
-  virtual void release(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Request * request(::org::omg::CORBA::Object *, ::java::lang::String *);
-public: // actually protected
-  ::org::omg::CORBA::ORB * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::Delegate)))) orb__;
-  ::gnu::CORBA::IOR * ior;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_SimpleDelegate__
diff --git a/libjava/gnu/CORBA/SocketRepository.h b/libjava/gnu/CORBA/SocketRepository.h
deleted file mode 100644
index 158fe4d..0000000
--- a/libjava/gnu/CORBA/SocketRepository.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_SocketRepository__
-#define __gnu_CORBA_SocketRepository__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class SocketRepository;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::CORBA::SocketRepository : public ::java::lang::Object
-{
-
-public:
-  SocketRepository();
-  static void put_socket(::java::lang::Object *, ::java::net::Socket *);
-private:
-  static void gc();
-public: // actually package-private
-  static jboolean not_reusable(::java::net::Socket *);
-public:
-  static ::java::net::Socket * get_socket(::java::lang::Object *);
-private:
-  static ::java::util::HashMap * sockets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_SocketRepository__
diff --git a/libjava/gnu/CORBA/StreamBasedRequest.h b/libjava/gnu/CORBA/StreamBasedRequest.h
deleted file mode 100644
index 7afb2da..0000000
--- a/libjava/gnu/CORBA/StreamBasedRequest.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_StreamBasedRequest__
-#define __gnu_CORBA_StreamBasedRequest__
-
-#pragma interface
-
-#include <gnu/CORBA/CDR/BufferedCdrOutput.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class StreamBasedRequest;
-        class gnuRequest;
-    }
-  }
-}
-
-class gnu::CORBA::StreamBasedRequest : public ::gnu::CORBA::CDR::BufferedCdrOutput
-{
-
-public:
-  StreamBasedRequest();
-  ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::gnu::CORBA::CDR::BufferedCdrOutput)))) request;
-  jboolean response_expected;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_StreamBasedRequest__
diff --git a/libjava/gnu/CORBA/StreamHolder.h b/libjava/gnu/CORBA/StreamHolder.h
deleted file mode 100644
index f71e4ad..0000000
--- a/libjava/gnu/CORBA/StreamHolder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_StreamHolder__
-#define __gnu_CORBA_StreamHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class StreamHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::StreamHolder : public ::java::lang::Object
-{
-
-public:
-  StreamHolder(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-public: // actually package-private
-  virtual ::org::omg::CORBA::portable::InputStream * getInputStream();
-public: // actually protected
-  ::org::omg::CORBA::portable::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_StreamHolder__
diff --git a/libjava/gnu/CORBA/StubLocator.h b/libjava/gnu/CORBA/StubLocator.h
deleted file mode 100644
index 591e30f..0000000
--- a/libjava/gnu/CORBA/StubLocator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_StubLocator__
-#define __gnu_CORBA_StubLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class IOR;
-        class StubLocator;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-        namespace portable
-        {
-            class ObjectImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::StubLocator : public ::java::lang::Object
-{
-
-public:
-  StubLocator();
-  static ::org::omg::CORBA::portable::ObjectImpl * search(::org::omg::CORBA::ORB *, ::gnu::CORBA::IOR *);
-public: // actually protected
-  static ::org::omg::CORBA::portable::ObjectImpl * createDefaultStub(::org::omg::CORBA::ORB *, ::gnu::CORBA::IOR *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_StubLocator__
diff --git a/libjava/gnu/CORBA/TypeCodeHelper.h b/libjava/gnu/CORBA/TypeCodeHelper.h
deleted file mode 100644
index eac0736..0000000
--- a/libjava/gnu/CORBA/TypeCodeHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_TypeCodeHelper__
-#define __gnu_CORBA_TypeCodeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class TypeCodeHelper;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::TypeCodeHelper : public ::java::lang::Object
-{
-
-public:
-  TypeCodeHelper();
-  static ::org::omg::CORBA::TypeCode * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::TypeCode *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_TypeCodeHelper__
diff --git a/libjava/gnu/CORBA/TypeKindNamer.h b/libjava/gnu/CORBA/TypeKindNamer.h
deleted file mode 100644
index da2c87f..0000000
--- a/libjava/gnu/CORBA/TypeKindNamer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_TypeKindNamer__
-#define __gnu_CORBA_TypeKindNamer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class TypeKindNamer;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::TypeKindNamer : public ::java::lang::Object
-{
-
-public:
-  TypeKindNamer();
-  static ::org::omg::CORBA::TypeCode * getPrimitveTC(::org::omg::CORBA::TCKind *);
-  static ::java::lang::String * nameIt(jint);
-  static ::java::lang::String * nameIt(::org::omg::CORBA::TypeCode *);
-public: // actually protected
-  static JArray< ::java::lang::String * > * tk;
-  static JArray< ::org::omg::CORBA::TypeCode * > * primitveCodes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_TypeKindNamer__
diff --git a/libjava/gnu/CORBA/Unexpected.h b/libjava/gnu/CORBA/Unexpected.h
deleted file mode 100644
index cadcd61..0000000
--- a/libjava/gnu/CORBA/Unexpected.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Unexpected__
-#define __gnu_CORBA_Unexpected__
-
-#pragma interface
-
-#include <java/lang/InternalError.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Unexpected;
-    }
-  }
-}
-
-class gnu::CORBA::Unexpected : public ::java::lang::InternalError
-{
-
-public:
-  Unexpected(::java::lang::String *, ::java::lang::Exception *);
-  Unexpected(::java::lang::Exception *);
-  Unexpected();
-  static void error(::java::lang::String *, ::java::lang::Exception *);
-  static void error(::java::lang::Exception *);
-  static void error();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::String * SHARED_MESSAGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Unexpected__
diff --git a/libjava/gnu/CORBA/Version.h b/libjava/gnu/CORBA/Version.h
deleted file mode 100644
index 0c8d910..0000000
--- a/libjava/gnu/CORBA/Version.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_Version__
-#define __gnu_CORBA_Version__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class Version;
-    }
-  }
-}
-
-class gnu::CORBA::Version : public ::java::lang::Object
-{
-
-public:
-  Version(jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  static ::gnu::CORBA::Version * read_version(::java::io::InputStream *);
-  virtual jboolean same(::gnu::CORBA::Version *);
-  virtual jboolean since_inclusive(jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual jboolean until_inclusive(jint, jint);
-  virtual void write(::java::io::OutputStream *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) major;
-  jint minor;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_Version__
diff --git a/libjava/gnu/CORBA/WCharHolder.h b/libjava/gnu/CORBA/WCharHolder.h
deleted file mode 100644
index b5a66de..0000000
--- a/libjava/gnu/CORBA/WCharHolder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_WCharHolder__
-#define __gnu_CORBA_WCharHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class WCharHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::WCharHolder : public ::java::lang::Object
-{
-
-public:
-  WCharHolder();
-  WCharHolder(jchar);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-private:
-  static ::org::omg::CORBA::TypeCode * t_char;
-public:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_WCharHolder__
diff --git a/libjava/gnu/CORBA/WStringHolder.h b/libjava/gnu/CORBA/WStringHolder.h
deleted file mode 100644
index 5d26fdaa..0000000
--- a/libjava/gnu/CORBA/WStringHolder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_WStringHolder__
-#define __gnu_CORBA_WStringHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class WStringHolder;
-      namespace typecodes
-      {
-          class StringTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::WStringHolder : public ::java::lang::Object
-{
-
-public:
-  WStringHolder();
-  WStringHolder(::java::lang::String *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-private:
-  static ::gnu::CORBA::typecodes::StringTypeCode * t_string;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_WStringHolder__
diff --git a/libjava/gnu/CORBA/_PolicyImplBase.h b/libjava/gnu/CORBA/_PolicyImplBase.h
deleted file mode 100644
index 3cd33d7..0000000
--- a/libjava/gnu/CORBA/_PolicyImplBase.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA__PolicyImplBase__
-#define __gnu_CORBA__PolicyImplBase__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class _PolicyImplBase;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::_PolicyImplBase : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _PolicyImplBase(jint, ::java::lang::Object *, jint, ::java::lang::String *);
-  virtual jint policy_type();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  virtual ::java::lang::Object * getValue();
-  virtual jint getCode();
-  virtual void destroy();
-  virtual ::java::lang::String * toString();
-  virtual ::org::omg::CORBA::Policy * copy();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) ids;
-  jint type;
-  ::java::lang::Object * value;
-  jint policyCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA__PolicyImplBase__
diff --git a/libjava/gnu/CORBA/gnuAny.h b/libjava/gnu/CORBA/gnuAny.h
deleted file mode 100644
index 5047b42..0000000
--- a/libjava/gnu/CORBA/gnuAny.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuAny__
-#define __gnu_CORBA_gnuAny__
-
-#pragma interface
-
-#include <org/omg/CORBA/Any.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuAny;
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ORB;
-          class Object;
-          class Principal;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class Streamable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuAny : public ::org::omg::CORBA::Any
-{
-
-public:
-  gnuAny();
-  virtual void setOrb(::org::omg::CORBA::ORB *);
-  virtual ::gnu::CORBA::gnuAny * Clone();
-  virtual ::org::omg::CORBA::portable::InputStream * create_input_stream();
-  virtual ::org::omg::CORBA::portable::OutputStream * create_output_stream();
-  virtual jboolean equal(::org::omg::CORBA::Any *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::org::omg::CORBA::Object * extract_Object();
-  virtual ::org::omg::CORBA::Principal * extract_Principal();
-  virtual ::org::omg::CORBA::portable::Streamable * extract_Streamable();
-  virtual ::org::omg::CORBA::TypeCode * extract_TypeCode();
-  virtual ::java::io::Serializable * extract_Value();
-  virtual ::org::omg::CORBA::Any * extract_any();
-  virtual jboolean extract_boolean();
-  virtual jchar extract_char();
-  virtual jdouble extract_double();
-  virtual ::java::math::BigDecimal * extract_fixed();
-  virtual jfloat extract_float();
-  virtual jint extract_long();
-  virtual jlong extract_longlong();
-  virtual jbyte extract_octet();
-  virtual jshort extract_short();
-  virtual ::java::lang::String * extract_string();
-  virtual jint extract_ulong();
-  virtual jlong extract_ulonglong();
-  virtual jshort extract_ushort();
-  virtual jchar extract_wchar();
-  virtual ::java::lang::String * extract_wstring();
-  virtual void insert_Object(::org::omg::CORBA::Object *, ::org::omg::CORBA::TypeCode *);
-  virtual void insert_Object(::org::omg::CORBA::Object *);
-  virtual void insert_Principal(::org::omg::CORBA::Principal *);
-  virtual void insert_Streamable(::org::omg::CORBA::portable::Streamable *);
-  virtual void insert_TypeCode(::org::omg::CORBA::TypeCode *);
-  virtual void insert_Value(::java::io::Serializable *, ::org::omg::CORBA::TypeCode *);
-  virtual void insert_Value(::java::io::Serializable *);
-  virtual void insert_any(::org::omg::CORBA::Any *);
-  virtual void insert_boolean(jboolean);
-  virtual void insert_char(jchar);
-  virtual void insert_double(jdouble);
-  virtual void insert_fixed(::java::math::BigDecimal *, ::org::omg::CORBA::TypeCode *);
-  virtual void insert_fixed(::java::math::BigDecimal *);
-  virtual void insert_float(jfloat);
-  virtual void insert_long(jint);
-  virtual void insert_longlong(jlong);
-  virtual void insert_octet(jbyte);
-  virtual void insert_short(jshort);
-  virtual void insert_string(::java::lang::String *);
-  virtual void insert_ulong(jint);
-  virtual void insert_ulonglong(jlong);
-  virtual void insert_ushort(jshort);
-  virtual void insert_wchar(jchar);
-  virtual void insert_wstring(::java::lang::String *);
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual void read_value(::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual void type(::org::omg::CORBA::TypeCode *);
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *);
-public: // actually protected
-  virtual void check(jint);
-private:
-  void resetTypes();
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  static ::org::omg::CORBA::TypeCode * nullType;
-  ::org::omg::CORBA::portable::Streamable * __attribute__((aligned(__alignof__( ::org::omg::CORBA::Any)))) has;
-  ::org::omg::CORBA::TypeCode * typecode;
-  jint xKind;
-private:
-  ::org::omg::CORBA::ORB * orb__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuAny__
diff --git a/libjava/gnu/CORBA/gnuCodecFactory.h b/libjava/gnu/CORBA/gnuCodecFactory.h
deleted file mode 100644
index 51d52b3..0000000
--- a/libjava/gnu/CORBA/gnuCodecFactory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuCodecFactory__
-#define __gnu_CORBA_gnuCodecFactory__
-
-#pragma interface
-
-#include <org/omg/CORBA/LocalObject.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuCodecFactory;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-      namespace IOP
-      {
-          class Codec;
-          class Encoding;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuCodecFactory : public ::org::omg::CORBA::LocalObject
-{
-
-public:
-  gnuCodecFactory(::org::omg::CORBA::ORB *);
-  virtual ::org::omg::IOP::Codec * create_codec(::org::omg::IOP::Encoding *);
-private:
-  ::org::omg::CORBA::ORB * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) orb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuCodecFactory__
diff --git a/libjava/gnu/CORBA/gnuContext.h b/libjava/gnu/CORBA/gnuContext.h
deleted file mode 100644
index 4d55ac5..0000000
--- a/libjava/gnu/CORBA/gnuContext.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuContext__
-#define __gnu_CORBA_gnuContext__
-
-#pragma interface
-
-#include <org/omg/CORBA/Context.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuContext;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class NVList;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuContext : public ::org::omg::CORBA::Context
-{
-
-public:
-  gnuContext(::java::lang::String *, ::org::omg::CORBA::Context *);
-  virtual ::java::lang::String * context_name();
-  virtual ::org::omg::CORBA::Context * create_child(::java::lang::String *);
-  virtual void delete_values(::java::lang::String *);
-  virtual ::org::omg::CORBA::NVList * get_values(::java::lang::String *, jint, ::java::lang::String *);
-  virtual ::org::omg::CORBA::Context * parent();
-  virtual void set_one_value(::java::lang::String *, ::org::omg::CORBA::Any *);
-  virtual void set_values(::org::omg::CORBA::NVList *);
-public: // actually package-private
-  ::org::omg::CORBA::Context * __attribute__((aligned(__alignof__( ::org::omg::CORBA::Context)))) parent__;
-  ::java::util::Map * properties;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuContext__
diff --git a/libjava/gnu/CORBA/gnuContextList.h b/libjava/gnu/CORBA/gnuContextList.h
deleted file mode 100644
index 914d502..0000000
--- a/libjava/gnu/CORBA/gnuContextList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuContextList__
-#define __gnu_CORBA_gnuContextList__
-
-#pragma interface
-
-#include <org/omg/CORBA/ContextList.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CorbaList;
-        class gnuContextList;
-    }
-  }
-}
-
-class gnu::CORBA::gnuContextList : public ::org::omg::CORBA::ContextList
-{
-
-public:
-  gnuContextList();
-  virtual void add(::java::lang::String *);
-  virtual jint count();
-  virtual ::java::lang::String * item(jint);
-  virtual void remove(jint);
-public: // actually package-private
-  ::gnu::CORBA::CorbaList * __attribute__((aligned(__alignof__( ::org::omg::CORBA::ContextList)))) strings;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuContextList__
diff --git a/libjava/gnu/CORBA/gnuEnvironment.h b/libjava/gnu/CORBA/gnuEnvironment.h
deleted file mode 100644
index 1557180..0000000
--- a/libjava/gnu/CORBA/gnuEnvironment.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuEnvironment__
-#define __gnu_CORBA_gnuEnvironment__
-
-#pragma interface
-
-#include <org/omg/CORBA/Environment.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuEnvironment;
-    }
-  }
-}
-
-class gnu::CORBA::gnuEnvironment : public ::org::omg::CORBA::Environment
-{
-
-public:
-  gnuEnvironment();
-  virtual void clear();
-  virtual void exception(::java::lang::Exception *);
-  virtual ::java::lang::Exception * exception();
-public: // actually protected
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::org::omg::CORBA::Environment)))) exception__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuEnvironment__
diff --git a/libjava/gnu/CORBA/gnuExceptionList.h b/libjava/gnu/CORBA/gnuExceptionList.h
deleted file mode 100644
index dd1b138..0000000
--- a/libjava/gnu/CORBA/gnuExceptionList.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuExceptionList__
-#define __gnu_CORBA_gnuExceptionList__
-
-#pragma interface
-
-#include <org/omg/CORBA/ExceptionList.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CorbaList;
-        class gnuExceptionList;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuExceptionList : public ::org::omg::CORBA::ExceptionList
-{
-
-public:
-  gnuExceptionList();
-  virtual void add(::org::omg::CORBA::TypeCode *);
-  virtual jint count();
-  virtual ::org::omg::CORBA::TypeCode * item(jint);
-  virtual void remove(jint);
-public: // actually protected
-  ::gnu::CORBA::CorbaList * __attribute__((aligned(__alignof__( ::org::omg::CORBA::ExceptionList)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuExceptionList__
diff --git a/libjava/gnu/CORBA/gnuNVList.h b/libjava/gnu/CORBA/gnuNVList.h
deleted file mode 100644
index 25d5e08..0000000
--- a/libjava/gnu/CORBA/gnuNVList.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuNVList__
-#define __gnu_CORBA_gnuNVList__
-
-#pragma interface
-
-#include <org/omg/CORBA/NVList.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CorbaList;
-        class gnuNVList;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class NamedValue;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuNVList : public ::org::omg::CORBA::NVList
-{
-
-public:
-  gnuNVList();
-  gnuNVList(jint);
-  virtual ::org::omg::CORBA::NamedValue * add(jint);
-  virtual ::org::omg::CORBA::NamedValue * add_item(::java::lang::String *, jint);
-  virtual ::org::omg::CORBA::NamedValue * add_value(::java::lang::String *, ::org::omg::CORBA::Any *, jint);
-  virtual void add(::org::omg::CORBA::NamedValue *);
-  virtual jint count();
-  virtual ::org::omg::CORBA::NamedValue * item(jint);
-  virtual void remove(jint);
-public: // actually protected
-  ::gnu::CORBA::CorbaList * __attribute__((aligned(__alignof__( ::org::omg::CORBA::NVList)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuNVList__
diff --git a/libjava/gnu/CORBA/gnuNamedValue.h b/libjava/gnu/CORBA/gnuNamedValue.h
deleted file mode 100644
index 17386a3..0000000
--- a/libjava/gnu/CORBA/gnuNamedValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuNamedValue__
-#define __gnu_CORBA_gnuNamedValue__
-
-#pragma interface
-
-#include <org/omg/CORBA/NamedValue.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuNamedValue;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuNamedValue : public ::org::omg::CORBA::NamedValue
-{
-
-public:
-  gnuNamedValue();
-  virtual void setFlags(jint);
-  virtual void setName(::java::lang::String *);
-  virtual void setValue(::org::omg::CORBA::Any *);
-  virtual jint flags();
-  virtual ::java::lang::String * name();
-  virtual ::org::omg::CORBA::Any * value();
-private:
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::org::omg::CORBA::NamedValue)))) m_value;
-  ::java::lang::String * m_name;
-  jint m_flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuNamedValue__
diff --git a/libjava/gnu/CORBA/gnuRequest$1.h b/libjava/gnu/CORBA/gnuRequest$1.h
deleted file mode 100644
index 722d2fa..0000000
--- a/libjava/gnu/CORBA/gnuRequest$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuRequest$1__
-#define __gnu_CORBA_gnuRequest$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuRequest;
-        class gnuRequest$1;
-    }
-  }
-}
-
-class gnu::CORBA::gnuRequest$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  gnuRequest$1(::gnu::CORBA::gnuRequest *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuRequest$1__
diff --git a/libjava/gnu/CORBA/gnuRequest$2.h b/libjava/gnu/CORBA/gnuRequest$2.h
deleted file mode 100644
index e85c647..0000000
--- a/libjava/gnu/CORBA/gnuRequest$2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuRequest$2__
-#define __gnu_CORBA_gnuRequest$2__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuRequest;
-        class gnuRequest$2;
-    }
-  }
-}
-
-class gnu::CORBA::gnuRequest$2 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  gnuRequest$2(::gnu::CORBA::gnuRequest *, ::gnu::CORBA::gnuRequest *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::CORBA::gnuRequest * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-private:
-  ::gnu::CORBA::gnuRequest * val$cloned;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuRequest$2__
diff --git a/libjava/gnu/CORBA/gnuRequest.h b/libjava/gnu/CORBA/gnuRequest.h
deleted file mode 100644
index 70ebd77..0000000
--- a/libjava/gnu/CORBA/gnuRequest.h
+++ /dev/null
@@ -1,184 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuRequest__
-#define __gnu_CORBA_gnuRequest__
-
-#pragma interface
-
-#include <org/omg/CORBA/Request.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class BufferedCdrOutput;
-          class BufferredCdrInput;
-      }
-      namespace GIOP
-      {
-          class MessageHeader;
-          class ReplyHeader;
-          class RequestHeader;
-      }
-        class IOR;
-        class RawReply;
-        class StreamBasedRequest;
-        class Version;
-        class gnuNVList;
-        class gnuRequest;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class Environment;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Policy;
-          class SystemException;
-          class TypeCode;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class TaggedComponent;
-          class TaggedProfile;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfo;
-          class ClientRequestInterceptorOperations;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuRequest : public ::org::omg::CORBA::Request
-{
-
-public:
-  gnuRequest();
-  virtual void setIor(::gnu::CORBA::IOR *);
-  virtual ::gnu::CORBA::IOR * getIor();
-  virtual void setORB(::org::omg::CORBA::ORB *);
-  virtual void setBigEndian(jboolean);
-  virtual void setOperation(::java::lang::String *);
-  virtual ::gnu::CORBA::StreamBasedRequest * getParameterStream();
-  virtual ::gnu::CORBA::gnuRequest * Clone();
-  virtual ::org::omg::CORBA::Any * add_in_arg();
-  virtual ::org::omg::CORBA::Any * add_inout_arg();
-  virtual ::org::omg::CORBA::Any * add_named_in_arg(::java::lang::String *);
-  virtual ::org::omg::CORBA::Any * add_named_inout_arg(::java::lang::String *);
-  virtual ::org::omg::CORBA::Any * add_named_out_arg(::java::lang::String *);
-  virtual ::org::omg::CORBA::Any * add_out_arg();
-  virtual ::org::omg::CORBA::NVList * arguments();
-  virtual ::org::omg::CORBA::ContextList * contexts();
-  virtual ::org::omg::CORBA::Context * ctx();
-  virtual void ctx(::org::omg::CORBA::Context *);
-  virtual ::org::omg::CORBA::Environment * env();
-  virtual ::org::omg::CORBA::ExceptionList * exceptions();
-  virtual void get_response();
-  virtual void invoke();
-  virtual ::java::lang::String * operation();
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual jboolean poll_response();
-  virtual ::org::omg::CORBA::NamedValue * result();
-  virtual ::org::omg::CORBA::Any * return_value();
-  virtual void send_deferred();
-  virtual void send_oneway();
-  virtual void set_args(::org::omg::CORBA::NVList *);
-  virtual void set_context_list(::org::omg::CORBA::ContextList *);
-  virtual void set_environment(::org::omg::CORBA::Environment *);
-  virtual void set_exceptions(::org::omg::CORBA::ExceptionList *);
-  virtual void set_operation(::java::lang::String *);
-  virtual void set_result(::org::omg::CORBA::NamedValue *);
-  virtual void set_return_type(::org::omg::CORBA::TypeCode *);
-  virtual void set_target(::org::omg::CORBA::Object *);
-  virtual ::gnu::CORBA::RawReply * submit();
-  virtual ::org::omg::CORBA::Object * target();
-  virtual ::gnu::CORBA::Version * useVersion(::gnu::CORBA::Version *);
-  virtual void waitWhileBusy();
-private:
-  void p_invoke();
-public: // actually package-private
-  virtual void readExceptionId(::gnu::CORBA::CDR::BufferredCdrInput *);
-public: // actually protected
-  virtual void write_parameter_buffer(::gnu::CORBA::GIOP::MessageHeader *, ::gnu::CORBA::CDR::BufferedCdrOutput *);
-  virtual void write_parameters(::gnu::CORBA::GIOP::MessageHeader *, ::gnu::CORBA::CDR::BufferedCdrOutput *);
-public:
-  virtual void add_request_service_context(::org::omg::IOP::ServiceContext *, jboolean);
-  virtual ::org::omg::IOP::TaggedProfile * effective_profile();
-  virtual ::org::omg::CORBA::Object * effective_target();
-  virtual ::org::omg::IOP::TaggedComponent * get_effective_component(jint);
-  virtual JArray< ::org::omg::IOP::TaggedComponent * > * get_effective_components(jint);
-  virtual ::org::omg::CORBA::Policy * get_request_policy(jint);
-  virtual ::java::lang::String * received_exception_id();
-  virtual ::org::omg::CORBA::Any * received_exception();
-  virtual ::org::omg::CORBA::Object * forward_reference();
-  virtual ::org::omg::CORBA::Any * get_slot(jint);
-  virtual jshort reply_status();
-  virtual jint request_id();
-  virtual jboolean response_expected();
-  virtual jshort sync_scope();
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint);
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint);
-  virtual JArray< ::java::lang::String * > * operation_context();
-  virtual JArray< ::java::lang::String * > * ice_contexts();
-  virtual void checkDii();
-  static ::gnu::CORBA::Version * MAX_SUPPORTED;
-  static jint PAUSE_INITIAL;
-  static jint PAUSE_STEPS;
-  static jint PAUSE_MAX;
-public: // actually package-private
-  ::org::omg::PortableInterceptor::ClientRequestInterceptorOperations * __attribute__((aligned(__alignof__( ::org::omg::CORBA::Request)))) m_interceptor;
-  ::org::omg::PortableInterceptor::ClientRequestInfo * m_info;
-private:
-  static ::gnu::CORBA::RawReply * EMPTY;
-public: // actually protected
-  ::org::omg::CORBA::Context * m_context;
-  ::org::omg::CORBA::ContextList * m_context_list;
-  ::org::omg::CORBA::Environment * m_environment;
-  ::org::omg::CORBA::ExceptionList * m_exceptions;
-  ::org::omg::CORBA::NamedValue * m_result;
-  ::java::lang::String * m_exception_id;
-  ::org::omg::CORBA::SystemException * m_sys_ex;
-  ::org::omg::CORBA::Object * m_target;
-  ::java::lang::String * m_operation;
-public:
-  ::gnu::CORBA::IOR * m_forward_ior;
-  ::org::omg::CORBA::Object * m_forwarding_target;
-public: // actually protected
-  jboolean complete;
-  jboolean oneWay;
-  jboolean running;
-  ::gnu::CORBA::gnuNVList * m_args;
-  ::gnu::CORBA::StreamBasedRequest * m_parameter_buffer;
-  JArray< ::org::omg::CORBA::Any * > * m_slots;
-  ::gnu::CORBA::GIOP::RequestHeader * m_rqh;
-  ::gnu::CORBA::GIOP::ReplyHeader * m_rph;
-private:
-  ::gnu::CORBA::IOR * ior;
-  ::org::omg::CORBA::ORB * orb__;
-  jboolean Big_endian;
-public: // actually package-private
-  ::gnu::CORBA::gnuRequest * redirected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuRequest__
diff --git a/libjava/gnu/CORBA/gnuValueHolder.h b/libjava/gnu/CORBA/gnuValueHolder.h
deleted file mode 100644
index d26dc33..0000000
--- a/libjava/gnu/CORBA/gnuValueHolder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_gnuValueHolder__
-#define __gnu_CORBA_gnuValueHolder__
-
-#pragma interface
-
-#include <org/omg/CORBA/ValueBaseHolder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class gnuValueHolder;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class BoxedValueHelper;
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::CORBA::gnuValueHolder : public ::org::omg::CORBA::ValueBaseHolder
-{
-
-public:
-  gnuValueHolder(::java::io::Serializable *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-public: // actually package-private
-  virtual void findHelper();
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::org::omg::CORBA::ValueBaseHolder)))) type;
-  ::org::omg::CORBA::portable::BoxedValueHelper * helper;
-  jboolean helper_NA;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_gnuValueHolder__
diff --git a/libjava/gnu/CORBA/interfaces/SocketFactory.h b/libjava/gnu/CORBA/interfaces/SocketFactory.h
deleted file mode 100644
index b6c1cea..0000000
--- a/libjava/gnu/CORBA/interfaces/SocketFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_interfaces_SocketFactory__
-#define __gnu_CORBA_interfaces_SocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace interfaces
-      {
-          class SocketFactory;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-        class Socket;
-    }
-  }
-}
-
-class gnu::CORBA::interfaces::SocketFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::ServerSocket * createServerSocket(jint) = 0;
-  virtual ::java::net::Socket * createClientSocket(::java::lang::String *, jint) = 0;
-  static ::java::lang::String * PROPERTY;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_CORBA_interfaces_SocketFactory__
diff --git a/libjava/gnu/CORBA/typecodes/AliasTypeCode.h b/libjava/gnu/CORBA/typecodes/AliasTypeCode.h
deleted file mode 100644
index 1615821..0000000
--- a/libjava/gnu/CORBA/typecodes/AliasTypeCode.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_AliasTypeCode__
-#define __gnu_CORBA_typecodes_AliasTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class AliasTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::AliasTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  AliasTypeCode(::org::omg::CORBA::TypeCode *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::TypeCode * content_type();
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *);
-  virtual jboolean equivalent(::org::omg::CORBA::TypeCode *);
-  virtual ::java::lang::String * id();
-  virtual ::java::lang::String * name();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) id__;
-  ::java::lang::String * name__;
-  ::org::omg::CORBA::TypeCode * aliasFor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_AliasTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/ArrayTypeCode.h b/libjava/gnu/CORBA/typecodes/ArrayTypeCode.h
deleted file mode 100644
index 4565632..0000000
--- a/libjava/gnu/CORBA/typecodes/ArrayTypeCode.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_ArrayTypeCode__
-#define __gnu_CORBA_typecodes_ArrayTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::ArrayTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  ArrayTypeCode(::org::omg::CORBA::TCKind *);
-  ArrayTypeCode(::org::omg::CORBA::TCKind *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * content_type();
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *);
-  virtual ::java::lang::String * id();
-  virtual jint length();
-  virtual void setLength(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) of;
-private:
-  jint length__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_ArrayTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/FixedTypeCode.h b/libjava/gnu/CORBA/typecodes/FixedTypeCode.h
deleted file mode 100644
index 2acd5e9..0000000
--- a/libjava/gnu/CORBA/typecodes/FixedTypeCode.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_FixedTypeCode__
-#define __gnu_CORBA_typecodes_FixedTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class FixedTypeCode;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::FixedTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  FixedTypeCode();
-  FixedTypeCode(::java::math::BigDecimal *);
-  virtual void setDigits(jint);
-  virtual void setScale(jint);
-  static jint countDigits(::java::math::BigDecimal *);
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *);
-  virtual jshort fixed_digits();
-  virtual jshort fixed_scale();
-private:
-  static const jlong serialVersionUID = 1LL;
-  jshort __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) digits;
-  jshort scale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_FixedTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/GeneralTypeCode.h b/libjava/gnu/CORBA/typecodes/GeneralTypeCode.h
deleted file mode 100644
index a522ad0..0000000
--- a/libjava/gnu/CORBA/typecodes/GeneralTypeCode.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_GeneralTypeCode__
-#define __gnu_CORBA_typecodes_GeneralTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class GeneralTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::GeneralTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  GeneralTypeCode(::org::omg::CORBA::TCKind *);
-  virtual void setConcreteBase_type(::org::omg::CORBA::TypeCode *);
-  virtual void setContentType(::org::omg::CORBA::TypeCode *);
-  virtual void setId(::java::lang::String *);
-  virtual void setLength(jint);
-  virtual void setName(::java::lang::String *);
-  virtual void setTypeModifier(jint);
-  virtual ::org::omg::CORBA::TypeCode * concrete_base_type();
-  virtual ::org::omg::CORBA::TypeCode * content_type();
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *);
-  virtual jboolean equivalent(::org::omg::CORBA::TypeCode *);
-  virtual ::java::lang::String * id();
-  virtual jint length();
-  virtual ::java::lang::String * name();
-  virtual jshort type_modifier();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  static jint UNSET;
-private:
-  static ::java::util::BitSet * lengthAllowed;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) id__;
-  ::java::lang::String * name__;
-  ::org::omg::CORBA::TypeCode * concrete_base_type__;
-  ::org::omg::CORBA::TypeCode * content_type__;
-  jint len;
-  jint type_modifier__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_GeneralTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/PrimitiveTypeCode.h b/libjava/gnu/CORBA/typecodes/PrimitiveTypeCode.h
deleted file mode 100644
index dda2b7f..0000000
--- a/libjava/gnu/CORBA/typecodes/PrimitiveTypeCode.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_PrimitiveTypeCode__
-#define __gnu_CORBA_typecodes_PrimitiveTypeCode__
-
-#pragma interface
-
-#include <org/omg/CORBA/TypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class PrimitiveTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::PrimitiveTypeCode : public ::org::omg::CORBA::TypeCode
-{
-
-public:
-  PrimitiveTypeCode(::org::omg::CORBA::TCKind *);
-  virtual ::org::omg::CORBA::TypeCode * concrete_base_type();
-  virtual ::org::omg::CORBA::TypeCode * content_type();
-  virtual jint default_index();
-  virtual ::org::omg::CORBA::TypeCode * discriminator_type();
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *);
-  virtual jboolean equivalent(::org::omg::CORBA::TypeCode *);
-  virtual jshort fixed_digits();
-  virtual jshort fixed_scale();
-  virtual ::org::omg::CORBA::TypeCode * get_compact_typecode();
-  virtual ::java::lang::String * id();
-  virtual ::org::omg::CORBA::TCKind * kind();
-  virtual jint length();
-  virtual jint member_count();
-  virtual ::org::omg::CORBA::Any * member_label(jint);
-  virtual ::java::lang::String * member_name(jint);
-  virtual ::org::omg::CORBA::TypeCode * member_type(jint);
-  virtual jshort member_visibility(jint);
-  virtual ::java::lang::String * name();
-  virtual jshort type_modifier();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  ::org::omg::CORBA::TCKind * __attribute__((aligned(__alignof__( ::org::omg::CORBA::TypeCode)))) kind__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_PrimitiveTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/RecordTypeCode$Field.h b/libjava/gnu/CORBA/typecodes/RecordTypeCode$Field.h
deleted file mode 100644
index d5de501..0000000
--- a/libjava/gnu/CORBA/typecodes/RecordTypeCode$Field.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_RecordTypeCode$Field__
-#define __gnu_CORBA_typecodes_RecordTypeCode$Field__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class RecordTypeCode$Field;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::RecordTypeCode$Field : public ::java::lang::Object
-{
-
-public:
-  RecordTypeCode$Field();
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) label;
-  ::java::lang::String * name;
-  ::org::omg::CORBA::TypeCode * type;
-  jint visibility;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_RecordTypeCode$Field__
diff --git a/libjava/gnu/CORBA/typecodes/RecordTypeCode.h b/libjava/gnu/CORBA/typecodes/RecordTypeCode.h
deleted file mode 100644
index be711a8..0000000
--- a/libjava/gnu/CORBA/typecodes/RecordTypeCode.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_RecordTypeCode__
-#define __gnu_CORBA_typecodes_RecordTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/GeneralTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-        class CorbaList;
-      namespace typecodes
-      {
-          class RecordTypeCode;
-          class RecordTypeCode$Field;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class StructMember;
-          class TCKind;
-          class TypeCode;
-          class UnionMember;
-          class ValueMember;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::RecordTypeCode : public ::gnu::CORBA::typecodes::GeneralTypeCode
-{
-
-public:
-  RecordTypeCode(::org::omg::CORBA::TCKind *);
-  virtual void setDefaultIndex(jint);
-  virtual void setDiscriminator_type(::org::omg::CORBA::TypeCode *);
-  virtual ::gnu::CORBA::typecodes::RecordTypeCode$Field * getField(jint);
-  virtual void add(::gnu::CORBA::typecodes::RecordTypeCode$Field *);
-  virtual void add(::org::omg::CORBA::StructMember *);
-  virtual void add(::org::omg::CORBA::ValueMember *);
-  virtual void add(::org::omg::CORBA::UnionMember *);
-  virtual jint default_index();
-  virtual ::org::omg::CORBA::TypeCode * discriminator_type();
-  virtual ::gnu::CORBA::typecodes::RecordTypeCode$Field * field();
-  virtual jint member_count();
-  virtual ::org::omg::CORBA::Any * member_label(jint);
-  virtual ::java::lang::String * member_name(jint);
-  virtual ::org::omg::CORBA::TypeCode * member_type(jint);
-  virtual jshort member_visibility(jint);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  ::gnu::CORBA::CorbaList * __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::GeneralTypeCode)))) members;
-private:
-  ::org::omg::CORBA::TypeCode * discriminator_type__;
-  jint default_index__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_RecordTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/RecursiveTypeCode.h b/libjava/gnu/CORBA/typecodes/RecursiveTypeCode.h
deleted file mode 100644
index 4fcc4fe..0000000
--- a/libjava/gnu/CORBA/typecodes/RecursiveTypeCode.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_RecursiveTypeCode__
-#define __gnu_CORBA_typecodes_RecursiveTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class RecursiveTypeCode;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::RecursiveTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  RecursiveTypeCode(::java::lang::String *);
-  virtual ::java::lang::String * id();
-private:
-  static const jlong serialVersionUID = 1LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) the_id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_RecursiveTypeCode__
diff --git a/libjava/gnu/CORBA/typecodes/StringTypeCode.h b/libjava/gnu/CORBA/typecodes/StringTypeCode.h
deleted file mode 100644
index 6513b3c..0000000
--- a/libjava/gnu/CORBA/typecodes/StringTypeCode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_CORBA_typecodes_StringTypeCode__
-#define __gnu_CORBA_typecodes_StringTypeCode__
-
-#pragma interface
-
-#include <gnu/CORBA/typecodes/PrimitiveTypeCode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class StringTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TCKind;
-      }
-    }
-  }
-}
-
-class gnu::CORBA::typecodes::StringTypeCode : public ::gnu::CORBA::typecodes::PrimitiveTypeCode
-{
-
-public:
-  StringTypeCode(::org::omg::CORBA::TCKind *);
-  virtual void setLength(jint);
-  virtual jint length();
-private:
-  static const jlong serialVersionUID = 1LL;
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::typecodes::PrimitiveTypeCode)))) len;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_CORBA_typecodes_StringTypeCode__
diff --git a/libjava/gnu/awt/LightweightRedirector.h b/libjava/gnu/awt/LightweightRedirector.h
deleted file mode 100644
index 03474c0..0000000
--- a/libjava/gnu/awt/LightweightRedirector.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_LightweightRedirector__
-#define __gnu_awt_LightweightRedirector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-        class LightweightRedirector;
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-      namespace event
-      {
-          class InputEvent;
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::awt::LightweightRedirector : public ::java::lang::Object
-{
-
-public:
-  LightweightRedirector();
-  virtual ::java::awt::AWTEvent * redirect(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual ::java::awt::event::MouseEvent * redirectMouse(::java::awt::event::MouseEvent *);
-  virtual jint getButtonNumber(::java::awt::event::InputEvent *);
-  static const jint LAST_BUTTON_NUMBER = 3;
-  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) releaseTargets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_LightweightRedirector__
diff --git a/libjava/gnu/awt/LightweightRedirector.java b/libjava/gnu/awt/LightweightRedirector.java
deleted file mode 100644
index 41dc124..0000000
--- a/libjava/gnu/awt/LightweightRedirector.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt;
-
-import java.awt.AWTEvent;
-import java.awt.AWTError;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.event.MouseEvent;
-import java.awt.event.InputEvent;
-
-/**
- * Encapsulates the logic required to dispatch events to the correct
- * component in a component tree that may contain lightweight
- * components. Toolkits typically only identify heavyweight components
- * as the source of events. This class redirects the events to the
- * appropriate lightweight children of the heavyweight component.
- */
-public class LightweightRedirector
-{
-  final static int LAST_BUTTON_NUMBER = 3;
-
-  /* We sacrifice one array element to allow the button number to 
-     match the index of this array. */
-  Component[] releaseTargets = new Component[LAST_BUTTON_NUMBER+1];
-
-  /** 
-   *
-   * Modifies or replaces the given event with an event that has been
-   * properly redirected.  State of button presses are kept so that
-   * button releases can be redirected to the same component as the
-   * button press.  It is required that all events are sent through
-   * this method in chronological order.
-   */
-  public AWTEvent redirect(AWTEvent event)
-  {
-    if (event instanceof MouseEvent)
-      return redirectMouse((MouseEvent) event);
-
-    /* In case we don't know how to redirect the event, simply return
-       the event unchanged. */
-    return event;
-  }
-
-  MouseEvent redirectMouse(MouseEvent event)
-  {
-    int button = getButtonNumber(event);
-    int id = event.getID();
-
-    Component heavySource = (Component) event.getSource();
-    Component source = heavySource;
-    int x = event.getX();
-    int y = event.getY();
-
-    if (id == MouseEvent.MOUSE_RELEASED)
-      {
-	Component target = releaseTargets[button];
-
-	if (target != null)
-	  {
-	    releaseTargets[button] = null;
-	    source = target;
-
-	    Component child = source;
-	    while (child != heavySource)
-	      {
-		x -= child.getX();
-		y -= child.getY();
-		child = child.getParent();
-		if (child == null)
-		  System.err.println("warning, orphaned release target");
-	      }
-	  }
-      }
-    else
-      {
-	/* Find real component, and adjust source, x and y
-	   accordingly. */
-	
-	while (true)
-	  {
-	    Component parent = source;
-	    
-	    Component child = parent.getComponentAt(x, y);
-	    
-	    if (parent == child)
-	      break;
-	    
-	    // maybe ignoring would be better?
-	    if (child == null)
-	      {
-		String msg = "delivered event not within component. " +
-		  "Heavyweight source was " + heavySource + ". " +
-		  "Component was " + parent;
-		throw new AWTError(msg);
-	      }
-	    if (child.isLightweight())
-	      {
-		// descend down to child
-		source = child;
-		x -= child.getX();
-		y -= child.getY();
-	      }
-	    else
-	      {
-		System.err.println("warning: event delivered to wrong " +
-				   "heavyweight component. Was " +
-				   "delivered to " + source + ". " +
-				   "Should have been delivered to " +
-				   child + ". Maybe the native window " +
-				   "system is bubbling events up the " +
-				   "containment hierarchy.");
-		break;
-	      }
-	  }
-	
-	/* ensure that the release event is delivered to the same
-	   component as the press event. For most toolkits this is
-	   only necessary for lightweight components, since the
-	   underlying windowing system takes care of its heavyweight
-	   components. */
-	if (id == MouseEvent.MOUSE_PRESSED)
-	  releaseTargets[button] = source;
-      }
-    
-    
-    if (source == heavySource)
-      return event; // no change in event
-    
-    // print warning for heavyweights
-    /* this warning can safely be removed if a toolkit that
-       needs heavyweight redirection support is ever created. */
-    if (!source.isLightweight())
-      System.err.println("warning: redirecting to heavyweight");
-    
-    MouseEvent redirected = new MouseEvent(source, event.getID(),
-					   event.getWhen(),
-					   event.getModifiersEx(),
-					   x, y,
-					   event.getClickCount(),
-					   event.isPopupTrigger());
-    
-    return redirected;
-  }
-  
-  /**
-   * Identifies the button number for an input event.
-   * 
-   * @returns the button number, or 0 if no button modifier was set
-   * for the event.
-   */
-  int getButtonNumber(InputEvent event)
-  {
-    int modifiers = event.getModifiersEx();
-    
-    modifiers &=
-      InputEvent.BUTTON1_DOWN_MASK |
-      InputEvent.BUTTON2_DOWN_MASK |
-      InputEvent.BUTTON3_DOWN_MASK;
-    
-    switch (modifiers)
-      {
-      case InputEvent.BUTTON1_DOWN_MASK:
-	return 1;
-      case InputEvent.BUTTON2_DOWN_MASK:
-	return 2;
-      case InputEvent.BUTTON3_DOWN_MASK:
-	return 3;
-      case 0:
-	return 0;
-
-      default:
-	System.err.println("FIXME: multibutton event");
-	return 0;
-      }
-  }
-}
diff --git a/libjava/gnu/awt/j2d/AbstractGraphicsState.h b/libjava/gnu/awt/j2d/AbstractGraphicsState.h
deleted file mode 100644
index 973d910..0000000
--- a/libjava/gnu/awt/j2d/AbstractGraphicsState.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_AbstractGraphicsState__
-#define __gnu_awt_j2d_AbstractGraphicsState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class AbstractGraphicsState;
-          class Graphics2DImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::awt::j2d::AbstractGraphicsState : public ::java::lang::Object
-{
-
-public:
-  AbstractGraphicsState();
-  virtual void setFrontend(::gnu::awt::j2d::Graphics2DImpl *);
-  virtual void dispose();
-  virtual void setColor(::java::awt::Color *) = 0;
-  virtual void setPaintMode() = 0;
-  virtual void setXORMode(::java::awt::Color *) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual void setClip(::java::awt::Shape *) = 0;
-  virtual ::java::awt::Shape * getClip() = 0;
-  virtual ::java::awt::Rectangle * getClipBounds() = 0;
-  virtual void copyArea(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawLine(jint, jint, jint, jint) = 0;
-  virtual void fillRect(jint, jint, jint, jint) = 0;
-  virtual void clearRect(jint, jint, jint, jint) = 0;
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawOval(jint, jint, jint, jint) = 0;
-  virtual void fillOval(jint, jint, jint, jint) = 0;
-  virtual void drawArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void fillArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void draw(::java::awt::Shape *) = 0;
-  virtual void fill(::java::awt::Shape *) = 0;
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean) = 0;
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual void drawString(::java::lang::String *, jfloat, jfloat) = 0;
-  virtual void translate(jint, jint) = 0;
-  virtual void translate(jdouble, jdouble) = 0;
-  virtual void rotate(jdouble) = 0;
-  virtual void rotate(jdouble, jdouble, jdouble) = 0;
-  virtual void scale(jdouble, jdouble) = 0;
-  virtual void shear(jdouble, jdouble) = 0;
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  ::gnu::awt::j2d::Graphics2DImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) frontend;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_j2d_AbstractGraphicsState__
diff --git a/libjava/gnu/awt/j2d/AbstractGraphicsState.java b/libjava/gnu/awt/j2d/AbstractGraphicsState.java
deleted file mode 100644
index 038bc9c..0000000
--- a/libjava/gnu/awt/j2d/AbstractGraphicsState.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright (C) 2000, 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.j2d;
-
-import java.awt.Color;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.Rectangle;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.image.ImageObserver;
-
-/**
- * Base class for graphics state objects (State pattern, GOF book)
- * that represents the current pipeline configuration. The Graphics2D
- * object forwards most of the requests to the state object. The
- * Graphics2D object itself only administers properties that are not
- * specific for a certain state.
- */
-public abstract class AbstractGraphicsState implements Cloneable
-{
-  Graphics2DImpl frontend;
-
-  public void setFrontend(Graphics2DImpl frontend)
-  {
-    this.frontend = frontend;
-  }
-  
-  public void dispose()
-  {
-    frontend = null;
-  }
-
-  // -------- Graphics methods:
-  
-  public abstract void setColor(Color color);
-
-  public abstract void setPaintMode();
-
-  public abstract void setXORMode(Color altColor);
-
-  public abstract void setFont(Font font);
-
-  public abstract FontMetrics getFontMetrics(Font font);
-
-  public abstract void setClip(Shape clip);
-
-  public abstract Shape getClip();
-  public abstract Rectangle getClipBounds();
-
-  public abstract void copyArea(int x, int y, 
-				int width, int height,
-				int dx, int dy);
-
-  public abstract void drawLine(int x1, int y1,
-				int x2, int y2);
-  
-  public abstract void fillRect(int x, int y,
-				int width, int height);
-  
-  public abstract void clearRect(int x, int y,
-				 int width, int height);
-  
-  public abstract void drawRoundRect(int x, int y,
-				     int width, int height,
-				     int arcWidth, int arcHeight);
-  
-  public abstract void fillRoundRect(int x, int y,
-				     int width, int height,
-				     int arcWidth, int arcHeight);
-  
-  public abstract void drawOval(int x, int y,
-				int width, int height);
-  
-  public abstract void fillOval(int x, int y,
-				int width, int height);
-  
-  public abstract void drawArc(int x, int y,
-			       int width, int height,
-			       int startAngle, int arcAngle);
-  
-  public abstract void fillArc(int x, int y,
-			       int width, int height,
-			       int startAngle, int arcAngle);
-  
-  public abstract void drawPolyline(int[] xPoints, int[] yPoints,int nPoints);
-
-  public abstract void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
-    
-  public abstract void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
-
-  public abstract boolean drawImage(Image image, int x, int y,
-				    ImageObserver observer);
-    
-
-  // -------- Graphics2D methods:
-
-  public abstract void draw(Shape shape);
-
-  public abstract void fill(Shape shape);
-    
-  public abstract boolean hit(Rectangle rect, Shape text, boolean onStroke);
-  
-  public abstract void drawString(String text, int x, int y);
-  
-  public abstract void drawString(String text, float x, float y);
-  
-  public abstract void translate(int x, int y);
-  
-  public abstract void translate(double tx, double ty);
-  
-  public abstract void rotate(double theta);
-  
-  public abstract void rotate(double theta, double x, double y);
-  
-  public abstract void scale(double scaleX, double scaleY);
-  
-  public abstract void shear(double shearX, double shearY);
-
-  public Object clone ()
-  {
-    try
-      {
-	return super.clone ();
-      }
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-}
diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.h b/libjava/gnu/awt/j2d/DirectRasterGraphics.h
deleted file mode 100644
index 4cb63f7..0000000
--- a/libjava/gnu/awt/j2d/DirectRasterGraphics.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_DirectRasterGraphics__
-#define __gnu_awt_j2d_DirectRasterGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class DirectRasterGraphics;
-          class MappedRaster;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::awt::j2d::DirectRasterGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual void setColor(::java::awt::Color *) = 0;
-  virtual void setPaintMode() = 0;
-  virtual void setXORMode(::java::awt::Color *) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual void setClip(::java::awt::Shape *) = 0;
-  virtual void copyArea(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawLine(jint, jint, jint, jint) = 0;
-  virtual void drawRect(jint, jint, jint, jint) = 0;
-  virtual void fillRect(jint, jint, jint, jint) = 0;
-  virtual void drawArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void fillArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint, jint, jint) = 0;
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::gnu::awt::j2d::MappedRaster * mapRaster(::java::awt::Rectangle *) = 0;
-  virtual void unmapRaster(::gnu::awt::j2d::MappedRaster *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_awt_j2d_DirectRasterGraphics__
diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.java b/libjava/gnu/awt/j2d/DirectRasterGraphics.java
deleted file mode 100644
index d7248b9..0000000
--- a/libjava/gnu/awt/j2d/DirectRasterGraphics.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.j2d;
-
-import java.awt.Color;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.Rectangle;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.image.Raster;
-import java.awt.image.ImageObserver;
-
-/**
- * Interface for a simple pixel based backend graphics object that
- * does not handle translation/transforms, curves, nor advanced
- * compositing.
- */
-public interface DirectRasterGraphics extends Cloneable
-{
-  void dispose();
-  
-  void setColor(Color color);
-  
-  void setPaintMode();
-  
-  void setXORMode(Color altColor);
-  
-  void setFont(Font font);
-  
-  FontMetrics getFontMetrics(Font font);
-  
-  // supports rects, multi-rects and polygons
-  void setClip(Shape clip);
-  
-  void copyArea(int x, int y, int width, int height,
-		       int dx, int dy);
-  
-  void drawLine(int x1, int y1, int x2, int y2);
-  
-  void drawRect(int x, int y, int width, int height);
-  
-  void fillRect(int x, int y, int width, int height);
-  
-  void drawArc(int x, int y, int width, int height,
-		      int startAngle, int arcAngle);
-  
-  void fillArc(int x, int y, int width, int height,
-		      int startAngle, int arcAngle);
-  
-  void drawPolyline(int[] xPoints, int[] yPoints, int nPoints);
-  
-  void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
-  
-  void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
-			  int translateX, int translateY);
-  
-  void drawString(String str, int x, int y);
-  
-  boolean drawImage(Image image, int x, int y,
-			   ImageObserver observer);
-
-  /**
-   * Map the data for screen pixels in the requested bounds to a
-   * raster object.  This gives read/write access to the screen
-   * pixels, allowing neat alpha and composite tricks.
-   */
-  MappedRaster mapRaster(Rectangle bounds);
-  
-  /**
-   * Detach previously mapped pixel data from a raster object.
-   */
-  void unmapRaster(MappedRaster mappedRaster);
-  
-  Object clone();
-}
diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.h b/libjava/gnu/awt/j2d/Graphics2DImpl.h
deleted file mode 100644
index c7e8a8c..0000000
--- a/libjava/gnu/awt/j2d/Graphics2DImpl.h
+++ /dev/null
@@ -1,157 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_Graphics2DImpl__
-#define __gnu_awt_j2d_Graphics2DImpl__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class AbstractGraphicsState;
-          class Graphics2DImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::awt::j2d::Graphics2DImpl : public ::java::awt::Graphics2D
-{
-
-public:
-  Graphics2DImpl(::java::awt::GraphicsConfiguration *);
-  virtual void setState(::gnu::awt::j2d::AbstractGraphicsState *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::Color * getColor();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual void setClip(::java::awt::Shape *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void dispose();
-  virtual void draw(::java::awt::Shape *);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void fill(::java::awt::Shape *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual void setPaint(::java::awt::Paint *);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual ::java::awt::Paint * getPaint();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual void clip(::java::awt::Shape *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void setComposite(::java::awt::Composite *);
-  virtual void setStroke(::java::awt::Stroke *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::awt::Composite * getComposite();
-  virtual ::java::awt::Stroke * getStroke();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-public: // actually package-private
-  ::java::awt::GraphicsConfiguration * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) config;
-  ::gnu::awt::j2d::AbstractGraphicsState * state;
-  ::java::awt::Color * fg;
-  ::java::awt::Color * bg;
-  ::java::awt::Font * font;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_j2d_Graphics2DImpl__
diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.java b/libjava/gnu/awt/j2d/Graphics2DImpl.java
deleted file mode 100644
index 5091af6..0000000
--- a/libjava/gnu/awt/j2d/Graphics2DImpl.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.j2d;
-
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.Rectangle;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Paint;
-import java.awt.RenderingHints;
-import java.awt.Stroke;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.ImageObserver;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-/**
- * Delegates almost all work to a state object, that allows us to
- * hot-swap rendering strategies based on state changes inflicted on
- * this Graphics object. This class keeps track of properties that are
- * not affected by the state, (such as clip shape,
- * foreground/background color, font, etc.).
- *
- * <p>The far front-end of the rendering pipeline consists of the
- * Graphics2D API. In the far back-end, lies the native graphics
- * libraries. In most cases the native graphics libraries only have
- * direct support for a subset of the properties of Graphics2D. To
- * make up missing features in the native graphics libraries, the
- * pipeline between the front-end and the back-end need to translate
- * drawing request to primitive operations that are supported by the
- * back-end. E.g. for X11, drawing a straight line will translate to
- * an XDrawLine, drawing a bezier curve will trigger flattening of the
- * curve and will result in a call to XDrawLines.
- *
- * <p>This is the basic strategy for the rendering pipeline: Whenever
- * a graphics property change occurs, that causes the current pipeline
- * to be insufficient, amend or replace parts of the pipeline so that
- * the pipeline will once again be able to translate requests to the
- * set of primitives supported by the native graphics library.
- *
- * <p>Most graphics libraries share common subsets of
- * functionality. To be able to reuse pieces of the rendering pipeline
- * for several backends, we define interfaces that describe subsets of
- * characteristics supported by the backends. A wrapper for the native
- * library can implement several interfaces to describe its range of
- * functionality.
- *
- * <p>Typically, most painting is done with a graphics object with
- * simple properties. Unless one is using a complex Look & Feel, the
- * painting of Swing components will never require affine transforms,
- * alpha blending, non-rectangular clipping, etc. When graphics
- * objects are created, they start off in a state where all the
- * properties are simple. Most graphics objects experience only
- * trivial property changes, and never leave this simple state. It is
- * therefore wise to ensure that the rendering pipeline for this
- * initial state is lean and as much as possible plugs directly into
- * the backend.
- *
- * <p>The initial state for graphics object of most raster displays
- * would call for two levels of indirection:
- *
- * <pre>
- * Graphics2D object ---> IntegerGraphicsState ---> DirectRasterGraphics
- * </pre>
- */
-public class Graphics2DImpl extends Graphics2D implements Cloneable
-{
-  GraphicsConfiguration config;
-
-  AbstractGraphicsState state;
-    
-  Color fg;
-  Color bg;
-
-  Font font;
-  
-  public Graphics2DImpl(GraphicsConfiguration config)
-  {
-    this.config = config;
-  }
-  
-  public void setState(AbstractGraphicsState state)
-  {
-    this.state = state;
-    this.state.setFrontend(this);
-  }
-    
-  public Object clone()
-  {
-    try
-      {
-	Graphics2DImpl gfxCopy = (Graphics2DImpl) super.clone();
-	AbstractGraphicsState stateCopy =
-	  (AbstractGraphicsState) state.clone();
-	gfxCopy.setState(stateCopy);
-	
-	return gfxCopy;
-      }
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-
-
-  // -------- Graphics methods:
-
-  public Graphics create()
-  {
-    Graphics2DImpl gfxCopy = (Graphics2DImpl) clone();
-    return gfxCopy;
-  }
-
-  public Color getColor()
-  {
-    return fg;
-  }
-  
-  public void setColor(Color color)
-  {
-    fg = color;
-    state.setColor(color);
-  }
-
-  public void setPaintMode()
-  {
-    state.setPaintMode();
-  }
-
-  public void setXORMode(Color altColor)
-  {
-    state.setXORMode(altColor);
-  }
-
-  public Font getFont()
-  {
-    return font;
-  }
-
-  public void setFont(Font font)
-  {
-    this.font = font;
-    state.setFont(font);
-  }
-    
-  public FontMetrics getFontMetrics(Font font)
-  {
-    return state.getFontMetrics(font);
-  }
-
-  public Rectangle getClipBounds()
-  {
-    return state.getClipBounds();
-  }
-    
-  public void clipRect(int x, int y, int width, int height)
-  {
-    Shape clip = state.getClip();
-    if (clip == null)
-    {
-      clip = new Rectangle (x,y,width,height);
-      setClip (clip);
-      return;
-    }
-    if (clip instanceof Rectangle)
-      {
-	Rectangle clipRect = (Rectangle) clip;
-	clip = clipRect.intersection(new Rectangle(x, y, width, height));
-	setClip(clip);
-	return;
-      }
-	
-    String msg =
-      "intersecting current clip shape " + clip + " with new rectangle " +
-      "has not been implemented yet";
-    throw new UnsupportedOperationException(msg);
-  }
-
-  public void setClip(int x, int y, int width, int height)
-  {
-    Rectangle clip = new Rectangle(x, y, width, height);
-    setClip(clip);
-  }
-
-  public Shape getClip()
-  {
-    return state.getClip();
-  }
-
-  public void setClip(Shape clip)
-  {
-    state.setClip(clip);
-  }
-
-  public void copyArea(int x, int y, int width, int height,
-		       int dx, int dy)
-  {
-    state.copyArea(x, y, width, height, dx, dy);
-  }
-
-  public void drawLine(int x1, int y1, int x2, int y2)
-  {
-    state.drawLine(x1, y1, x2, y2);
-  }
-    
-  public void fillRect(int x, int y, int width, int height)
-  {
-    state.fillRect(x, y, width, height);
-  }
-    
-  public void clearRect(int x, int y, int width, int height)
-  {
-    state.clearRect(x, y, width, height);
-  }
-  
-  public void drawRoundRect(int x, int y, int width, int height,
-			    int arcWidth, int arcHeight)
-  {
-    state.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
-  }
-    
-  public void fillRoundRect(int x, int y, int width, int height,
-			    int arcWidth, int arcHeight)
-  {
-    state.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
-  }
-
-  public void drawOval(int x, int y, int width, int height)
-  {
-    state.drawOval(x, y, width, height);
-  }
-
-  public void fillOval(int x, int y, int width, int height)
-  {
-    state.fillOval(x, y, width, height);
-  }
-
-  public void drawArc(int x, int y, int width, int height,
-		      int startAngle, int arcAngle)
-  {
-    state.drawArc(x, y, width, height, startAngle, arcAngle);
-  }
-
-  public void fillArc(int x, int y, int width, int height,
-		      int startAngle, int arcAngle)
-  {
-    state.fillArc(x, y, width, height, startAngle, arcAngle);
-  }
-
-  public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    state.drawPolyline(xPoints, yPoints, nPoints);
-  }
-  
-  public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    state.drawPolygon(xPoints, yPoints, nPoints);
-  }
-    
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    state.fillPolygon(xPoints, yPoints, nPoints);
-  }
-    
-  public boolean drawImage(Image image, int x, int y,
-			   ImageObserver observer)
-  {
-    return state.drawImage(image, x, y, observer);
-  }
-
-  public boolean drawImage(Image img, int x, int y,
-			   int width, int height,
-			   ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public boolean drawImage(Image img, int x, int y, Color bgcolor,
-			   ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public boolean drawImage(Image img, int x, int y,
-			   int width, int height, Color bgcolor,
-			   ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public boolean drawImage(Image img,
-			   int dx1, int dy1, int dx2, int dy2,
-			   int sx1, int sy1, int sx2, int sy2,
-			   ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public boolean drawImage(Image img,
-			   int dx1, int dy1, int dx2, int dy2,
-			   int sx1, int sy1, int sx2, int sy2,
-			   Color bgcolor, ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public void dispose()
-  {
-    AbstractGraphicsState lState = state;
-    
-    state = null;
-    config = null;
-    font = null;
-    fg = null;
-    bg = null;
-    
-    if (lState != null)
-      lState.dispose();
-  }
-    
-
-
-  // -------- Graphics2D methods:
-    
-  public void draw(Shape shape)
-  {
-    state.draw(shape);
-  }
-  
-  public boolean drawImage(Image image, AffineTransform xform,
-			   ImageObserver obs)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-
-  public void drawString(String text, int x, int y)
-  {
-    state.drawString(text, x, y);
-  }
-
-  public void drawString(String text, float x, float y)
-  {
-    state.drawString(text, x, y);
-  }
-
-  public void fill(Shape shape)
-  {
-    state.fill(shape);
-  }
-
-  public boolean hit(Rectangle rect, Shape text, boolean onStroke)
-  {
-    return state.hit(rect, text, onStroke);
-  }
-    
-  public GraphicsConfiguration getDeviceConfiguration()
-  {
-    return config;
-  }
-
-  public void setPaint(Paint paint)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void setRenderingHint(RenderingHints.Key hintKey,
-			       Object hintValue)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public Object getRenderingHint(RenderingHints.Key hintKey)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public RenderingHints getRenderingHints()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-    
-  public void translate(int x, int y)
-  {
-    state.translate(x, y);
-  }
-  
-  public void translate(double tx, double ty)
-  {
-    state.translate(tx, ty);
-  }
-    
-  public void rotate(double theta)
-  {
-    state.rotate(theta);
-  }
-
-  public void rotate(double theta, double x, double y)
-  {
-    state.rotate(theta, x, y);
-  }
-  
-  public void scale(double scaleX, double scaleY)
-  {
-    state.scale(scaleX, scaleY);
-  }
-  
-  public void shear(double shearX, double shearY)
-  {
-    state.shear(shearX, shearY);
-  }
-
-  public void transform(AffineTransform Tx)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void setTransform(AffineTransform Tx)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-    
-  public AffineTransform getTransform()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Paint getPaint()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-    
-  public void setBackground(Color color)
-  {
-    bg = color;
-  }
-
-  public Color getBackground()
-  {
-    return bg;
-  }
-
-  public void clip(Shape shape)
-  {
-    Shape clip = state.getClip();
-    
-    if ((shape instanceof Rectangle) && (clip instanceof Rectangle))
-      {
-	clip = ((Rectangle) clip).intersection((Rectangle) shape);
-	state.setClip(clip);
-	return;
-      }
-	
-    String msg =
-      "intersecting current clip shape " + clip + " with new shape " + shape +
-      "has not been implemented yet";
-    throw new UnsupportedOperationException(msg);
-  }
-  
-  public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y)
-  {
-    throw new UnsupportedOperationException("not implemented yet");  
-  }
-
-  public void drawRenderedImage(RenderedImage image, AffineTransform xform)
-  {
-    throw new UnsupportedOperationException("not implemented yet");  
-  }
-
-  public void drawRenderableImage(RenderableImage image, AffineTransform xform)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void drawString(AttributedCharacterIterator iterator,
-                		  int x, int y)
-  {
-    throw new UnsupportedOperationException("not implemented yet");  
-  }
-
-  public void drawString(AttributedCharacterIterator iterator, float x, 
-			 float y)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void setComposite(Composite comp)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void setStroke(Stroke stroke)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void setRenderingHints(Map hints)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void addRenderingHints(Map hints)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Composite getComposite()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Stroke getStroke()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public FontRenderContext getFontRenderContext ()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void drawGlyphVector (GlyphVector g, float x, float y)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-}
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.h b/libjava/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.h
deleted file mode 100644
index eaa7c93..0000000
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_IntegerGraphicsState$ScreenCoupledImage__
-#define __gnu_awt_j2d_IntegerGraphicsState$ScreenCoupledImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class IntegerGraphicsState$ScreenCoupledImage;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class gnu::awt::j2d::IntegerGraphicsState$ScreenCoupledImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_awt_j2d_IntegerGraphicsState$ScreenCoupledImage__
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.h b/libjava/gnu/awt/j2d/IntegerGraphicsState.h
deleted file mode 100644
index 9a22609..0000000
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_IntegerGraphicsState__
-#define __gnu_awt_j2d_IntegerGraphicsState__
-
-#pragma interface
-
-#include <gnu/awt/j2d/AbstractGraphicsState.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class DirectRasterGraphics;
-          class IntegerGraphicsState;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::awt::j2d::IntegerGraphicsState : public ::gnu::awt::j2d::AbstractGraphicsState
-{
-
-public:
-  IntegerGraphicsState(::gnu::awt::j2d::DirectRasterGraphics *);
-  virtual ::java::lang::Object * clone();
-  virtual void dispose();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setClip(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-private:
-  void needAffineTransform();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::awt::j2d::AbstractGraphicsState)))) tx;
-  jint ty;
-  ::gnu::awt::j2d::DirectRasterGraphics * directGfx;
-  ::java::awt::Shape * clip;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_j2d_IntegerGraphicsState__
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
deleted file mode 100644
index bcfacd0..0000000
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.j2d;
-
-import java.awt.Color;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.Rectangle;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.ColorModel;
-
-/**
- * IntegerGraphicsState is one of several graphics state
- * implementations.  This graphics state is used when the graphics
- * object has simple properties, (coordinate translation only, no
- * transform) and the backend supports integer coordinates (pixel
- * based). For primitive paint operations, this object translates the
- * coordinates and forwards the request to the backend. For requests
- * to draw arbitrary shapes and paths, this object translates the
- * requests to primitive drawing operations supported by the
- * backend. IntegerGraphicsState is meant to support the most common
- * state of an graphics object. The degree of functionality is roughly
- * equivalent with the old java.awt.Graphics API.
- */
-public class IntegerGraphicsState extends AbstractGraphicsState
-{
-  int tx;
-  int ty;
-  
-  DirectRasterGraphics directGfx;
-  Shape clip;
-  
-  /** Interface for images which are coupled to a GraphicsConfiguration,
-   * as is typically the case for an off-screen buffer used in
-   * double-buffering.  Any image which implements this interface is
-   * rendered directly by DirectRasterGraphics (i.e. by directGfx.drawImage)
-   */
-  public interface ScreenCoupledImage
-  {
-    /** Get the GraphicsConfiguration to which this image is coupled
-     * @return the GraphicsConfiguration
-     */
-    GraphicsConfiguration getGraphicsConfiguration ();
-  }
-  
-  public IntegerGraphicsState(DirectRasterGraphics directGfx)
-  {
-    this.directGfx = directGfx;
-  }
-  
-  public Object clone()
-  {
-    IntegerGraphicsState clone = (IntegerGraphicsState) super.clone();
-    clone.directGfx = (DirectRasterGraphics) directGfx.clone();
-    
-    return clone;
-  }
-
-  public void dispose()
-  {
-    DirectRasterGraphics lDeviceGfx = directGfx;
-    
-    directGfx = null;
-    
-    if (lDeviceGfx != null)
-      lDeviceGfx.dispose();
-    
-    super.dispose();
-  }
-  
-  // -------- Graphics methods:
-  
-  public void setColor(Color color)
-  {
-    directGfx.setColor(color);
-  }
-  
-  public void setPaintMode()
-  {
-    directGfx.setPaintMode();
-  }
-
-  public void setXORMode(Color altColor)
-  {
-    directGfx.setXORMode(altColor);
-  }
-  
-  public void setFont(Font font)
-  {
-    directGfx.setFont(font);
-  }
-  
-  public FontMetrics getFontMetrics(Font font)
-  {
-    return directGfx.getFontMetrics(font);
-  }
-
-  public void setClip(Shape clip)
-  {
-    if (clip instanceof Rectangle)
-      {
-	Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone();
-	clipRect.x += tx;
-	clipRect.y += ty;
-	
-	this.clip = clipRect;
-	
-	directGfx.setClip(clipRect);
-	return;
-      }
-    
-    String msg =
-      "translating clip shape " + clip + " into device " +
-      "coordinate space has not been implemented yet";
-    
-    throw new UnsupportedOperationException(msg);
-  }
-
-  public Shape getClip()
-  {
-    if (clip == null)
-      return null;
-    if (clip instanceof Rectangle)
-      {
-	Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone();
-	clipRect.x -= tx;
-	clipRect.y -= ty;
-	return clipRect;
-      }
-
-    String msg =
-      "translating clip shape " + clip + " into user " +
-      "coordinate space has not been implemented yet";
-    
-    throw new UnsupportedOperationException(msg);
-  }
-
-  public Rectangle getClipBounds()
-  {
-    if (clip == null)
-      return null;
-    Rectangle clipRect = clip.getBounds();
-    
-    clipRect.x -= tx;
-    clipRect.y -= ty;
-    return clipRect;
-  }
-
-  public void copyArea(int x, int y, 
-		       int width, int height,
-		       int dx, int dy)
-  {
-    directGfx.copyArea(x+tx, y+ty, width, height, dx, dy);
-  }
-
-  public void drawLine(int x1, int y1,
-		       int x2, int y2)
-  {
-    directGfx.drawLine(x1+tx, y1+ty, x2+tx, y2+ty);
-  }
-    
-  public void fillRect(int x, int y,
-		       int width, int height)
-  {
-    directGfx.fillRect(x+tx, y+ty, width, height);
-  }
-    
-  public void clearRect(int x, int y,
-			int width, int height)
-  {
-    directGfx.setColor(frontend.getBackground());
-    directGfx.fillRect(x+tx, y+ty, width, height);
-    directGfx.setColor(frontend.getColor());
-  }
-
-  public void drawRoundRect(int x, int y,
-			    int width, int height,
-			    int arcWidth, int arcHeight)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public void fillRoundRect(int x, int y,
-			    int width, int height,
-			    int arcWidth, int arcHeight)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public void drawOval(int x, int y,
-		       int width, int height)
-  {
-    drawArc (x, y, width, height, 0, 360);
-  }
-  
-  public void fillOval(int x, int y,
-		       int width, int height)
-  {
-    fillArc (x, y, width, height, 0, 360);
-  }
-
-  public void drawArc(int x, int y,
-		      int width, int height,
-		      int startAngle, int arcAngle)
-  {
-    directGfx.drawArc(x+tx, y+ty, width, height, startAngle, arcAngle);
-  }    
-
-  public void fillArc(int x, int y,
-		      int width, int height,
-		      int startAngle, int arcAngle)
-  {
-    directGfx.fillArc(x+tx, y+ty, width, height, startAngle, arcAngle);
-  }
-  
-  public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    if ((tx == 0) && (ty == 0))
-      {
-	directGfx.drawPolyline(xPoints, yPoints, nPoints);
-	return;
-      }
-	    
-    throw new UnsupportedOperationException("translate not implemented");
-  }
-
-  public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    if ((tx == 0) && (ty == 0))
-      {
-	directGfx.drawPolygon(xPoints, yPoints, nPoints);
-	return;
-      }
-
-    throw new UnsupportedOperationException("translate not implemented");
-  }
-  
-  public void fillPolygon (int[] xPoints, int[] yPoints, int nPoints)
-  {
-    // FIXME: remove tx & ty args once translation via AffineTransform
-    // is implemented.
-    directGfx.fillPolygon (xPoints, yPoints, nPoints, tx, ty);
-  }
-
-  public boolean drawImage(Image image, int x, int y,
-			   ImageObserver observer)
-  {
-    x += tx;
-    y += ty;
-    
-    if (image instanceof ScreenCoupledImage)
-    {
-      GraphicsConfiguration config
-        = ((ScreenCoupledImage)image).getGraphicsConfiguration ();
-      if (config == frontend.config)
-        return directGfx.drawImage (image, x, y, observer);
-    }
-    if (image instanceof BufferedImage)
-    {
-      BufferedImage bImage = (BufferedImage) image;
-      // FIXME: eliminate? ScreenCoupledImage is probably more efficient
-      Object config = bImage.getProperty ("java.awt.GraphicsConfiguration");
-      if (config == frontend.config)
-        return directGfx.drawImage (image, x, y, observer);
-      
-      int width = image.getWidth (null);
-      int height = image.getHeight (null);
-      
-      Rectangle bounds = new Rectangle (x, y, width, height);
-      
-      MappedRaster mr = directGfx.mapRaster (bounds);
-      
-      // manipulate raster here...
-      ColorModel colorModel = mr.getColorModel ();
-      WritableRaster raster = mr.getRaster ();
-      
-      int xEnd = x + width;
-      int yEnd = y + height;
-      
-      // FIXME: Use the following code only as a fallback. It's SLOW!
-      
-      Object rgbElem = null;
-      for (int yy=0; yy<height; yy++)
-      {
-        for (int xx=0; xx<width; xx++)
-        {
-          int srgb = bImage.getRGB (xx, yy);
-          int sa = ((srgb >>> 24) & 0xff) + 1;
-          int sr = ((srgb >>> 16) & 0xff) + 1;
-          int sg = ((srgb >>> 8) & 0xff) + 1;
-          int sb = (srgb & 0xff) + 1;
-          
-          rgbElem = raster.getDataElements (xx+x, yy+y, rgbElem);
-          int drgb = colorModel.getRGB (rgbElem);
-          int dr = ((drgb >>> 16) & 0xff) + 1;
-          int dg = ((drgb >>> 8) & 0xff) + 1;
-          int db = (drgb & 0xff) + 1;
-          int da = 256 - sa;
-          
-          dr = ((sr*sa + dr*da) >>> 8) - 1;
-          dg = ((sg*sa + dg*da) >>> 8) - 1;
-          db = ((sb*sa + db*da) >>> 8) - 1;
-          
-          drgb = (dr<<16) | (dg<<8) | db;
-          
-          rgbElem = colorModel.getDataElements (drgb, rgbElem);
-          
-          raster.setDataElements (xx+x, yy+y, rgbElem);
-        }
-      }
-      directGfx.unmapRaster (mr);
-      return true;
-      
-    }
-    throw new UnsupportedOperationException ("drawing image " + image +
-    "not implemented");
-  }
-  
-
-  // -------- Graphics2D methods:
-  
-  public void draw(Shape shape)
-  {
-    if (shape instanceof Rectangle)
-      {
-	Rectangle rect = (Rectangle) shape;
-	directGfx.drawRect(rect.x+tx, rect.y+ty, rect.width, rect.height);
-	return;
-      } 
-    
-    throw new UnsupportedOperationException("shape not implemented");
-  }
-
-  public void fill(Shape shape)
-  {
-    if (shape instanceof Rectangle)
-      {
-	Rectangle rect = (Rectangle) shape;
-	directGfx.fillRect(rect.x+tx, rect.y+ty, rect.width, rect.height);
-	return;
-      }
-    
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public boolean hit(Rectangle rect, Shape text,
-		     boolean onStroke)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  public void drawString(String text, int x, int y)
-  {
-    directGfx.drawString(text, x+tx, y+ty);
-  }
-
-  public void drawString(String text, float x, float y)
-  {
-    drawString(text, (int) x, (int) y);
-  }
-  
-  public void translate(int x, int y)
-  {
-    tx += x;
-    ty += y;
-  }
-    
-  public void translate(double tx, double ty)
-  {
-    if ((tx == 0) && (ty == 0))
-      return;
-    
-    needAffineTransform();
-  }
-
-  public void rotate(double theta)
-  {
-    if (theta == 0)
-      return;
-    
-    needAffineTransform();
-  }
-
-  public void rotate(double theta, double x, double y)
-  {
-    if (theta == 0)
-      return;
-    
-    needAffineTransform();
-  }
-
-  public void scale(double scaleX, double scaleY)
-  {
-    if ((scaleX == 1) && (scaleY == 1))
-      return;
-
-    needAffineTransform();
-  }
-  
-  public void shear(double shearX, double shearY)
-  {
-    if ((shearX == 0) && (shearY == 0))
-      return;
-    
-    needAffineTransform();
-  }   
-  
-  private void needAffineTransform()
-  {
-    throw new UnsupportedOperationException("state with affine " +
-					    "transform not implemented");
-  }
-}
diff --git a/libjava/gnu/awt/j2d/MappedRaster.h b/libjava/gnu/awt/j2d/MappedRaster.h
deleted file mode 100644
index ab5a81e..0000000
--- a/libjava/gnu/awt/j2d/MappedRaster.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_j2d_MappedRaster__
-#define __gnu_awt_j2d_MappedRaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class MappedRaster;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::awt::j2d::MappedRaster : public ::java::lang::Object
-{
-
-public:
-  MappedRaster(::java::awt::image::WritableRaster *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * getRaster();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-public: // actually package-private
-  ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::java::lang::Object)))) raster;
-  ::java::awt::image::ColorModel * cm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_j2d_MappedRaster__
diff --git a/libjava/gnu/awt/j2d/MappedRaster.java b/libjava/gnu/awt/j2d/MappedRaster.java
deleted file mode 100644
index eb41eec..0000000
--- a/libjava/gnu/awt/j2d/MappedRaster.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.j2d;
-
-import java.awt.image.WritableRaster;
-import java.awt.image.ColorModel;
-
-/* The raster and associated properties of a mapped screen region.
- * The compositing capabilities of backends are often insufficient.
- * The backend may not support alpha blending, or may not support some
- * other special compositing rule.  This means that compositing must
- * sometimes be done within the rendering pipeline.  The general
- * compositing operation consists of combining new color and alpha
- * values with existing color values on the drawing surface, to find
- * the new color values for the drawing surface. The way the values
- * are combined, determines what kind of compositing operation that is
- * performed.  The default compositing operation is alpha compositing.
- *
- * <p>In order to perform alpha compositing and other compositing
- * operations, we need access to the color values of the imagery that
- * has already been drawn on the drawing surface.  The
- * DirectRasterGraphics interface must therefore contain methods that
- * makes it possible to gain access to the pixel values of the drawing
- * surface.  The methods are modeled after the POSIX mmap() and
- * munmap() functions.  But, instead of mapping and unmapping portions
- * of data from a file descriptor to memory, the methods in
- * DirectRasterGraphics maps and unmaps portions of the drawing
- * surface to data arrays within writable raster objects.  A call to
- * mapRaster() will return a writable raster object, encapsulating the
- * image data of the drawing surface in the requested domain. The data
- * encapsulated by this raster object can be modified using the
- * WritableRaster API, or the data buffers can be retrieved from the
- * raster, so that the data arrays can be manipulated directly.  When
- * the raster image has been modified as desired, the data can be
- * resynchronized with the drawing surface by calling mapRaster().
- *
- * <p>As with mmap() and munmap() the methods may work by direct
- * manipulation of shared memory, (i.e. the raster object directly
- * wraps the actual image data of the drawing surface), or may make a
- * private copy that is resynched when the raster is unmapped. The
- * backend may choose to implement either mechanism, and the pipeline
- * code should not care what mechanism is actually used.  This design
- * allows us to make full use of speedups such as X shared memory
- * extentions when available.
- */
-public class MappedRaster
-{
-  WritableRaster raster;
-  ColorModel cm;
-  
-  public MappedRaster(WritableRaster raster, ColorModel cm)
-  {
-    this.raster = raster;
-    this.cm = cm;
-  }
-
-  public final WritableRaster getRaster()
-  {
-    return raster;
-  }
-
-  public final ColorModel getColorModel()
-  {
-    return cm;
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XCanvasPeer$DoMap.h b/libjava/gnu/awt/xlib/XCanvasPeer$DoMap.h
deleted file mode 100644
index 08498e1..0000000
--- a/libjava/gnu/awt/xlib/XCanvasPeer$DoMap.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XCanvasPeer$DoMap__
-#define __gnu_awt_xlib_XCanvasPeer$DoMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XCanvasPeer$DoMap;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Window;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XCanvasPeer$DoMap : public ::java::lang::Object
-{
-
-public:
-  XCanvasPeer$DoMap(::gnu::gcj::xlib::Window *);
-  virtual void run();
-public: // actually package-private
-  ::gnu::gcj::xlib::Window * __attribute__((aligned(__alignof__( ::java::lang::Object)))) window;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XCanvasPeer$DoMap__
diff --git a/libjava/gnu/awt/xlib/XCanvasPeer.h b/libjava/gnu/awt/xlib/XCanvasPeer.h
deleted file mode 100644
index 509b98e..0000000
--- a/libjava/gnu/awt/xlib/XCanvasPeer.h
+++ /dev/null
@@ -1,164 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XCanvasPeer__
-#define __gnu_awt_xlib_XCanvasPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XCanvasPeer;
-          class XGraphicsConfiguration;
-          class XToolkit;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Window;
-          class WindowAttributes;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::awt::xlib::XCanvasPeer : public ::java::lang::Object
-{
-
-public:
-  XCanvasPeer(::java::awt::Component *);
-public: // actually package-private
-  virtual ::gnu::gcj::xlib::Window * locateParentWindow(::java::awt::Rectangle *);
-  virtual void initWindowProperties();
-  virtual ::gnu::awt::xlib::XToolkit * getXToolkit();
-public: // actually protected
-  virtual void ensureFlush();
-public:
-  virtual ::java::awt::Component * getComponent();
-public: // actually package-private
-  virtual jlong getBasicEventMask();
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void dispose();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual jboolean isFocusTraversable();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void enable();
-  virtual void disable();
-  virtual void setEventMask(jlong);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual void hide();
-  virtual jboolean isFocusable();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual jboolean handlesWheelScrolling();
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-public: // actually package-private
-  static ::java::awt::Dimension * MIN_SIZE;
-public:
-  ::gnu::gcj::xlib::Window * __attribute__((aligned(__alignof__( ::java::lang::Object)))) window;
-public: // actually package-private
-  ::gnu::gcj::xlib::Window * parent;
-  ::java::awt::Component * component;
-  ::gnu::awt::xlib::XGraphicsConfiguration * config;
-private:
-  ::gnu::gcj::xlib::WindowAttributes * attributes;
-  jlong eventMask;
-  ::java::awt::Rectangle * locationBounds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XCanvasPeer__
diff --git a/libjava/gnu/awt/xlib/XCanvasPeer.java b/libjava/gnu/awt/xlib/XCanvasPeer.java
deleted file mode 100644
index 6d1fb67..0000000
--- a/libjava/gnu/awt/xlib/XCanvasPeer.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.Dimension;
-import java.awt.BufferCapabilities;
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.Rectangle;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Image;
-import java.awt.GraphicsConfiguration;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.AWTEvent;
-import java.awt.Cursor;
-import java.awt.Shape;
-
-import java.awt.peer.*;
-import java.awt.image.*;
-
-import java.awt.event.MouseListener;
-import java.awt.event.PaintEvent;
-
-import java.util.EventListener;
-
-import gnu.gcj.xlib.WMSizeHints;
-import gnu.gcj.xlib.Window;
-import gnu.gcj.xlib.WindowAttributes;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.Visual;
-import gnu.gcj.xlib.Screen;
-import gnu.gcj.xlib.XImage;
-
-import gnu.awt.j2d.*;
-
-import sun.awt.CausedFocusEvent;
-
-public class XCanvasPeer implements CanvasPeer
-{
-  static final Dimension MIN_SIZE = new Dimension(1, 1);
-  
-  public // temporary
-  
-  Window window;
-  Window parent;
-
-  Component component;
-  XGraphicsConfiguration config;
-  private WindowAttributes attributes = new WindowAttributes();
-  private long eventMask;
-  
-  public XCanvasPeer(Component component)
-  {
-    this.component = component;
-    
-    // Set up graphics configuration (ie. screen + visual):
-
-    config = (XGraphicsConfiguration)
-      component.getGraphicsConfiguration();
-
-    if (config == null)
-      {
-	// This will usually only happen for toplevel windows
-	config = getXToolkit().getDefaultXGraphicsConfiguration();
-      } 
-
-    Rectangle bounds = component.getBounds();
-    parent = locateParentWindow(bounds);
-	
-    // Windows in X must atleast be of size 1x1
-    boolean boundsChanged = false;
-    if (bounds.width < 1)
-      {
-	boundsChanged = true;
-	bounds.width = 1;
-      }
-    if (bounds.height < 1)
-      {
-	boundsChanged = true;
-	bounds.height = 1;
-      }
-	
-    /* don't worry about this calling back to us, since the real
-       component object has not yet received a reference to this peer
-       object. */
-    component.setBounds(bounds);
-	    
-
-    /* Set background color */
-    Color bg = component.getBackground();
-    if (bg != null)
-      {
-	int[] components =
-	{
-	  bg.getRed(),
-	  bg.getGreen(),
-	  bg.getBlue(),
-	  0xff
-	};
-
-	ColorModel cm = config.getColorModel();
-	long pixel = cm.getDataElement(components, 0);
-	attributes.setBackground(pixel);
-      }
-	
-    /* Set exposure mask so that we get exposure events
-       that can be translated into paint() calls. */
-    long eventMask = WindowAttributes.MASK_EXPOSURE;
-
-    /* It would be nice to set up all other required events here, but
-       it is not possible to do so before after all the children of
-       this component has been realized.  The reason is that it is not
-       determined whether a component is lightweight before after the
-       addNotify() method has been called.  Thus, it is not possible
-       for parent component to determine what events it needs to
-       furnish for lightweight children.  Instead, we currently rely
-       on the component calling our setEventMask() method after the
-       correct event mask has been determined. */
-
-    attributes.setEventMask(eventMask);
-	
-	    
-    // TODO: set more window attributes?
-
-    /* don't allow event queue to process events from the newly
-       created window before this peer has been registered as client
-       data. */
-    synchronized (getXToolkit().eventLoop)
-      {
-	window = new gnu.gcj.xlib.Window(parent, bounds, attributes);
-	window.setClientData(this); /* make it possible to find back
-				       to this peer object. Used by
-				       XEventQueue. */
-      }
-    
-    initWindowProperties();
-
-    if (component.isVisible())
-      EventQueue.invokeLater(new DoMap(window));
-  }
-
-  /**
-   * Override this in subclasses to implement other ways of obtaining
-   * parent windows.  Toplevel windows will typically have a different
-   * implementation.
-   */
-  gnu.gcj.xlib.Window locateParentWindow(Rectangle bounds)
-  {
-    Container parent = component.getParent();
-    while (parent.isLightweight())
-      {
-	bounds.x += parent.getX();
-	bounds.y += parent.getY();
-	parent = parent.getParent();
-	// a null pointer here is a genuine error
-      }
-    
-    XCanvasPeer parentPeer = (XCanvasPeer) parent.getPeer();
-    if (parentPeer == null)
-      throw new NullPointerException("Parent has no peer. This should " +
-				     "not be possible, since the " +
-				     "calls leading here should come " +
-				     "from parent, after it has " +
-				     "set the parent peer.");
-    return parentPeer.window;
-  }
-    
-
-  /** 
-   * Template method to allow subclasses to apply properties to X11
-   * window right after creation.
-   */
-  void initWindowProperties()
-  {
-  }
-    
-  XToolkit getXToolkit()
-  {
-    return XToolkit.INSTANCE;
-  }
-
-  protected void ensureFlush()
-  {
-    getXToolkit().flushIfIdle();
-  }
-
-  public Component getComponent()
-  {
-    return component;
-  }
-  
-  long getBasicEventMask()
-  {
-    return WindowAttributes.MASK_EXPOSURE;
-  }
-    
-  // -------- java.awt.peer.ComponentPeer implementation
-
-  public int checkImage(Image img, int width, int height, ImageObserver o)
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-  public Image createImage(ImageProducer prod)
-  {
-    return new XOffScreenImage (config, window, prod, config.getColorModel());
-  }
-  public Image createImage(int width, int height)
-  {
-    return new XOffScreenImage (config, window, width, height, config.getColorModel());
-  }
-  public void dispose()
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public GraphicsConfiguration getGraphicsConfiguration()
-  {
-    return config;
-  }
-
-  public FontMetrics getFontMetrics(Font f)
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public ColorModel getColorModel ()
-  {
-    return null;
-  }
-
-  public Graphics getGraphics()
-  {
-    DirectRasterGraphics gfxDevice = new XGraphics(window, config);
-    IntegerGraphicsState igState = new IntegerGraphicsState(gfxDevice);
-    Graphics2DImpl gfx2d = new Graphics2DImpl(config);
-
-    gfx2d.setState(igState);
-    gfx2d.setColor(component.getBackground());
-    return gfx2d;
-  }
-
-  private Rectangle locationBounds;
-  public Point getLocationOnScreen()
-  {
-    locationBounds = window.getBounds (locationBounds);
-    return new Point (locationBounds.x,locationBounds.y);
-  }
-
-  public Dimension getMinimumSize ()
-  {
-    return MIN_SIZE;
-  }
-
-  public Dimension minimumSize ()
-  {
-    return getMinimumSize ();
-  }
-
-  public Dimension getPreferredSize ()
-  {
-    return component.getSize();
-  }
-    
-  public Dimension preferredSize ()
-  {
-    return getPreferredSize();
-  }
-    
-  public Toolkit getToolkit()
-  {
-    return getXToolkit();
-  }
-
-  public void handleEvent(AWTEvent event)
-  {
-    int id = event.getID ();
-    
-    switch (id)
-    {
-      case PaintEvent.PAINT:
-      case PaintEvent.UPDATE:
-      {
-        try
-        {
-          Graphics g = getGraphics ();
-          g.setClip (((PaintEvent)event).getUpdateRect ());
-          
-          if (id == PaintEvent.PAINT)
-            component.paint (g);
-          else
-            component.update (g);
-          
-          g.dispose ();
-        }
-        catch (InternalError e)
-        {
-          System.err.println (e);
-        }
-      }
-      break;
-    }
-  }
-
-  public boolean isFocusTraversable()
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public void paint(Graphics gfx)
-  {
-    // do nothing by default
-  }
-    
-  public boolean prepareImage(Image img, int width, int height,
-			      ImageObserver o)
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public void print(Graphics graphics)
-  {
-    paint(graphics);
-  }
-
-  public void repaint(long tm, int x, int y, int w, int h)
-  {
-    /* TODO?
-
-       X allows intelligent X servers to do smart
-       refreshing. Perhaps involve X in repainting of components,
-       rather that keeping it all within the local event queue. */
-    
-    PaintEvent updateEvent = new PaintEvent(component,
-					    PaintEvent.UPDATE,
-					    new Rectangle(x, y, w, h));
-    getXToolkit().queue.postEvent(updateEvent);
-  }
-    
-  public void requestFocus()
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public void setBackground(Color color)
-  {
-    if (color != null)
-    {
-      int[] components =
-      {
-        color.getRed (),
-        color.getGreen (),
-        color.getBlue (),
-        0xff
-      };
-      
-      ColorModel cm = config.getColorModel ();
-      long pixel = cm.getDataElement (components, 0);
-      attributes.setBackground (pixel);
-      window.setAttributes (attributes);
-    }
-  }
-
-  public void setBounds(int x, int y, int width, int height)
-  {
-    width  = Math.max(width,  1);
-    height = Math.max(height, 1);
-    window.setBounds(x, y, width, height);
-    ensureFlush();	    
-  }
-    
-  public void reshape (int x, int y, int width, int height)
-  {
-    setBounds (x, y, width, height);
-  }
-
-  public void setCursor(Cursor cursor)
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    throw new UnsupportedOperationException("FIXME, not implemented");
-  }
-
-  public void enable ()
-  {
-    setEnabled (true);
-  }
-
-  public void disable ()
-  {
-    setEnabled (false);
-  }
-
-  public void setEventMask(long eventMask)
-  {
-    if (this.eventMask != eventMask)
-    {
-      this.eventMask = eventMask;
-      long xEventMask = getBasicEventMask ();
-      
-      if ((eventMask & AWTEvent.MOUSE_EVENT_MASK) != 0)
-      {
-        xEventMask |=
-          WindowAttributes.MASK_BUTTON_PRESS |
-          WindowAttributes.MASK_BUTTON_RELEASE;
-      }
-      
-      attributes.setEventMask (xEventMask);
-      window.setAttributes (attributes);
-      ensureFlush ();
-    }
-  }
-
-  public void setFont(Font font)
-  {
-    /* default canvas peer does not keep track of font, since it won't
-       paint anything. */
-  }
-
-  public void setForeground(Color color)
-  {
-    /* default canvas peer does not keep track of foreground, since it won't
-       paint anything. */
-  }
-	
-  public void setVisible(boolean visible)
-  {
-    if (visible)
-      {
-	window.map();
-	ensureFlush();	    
-      }
-    else
-      {
-	window.unmap();
-	ensureFlush();	    
-      }
-  }
-	
-  public void show ()
-  {
-    setVisible (true);
-  }
-
-  public void hide ()
-  {
-    setVisible (false);
-  }
-
-  public boolean isFocusable ()
-  {
-    return false;
-  }
-
-  public boolean requestFocus (Component source, boolean b1, 
-                               boolean b2, long x)
-  {
-    return false;
-  }
-
-  public boolean requestFocus (Component source, boolean b1, 
-                               boolean b2, long x,
-			       CausedFocusEvent.Cause cause)
-  {
-    return false;
-  }
-
-  public boolean isObscured ()
-  {
-    return false;
-  }
-
-  public boolean canDetermineObscurity ()
-  {
-    return false;
-  }
-
-  public void coalescePaintEvent (PaintEvent e)
-  {
-  }
-
-  public void updateCursorImmediately ()
-  {
-  }
-
-  public VolatileImage createVolatileImage (int width, int height)
-  {
-    return null;
-  }
-
-  public boolean handlesWheelScrolling ()
-  {
-    return false;
-  }
-
-  public void createBuffers (int x, BufferCapabilities capabilities)
-    throws java.awt.AWTException
-
-  {
-  }
-
-  public Image getBackBuffer ()
-  {
-    return null;
-  }
-
-  public void flip (BufferCapabilities.FlipContents contents)
-  {
-  }
-
-  public void destroyBuffers ()
-  {
-  }
-
-  static class DoMap implements Runnable 
-  {
-    Window window;
-    public DoMap(Window w) 
-    {
-      this.window = w;
-    }
-    
-    public void run() 
-    {
-      window.map();
-    }
-  }
-
-  /**
-   * @since 1.5
-   */
-  public boolean isRestackSupported ()
-  {
-    return false;
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void cancelPendingPaint (int x, int y, int width, int height)
-  {
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void restack ()
-  {
-  }
-
-  /**
-   * @since 1.5
-   */
-  public Rectangle getBounds ()
-  {
-    return null;
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void reparent (ContainerPeer parent)
-  {
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void setBounds (int x, int y, int width, int height, int z)
-  {
-  }
-
-  /**
-   * @since 1.5
-   */
-  public boolean isReparentSupported ()
-  {
-    return false;
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void layout ()
-  {
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XEventLoop.h b/libjava/gnu/awt/xlib/XEventLoop.h
deleted file mode 100644
index 8061e9a..0000000
--- a/libjava/gnu/awt/xlib/XEventLoop.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XEventLoop__
-#define __gnu_awt_xlib_XEventLoop__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-        class LightweightRedirector;
-      namespace xlib
-      {
-          class XEventLoop;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class XAnyEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class EventQueue;
-    }
-  }
-}
-
-class gnu::awt::xlib::XEventLoop : public ::java::lang::Object
-{
-
-public:
-  XEventLoop(::gnu::gcj::xlib::Display *, ::java::awt::EventQueue *);
-  virtual void run();
-public: // actually package-private
-  virtual jboolean postNextEvent(jboolean);
-public:
-  virtual ::java::awt::AWTEvent * getNextEvent(jboolean);
-public: // actually package-private
-  virtual jboolean loadNextEvent(jboolean);
-  virtual ::java::awt::AWTEvent * createEvent();
-  virtual ::java::awt::AWTEvent * createPaintEvent(::java::awt::Component *);
-  virtual ::java::awt::AWTEvent * createMouseEvent(jint, ::java::awt::Component *);
-  virtual void configureNotify(::java::lang::Object *);
-public:
-  virtual void flushIfIdle();
-public: // actually package-private
-  virtual void setIdle(jboolean);
-  virtual jboolean isIdle();
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-  ::java::awt::EventQueue * queue;
-  ::gnu::gcj::xlib::XAnyEvent * anyEvent;
-private:
-  ::java::lang::Thread * eventLoopThread;
-public: // actually package-private
-  ::gnu::awt::LightweightRedirector * lightweightRedirector;
-  jboolean volatile idle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XEventLoop__
diff --git a/libjava/gnu/awt/xlib/XEventLoop.java b/libjava/gnu/awt/xlib/XEventLoop.java
deleted file mode 100644
index d0c46a8..0000000
--- a/libjava/gnu/awt/xlib/XEventLoop.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package gnu.awt.xlib;
-
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-import java.awt.*;
-
-import gnu.awt.LightweightRedirector;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.XAnyEvent;
-import gnu.gcj.xlib.XExposeEvent;
-import gnu.gcj.xlib.XButtonEvent;
-import gnu.gcj.xlib.XConfigureEvent;
-import java.awt.event.PaintEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.util.Vector;
-
-public class XEventLoop implements Runnable
-{
-  Display display;
-  EventQueue queue;
-  XAnyEvent anyEvent;
-  private Thread eventLoopThread;
-  
-  LightweightRedirector lightweightRedirector = new LightweightRedirector();
-    
-  public XEventLoop(Display display, EventQueue queue)
-  {
-    this.display = display;
-    this.queue = queue;
-    
-    anyEvent = new XAnyEvent(display);
-    eventLoopThread = new Thread(this, "AWT thread for XEventLoop");
-    eventLoopThread.start();
-  }
-
-  public void run ()
-  {
-    // FIXME: do we need an interrupt mechanism for window shutdown?
-    while (true)
-      postNextEvent (true);
-  }
-  
-  /** If there's an event available, post it.
-   * @return true if an event was posted
-   */
-  boolean postNextEvent(boolean block)
-  {
-    AWTEvent evt = getNextEvent(block);
-    if (evt != null)
-      queue.postEvent(evt);
-    return evt != null;
-  }
-    
-  /** Get the next event.
-   * @param block If true, block until an event becomes available
-   */
-  public AWTEvent getNextEvent(boolean block)
-  {
-    // ASSERT:
-    if (isIdle())
-      throw new Error("should not be idle");
-    
-    AWTEvent event = null;
-    if (loadNextEvent(block))
-      {
-        event = createEvent(); 
-        event = lightweightRedirector.redirect(event);
-      }
-    return event;
-  }
-
-  boolean loadNextEvent(boolean block)
-  {
-    boolean gotEvent = false;
-    try
-      {
-	setIdle(true);
-	
-	/* The code below will result in an XFlush(). However,
-	   while we are waiting for events after calling XFlush(),
-	   new X requests issued on other threads will not
-	   automatically be flushed. This can lead to a deadlock
-	   since XFlush() will not be called before after the
-	   processing of the next event, and new events arriving
-	   might be dependent on the delivery of the X
-	   requests. 
-	   
-	   Code that issues X requests should therefore call
-	   flushIfIdle() after they're done, to ensure that the
-	   requests are delivered in a timely manner.  XFlush is not
-	   run if event processing is underway, since we are assured
-	   that the event loop execution will return to this point,
-	   where requests are flushed again, before waiting for new
-	   events.
-
-	   Alternatively, do the work on the AWT thread, since the
-	   XEventQueue knows how to flush the display when it runs out
-	   of events. */
-	
-	//display.flush(); // implicit?
-	gotEvent = anyEvent.loadNext(block);
-      }
-    catch (RuntimeException re)
-      {
-	System.err.println("Exception thrown on event thread:" + re);
-      }
-    finally
-      {
-	setIdle(false);
-      }
-    return gotEvent;
-  }
-    
-  /**
-   * @returns an AWT event created based on the current XEvent.
-   * Returns null if the current XEvent does not map to any perticular
-   * AWT event.
-   */
-    
-  AWTEvent createEvent ()
-  {
-    int type = anyEvent.getType ();
-    // Ignore some events without further processing
-    switch (type)
-    {
-      // ignore "no expose" events, which are generated whenever a  pixmap
-      // is copied to copied to a window which is entirely unobscured
-      case XAnyEvent.TYPE_NO_EXPOSE:
-      case XAnyEvent.TYPE_UNMAP_NOTIFY:     // ignore for now
-      case XAnyEvent.TYPE_MAP_NOTIFY:       // ignore for now
-      case XAnyEvent.TYPE_REPARENT_NOTIFY:  // ignore for now
-        return null;
-      default:
-        break;  // continue processing events not in ignore list
-    }
-    /* avoid attempting to get client data before client data has
-       been set. */
-    Object peer;
-    synchronized (this)
-    {
-      peer = anyEvent.getWindow ().getClientData ();
-    }
-    
-    Component source = null;
-    
-    // Try to identify source component
-    
-    if (peer instanceof XCanvasPeer)
-    {
-      source = ((XCanvasPeer) peer).getComponent ();
-    }
-    
-    if (source == null)
-    {
-      String msg = "unable to locate source for event (" +
-      anyEvent + "): peer=" + peer;
-      throw new RuntimeException (msg);
-    }
-    
-    /* if a mapping from anyEvent to AWTEvent is possible, construct a
-       new AWTEvent and return it. */
-    
-    switch (type)
-    {
-      case XAnyEvent.TYPE_EXPOSE:
-        return createPaintEvent (source);
-      case XAnyEvent.TYPE_BUTTON_PRESS:
-      case XAnyEvent.TYPE_BUTTON_RELEASE:
-        return createMouseEvent (type, source);
-      case XAnyEvent.TYPE_CONFIGURE_NOTIFY:
-        configureNotify (peer);
-        return null;
-        
-      default:
-        String msg = "Do not know how to handle event (" + anyEvent + ")";
-        throw new RuntimeException (msg);
-    }
-  }
-  
-  AWTEvent createPaintEvent(Component src)
-  {
-    XExposeEvent expose = new XExposeEvent(anyEvent);
-    PaintEvent pe = new PaintEvent(src, PaintEvent.PAINT,
-				   expose.getBounds());
-    return pe;
-  }
-    
-  AWTEvent createMouseEvent(int type, Component src)
-  {    
-    XButtonEvent buttonEvt = new XButtonEvent(anyEvent);
-    
-    int modifiers = 0; //buttonToModifierMap[buttonEvt.button];
-    
-    /* Warning: this makes assumptions on the contents of
-       X.h... Button1 = 1, Button2 = 2, etc... */
-    switch (buttonEvt.button)
-      {
-      case 1:
-	modifiers = InputEvent.BUTTON1_DOWN_MASK;
-	break;
-      case 2:
-	modifiers = InputEvent.BUTTON2_DOWN_MASK;
-	break;
-      case 3:
-	modifiers = InputEvent.BUTTON2_DOWN_MASK;
-	break;
-      }
-    
-    int state = buttonEvt.state;
-    
-    // remap bits from state to modifiers:
-    
-    if ((state & XButtonEvent.MASK_SHIFT) != 0)
-      modifiers |= InputEvent.SHIFT_MASK;
-	
-	
-    if ((state & XButtonEvent.MASK_CONTROL) != 0)
-      modifiers |= InputEvent.CTRL_MASK;
-	
-    
-    /* FIXME: we need additional X code to properly map MODn states to
-       input modifiers */
-	
-    int clickCount = 1; // FIXME... Can't get this from X.
-    boolean popupTrigger = false; // FIXME: look up policy somewhere
-	
-    int x = buttonEvt.x;
-    int y = buttonEvt.y;
-
-    int id = (type == XAnyEvent.TYPE_BUTTON_PRESS) ?
-      MouseEvent.MOUSE_PRESSED :
-      MouseEvent.MOUSE_RELEASED;
-	
-    MouseEvent me = new MouseEvent(src,
-				   id,
-				   buttonEvt.time, modifiers,
-				   buttonEvt.x, buttonEvt.y,
-				   clickCount, popupTrigger);
-    return me;
-  }
-
-  void configureNotify(Object peerObj)
-  {
-    XConfigureEvent configEvent = new XConfigureEvent(anyEvent);
-    XFramePeer peer = (XFramePeer)  peerObj;
-    
-    peer.configureNotify(configEvent);
-  }
-    
-  public void flushIfIdle()
-  {
-    if (isIdle())
-      display.flush();
-  }
-  
-  volatile boolean idle = false;
-
-  final synchronized void setIdle(boolean idle)
-  {
-    this.idle = idle;
-  }
-
-  final synchronized boolean isIdle()
-  {
-    return idle;
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XEventQueue.h b/libjava/gnu/awt/xlib/XEventQueue.h
deleted file mode 100644
index ca41be7..0000000
--- a/libjava/gnu/awt/xlib/XEventQueue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XEventQueue__
-#define __gnu_awt_xlib_XEventQueue__
-
-#pragma interface
-
-#include <java/awt/EventQueue.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XEventQueue;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-    }
-  }
-}
-
-class gnu::awt::xlib::XEventQueue : public ::java::awt::EventQueue
-{
-
-public:
-  XEventQueue(::gnu::gcj::xlib::Display *);
-  virtual ::java::awt::AWTEvent * getNextEvent();
-public: // actually package-private
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::awt::EventQueue)))) display;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XEventQueue__
diff --git a/libjava/gnu/awt/xlib/XEventQueue.java b/libjava/gnu/awt/xlib/XEventQueue.java
deleted file mode 100644
index b068daf..0000000
--- a/libjava/gnu/awt/xlib/XEventQueue.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import gnu.gcj.xlib.Display;
-import java.awt.AWTEvent;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.EventQueue;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ContainerEvent;
-
-/**
- * The main difference here from a standard EventQueue is that the X
- * display connection is flushed before waiting for more events.
- */
-public class XEventQueue extends EventQueue
-{
-  Display display;
-  
-  public XEventQueue(Display display)
-  {
-    this.display = display;
-  }
-  
-  public AWTEvent getNextEvent() throws InterruptedException
-  {
-    if ((peekEvent() == null) && (display != null))
-      display.flush();
-    AWTEvent event = super.getNextEvent();
-    if (event != null)
-    {
-      switch (event.getID ())
-      {
-        case ContainerEvent.COMPONENT_ADDED:
-        {
-          /* If a component has been added to a container, it needs to be
-           * invalidated, to ensure that it ultimately gets an addNotify.
-           * If it's not invalidated, the component will never display in 
-           * an already-showing container (probably applies only to CardLayout).
-           * Perhaps this code should be in java.awt, but the problem only seems 
-           * to happen with xlib peers (not with gtk peers) so it's here instead.
-           */
-          ContainerEvent ce = (ContainerEvent)event;
-          ce.getChild ().invalidate ();
-          ce.getContainer ().validate ();
-        }
-        break;
-
-        case ComponentEvent.COMPONENT_RESIZED:
-        {
-          ComponentEvent ce = (ComponentEvent)event;
-          // FIXME: there may be opportunities to coalesce resize events
-          ce.getComponent ().validate ();
-        }
-        break;
-
-        case ComponentEvent.COMPONENT_SHOWN:
-        {
-          ComponentEvent ce = (ComponentEvent)event;
-          Component comp = ce.getComponent ();
-          if (!comp.isValid ())
-          {
-            /* Try to validate, going up the tree to the highest-level invalid
-             * Container.  The idea is to ensure that addNotify gets called for
-             * any non-top-level component being shown, to make it create a peer.
-             */
-            Container parent = comp.getParent ();
-            while (parent != null)
-            {
-              Container next = parent.getParent ();
-              if (next == null || next.isValid ())
-              {
-                parent.validate ();
-                break;
-              }
-              else
-                parent = next;
-            }
-            if (comp instanceof Container)
-              comp.validate ();
-          }
-          comp.repaint ();
-        }
-        break;
-        
-        default:
-          break;
-      }
-    }
-    return event;
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XFontMetrics.h b/libjava/gnu/awt/xlib/XFontMetrics.h
deleted file mode 100644
index 55b2189..0000000
--- a/libjava/gnu/awt/xlib/XFontMetrics.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XFontMetrics__
-#define __gnu_awt_xlib_XFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontMetrics;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Font;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::awt::xlib::XFontMetrics : public ::java::awt::FontMetrics
-{
-
-public:
-  XFontMetrics(::gnu::gcj::xlib::Font *, ::java::awt::Font *);
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getMaxAscent();
-  virtual jint getMaxDescent();
-  virtual jint stringWidth(::java::lang::String *);
-public: // actually package-private
-  ::gnu::gcj::xlib::Font * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) xfont;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XFontMetrics__
diff --git a/libjava/gnu/awt/xlib/XFontMetrics.java b/libjava/gnu/awt/xlib/XFontMetrics.java
deleted file mode 100644
index 4e45a1f..0000000
--- a/libjava/gnu/awt/xlib/XFontMetrics.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.FontMetrics;
-
-public class XFontMetrics extends FontMetrics
-{
-  gnu.gcj.xlib.Font xfont;
-  
-  public XFontMetrics(gnu.gcj.xlib.Font xfont, java.awt.Font awtFont)
-  {
-    super(awtFont);
-    this.xfont = xfont;
-  }
-
-  public int getAscent()
-  {
-    return xfont.getAscent();
-  }
-
-  public int getDescent()
-  {
-    return xfont.getDescent();
-  }
-
-  public int getMaxAscent()
-  {
-    return xfont.getMaxAscent();
-  }
- 
-  public int getMaxDescent()
-  {
-    return xfont.getMaxDescent();
-  }
-
-  public int stringWidth(String str)
-  {
-    return xfont.getStringWidth(str);
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XFontPeer.h b/libjava/gnu/awt/xlib/XFontPeer.h
deleted file mode 100644
index b497d06..0000000
--- a/libjava/gnu/awt/xlib/XFontPeer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XFontPeer__
-#define __gnu_awt_xlib_XFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontPeer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::awt::xlib::XFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public:
-  XFontPeer(::java::lang::String *, jint);
-  XFontPeer(::java::lang::String *, jint, jfloat);
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XFontPeer__
diff --git a/libjava/gnu/awt/xlib/XFontPeer.java b/libjava/gnu/awt/xlib/XFontPeer.java
deleted file mode 100644
index cd05a11..0000000
--- a/libjava/gnu/awt/xlib/XFontPeer.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
- 
-   This file is part of libgcj.
- 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.*;
-import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.peer.ClasspathFontPeer;
-import java.util.Locale;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.text.CharacterIterator;
-
-/**
- * Classpath-compatible peer for a font
- */
-public class XFontPeer extends ClasspathFontPeer
-{
-  public XFontPeer (String name, int style)
-  {
-    this (name, style, 12 /* kludge */);
-  }
-  
-  public XFontPeer (String name, int style, float size)
-  {
-    super (name, style, (int)size);
-  }
-  
-  /**
-   * Implementation of {@link Font#canDisplay(char)}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public boolean canDisplay (Font font, int c)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#canDisplay(String)},
-   * {@link Font#canDisplay(char [], int, int)}, and
-   * {@link Font#canDisplay(CharacterIterator, int, int)}.
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public int canDisplayUpTo (Font font, CharacterIterator i, int start, int limit)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link
-   * Font#createGlyphVector(FontRenderContext, String)}, {@link
-   * Font#createGlyphVector(FontRenderContext, char[])}, and {@link
-   * Font#createGlyphVector(FontRenderContext, CharacterIterator)}.
-   *
-   * @param font the font object that the created GlyphVector will return
-   * when it gets asked for its font. This argument is needed because the
-   * public API of {@link GlyphVector} works with {@link java.awt.Font},
-   * not with font peers.
-   */
-  public GlyphVector createGlyphVector (Font font, FontRenderContext frc, CharacterIterator ci)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#createGlyphVector(FontRenderContext,
-   * int[])}.
-   *
-   * @param font the font object that the created GlyphVector will return
-   * when it gets asked for its font. This argument is needed because the
-   * public API of {@link GlyphVector} works with {@link java.awt.Font},
-   * not with font peers.
-   */
-  public GlyphVector createGlyphVector (Font font, FontRenderContext ctx, int[] glyphCodes)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getBaselineFor(char)}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public byte getBaselineFor (Font font, char c)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getFontMetrics()}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public FontMetrics getFontMetrics (Font font)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /** Returns a name for the specified glyph. This is useful for
-   * generating PostScript or PDF files that embed some glyphs of a
-   * font. If the implementation follows glyph naming conventions
-   * specified by Adobe, search engines can extract the original text
-   * from the generated PostScript and PDF files.
-   *
-   * <p>This method is currently not used by GNU Classpath. However,
-   * it would be very useful for someone wishing to write a good
-   * PostScript or PDF stream provider for the
-   * <code>javax.print</code> package.
-   *
-   * <p><b>Names are not unique:</b> Under some rare circumstances,
-   * the same name can be returned for different glyphs. It is
-   * therefore recommended that printer drivers check whether the same
-   * name has already been returned for antoher glyph, and make the
-   * name unique by adding the string ".alt" followed by the glyph
-   * index.</p>
-   *
-   * <p>This situation would occur for an OpenType or TrueType font
-   * that has a <code>post</code> table of format 3 and provides a
-   * mapping from glyph IDs to Unicode sequences through a
-   * <code>Zapf</code> table. If the same sequence of Unicode
-   * codepoints leads to different glyphs (depending on contextual
-   * position, for example, or on typographic sophistication level),
-   * the same name would get synthesized for those glyphs. To avoid
-   * this, the font peer would have to go through the names of all
-   * glyphs, which would make this operation very inefficient with
-   * large fonts.
-   *
-   * @param font the font containing the glyph whose name is
-   * requested.
-   *
-   * @param glyphIndex the glyph whose name the caller wants to
-   * retrieve.
-   *
-   * @return the glyph name, or <code>null</code> if a font does not
-   * provide glyph names.
-   */
-  public String getGlyphName (Font font, int glyphIndex)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getLineMetrics(CharacterIterator, int,
-   * int, FontRenderContext)}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public LineMetrics getLineMetrics (Font font, CharacterIterator ci, int begin, int limit, FontRenderContext rc)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getMaxCharBounds(FontRenderContext)}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public Rectangle2D getMaxCharBounds (Font font, FontRenderContext rc)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getMissingGlyphCode()}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public int getMissingGlyphCode (Font font)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getNumGlyphs()}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public int getNumGlyphs (Font font)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getPSName()}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public String getPostScriptName (Font font)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#getStringBounds(CharacterIterator, int,
-   * int, FontRenderContext)}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public Rectangle2D getStringBounds (Font font, CharacterIterator ci, int begin, int limit, FontRenderContext frc)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /** Returns the name of this font face inside the family, for example
-   * <i>&#x201c;Light&#x201d;</i>.
-   *
-   * <p>This method is currently not used by {@link Font}. However,
-   * this name would be needed by any serious desktop publishing
-   * application.
-   *
-   * @param font the font whose sub-family name is requested.
-   *
-   * @param locale the locale for which to localize the name.  If
-   * <code>locale</code> is <code>null</code>, the returned name is
-   * localized to the user&#x2019;s default locale.
-   *
-   * @return the name of the face inside its family, or
-   * <code>null</code> if the font does not provide a sub-family name.
-   */
-  public String getSubFamilyName (Font font, Locale locale)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#hasUniformLineMetrics()}
-   *
-   * @param font the font this peer is being called from. This may be
-   * useful if you are sharing peers between Font objects. Otherwise it may
-   * be ignored.
-   */
-  public boolean hasUniformLineMetrics (Font font)
-  {
-    throw new UnsupportedOperationException ();
-  }
-  
-  /**
-   * Implementation of {@link Font#layoutGlyphVector(FontRenderContext,
-   * char[], int, int, int)}.
-   *
-   * @param font the font object that the created GlyphVector will return
-   * when it gets asked for its font. This argument is needed because the
-   * public API of {@link GlyphVector} works with {@link java.awt.Font},
-   * not with font peers.
-   */
-  public GlyphVector layoutGlyphVector (Font font, FontRenderContext frc, char[] chars, int start, int limit, int flags)
-  {
-    throw new UnsupportedOperationException ();
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XFramePeer.h b/libjava/gnu/awt/xlib/XFramePeer.h
deleted file mode 100644
index 1ca28c6..0000000
--- a/libjava/gnu/awt/xlib/XFramePeer.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XFramePeer__
-#define __gnu_awt_xlib_XFramePeer__
-
-#pragma interface
-
-#include <gnu/awt/xlib/XCanvasPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFramePeer;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Window;
-          class XConfigureEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class Frame;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::awt::xlib::XFramePeer : public ::gnu::awt::xlib::XCanvasPeer
-{
-
-public:
-  XFramePeer(::java::awt::Frame *);
-public: // actually package-private
-  virtual ::gnu::gcj::xlib::Window * locateParentWindow(::java::awt::Rectangle *);
-  virtual void initWindowProperties();
-  virtual jlong getBasicEventMask();
-  virtual void configureNotify(::gnu::gcj::xlib::XConfigureEvent *);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void toBack();
-  virtual void toFront();
-  virtual void setIconImage(::java::awt::Image *);
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual void setTitle(::java::lang::String *);
-  virtual void setResizable(jboolean);
-  virtual jint getState();
-  virtual void setState(jint);
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual void setBoundsPrivate(jint, jint, jint, jint);
-  virtual ::java::awt::Rectangle * getBoundsPrivate();
-  virtual void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-  virtual void setAlwaysOnTop(jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateMinimumSize();
-  virtual void updateIconImages();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::awt::xlib::XCanvasPeer)))) processingConfigureNotify;
-public: // actually package-private
-  static ::java::awt::Insets * INSETS_0_PROTOTYPE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XFramePeer__
diff --git a/libjava/gnu/awt/xlib/XFramePeer.java b/libjava/gnu/awt/xlib/XFramePeer.java
deleted file mode 100644
index 2f9b503..0000000
--- a/libjava/gnu/awt/xlib/XFramePeer.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.*;
-import java.awt.peer.*;
-import java.awt.image.*;
-import gnu.gcj.xlib.WMSizeHints;
-import gnu.gcj.xlib.WindowAttributes;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.Visual;
-import gnu.gcj.xlib.Screen;
-import gnu.gcj.xlib.XConfigureEvent;
-
-/** FIXME: a lot of the code here should be moved down to XWindowPeer. */
-
-public class XFramePeer extends XCanvasPeer implements FramePeer
-{
-  private boolean processingConfigureNotify = false;
-  
-  public XFramePeer(Frame frame)
-  {
-    super(frame);
-    
-    // Set some defaults for a toplevel component:
-    if (frame.getFont() == null)
-      frame.setFont(new Font("helvetica", Font.PLAIN, 12));
-
-    if (frame.getBackground() == null)
-      frame.setBackground(Color.lightGray);
-
-    if (frame.getForeground() == null)
-      frame.setForeground(Color.black);
-  }
-
-  /** Find parent window for toplevel window, ie. root window of
-      selected screen. Bounds are not changed. */
-  gnu.gcj.xlib.Window locateParentWindow(Rectangle bounds)
-  {
-    Screen screen = config.getVisual().getScreen();
-    return screen.getRootWindow();
-  }
-	
-  void initWindowProperties()
-  {
-    Frame frame = (Frame) component;
-    setResizable(frame.isResizable());
-    String title = frame.getTitle();
-    if (!title.equals("")) setTitle(title);
-  }
-
-  long getBasicEventMask()
-  {
-    return super.getBasicEventMask() |
-      WindowAttributes.MASK_STRUCTURE_NOTIFY;
-  }
-
-  void configureNotify(XConfigureEvent configEvent)
-  {
-    processingConfigureNotify = true; // to avoid setBounds flood
-    component.setBounds(configEvent.getBounds());
-    processingConfigureNotify = false;
-  }
-
-  /* Overridden to ignore request to set bounds if the request occurs
-     while processing an XConfigureNotify event, in which case the X
-     window already has the desired bounds.
-     That's what java.awt.Window.setBoundsCallback is for, but it's
-     package-private, and using our own flag eliminates the need to
-     circumvent java security.
-  */
-  public void setBounds(int x, int y, int width, int height)
-  {
-    if (!processingConfigureNotify)
-      super.setBounds(x, y, width, height);
-  }
-  
-  // Implementing ContainerPeer:
-
-  static final Insets INSETS_0_PROTOTYPE = new Insets(0, 0, 0, 0);
-
-  public Insets getInsets()
-  {
-    return (Insets) INSETS_0_PROTOTYPE.clone();
-  }
-
-  public Insets insets ()
-  {
-    return getInsets ();
-  }
-
-  public void beginValidate()
-  {
-  }
-
-  public void endValidate()
-  {
-    // reassert sizing hints
-    Frame frame = (Frame) component;
-    setResizable(frame.isResizable());
-  }
-    
-
-  // Implementing WindowPeer:
-
-  public void toBack()
-  {
-    window.toBack ();	
-  }
-  
-  public void toFront()
-  {
-    window.toFront ();
-  }
-
-
-  // Implementing FramePeer:
-
-  public void setIconImage(Image image)
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-  
-  public void setMenuBar(MenuBar mb)
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-
-
-  public void setTitle(String title)
-  {
-    synchronized (window.getDisplay())
-      {
-	// Oh, what a nice implementation :-)
-	window.setProperty("WM_NAME", "STRING", title);
-	
-	ensureFlush();
-      }
-  }
-
-  public void setResizable(boolean resizable)
-  {
-    Frame frame = (Frame) component;
-    
-    WMSizeHints sizeHints = new WMSizeHints();
-    if (resizable)
-      {
-	Dimension minSize = frame.getMinimumSize();
-	sizeHints.setMinSize(minSize.width, minSize.height);
-	
-	Dimension maxSize = frame.getMaximumSize();
-	
-	if ((maxSize.width < Short.MAX_VALUE) ||
-	    (maxSize.height < Short.MAX_VALUE))
-	  {
-	    maxSize.width  = Math.min(maxSize.width,  Short.MAX_VALUE);
-	    maxSize.height = Math.min(maxSize.height, Short.MAX_VALUE);
-	    sizeHints.setMaxSize(maxSize.width, maxSize.height);
-	  }
-      }
-    else
-      {
-	// lock resizing to current bounds
-	Dimension size = frame.getSize();
-	sizeHints.setMinSize(size.width, size.height);
-	sizeHints.setMaxSize(size.width, size.height);
-      }
-    sizeHints.applyNormalHints(window);
-  }
-
-  public int getState ()
-  {
-    return 0;
-  }
-
-  public void setState (int state)
-  {
-  }
-
-  public void setMaximizedBounds (Rectangle r)
-  {
-  }
-
-  public void beginLayout () { }
-  public void endLayout () { }
-  public boolean isPaintPending () { return false; }
-
-  /**
-   * @since 1.5
-   */
-  public void setBoundsPrivate (int x, int y, int width, int height)
-  {
-    // TODO: Implement this.
-    throw new UnsupportedOperationException("Not yet implemented.");
-  }
-
-  public Rectangle getBoundsPrivate()
-  {
-    // TODO: Implement this.
-    throw new UnsupportedOperationException("Not yet implemented.");
-  }
-
-  /**
-   * @since 1.5
-   */
-  public void updateAlwaysOnTop()
-  {
-  }
-
-  /**
-   * @since 1.5
-   */
-  public boolean requestWindowFocus ()
-  {
-    return false;
-  }
-
-  public void setAlwaysOnTop(boolean alwaysOnTop)
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-
-  public void updateFocusableWindowState()
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-
-  public void setModalBlocked(Dialog blocker, boolean blocked)
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-
-  public void updateMinimumSize()
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-
-  public void updateIconImages()
-  {
-    throw new UnsupportedOperationException("not implemented yet");	
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XGraphics$XRaster.h b/libjava/gnu/awt/xlib/XGraphics$XRaster.h
deleted file mode 100644
index 8183599..0000000
--- a/libjava/gnu/awt/xlib/XGraphics$XRaster.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphics$XRaster__
-#define __gnu_awt_xlib_XGraphics$XRaster__
-
-#pragma interface
-
-#include <gnu/awt/j2d/MappedRaster.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XGraphics$XRaster;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class XImage;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphics$XRaster : public ::gnu::awt::j2d::MappedRaster
-{
-
-public:
-  XGraphics$XRaster(::java::awt::image::WritableRaster *, ::gnu::gcj::xlib::XImage *, ::java::awt::image::ColorModel *);
-public: // actually package-private
-  ::gnu::gcj::xlib::XImage * __attribute__((aligned(__alignof__( ::gnu::awt::j2d::MappedRaster)))) ximage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphics$XRaster__
diff --git a/libjava/gnu/awt/xlib/XGraphics.h b/libjava/gnu/awt/xlib/XGraphics.h
deleted file mode 100644
index 4098ba4..0000000
--- a/libjava/gnu/awt/xlib/XGraphics.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphics__
-#define __gnu_awt_xlib_XGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace j2d
-      {
-          class MappedRaster;
-      }
-      namespace xlib
-      {
-          class XFontMetrics;
-          class XGraphics;
-          class XGraphicsConfiguration;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Drawable;
-          class GC;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void dispose();
-  XGraphics(::gnu::gcj::xlib::Drawable *, ::gnu::awt::xlib::XGraphicsConfiguration *);
-  virtual void setColor(::java::awt::Color *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint, jint, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::gnu::awt::j2d::MappedRaster * mapRaster(::java::awt::Rectangle *);
-  virtual void unmapRaster(::gnu::awt::j2d::MappedRaster *);
-public: // actually package-private
-  ::gnu::gcj::xlib::GC * __attribute__((aligned(__alignof__( ::java::lang::Object)))) context;
-  ::gnu::awt::xlib::XGraphicsConfiguration * config;
-  ::java::awt::Rectangle * clipBounds;
-  ::gnu::awt::xlib::XFontMetrics * metrics;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphics__
diff --git a/libjava/gnu/awt/xlib/XGraphics.java b/libjava/gnu/awt/xlib/XGraphics.java
deleted file mode 100644
index 215c04d..0000000
--- a/libjava/gnu/awt/xlib/XGraphics.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright (C) 2000, 2003, 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.*;
-import java.awt.image.WritableRaster;
-import java.awt.image.Raster;
-import java.awt.image.DataBuffer;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageObserver;
-import java.awt.image.BufferedImage;
-import gnu.gcj.xlib.GC;
-import gnu.gcj.xlib.XImage;
-import gnu.gcj.xlib.Drawable;
-import gnu.gcj.xlib.Window;
-import gnu.gcj.xlib.Drawable;
-import gnu.gcj.xlib.Pixmap;
-import gnu.gcj.xlib.Visual;
-import gnu.awt.j2d.DirectRasterGraphics;
-import gnu.awt.j2d.MappedRaster;
-
-public class XGraphics implements Cloneable, DirectRasterGraphics
-{
-  static class XRaster extends MappedRaster
-  {
-    XImage ximage;
-    
-    public XRaster(WritableRaster raster, XImage ximage, ColorModel cm)
-    {
-      super(raster, cm);
-      this.ximage = ximage;
-    }
-  }
-  
-  GC context;
-  XGraphicsConfiguration config;
-  Rectangle clipBounds;
-    
-  XFontMetrics metrics;
-
-
-  public Object clone()
-  {
-    try
-      {
-	XGraphics gfxCopy = (XGraphics) super.clone();
-	gfxCopy.context = context.create();
-	
-	return gfxCopy;
-      }
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-
-  public void dispose()
-  {
-    GC lContext = context;
-    context = null;
-    config = null;
-    clipBounds = null;
-    metrics = null;
-    
-    if (lContext != null)
-    {
-      lContext.dispose();
-    }	    
-  }
-
-  public XGraphics(Drawable drawable, XGraphicsConfiguration config)
-  {
-    context = GC.create(drawable);
-    this.config = config;
-  }  
-  
-  public void setColor(Color color)
-  {
-    if (color != null)
-      context.setForeground(config.getPixel(color));
-  }
-
-  public void setPaintMode()
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  public void setXORMode(Color c1)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public void setFont(Font font)
-  {
-    if (font == null)
-      return;
-    if ((metrics != null) && font.equals(metrics.getFont()))
-      return;
-    metrics = config.getXFontMetrics(font);
-    if (metrics != null)
-      context.setFont(metrics.xfont);
-  }
-    
-  public FontMetrics getFontMetrics(Font font)
-  {
-    if ((metrics != null) && font.equals(metrics.getFont()))
-      return metrics;
-    
-    return config.getXFontMetrics(font);
-  }
-    
-  public void setClip(int x, int y, int width, int height)
-  {
-    Rectangle[] rects = { new Rectangle(x, y, width, height) };
-    context.setClipRectangles(rects);
-  }
-    
-  public void setClip(Shape clip)
-  {
-    /* TODO: create a special RectangleUnion shape that can be
-       used to draw advantage of the GCs ability to set multiple
-       rectangles. 
-    */
-
-    /* FIXME: creating all these objects is wasteful and can be
-       costly in the long run, since this code is run at every
-       expose. */
-    Rectangle newClipBounds = clip.getBounds();
-    
-    /* FIXME: decide whether this test code is worth anything
-     * (as of 2004-01-29, it prints frequently)
-    if ((clipBounds != null) && !clipBounds.contains(newClipBounds))
-      {
-	System.err.println("warning: old clip ("+ clipBounds +") does " +
-			   "not fully contain new clip (" +
-			   newClipBounds + ")");
-      }
-     */
-    clipBounds = newClipBounds;
-    Rectangle[] rects = { clipBounds };
-    context.setClipRectangles(rects);
-  }
-    
-  public void copyArea(int x, int y, int width, int height, int
-		       dx, int dy)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public void drawLine(int x1, int y1, int x2, int y2)
-  {
-    context.drawLine(x1, y1, x2, y2);
-  }
-    
-  public void drawRect(int x, int y, int width, int height)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-    
-  public void fillRect(int x, int y, int width, int height)
-  {
-    context.fillRectangle(x, y, width, height);
-  }
-    
-  public void drawArc(int x, int y, int width, int height, int
-		      startAngle, int arcAngle)
-  {
-    context.drawArc (x, y, width, height, startAngle, arcAngle);
-  }
-    
-  public void fillArc(int x, int y, int width, int height, int
-		      startAngle, int arcAngle)
-  {
-    context.fillArc (x, y, width, height, startAngle, arcAngle);
-  }
-    
-  public void drawPolyline(int[] xPoints, int[] yPoints, int
-			   nPoints)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public void drawPolygon(int[] xPoints, int[] yPoints, int
-			  nPoints)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
-			  int translateX, int translateY)
-  {
-    context.fillPolygon(xPoints, yPoints, nPoints, translateX, translateY);
-  }
-
-  public void drawString(String str, int x, int y)
-  {
-    context.drawString(str, x, y);
-  }
-
-  public boolean drawImage(Image img, int x, int y,
-			   ImageObserver observer)
-  {
-    if (img instanceof XOffScreenImage)
-    {
-      // FIXME: have to enforce clip, or is it OK as-is?
-      XOffScreenImage offScreenImage = (XOffScreenImage) img;
-      Pixmap pixmap = offScreenImage.getPixmap ();
-      context.copyArea (pixmap, 0, 0, x, y,
-        offScreenImage.getWidth (), offScreenImage.getHeight ());
-      return true;
-    }
-    if (clipBounds == null)
-      return false; // ***FIXME***
-
-    if (!(img instanceof BufferedImage))
-      {
-	throw new AWTError("unknown image class");
-      }
-	
-    BufferedImage bimg = (BufferedImage) img;
-
-    XImage ximg = (XImage) bimg.getProperty("gnu.gcj.xlib.XImage");
-    if (ximg == null)
-      {
-	System.err.println("FIXME: skipping null XImage, should " +
-			   "really do on the spot conversion");
-	return false;
-      }
-
-    /*
-      +------------------
-      |    clip
-      |     +---------+
-      | img |         |
-      |  +--+-------+ |
-      |  |  |       | | 
-      |  |  |       | |
-      |  |  +-------+-+
-      |  |          |
-      |  +----------+
-    */
-
-    int iLeft   = Math.max(x, clipBounds.x);
-    int iTop    = Math.max(y, clipBounds.y);
-    int iRight  = Math.min(x + bimg.getWidth(),
-			   clipBounds.x + clipBounds.width);
-    int iBottom = Math.min(y + bimg.getHeight(),
-			   clipBounds.y + clipBounds.height);
-    
-    int srcX = iLeft - x;
-    int srcY = iTop  - y;
-    
-    int width  = iRight  - iLeft;
-    int height = iBottom - iTop;
-    
-    if ((width > 0) && (height > 0))
-      context.putImage(ximg, srcX, srcY, iLeft, iTop, width, height);
-
-    return true;
-  }
-
-  public MappedRaster mapRaster(Rectangle bounds)
-  {
-    Visual visual = config.getVisual();
-    XImage ximage = new XImage(visual, bounds.width, bounds.height,
-			       false // do not auto allocate memory
-			       );
-
-    WritableRaster raster =
-      config.createRasterForXImage(ximage,
-				   new Point(bounds.x, bounds.y));
-    
-    DataBuffer dataB = raster.getDataBuffer();
-    XGraphicsConfiguration.attachData(ximage, dataB, 0);
-
-    Drawable drawable = context.getDrawable();
-
-    // TODO: restrict to clipping
-
-    Rectangle mBounds = drawable.copyIntoXImage(ximage, bounds, 0, 0);
-	
-    return new XRaster(raster, ximage, config.imageCM);
-  }
-    
-    
-  public void unmapRaster(MappedRaster mappedRaster)
-  {
-    XRaster xraster = (XRaster) mappedRaster;
-    XImage ximage = xraster.ximage;
-    Raster raster = xraster.getRaster();
-    int x = raster.getMinX();
-    int y = raster.getMinY();
-    int width = raster.getWidth();
-    int height = raster.getHeight();
-    
-    context.putImage(ximage, 0, 0, x, y, width, height);
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.h b/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.h
deleted file mode 100644
index 42e3c8d..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry__
-#define __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontMetrics;
-          class XGraphicsConfiguration$FontMetricsCache$PerDisplayCache;
-          class XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry(::gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache$PerDisplayCache *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) lruOrder;
-  ::gnu::awt::xlib::XFontMetrics * fm;
-  ::java::awt::Font * font;
-  ::gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache$PerDisplayCache * this$2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry__
diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.h b/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.h
deleted file mode 100644
index 8a236d6..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache__
-#define __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontMetrics;
-          class XGraphicsConfiguration$FontMetricsCache;
-          class XGraphicsConfiguration$FontMetricsCache$PerDisplayCache;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache$PerDisplayCache : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XGraphicsConfiguration$FontMetricsCache$PerDisplayCache(::gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache *);
-  virtual ::gnu::awt::xlib::XFontMetrics * get(::java::awt::Font *);
-  virtual void put(::java::awt::Font *, ::gnu::awt::xlib::XFontMetrics *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) lruCount;
-  ::java::util::Hashtable * entries;
-public: // actually package-private
-  ::gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache$PerDisplayCache__
diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.h b/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.h
deleted file mode 100644
index 53935f5..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache__
-#define __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontMetrics;
-          class XGraphicsConfiguration$FontMetricsCache;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XGraphicsConfiguration$FontMetricsCache();
-  virtual ::gnu::awt::xlib::XFontMetrics * get(::java::awt::Font *, ::gnu::gcj::xlib::Display *);
-  virtual void put(::java::awt::Font *, ::gnu::gcj::xlib::Display *, ::gnu::awt::xlib::XFontMetrics *);
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) displays;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsConfiguration$FontMetricsCache__
diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration.h b/libjava/gnu/awt/xlib/XGraphicsConfiguration.h
deleted file mode 100644
index b7f53ef..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsConfiguration__
-#define __gnu_awt_xlib_XGraphicsConfiguration__
-
-#pragma interface
-
-#include <java/awt/GraphicsConfiguration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XFontMetrics;
-          class XGraphicsConfiguration;
-          class XGraphicsConfiguration$FontMetricsCache;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Colormap;
-          class Visual;
-          class XImage;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class GraphicsDevice;
-        class Point;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class DataBuffer;
-          class VolatileImage;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsConfiguration : public ::java::awt::GraphicsConfiguration
-{
-
-public:
-  XGraphicsConfiguration(::gnu::gcj::xlib::Visual *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint);
-public: // actually package-private
-  virtual ::java::awt::image::WritableRaster * createRasterForXImage(::gnu::gcj::xlib::XImage *, ::java::awt::Point *);
-  static void attachData(::gnu::gcj::xlib::XImage *, ::java::awt::image::DataBuffer *, jint);
-  virtual void prepareColorModel(::gnu::gcj::xlib::XImage *);
-  virtual void calcZPixmapModels(jint);
-  virtual void calcDecomposedRGBModels(jint);
-  virtual void calcPseudoColorModels(jint);
-public:
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-public: // actually package-private
-  virtual void preparePixelCM();
-public:
-  virtual ::java::awt::image::ColorModel * getColorModel(jint);
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform();
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform();
-  virtual ::java::awt::Rectangle * getBounds();
-public: // actually package-private
-  virtual ::gnu::gcj::xlib::Visual * getVisual();
-  virtual ::gnu::awt::xlib::XFontMetrics * getXFontMetrics(::java::awt::Font *);
-  virtual jint getPixel(::java::awt::Color *);
-public:
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint);
-public: // actually package-private
-  ::gnu::gcj::xlib::Visual * __attribute__((aligned(__alignof__( ::java::awt::GraphicsConfiguration)))) visual;
-  jint format;
-  ::gnu::gcj::xlib::Colormap * colormap;
-  ::java::awt::image::ColorModel * imageCM;
-  ::java::awt::image::ColorModel * pixelCM;
-private:
-  static const jint CACHE_SIZE_PER_DISPLAY = 10;
-public: // actually package-private
-  static ::gnu::awt::xlib::XGraphicsConfiguration$FontMetricsCache * fontMetricsCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsConfiguration__
diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java b/libjava/gnu/awt/xlib/XGraphicsConfiguration.java
deleted file mode 100644
index 7d52711..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.Rectangle;
-import java.awt.Graphics2D;
-import java.awt.Graphics;
-import java.awt.GraphicsDevice;
-import java.awt.Point;
-import java.awt.Color;
-import java.awt.color.ColorSpace;
-import java.awt.Font;
-import java.awt.image.*;
-import java.awt.geom.AffineTransform;
-import gnu.gcj.xlib.GC;
-import gnu.gcj.xlib.Drawable;
-import gnu.gcj.xlib.Window;
-import gnu.gcj.xlib.XImage;
-import gnu.gcj.xlib.Visual;
-import gnu.gcj.xlib.Colormap;
-import gnu.gcj.xlib.XColor;
-import gnu.gcj.xlib.Screen;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.XException;
-import gnu.java.awt.Buffers;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class XGraphicsConfiguration extends GraphicsConfiguration
-{
-  //public abstract GraphicsDevice getDevice();
-  
-  Visual visual;
-  int format;
-  Colormap colormap;
-  ColorModel imageCM;
-  ColorModel pixelCM;
-  private static final int CACHE_SIZE_PER_DISPLAY = 10;
-  static FontMetricsCache fontMetricsCache = new FontMetricsCache ();
-  
-  /** Font metrics cache class.  Caches at most CACHE_SIZE_PER_DISPLAY
-   * XFontMetrics objects for each display device.  When a display's cache
-   * gets full, the least-recently used entry is overwritten.
-   * XXX: lruOrder rolls over after a few billion operations, so it might
-   * on very rare occasions misinterpret which is the oldest entry
-   */
-  static class FontMetricsCache
-  {
-    private java.util.Hashtable displays = new java.util.Hashtable ();
-    
-    /** Font metrics cache for a display device
-     */
-    class PerDisplayCache
-    {
-      private int lruCount = 0;
-      private java.util.Hashtable entries = new java.util.Hashtable ();
-      
-      class CacheEntry
-      {
-        int lruOrder;
-        XFontMetrics fm;
-        Font font;
-      }
-      
-      /** Get an entry (null if not there) and update LRU ordering
-       */
-      XFontMetrics get (Font font)
-      {
-        CacheEntry entry = (CacheEntry)entries.get (font);
-        if (entry != null)
-        {
-          entry.lruOrder = lruCount++;
-        }
-        return (entry==null) ? null : entry.fm;
-      }
-      
-      /** Put an entry in the cache, eliminating the oldest entry if
-       * the cache is at capacity.
-       */
-      void put (Font font, XFontMetrics fontMetrics)
-      {
-        if (entries.size () >= CACHE_SIZE_PER_DISPLAY)
-        {
-          // cache is full -- eliminate the oldest entry
-          // slow operation, but shouldn't happen very often
-          int maxAge = 0;
-          CacheEntry oldestEntry = null;
-          int referenceCount = lruCount;
-          for (Enumeration e = entries.elements (); e.hasMoreElements ();)
-          {
-            CacheEntry entry = (CacheEntry)e.nextElement ();
-            if ((referenceCount-entry.lruOrder) > maxAge)
-            {
-              maxAge = referenceCount-entry.lruOrder;
-              oldestEntry = entry;
-            }
-          }
-          if (oldestEntry != null)
-            entries.remove (oldestEntry.font);
-        }
-        CacheEntry newEntry = new CacheEntry ();
-        newEntry.lruOrder = lruCount++;
-        newEntry.fm = fontMetrics;
-        newEntry.font = font;
-        entries.put (font,newEntry);
-      }
-    }
-    
-    /** Get the font metrics for a font, if it is present in the cache.
-     * @param font The AWT font for which to find the font metrics
-     * @param display The display, to select the cached entries for that display
-     * @return The font metrics, or null if not cached
-     */
-    XFontMetrics get (Font font, Display display)
-    {
-      PerDisplayCache cache = (PerDisplayCache)displays.get (display);
-      return (cache==null) ? null : cache.get (font);
-    }
-    
-    /** Put a font in the cache
-     * @param font The font
-     * @param display The display
-     * @param fontMetrics The font metrics
-     */
-    void put (Font font, Display display, XFontMetrics fontMetrics)
-    {
-      PerDisplayCache cache = (PerDisplayCache)displays.get (display);
-      if (cache == null)
-      {
-        cache = new PerDisplayCache ();
-        displays.put (display,cache);
-      }
-      cache.put (font,fontMetrics);
-    }
-  }
-  
-  public XGraphicsConfiguration(Visual visual)
-  {
-    this.visual = visual;
-  }
-
-  public BufferedImage createCompatibleImage(int width, int height)
-  {
-    XImage ximg = new XImage(visual, width, height,
-			     false // do not auto allocate memory
-			     );
-
-    Point origin = new Point(0, 0);
-    WritableRaster raster = createRasterForXImage(ximg, origin);
-
-    /* This is not a good way of doing this. Multiple toolkits may
-       want to share the BufferedImage. */
-    Hashtable props = new Hashtable();
-    props.put("gnu.gcj.xlib.XImage", ximg);
-    props.put("java.awt.GraphicsConfiguration", this);
-    
-    BufferedImage bimg = new BufferedImage(imageCM,raster, false, props);
-
-    DataBuffer dataB = raster.getDataBuffer();
-    attachData(ximg, dataB, 0);
-    return bimg;
-  }
-
-  WritableRaster createRasterForXImage(XImage ximage, Point origin)
-  {
-    if (imageCM == null) prepareColorModel(ximage);
-    
-    /*
-      This will not work, since it creates a sample model that
-      does not necessarily match the format of the XImage.
-      
-      WritableRaster raster =
-      imageCM.createCompatibleWritableRaster(width, height); */
-    
-    // Create a sample model matching the XImage:
-
-    SampleModel imageSM = null;
-
-    int width = ximage.getWidth();
-    int height = ximage.getHeight();
-    int bitsPerPixel = ximage.getBitsPerPixel();
-    int dataType =
-      Buffers.smallestAppropriateTransferType(bitsPerPixel);
-    int bitsPerDataElement = DataBuffer.getDataTypeSize(dataType);
-    int scanlineStride = ximage.getBytesPerLine()*8/bitsPerDataElement;
-    
-    if (imageCM instanceof IndexColorModel)
-      {
-	int[] bandOffsets = {0};
-	imageSM = new ComponentSampleModel(dataType,
-					   width, height,
-					   1, // pixel stride
-					   scanlineStride,
-					   bandOffsets);
-      }
-    else if (imageCM instanceof PackedColorModel)
-      {
-	PackedColorModel pcm = (PackedColorModel) imageCM;
-	int[] masks = pcm.getMasks();
-	
-	imageSM = new SinglePixelPackedSampleModel(dataType,
-						   width, height,
-						   scanlineStride,
-						   masks);
-      }
-
-    if (imageSM == null)
-      {
-	throw new UnsupportedOperationException("creating sample model " +
-						"for " + imageCM +
-						" not implemented");
-      }
-
-    WritableRaster raster = Raster.createWritableRaster(imageSM, origin);
-    return raster;
-  }
-
-
-
-  /**
-   * Attach a the memory of a data buffer to an XImage
-   * structure. [This method is not gnu.awt.xlib specific, and should
-   * maybe be moved to a different location.]
-   *
-   * @param offset Offset to data. The given offset does not include
-   * data buffer offset, which will also be added.  
-   */
-  static void attachData(XImage ximage, DataBuffer dataB, int offset)
-  {
-    offset += dataB.getOffset();
-    switch (dataB.getDataType())
-      {
-      case DataBuffer.TYPE_BYTE:
-	ximage.setData(((DataBufferByte) dataB).getData(), offset);
-	break;
-      case DataBuffer.TYPE_USHORT:
-	ximage.setData(((DataBufferUShort) dataB).getData(), offset);
-	break;
-      case DataBuffer.TYPE_INT:
-	ximage.setData(((DataBufferInt) dataB).getData(), offset);
-	break;
-      default:
-	throw
-	  new UnsupportedOperationException("Do not know how to " +
-					    "set data for data " +
-					    "type " +
-					    dataB.getDataType());
-      }
-  }
-    
-  void prepareColorModel(XImage ximage)
-  {
-    format = ximage.getFormat();
-    int bitsPerPixel = ximage.getBitsPerPixel();
-    switch (format) {
-    case XImage.ZPIXMAP_FORMAT:
-      calcZPixmapModels(bitsPerPixel);
-      break;
-      
-    default:
-      throw new UnsupportedOperationException("unimplemented format");
-    }
-  }
-
-  void calcZPixmapModels(int bitsPerPixel)
-  {
-    switch (visual.getVisualClass())
-      {
-      case Visual.VC_TRUE_COLOR:
-	calcDecomposedRGBModels(bitsPerPixel);
-	break;
-      case Visual.VC_PSEUDO_COLOR:
-	calcPseudoColorModels(bitsPerPixel);
-	break;
-      default:
-	String msg = "unimplemented visual class";
-	throw new UnsupportedOperationException(msg);
-      }
-  }
-    
-  void calcDecomposedRGBModels(int bitsPerPixel)
-  {
-    int dataType = Buffers.smallestAppropriateTransferType(bitsPerPixel);
-    
-    
-    if (DataBuffer.getDataTypeSize(dataType) == bitsPerPixel)
-      {	
-	ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
-	
-	imageCM = new DirectColorModel(cs,
-				       visual.getDepth(),
-				       visual.getRedMask(),
-				       visual.getGreenMask(),
-				       visual.getBlueMask(),
-				       0, // no alpha
-				       false,
-				       dataType);
-      }
-    else
-      {
-	throw new
-	  UnsupportedOperationException("unimplemented bits per pixel");
-      }
-    }
-    
-  void calcPseudoColorModels(int bitsPerPixel)
-  {
-    if (colormap == null)
-      colormap = visual.getScreen().getDefaultColormap();
-    
-    XColor[] colArray = colormap.getXColors();
-	
-    int numCol = colArray.length;
-    byte[] rmap = new byte[numCol];
-    byte[] gmap = new byte[numCol];
-    byte[] bmap = new byte[numCol];
-    byte[] amap = new byte[numCol];
-    
-    for (int i=0; i < numCol; i++)
-      {
-	XColor color = colArray[i];
-	if (color.getFlags() == Colormap.FLAG_SHARED)
-	  {
-	    rmap[i] = (byte) (color.getRed()   >> 8);
-	    gmap[i] = (byte) (color.getGreen() >> 8);
-	    bmap[i] = (byte) (color.getBlue()  >> 8);
-	    amap[i] = (byte) 0xff;
-	  } // else, leave default zero values...
-      }
-
-    imageCM = new IndexColorModel(visual.getDepth(), numCol,
-				  rmap, gmap, bmap, amap);
-  }
-
-  /**
-   * Gets the associated device that this configuration describes.
-   *
-   * @return the device
-   */
-  public GraphicsDevice getDevice()
-  {
-    throw new UnsupportedOperationException("not implemented");  
-  }
-
-  /**
-   * Returns a buffered image optimized to this device, so that blitting can
-   * be supported in the buffered image.
-   *
-   * @param w the width of the buffer
-   * @param h the height of the buffer
-   * @return the buffered image, or null if none is supported
-   */
-  public BufferedImage createCompatibleImage(int width,
-					     int height,
-					     int transparency)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  /**
-   * Returns a buffered volatile image optimized to this device, so that
-   * blitting can be supported in the buffered image. Because the buffer is
-   * volatile, it can be optimized by native graphics accelerators.
-   *
-   * @param w the width of the buffer
-   * @param h the height of the buffer
-   * @return the buffered image, or null if none is supported
-   * @see Component#createVolatileImage(int, int)
-   * @since 1.4
-   */
-  public VolatileImage createCompatibleVolatileImage(int w, int h)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  /**
-   * FIXME: I'm not sure which color model that should be returned here.
-   */
-  public ColorModel getColorModel()
-  {
-    if (pixelCM == null)
-      preparePixelCM();
-    return pixelCM;
-  }
-
-  void preparePixelCM()
-  {
-    switch (visual.getVisualClass())
-      {
-      case Visual.VC_TRUE_COLOR:
-	pixelCM = new DirectColorModel(visual.getDepth(),
-				       visual.getRedMask(),
-				       visual.getGreenMask(),
-				       visual.getBlueMask());
-	break;
-      case Visual.VC_PSEUDO_COLOR:
-
-	if (colormap == null)
-	  colormap = visual.getScreen().getDefaultColormap();
-	
-	XColor[] colArray = colormap.getXColors();
-	
-	int numCol = colArray.length;
-	byte[] rmap = new byte[numCol];
-	byte[] gmap = new byte[numCol];
-	byte[] bmap = new byte[numCol];
-	byte[] amap = new byte[numCol];
-	
-	for (int i=0; i < numCol; i++)
-	  {
-	    XColor color = colArray[i];
-	    if (color.getFlags() == Colormap.FLAG_SHARED) {
-	      rmap[i] = (byte) (color.getRed()   >> 8);
-	      gmap[i] = (byte) (color.getGreen() >> 8);
-	      bmap[i] = (byte) (color.getBlue()  >> 8);
-	      amap[i] = (byte) 0xff;
-	    } // else, leave default zero values...
-
-	  }
-
-	pixelCM = new IndexColorModel(visual.getDepth(), numCol,
-				      rmap, gmap, bmap, amap);
-	break;
-      default:
-	throw new UnsupportedOperationException("not implemented");
-      }
-  }
-  
-  public ColorModel getColorModel(int transparency)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-    
-  public AffineTransform getDefaultTransform()
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  public AffineTransform getNormalizingTransform()
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
- 
-  public Rectangle getBounds()
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-  Visual getVisual()
-  {
-    return visual;
-  }
-    
-  /* FIXME: This should be moved to XGraphicsDevice... */
-  XFontMetrics getXFontMetrics (java.awt.Font awtFont)
-  {
-    // If the metrics object for this font is already cached, use it.
-    // Otherwise create and cache it.
-    Display display = visual.getScreen ().getDisplay ();
-    XFontMetrics fm = fontMetricsCache.get (awtFont,display);
-    if (fm == null)
-    {
-      String foundry      = "*";
-      String family       = awtFont.getName ();
-      String weight       = awtFont.isBold () ? "bold" : "medium";
-      String slant        = awtFont.isItalic () ? "i" : "r";
-      String sWidth       = "*";
-      String addStyle     = "";
-      String pixelSize    = "*";
-      String pointSize    = awtFont.getSize () + "0";
-      String xres         = "*";
-      String yres         = "*";
-      String spacing      = "*";
-      String averageWidth = "*";
-      String charset      = "iso10646-1"; // because we use functions like XDrawString16
-      
-      String logicalFontDescription =
-        "-" + // FontNameRegistry prefix
-        foundry   + "-" + family    + "-" + weight       + "-" +
-        slant     + "-" + sWidth    + "-" + addStyle     + "-" +
-        pixelSize + "-" + pointSize + "-" + xres         + "-" +
-        yres      + "-" + spacing   + "-" + averageWidth + "-";
-      
-      // Try to load a Unicode font.  If that doesn't work, try again, without
-      // specifying the character set.
-      try
-      {
-        gnu.gcj.xlib.Font xfont = new gnu.gcj.xlib.Font (display, logicalFontDescription + charset);
-        fm = new XFontMetrics (xfont, awtFont);
-      }
-      catch (XException e)
-      {
-        gnu.gcj.xlib.Font xfont = new gnu.gcj.xlib.Font (display, logicalFontDescription + "*-*");
-        fm = new XFontMetrics (xfont, awtFont);
-      }
-      fontMetricsCache.put (awtFont,display,fm);
-    }
-    return fm;
-  }
-
-  int getPixel(Color color)
-  {
-    /* FIXME: consider an integer technique whenever
-     * the ColorModel is 8 bits per color.
-     * The problem with using integers is that it doesn't work unless
-     * the colors are 8 bits each (as in the array), since ColorModel.getDataElement(int[],int)
-     * expects non-normalized values.  For example, in a 16-bit display mode, you
-     * would typically have 5 bits each for red and blue, and 6 bits for green.
-    int[] components =
-    {
-      color.getRed (),
-      color.getGreen (),
-      color.getBlue (),
-      0xff
-    };
-     */
-    
-    int[] unnormalizedComponents = { 0, 0, 0, 0xff };
-    ColorModel cm = getColorModel ();
-    if (color != null)
-    {
-      float[] normalizedComponents =
-      {
-        ((float)color.getRed ()) / 255F,
-        ((float)color.getGreen ()) / 255F,
-        ((float)color.getBlue ()) / 255F,
-        1
-      };
-      cm.getUnnormalizedComponents(normalizedComponents, 0,
-           unnormalizedComponents, 0);
-    }
-    return cm.getDataElement (unnormalizedComponents, 0);
-  }
-
-  /**
-   * @since 1.5
-   */
-  public VolatileImage createCompatibleVolatileImage (int width, int height,
-                                                      int transparency)
-  {
-    return null;
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XGraphicsDevice.h b/libjava/gnu/awt/xlib/XGraphicsDevice.h
deleted file mode 100644
index d5dc2f1..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsDevice.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsDevice__
-#define __gnu_awt_xlib_XGraphicsDevice__
-
-#pragma interface
-
-#include <java/awt/GraphicsDevice.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XGraphicsDevice;
-          class XToolkit;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsDevice : public ::java::awt::GraphicsDevice
-{
-
-public:
-  virtual jint getType();
-  XGraphicsDevice(jint, ::gnu::awt::xlib::XToolkit *);
-  virtual ::java::lang::String * getIDstring();
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations();
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration();
-  virtual jboolean isDisplayChangeSupported();
-  virtual jboolean isFullScreenSupported();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsDevice)))) id;
-  ::java::lang::String * IDstring;
-  JArray< ::java::awt::GraphicsConfiguration * > * configs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsDevice__
diff --git a/libjava/gnu/awt/xlib/XGraphicsDevice.java b/libjava/gnu/awt/xlib/XGraphicsDevice.java
deleted file mode 100755
index 4fe1c23..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsDevice.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsConfiguration;
-
-public class XGraphicsDevice extends GraphicsDevice
-{
-  private int id;
-  private String IDstring;
-  private GraphicsConfiguration[] configs;
-
-  public int getType()
-  {
-    return TYPE_RASTER_SCREEN;
-  }
-
-  public XGraphicsDevice(int id, XToolkit toolkit)
-  {
-    this.id = id;
-    IDstring = "XGraphicsDevice " + id;
-    configs = new GraphicsConfiguration [1];
-    configs[0] = toolkit.getDefaultXGraphicsConfiguration();
-  }
-
-  public String getIDstring()
-  {
-    return IDstring;
-  }
-
-  public GraphicsConfiguration[] getConfigurations()
-  {
-    return configs;
-  }
-
-  public GraphicsConfiguration getDefaultConfiguration()
-  {
-    return configs[0];
-  }
-
-  public boolean isDisplayChangeSupported()
-  {
-    return false;
-  }
-
-  public boolean isFullScreenSupported()
-  {
-    return false;
-  }
-}
-
diff --git a/libjava/gnu/awt/xlib/XGraphicsEnvironment.h b/libjava/gnu/awt/xlib/XGraphicsEnvironment.h
deleted file mode 100644
index 0f09087..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsEnvironment.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XGraphicsEnvironment__
-#define __gnu_awt_xlib_XGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XGraphicsDevice;
-          class XGraphicsEnvironment;
-          class XToolkit;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public: // actually package-private
-  XGraphicsEnvironment(::gnu::awt::xlib::XToolkit *);
-public:
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-private:
-  ::gnu::awt::xlib::XToolkit * __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) toolkit;
-  JArray< ::gnu::awt::xlib::XGraphicsDevice * > * devices;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XGraphicsEnvironment__
diff --git a/libjava/gnu/awt/xlib/XGraphicsEnvironment.java b/libjava/gnu/awt/xlib/XGraphicsEnvironment.java
deleted file mode 100755
index 64c7990..0000000
--- a/libjava/gnu/awt/xlib/XGraphicsEnvironment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.GraphicsEnvironment;
-import java.awt.GraphicsDevice;
-import java.awt.Graphics2D;
-import java.awt.Font;
-import java.awt.image.BufferedImage;
-import java.util.Locale;
-
-public class XGraphicsEnvironment extends GraphicsEnvironment
-{
-  private XToolkit toolkit;
-  private XGraphicsDevice [] devices;
-
-  XGraphicsEnvironment (XToolkit toolkit)
-  {
-    this.toolkit = toolkit;
-    devices = new XGraphicsDevice [1];
-    devices [0] = new XGraphicsDevice (0,toolkit);
-  }
-
-  public GraphicsDevice[] getScreenDevices ()
-  {
-    return devices;
-  }
-
-  public GraphicsDevice getDefaultScreenDevice ()
-  {
-    return devices [0];
-  }
-
-  public Graphics2D createGraphics (BufferedImage image)
-  {
-    throw new UnsupportedOperationException ("createGraphics not implemented yet in " + this.getClass ().getName ());
-  }
-
-  public Font[] getAllFonts()
-  {
-    throw new UnsupportedOperationException ("getAllFonts not implemented yet in " + this.getClass ().getName ());
-  }
-
-  public String[] getAvailableFontFamilyNames (Locale l)
-  {
-    throw new UnsupportedOperationException ("getAvailableFontFamilyNames not implemented yet in " + this.getClass ().getName ());
-  }
-
-  public String[] getAvailableFontFamilyNames ()
-  {
-    throw new UnsupportedOperationException ("getAvailableFontFamilyNames not implemented yet in " + this.getClass ().getName ());
-  }
-}
diff --git a/libjava/gnu/awt/xlib/XOffScreenImage.h b/libjava/gnu/awt/xlib/XOffScreenImage.h
deleted file mode 100644
index 73ca8bf..0000000
--- a/libjava/gnu/awt/xlib/XOffScreenImage.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XOffScreenImage__
-#define __gnu_awt_xlib_XOffScreenImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XGraphicsConfiguration;
-          class XOffScreenImage;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Drawable;
-          class GC;
-          class Pixmap;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class GraphicsConfiguration;
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::awt::xlib::XOffScreenImage : public ::java::awt::Image
-{
-
-public: // actually package-private
-  XOffScreenImage(::gnu::awt::xlib::XGraphicsConfiguration *, ::gnu::gcj::xlib::Drawable *, jint, jint, ::java::awt::image::ColorModel *);
-  XOffScreenImage(::gnu::awt::xlib::XGraphicsConfiguration *, ::gnu::gcj::xlib::Drawable *, ::java::awt::image::ImageProducer *, ::java::awt::image::ColorModel *);
-public:
-  virtual ::gnu::gcj::xlib::Pixmap * getPixmap();
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual jint getHeight();
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getWidth();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual void imageComplete(jint);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setDimensions(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-private:
-  ::gnu::gcj::xlib::Pixmap * __attribute__((aligned(__alignof__( ::java::awt::Image)))) pixmap;
-  ::gnu::awt::xlib::XGraphicsConfiguration * config;
-  jint width;
-  jint height;
-  ::gnu::gcj::xlib::Drawable * drawable;
-  ::java::awt::image::ImageProducer * prod;
-  ::gnu::gcj::xlib::GC * gc;
-  ::java::awt::image::ColorModel * pixmapColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XOffScreenImage__
diff --git a/libjava/gnu/awt/xlib/XOffScreenImage.java b/libjava/gnu/awt/xlib/XOffScreenImage.java
deleted file mode 100644
index 0ea6c1b..0000000
--- a/libjava/gnu/awt/xlib/XOffScreenImage.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
- 
-   This file is part of libgcj.
- 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.Image;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
-import java.awt.image.ImageConsumer;
-import java.util.Hashtable;
-import gnu.awt.j2d.DirectRasterGraphics;
-import gnu.awt.j2d.Graphics2DImpl;
-import gnu.awt.j2d.IntegerGraphicsState;
-import gnu.gcj.xlib.Drawable;
-import gnu.gcj.xlib.Pixmap;
-import gnu.gcj.xlib.Screen;
-import gnu.gcj.xlib.Visual;
-import gnu.gcj.xlib.GC;
-
-/** Image class for xlib off-screen buffers.
- * The image is stored in a server-side pixmap for best performance.
- * This class supports getGraphics, so you can draw on the pixmap, and is
- * specially handled when doing drawImage, so that the image copy is done
- * entirely in the X server.
- * This class does not support rasterization, for which you'd need an XImage.
- *
- * @author  scott gilbertson <scottg@mantatest.com> <sgilbertson@cogeco.ca>
- */
-public class XOffScreenImage extends Image 
-                             implements IntegerGraphicsState.ScreenCoupledImage,
-                             ImageConsumer
-{
-  private Pixmap pixmap;
-  private XGraphicsConfiguration config;
-  private int width;
-  private int height;
-  private Drawable drawable;
-  private ImageProducer prod;
-  private GC gc;
-  private ColorModel pixmapColorModel;
-  
-  /** Create a new XOffScreenImage
-   * @param config Graphics configuration, to compare against on-screen 
-   *               components and to create the appropriate Graphics
-   * @param drawable The drawable with which the image is compatible
-   * @param width The width of the image
-   * @param height The height of the image
-   * @param cm The ColorModel associated with drawable
-   */
-  XOffScreenImage (XGraphicsConfiguration config, Drawable drawable, int width, int height, ColorModel cm)
-  {
-    this.config = config;
-    this.width = width;
-    this.height = height;
-    this.drawable = drawable;
-    pixmapColorModel = cm;
-    pixmap = new Pixmap (drawable, width, height, drawable.getDepth ());
-    gc = GC.create (pixmap);
-  }
-  
-  /** Create a new XOffScreenImage and obtain image data from an ImageProducer
-   * @param config Graphics configuration, to compare against on-screen 
-   *               components and to create the appropriate Graphics
-   * @param drawable The drawable with which the image is compatible
-   * @param prod The source of image data for this image
-   * @param cm The ColorModel associated with drawable
-   */
-  XOffScreenImage (XGraphicsConfiguration config, Drawable drawable, ImageProducer prod, ColorModel cm)
-  {
-    this.config = config;
-    this.width = 0;  // size will be overridden in a moment
-    this.height = 0;
-    this.drawable = drawable;
-    this.prod = prod;
-    pixmapColorModel = cm;
-    prod.startProduction (this);
-  }
-  
-  /** Get the pixmap which contains this image
-   * @return The pixmap
-   */
-  public Pixmap getPixmap ()
-  {
-    return pixmap;
-  }
-  
-  /** Flushes (that is, destroys) any resources used for this image.  This
-   * includes the actual image data.
-   */
-  public void flush ()
-  {
-    // FIXME: should dispose pixmap
-    pixmap = null;
-  }
-  
-  /** Returns a graphics context object for drawing an off-screen object.
-   * This method is only valid for off-screen objects.
-   *
-   * @return a graphics context object for an off-screen object
-   * @see Graphics#createImage(int, int)
-   */
-  public Graphics getGraphics ()
-  {
-    DirectRasterGraphics gfxDevice = new XGraphics (pixmap, config);
-    IntegerGraphicsState igState = new IntegerGraphicsState (gfxDevice);
-    Graphics2DImpl gfx2d = new Graphics2DImpl (config);
-    gfx2d.setState (igState);
-    return gfx2d;
-  }
-  
-  /** Returns the height of the image, or -1 if it is unknown.  If the
-   * image height is unknown, the observer object will be notified when
-   * the value is known.
-   *
-   * @param observer the image observer for this object
-   * @return the height in pixels
-   * @see #getWidth(ImageObserver)
-   */
-  public int getHeight (ImageObserver observer)
-  {
-    return height;
-  }
-  
-  /** Returns the height of the image, or -1 if it is unknown.  If the
-   * image height is unknown, the observer object will be notified when
-   * the value is known.
-   *
-   * @return the height in pixels
-   * @see #getWidth()
-   */
-  public int getHeight ()
-  {
-    return height;
-  }
-  
-  /** Returns the image producer object for this object. The producer is the
-   * object which generates pixels for this image.
-   *
-   * @return the image producer for this object
-   */
-  public ImageProducer getSource ()
-  {
-    if (prod == null)
-      throw new UnsupportedOperationException ("getSource not supported");
-    else
-      return prod;
-  }
-  
-  /** Returns the width of the image, or -1 if it is unknown.  If the
-   * image width is unknown, the observer object will be notified when
-   * the value is known.
-   *
-   * @param observer the image observer for this object
-   * @return the width in pixels
-   * @see #getHeight(ImageObserver)
-   */
-  public int getWidth (ImageObserver observer)
-  {
-    return width;
-  }
-  
-  /** Returns the width of the image, or -1 if it is unknown.  If the
-   * image width is unknown, the observer object will be notified when
-   * the value is known.
-   *
-   * @return the width in pixels
-   * @see #getHeight()
-   */
-  public int getWidth ()
-  {
-    return width;
-  }
-
-  /** This method requests a named property for an object.  The value of the
-   * property is returned. The value <code>UndefinedProperty</code> is
-   * returned if there is no property with the specified name.  The value
-   * <code>null</code> is returned if the properties for the object are
-   * not yet known.  In this case, the specified image observer is notified
-   * when the properties are known.
-   *
-   * @param name the requested property name
-   * @param observer the image observer for this object
-   * @return the named property, if available
-   * @see #UndefinedProperty
-   */
-  public Object getProperty (String name, ImageObserver observer)
-  {
-    return null;
-  }
-  
-  /** Get the GraphicsConfiguration to which this image is coupled
-   * @return the GraphicsConfiguration
-   */
-  public GraphicsConfiguration getGraphicsConfiguration ()
-  {
-    return config;
-  }
-  
-  public void imageComplete (int status)
-  {
-  }
-  
-  public void setColorModel (ColorModel model)
-  {
-  }
-  
-  public void setDimensions (int width, int height)
-  {
-    this.width = width;
-    this.height = height;
-    pixmap = new Pixmap (drawable, width, height, drawable.getDepth ());
-    gc = GC.create (pixmap);
-  }
-  
-  public void setHints (int flags)
-  {
-  }
-  
-  public void setPixels (int x, int y, int w, int h, ColorModel model, int[] pixels, int offset, int scansize)
-  {
-    int idx = 0;
-    float[] normalizedComponents = new float [4];
-    int[] unnormalizedComponents = { 0, 0, 0, 0xff };
-    normalizedComponents[3] = 1;
-    for (int yp=y; yp < (y + h); yp++)
-    {
-      for (int xp=x; xp < (x + w); xp++)
-      {
-        int p = (yp - y) * scansize + (xp - x) + offset;
-        // FIXME: there HAS to be a more efficient mechanism for color mapping
-        normalizedComponents[0] = (float)model.getRed (pixels[p]) / 255F;
-        normalizedComponents[1] = (float)model.getGreen (pixels[p]) / 255F;
-        normalizedComponents[2] = (float)model.getBlue (pixels[p]) / 255F;
-        pixmapColorModel.getUnnormalizedComponents (normalizedComponents, 0,
-          unnormalizedComponents, 0);
-        int pixelColor = pixmapColorModel.getDataElement (unnormalizedComponents, 0);
-        gc.setForeground (pixelColor);
-        gc.drawPoint (xp, yp);
-      }
-    }
-  }
-  
-  public void setPixels (int x, int y, int w, int h, ColorModel model, byte[] pixels, int offset, int scansize)
-  {
-    int idx = 0;
-    float[] normalizedComponents = new float [4];
-    int[] unnormalizedComponents = { 0, 0, 0, 0xff };
-    normalizedComponents[3] = 1;
-    for (int yp=y; yp < (y + h); yp++)
-    {
-      for (int xp=x; xp < (x + w); xp++)
-      {
-        // FIXME: there HAS to be a more efficient mechanism for color mapping
-        int p = (yp - y) * scansize + (xp - x) + offset;
-        normalizedComponents[0] = (float)model.getRed (pixels[p]) / 255F;
-        normalizedComponents[1] = (float)model.getGreen (pixels[p]) / 255F;
-        normalizedComponents[2] = (float)model.getBlue (pixels[p]) / 255F;
-        pixmapColorModel.getUnnormalizedComponents (normalizedComponents, 0,
-          unnormalizedComponents, 0);
-        int pixelColor = pixmapColorModel.getDataElement (unnormalizedComponents, 0);
-        gc.setForeground (pixelColor);
-        gc.drawPoint (xp, yp);
-      }
-    }
-  }
-  
-  public void setProperties (Hashtable props)
-  {
-  }
-  
-}
diff --git a/libjava/gnu/awt/xlib/XPanelPeer.h b/libjava/gnu/awt/xlib/XPanelPeer.h
deleted file mode 100644
index 4fcc0c7..0000000
--- a/libjava/gnu/awt/xlib/XPanelPeer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XPanelPeer__
-#define __gnu_awt_xlib_XPanelPeer__
-
-#pragma interface
-
-#include <gnu/awt/xlib/XCanvasPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XPanelPeer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-        class Panel;
-    }
-  }
-}
-
-class gnu::awt::xlib::XPanelPeer : public ::gnu::awt::xlib::XCanvasPeer
-{
-
-public:
-  XPanelPeer(::java::awt::Panel *);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-public: // actually package-private
-  static ::java::awt::Insets * INSETS_0_PROTOTYPE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XPanelPeer__
diff --git a/libjava/gnu/awt/xlib/XPanelPeer.java b/libjava/gnu/awt/xlib/XPanelPeer.java
deleted file mode 100644
index 0b775f8..0000000
--- a/libjava/gnu/awt/xlib/XPanelPeer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.*;
-import java.awt.peer.*;
-import java.awt.image.*;
-import gnu.gcj.xlib.WMSizeHints;
-import gnu.gcj.xlib.WindowAttributes;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.Visual;
-import gnu.gcj.xlib.Screen;
-
-public class XPanelPeer extends XCanvasPeer implements PanelPeer
-{
-
-  public XPanelPeer(Panel panel)
-  {
-    super(panel);
-  }
-
-  // no reason to override yet
-  //void initWindowProperties();
-  //gnu.gcj.xlib.Window getParentWindow();
-  
-
-  // Implementing ContainerPeer:
-  
-  // Default is no insets...
-  static final Insets INSETS_0_PROTOTYPE = new Insets(0, 0, 0, 0);
-
-  public Insets getInsets()
-  {
-    return (Insets) INSETS_0_PROTOTYPE.clone();
-  }
-
-  public Insets insets()
-  {
-    return getInsets();
-  }
-
-  public void beginValidate()
-  {
-    // NOP
-  }
-  
-  public void endValidate()
-  {
-    // NOP
-  }
-
-  public void beginLayout () { }
-  public void endLayout () { }
-  public boolean isPaintPending () { return false; }
-}
diff --git a/libjava/gnu/awt/xlib/XToolkit.h b/libjava/gnu/awt/xlib/XToolkit.h
deleted file mode 100644
index e4e35db..0000000
--- a/libjava/gnu/awt/xlib/XToolkit.h
+++ /dev/null
@@ -1,214 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_awt_xlib_XToolkit__
-#define __gnu_awt_xlib_XToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace awt
-    {
-      namespace xlib
-      {
-          class XEventLoop;
-          class XGraphicsConfiguration;
-          class XToolkit;
-      }
-    }
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-      }
-    }
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Component;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::awt::xlib::XToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public:
-  XToolkit();
-  virtual void flushIfIdle();
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual jint getScreenResolution();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void sync();
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-  virtual void beep();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-public: // actually package-private
-  virtual ::gnu::awt::xlib::XGraphicsConfiguration * getDefaultXGraphicsConfiguration();
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-  virtual jboolean nativeQueueEmpty();
-  virtual void wakeNativeQueue();
-  virtual void iterateNativeQueue(::java::awt::EventQueue *, jboolean);
-  virtual void setAlwaysOnTop(jboolean);
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-public: // actually package-private
-  static ::gnu::awt::xlib::XToolkit * INSTANCE;
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) display;
-  ::java::awt::EventQueue * queue;
-  ::gnu::awt::xlib::XEventLoop * eventLoop;
-  ::gnu::awt::xlib::XGraphicsConfiguration * defaultConfig;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XToolkit__
diff --git a/libjava/gnu/awt/xlib/XToolkit.java b/libjava/gnu/awt/xlib/XToolkit.java
deleted file mode 100644
index 681aad6..0000000
--- a/libjava/gnu/awt/xlib/XToolkit.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.awt.xlib;
-
-import java.awt.*;
-import java.awt.dnd.*;
-import java.awt.dnd.peer.*;
-import java.awt.font.*;
-import java.awt.im.*;
-import java.awt.peer.*;
-import java.awt.image.ImageProducer;
-import java.awt.image.ImageObserver;
-import java.net.*;
-import java.awt.datatransfer.Clipboard;
-import java.io.InputStream;
-import java.text.AttributedString;
-import java.util.Map;
-import java.util.Properties;
-import gnu.gcj.xlib.Display;
-import gnu.gcj.xlib.Screen;
-import gnu.gcj.xlib.Visual;
-import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.EmbeddedWindow;
-import gnu.java.awt.peer.ClasspathFontPeer;
-import gnu.java.awt.peer.EmbeddedWindowPeer;
-
-public class XToolkit extends ClasspathToolkit
-{
-  static XToolkit INSTANCE;
-  
-  Display display;
-
-  EventQueue queue;
-  XEventLoop eventLoop;
-
-  XGraphicsConfiguration defaultConfig;
-
-  public XToolkit()
-  {
-    INSTANCE = this;
-    display = new Display();
-    synchronized (display)
-      {
-	queue = new XEventQueue(display);
-	eventLoop = new XEventLoop(display, queue);
-      }
-  }
-
-  public void flushIfIdle()
-  {
-    eventLoop.flushIfIdle();
-  }
-
-  protected ButtonPeer createButton(Button frontend)
-  {
-    // FIXME: Stubbed out, needs Swing:
-    /*
-    XCanvasPeer realPeer = new XCanvasPeer(frontend);
-    SButtonPeer sbPeer = new SButtonPeer(frontend, realPeer);
-    return sbPeer;
-    */
-    return null;
-  }
-    
-  protected TextFieldPeer createTextField(TextField frontend)
-  {
-    return null; // FIXME
-  }
-    
-  protected LabelPeer createLabel(Label frontend) 
-  {
-    return null; // FIXME
-  }
-    
-  protected ListPeer createList(List frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected CheckboxPeer createCheckbox(Checkbox frontend) 
-  {
-    return null; // FIXME
-  }
-    
-  protected ScrollbarPeer createScrollbar(Scrollbar frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected ScrollPanePeer createScrollPane(ScrollPane frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected TextAreaPeer createTextArea(TextArea frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected ChoicePeer createChoice(Choice frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected FramePeer createFrame(Frame frontend) {
-    return new XFramePeer(frontend);
-  }
-
-  protected CanvasPeer createCanvas(Canvas frontend) {
-    XCanvasPeer peer = new XCanvasPeer(frontend);
-    return peer;
-  }
-  
-  protected PanelPeer createPanel(Panel frontend) {
-    return new XPanelPeer(frontend);
-  }
-
-  protected WindowPeer createWindow(Window frontend) 
-  {
-    return null; // FIXME
-  }
-    
-  protected DialogPeer createDialog(Dialog frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected MenuBarPeer createMenuBar(MenuBar frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected MenuPeer createMenu(Menu frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected PopupMenuPeer createPopupMenu(PopupMenu frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected MenuItemPeer createMenuItem(MenuItem frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected FileDialogPeer createFileDialog(FileDialog frontend) 
-  {
-    return null; // FIXME
-  }
-  
-  protected CheckboxMenuItemPeer
-      createCheckboxMenuItem(CheckboxMenuItem frontend) 
-  {
-    return null; // FIXME
-  }
-
-  protected java.awt.peer.FontPeer getFontPeer(String name, int style) 
-  {
-    return new XFontPeer (name,style);
-  }
-
-  public Dimension getScreenSize()
-  { 
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public int getScreenResolution()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public java.awt.image.ColorModel getColorModel()
-  {
-    return getDefaultXGraphicsConfiguration().getColorModel();
-  }
-
-  public String[] getFontList()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public FontMetrics getFontMetrics(Font font)
-  {
-    return getDefaultXGraphicsConfiguration().getXFontMetrics(font);
-  }
-
-  public void sync()
-  {
-    flushIfIdle ();
-    // FIXME: should instead wait for eventLoop to go idle
-    // (perhaps send a dummy event there and block till it makes
-    // it through the queue)
-  }
-    
-  public Image getImage(String filename)
-  {
-    return createImage(filename);
-  }
-  
-  public Image getImage(URL url)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Image createImage(String filename)
-  {
-    // FIXME: Stubbed out. We need a proper image I/O API.
-
-    /*
-    BufferedImage jpeg;
-    FileInputStream fis = openFile(filename);
-    if (fis == null)
-      return null;
-    
-    BasicRasterImageConsumer consumer = new BasicRasterImageConsumer();
-    JPEGImageDecoder jid = new JPEGImageDecoder(fis);
-
-    jid.startProduction(consumer);
-    jpeg = consumer.getImage();
-    
-    int w = jpeg.getWidth();
-    int h = jpeg.getHeight();
-    
-    BufferedImage img =
-      getDefaultXGraphicsConfiguration().createCompatibleImage(w, h);
-    
-    Renderers renderers = Renderers.getInstance();
-    
-    RasterOp renderer = renderers.createRenderer(jpeg.getColorModel(),
-						 jpeg.getSampleModel(),
-						 img.getColorModel(),
-						 img.getSampleModel());
-	
-    if (renderer == null)
-      {
-	throw new UnsupportedOperationException("couldn't find renderer");
-      }
-
-    renderer.filter(jpeg.getRaster(), img.getRaster());
-    
-    return img;
-    */
-
-    return null;
-  }
-
-  public Image createImage(URL url)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public boolean prepareImage(Image image,
-			      int width,
-			      int height,
-			      ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public int checkImage(Image image,
-			int width,
-			int height,
-			ImageObserver observer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-  
-  public Image createImage(ImageProducer producer)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Image createImage(byte[] imagedata,
-			   int imageoffset,
-			   int imagelength)
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  /*
-    public PrintJob getPrintJob(Frame frame,
-				String jobtitle,
-				Properties props);
-  */
-
-  public void beep()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-
-  public Clipboard getSystemClipboard() 
-  {
-    return null; // FIXME
-  }
-    
-  protected EventQueue getSystemEventQueueImpl()
-  {
-    return queue;
-  }
-    
-  public PrintJob getPrintJob (Frame frame, String title, Properties props)
-  {
-    return null;		// FIXME
-  }
-
-  XGraphicsConfiguration getDefaultXGraphicsConfiguration()
-  {
-    if (defaultConfig == null)
-      {
-	Screen screen = display.getDefaultScreen();
-	Visual visual = screen.getRootVisual();
-	defaultConfig = new XGraphicsConfiguration(visual);
-
-	// ASSERT:
-	if (!defaultConfig.getVisual().getScreen().equals(screen))
-	  {
-	    String msg = "screen of graphics configuration is not " +
-	      "default screen";
-	    throw new Error(msg);
-	  }
-      }
-    
-    return defaultConfig;
-  }
-
-  public DragSourceContextPeer
-    createDragSourceContextPeer(DragGestureEvent dge)
-    throws InvalidDnDOperationException
-  {
-    throw new UnsupportedOperationException("not implemented");  
-  }
-
-  public DragGestureRecognizer
-    createDragGestureRecognizer(Class abstractRecognizerClass,
-				DragSource ds, Component c,
-				int srcActions, DragGestureListener dgl)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-
-    
-  public Map mapInputMethodHighlight(InputMethodHighlight highlight)
-  {
-    throw new UnsupportedOperationException("not implemented");
-  }
-  
-  /** Returns a shared instance of the local, platform-specific
-   * graphics environment.
-   *
-   * <p>This method is specific to GNU Classpath. It gets called by
-   * the Classpath implementation of {@link
-   * GraphicsEnvironment.getLocalGraphcisEnvironment()}.
-   */
-  public GraphicsEnvironment getLocalGraphicsEnvironment ()
-  {
-    return new XGraphicsEnvironment (this);
-  }
-  
-  /** Acquires an appropriate {@link ClasspathFontPeer}, for use in
-   * classpath's implementation of {@link java.awt.Font}.
-   *
-   * @param name The logical name of the font. This may be either a face
-   * name or a logical font name, or may even be null. A default
-   * implementation of name decoding is provided in
-   * {@link ClasspathFontPeer}, but may be overridden in other toolkits.
-   *
-   * @param attrs Any extra {@link java.awt.font.TextAttribute} attributes
-   * this font peer should have, such as size, weight, family name, or
-   * transformation.
-   */
-  public ClasspathFontPeer getClasspathFontPeer (String name, Map attrs)
-  {
-    int style = Font.PLAIN;
-    float size = 12;
-
-    if (attrs.containsKey (TextAttribute.WEIGHT))
-      {
-        Float weight = (Float) attrs.get (TextAttribute.WEIGHT);
-        if (weight.floatValue () >= TextAttribute.WEIGHT_BOLD.floatValue ())
-          style += Font.BOLD;
-      }
-
-    if (attrs.containsKey (TextAttribute.POSTURE))
-      {
-        Float posture = (Float) attrs.get (TextAttribute.POSTURE);
-        if (posture.floatValue () >= TextAttribute.POSTURE_OBLIQUE.floatValue ())
-          style += Font.ITALIC;
-      }
-
-    if (attrs.containsKey (TextAttribute.SIZE))
-      {
-        Float fsize = (Float) attrs.get (TextAttribute.SIZE);
-        size = fsize.floatValue ();
-      }
-
-    return new XFontPeer (name,style,size);
-  }
-
-  /** Creates a font, reading the glyph definitions from a stream.
-   *
-   * <p>This method provides the platform-specific implementation for
-   * the static factory method {@link Font#createFont(int,
-   * java.io.InputStream)}.
-   *
-   * @param format the format of the font data, such as {@link
-   * Font#TRUETYPE_FONT}. An implementation may ignore this argument
-   * if it is able to automatically recognize the font format from the
-   * provided data.
-   *
-   * @param stream an input stream from where the font data is read
-   * in. The stream will be advanced to the position after the font
-   * data, but not closed.
-   *
-   * @throws IllegalArgumentException if <code>format</code> is
-   * not supported.
-   *
-   * @throws FontFormatException if <code>stream</code> does not
-   * contain data in the expected format, or if required tables are
-   * missing from a font.
-   *
-   * @throws IOException if a problem occurs while reading in the
-   * contents of <code>stream</code>.
-   */
-  public Font createFont (int format, InputStream stream)
-  {
-    throw new java.lang.UnsupportedOperationException ();
-  }
-
-  public RobotPeer createRobot (GraphicsDevice screen) throws AWTException
-  {
-    throw new java.lang.UnsupportedOperationException ();
-  }
-
-  public EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w)
-  {
-    throw new java.lang.UnsupportedOperationException ();
-  }
-
-  public boolean nativeQueueEmpty() 
-  {
-    // Tell EventQueue the native queue is empty, because XEventLoop
-    // separately ensures that native events are posted to AWT.
-    return true;
-  }
-
-  public void wakeNativeQueue() 
-  {
-    // Not implemented, because the native queue is always awake.
-    // (i.e. it's polled in a thread separate from the AWT dispatch thread)
-  }
-
-  /** Checks the native event queue for events.  If blocking, waits until an
-   * event is available before returning, unless interrupted by
-   * wakeNativeQueue.  If non-blocking, returns immediately even if no
-   * event is available.
-   *
-   * @param locked The calling EventQueue
-   * @param block If true, waits for a native event before returning
-   */
-  public void iterateNativeQueue(java.awt.EventQueue locked, boolean block) 
-  {
-    // There is nothing to do here except block, because XEventLoop 
-    // iterates the queue in a dedicated thread.
-    if (block)
-    {
-      try
-      {
-        queue.wait ();
-      }
-      catch (InterruptedException ie)
-      {
-        // InterruptedException intentionally ignored
-      }
-    }
-  }
-
-  public void setAlwaysOnTop(boolean b)
-  {
-    // TODO: Implement properly.
-  }
-
-  public boolean isModalExclusionTypeSupported
-    (Dialog.ModalExclusionType modalExclusionType)
-  {
-    // TODO: Implement properly.
-    return false;
-  }
-
-  public boolean isModalityTypeSupported(Dialog.ModalityType modalityType)
-  {
-    // TODO: Implement properly.
-    return false;
-  }
-}
diff --git a/libjava/gnu/classpath/Configuration.h b/libjava/gnu/classpath/Configuration.h
deleted file mode 100644
index 699fb0f..0000000
--- a/libjava/gnu/classpath/Configuration.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_Configuration__
-#define __gnu_classpath_Configuration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Configuration;
-    }
-  }
-}
-
-class gnu::classpath::Configuration : public ::java::lang::Object
-{
-
-  Configuration();
-  static ::java::lang::String * classpath_home();
-  static jboolean debug();
-  static ::java::lang::String * toolkit();
-  static ::java::lang::String * ecj();
-public:
-  static ::java::lang::String * CLASSPATH_HOME;
-  static ::java::lang::String * CLASSPATH_VERSION;
-  static jboolean DEBUG;
-  static const jboolean INIT_LOAD_LIBRARY = 0;
-  static ::java::lang::String * default_awt_peer_toolkit;
-  static const jboolean JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = 0;
-  static ::java::lang::String * ECJ_JAR;
-  static const jboolean WANT_NATIVE_BIG_INTEGER = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_Configuration__
diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java
deleted file mode 100644
index f91d837..0000000
--- a/libjava/gnu/classpath/Configuration.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Configuration.java --
-   Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.classpath;
-
-/**
- * This file defines compile-time constants that can be accessed by
- * java code. It is pre-processed by configure.  
- */
-public final class Configuration
-{
-  private Configuration()
-  {
-  }
-
-  private static native String classpath_home();
-  private static native boolean debug();
-  private static native String toolkit();
-  private static native String ecj();
-
-  /**
-   * The value of CLASSPATH_HOME is the location that the classpath
-   * libraries and support files where installed in. It is set according to
-   * the argument for --prefix given to configure and used to set the
-   * System property gnu.classpath.home.
-   */
-  public static final String CLASSPATH_HOME = classpath_home();
-
-  /**
-   * The release version number of GNU Classpath.
-   * It is set according to the value of 'version' in the configure[.in] file
-   * and used to set the System property gnu.classpath.version.
-   */
-  public static final String CLASSPATH_VERSION = "0.99";
-
-  /**
-   * The value of DEBUG is substituted according to whether the
-   * "--enable-debug" argument was passed to configure. Code
-   * which is made conditional based on the value of this flag - typically 
-   * code that generates debugging output - will be removed by the optimizer 
-   * in a non-debug build.
-   */
-  public static final boolean DEBUG = debug();
-
-  /**
-   * The value of LOAD_LIBRARY is substituted according to whether the
-   * "--enable-load-library" or "--disable-load-library" argument was passed 
-   * to configure.  By default, configure should define this is as true.
-   * If set to false, loadLibrary() calls to load native function
-   * implementations, typically found in static initializers of classes
-   * which contain native functions, will be omitted.  This is useful for
-   * runtimes which pre-link their native function implementations and do
-   * not require additional shared libraries to be loaded.
-   */
-  public static final boolean INIT_LOAD_LIBRARY = false;
-
-  /**
-   * Name of default AWT peer library.
-   */
-  public static final String default_awt_peer_toolkit = toolkit();
-
-  /**
-   * Whether to automatically run the init* methods in java.lang.System
-   * (the default) at class initialization time or whether to have the VM
-   * explicitly invoke them.
-   *
-   * The default is false, meaning the VM does not explicitly run the
-   * initializers. 
-   * 
-   */
-  public static final boolean JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = false;
-
-  /**
-   * The Eclipse Java Compiler jar file for use by the
-   * com.sun.tools.javac implementation in tools.zip.
-   */
-  public static final String ECJ_JAR = ecj();
-
-  /**
-   * Set to <code>true</code> if the config script found that (a) an
-   * implementation of java.math.BigInteger, based on the GNU MP library, is
-   * desired in preference to a pure Java one, and (b) the GNU MP library was
-   * found on the platform where the JVM is to run. Otherwise, this field is
-   * set to <code>false</code>.
-   */
-  public static final boolean WANT_NATIVE_BIG_INTEGER = true;
-}
diff --git a/libjava/gnu/classpath/NotImplementedException.h b/libjava/gnu/classpath/NotImplementedException.h
deleted file mode 100644
index b81e112..0000000
--- a/libjava/gnu/classpath/NotImplementedException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_NotImplementedException__
-#define __gnu_classpath_NotImplementedException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class NotImplementedException;
-    }
-  }
-}
-
-class gnu::classpath::NotImplementedException : public ::java::lang::RuntimeException
-{
-
-  NotImplementedException();
-  static const jlong serialVersionUID = 5112972057211125814LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_NotImplementedException__
diff --git a/libjava/gnu/classpath/Pair.h b/libjava/gnu/classpath/Pair.h
deleted file mode 100644
index 98b3e23..0000000
--- a/libjava/gnu/classpath/Pair.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_Pair__
-#define __gnu_classpath_Pair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pair;
-    }
-  }
-}
-
-class gnu::classpath::Pair : public ::java::lang::Object
-{
-
-public:
-  Pair(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getLeft();
-  virtual ::java::lang::Object * getRight();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  ::java::lang::Object * right;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_Pair__
diff --git a/libjava/gnu/classpath/Pointer.h b/libjava/gnu/classpath/Pointer.h
deleted file mode 100644
index 79d0ecc..0000000
--- a/libjava/gnu/classpath/Pointer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_Pointer__
-#define __gnu_classpath_Pointer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-  }
-}
-
-class gnu::classpath::Pointer : public ::java::lang::Object
-{
-
-public:
-  Pointer();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_Pointer__
diff --git a/libjava/gnu/classpath/Pointer32.h b/libjava/gnu/classpath/Pointer32.h
deleted file mode 100644
index d704ee0..0000000
--- a/libjava/gnu/classpath/Pointer32.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_Pointer32__
-#define __gnu_classpath_Pointer32__
-
-#pragma interface
-
-#include <gnu/classpath/Pointer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer32;
-    }
-  }
-}
-
-class gnu::classpath::Pointer32 : public ::gnu::classpath::Pointer
-{
-
-public:
-  Pointer32(jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::classpath::Pointer)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_Pointer32__
diff --git a/libjava/gnu/classpath/Pointer64.h b/libjava/gnu/classpath/Pointer64.h
deleted file mode 100644
index b44950c..0000000
--- a/libjava/gnu/classpath/Pointer64.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_Pointer64__
-#define __gnu_classpath_Pointer64__
-
-#pragma interface
-
-#include <gnu/classpath/Pointer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer64;
-    }
-  }
-}
-
-class gnu::classpath::Pointer64 : public ::gnu::classpath::Pointer
-{
-
-public:
-  Pointer64(jlong);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::gnu::classpath::Pointer)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_Pointer64__
diff --git a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
deleted file mode 100644
index 2d532ad..0000000
--- a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_ServiceFactory$ServiceIterator__
-#define __gnu_classpath_ServiceFactory$ServiceIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class ServiceFactory$ServiceIterator;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class AccessControlContext;
-    }
-  }
-}
-
-class gnu::classpath::ServiceFactory$ServiceIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, jboolean, ::java::security::AccessControlContext *);
-public:
-  ::java::lang::Object * next();
-  jboolean hasNext();
-  void remove();
-private:
-  ::java::lang::Object * loadNextServiceProvider();
-  void advanceReader();
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) spi;
-  ::java::util::Enumeration * urls;
-  ::java::lang::ClassLoader * loader;
-  ::java::security::AccessControlContext * securityContext;
-  ::java::io::BufferedReader * reader;
-  ::java::net::URL * currentURL;
-  ::java::lang::Object * nextProvider;
-  jboolean error;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_ServiceFactory$ServiceIterator__
diff --git a/libjava/gnu/classpath/ServiceFactory.h b/libjava/gnu/classpath/ServiceFactory.h
deleted file mode 100644
index d335427..0000000
--- a/libjava/gnu/classpath/ServiceFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_ServiceFactory__
-#define __gnu_classpath_ServiceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class ServiceFactory;
-    }
-  }
-}
-
-class gnu::classpath::ServiceFactory : public ::java::lang::Object
-{
-
-  ServiceFactory();
-public:
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *, jboolean);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *);
-public: // actually package-private
-  static void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Throwable *);
-private:
-  static ::java::util::logging::Logger * LOGGER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_ServiceFactory__
diff --git a/libjava/gnu/classpath/ServiceProviderLoadingAction.h b/libjava/gnu/classpath/ServiceProviderLoadingAction.h
deleted file mode 100644
index d6abfe5..0000000
--- a/libjava/gnu/classpath/ServiceProviderLoadingAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_ServiceProviderLoadingAction__
-#define __gnu_classpath_ServiceProviderLoadingAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class ServiceProviderLoadingAction;
-    }
-  }
-}
-
-class gnu::classpath::ServiceProviderLoadingAction : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceProviderLoadingAction(::java::lang::Class *, ::java::lang::String *, ::java::lang::ClassLoader *);
-public:
-  ::java::lang::Object * run();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) spi;
-  ::java::lang::String * providerName;
-  ::java::lang::ClassLoader * loader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_ServiceProviderLoadingAction__
diff --git a/libjava/gnu/classpath/SystemProperties.h b/libjava/gnu/classpath/SystemProperties.h
deleted file mode 100644
index 290300a..0000000
--- a/libjava/gnu/classpath/SystemProperties.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_SystemProperties__
-#define __gnu_classpath_SystemProperties__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class SystemProperties;
-    }
-  }
-}
-
-class gnu::classpath::SystemProperties : public ::java::lang::Object
-{
-
-public:
-  SystemProperties();
-private:
-  static void insertSystemProperties(::java::util::Properties *);
-public:
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static ::java::lang::String * getProperty(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * setProperty(::java::lang::String *, ::java::lang::String *);
-  static ::java::util::Properties * getProperties();
-  static void setProperties(::java::util::Properties *);
-private:
-  static jboolean isWordsBigEndian();
-public:
-  static ::java::lang::String * remove(::java::lang::String *);
-private:
-  static ::java::util::Properties * properties;
-  static ::java::util::Properties * defaultProperties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_SystemProperties__
diff --git a/libjava/gnu/classpath/SystemProperties.java b/libjava/gnu/classpath/SystemProperties.java
deleted file mode 100644
index e5ecdf7..0000000
--- a/libjava/gnu/classpath/SystemProperties.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* SystemProperties.java -- Manage the System properties.
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.classpath;
-
-import java.util.Properties;
-
-/**
- * The class manages the System properties. This class is only available to
- * privileged code (i.e. code loaded by the bootstrap class loader) and
- * therefore doesn't do any security checks.
- * This class is separated out from java.lang.System to simplify bootstrap
- * dependencies and to allow trusted code a simple and efficient mechanism
- * to access the system properties.
- */
-public class SystemProperties
-{
-  /**
-   * Stores the current system properties. This can be modified by
-   * {@link #setProperties(Properties)}, but will never be null, because
-   * setProperties(null) sucks in the default properties.
-   */
-  private static Properties properties;
-
-  /**
-   * The default properties. Once the default is stabilized,
-   * it should not be modified;
-   * instead it is cloned when calling <code>setProperties(null)</code>.
-   */
-  private static final Properties defaultProperties = new Properties();
-
-  private static native void insertSystemProperties(Properties properties);
-
-  static
-  {
-    insertSystemProperties(defaultProperties);
-
-    defaultProperties.put("gnu.classpath.version",
-                          Configuration.CLASSPATH_VERSION);
-
-    // Set base URL if not already set.
-    if (defaultProperties.get("gnu.classpath.home.url") == null)
-      defaultProperties.put("gnu.classpath.home.url",
-			    "file://"
-			    + defaultProperties.get("gnu.classpath.home")
-	                    + "/lib");
-
-    // Set short name if not already set.
-    if (defaultProperties.get("gnu.classpath.vm.shortname") == null)
-      {
-	String value = defaultProperties.getProperty("java.vm.name");
-	int index = value.lastIndexOf(' ');
-	if (index != -1)
-	  value = value.substring(index + 1);
-	defaultProperties.put("gnu.classpath.vm.shortname", value);
-      }
-
-    // Network properties
-    if (defaultProperties.get("http.agent") == null)
-      {
-	String userAgent = ("gnu-classpath/"
-	                    + defaultProperties.getProperty("gnu.classpath.version")
-	                    + " ("
-	                    + defaultProperties.getProperty("gnu.classpath.vm.shortname")
-	                    + "/"
-	                    + defaultProperties.getProperty("java.vm.version")
-	                    + ")");
-	 defaultProperties.put("http.agent", userAgent);
-      }
-
-    defaultProperties.put("gnu.cpu.endian",
-			  isWordsBigEndian() ? "big" : "little");
-
-    // XXX FIXME - Temp hack for old systems that set the wrong property
-    if (defaultProperties.get("java.io.tmpdir") == null)
-      defaultProperties.put("java.io.tmpdir",
-                            defaultProperties.get("java.tmpdir"));
-
-    // Note that we use clone here and not new.  Some programs assume
-    // that the system properties do not have a parent.
-    properties = (Properties) defaultProperties.clone();
-  }
-
-  public static String getProperty(String name)
-  {
-    return properties.getProperty(name);
-  }
-
-  public static String getProperty(String name, String defaultValue)
-  {
-    return properties.getProperty(name, defaultValue);
-  }
-
-  public static String setProperty(String name, String value)
-  {
-    return (String) properties.setProperty(name, value);
-  }
-
-  public static Properties getProperties()
-  {
-    return properties;
-  }
-
-  public static void setProperties(Properties properties)
-  {
-    if (properties == null)
-      {
-        // Note that we use clone here and not new.  Some programs
-        // assume that the system properties do not have a parent.
-        properties = (Properties)defaultProperties.clone();
-      }
-
-    SystemProperties.properties = properties;
-  }
-
-  /**
-   * Detect big-endian systems.
-   *
-   * @return true if the system is big-endian.
-   */
-  private static native boolean isWordsBigEndian();
-
-  /**
-   * Removes the supplied system property and its current value.
-   * If the specified property does not exist, nothing happens.
-   * 
-   * @throws NullPointerException if the property name is null.
-   * @return the value of the removed property, or null if no
-   *         such property exists.
-   */
-  public static String remove(String name)
-  {
-    return (String) properties.remove(name);
-  }
-
-}
diff --git a/libjava/gnu/classpath/VMStackWalker.h b/libjava/gnu/classpath/VMStackWalker.h
deleted file mode 100644
index bfe1845..0000000
--- a/libjava/gnu/classpath/VMStackWalker.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_VMStackWalker__
-#define __gnu_classpath_VMStackWalker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class VMStackWalker;
-    }
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class gnu::classpath::VMStackWalker : public ::java::lang::Object
-{
-
-public:
-  VMStackWalker();
-  static JArray< ::java::lang::Class * > * getClassContext();
-  static ::java::lang::Class * getCallingClass();
-private:
-  static ::java::lang::Class * getCallingClass(::gnu::gcj::RawData *);
-public:
-  static ::java::lang::ClassLoader * getCallingClassLoader();
-private:
-  static ::java::lang::ClassLoader * getCallingClassLoader(::gnu::gcj::RawData *);
-public:
-  static ::java::lang::ClassLoader * getClassLoader(::java::lang::Class *);
-  static ::java::lang::ClassLoader * firstNonNullClassLoader();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_VMStackWalker__
diff --git a/libjava/gnu/classpath/VMStackWalker.java b/libjava/gnu/classpath/VMStackWalker.java
deleted file mode 100644
index 0cf6ecd..0000000
--- a/libjava/gnu/classpath/VMStackWalker.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* VMStackWalker.java -- Reference implementation of VM hooks for stack access
-   Copyright (C) 2005, 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.classpath;
-
-import gnu.gcj.RawData;
-
-/**
- * This class provides access to the classes on the Java stack
- * for reflection and security purposes.
- *
- * <p>
- * This class is only available to privileged code (i.e., code loaded
- * by the bootstrap loader).
- *
- * @author John Keiser
- * @author Eric Blake <ebb9@email.byu.edu>
- * @author Archie Cobbs
- * @author Andrew Haley <aph@redhat.com>
- * @author Gary Benson <gbenson@redhat.com>
- */
-public final class VMStackWalker
-{
-  /**
-   * Get a list of all the classes currently executing methods on the
-   * Java stack. <code>getClassContext()[0]</code> is the class associated
-   * with the currently executing method, i.e., the method that called
-   * <code>VMStackWalker.getClassContext()</code> (possibly through
-   * reflection). So you may need to pop off these stack frames from
-   * the top of the stack:
-   * <ul>
-   * <li><code>VMStackWalker.getClassContext()</code>
-   * <li><code>Method.invoke()</code>
-   * </ul>
-   *
-   * @return an array of the declaring classes of each stack frame
-   */
-  public static native Class[] getClassContext();
-
-  /**
-   * Get the class associated with the method invoking the method
-   * invoking this method, or <code>null</code> if the stack is not
-   * that deep (e.g., invoked via JNI invocation API). This method
-   * is an optimization for the expression <code>getClassContext()[1]</code>
-   * and should return the same result.
-   *
-   * <p>
-   * When compiling to native code gcj translates calls to this
-   * method into calls to <code>getCallingClass(addr)</code>, with
-   * <code>addr</code> being the address of the method calling this
-   * method. <code>getCallingClass(addr)</code> does not unwind the
-   * stack, so is therefore more efficient.
-   */
-  public static native Class getCallingClass();
-
-  /**
-   * Get the class associated with the method invoking the method
-   * invoking this method, or <code>null</code> if the stack is not
-   * that deep (e.g., invoked via JNI invocation API).
-   *
-   * @param addr The address of the method invoking this method.
-   */
-  private static native Class getCallingClass(RawData addr);
-
-  /**
-   * Get the class loader associated with the Class returned by
-   * <code>getCallingClass()</code>, or <code>null</code> if no such class
-   * exists or it is the boot loader. This method is an optimization for the
-   * expression <code>VMStackWalker.getClassLoader(getClassContext()[1])</code>
-   * and should return the same result.
-   *
-   * <p>
-   * When compiling to native code gcj translates calls to this
-   * method into calls to <code>getCallingClassLoader(addr)</code>,
-   * with <code>addr</code> being the address of the method calling
-   * this method. <code>getCallingClassLoader(addr)</code> does not
-   * unwind the stack, so is therefore more efficient.
-   */
-  public static native ClassLoader getCallingClassLoader();
-
-  /**
-   * Get the class loader associated with the Class returned by
-   * <code>getCallingClass()</code>, or <code>null</code> if no
-   * such class exists or it is the boot loader.
-   * 
-   * @param addr The address of the method invoking this method.
-   */
-  private static native ClassLoader getCallingClassLoader(RawData addr);
-
-  /**
-   * Retrieve the class's ClassLoader, or <code>null</code> if loaded
-   * by the bootstrap loader. I.e., this should return the same thing
-   * as {@link java.lang.VMClass#getClassLoader}. This duplicate version
-   * is here to work around access permissions.
-   */
-  public static native ClassLoader getClassLoader(Class cl);
-
-  /**
-   * Walk up the stack and return the first non-null class loader.
-   * If there aren't any non-null class loaders on the stack, return null.
-   */
-  public static native ClassLoader firstNonNullClassLoader();
-}
-
diff --git a/libjava/gnu/classpath/debug/Component.h b/libjava/gnu/classpath/debug/Component.h
deleted file mode 100644
index b6dd87e..0000000
--- a/libjava/gnu/classpath/debug/Component.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_Component__
-#define __gnu_classpath_debug_Component__
-
-#pragma interface
-
-#include <java/util/logging/Level.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class Component;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::Component : public ::java::util::logging::Level
-{
-
-  Component(::java::lang::String *, jint);
-  Component(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::classpath::debug::Component * forName(::java::lang::String *);
-  jint startIndex();
-  jint endIndex();
-  static ::gnu::classpath::debug::Component * EVERYTHING;
-  static ::gnu::classpath::debug::Component * SSL;
-  static ::gnu::classpath::debug::Component * SSL_HANDSHAKE;
-  static ::gnu::classpath::debug::Component * SSL_RECORD_LAYER;
-  static ::gnu::classpath::debug::Component * SSL_KEY_EXCHANGE;
-  static ::gnu::classpath::debug::Component * SSL_DELEGATED_TASK;
-  static ::gnu::classpath::debug::Component * CRYPTO;
-  static ::gnu::classpath::debug::Component * X509;
-  static ::gnu::classpath::debug::Component * POLICY;
-  static ::gnu::classpath::debug::Component * IPP;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::logging::Level)))) startIndex__;
-  jint endIndex__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_Component__
diff --git a/libjava/gnu/classpath/debug/PreciseFilter.h b/libjava/gnu/classpath/debug/PreciseFilter.h
deleted file mode 100644
index 14fdfdb..0000000
--- a/libjava/gnu/classpath/debug/PreciseFilter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_PreciseFilter__
-#define __gnu_classpath_debug_PreciseFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class Component;
-          class PreciseFilter;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::PreciseFilter : public ::java::lang::Object
-{
-
-  PreciseFilter();
-public:
-  void disable(::gnu::classpath::debug::Component *);
-  void enable(::gnu::classpath::debug::Component *);
-  jboolean isEnabled(::gnu::classpath::debug::Component *);
-  jboolean isLoggable(::java::util::logging::LogRecord *);
-  static ::gnu::classpath::debug::PreciseFilter * GLOBAL;
-private:
-  ::java::util::BitSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_PreciseFilter__
diff --git a/libjava/gnu/classpath/debug/Simple1LineFormatter.h b/libjava/gnu/classpath/debug/Simple1LineFormatter.h
deleted file mode 100644
index 237dfac..0000000
--- a/libjava/gnu/classpath/debug/Simple1LineFormatter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_Simple1LineFormatter__
-#define __gnu_classpath_debug_Simple1LineFormatter__
-
-#pragma interface
-
-#include <java/util/logging/Formatter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class Simple1LineFormatter;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-        class NumberFormat;
-    }
-  }
-}
-
-class gnu::classpath::debug::Simple1LineFormatter : public ::java::util::logging::Formatter
-{
-
-public:
-  Simple1LineFormatter();
-  virtual ::java::lang::String * format(::java::util::logging::LogRecord *);
-private:
-  static ::java::lang::String * DAT_PATTERN;
-  static ::java::lang::String * THREAD_PATTERN;
-  static ::java::lang::String * SPACES_32;
-  static ::java::lang::String * SPACES_6;
-  static ::java::lang::String * LS;
-  ::java::text::DateFormat * __attribute__((aligned(__alignof__( ::java::util::logging::Formatter)))) dateFormat;
-  ::java::text::NumberFormat * threadFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_Simple1LineFormatter__
diff --git a/libjava/gnu/classpath/debug/SystemLogger.h b/libjava/gnu/classpath/debug/SystemLogger.h
deleted file mode 100644
index dc367e3..0000000
--- a/libjava/gnu/classpath/debug/SystemLogger.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_SystemLogger__
-#define __gnu_classpath_debug_SystemLogger__
-
-#pragma interface
-
-#include <java/util/logging/Logger.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::SystemLogger : public ::java::util::logging::Logger
-{
-
-public:
-  static ::gnu::classpath::debug::SystemLogger * getSystemLogger();
-private:
-  SystemLogger();
-public:
-  void logv(::java::util::logging::Level *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  static ::gnu::classpath::debug::SystemLogger * SYSTEM;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_SystemLogger__
diff --git a/libjava/gnu/classpath/debug/TeeInputStream.h b/libjava/gnu/classpath/debug/TeeInputStream.h
deleted file mode 100644
index 293f057..0000000
--- a/libjava/gnu/classpath/debug/TeeInputStream.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_TeeInputStream__
-#define __gnu_classpath_debug_TeeInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class TeeInputStream;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::TeeInputStream : public ::java::io::InputStream
-{
-
-public:
-  TeeInputStream(::java::io::InputStream *, ::java::io::OutputStream *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void close();
-  virtual jboolean markSupported();
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_TeeInputStream__
diff --git a/libjava/gnu/classpath/debug/TeeOutputStream.h b/libjava/gnu/classpath/debug/TeeOutputStream.h
deleted file mode 100644
index 2435780..0000000
--- a/libjava/gnu/classpath/debug/TeeOutputStream.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_TeeOutputStream__
-#define __gnu_classpath_debug_TeeOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class TeeOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::TeeOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  TeeOutputStream(::java::io::OutputStream *, ::java::io::OutputStream *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) out;
-  ::java::io::OutputStream * sink;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_TeeOutputStream__
diff --git a/libjava/gnu/classpath/debug/TeeReader.h b/libjava/gnu/classpath/debug/TeeReader.h
deleted file mode 100644
index 5da674b..0000000
--- a/libjava/gnu/classpath/debug/TeeReader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_TeeReader__
-#define __gnu_classpath_debug_TeeReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class TeeReader;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::TeeReader : public ::java::io::Reader
-{
-
-public:
-  TeeReader(::java::io::Reader *, ::java::io::Writer *);
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void close();
-  virtual jboolean markSupported();
-private:
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::io::Reader)))) in;
-  ::java::io::Writer * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_TeeReader__
diff --git a/libjava/gnu/classpath/debug/TeeWriter.h b/libjava/gnu/classpath/debug/TeeWriter.h
deleted file mode 100644
index ee34cf0..0000000
--- a/libjava/gnu/classpath/debug/TeeWriter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_debug_TeeWriter__
-#define __gnu_classpath_debug_TeeWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class TeeWriter;
-      }
-    }
-  }
-}
-
-class gnu::classpath::debug::TeeWriter : public ::java::io::Writer
-{
-
-public:
-  TeeWriter(::java::io::Writer *, ::java::io::Writer *);
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-private:
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) out;
-  ::java::io::Writer * sink;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_debug_TeeWriter__
diff --git a/libjava/gnu/classpath/jdwp/Jdwp$1.h b/libjava/gnu/classpath/jdwp/Jdwp$1.h
deleted file mode 100644
index 5f779e1..0000000
--- a/libjava/gnu/classpath/jdwp/Jdwp$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_Jdwp$1__
-#define __gnu_classpath_jdwp_Jdwp$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class Jdwp;
-          class Jdwp$1;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::Jdwp$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Jdwp$1(::gnu::classpath::jdwp::Jdwp *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::classpath::jdwp::Jdwp * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_Jdwp$1__
diff --git a/libjava/gnu/classpath/jdwp/Jdwp.h b/libjava/gnu/classpath/jdwp/Jdwp.h
deleted file mode 100644
index ba10ead..0000000
--- a/libjava/gnu/classpath/jdwp/Jdwp.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_Jdwp__
-#define __gnu_classpath_jdwp_Jdwp__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class Jdwp;
-        namespace event
-        {
-            class Event;
-            class EventRequest;
-        }
-        namespace processor
-        {
-            class PacketProcessor;
-        }
-        namespace transport
-        {
-            class JdwpConnection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::Jdwp : public ::java::lang::Thread
-{
-
-public:
-  Jdwp();
-  static ::gnu::classpath::jdwp::Jdwp * getDefault();
-  virtual ::java::lang::ThreadGroup * getJdwpThreadGroup();
-  static jboolean suspendOnStartup();
-  virtual void configure(::java::lang::String *);
-private:
-  void _doInitialization();
-public:
-  virtual void shutdown();
-  static void notify(::gnu::classpath::jdwp::event::Event *);
-  static void notify(JArray< ::gnu::classpath::jdwp::event::Event * > *);
-  static void sendEvent(::gnu::classpath::jdwp::event::EventRequest *, ::gnu::classpath::jdwp::event::Event *);
-  static void sendEvents(JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, JArray< ::gnu::classpath::jdwp::event::Event * > *, jbyte);
-private:
-  void _enforceSuspendPolicy(jbyte);
-public:
-  virtual void subcomponentInitialized();
-  virtual void run();
-private:
-  void _processConfigury(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::classpath::jdwp::processor::PacketProcessor * access$0(::gnu::classpath::jdwp::Jdwp *);
-private:
-  static ::gnu::classpath::jdwp::Jdwp * _instance;
-public:
-  static jboolean isDebugging;
-private:
-  ::gnu::classpath::jdwp::processor::PacketProcessor * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) _packetProcessor;
-  ::java::lang::Thread * _ppThread;
-  ::java::util::HashMap * _properties;
-  static ::java::lang::String * _PROPERTY_SUSPEND;
-  ::gnu::classpath::jdwp::transport::JdwpConnection * _connection;
-  jboolean _shutdown;
-  ::java::lang::ThreadGroup * _group;
-  ::java::lang::Object * _initLock;
-  jint _initCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_Jdwp__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$ClassStatus.h b/libjava/gnu/classpath/jdwp/JdwpConstants$ClassStatus.h
deleted file mode 100644
index 4cc1502..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$ClassStatus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$ClassStatus__
-#define __gnu_classpath_jdwp_JdwpConstants$ClassStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$ClassStatus;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$ClassStatus : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$ClassStatus();
-  static const jint VERIFIED = 1;
-  static const jint PREPARED = 2;
-  static const jint INITIALIZED = 4;
-  static const jint ERROR = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$ClassStatus__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.h
deleted file mode 100644
index 940ada8..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ArrayReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ArrayReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ArrayReference();
-  static const jbyte CS_VALUE = 13;
-  static const jbyte LENGTH = 1;
-  static const jbyte GET_VALUES = 2;
-  static const jbyte SET_VALUES = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.h
deleted file mode 100644
index 0115eb2..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayType__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ArrayType;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ArrayType : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ArrayType();
-  static const jbyte CS_VALUE = 4;
-  static const jbyte NEW_INSTANCE = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ArrayType__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.h
deleted file mode 100644
index 3725550..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassLoaderReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassLoaderReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ClassLoaderReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ClassLoaderReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ClassLoaderReference();
-  static const jbyte CS_VALUE = 14;
-  static const jbyte VISIBLE_CLASSES = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassLoaderReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.h
deleted file mode 100644
index 73f2152..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassObjectReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassObjectReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ClassObjectReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ClassObjectReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ClassObjectReference();
-  static const jbyte CS_VALUE = 17;
-  static const jbyte REFLECTED_TYPE = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassObjectReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.h
deleted file mode 100644
index 4d90554..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassType__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ClassType;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ClassType : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ClassType();
-  static const jbyte CS_VALUE = 3;
-  static const jbyte SUPERCLASS = 1;
-  static const jbyte SET_VALUES = 2;
-  static const jbyte INVOKE_METHOD = 3;
-  static const jbyte NEW_INSTANCE = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ClassType__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.h
deleted file mode 100644
index 74eba42..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$Event__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$Event__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$Event;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$Event : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$Event();
-  static const jbyte CS_VALUE = 64;
-  static const jbyte COMPOSITE = 100;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$Event__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.h
deleted file mode 100644
index c486a61..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$EventRequest__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$EventRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$EventRequest;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$EventRequest : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$EventRequest();
-  static const jbyte CS_VALUE = 15;
-  static const jbyte SET = 1;
-  static const jbyte CLEAR = 2;
-  static const jbyte CLEAR_ALL_BREAKPOINTS = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$EventRequest__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.h
deleted file mode 100644
index 07949aa..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$Field__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$Field__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$Field;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$Field : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$Field();
-  static const jbyte CS_VALUE = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$Field__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.h
deleted file mode 100644
index 608072d..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$InterfaceType__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$InterfaceType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$InterfaceType;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$InterfaceType : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$InterfaceType();
-  static const jbyte CS_VALUE = 5;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$InterfaceType__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.h
deleted file mode 100644
index 8b40665..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$Method__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$Method__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$Method;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$Method : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$Method();
-  static const jbyte CS_VALUE = 6;
-  static const jbyte LINE_TABLE = 1;
-  static const jbyte VARIABLE_TABLE = 2;
-  static const jbyte BYTE_CODES = 3;
-  static const jbyte IS_OBSOLETE = 4;
-  static const jbyte VARIABLE_TABLE_WITH_GENERIC = 5;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$Method__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.h
deleted file mode 100644
index 3d9f5c4..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ObjectReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ObjectReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ObjectReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ObjectReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ObjectReference();
-  static const jbyte CS_VALUE = 9;
-  static const jbyte REFERENCE_TYPE = 1;
-  static const jbyte GET_VALUES = 2;
-  static const jbyte SET_VALUES = 3;
-  static const jbyte MONITOR_INFO = 5;
-  static const jbyte INVOKE_METHOD = 6;
-  static const jbyte DISABLE_COLLECTION = 7;
-  static const jbyte ENABLE_COLLECTION = 8;
-  static const jbyte IS_COLLECTED = 9;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ObjectReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.h
deleted file mode 100644
index dc4bd00..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ReferenceType__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ReferenceType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ReferenceType;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ReferenceType : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ReferenceType();
-  static const jbyte CS_VALUE = 2;
-  static const jbyte SIGNATURE = 1;
-  static const jbyte CLASS_LOADER = 2;
-  static const jbyte MODIFIERS = 3;
-  static const jbyte FIELDS = 4;
-  static const jbyte METHODS = 5;
-  static const jbyte GET_VALUES = 6;
-  static const jbyte SOURCE_FILE = 7;
-  static const jbyte NESTED_TYPES = 8;
-  static const jbyte STATUS = 9;
-  static const jbyte INTERFACES = 10;
-  static const jbyte CLASS_OBJECT = 11;
-  static const jbyte SOURCE_DEBUG_EXTENSION = 12;
-  static const jbyte SIGNATURE_WITH_GENERIC = 13;
-  static const jbyte FIELDS_WITH_GENERIC = 14;
-  static const jbyte METHODS_WITH_GENERIC = 15;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ReferenceType__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.h
deleted file mode 100644
index 60f4072..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$StackFrame__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$StackFrame__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$StackFrame;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$StackFrame : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$StackFrame();
-  static const jbyte CS_VALUE = 16;
-  static const jbyte GET_VALUES = 1;
-  static const jbyte SET_VALUES = 2;
-  static const jbyte THIS_OBJECT = 3;
-  static const jbyte POP_FRAMES = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$StackFrame__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.h
deleted file mode 100644
index f795c3a..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$StringReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$StringReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$StringReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$StringReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$StringReference();
-  static const jbyte CS_VALUE = 10;
-  static const jbyte VALUE = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$StringReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.h
deleted file mode 100644
index 3cf1f55..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadGroupReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadGroupReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ThreadGroupReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ThreadGroupReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ThreadGroupReference();
-  static const jbyte CS_VALUE = 12;
-  static const jbyte NAME = 1;
-  static const jbyte PARENT = 2;
-  static const jbyte CHILDREN = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadGroupReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.h
deleted file mode 100644
index 603c6d1..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadReference__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$ThreadReference;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$ThreadReference : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$ThreadReference();
-  static const jbyte CS_VALUE = 11;
-  static const jbyte NAME = 1;
-  static const jbyte SUSPEND = 2;
-  static const jbyte RESUME = 3;
-  static const jbyte STATUS = 4;
-  static const jbyte THREAD_GROUP = 5;
-  static const jbyte FRAMES = 6;
-  static const jbyte FRAME_COUNT = 7;
-  static const jbyte OWNED_MONITORS = 8;
-  static const jbyte CURRENT_CONTENDED_MONITOR = 9;
-  static const jbyte STOP = 10;
-  static const jbyte INTERRUPT = 11;
-  static const jbyte SUSPEND_COUNT = 12;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$ThreadReference__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.h
deleted file mode 100644
index a6f6933..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet$VirtualMachine__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet$VirtualMachine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet$VirtualMachine;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet$VirtualMachine : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet$VirtualMachine();
-  static const jbyte CS_VALUE = 1;
-  static const jbyte VERSION = 1;
-  static const jbyte CLASSES_BY_SIGNATURE = 2;
-  static const jbyte ALL_CLASSES = 3;
-  static const jbyte ALL_THREADS = 4;
-  static const jbyte TOP_LEVEL_THREAD_GROUPS = 5;
-  static const jbyte DISPOSE = 6;
-  static const jbyte IDSIZES = 7;
-  static const jbyte SUSPEND = 8;
-  static const jbyte RESUME = 9;
-  static const jbyte EXIT = 10;
-  static const jbyte CREATE_STRING = 11;
-  static const jbyte CAPABILITIES = 12;
-  static const jbyte CLASS_PATHS = 13;
-  static const jbyte DISPOSE_OBJECTS = 14;
-  static const jbyte HOLD_EVENTS = 15;
-  static const jbyte RELEASE_EVENTS = 16;
-  static const jbyte CAPABILITIES_NEW = 17;
-  static const jbyte REDEFINE_CLASSES = 18;
-  static const jbyte SET_DEFAULT_STRATUM = 19;
-  static const jbyte ALL_CLASSES_WITH_GENERIC = 20;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet$VirtualMachine__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet.h b/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet.h
deleted file mode 100644
index 3dc0bf1..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$CommandSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$CommandSet__
-#define __gnu_classpath_jdwp_JdwpConstants$CommandSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$CommandSet;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$CommandSet : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$CommandSet();
-  static const jint MAXIMUM = 17;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$CommandSet__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$Error.h b/libjava/gnu/classpath/jdwp/JdwpConstants$Error.h
deleted file mode 100644
index 138a916..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$Error.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$Error__
-#define __gnu_classpath_jdwp_JdwpConstants$Error__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$Error;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$Error : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$Error();
-  static const jshort NONE = 0;
-  static const jshort INVALID_THREAD = 10;
-  static const jshort INVALID_THREAD_GROUP = 11;
-  static const jshort INVALID_PRIORITY = 12;
-  static const jshort THREAD_NOT_SUSPENDED = 13;
-  static const jshort THREAD_SUSPENDED = 14;
-  static const jshort INVALID_OBJECT = 20;
-  static const jshort INVALID_CLASS = 21;
-  static const jshort CLASS_NOT_PREPARED = 22;
-  static const jshort INVALID_METHODID = 23;
-  static const jshort INVALID_LOCATION = 24;
-  static const jshort INVALID_FIELDID = 25;
-  static const jshort INVALID_FRAMEID = 30;
-  static const jshort NO_MORE_FRAMES = 31;
-  static const jshort OPAQUE_FRAME = 32;
-  static const jshort NOT_CURRENT_FRAME = 33;
-  static const jshort TYPE_MISMATCH = 34;
-  static const jshort INVALID_SLOT = 35;
-  static const jshort DUPLICATE = 40;
-  static const jshort NOT_FOUND = 41;
-  static const jshort INVALID_MONITOR = 50;
-  static const jshort NOT_MONITOR_OWNER = 51;
-  static const jshort INTERRUPT = 52;
-  static const jshort INVALID_CLASS_FORMAT = 60;
-  static const jshort CIRCULAR_CLASS_DEFINITION = 61;
-  static const jshort FAILS_VERIFICATION = 62;
-  static const jshort ADD_METHOD_NOT_IMPLEMENTED = 63;
-  static const jshort SCHEMA_CHANGE_NOT_IMPLEMENTED = 64;
-  static const jshort INVALID_TYPESTATE = 65;
-  static const jshort HIERARCHY_CHANGE_NOT_IMPLEMENTED = 66;
-  static const jshort DELETE_METHOD_NOT_IMPLEMENTED = 67;
-  static const jshort UNSUPPORTED_VERSION = 68;
-  static const jshort NAMES_DONT_MATCH = 69;
-  static const jshort CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED = 70;
-  static const jshort METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED = 71;
-  static const jshort NOT_IMPLEMENTED = 99;
-  static const jshort NULL_POINTER = 100;
-  static const jshort ABSENT_INFORMATION = 101;
-  static const jshort INVALID_EVENT_TYPE = 102;
-  static const jshort ILLEGAL_ARGUMENT = 103;
-  static const jshort OUT_OF_MEMORY = 110;
-  static const jshort ACCESS_DENIED = 111;
-  static const jshort VM_DEAD = 112;
-  static const jshort INTERNAL = 113;
-  static const jshort UNATTACHED_THREAD = 115;
-  static const jshort INVALID_TAG = 500;
-  static const jshort ALREADY_INVOKING = 502;
-  static const jshort INVALID_INDEX = 503;
-  static const jshort INVALID_LENGTH = 504;
-  static const jshort INVALID_STRING = 506;
-  static const jshort INVALID_CLASS_LOADER = 507;
-  static const jshort INVALID_ARRAY = 508;
-  static const jshort TRANSPORT_LOAD = 509;
-  static const jshort TRANSPORT_INIT = 510;
-  static const jshort NATIVE_METHOD = 511;
-  static const jshort INVALID_COUNT = 512;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$Error__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$EventKind.h b/libjava/gnu/classpath/jdwp/JdwpConstants$EventKind.h
deleted file mode 100644
index bdb501c..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$EventKind.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$EventKind__
-#define __gnu_classpath_jdwp_JdwpConstants$EventKind__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$EventKind;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$EventKind : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$EventKind();
-  static const jbyte SINGLE_STEP = 1;
-  static const jbyte BREAKPOINT = 2;
-  static const jbyte FRAME_POP = 3;
-  static const jbyte EXCEPTION = 4;
-  static const jbyte USER_DEFINED = 5;
-  static const jbyte THREAD_START = 6;
-  static const jbyte THREAD_END = 7;
-  static const jbyte CLASS_PREPARE = 8;
-  static const jbyte CLASS_UNLOAD = 9;
-  static const jbyte CLASS_LOAD = 10;
-  static const jbyte FIELD_ACCESS = 20;
-  static const jbyte FIELD_MODIFICATION = 21;
-  static const jbyte EXCEPTION_CATCH = 30;
-  static const jbyte METHOD_ENTRY = 40;
-  static const jbyte METHOD_EXIT = 41;
-  static const jbyte VM_INIT = 90;
-  static const jbyte VM_DEATH = 99;
-  static const jbyte VM_DISCONNECTED = 100;
-  static const jbyte VM_START = 90;
-  static const jbyte THREAD_DEATH = 7;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$EventKind__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.h b/libjava/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.h
deleted file mode 100644
index bcd412b..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$InvokeOptions__
-#define __gnu_classpath_jdwp_JdwpConstants$InvokeOptions__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$InvokeOptions;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$InvokeOptions : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$InvokeOptions();
-  static const jint INVOKE_SINGLE_THREADED = 1;
-  static const jint INVOKE_NONVIRTUAL = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$InvokeOptions__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$ModKind.h b/libjava/gnu/classpath/jdwp/JdwpConstants$ModKind.h
deleted file mode 100644
index f2f087a..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$ModKind.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$ModKind__
-#define __gnu_classpath_jdwp_JdwpConstants$ModKind__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$ModKind;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$ModKind : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$ModKind();
-  static const jbyte COUNT = 1;
-  static const jbyte CONDITIONAL = 2;
-  static const jbyte THREAD_ONLY = 3;
-  static const jbyte CLASS_ONLY = 4;
-  static const jbyte CLASS_MATCH = 5;
-  static const jbyte CLASS_EXCLUDE = 6;
-  static const jbyte LOCATION_ONLY = 7;
-  static const jbyte EXCEPTION_ONLY = 8;
-  static const jbyte FIELD_ONLY = 9;
-  static const jbyte STEP = 10;
-  static const jbyte INSTANCE_ONLY = 11;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$ModKind__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$StepDepth.h b/libjava/gnu/classpath/jdwp/JdwpConstants$StepDepth.h
deleted file mode 100644
index 55d1b62..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$StepDepth.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$StepDepth__
-#define __gnu_classpath_jdwp_JdwpConstants$StepDepth__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$StepDepth;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$StepDepth : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$StepDepth();
-  static const jint INTO = 0;
-  static const jint OVER = 1;
-  static const jint OUT = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$StepDepth__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$StepSize.h b/libjava/gnu/classpath/jdwp/JdwpConstants$StepSize.h
deleted file mode 100644
index abd3a25..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$StepSize.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$StepSize__
-#define __gnu_classpath_jdwp_JdwpConstants$StepSize__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$StepSize;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$StepSize : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$StepSize();
-  static const jint MIN = 0;
-  static const jint LINE = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$StepSize__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.h b/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.h
deleted file mode 100644
index 8facf57..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$SuspendPolicy__
-#define __gnu_classpath_jdwp_JdwpConstants$SuspendPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$SuspendPolicy;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$SuspendPolicy : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$SuspendPolicy();
-  static const jbyte NONE = 0;
-  static const jbyte EVENT_THREAD = 1;
-  static const jbyte ALL = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$SuspendPolicy__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.h b/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.h
deleted file mode 100644
index 6c57809..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$SuspendStatus__
-#define __gnu_classpath_jdwp_JdwpConstants$SuspendStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$SuspendStatus;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$SuspendStatus : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$SuspendStatus();
-  static const jbyte SUSPENDED = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$SuspendStatus__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$Tag.h b/libjava/gnu/classpath/jdwp/JdwpConstants$Tag.h
deleted file mode 100644
index 99c3df9..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$Tag.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$Tag__
-#define __gnu_classpath_jdwp_JdwpConstants$Tag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$Tag;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$Tag : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$Tag();
-  static const jbyte ARRAY = 91;
-  static const jbyte BYTE = 66;
-  static const jbyte CHAR = 67;
-  static const jbyte OBJECT = 76;
-  static const jbyte FLOAT = 70;
-  static const jbyte DOUBLE = 68;
-  static const jbyte INT = 73;
-  static const jbyte LONG = 74;
-  static const jbyte SHORT = 83;
-  static const jbyte VOID = 86;
-  static const jbyte BOOLEAN = 90;
-  static const jbyte STRING = 115;
-  static const jbyte THREAD = 116;
-  static const jbyte THREAD_GROUP = 103;
-  static const jbyte CLASS_LOADER = 108;
-  static const jbyte CLASS_OBJECT = 99;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$Tag__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.h b/libjava/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.h
deleted file mode 100644
index 411abad..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$ThreadStatus__
-#define __gnu_classpath_jdwp_JdwpConstants$ThreadStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$ThreadStatus;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$ThreadStatus : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$ThreadStatus();
-  static const jint ZOMBIE = 0;
-  static const jint RUNNING = 1;
-  static const jint SLEEPING = 2;
-  static const jint MONITOR = 3;
-  static const jint WAIT = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$ThreadStatus__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$TypeTag.h b/libjava/gnu/classpath/jdwp/JdwpConstants$TypeTag.h
deleted file mode 100644
index 426d3d2..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$TypeTag.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$TypeTag__
-#define __gnu_classpath_jdwp_JdwpConstants$TypeTag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$TypeTag;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$TypeTag : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$TypeTag();
-  static const jbyte CLASS = 1;
-  static const jbyte INTERFACE = 2;
-  static const jbyte ARRAY = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$TypeTag__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants$Version.h b/libjava/gnu/classpath/jdwp/JdwpConstants$Version.h
deleted file mode 100644
index 293652f..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants$Version.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants$Version__
-#define __gnu_classpath_jdwp_JdwpConstants$Version__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants$Version;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants$Version : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants$Version();
-  static const jint MAJOR = 1;
-  static const jint MINOR = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants$Version__
diff --git a/libjava/gnu/classpath/jdwp/JdwpConstants.h b/libjava/gnu/classpath/jdwp/JdwpConstants.h
deleted file mode 100644
index 98f0b88..0000000
--- a/libjava/gnu/classpath/jdwp/JdwpConstants.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_JdwpConstants__
-#define __gnu_classpath_jdwp_JdwpConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class JdwpConstants;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::JdwpConstants : public ::java::lang::Object
-{
-
-public:
-  JdwpConstants();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_JdwpConstants__
diff --git a/libjava/gnu/classpath/jdwp/VMFrame.h b/libjava/gnu/classpath/jdwp/VMFrame.h
deleted file mode 100644
index 737f39d..0000000
--- a/libjava/gnu/classpath/jdwp/VMFrame.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMFrame__
-#define __gnu_classpath_jdwp_VMFrame__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMFrame;
-        namespace util
-        {
-            class Location;
-        }
-        namespace value
-        {
-            class Value;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMFrame : public ::java::lang::Object
-{
-
-public:
-  VMFrame(::java::lang::Thread *, jlong, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
-  virtual ::gnu::classpath::jdwp::util::Location * getLocation();
-  virtual ::gnu::classpath::jdwp::value::Value * getValue(jint, jbyte);
-  virtual void setValue(jint, ::gnu::classpath::jdwp::value::Value *);
-  virtual ::java::lang::Thread * getThread();
-  virtual ::java::lang::Object * getObject();
-  virtual jlong getId();
-  static const jint SIZE = 8;
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) thread;
-  ::java::lang::Object * obj;
-  ::gnu::classpath::jdwp::util::Location * loc;
-  jlong id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMFrame__
diff --git a/libjava/gnu/classpath/jdwp/VMFrame.java b/libjava/gnu/classpath/jdwp/VMFrame.java
deleted file mode 100644
index de2640c..0000000
--- a/libjava/gnu/classpath/jdwp/VMFrame.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* VMFrame.java -- Reference implementation of VM hooks for JDWP Frame access.
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.classpath.jdwp;
-
-import gnu.classpath.jdwp.util.Location;
-import gnu.classpath.jdwp.value.Value;
-
-/**
- * Reference implementation of VM hooks for JDWP Frame access.
- * 
- * @author aluchko 
- */
-
-public class VMFrame
-{
-  /**
-   * Returns the size of a frame ID over JDWP
-   */
-  public static final int SIZE = 8;
-
-  // The thread this frame resides in
-  private Thread thread;
-   
-  //The object of this frame
-  private Object obj;
-  
-  // The current location of this frame
-  private Location loc;
-  
-  // id of this frame
-  private long id;
-  
-  /**
-   * Create a new VMFrame object.
-   * 
-   * @param thr a Thread, the thread this frame is in
-   * @param frame_id a long, the jframeID of this frame
-   * @param frame_loc a Location, the location of this frame
-   */
-  public VMFrame(Thread thr, long frame_id, Location frame_loc,
-                 Object frame_obj)
-  {
-    thread = thr;
-    id = frame_id;
-    loc = frame_loc;
-    obj = frame_obj;
-  }
-  
-  /**
-   * Gets the current location of the frame.
-   */
-  public Location getLocation()
-  {
-    return loc;
-  }
-
-  /**
-   * Returns the value of the variable in the given slot.
-   * 
-   * @param slot the slot containing the variable
-   */
-  public native Value getValue(int slot, byte sig);
-
-  /**
-   * Assigns the given variable to the given value. 
-   * @param slot The slot which contains the variable
-   * @param value The value to assign the variable to
-   */
-  public native void setValue(int slot, Value value);
-  
-  /**
-   * Get the thread this frame is in.
-   */
-  public Thread getThread()
-  {
-    return thread;
-  }
-
-  /**
-   * Get the object which is represented by 'this' in the context of the frame,
-   * returns null if the method is native or static.
-   */
-  public Object getObject()
-  {
-    return obj;
-  }
-
-  /**
-   * Get the frameID
-   * @return an id which is unique within the scope of the VM
-   */
-  public long getId()
-  {
-    return id;
-  }
-
-}
diff --git a/libjava/gnu/classpath/jdwp/VMIdManager$IdFactory.h b/libjava/gnu/classpath/jdwp/VMIdManager$IdFactory.h
deleted file mode 100644
index f24d6b3..0000000
--- a/libjava/gnu/classpath/jdwp/VMIdManager$IdFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMIdManager$IdFactory__
-#define __gnu_classpath_jdwp_VMIdManager$IdFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMIdManager$IdFactory;
-        namespace id
-        {
-            class ObjectId;
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMIdManager$IdFactory : public ::java::lang::Object
-{
-
-  VMIdManager$IdFactory();
-public:
-  static ::gnu::classpath::jdwp::id::ObjectId * newObjectId(::java::lang::ref::SoftReference *);
-  static ::gnu::classpath::jdwp::id::ReferenceTypeId * newReferenceTypeId(::java::lang::ref::SoftReference *);
-private:
-  static ::java::lang::Object * _idLock;
-  static ::java::lang::Object * _ridLock;
-  static jlong _lastId;
-  static jlong _lastRid;
-  static ::java::util::HashMap * _idList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMIdManager$IdFactory__
diff --git a/libjava/gnu/classpath/jdwp/VMIdManager$ReferenceKey.h b/libjava/gnu/classpath/jdwp/VMIdManager$ReferenceKey.h
deleted file mode 100644
index 7acd047..0000000
--- a/libjava/gnu/classpath/jdwp/VMIdManager$ReferenceKey.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMIdManager$ReferenceKey__
-#define __gnu_classpath_jdwp_VMIdManager$ReferenceKey__
-
-#pragma interface
-
-#include <java/lang/ref/SoftReference.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMIdManager;
-          class VMIdManager$ReferenceKey;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMIdManager$ReferenceKey : public ::java::lang::ref::SoftReference
-{
-
-public:
-  VMIdManager$ReferenceKey(::gnu::classpath::jdwp::VMIdManager *, ::java::lang::Object *);
-  VMIdManager$ReferenceKey(::gnu::classpath::jdwp::VMIdManager *, ::java::lang::Object *, ::java::lang::ref::ReferenceQueue *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::ref::SoftReference)))) _hash;
-public: // actually package-private
-  ::gnu::classpath::jdwp::VMIdManager * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMIdManager$ReferenceKey__
diff --git a/libjava/gnu/classpath/jdwp/VMIdManager.h b/libjava/gnu/classpath/jdwp/VMIdManager.h
deleted file mode 100644
index 22fc42f..0000000
--- a/libjava/gnu/classpath/jdwp/VMIdManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMIdManager__
-#define __gnu_classpath_jdwp_VMIdManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMIdManager;
-        namespace id
-        {
-            class ObjectId;
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMIdManager : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::classpath::jdwp::VMIdManager * getDefault();
-private:
-  VMIdManager();
-  void _update();
-public:
-  virtual ::gnu::classpath::jdwp::id::ObjectId * getObjectId(::java::lang::Object *);
-  virtual ::gnu::classpath::jdwp::id::ObjectId * get(jlong);
-  virtual ::gnu::classpath::jdwp::id::ObjectId * readObjectId(::java::nio::ByteBuffer *);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getReferenceTypeId(::java::lang::Class *);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getReferenceType(jlong);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * readReferenceTypeId(::java::nio::ByteBuffer *);
-private:
-  static ::gnu::classpath::jdwp::VMIdManager * _idm;
-  ::java::lang::ref::ReferenceQueue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _refQueue;
-  ::java::util::Hashtable * _oidTable;
-  ::java::util::Hashtable * _idTable;
-  ::java::util::Hashtable * _classTable;
-  ::java::util::Hashtable * _ridTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMIdManager__
diff --git a/libjava/gnu/classpath/jdwp/VMIdManager.java b/libjava/gnu/classpath/jdwp/VMIdManager.java
deleted file mode 100644
index f787a8c..0000000
--- a/libjava/gnu/classpath/jdwp/VMIdManager.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/* VMIdManager.java -- A reference/example implementation of a manager for
-   JDWP object/reference type IDs
-
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.classpath.jdwp;
-
-import gnu.classpath.jdwp.exception.InvalidClassException;
-import gnu.classpath.jdwp.exception.InvalidObjectException;
-import gnu.classpath.jdwp.id.*;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-/**
- * This class manages objects and referencetypes that are reported
- * to the debugger. All objects and referencetypes reported to the
- * debugger should go through this manager.
- *
- * A brief summary of what an <code>IdManager</code> must provide:
- *
- * <code>
- * public ObjectId getObjectId (Object theObject);
- * public ObjectId get (long id);
- * public ObjectId readObjectId (ByteBuffer bb);
- * public ReferenceTypeId getReferenceTypeId (Class clazz);
- * public ReferenceTypeId getReferenceType (long id);
- * public ReferenceTypeId readReferenceTypeId (ByteBuffer bb);
- * </code>
- *
- * See the javadoc on these methods later in this file for more
- * information on these functions.
- *
- * <b>NOTE:</b> All IDs handled by the ID manager (all object and reference
- * type IDs) are assumed to be of type <code>long</code>.
- *
- * <b>NOTE:</b> This class does not manage virtual machine-specific types,
- * like methods, fields, and frames. These already have unique IDs within
- * the virtual machine and do not need further abstraction here.
- *
- * @author Keith Seitz  (keiths@redhat.com)
- */
-public class VMIdManager
-{
-  // This factory generates ids for objects and types that may
-  // be sent to a debugger.
-  private static class IdFactory
-  {
-    // ID of last object / referencetype
-    private static Object _idLock = new Object ();
-    private static Object _ridLock = new Object ();
-    private static long _lastId = 0;
-    private static long _lastRid = 0;
-
-    // A list of all ID types
-    private static HashMap _idList = new HashMap ();
-
-    // Initialize the id list with known types
-    static
-    {
-      // ObjectId and ArrayId are special cases. See newObjectId.
-      _idList.put (ClassLoaderId.typeClass, ClassLoaderId.class);
-      _idList.put (ClassObjectId.typeClass, ClassObjectId.class);
-      _idList.put (StringId.typeClass, StringId.class);
-      _idList.put (ThreadId.typeClass, ThreadId.class);
-      _idList.put (ThreadGroupId.typeClass, ThreadGroupId.class);
-    }
-
-    /**
-     * Returns a new id for the given object
-     *
-     * @param obj  SoftReference of the object for which an id is desired
-     * @returns a suitable object id
-     */
-    public static ObjectId newObjectId (SoftReference obj)
-    {
-      ObjectId id = null;
-      Object object = obj.get ();
-
-      // Special case: arrays
-      if (object.getClass ().isArray ())
-	id = new ArrayId ();
-      else
-	{
-	  // Loop through all classes until we hit baseclass
-	  Class myClass;
-	  for (myClass = object.getClass (); myClass != null;
-	       myClass = myClass.getSuperclass ())
-	    {
-	      Class clz = (Class) _idList.get (myClass);
-	      if (clz != null)
-		{
-		  try
-		    {
-		      id = (ObjectId) clz.newInstance ();
-		      synchronized (_idLock)
-			{
-			  id.setId (++_lastId);
-			}
-		      id.setReference (obj);
-		      return id;
-		    }
-		  catch (InstantiationException ie)
-		    {
-		      // This really should not happen
-		      throw new RuntimeException ("cannot create new ID", ie);
-		    }
-		  catch (IllegalAccessException iae)
-		    {
-		      // This really should not happen
-		      throw new RuntimeException ("illegal access of ID", iae);
-		    }
-		}
-	    }
-
-	  /* getSuperclass returned null and no matching ID type found.
-	     So it must derive from Object. */
-	  id = new ObjectId ();
-	}
-
-      synchronized (_idLock)
-	{
-	  id.setId (++_lastId);
-	}
-      id.setReference (obj);
-      return id;
-    }
-
-    /**
-     * Returns a new reference type id for the given class
-     *
-     * @param ref  SoftReference to the desired type
-     * @returns a suitable reference type id or null when the
-     * reference is cleared.
-     */
-    public static ReferenceTypeId newReferenceTypeId (SoftReference ref)
-    {
-      ReferenceTypeId id;
-      Class clazz = (Class) ref.get ();
-      if (clazz == null)
-	return null;
-
-      if (clazz.isArray ())
-	id = new ArrayReferenceTypeId ();
-      else if (clazz.isInterface ())
-	id = new InterfaceReferenceTypeId ();
-      else
-	id = new ClassReferenceTypeId ();
-      id.setReference (ref);
-      synchronized (_ridLock)
-	{
-	  id.setId (++_lastRid);
-	}
-      return id;
-    }
-  }
-
-  /**
-   * This class is a SoftReferenceIdentity type that is used by
-   * the ID manager.
-   */
-  class ReferenceKey extends SoftReference
-  {
-    // Hash code of referent
-    private int _hash;
-
-    /**
-     * Constructs a new <code>ReferenceKey</code> object
-     * with the given referent.
-     *
-     * <p>This constructor should only be used for object lookups
-     * by the backend.
-     *
-     * @param referent  the object to reference
-     */
-    public ReferenceKey (Object referent)
-    {
-      super (referent);
-      _hash = referent.hashCode ();
-    }
-    
-    /**
-     * Constructs a new <code>ReferenceKey</code> object
-     * with the given referent and reference queue.
-     *
-     * <p>The JDWP back-end stores a <code>ReferenceKey</code>
-     * with its corresponding <code>JdwpId</code>. This constructor
-     * is used by the back-end when adding new IDs to be managed.
-     *
-     * @param referent  the object to reference
-     * @param queue     the queue to which to report garbage collections
-     */
-    public ReferenceKey (Object referent, ReferenceQueue queue)
-    {
-      super (referent, queue);
-      _hash = referent.hashCode ();
-    }
-    
-    /**
-     * Returns the hash code of the referent.
-     * This seems hacky, but is required in order to use this class
-     * as a hash table key.
-     *
-     * @returns the hash code of the referent
-     */
-    public int hashCode ()
-    {
-      return _hash;
-    }
-
-    /**
-     * Comparator for keys
-     *
-     * This method can be used in two ways:
-     *
-     * <ol>
-     *    <li>For table lookups, where we want to compare referents</li>
-     *    <li>For clearing GCd objects, where we want to compare the actual
-     *        key object (not the referent)</li>
-     * </ol>
-     */
-    public boolean equals (Object obj)
-    {
-      if (obj instanceof ReferenceKey)
-	{
-	  ReferenceKey ref = (ReferenceKey) obj;
-	  
-	  /* First check if the two references are the same.
-	     If they are, that means we must be clearing GCd objects. */
-	  if (this == obj)
-	    return true;
-	  
-	  return (ref.get () == get ());
-	}
-      
-      return false;
-    }
-  }
-  
-  // instance of VMIdManager
-  private static VMIdManager _idm = new VMIdManager ();
-
-  // A reference queue for our objects
-  private ReferenceQueue _refQueue;
-
-  // Mapping of objects (ReferenceKey) to IDs (ObjectId)
-  private Hashtable _oidTable;
-
-  // Mapping of ID numbers (Long) to IDs (ObjectId)
-  private Hashtable _idTable;
-
-  /* Mapping of class (ReferenceKey) to IDs (ReferenceTypeId) for reference
-     types. Unlike other types, reference id types are NEVER released. */
-  private Hashtable _classTable;
-
-  // Mapping of ID numbers (Long) to reference type IDs (ReferenceTypeId)
-  private Hashtable _ridTable;
-
-  /**
-   * Gets the instance of VMIdManager, constructing a new one
-   * if none currently exists.
-   */
-  public static VMIdManager getDefault ()
-  {
-    return _idm;
-  }
-
-  // Constructs a new <code>IdManager</code>
-  private VMIdManager ()
-  {
-    _refQueue = new ReferenceQueue ();
-    _oidTable = new Hashtable (50);
-    _idTable = new Hashtable (50);
-    _classTable = new Hashtable (20);
-    _ridTable = new Hashtable (20);
-  }
-
-  // Updates the object ID table, removing IDs whose objects have
-  // been garbage collected.
-  private void _update ()
-  {
-    Reference ref;
-    while ((ref = _refQueue.poll ()) != null)
-      {
-	ObjectId id = (ObjectId) _oidTable.get (ref);
-	_oidTable.remove (ref);
-	_idTable.remove (new Long (id.getId ()));
-      }
-  }
-
-  /**
-   * Returns an id for the given object, adding it
-   * if it does not have an id.
-   *
-   * @param theObject  the object to get an ID/add
-   * @returns  the ID of the object
-   */
-  public ObjectId getObjectId (Object theObject)
-  {
-    // Special case: null object.
-    if (theObject == null)
-      return new NullObjectId ();
-	  
-    ReferenceKey ref = new ReferenceKey (theObject, _refQueue);
-    ObjectId id = (ObjectId) _oidTable.get (ref);
-    if (id == null)
-      {
-	// update the tables -- this is an arbitrary place to put this
-	_update ();
-
-	// Object not found. Make new id for it
-	id = IdFactory.newObjectId (ref);
-	_oidTable.put (ref, id);
-	_idTable.put (new Long (id.getId ()), id);
-      }
-
-    return id;
-  }
-
-  /**
-   * Returns the <code>JdwpId</code> for a given ID. Unlike
-   * <code>getId</code>, it throws an exception if the ID is not
-   * known.
-   *
-   * @param id  the numerical ID of the desired <code>JdwpId</code>
-   * @throws InvalidObjectException if the ID is not found
-   */
-  public ObjectId get (long id)
-    throws InvalidObjectException
-  {
-    // Special case: null object id.
-    if (id == 0)
-      return new NullObjectId ();
-    
-    ObjectId oid = (ObjectId) _idTable.get (new Long (id));
-    if (oid == null)
-      throw new InvalidObjectException (id);
- 
-    return oid;
-  }
-
-  public ObjectId readObjectId (ByteBuffer bb)
-    throws InvalidObjectException
-  {
-    long id = bb.getLong ();
-    return get (id);
-  }
-
-  /**
-   * Gets the reference type id for the given class, creating
-   * a new one if it does not already have an id
-   *
-   * @param clazz  the class for which to get an ID
-   * @returns  the ID of the class
-   */
-  public ReferenceTypeId getReferenceTypeId (Class clazz)
-  {
-    ReferenceKey ref = new ReferenceKey (clazz);
-    ReferenceTypeId id = (ReferenceTypeId)_classTable.get (ref);
-    if (id == null)
-      {
-	// Object not found. Make new id for it
-	id = IdFactory.newReferenceTypeId (ref);
-	_classTable.put (ref, id);
-	_ridTable.put (new Long (id.getId ()), id);
-      }
-
-    return id;
-  }
-
-  /**
-   * Returns the <code>ReferenceTypeId</code> for a given ID. Unlike
-   * <code>getReferenceTypeId</code>, it throws an exception if the ID is not
-   * known.
-   *
-   * @param id  the numerical ID of the desired reference type
-   * @throws InvalidClassException if the ID is not found
-   */
-  public ReferenceTypeId getReferenceType (long id)
-    throws InvalidClassException
-  {
-    ReferenceTypeId rid = (ReferenceTypeId) _ridTable.get (new Long (id));
-    if (rid == null)
-      throw new InvalidClassException (id);
- 
-    return rid;
-  }
-
-  public ReferenceTypeId readReferenceTypeId (ByteBuffer bb)
-    throws InvalidClassException
-  {
-    long id = bb.getLong ();
-    return getReferenceType (id);
-  }
-}
diff --git a/libjava/gnu/classpath/jdwp/VMMethod.h b/libjava/gnu/classpath/jdwp/VMMethod.h
deleted file mode 100644
index 00f4d87..0000000
--- a/libjava/gnu/classpath/jdwp/VMMethod.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMMethod__
-#define __gnu_classpath_jdwp_VMMethod__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMMethod;
-        namespace util
-        {
-            class LineTable;
-            class VariableTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMMethod : public ::java::lang::Object
-{
-
-public: // actually protected
-  VMMethod(::java::lang::Class *, jlong);
-public:
-  virtual jlong getId();
-  virtual ::java::lang::Class * getDeclaringClass();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getSignature();
-  virtual jint getModifiers();
-  virtual ::gnu::classpath::jdwp::util::LineTable * getLineTable();
-  virtual ::gnu::classpath::jdwp::util::VariableTable * getVariableTable();
-  virtual ::java::lang::String * toString();
-  virtual void writeId(::java::io::DataOutputStream *);
-  static ::gnu::classpath::jdwp::VMMethod * readId(::java::lang::Class *, ::java::nio::ByteBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  static const jint SIZE = 8;
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _class;
-  jlong _methodId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMMethod__
diff --git a/libjava/gnu/classpath/jdwp/VMMethod.java b/libjava/gnu/classpath/jdwp/VMMethod.java
deleted file mode 100644
index 6a2b04e..0000000
--- a/libjava/gnu/classpath/jdwp/VMMethod.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* VMMethod.java -- a method in a virtual machine
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.classpath.jdwp;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import gnu.classpath.jdwp.exception.JdwpException;
-import gnu.classpath.jdwp.util.LineTable;
-import gnu.classpath.jdwp.util.VariableTable;
-
-/**
- * This class is really an amalgamation of two classes: one class
- * represents a virtual machine method and the other represents
- * the JDWP back-end's ID for the method.
- *
- * @author Keith Seitz  (keiths@redhat.com)
- */
-public class VMMethod
-{
-  /**
-   * Returns the size of a JDWP method ID
-   * @see gnu.classpath.jdwp.id.JdwpId#SIZE
-   */
-   public static final int SIZE = 8;
-
-  // The class in which this method is declared
-  private Class _class;
-
-  // The method's ID
-  private long _methodId;
-
-  /**
-   * Constructs a new VMMethod object. This constructor is protected
-   * so that only the factory methods of VMVirtualMachine can be used
-   * to create VMMethods.
-   *
-   * @param klass the method's containing class
-   * @param id    method identifier, e.g., jmethodID
-   * @see gnu.classpath.jdwp.VMVirtualMachine#getAllClassMethods
-   * @see gnu.classpath.jdwp.VMVirtualMachine#getClassMethod
-   */
-  protected VMMethod(Class klass, long id)
-  {
-    _class = klass;
-    _methodId = id;
-  }
-
-  /**
-   * Returns the internal method ID for this method
-   */
-  public long getId()
-  {
-    return _methodId;
-  }
-
-  /**
-   * Returns the method's declaring class
-   */
-  public Class getDeclaringClass()
-  {
-    return _class;
-  }
-
-  /**
-   * Returns the name of this method
-   */
-  public native String getName();
-
-  /**
-   * Returns the signature of this method
-   */
-  public native String getSignature();
-
-  /**
-   * Returns the method's modifier flags
-   */
-  public native int getModifiers();
-
-  /**
-   * "Returns line number information for the method, if present. The line
-   * table maps source line numbers to the initial code index of the line.
-   * The line table is ordered by code index (from lowest to highest). The
-   * line number information is constant unless a new class definition is
-   * installed using RedefineClasses."
-   *
-   * @return the line table
-   * @throws JdwpException
-   */
-  public native LineTable getLineTable()
-    throws JdwpException;
-
-  /**
-   * "Returns variable information for the method. The variable table
-   * includes arguments and locals declared within the method. For instance
-   * methods, the "this" reference is included in the table. Also, synthetic
-   * variables may be present."
-   *
-   * @return the variable table
-   * @throws JdwpException
-   */
-  public native VariableTable getVariableTable()
-    throws JdwpException;
-
-  /**
-   * Returns a string representation of this method (not
-   * required but nice for debugging).
-   */
-  public String toString()
-  {
-    return getDeclaringClass().getName() + "." + getName();
-  }
-
-  /**
-   * Writes the method's ID to the output stream
-   *
-   * @param ostream the output stream to which to write
-   * @throws IOException for any errors writing to the stream
-   * @see gnu.classpath.jdwp.id.JdwpId#write
-   */
-  public void writeId(DataOutputStream ostream)
-    throws IOException
-  {
-    ostream.writeLong(getId());
-  }
-
-  /**
-   * Returns a VMMethod from the ID in the byte buffer
-   *
-   * @param klass the method's declaring class
-   * @param bb    a ByteBuffer containing the method's ID
-   * @throws JdwpException for any errors creating the method
-   * @throws IOException for any errors reading from the buffer
-   */
-  public static VMMethod readId(Class klass, ByteBuffer bb)
-    throws JdwpException, IOException
-  {
-    return VMVirtualMachine.getClassMethod(klass, bb.getLong());
-  }
-
-  public boolean equals(Object obj)
-  {
-    if (obj instanceof VMMethod)
-      {
-	VMMethod m = (VMMethod) obj;
-	return (getId() == m.getId());
-      }
-
-    return false;
-  }
-}
diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.h b/libjava/gnu/classpath/jdwp/VMVirtualMachine.h
deleted file mode 100644
index 1f7d03a..0000000
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_VMVirtualMachine__
-#define __gnu_classpath_jdwp_VMVirtualMachine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMFrame;
-          class VMMethod;
-          class VMVirtualMachine;
-        namespace event
-        {
-            class EventRequest;
-        }
-        namespace util
-        {
-            class MethodResult;
-            class MonitorInfo;
-        }
-        namespace value
-        {
-            class Value;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMVirtualMachine : public ::java::lang::Object
-{
-
-public:
-  VMVirtualMachine();
-  static void initialize();
-  static void suspendThread(::java::lang::Thread *);
-  static void suspendAllThreads();
-  static void resumeThread(::java::lang::Thread *);
-  static void resumeAllThreads();
-  static jint getSuspendCount(::java::lang::Thread *);
-  static ::java::util::Collection * getAllLoadedClasses();
-  static jint getClassStatus(::java::lang::Class *);
-  static JArray< ::gnu::classpath::jdwp::VMMethod * > * getAllClassMethods(::java::lang::Class *);
-  static ::gnu::classpath::jdwp::VMMethod * getClassMethod(::java::lang::Class *, jlong);
-  static ::java::util::ArrayList * getFrames(::java::lang::Thread *, jint, jint);
-  static ::gnu::classpath::jdwp::VMFrame * getFrame(::java::lang::Thread *, jlong);
-  static jint getFrameCount(::java::lang::Thread *);
-  static jint getThreadStatus(::java::lang::Thread *);
-  static ::java::util::ArrayList * getLoadRequests(::java::lang::ClassLoader *);
-  static ::gnu::classpath::jdwp::util::MethodResult * executeMethod(::java::lang::Object *, ::java::lang::Thread *, ::java::lang::Class *, ::gnu::classpath::jdwp::VMMethod *, JArray< ::gnu::classpath::jdwp::value::Value * > *, jint);
-  static ::java::lang::String * getSourceFile(::java::lang::Class *);
-  static void registerEvent(::gnu::classpath::jdwp::event::EventRequest *);
-  static void unregisterEvent(::gnu::classpath::jdwp::event::EventRequest *);
-  static void clearEvents(jbyte);
-  static void redefineClasses(JArray< ::java::lang::Class * > *, JArray< JArray< jbyte > * > *);
-  static void setDefaultStratum(::java::lang::String *);
-  static ::java::lang::String * getSourceDebugExtension(::java::lang::Class *);
-  static JArray< jbyte > * getBytecodes(::gnu::classpath::jdwp::VMMethod *);
-  static ::gnu::classpath::jdwp::util::MonitorInfo * getMonitorInfo(::java::lang::Object *);
-  static JArray< ::java::lang::Object * > * getOwnedMonitors(::java::lang::Thread *);
-  static ::java::lang::Object * getCurrentContendedMonitor(::java::lang::Thread *);
-  static void popFrames(::java::lang::Thread *, jlong);
-  static const jboolean canWatchFieldModification = 0;
-  static const jboolean canWatchFieldAccess = 0;
-  static const jboolean canGetBytecodes = 0;
-  static const jboolean canGetSyntheticAttribute = 0;
-  static const jboolean canGetOwnedMonitorInfo = 0;
-  static const jboolean canGetCurrentContendedMonitor = 0;
-  static const jboolean canGetMonitorInfo = 0;
-  static const jboolean canRedefineClasses = 0;
-  static const jboolean canAddMethod = 0;
-  static const jboolean canUnrestrictedlyRedefineClasses = 0;
-  static const jboolean canPopFrames = 0;
-  static const jboolean canUseInstanceFilters = 0;
-  static const jboolean canGetSourceDebugExtension = 0;
-  static const jboolean canRequestVMDeathEvent = 0;
-  static const jboolean canSetDefaultStratum = 0;
-private:
-  static ::java::util::Hashtable * _jdwp_suspend_counts;
-public: // actually package-private
-  static ::java::util::Hashtable * _stepping_threads;
-  static ::java::util::ArrayList * _event_list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMVirtualMachine__
diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
deleted file mode 100644
index acd0996..0000000
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/* VMVirtualMachine.java -- A reference implementation of a JDWP virtual
-   machine
-
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.classpath.jdwp;
-
-import gnu.classpath.jdwp.event.EventRequest;
-import gnu.classpath.jdwp.exception.InvalidMethodException;
-import gnu.classpath.jdwp.exception.JdwpException;
-import gnu.classpath.jdwp.util.MethodResult;
-import gnu.classpath.jdwp.util.MonitorInfo;
-import gnu.classpath.jdwp.value.Value;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-
-/**
- * A virtual machine according to JDWP.
- *
- * @author Keith Seitz  <keiths@redhat.com>
- */
-public class VMVirtualMachine
-{
-  // VM Capabilities
-  public static final boolean canWatchFieldModification = false;
-  public static final boolean canWatchFieldAccess = false;
-  public static final boolean canGetBytecodes = false;
-  public static final boolean canGetSyntheticAttribute = false;
-  public static final boolean canGetOwnedMonitorInfo = false;
-  public static final boolean canGetCurrentContendedMonitor = false;
-  public static final boolean canGetMonitorInfo = false;
-  public static final boolean canRedefineClasses = false;
-  public static final boolean canAddMethod = false;
-  public static final boolean canUnrestrictedlyRedefineClasses = false;
-  public static final boolean canPopFrames = false;
-  public static final boolean canUseInstanceFilters = false;
-  public static final boolean canGetSourceDebugExtension = false;
-  public static final boolean canRequestVMDeathEvent = false;
-  public static final boolean canSetDefaultStratum = false;
-
-  // Thread suspension table. Maps Thread to suspend count (Integer)
-  private static Hashtable _jdwp_suspend_counts;
-
-  // List of stepping threads: maps Thread -> stepping info
-  static Hashtable _stepping_threads;
-  
-  // List of co-located JVMTI events
-  static ArrayList _event_list;
-
-  public static native void initialize ();
-
-  /**
-   * Suspend a thread
-   *
-   * @param  thread  the thread to suspend
-   */
-  public static native void suspendThread (Thread thread)
-    throws JdwpException;
-
-  /**
-   * Suspend all threads
-   */
-  public static void suspendAllThreads ()
-    throws JdwpException
-  {
-    // Our JDWP thread group -- don't suspend any of those threads
-    Thread current = Thread.currentThread ();
-    ThreadGroup jdwpGroup = Jdwp.getDefault().getJdwpThreadGroup();
-
-    // Find the root ThreadGroup
-    ThreadGroup group = jdwpGroup;
-    ThreadGroup parent = group.getParent ();
-    while (parent != null)
-      {
-	group = parent;
-	parent = group.getParent ();
-      }
-    
-    // Get all the threads in the system
-    int num = group.activeCount ();
-    Thread[] threads = new Thread[num];
-    group.enumerate (threads);
-
-    for (int i = 0; i < num; ++i)
-      {
-	Thread t = threads[i];
-	if (t != null)
-	  {
-	    if (t.getThreadGroup () == jdwpGroup || t == current)
-	      {
-		// Don't suspend the current thread or any JDWP thread
-		continue;
-	      }
-	    else
-	      suspendThread (t);
-	  }
-      }
-
-    // Now suspend the current thread
-    if (current.getThreadGroup() != jdwpGroup)
-      suspendThread (current);
-  }
-
-  /**
-   * Resume a thread. A thread must be resumed as many times
-   * as it has been suspended.
-   *
-   * @param  thread  the thread to resume
-   */
-  public static native void resumeThread (Thread thread)
-    throws JdwpException;
-
-  /**
-   * Resume all threads. This simply decrements the thread's
-   * suspend count. It can not be used to force the application
-   * to run.
-   */
-  public static void resumeAllThreads ()
-    throws JdwpException
-  {
-    // Our JDWP thread group -- don't resume
-    Thread current = Thread.currentThread ();
-    ThreadGroup jdwpGroup = current.getThreadGroup ();
-
-    // Find the root ThreadGroup
-    ThreadGroup group = jdwpGroup;
-    ThreadGroup parent = group.getParent ();
-    while (parent != null)
-      {
-	group = parent;
-	parent = group.getParent ();
-      }
-    
-    // Get all the threads in the system
-    int num = group.activeCount ();
-    Thread[] threads = new Thread[num];
-    group.enumerate (threads);
-
-    for (int i = 0; i < num; ++i)
-      {
-	Thread t = threads[i];
-	if (t != null)
-	  {
-	    if (t.getThreadGroup () == jdwpGroup || t == current)
-	      {
-		// Don't resume the current thread or any JDWP thread
-		continue;
-	      }
-	    else
-	      resumeThread (t);
-	  }
-      }
-  }
-
-  /**
-   * Get the suspend count for a give thread
-   *
-   * @param  thread  the thread whose suspend count is desired
-   * @return the number of times the thread has been suspended
-   */
-  public static native int getSuspendCount (Thread thread)
-    throws JdwpException;
- 
-  /**
-   * Returns a Collection of all classes loaded in the VM
-   */
-  public static native Collection getAllLoadedClasses ()
-    throws JdwpException;
-
-  /**
-   * Returns the status of the given class
-   *
-   * @param  clazz  the class whose status is desired
-   * @return a flag containing the class's status
-   * @see JdwpConstants.ClassStatus
-   */
-  public static native int getClassStatus (Class clazz)
-    throws JdwpException;
-
-  /**
-   * Returns all of the methods defined in the given class. This
-   * includes all methods, constructors, and class initializers.
-   *
-   * @param  klass  the class whose methods are desired
-   * @return an array of virtual machine methods
-   */
-  public static native VMMethod[] getAllClassMethods (Class klass)
-    throws JdwpException;
-
-  /**
-   * A factory method for getting valid virtual machine methods
-   * which may be passed to/from the debugger.
-   *
-   * @param klass the class in which the method is defined
-   * @param id    the ID of the desired method
-   * @return the desired internal representation of the method
-   * @throws InvalidMethodException if the method is not defined
-   *           in the class
-   * @throws JdwpException for any other error
-   */
-  public static native VMMethod getClassMethod(Class klass, long id)
-    throws JdwpException;
-
-  /**
-   * Returns the thread's call stack
-   *
-   * @param  thread  thread for which to get call stack
-   * @param  start   index of first frame to return
-   * @param  length  number of frames to return (-1 for all frames)
-   * @return a list of frames
-   */
-  public static native ArrayList getFrames (Thread thread, int start,
-					    int length)
-    throws JdwpException;
-
-  /**
-   * Returns the frame for a given thread with the frame ID in
-   * the buffer
-   *
-   * I don't like this.
-   *
-   * @param  thread  the frame's thread
-   * @param  bb      buffer containing the frame's ID
-   * @return the desired frame
-   */
-  public static native VMFrame getFrame (Thread thread, long frameID)
-    throws JdwpException;
-
-  /**
-   * Returns the number of frames in the thread's stack
-   *
-   * @param  thread  the thread for which to get a frame count
-   * @return the number of frames in the thread's stack
-   */
-  public static native int getFrameCount (Thread thread)
-    throws JdwpException;
-
-
-  /**
-   * Returns the status of a thread
-   *
-   * @param  thread  the thread for which to get status
-   * @return integer status of the thread
-   * @see JdwpConstants.ThreadStatus
-   */
-  public static native int getThreadStatus (Thread thread)
-    throws JdwpException;
-
-  /**
-   * Returns a list of all classes which this class loader has been
-   * requested to load
-   *
-   * @param  cl  the class loader
-   * @return a list of all visible classes
-   */
-  public static native ArrayList getLoadRequests (ClassLoader cl)
-    throws JdwpException;
-
-  /**
-   * Executes a method in the virtual machine. The thread must already
-   * be suspended by a previous event. When the method invocation is
-   * complete, the thread (or all threads if INVOKE_SINGLE_THREADED is
-   * not set in options) must be suspended before this method returns.
-   *
-   * @param  obj         instance in which to invoke method (null for static)
-   * @param  thread      the thread in which to invoke the method
-   * @param  clazz       the class in which the method is defined
-   * @param  method      the method to invoke
-   * @param  values      arguments to pass to method
-   * @param  options     invocation options
-   * @return a result object containing the results of the invocation
-   */
-  public static native MethodResult executeMethod (Object obj, Thread thread,
-					    Class clazz, VMMethod method,
-					    Value[] values,
-					    int options)
-    throws JdwpException;
-
-  /**
-   * "Returns the name of source file in which a reference type was declared"
-   *
-   * @param  clazz  the class for which to return a source file
-   * @return a string containing the source file name; "no path information
-   *         for the file is included"
-   */
-  public static native String getSourceFile (Class clazz)
-    throws JdwpException;
-
-  /**
-   * Register a request from the debugger
-   *
-   * Virtual machines have two options. Either do nothing and allow
-   * the event manager to take care of the request (useful for broadcast-type
-   * events like class prepare/load/unload, thread start/end, etc.)
-   * or do some internal work to set up the event notification (useful for
-   * execution-related events like breakpoints, single-stepping, etc.).
-   */
-  public static native void registerEvent (EventRequest request)
-    throws JdwpException;
-
-  /**
-   * Unregisters the given request
-   *
-   * @param  request  the request to unregister
-   */
-  public static native void unregisterEvent (EventRequest request)
-    throws JdwpException;
-
-
-  /**
-   * Clear all events of the given kind
-   *
-   * @param  kind  the type of events to clear
-   */
-  public static native void clearEvents (byte kind)
-    throws JdwpException;
-
-  /**
-   * Redefines the given types. VM must support canRedefineClasses
-   * capability (may also require canAddMethod and/or
-   * canUnrestrictedlyRedefineClasses capabilities)
-   *
-   * @param types the classes to redefine
-   * @param bytecodes the new bytecode definitions for the classes
-   */
-  public static native void redefineClasses(Class[] types, byte[][] bytecodes)
-    throws JdwpException;
-
-  /**
-   * Sets the default stratum. VM must support the
-   * canSetDefaultStratum capability.
-   *
-   * @param stratum the new default stratum or empty string to
-   *        use the reference default
-   */
-  public static native void setDefaultStratum(String stratum)
-    throws JdwpException;
-
-  /**
-   * Returns the source debug extension. VM must support the
-   * canGetSourceDebugExtension capability.
-   *
-   * @param klass the class for which to return information
-   * @returns the source debug extension
-   */
-  public static native String getSourceDebugExtension(Class klass)
-    throws JdwpException;
-
-  /**
-   * Returns the bytecode for the given method. VM must support the
-   * canGetBytecodes capability.
-   *
-   * @param method the method for which to get bytecodes
-   * @returns the bytecodes
-   */
-  public static native byte[] getBytecodes(VMMethod method)
-    throws JdwpException;
-
-  /**
-   * Returns monitor information about an object. VM must support
-   * the canGetMonitorInformation capability.
-   *
-   * @param obj the object
-   * @returns monitor information (owner, entry count, waiters)
-   */
-  public static native MonitorInfo getMonitorInfo(Object obj)
-    throws JdwpException;
-
-  /**
-   * Returns a list of owned monitors. VM must support the
-   * canGetOwnedMonitorInfo capability.
-   *
-   * @param thread a thread
-   * @returns the list of monitors owned by this thread
-   */
-  public static native Object[] getOwnedMonitors(Thread thread)
-    throws JdwpException;
-
-  /**
-   * Returns the current contended monitor for a thread. VM must
-   * support canGetCurrentContendedMonitor capability.
-   *
-   * @param thread the thread
-   * @returns the contended monitor
-   */
-  public static native Object getCurrentContendedMonitor(Thread thread)
-    throws JdwpException;
-
-  /**
-   * Pop all frames up to and including the given frame. VM must
-   * support canPopFrames capability. It is the responsibility
-   * of the VM to check if the thread is suspended. If it is not,
-   * the VM should throw ThreadNotSuspendedException.
-   *
-   * @param thread the thread
-   * @param frame the frame ID
-   */
-  public static native void popFrames(Thread thread, long frameId);
-}
diff --git a/libjava/gnu/classpath/jdwp/event/BreakpointEvent.h b/libjava/gnu/classpath/jdwp/event/BreakpointEvent.h
deleted file mode 100644
index 3a8bfd1..0000000
--- a/libjava/gnu/classpath/jdwp/event/BreakpointEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_BreakpointEvent__
-#define __gnu_classpath_jdwp_event_BreakpointEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class BreakpointEvent;
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::BreakpointEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  BreakpointEvent(::java::lang::Thread *, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-  ::gnu::classpath::jdwp::util::Location * _location;
-  ::java::lang::Object * _instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_BreakpointEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/ClassPrepareEvent.h b/libjava/gnu/classpath/jdwp/event/ClassPrepareEvent.h
deleted file mode 100644
index 35d24ea..0000000
--- a/libjava/gnu/classpath/jdwp/event/ClassPrepareEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_ClassPrepareEvent__
-#define __gnu_classpath_jdwp_event_ClassPrepareEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class ClassPrepareEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::ClassPrepareEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  ClassPrepareEvent(::java::lang::Thread *, ::java::lang::Class *, jint);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-  ::java::lang::Class * _class;
-  jint _status;
-public:
-  static const jint STATUS_VERIFIED = 1;
-  static const jint STATUS_PREPARED = 2;
-  static const jint STATUS_INITIALIZED = 4;
-  static const jint STATUS_ERROR = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_ClassPrepareEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/ClassUnloadEvent.h b/libjava/gnu/classpath/jdwp/event/ClassUnloadEvent.h
deleted file mode 100644
index 3544790..0000000
--- a/libjava/gnu/classpath/jdwp/event/ClassUnloadEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_ClassUnloadEvent__
-#define __gnu_classpath_jdwp_event_ClassUnloadEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class ClassUnloadEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::ClassUnloadEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  ClassUnloadEvent(::java::lang::String *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _signature;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_ClassUnloadEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/Event.h b/libjava/gnu/classpath/jdwp/event/Event.h
deleted file mode 100644
index 132d6b5..0000000
--- a/libjava/gnu/classpath/jdwp/event/Event.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_Event__
-#define __gnu_classpath_jdwp_event_Event__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-            class EventRequest;
-        }
-        namespace transport
-        {
-            class JdwpPacket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::Event : public ::java::lang::Object
-{
-
-public:
-  Event(jbyte);
-  virtual jbyte getEventKind();
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *) = 0;
-public:
-  virtual ::java::lang::Object * getParameter(jint) = 0;
-  static ::gnu::classpath::jdwp::transport::JdwpPacket * toPacket(::java::io::DataOutputStream *, JArray< ::gnu::classpath::jdwp::event::Event * > *, JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, jbyte);
-private:
-  static void _toData(::java::io::DataOutputStream *, ::gnu::classpath::jdwp::event::Event *, ::gnu::classpath::jdwp::event::EventRequest *);
-public:
-  static const jint EVENT_CLASS = 1;
-  static const jint EVENT_THREAD = 2;
-  static const jint EVENT_LOCATION = 3;
-  static const jint EVENT_INSTANCE = 4;
-  static const jint EVENT_FIELD = 5;
-  static const jint EVENT_EXCEPTION_CLASS = 6;
-  static const jint EVENT_EXCEPTION_CAUGHT = 7;
-private:
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) _eventKind;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_Event__
diff --git a/libjava/gnu/classpath/jdwp/event/EventManager.h b/libjava/gnu/classpath/jdwp/event/EventManager.h
deleted file mode 100644
index 45b4762..0000000
--- a/libjava/gnu/classpath/jdwp/event/EventManager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_EventManager__
-#define __gnu_classpath_jdwp_event_EventManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-            class EventManager;
-            class EventRequest;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::EventManager : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::classpath::jdwp::event::EventManager * getDefault();
-private:
-  EventManager();
-public:
-  virtual JArray< ::gnu::classpath::jdwp::event::EventRequest * > * getEventRequests(::gnu::classpath::jdwp::event::Event *);
-  virtual void requestEvent(::gnu::classpath::jdwp::event::EventRequest *);
-  virtual void deleteRequest(jbyte, jint);
-  virtual void clearRequests(jbyte);
-  virtual ::gnu::classpath::jdwp::event::EventRequest * getRequest(jbyte, jint);
-  virtual ::java::util::Collection * getRequests(jbyte);
-private:
-  static ::gnu::classpath::jdwp::event::EventManager * _instance;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _requests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_EventManager__
diff --git a/libjava/gnu/classpath/jdwp/event/EventRequest.h b/libjava/gnu/classpath/jdwp/event/EventRequest.h
deleted file mode 100644
index 3a493a7..0000000
--- a/libjava/gnu/classpath/jdwp/event/EventRequest.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_EventRequest__
-#define __gnu_classpath_jdwp_event_EventRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-            class EventRequest;
-          namespace filters
-          {
-              class IEventFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::EventRequest : public ::java::lang::Object
-{
-
-public:
-  EventRequest(jbyte, jbyte);
-  EventRequest(jint, jbyte, jbyte);
-  virtual void addFilter(::gnu::classpath::jdwp::event::filters::IEventFilter *);
-  virtual ::java::util::Collection * getFilters();
-  virtual jbyte getSuspendPolicy();
-  virtual jint getId();
-  virtual void setId(jint);
-  virtual jbyte getEventKind();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-  static const jbyte EVENT_SINGLE_STEP = 1;
-  static const jbyte EVENT_BREAKPOINT = 2;
-  static const jbyte EVENT_FRAME_POP = 3;
-  static const jbyte EVENT_EXCEPTION = 4;
-  static const jbyte EVENT_USER_DEFINED = 5;
-  static const jbyte EVENT_THREAD_START = 6;
-  static const jbyte EVENT_THREAD_END = 7;
-  static const jbyte EVENT_CLASS_PREPARE = 8;
-  static const jbyte EVENT_CLASS_UNLOAD = 9;
-  static const jbyte EVENT_CLASS_LOAD = 10;
-  static const jbyte EVENT_FIELD_ACCESS = 20;
-  static const jbyte EVENT_FIELD_MODIFY = 21;
-  static const jbyte EVENT_METHOD_ENTRY = 40;
-  static const jbyte EVENT_METHOD_EXIT = 41;
-  static const jbyte EVENT_VM_INIT = 90;
-  static const jbyte EVENT_VM_DEATH = 99;
-  static const jbyte SUSPEND_NONE = 0;
-  static const jbyte SUSPEND_THREAD = 1;
-  static const jbyte SUSPEND_ALL = 2;
-private:
-  static jint _last_id;
-  static ::java::lang::Object * _idLock;
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _filters;
-  jint _id;
-  jbyte _suspendPolicy;
-  jbyte _kind;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_EventRequest__
diff --git a/libjava/gnu/classpath/jdwp/event/ExceptionEvent.h b/libjava/gnu/classpath/jdwp/event/ExceptionEvent.h
deleted file mode 100644
index 02745b6..0000000
--- a/libjava/gnu/classpath/jdwp/event/ExceptionEvent.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_ExceptionEvent__
-#define __gnu_classpath_jdwp_event_ExceptionEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class ExceptionEvent;
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::ExceptionEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  ExceptionEvent(::java::lang::Throwable *, ::java::lang::Thread *, ::gnu::classpath::jdwp::util::Location *, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Class *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(jint);
-  virtual void setCatchLoc(::gnu::classpath::jdwp::util::Location *);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _instance;
-  ::java::lang::Throwable * _exception;
-  ::java::lang::Thread * _thread;
-  ::gnu::classpath::jdwp::util::Location * _location;
-  ::gnu::classpath::jdwp::util::Location * _catchLocation;
-  ::java::lang::Class * _klass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_ExceptionEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/MethodEntryEvent.h b/libjava/gnu/classpath/jdwp/event/MethodEntryEvent.h
deleted file mode 100644
index cb9c272..0000000
--- a/libjava/gnu/classpath/jdwp/event/MethodEntryEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_MethodEntryEvent__
-#define __gnu_classpath_jdwp_event_MethodEntryEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class MethodEntryEvent;
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::MethodEntryEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  MethodEntryEvent(::java::lang::Thread *, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-  ::gnu::classpath::jdwp::util::Location * _location;
-  ::java::lang::Object * _instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_MethodEntryEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/MethodExitEvent.h b/libjava/gnu/classpath/jdwp/event/MethodExitEvent.h
deleted file mode 100644
index 89b0153..0000000
--- a/libjava/gnu/classpath/jdwp/event/MethodExitEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_MethodExitEvent__
-#define __gnu_classpath_jdwp_event_MethodExitEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class MethodExitEvent;
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::MethodExitEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  MethodExitEvent(::java::lang::Thread *, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-  ::gnu::classpath::jdwp::util::Location * _location;
-  ::java::lang::Object * _instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_MethodExitEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/SingleStepEvent.h b/libjava/gnu/classpath/jdwp/event/SingleStepEvent.h
deleted file mode 100644
index 4819058..0000000
--- a/libjava/gnu/classpath/jdwp/event/SingleStepEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_SingleStepEvent__
-#define __gnu_classpath_jdwp_event_SingleStepEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class SingleStepEvent;
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::SingleStepEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  SingleStepEvent(::java::lang::Thread *, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-  ::gnu::classpath::jdwp::util::Location * _location;
-  ::java::lang::Object * _instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_SingleStepEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/ThreadEndEvent.h b/libjava/gnu/classpath/jdwp/event/ThreadEndEvent.h
deleted file mode 100644
index b5b964e..0000000
--- a/libjava/gnu/classpath/jdwp/event/ThreadEndEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_ThreadEndEvent__
-#define __gnu_classpath_jdwp_event_ThreadEndEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class ThreadEndEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::ThreadEndEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  ThreadEndEvent(::java::lang::Thread *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_ThreadEndEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/ThreadStartEvent.h b/libjava/gnu/classpath/jdwp/event/ThreadStartEvent.h
deleted file mode 100644
index f4f7afd..0000000
--- a/libjava/gnu/classpath/jdwp/event/ThreadStartEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_ThreadStartEvent__
-#define __gnu_classpath_jdwp_event_ThreadStartEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class ThreadStartEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::ThreadStartEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  ThreadStartEvent(::java::lang::Thread *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _thread;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_ThreadStartEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/VmDeathEvent.h b/libjava/gnu/classpath/jdwp/event/VmDeathEvent.h
deleted file mode 100644
index ae0b24e..0000000
--- a/libjava/gnu/classpath/jdwp/event/VmDeathEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_VmDeathEvent__
-#define __gnu_classpath_jdwp_event_VmDeathEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class VmDeathEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::VmDeathEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  VmDeathEvent();
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_VmDeathEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/VmInitEvent.h b/libjava/gnu/classpath/jdwp/event/VmInitEvent.h
deleted file mode 100644
index 3a7db88..0000000
--- a/libjava/gnu/classpath/jdwp/event/VmInitEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_VmInitEvent__
-#define __gnu_classpath_jdwp_event_VmInitEvent__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/Event.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class VmInitEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::VmInitEvent : public ::gnu::classpath::jdwp::event::Event
-{
-
-public:
-  VmInitEvent(::java::lang::Thread *);
-  virtual ::java::lang::Object * getParameter(jint);
-public: // actually protected
-  virtual void _writeData(::java::io::DataOutputStream *);
-private:
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::event::Event)))) _initialThread;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_VmInitEvent__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.h
deleted file mode 100644
index 7a67964..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ClassExcludeFilter__
-#define __gnu_classpath_jdwp_event_filters_ClassExcludeFilter__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/event/filters/ClassMatchFilter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ClassExcludeFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ClassExcludeFilter : public ::gnu::classpath::jdwp::event::filters::ClassMatchFilter
-{
-
-public:
-  ClassExcludeFilter(::java::lang::String *);
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ClassExcludeFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ClassMatchFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ClassMatchFilter.h
deleted file mode 100644
index 3670c26..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ClassMatchFilter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ClassMatchFilter__
-#define __gnu_classpath_jdwp_event_filters_ClassMatchFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ClassMatchFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ClassMatchFilter : public ::java::lang::Object
-{
-
-public:
-  ClassMatchFilter(::java::lang::String *);
-  virtual ::java::lang::String * getPattern();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ClassMatchFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.h
deleted file mode 100644
index 6c887ab..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ClassOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_ClassOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ClassOnlyFilter;
-          }
-        }
-        namespace id
-        {
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ClassOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  ClassOnlyFilter(::gnu::classpath::jdwp::id::ReferenceTypeId *);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getType();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ReferenceTypeId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ClassOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ConditionalFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ConditionalFilter.h
deleted file mode 100644
index 23c5a14..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ConditionalFilter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ConditionalFilter__
-#define __gnu_classpath_jdwp_event_filters_ConditionalFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ConditionalFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ConditionalFilter : public ::java::lang::Object
-{
-
-public:
-  ConditionalFilter(::java::lang::Object *);
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ConditionalFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/CountFilter.h b/libjava/gnu/classpath/jdwp/event/filters/CountFilter.h
deleted file mode 100644
index c3db4ae..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/CountFilter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_CountFilter__
-#define __gnu_classpath_jdwp_event_filters_CountFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class CountFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::CountFilter : public ::java::lang::Object
-{
-
-public:
-  CountFilter(jint);
-  virtual jint getCount();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_CountFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.h
deleted file mode 100644
index 4a84d43..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ExceptionOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_ExceptionOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ExceptionOnlyFilter;
-          }
-        }
-        namespace id
-        {
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ExceptionOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  ExceptionOnlyFilter(::gnu::classpath::jdwp::id::ReferenceTypeId *, jboolean, jboolean);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getType();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ReferenceTypeId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _refId;
-  jboolean _caught;
-  jboolean _uncaught;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ExceptionOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.h
deleted file mode 100644
index 2f6d577..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_FieldOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_FieldOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class FieldOnlyFilter;
-          }
-        }
-        namespace id
-        {
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::FieldOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  FieldOnlyFilter(::gnu::classpath::jdwp::id::ReferenceTypeId *, ::gnu::classpath::jdwp::id::ReferenceTypeId *);
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getType();
-  virtual ::gnu::classpath::jdwp::id::ReferenceTypeId * getField();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ReferenceTypeId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _refId;
-  ::gnu::classpath::jdwp::id::ReferenceTypeId * _fieldId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_FieldOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/IEventFilter.h b/libjava/gnu/classpath/jdwp/event/filters/IEventFilter.h
deleted file mode 100644
index 0723bad..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/IEventFilter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_IEventFilter__
-#define __gnu_classpath_jdwp_event_filters_IEventFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class IEventFilter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::IEventFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_classpath_jdwp_event_filters_IEventFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.h
deleted file mode 100644
index 3b5aedf..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_InstanceOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_InstanceOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class InstanceOnlyFilter;
-          }
-        }
-        namespace id
-        {
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::InstanceOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  InstanceOnlyFilter(::gnu::classpath::jdwp::id::ObjectId *);
-  virtual ::gnu::classpath::jdwp::id::ObjectId * getInstance();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ObjectId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_InstanceOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.h
deleted file mode 100644
index e5e0da9..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_LocationOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_LocationOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class LocationOnlyFilter;
-          }
-        }
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::LocationOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  LocationOnlyFilter(::gnu::classpath::jdwp::util::Location *);
-  virtual ::gnu::classpath::jdwp::util::Location * getLocation();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::util::Location * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_LocationOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/StepFilter.h b/libjava/gnu/classpath/jdwp/event/filters/StepFilter.h
deleted file mode 100644
index c434ae1..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/StepFilter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_StepFilter__
-#define __gnu_classpath_jdwp_event_filters_StepFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class StepFilter;
-          }
-        }
-        namespace id
-        {
-            class ThreadId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::StepFilter : public ::java::lang::Object
-{
-
-public:
-  StepFilter(::gnu::classpath::jdwp::id::ThreadId *, jint, jint);
-  virtual ::gnu::classpath::jdwp::id::ThreadId * getThread();
-  virtual jint getSize();
-  virtual jint getDepth();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ThreadId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _tid;
-  jint _size;
-  jint _depth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_StepFilter__
diff --git a/libjava/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.h b/libjava/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.h
deleted file mode 100644
index 0c1a6ee..0000000
--- a/libjava/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_event_filters_ThreadOnlyFilter__
-#define __gnu_classpath_jdwp_event_filters_ThreadOnlyFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-          namespace filters
-          {
-              class ThreadOnlyFilter;
-          }
-        }
-        namespace id
-        {
-            class ThreadId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::event::filters::ThreadOnlyFilter : public ::java::lang::Object
-{
-
-public:
-  ThreadOnlyFilter(::gnu::classpath::jdwp::id::ThreadId *);
-  virtual ::gnu::classpath::jdwp::id::ThreadId * getThread();
-  virtual jboolean matches(::gnu::classpath::jdwp::event::Event *);
-private:
-  ::gnu::classpath::jdwp::id::ThreadId * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _tid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_event_filters_ThreadOnlyFilter__
diff --git a/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h b/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h
deleted file mode 100644
index bb4c699..0000000
--- a/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_AbsentInformationException__
-#define __gnu_classpath_jdwp_exception_AbsentInformationException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class AbsentInformationException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::AbsentInformationException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  AbsentInformationException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_AbsentInformationException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidClassException.h b/libjava/gnu/classpath/jdwp/exception/InvalidClassException.h
deleted file mode 100644
index fb6028f..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidClassException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidClassException__
-#define __gnu_classpath_jdwp_exception_InvalidClassException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidClassException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidClassException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidClassException(jlong);
-  InvalidClassException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidClassException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidClassLoaderException.h b/libjava/gnu/classpath/jdwp/exception/InvalidClassLoaderException.h
deleted file mode 100644
index 201b5db..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidClassLoaderException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidClassLoaderException__
-#define __gnu_classpath_jdwp_exception_InvalidClassLoaderException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidClassLoaderException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidClassLoaderException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidClassLoaderException(jlong);
-  InvalidClassLoaderException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidClassLoaderException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidCountException.h b/libjava/gnu/classpath/jdwp/exception/InvalidCountException.h
deleted file mode 100644
index b5bfea3..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidCountException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidCountException__
-#define __gnu_classpath_jdwp_exception_InvalidCountException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidCountException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidCountException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidCountException(jint);
-  InvalidCountException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidCountException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidEventTypeException.h b/libjava/gnu/classpath/jdwp/exception/InvalidEventTypeException.h
deleted file mode 100644
index e5e7d12..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidEventTypeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidEventTypeException__
-#define __gnu_classpath_jdwp_exception_InvalidEventTypeException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidEventTypeException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidEventTypeException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidEventTypeException(jbyte);
-  InvalidEventTypeException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidEventTypeException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidFieldException.h b/libjava/gnu/classpath/jdwp/exception/InvalidFieldException.h
deleted file mode 100644
index 31ebf4a..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidFieldException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidFieldException__
-#define __gnu_classpath_jdwp_exception_InvalidFieldException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidFieldException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidFieldException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidFieldException(jlong);
-  InvalidFieldException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidFieldException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidFrameException.h b/libjava/gnu/classpath/jdwp/exception/InvalidFrameException.h
deleted file mode 100644
index abe84e0..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidFrameException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidFrameException__
-#define __gnu_classpath_jdwp_exception_InvalidFrameException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidFrameException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidFrameException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidFrameException(jlong);
-  InvalidFrameException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidFrameException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidLocationException.h b/libjava/gnu/classpath/jdwp/exception/InvalidLocationException.h
deleted file mode 100644
index 8d44f50..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidLocationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidLocationException__
-#define __gnu_classpath_jdwp_exception_InvalidLocationException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidLocationException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidLocationException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidLocationException();
-  InvalidLocationException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidLocationException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidMethodException.h b/libjava/gnu/classpath/jdwp/exception/InvalidMethodException.h
deleted file mode 100644
index c6d44ca..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidMethodException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidMethodException__
-#define __gnu_classpath_jdwp_exception_InvalidMethodException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidMethodException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidMethodException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidMethodException(jlong);
-  InvalidMethodException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidMethodException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidObjectException.h b/libjava/gnu/classpath/jdwp/exception/InvalidObjectException.h
deleted file mode 100644
index 20ea14f..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidObjectException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidObjectException__
-#define __gnu_classpath_jdwp_exception_InvalidObjectException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidObjectException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidObjectException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidObjectException(jlong);
-  InvalidObjectException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidObjectException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidSlotException.h b/libjava/gnu/classpath/jdwp/exception/InvalidSlotException.h
deleted file mode 100644
index 4582dac..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidSlotException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidSlotException__
-#define __gnu_classpath_jdwp_exception_InvalidSlotException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidSlotException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidSlotException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidSlotException(jint);
-  InvalidSlotException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidSlotException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidStringException.h b/libjava/gnu/classpath/jdwp/exception/InvalidStringException.h
deleted file mode 100644
index b31ef70..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidStringException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidStringException__
-#define __gnu_classpath_jdwp_exception_InvalidStringException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidStringException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidStringException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidStringException(::java::lang::String *);
-  InvalidStringException(jlong);
-  InvalidStringException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidStringException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidTagException.h b/libjava/gnu/classpath/jdwp/exception/InvalidTagException.h
deleted file mode 100644
index f7f0f1e..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidTagException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidTagException__
-#define __gnu_classpath_jdwp_exception_InvalidTagException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidTagException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidTagException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidTagException(jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidTagException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidThreadException.h b/libjava/gnu/classpath/jdwp/exception/InvalidThreadException.h
deleted file mode 100644
index 7295140..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidThreadException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidThreadException__
-#define __gnu_classpath_jdwp_exception_InvalidThreadException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidThreadException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidThreadException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidThreadException(jlong);
-  InvalidThreadException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidThreadException__
diff --git a/libjava/gnu/classpath/jdwp/exception/InvalidThreadGroupException.h b/libjava/gnu/classpath/jdwp/exception/InvalidThreadGroupException.h
deleted file mode 100644
index c95db02..0000000
--- a/libjava/gnu/classpath/jdwp/exception/InvalidThreadGroupException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_InvalidThreadGroupException__
-#define __gnu_classpath_jdwp_exception_InvalidThreadGroupException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class InvalidThreadGroupException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::InvalidThreadGroupException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  InvalidThreadGroupException(jlong);
-  InvalidThreadGroupException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_InvalidThreadGroupException__
diff --git a/libjava/gnu/classpath/jdwp/exception/JdwpException.h b/libjava/gnu/classpath/jdwp/exception/JdwpException.h
deleted file mode 100644
index 04869f2..0000000
--- a/libjava/gnu/classpath/jdwp/exception/JdwpException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_JdwpException__
-#define __gnu_classpath_jdwp_exception_JdwpException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class JdwpException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::JdwpException : public ::java::lang::Exception
-{
-
-public:
-  JdwpException(jshort, ::java::lang::Throwable *);
-  JdwpException(jshort, ::java::lang::String *);
-  virtual jshort getErrorCode();
-private:
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Exception)))) _errorCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_JdwpException__
diff --git a/libjava/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.h b/libjava/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.h
deleted file mode 100644
index 035f397..0000000
--- a/libjava/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_JdwpIllegalArgumentException__
-#define __gnu_classpath_jdwp_exception_JdwpIllegalArgumentException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class JdwpIllegalArgumentException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::JdwpIllegalArgumentException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  JdwpIllegalArgumentException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_JdwpIllegalArgumentException__
diff --git a/libjava/gnu/classpath/jdwp/exception/JdwpInternalErrorException.h b/libjava/gnu/classpath/jdwp/exception/JdwpInternalErrorException.h
deleted file mode 100644
index 6829e26..0000000
--- a/libjava/gnu/classpath/jdwp/exception/JdwpInternalErrorException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_JdwpInternalErrorException__
-#define __gnu_classpath_jdwp_exception_JdwpInternalErrorException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class JdwpInternalErrorException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::JdwpInternalErrorException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  JdwpInternalErrorException(::java::lang::Throwable *);
-  JdwpInternalErrorException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_JdwpInternalErrorException__
diff --git a/libjava/gnu/classpath/jdwp/exception/NativeMethodException.h b/libjava/gnu/classpath/jdwp/exception/NativeMethodException.h
deleted file mode 100644
index 4f7a55c..0000000
--- a/libjava/gnu/classpath/jdwp/exception/NativeMethodException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_NativeMethodException__
-#define __gnu_classpath_jdwp_exception_NativeMethodException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class NativeMethodException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::NativeMethodException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  NativeMethodException(jlong);
-  NativeMethodException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_NativeMethodException__
diff --git a/libjava/gnu/classpath/jdwp/exception/NotImplementedException.h b/libjava/gnu/classpath/jdwp/exception/NotImplementedException.h
deleted file mode 100644
index 4a99592..0000000
--- a/libjava/gnu/classpath/jdwp/exception/NotImplementedException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_NotImplementedException__
-#define __gnu_classpath_jdwp_exception_NotImplementedException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class NotImplementedException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::NotImplementedException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  NotImplementedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_NotImplementedException__
diff --git a/libjava/gnu/classpath/jdwp/exception/TypeMismatchException.h b/libjava/gnu/classpath/jdwp/exception/TypeMismatchException.h
deleted file mode 100644
index 701bf6e..0000000
--- a/libjava/gnu/classpath/jdwp/exception/TypeMismatchException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_TypeMismatchException__
-#define __gnu_classpath_jdwp_exception_TypeMismatchException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class TypeMismatchException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::TypeMismatchException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  TypeMismatchException(jbyte);
-  TypeMismatchException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_TypeMismatchException__
diff --git a/libjava/gnu/classpath/jdwp/exception/VmDeadException.h b/libjava/gnu/classpath/jdwp/exception/VmDeadException.h
deleted file mode 100644
index 616f735..0000000
--- a/libjava/gnu/classpath/jdwp/exception/VmDeadException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_exception_VmDeadException__
-#define __gnu_classpath_jdwp_exception_VmDeadException__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/exception/JdwpException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace exception
-        {
-            class VmDeadException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::exception::VmDeadException : public ::gnu::classpath::jdwp::exception::JdwpException
-{
-
-public:
-  VmDeadException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_exception_VmDeadException__
diff --git a/libjava/gnu/classpath/jdwp/id/ArrayId.h b/libjava/gnu/classpath/jdwp/id/ArrayId.h
deleted file mode 100644
index 7e971e0..0000000
--- a/libjava/gnu/classpath/jdwp/id/ArrayId.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ArrayId__
-#define __gnu_classpath_jdwp_id_ArrayId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ArrayId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ArrayId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  ArrayId();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ArrayId__
diff --git a/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.h b/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.h
deleted file mode 100644
index e52b109..0000000
--- a/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ArrayReferenceTypeId__
-#define __gnu_classpath_jdwp_id_ArrayReferenceTypeId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ReferenceTypeId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ArrayReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ArrayReferenceTypeId : public ::gnu::classpath::jdwp::id::ReferenceTypeId
-{
-
-public:
-  ArrayReferenceTypeId();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ArrayReferenceTypeId__
diff --git a/libjava/gnu/classpath/jdwp/id/ClassLoaderId.h b/libjava/gnu/classpath/jdwp/id/ClassLoaderId.h
deleted file mode 100644
index 1621002..0000000
--- a/libjava/gnu/classpath/jdwp/id/ClassLoaderId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ClassLoaderId__
-#define __gnu_classpath_jdwp_id_ClassLoaderId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ClassLoaderId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ClassLoaderId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  ClassLoaderId();
-  virtual ::java::lang::ClassLoader * getClassLoader();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ClassLoaderId__
diff --git a/libjava/gnu/classpath/jdwp/id/ClassObjectId.h b/libjava/gnu/classpath/jdwp/id/ClassObjectId.h
deleted file mode 100644
index 5f628a4..0000000
--- a/libjava/gnu/classpath/jdwp/id/ClassObjectId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ClassObjectId__
-#define __gnu_classpath_jdwp_id_ClassObjectId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ClassObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ClassObjectId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  ClassObjectId();
-  virtual ::java::lang::Class * getClassObject();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ClassObjectId__
diff --git a/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.h b/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.h
deleted file mode 100644
index f159722..0000000
--- a/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ClassReferenceTypeId__
-#define __gnu_classpath_jdwp_id_ClassReferenceTypeId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ReferenceTypeId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ClassReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ClassReferenceTypeId : public ::gnu::classpath::jdwp::id::ReferenceTypeId
-{
-
-public:
-  ClassReferenceTypeId();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ClassReferenceTypeId__
diff --git a/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.h b/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.h
deleted file mode 100644
index e1f2a91..0000000
--- a/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_InterfaceReferenceTypeId__
-#define __gnu_classpath_jdwp_id_InterfaceReferenceTypeId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ReferenceTypeId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class InterfaceReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::InterfaceReferenceTypeId : public ::gnu::classpath::jdwp::id::ReferenceTypeId
-{
-
-public:
-  InterfaceReferenceTypeId();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_InterfaceReferenceTypeId__
diff --git a/libjava/gnu/classpath/jdwp/id/JdwpId.h b/libjava/gnu/classpath/jdwp/id/JdwpId.h
deleted file mode 100644
index 67e8c2c5..0000000
--- a/libjava/gnu/classpath/jdwp/id/JdwpId.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_JdwpId__
-#define __gnu_classpath_jdwp_id_JdwpId__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class JdwpId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::JdwpId : public ::java::lang::Object
-{
-
-public:
-  JdwpId(jbyte);
-  virtual void setId(jlong);
-  virtual jlong getId();
-  virtual ::java::lang::ref::SoftReference * getReference();
-  virtual void setReference(::java::lang::ref::SoftReference *);
-  virtual jboolean equals(::gnu::classpath::jdwp::id::JdwpId *);
-  virtual void write(::java::io::DataOutputStream *) = 0;
-  virtual void writeTagged(::java::io::DataOutputStream *);
-  static const jint SIZE = 8;
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) _id;
-private:
-  jbyte _tag;
-public: // actually protected
-  ::java::lang::ref::SoftReference * _reference;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_JdwpId__
diff --git a/libjava/gnu/classpath/jdwp/id/NullObjectId.h b/libjava/gnu/classpath/jdwp/id/NullObjectId.h
deleted file mode 100644
index 6231783..0000000
--- a/libjava/gnu/classpath/jdwp/id/NullObjectId.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_NullObjectId__
-#define __gnu_classpath_jdwp_id_NullObjectId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class NullObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::NullObjectId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  NullObjectId();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_NullObjectId__
diff --git a/libjava/gnu/classpath/jdwp/id/ObjectId.h b/libjava/gnu/classpath/jdwp/id/ObjectId.h
deleted file mode 100644
index 724d921..0000000
--- a/libjava/gnu/classpath/jdwp/id/ObjectId.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ObjectId__
-#define __gnu_classpath_jdwp_id_ObjectId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/JdwpId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ObjectId : public ::gnu::classpath::jdwp::id::JdwpId
-{
-
-public:
-  ObjectId();
-  ObjectId(jbyte);
-  virtual ::java::lang::Object * getObject();
-  virtual void write(::java::io::DataOutputStream *);
-  virtual void disableCollection();
-  virtual void enableCollection();
-  static ::java::lang::Class * typeClass;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::id::JdwpId)))) _handle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ObjectId__
diff --git a/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.h b/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.h
deleted file mode 100644
index 0d8a884..0000000
--- a/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ReferenceTypeId__
-#define __gnu_classpath_jdwp_id_ReferenceTypeId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/JdwpId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ReferenceTypeId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ReferenceTypeId : public ::gnu::classpath::jdwp::id::JdwpId
-{
-
-public:
-  ReferenceTypeId(jbyte);
-  virtual ::java::lang::Class * getType();
-  virtual void write(::java::io::DataOutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ReferenceTypeId__
diff --git a/libjava/gnu/classpath/jdwp/id/StringId.h b/libjava/gnu/classpath/jdwp/id/StringId.h
deleted file mode 100644
index 901df28..0000000
--- a/libjava/gnu/classpath/jdwp/id/StringId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_StringId__
-#define __gnu_classpath_jdwp_id_StringId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class StringId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::StringId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  StringId();
-  virtual ::java::lang::String * getString();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_StringId__
diff --git a/libjava/gnu/classpath/jdwp/id/ThreadGroupId.h b/libjava/gnu/classpath/jdwp/id/ThreadGroupId.h
deleted file mode 100644
index 3f6b8f9..0000000
--- a/libjava/gnu/classpath/jdwp/id/ThreadGroupId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ThreadGroupId__
-#define __gnu_classpath_jdwp_id_ThreadGroupId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ThreadGroupId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ThreadGroupId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  ThreadGroupId();
-  virtual ::java::lang::ThreadGroup * getThreadGroup();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ThreadGroupId__
diff --git a/libjava/gnu/classpath/jdwp/id/ThreadId.h b/libjava/gnu/classpath/jdwp/id/ThreadId.h
deleted file mode 100644
index ed62592..0000000
--- a/libjava/gnu/classpath/jdwp/id/ThreadId.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_id_ThreadId__
-#define __gnu_classpath_jdwp_id_ThreadId__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/id/ObjectId.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace id
-        {
-            class ThreadId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::id::ThreadId : public ::gnu::classpath::jdwp::id::ObjectId
-{
-
-public:
-  ThreadId();
-  virtual ::java::lang::Thread * getThread();
-  static ::java::lang::Class * typeClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_id_ThreadId__
diff --git a/libjava/gnu/classpath/jdwp/natVMFrame.cc b/libjava/gnu/classpath/jdwp/natVMFrame.cc
deleted file mode 100644
index 6f2d523..0000000
--- a/libjava/gnu/classpath/jdwp/natVMFrame.cc
+++ /dev/null
@@ -1,338 +0,0 @@
-// natFrame.cc -- native support for VMFrame.java
-
-/* Copyright (C) 2006, 2007 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <jvmti.h>
-#include "jvmti-int.h"
-
-#include <java-interp.h>
-
-#include <gnu/classpath/jdwp/VMFrame.h>
-#include <gnu/classpath/jdwp/VMVirtualMachine.h>
-#include <gnu/classpath/jdwp/exception/InvalidFrameException.h>
-#include <gnu/classpath/jdwp/exception/InvalidSlotException.h>
-#include <gnu/classpath/jdwp/exception/InvalidThreadException.h>
-#include <gnu/classpath/jdwp/exception/JdwpInternalErrorException.h>
-#include <gnu/classpath/jdwp/exception/TypeMismatchException.h>
-#include <gnu/classpath/jdwp/util/NullObject.h>
-#include <gnu/classpath/jdwp/value/ArrayValue.h>
-#include <gnu/classpath/jdwp/value/ByteValue.h>
-#include <gnu/classpath/jdwp/value/BooleanValue.h>
-#include <gnu/classpath/jdwp/value/CharValue.h>
-#include <gnu/classpath/jdwp/value/DoubleValue.h>
-#include <gnu/classpath/jdwp/value/FloatValue.h>
-#include <gnu/classpath/jdwp/value/IntValue.h>
-#include <gnu/classpath/jdwp/value/LongValue.h>
-#include <gnu/classpath/jdwp/value/ObjectValue.h>
-#include <gnu/classpath/jdwp/value/ShortValue.h>
-#include <gnu/classpath/jdwp/value/Value.h>
-#include <gnu/classpath/jdwp/value/VoidValue.h>
-
-using namespace java::lang;
-using namespace gnu::classpath::jdwp;
-using namespace gnu::classpath::jdwp::exception;
-
-
-// All the jvmti GetLocalXX and SetLocalXX functions return the same potential
-// errors, so this function handles them all and throws the appropriate JDWP
-// exception.
-static void
-checkJVMTIError (jvmtiEnv *env, jthread thread, jvmtiError jerr, jint slot,
-                 jbyte sig)
-{
-  if (jerr != JVMTI_ERROR_NONE)
-    {
-      char *error;
-      env->GetErrorName (jerr, &error);
-      String *msg = reinterpret_cast<String *> (JvNewStringUTF (error));
-      env->Deallocate ((unsigned char *) error);
-      
-      if (jerr == JVMTI_ERROR_INVALID_THREAD)
-        throw new InvalidThreadException ((jlong) thread);
-      else if (jerr == JVMTI_ERROR_NO_MORE_FRAMES)
-        throw new InvalidFrameException (msg);
-      else if (jerr == JVMTI_ERROR_INVALID_SLOT)
-        throw new InvalidSlotException (slot);
-      else if (jerr == JVMTI_ERROR_TYPE_MISMATCH)
-        throw new TypeMismatchException (sig);
-      else
-        throw new JdwpInternalErrorException (msg);
-    }
-}
-
-
-static jobject
-getObjectJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig)
-{
-  jobject value;
-  jvmtiError jerr = env->GetLocalObject (thread, depth, slot, &value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-  
-  return value;
-}
-
-static void
-setObjectJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth,
-                jbyte sig, jobject value)
-{
-  if (value->getClass ()->isAssignableFrom (&util::NullObject::class$))
-    value = NULL;
-	
-  jvmtiError jerr = env->SetLocalObject (thread, depth, slot, value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-}
-
-static jint
-getIntJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig)
-{
-  jint value;
-  jvmtiError jerr = env->GetLocalInt (thread, depth, slot, &value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-  return value;
-}
-
-static void
-setIntJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig,
-             jint value)
-{
-  jvmtiError jerr = env->SetLocalInt (thread, depth, slot, value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-}
-
-static jlong
-getLongJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig)
-{
-  jlong value;
-  jvmtiError jerr = env->GetLocalLong (thread, depth, slot, &value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-  
-  return value;
-}
-
-static void
-setLongJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig,
-              jlong value)
-{
-  jvmtiError jerr = env->SetLocalLong (thread, depth, slot, value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-}
-
-static jfloat
-getFloatJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig)
-{
-  jfloat value;
-  jvmtiError jerr = env->GetLocalFloat (thread, depth, slot, &value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-  
-  return value;
-}
-
-static void
-setFloatJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, jbyte sig,
-               jfloat value)
-{
-  jvmtiError jerr = env->SetLocalFloat (thread, depth, slot, value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-}
-
-static jdouble
-getDoubleJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth,
-                jbyte sig)
-{
-  jdouble value;
-  jvmtiError jerr = env->GetLocalDouble (thread, depth, slot, &value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-  
-  return value;
-}
-
-static void
-setDoubleJVMTI (jvmtiEnv *env, jthread thread, jint slot, jint depth, 
-                jbyte sig, jdouble value)
-{
-  jvmtiError jerr = env->SetLocalDouble (thread, depth, slot, value);
-  
-  checkJVMTIError (env, thread, jerr, slot, sig);
-}
-
-// This is necessary since JVMTI requires a stack depth as a parameter in all
-// its local variable functions.  Since JDWP needs frameids, we have to run
-// through the call stack to translate these ids into the parameters JVMTI
-// wants.
-static jint
-getFrameDepth (_Jv_Frame *frame)
-{
-  jint depth = 0;
-  _Jv_Frame *top_frame = (_Jv_Frame *) frame->thread->frame;
-  jint num_frames = VMVirtualMachine::getFrameCount (frame->thread);
-  
-  while (frame != top_frame)
-    {
-      top_frame = top_frame->next;
-      depth++;
-      
-      if (depth >= num_frames || top_frame == NULL)
-        throw new InvalidFrameException ((jlong) frame);
-    }
-  
-  return depth;
-}
-
-using namespace gnu::classpath::jdwp::value;
-
-Value *
-gnu::classpath::jdwp::VMFrame::getValue (jint slot, jbyte sig)
-{
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (id);
-  jint depth = getFrameDepth (frame);
-  jthread thread = reinterpret_cast<jthread> (frame->thread);
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-  
-  Value *value = NULL;
-
-  switch (sig)
-    {
-    case 'B':
-      value = new ByteValue ((jbyte) getIntJVMTI (env, thread, slot, depth, 
-                                                  sig));
-      break;
-    case 'Z':
-      value = new BooleanValue ((jboolean) getIntJVMTI (env, thread, slot,
-                                                        depth, sig));
-      break;
-    case 'C':
-      value = new CharValue ((jchar) getIntJVMTI (env, thread, slot, depth,
-                                                  sig));
-      break;
-    case 'S':
-      value = new ShortValue ((jshort) getIntJVMTI (env, thread, slot, depth,
-                                                    sig));
-      break;
-    case 'I':
-      value = new IntValue (getIntJVMTI (env, thread, slot, depth, sig));
-      break;
-    case 'J':
-      value = new LongValue (getLongJVMTI (env, thread, slot, depth, sig));
-      break;
-    case 'F':
-      value = new FloatValue (getFloatJVMTI (env, thread, slot, depth, sig));
-      break;
-    case 'D':
-      value = new DoubleValue (getDoubleJVMTI (env, thread, slot, depth, sig));
-      break;
-    case 'V':
-      value = new VoidValue ();
-      break;
-    case '[':
-      {
-        Object *obj = getObjectJVMTI (env, thread, slot, depth, sig);
-        if (obj == NULL)
-          obj = new util::NullObject ();
-        value = new ArrayValue (obj);
-        break;
-      }
-    default:
-      Object *obj = getObjectJVMTI (env, thread, slot, depth, sig);
-      if (obj == NULL)
-        obj = new util::NullObject ();
-      value = new ObjectValue (obj);
-      break;
-    }
-  
-  return value;
-}
-
-void
-gnu::classpath::jdwp::VMFrame::setValue (jint slot, Value* value)
-{	
-  jbyte sig = value->getTag ();
-  
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (id);
-  jint depth = getFrameDepth (frame);
-  jthread thread = reinterpret_cast<jthread> (frame->thread);
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-  
-  switch (sig)
-    {
-    case 'B':
-      {
-        ByteValue *val = reinterpret_cast<ByteValue *> (value);
-        setIntJVMTI (env, thread, slot, depth, sig, (jint) val->getValue ());
-        break;
-      }
-    case 'Z':
-      {
-        BooleanValue *val = reinterpret_cast<BooleanValue *> (value);
-        setIntJVMTI (env, thread, slot, depth, sig, (jint) val->getValue ());
-        break;
-      }
-    case 'C':
-      {
-        CharValue *val = reinterpret_cast<CharValue *> (value);
-        setIntJVMTI (env, thread, slot, depth, sig, (jint) val->getValue ());
-        break;
-      }
-    case 'S':
-      {
-        ShortValue *val = reinterpret_cast<ShortValue *> (value);
-        setIntJVMTI (env, thread, slot, depth, sig, (jint) val->getValue ());
-        break;
-      }
-    case 'I':
-      {
-        IntValue *val = reinterpret_cast<IntValue *> (value);
-        setIntJVMTI (env, thread, slot, depth, sig, val->getValue ());
-        break;
-      }
-    case 'J':
-      {
-        LongValue *val = reinterpret_cast<LongValue *> (value);
-        setLongJVMTI (env, thread, slot, depth, sig, val->getValue ());
-        break;
-      }
-    case 'F':
-      {
-        FloatValue *val = reinterpret_cast<FloatValue *> (value);
-        setFloatJVMTI (env, thread, slot, depth, sig, val->getValue ());
-        break;
-      }
-    case 'D':
-      {
-        DoubleValue *val = reinterpret_cast<DoubleValue *> (value);
-        setDoubleJVMTI (env, thread, slot, depth, sig, val->getValue ());
-        break;
-      }
-    case 'V':
-      break;
-    case '[':
-      {
-        ArrayValue *val = reinterpret_cast<ArrayValue *> (value);
-        setObjectJVMTI (env, thread, slot, depth, sig, val->getObject ());
-        break;
-      }
-    default:
-      {
-        ObjectValue *val = reinterpret_cast<ObjectValue *> (value);
-        setObjectJVMTI (env, thread, slot, depth, sig, val->getObject());
-        break;
-      }
-    }
-}
diff --git a/libjava/gnu/classpath/jdwp/natVMMethod.cc b/libjava/gnu/classpath/jdwp/natVMMethod.cc
deleted file mode 100644
index 1cea54d..0000000
--- a/libjava/gnu/classpath/jdwp/natVMMethod.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// natVMMethod.cc -- native support for VMMethod
-
-/* Copyright (C) 2006, 2007 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <java-interp.h>
-#include <jvmti.h>
-#include "jvmti-int.h"
-
-#include <java/lang/reflect/Modifier.h>
-#include <gnu/classpath/jdwp/VMMethod.h>
-#include <gnu/classpath/jdwp/exception/AbsentInformationException.h>
-#include <gnu/classpath/jdwp/exception/InvalidMethodException.h>
-#include <gnu/classpath/jdwp/exception/JdwpInternalErrorException.h>
-#include <gnu/classpath/jdwp/util/LineTable.h>
-#include <gnu/classpath/jdwp/util/VariableTable.h>
-
-using namespace java::lang;
-
-#define CHECK_INTERP_CLASS()	\
-do								\
-  {								\
-    if (!_Jv_IsInterpretedClass (getDeclaringClass ()))	\
-      {													\
-        ::java::lang::String *msg = JvNewStringLatin1 ("native class"); \
-        throw new exception::JdwpInternalErrorException (msg); 			\
-      }													\
-  }								\
-while (0)
-
-jstring
-gnu::classpath::jdwp::VMMethod::getName ()
-{
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-  jmethodID method = reinterpret_cast<jmethodID> (_methodId);
-  char *name;
-  env->GetMethodName (method, &name, NULL, NULL);
-  jstring string = JvNewStringUTF (name);
-  env->Deallocate (reinterpret_cast<unsigned char *> (name));
-  return string;
-}
-
-jstring
-gnu::classpath::jdwp::VMMethod::getSignature ()
-{
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-  jmethodID method = reinterpret_cast<jmethodID> (_methodId);
-  char *signature;
-  env->GetMethodName (method, NULL, &signature, NULL);
-  jstring string = JvNewStringUTF (signature);
-  env->Deallocate (reinterpret_cast<unsigned char *> (signature));
-  return string;
-}
-
-jint
-gnu::classpath::jdwp::VMMethod::getModifiers ()
-{
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-  jmethodID method = reinterpret_cast<jmethodID> (_methodId);
-  jint flags;
-  env->GetMethodModifiers (method, &flags);
-
-  // If this class is compiled, as far as JDWP is concerned, its methods are 
-  // native.  This will set the native flag for these methods.
-  if (!_Jv_IsInterpretedClass (getDeclaringClass ()))
-    flags |= ::java::lang::reflect::Modifier::NATIVE;
-
-  return flags;
-}
-
-gnu::classpath::jdwp::util::LineTable *
-gnu::classpath::jdwp::VMMethod::getLineTable ()
-{
-  CHECK_INTERP_CLASS ();
-
-  jmethodID desired_method = reinterpret_cast<jmethodID> (_methodId);
-
-  _Jv_MethodBase *theMethod
-    = _Jv_FindInterpreterMethod (getDeclaringClass (), desired_method);
-
-  if (theMethod == NULL)
-    {
-      // this should not happen
-      ::java::lang::String *msg
-	= JvNewStringLatin1 ("could not find method in class");
-      throw new exception::JdwpInternalErrorException (msg);
-    }
-
-  if (::java::lang::reflect::Modifier::isNative (desired_method->accflags))
-    {
-      jintArray lines = JvNewIntArray (0);
-      jlongArray indices = JvNewLongArray (0);
-      return new util::LineTable (-1, -1, lines, indices);
-    }
-
-  // get the linetable
-  _Jv_InterpMethod *imeth = reinterpret_cast<_Jv_InterpMethod *> (theMethod);
-  jlong start;
-  jlong end;
-  jintArray lines;
-  jlongArray indices;
-  imeth->get_line_table (start, end, lines, indices);
-  return new util::LineTable (start, end, lines, indices);
-}
-
-
-gnu::classpath::jdwp::util::VariableTable*
-gnu::classpath::jdwp::VMMethod::getVariableTable ()
-{
-  using namespace gnu::classpath::jdwp::util;
-  
-  jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv ();
-	
-  CHECK_INTERP_CLASS ();
-  
-  jmethodID meth = reinterpret_cast<jmethodID> (_methodId);
-  jvmtiLocalVariableEntry *var_table;
-  jint num_slots, args_len;
-  
-  jvmtiError jerr = env->GetLocalVariableTable (meth, &num_slots, &var_table);
-  
-  if (jerr != JVMTI_ERROR_NONE)
-    goto error;
-  
-  jerr = env->GetArgumentsSize (meth, &args_len);
-  
-  if (jerr != JVMTI_ERROR_NONE)
-    {
-    error:
-      using namespace gnu::classpath::jdwp::exception;
-      char *error;
-      env->GetErrorName (jerr, &error);
-      String *msg = JvNewStringUTF (error);
-      env->Deallocate (reinterpret_cast<unsigned char *> (error));
-      
-      if (jerr == JVMTI_ERROR_NATIVE_METHOD)
-        throw new AbsentInformationException (msg);
-      else if (jerr == JVMTI_ERROR_INVALID_METHODID)
-        throw new InvalidMethodException (_methodId);
-      else
-        throw new JdwpInternalErrorException (msg);
-    }
-  
-  jlongArray start_pcs = JvNewLongArray (num_slots);
-  jlong *start_pcs_ptr = elements (start_pcs);
-  jintArray lengths = JvNewIntArray (num_slots);
-  jint *lengths_ptr = elements (lengths);
-  jintArray slots = JvNewIntArray (num_slots);
-  jint *slots_ptr = elements (slots);
-  JArray<String *> *names = reinterpret_cast<JArray<String *> *> 
-                              (JvNewObjectArray (num_slots, 
-                                                 &String::class$, NULL));
-  jstring *names_ptr = elements (names);
-  JArray<String *> *signatures = reinterpret_cast<JArray<String *> *>
-                                   (JvNewObjectArray (num_slots, 
-                                                      &String::class$, NULL));
-  jstring *signatures_ptr = elements (signatures);
-  
-  // Get the information out of the JVMTI strucutre and Deallocate the strings.
-  for (int i = 0; i < num_slots; i++)
-    {
-      start_pcs_ptr[i] = var_table[i].start_location;
-      lengths_ptr[i] = var_table[i].length;
-      slots_ptr[i] = var_table[i].slot;
-      names_ptr[i] = JvNewStringUTF (var_table[i].name);
-      env->Deallocate (reinterpret_cast<unsigned char *> 
-                         (var_table[i].name));
-      signatures_ptr[i] = JvNewStringUTF (var_table[i].signature);
-      env->Deallocate (reinterpret_cast<unsigned char *> 
-                         (var_table[i].signature));
-      env->Deallocate (reinterpret_cast<unsigned char *>
-                         (var_table[i].generic_signature));
-    }
-  
-  // Now Deallocate the table since it's strings have already been freed.
-  env->Deallocate (reinterpret_cast<unsigned char *> (var_table));
-  
-  // Create the new JDWP VariableTable to return with the now filled arrays.
-  VariableTable* jdwp_vtable = new VariableTable (args_len, num_slots,
-                                                  start_pcs, names, signatures,
-                                                  lengths, slots);
-  
-  return jdwp_vtable;
-}
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
deleted file mode 100644
index 7bd300b..0000000
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ /dev/null
@@ -1,1159 +0,0 @@
-// natVMVirtualMachine.cc - native support for VMVirtualMachine
-
-/* Copyright (C) 2006, 2007 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <java-assert.h>
-#include <java-interp.h>
-#include <jvm.h>
-#include <jvmti.h>
-
-#include <java/lang/Class.h>
-#include <java/lang/ClassLoader.h>
-#include <java/lang/Integer.h>
-#include <java/lang/String.h>
-#include <java/lang/StringBuilder.h>
-#include <java/lang/Thread.h>
-#include <java/lang/Throwable.h>
-#include <java/nio/ByteBuffer.h>
-#include <java/nio/ByteBufferImpl.h>
-#include <java/util/ArrayList.h>
-#include <java/util/Collection.h>
-#include <java/util/Hashtable.h>
-#include <java/util/Iterator.h>
-
-#include <gnu/classpath/jdwp/Jdwp.h>
-#include <gnu/classpath/jdwp/JdwpConstants$StepDepth.h>
-#include <gnu/classpath/jdwp/JdwpConstants$StepSize.h>
-#include <gnu/classpath/jdwp/JdwpConstants$ThreadStatus.h>
-#include <gnu/classpath/jdwp/VMFrame.h>
-#include <gnu/classpath/jdwp/VMMethod.h>
-#include <gnu/classpath/jdwp/VMVirtualMachine.h>
-#include <gnu/classpath/jdwp/event/BreakpointEvent.h>
-#include <gnu/classpath/jdwp/event/ClassPrepareEvent.h>
-#include <gnu/classpath/jdwp/event/ExceptionEvent.h>
-#include <gnu/classpath/jdwp/event/EventManager.h>
-#include <gnu/classpath/jdwp/event/EventRequest.h>
-#include <gnu/classpath/jdwp/event/SingleStepEvent.h>
-#include <gnu/classpath/jdwp/event/ThreadEndEvent.h>
-#include <gnu/classpath/jdwp/event/ThreadStartEvent.h>
-#include <gnu/classpath/jdwp/event/VmDeathEvent.h>
-#include <gnu/classpath/jdwp/event/VmInitEvent.h>
-#include <gnu/classpath/jdwp/event/filters/IEventFilter.h>
-#include <gnu/classpath/jdwp/event/filters/LocationOnlyFilter.h>
-#include <gnu/classpath/jdwp/event/filters/StepFilter.h>
-#include <gnu/classpath/jdwp/exception/AbsentInformationException.h>
-#include <gnu/classpath/jdwp/exception/InvalidFrameException.h>
-#include <gnu/classpath/jdwp/exception/InvalidLocationException.h>
-#include <gnu/classpath/jdwp/exception/InvalidMethodException.h>
-#include <gnu/classpath/jdwp/exception/JdwpInternalErrorException.h>
-#include <gnu/classpath/jdwp/id/ThreadId.h>
-#include <gnu/classpath/jdwp/util/Location.h>
-#include <gnu/classpath/jdwp/util/MethodResult.h>
-#include <gnu/gcj/jvmti/Breakpoint.h>
-#include <gnu/gcj/jvmti/BreakpointManager.h>
-
-using namespace java::lang;
-using namespace gnu::classpath::jdwp::event;
-using namespace gnu::classpath::jdwp::util;
-
-// Stepping information
-struct step_info
-{
-  jint size;   // See gnu.classpath.jdwp.JdwpConstants.StepSize
-  jint depth;  // See gnu.classpath.jdwp.JdwpConstants.StepDepth
-  int stack_depth;  // stack depth at start of stepping
-  jmethodID method; // method in which we are stepping
-};
-
-// Forward declarations
-static jvmtiError get_linetable (jvmtiEnv *, jmethodID, jint *,
-				 jvmtiLineNumberEntry **);
-static Location *get_request_location (EventRequest *);
-static gnu::classpath::jdwp::event::filters::StepFilter *
-get_request_step_filter (EventRequest *);
-static void handle_single_step (jvmtiEnv *, struct step_info *, jthread,
-				jmethodID, jlocation);
-static void JNICALL jdwpBreakpointCB (jvmtiEnv *, JNIEnv *, jthread,
-				      jmethodID, jlocation);
-static void JNICALL jdwpClassPrepareCB (jvmtiEnv *, JNIEnv *, jthread, jclass);
-static void JNICALL jdwpExceptionCB (jvmtiEnv *, JNIEnv *jni_env, jthread,
-				     jmethodID, jlocation, jobject,
-				     jmethodID, jlocation);
-static void JNICALL jdwpSingleStepCB (jvmtiEnv *, JNIEnv *, jthread,
-				      jmethodID, jlocation);
-static void JNICALL jdwpThreadEndCB (jvmtiEnv *, JNIEnv *, jthread);
-static void JNICALL jdwpThreadStartCB (jvmtiEnv *, JNIEnv *, jthread);
-static void JNICALL jdwpVMDeathCB (jvmtiEnv *, JNIEnv *);
-static void JNICALL jdwpVMInitCB (jvmtiEnv *, JNIEnv *, jthread);
-static void throw_jvmti_error (jvmtiError);
-
-#define DEFINE_CALLBACK(Cb,Event) Cb.Event = jdwp ## Event ## CB
-#define DISABLE_EVENT(Event,Thread)					\
-  _jdwp_jvmtiEnv->SetEventNotificationMode (JVMTI_DISABLE,		\
-					    JVMTI_EVENT_ ## Event, Thread)
-#define ENABLE_EVENT(Event,Thread)					\
-  _jdwp_jvmtiEnv->SetEventNotificationMode (JVMTI_ENABLE,		\
-					    JVMTI_EVENT_ ## Event, Thread)
-// JVMTI environment
-static jvmtiEnv *_jdwp_jvmtiEnv;
-
-jvmtiEnv *
-_Jv_GetJDWP_JVMTIEnv (void)
-{
-  return _jdwp_jvmtiEnv;
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::initialize ()
-{
-  _jdwp_suspend_counts = new ::java::util::Hashtable ();
-  _stepping_threads = new ::java::util::Hashtable ();
-  _event_list = new ::java::util::ArrayList ();
-
-  JavaVM *vm = _Jv_GetJavaVM ();
-  union
-  {
-    void *ptr;
-    jvmtiEnv *env;
-  } foo;
-  vm->GetEnv (&(foo.ptr), JVMTI_VERSION_1_0);
-  _jdwp_jvmtiEnv = foo.env;
-
-  // Wait for VM_INIT to do more initialization
-  jvmtiEventCallbacks callbacks;
-  DEFINE_CALLBACK (callbacks, VMInit);
-  _jdwp_jvmtiEnv->SetEventCallbacks (&callbacks, sizeof (callbacks));
-  ENABLE_EVENT (VM_INIT, NULL);
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::suspendThread (Thread *thread)
-{
-  jint value;
-  Integer *count;
-  {
-    JvSynchronize dummy (_jdwp_suspend_counts);
-    count = reinterpret_cast<Integer *> (_jdwp_suspend_counts->get (thread));
-    if (count == NULL)
-      {
-	// New -- suspend thread
-	value = 0;
-      }
-    else
-      {
-	// Thread already suspended
-	value = count->intValue ();
-      }
-
-    count = Integer::valueOf (++value);
-    _jdwp_suspend_counts->put (thread, count);
-  }
-
-  if (value == 1)
-    {
-      // Suspend the thread
-      jvmtiError err = _jdwp_jvmtiEnv->SuspendThread (thread);
-      if (err != JVMTI_ERROR_NONE)
-	{
-	  using namespace gnu::gcj::runtime;
-	  using namespace gnu::classpath::jdwp::exception;
-	  char *reason;
-	  _jdwp_jvmtiEnv->GetErrorName (err, &reason);
-	  String *txt = JvNewStringLatin1 ("could not suspend thread: ");
-	  StringBuilder *msg = new StringBuilder (txt);
-	  msg->append (JvNewStringLatin1 (reason));
-	  _jdwp_jvmtiEnv->Deallocate ((unsigned char *) reason);
-	  throw new JdwpInternalErrorException (msg->toString ());
-	}
-    }
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::resumeThread (Thread *thread)
-{
-  jint value;
-  {
-    JvSynchronize dummy (_jdwp_suspend_counts);
-    Integer *count
-      = reinterpret_cast<Integer *> (_jdwp_suspend_counts->get (thread));
-    if (count == NULL)
-      {
-	// Thread not suspended: ThreadReference.Resume says to ignore it.
-	return;
-      }
-    else
-      {
-	// Decrement suspend count
-	value = count->intValue () - 1;
-      }
-
-    if (value == 0)
-      {
-	// Thread will be resumed, remove from table
-	_jdwp_suspend_counts->remove (thread);
-      }
-    else
-      {
-	// Thread stays suspended: record new suspend count
-	count = Integer::valueOf (value);
-	_jdwp_suspend_counts->put (thread, count);
-      }
-  }
-
-  if (value == 0)
-    {
-      jvmtiError err = _jdwp_jvmtiEnv->ResumeThread (thread);
-      if (err != JVMTI_ERROR_NONE)
-	{
-	  using namespace gnu::gcj::runtime;
-	  using namespace gnu::classpath::jdwp::exception;
-	  char *reason;
-	  _jdwp_jvmtiEnv->GetErrorName (err, &reason);
-	  String *txt = JvNewStringLatin1 ("could not resume thread: ");
-	  StringBuilder *msg = new StringBuilder (txt);
-	  msg->append (JvNewStringLatin1 (reason));
-	  _jdwp_jvmtiEnv->Deallocate ((unsigned char *) reason);
-	  throw new JdwpInternalErrorException (msg->toString ());
-	}
-    }
-}
-
-jint
-gnu::classpath::jdwp::VMVirtualMachine::getSuspendCount (Thread *thread)
-{
-  jint suspensions = 0;
-  Integer *count
-    = reinterpret_cast<Integer *> (_jdwp_suspend_counts->get (thread));
-  if (count != NULL)
-    suspensions = count->intValue ();
-  return suspensions;
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::registerEvent (EventRequest *request)
-{
-  switch (request->getEventKind ())
-    {
-    case EventRequest::EVENT_SINGLE_STEP:
-      {
-	Thread *thread;
-	filters::StepFilter *filter = get_request_step_filter (request);
-	if (filter == NULL)
-	  {
-	    // No filter specified: report every step in every
-	    // thread.
-	    thread = NULL;
-	  }
-	else
-	  {
-	    // Add stepping information to list of stepping threads
-	    thread = filter->getThread ()->getThread ();
-	    _Jv_InterpFrame *frame
-	      = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
-	    struct step_info *sinfo
-	      = (struct step_info *) JvAllocBytes (sizeof (struct step_info));
-	    sinfo->size = filter->getSize ();
-	    sinfo->depth = filter->getDepth ();
-	    sinfo->stack_depth = frame->depth ();
-	    sinfo->method = frame->self->get_method ();
-	    _stepping_threads->put (thread, (jobject) sinfo);
-	  }
-
-	ENABLE_EVENT (SINGLE_STEP, thread);
-      }
-      break;
-
-    case EventRequest::EVENT_BREAKPOINT:
-      {
-	using namespace ::gnu::gcj::jvmti;
-	Location *loc = get_request_location (request);
-	if (loc == NULL)
-	  {
-	    using namespace gnu::classpath::jdwp::exception;
-	    throw new InvalidLocationException ();
-	  }
-
-	jlong method = loc->getMethod ()->getId ();
-	jlocation index = loc->getIndex ();
-	Breakpoint  *bp = BreakpointManager::getBreakpoint (method, index);
-	if (bp == NULL)
-	  {
-	    // Breakpoint not in interpreter yet
-	    bp = BreakpointManager::newBreakpoint (method, index);
-	  }
-	else
-	  {
-	    // Ignore the duplicate
-	  }
-      }
-      break;
-
-    case EventRequest::EVENT_FRAME_POP:
-      break;
-
-    case EventRequest::EVENT_EXCEPTION:
-      break;
-
-    case EventRequest::EVENT_USER_DEFINED:
-      break;
-
-    case EventRequest::EVENT_THREAD_START:
-      break;
-
-    case EventRequest::EVENT_THREAD_END:
-      break;
-
-    case EventRequest::EVENT_CLASS_PREPARE:
-      break;
-
-    case EventRequest::EVENT_CLASS_LOAD:
-      break;
-
-    case EventRequest::EVENT_CLASS_UNLOAD:
-      break;
-
-    case EventRequest::EVENT_FIELD_ACCESS:
-      break;
-
-    case EventRequest::EVENT_FIELD_MODIFY:
-      break;
-
-    case EventRequest::EVENT_METHOD_ENTRY:
-      break;
-
-    case EventRequest::EVENT_METHOD_EXIT:
-      break;
-
-    case EventRequest::EVENT_VM_INIT:
-      break;
-
-    case EventRequest::EVENT_VM_DEATH:
-      break;
-    }
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::unregisterEvent (EventRequest *request)
-{
-  switch (request->getEventKind ())
-    {
-    case EventRequest::EVENT_SINGLE_STEP:
-      {
-	Thread *thread;
-	filters::StepFilter *filter = get_request_step_filter (request);
-	if (filter == NULL)
-	  thread = NULL;
-	else
-	  {
-	    thread = filter->getThread ()->getThread ();
-	    _stepping_threads->remove (thread);
-	  }
-
-	DISABLE_EVENT (SINGLE_STEP, thread);
-      }
-      break;
-
-    case EventRequest::EVENT_BREAKPOINT:
-      {
-	using namespace gnu::gcj::jvmti;
-	::java::util::Collection *breakpoints;
-	EventManager *em = EventManager::getDefault ();
-	breakpoints = em->getRequests (EventRequest::EVENT_BREAKPOINT);
-
-	// Check for duplicates
-	int matches = 0;
-	Location *the_location = get_request_location (request);
-
-	// This should not be possible: we REQUIRE a Location
-	// to install a breakpoint
-	JvAssert (the_location != NULL);
-
-	::java::util::Iterator *iter = breakpoints->iterator ();
-	while (iter->hasNext ())
-	  {
-	    EventRequest *er
-	      = reinterpret_cast<EventRequest *> (iter->next ());
-	    Location *loc = get_request_location (er);
-	    JvAssert (loc != NULL);
-	    if (loc->equals (the_location) && ++matches == 2)
-	      {
-		// Short-circuit: already more than one breakpoint
-		return;
-	      }
-	  }
-
-	if (matches == 0)
-	  {
-	    using namespace gnu::classpath::jdwp::exception;
-	    jstring msg
-	      = JvNewStringLatin1 ("attempt to remove unknown breakpoint");
-	    throw new JdwpInternalErrorException (msg);
-	  }
-
-	jlong methodId = the_location->getMethod ()->getId ();
-	BreakpointManager::deleteBreakpoint (methodId,
-					     the_location->getIndex ());
-      }
-      break;
-
-    case EventRequest::EVENT_FRAME_POP:
-      break;
-
-    case EventRequest::EVENT_EXCEPTION:
-      break;
-
-    case EventRequest::EVENT_USER_DEFINED:
-      break;
-
-    case EventRequest::EVENT_THREAD_START:
-      break;
-
-    case EventRequest::EVENT_THREAD_END:
-      break;
-
-    case EventRequest::EVENT_CLASS_PREPARE:
-      break;
-
-    case EventRequest::EVENT_CLASS_LOAD:
-      break;
-
-    case EventRequest::EVENT_CLASS_UNLOAD:
-      break;
-
-    case EventRequest::EVENT_FIELD_ACCESS:
-      break;
-
-    case EventRequest::EVENT_FIELD_MODIFY:
-      break;
-
-    case EventRequest::EVENT_METHOD_ENTRY:
-      break;
-
-    case EventRequest::EVENT_METHOD_EXIT:
-      break;
-
-    case EventRequest::EVENT_VM_INIT:
-      break;
-
-    case EventRequest::EVENT_VM_DEATH:
-      break;
-    }
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::clearEvents (MAYBE_UNUSED jbyte kind)
-{
-}
-
-java::util::Collection *
-gnu::classpath::jdwp::VMVirtualMachine::getAllLoadedClasses (void)
-{
-  using namespace ::java::util;
-  return (Collection *) new ArrayList ();
-}
-
-jint
-gnu::classpath::jdwp::VMVirtualMachine::
-getClassStatus (jclass klass)
-{
-  jint flags = 0;
-  jvmtiError err = _jdwp_jvmtiEnv->GetClassStatus (klass, &flags);
-  if (err != JVMTI_ERROR_NONE)
-    throw_jvmti_error (err);
-
-  using namespace gnu::classpath::jdwp::event;
-  jint status = 0;
-  if (flags & JVMTI_CLASS_STATUS_VERIFIED)
-    status |= ClassPrepareEvent::STATUS_VERIFIED;
-  if (flags & JVMTI_CLASS_STATUS_PREPARED)
-    status |= ClassPrepareEvent::STATUS_PREPARED;
-  if (flags & JVMTI_CLASS_STATUS_ERROR)
-    status |= ClassPrepareEvent::STATUS_ERROR;
-  if (flags & JVMTI_CLASS_STATUS_INITIALIZED)
-    status |= ClassPrepareEvent::STATUS_INITIALIZED;
-
-  return status;
-}
-
-JArray<gnu::classpath::jdwp::VMMethod *> *
-gnu::classpath::jdwp::VMVirtualMachine::
-getAllClassMethods (jclass klass)
-{
-  jint count;
-  jmethodID *methods;
-  jvmtiError err = _jdwp_jvmtiEnv->GetClassMethods (klass, &count, &methods);
-  if (err != JVMTI_ERROR_NONE)
-    throw_jvmti_error (err);
-
-  JArray<VMMethod *> *result
-    = (JArray<VMMethod *> *) JvNewObjectArray (count,
-					       &VMMethod::class$, NULL);
-  VMMethod **rmeth = elements (result);
-  for (int i = 0; i < count; ++i)
-    {
-      jlong id = reinterpret_cast<jlong> (methods[i]);
-      rmeth[i] = getClassMethod (klass, id);
-    }
-
-  _jdwp_jvmtiEnv->Deallocate ((unsigned char *) methods);
-  return result;
-}
-
-gnu::classpath::jdwp::VMMethod *
-gnu::classpath::jdwp::VMVirtualMachine::
-getClassMethod (jclass klass, jlong id)
-{
-  jint count;
-  jmethodID *methods;
-  jvmtiError err = _jdwp_jvmtiEnv->GetClassMethods (klass, &count, &methods);
-  if (err != JVMTI_ERROR_NONE)
-    throw_jvmti_error (err);
-
-  jmethodID meth_id = reinterpret_cast<jmethodID> (id);
-
-  using namespace gnu::classpath::jdwp;
-
-  // Check if this method is defined for the given class and if so return a
-  // VMMethod representing it.
-  for (int i = 0; i < count; i++)
-    {
-      if (methods[i] == meth_id)
-        return new VMMethod (klass, reinterpret_cast<jlong> (meth_id));
-    }
-
-  throw new exception::InvalidMethodException (id);
-}
-
-java::util::ArrayList *
-gnu::classpath::jdwp::VMVirtualMachine::getFrames (Thread *thread, jint start,
-                                                   jint length)
-{
-  jint frame_count = getFrameCount (thread);
-  ::java::util::ArrayList *frame_list;
-  
-  // Calculate the max number of frames to be returned.
-  jint num_frames = frame_count - start;
-  
-  // Check if num_frames is valid.
-  if (num_frames < 0)
-    num_frames = 0;
-  
-  // Check if there are more than length frames left after start.
-  // If length ios -1 return all remaining frames.
-  if (length != -1 && num_frames > length)
-    num_frames = length;
-     
-  frame_list = new ::java::util::ArrayList (num_frames);
-  
-  _Jv_Frame *vm_frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
-  
-  // Take start frames off the top of the stack
-  while (vm_frame != NULL && start > 0)
-    {
-      start--;
-      vm_frame = vm_frame->next;
-    }
-  
-  // Use as a counter for the number of frames returned.
-  num_frames = 0;
-  
-  while (vm_frame != NULL && (num_frames < length || length == -1))
-    {  
-      jlong frameId = reinterpret_cast<jlong> (vm_frame);
-      
-      VMFrame *frame = getFrame (thread, frameId);
-      frame_list->add (frame);
-      vm_frame = vm_frame->next;
-      num_frames++;
-    }
-  
-  return frame_list;
-}
-
-gnu::classpath::jdwp::VMFrame *
-gnu::classpath::jdwp::VMVirtualMachine::
-getFrame (Thread *thread, jlong frameID)
-{
-  using namespace gnu::classpath::jdwp::exception;
-  
-  _Jv_Frame *vm_frame = (_Jv_Frame *) thread->frame;
-  jint depth = 0;
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (frameID); 
-  
-  // We need to find the stack depth of the frame, so search through the call
-  // stack to find it.  This also checks for a valid frameID.
-  while (vm_frame != frame)
-    {
-      vm_frame = vm_frame->next;
-      depth++;
-      if (vm_frame == NULL)
-        throw new InvalidFrameException (frameID);
-    }
-  
-  Location *loc = NULL;
-  jvmtiFrameInfo info;
-  jvmtiError jerr;
-  jint num_frames;
-  jclass klass;
-  
-  // Get the info for the frame of interest
-  jerr = _jdwp_jvmtiEnv->GetStackTrace (thread, depth, 1, &info, &num_frames);
-   
-  if (jerr != JVMTI_ERROR_NONE)
-    throw_jvmti_error (jerr);
-  
-  jerr = _jdwp_jvmtiEnv->GetMethodDeclaringClass (info.method, &klass);
-      
-  if (jerr != JVMTI_ERROR_NONE)
-    throw_jvmti_error (jerr);
-
-  VMMethod *meth 
-    = getClassMethod (klass, reinterpret_cast<jlong> (info.method));
-  
-  jobject this_obj;
-  
-  if (info.location == -1)
-    {
-      loc = new Location (meth, 0);
-      this_obj = NULL;
-    }
-  else
-    {
-      loc = new Location (meth, info.location);
-      _Jv_InterpFrame *iframe = reinterpret_cast<_Jv_InterpFrame *> (vm_frame);
-      this_obj = iframe->get_this_ptr ();
-    }
-  
-  return new VMFrame (thread, reinterpret_cast<jlong> (vm_frame), loc,
-                      this_obj); 
-}
-
-jint
-gnu::classpath::jdwp::VMVirtualMachine::
-getFrameCount (Thread *thread)
-{
-  jint frame_count;
-  
-  jvmtiError jerr = _jdwp_jvmtiEnv->GetFrameCount (thread, &frame_count);
-  
-  if (jerr != JVMTI_ERROR_NONE)
-    throw_jvmti_error (jerr);
-  
-  return frame_count;
-}
-
-jint
-gnu::classpath::jdwp::VMVirtualMachine::
-getThreadStatus (Thread *thread)
-{
-  jint thr_state, status;
-  
-  jvmtiError jerr = _jdwp_jvmtiEnv->GetThreadState (thread, &thr_state);
-  if (jerr != JVMTI_ERROR_NONE)
-    throw_jvmti_error (jerr);
-  
-  if (thr_state & JVMTI_THREAD_STATE_SLEEPING)
-    status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::SLEEPING;
-  else if (thr_state & JVMTI_THREAD_STATE_RUNNABLE)
-    status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::RUNNING;
-  else if (thr_state & JVMTI_THREAD_STATE_WAITING)
-    {
-      if (thr_state & (JVMTI_THREAD_STATE_IN_OBJECT_WAIT
-                       | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER))
-        status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::MONITOR;
-      else
-        status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::WAIT;
-    }
-  else
-    {
-      // The thread is not SLEEPING, MONITOR, or WAIT.  It may, however, be
-      // alive but not yet started.
-      if (!(thr_state & (JVMTI_THREAD_STATE_ALIVE 
-                         | JVMTI_THREAD_STATE_TERMINATED)))
-        status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::RUNNING;
-      status = gnu::classpath::jdwp::JdwpConstants$ThreadStatus::ZOMBIE;     
-    }   
-
-  return status;
-}
-
-java::util::ArrayList *
-gnu::classpath::jdwp::VMVirtualMachine::
-getLoadRequests (MAYBE_UNUSED ClassLoader *cl)
-{
-  return new ::java::util::ArrayList ();
-}
-
-MethodResult *
-gnu::classpath::jdwp::VMVirtualMachine::
-executeMethod (MAYBE_UNUSED jobject obj, MAYBE_UNUSED Thread *thread,
-	       MAYBE_UNUSED jclass clazz, MAYBE_UNUSED VMMethod *method,
-	       MAYBE_UNUSED JArray<value::Value *> *values,
-	       MAYBE_UNUSED jint options)
-{
-  return NULL;
-}
-
-jstring
-gnu::classpath::jdwp::VMVirtualMachine::
-getSourceFile (jclass clazz)
-{
-  jstring file = _Jv_GetInterpClassSourceFile (clazz);
-  
-  // Check if the source file was found.
-  if (file == NULL)
-    throw new exception::AbsentInformationException (
-                           _Jv_NewStringUTF("Source file not found"));
-  
-  return file;
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::
-redefineClasses (MAYBE_UNUSED JArray<jclass> *types,
-		 MAYBE_UNUSED JArray<jbyteArray> *bytecodes)
-{
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::
-setDefaultStratum (MAYBE_UNUSED jstring stratum)
-{
-}
-
-jstring
-gnu::classpath::jdwp::VMVirtualMachine::
-getSourceDebugExtension (MAYBE_UNUSED jclass klass)
-{
-  return NULL;
-}
-
-jbyteArray
-gnu::classpath::jdwp::VMVirtualMachine::
-getBytecodes (MAYBE_UNUSED gnu::classpath::jdwp::VMMethod *method)
-{
-  return NULL;
-}
-
-gnu::classpath::jdwp::util::MonitorInfo *
-gnu::classpath::jdwp::VMVirtualMachine::
-getMonitorInfo (MAYBE_UNUSED jobject obj)
-{
-  return NULL;
-}
-
-jobjectArray
-gnu::classpath::jdwp::VMVirtualMachine::
-getOwnedMonitors (MAYBE_UNUSED ::java::lang::Thread *thread)
-{
-  return NULL;
-}
-
-jobject
-gnu::classpath::jdwp::VMVirtualMachine::
-getCurrentContendedMonitor (MAYBE_UNUSED ::java::lang::Thread *thread)
-{
-  return NULL;
-}
-
-void
-gnu::classpath::jdwp::VMVirtualMachine::
-popFrames (MAYBE_UNUSED ::java::lang::Thread *thread,
-	   MAYBE_UNUSED jlong frameId)
-{
-}
-
-// A simple caching function used while single-stepping
-static jvmtiError
-get_linetable (jvmtiEnv *env, jmethodID method, jint *count_ptr,
-	       jvmtiLineNumberEntry **table_ptr)
-{
-  static jint last_count = 0;
-  static jvmtiLineNumberEntry *last_table = NULL;
-  static jmethodID last_method = 0;
-
-  if (method == last_method)
-    {
-      *count_ptr = last_count;
-      *table_ptr = last_table;
-      return JVMTI_ERROR_NONE;
-    }
-
-  jvmtiError err;
-  jint count;
-  jvmtiLineNumberEntry *table;
-  err = env->GetLineNumberTable (method, &count, &table);
-  if (err != JVMTI_ERROR_NONE)
-    {
-      // Keep last table in cache
-      return err;
-    }
-
-  env->Deallocate ((unsigned char *) last_table);
-  last_table = *table_ptr = table;
-  last_count = *count_ptr = count;
-  return JVMTI_ERROR_NONE;
-}
-
-static gnu::classpath::jdwp::event::filters::StepFilter *
-get_request_step_filter (EventRequest *request)
-{
-  ::java::util::Collection *filters = request->getFilters ();
-  ::java::util::Iterator *iter = filters->iterator ();
-  filters::StepFilter *filter = NULL;
-  while (iter->hasNext ())
-    {
-      using namespace gnu::classpath::jdwp::event::filters;
-      IEventFilter *next = (IEventFilter *) iter->next ();
-      if (next->getClass () == &StepFilter::class$)
-	{
-	  filter = reinterpret_cast<StepFilter *> (next);
-	  break;
-	}
-    }
-
-  return filter;
-}
-
-static Location *
-get_request_location (EventRequest *request)
-{
-  Location *loc = NULL;
-  ::java::util::Collection *filters = request->getFilters ();
-  ::java::util::Iterator *iter = filters->iterator ();
-  while (iter->hasNext ())
-    {
-      using namespace gnu::classpath::jdwp::event::filters;
-      IEventFilter *filter = (IEventFilter *) iter->next ();
-      if (filter->getClass () == &LocationOnlyFilter::class$)
-	{
-	  LocationOnlyFilter *lof
-	    = reinterpret_cast<LocationOnlyFilter *> (filter);
-	  loc = lof->getLocation ();
-	}
-    }
-
-  return loc;
-}
-
-static void
-handle_single_step (jvmtiEnv *env, struct step_info *sinfo, jthread thread,
-		    jmethodID method, jlocation location)
-{
-  using namespace gnu::classpath::jdwp;
-
-  if (sinfo == NULL || sinfo->size == JdwpConstants$StepSize::MIN)
-    {
-      // Stop now
-      goto send_notification;
-    }
-  else
-    {
-      // Check if we're on a new source line
-      /* This is a little inefficient when we're stepping OVER,
-	 but this must be done when stepping INTO. */
-      jint count;
-      jvmtiLineNumberEntry *table;
-      if (get_linetable (env, method, &count, &table) == JVMTI_ERROR_NONE)
-	{
-	  jint i;
-	  for (i = 0; i < count; ++i)
-	    {
-	      if (table[i].start_location == location)
-		{
-		  // This is the start of a new line -- stop
-		  goto send_notification;
-		}
-	    }
-
-	  // Not at a new source line -- just keep stepping
-	  return;
-	}
-      else
-	{
-	  /* Something went wrong: either "absent information"
-	     or "out of memory" ("invalid method id" and "native
-	     method" aren't possible -- those are validated before
-	     single stepping is enabled).
-
-	     Do what gdb does: just keep going. */
-	  return;
-	}
-    }
-
- send_notification:
-  jclass klass;
-  jvmtiError err = env->GetMethodDeclaringClass (method, &klass);
-  if (err != JVMTI_ERROR_NONE)
-    {
-      fprintf (stderr, "libgcj: internal error: could not find class for method while single stepping -- continuing\n");
-      return;
-    }
-
-  VMMethod *vmmethod = new VMMethod (klass, reinterpret_cast<jlong> (method));
-  Location *loc = new Location (vmmethod, location);
-  _Jv_InterpFrame *iframe
-    = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);  
-  JvAssert (iframe->frame_type == frame_interpreter);
-  jobject instance = iframe->get_this_ptr ();
-  event::SingleStepEvent *event
-    = new event::SingleStepEvent (thread, loc, instance);
-
-  // We only want to send the notification (and consequently
-  // suspend) if we are not about to execute a breakpoint.
-  _Jv_InterpMethod *im = reinterpret_cast<_Jv_InterpMethod *> (iframe->self);
-  if (im->breakpoint_at (location))
-    {
-      // Next insn is a breakpoint -- record event and
-      // wait for the JVMTI breakpoint notification to
-      // enforce a suspension policy.
-      VMVirtualMachine::_event_list->add (event);
-    }
-  else
-    {
-      // Next insn is not a breakpoint, so send notification
-      // and enforce the suspend policy.
-      Jdwp::notify (event);
-    }
-}
-
-static void
-throw_jvmti_error (jvmtiError err)
-{
-  char *error;
-  jstring msg;
-  if (_jdwp_jvmtiEnv->GetErrorName (err, &error) == JVMTI_ERROR_NONE)
-    {
-      msg = JvNewStringLatin1 (error);
-      _jdwp_jvmtiEnv->Deallocate ((unsigned char *) error);
-    }
-  else
-    msg = JvNewStringLatin1 ("out of memory");
-
-  using namespace gnu::classpath::jdwp::exception;
-  throw new JdwpInternalErrorException (msg);
-}
-
-static void JNICALL
-jdwpBreakpointCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
-		  jthread thread, jmethodID method, jlocation location)
-{
-  jclass klass;
-  jvmtiError err;
-  err = env->GetMethodDeclaringClass (method, &klass);
-  JvAssert (err == JVMTI_ERROR_NONE);
-
-  using namespace gnu::classpath::jdwp;
-  using namespace gnu::classpath::jdwp::event;
-
-  jlong methodId = reinterpret_cast<jlong> (method);
-  VMMethod *meth = VMVirtualMachine::getClassMethod (klass, methodId);
-  Location *loc = new Location (meth, location);
-  _Jv_InterpFrame *iframe
-    = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
-  JvAssert (iframe->frame_type == frame_interpreter);
-  jobject instance = iframe->get_this_ptr ();
-  BreakpointEvent *event = new BreakpointEvent (thread, loc, instance);
-  
-  VMVirtualMachine::_event_list->add (event);
-  JArray<Event *> *events
-    = ((JArray<Event *> *)
-       JvNewObjectArray (VMVirtualMachine::_event_list->size (),
-			 &Event::class$, NULL));
-  VMVirtualMachine::_event_list->toArray ((jobjectArray) events);
-  VMVirtualMachine::_event_list->clear ();
-  Jdwp::notify (events);
-}
-
-static void JNICALL
-jdwpClassPrepareCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
-		    jthread thread, jclass klass)
-{
-  using namespace gnu::classpath::jdwp;
-
-  jint status = VMVirtualMachine::getClassStatus (klass);
-  event::ClassPrepareEvent *event
-    = new event::ClassPrepareEvent (thread, klass, status);
-  Jdwp::notify (event);
-}
-
-static void JNICALL
-jdwpExceptionCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env, jthread thread,
-		 jmethodID method, jlocation location, jobject exception,
-		 jmethodID catch_method, jlocation catch_location)
-{
-  using namespace gnu::classpath::jdwp;
-  jclass throw_klass;
-  jvmtiError err = env->GetMethodDeclaringClass (method, &throw_klass);
-  if (err != JVMTI_ERROR_NONE)
-    {
-      fprintf (stderr, "libgcj: internal error: could not find class for ");
-      fprintf (stderr, "method throwing exception -- continuing\n");
-      return;
-    }
-
-  VMMethod *vmmethod = new VMMethod (throw_klass,
-				     reinterpret_cast<jlong> (method));
-  Location *throw_loc = new Location (vmmethod, location);  
-  Location *catch_loc = NULL;
-  if (catch_method == 0)
-    catch_loc = Location::getEmptyLocation ();
-  else
-    {
-      jclass catch_klass;
-      err = env->GetMethodDeclaringClass (catch_method, &catch_klass);
-      if (err != JVMTI_ERROR_NONE)
-	{
-	  fprintf (stderr,
-		   "libgcj: internal error: could not find class for ");
-	  fprintf (stderr,
-		   "method catching exception -- ignoring\n");
-	}
-      else
-	{
-	  vmmethod = new VMMethod (catch_klass,
-				   reinterpret_cast<jlong> (catch_method));
-	  catch_loc = new Location (vmmethod, catch_location);
-	}
-    }
-
-  _Jv_InterpFrame *iframe
-    = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
-  jobject instance = (iframe == NULL) ? NULL : iframe->get_this_ptr ();
-  Throwable *throwable = reinterpret_cast<Throwable *> (exception);
-  event::ExceptionEvent *e = new ExceptionEvent (throwable, thread,
-						 throw_loc, catch_loc,
-						 throw_klass, instance);
-  Jdwp::notify (e);
-}
-
-static void JNICALL
-jdwpSingleStepCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env, jthread thread,
-		  jmethodID method, jlocation location)
-{
-  jobject si =
-    gnu::classpath::jdwp::VMVirtualMachine::_stepping_threads->get (thread);
-  struct step_info *sinfo = reinterpret_cast<struct step_info *> (si);
-
-  if (sinfo == NULL)
-    {
-      // no step filter for this thread - simply report it
-      handle_single_step (env, NULL, thread, method, location);
-    }
-  else
-    {
-      // A step filter exists for this thread
-      using namespace gnu::classpath::jdwp;
-
-      _Jv_InterpFrame *frame
-	= reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
-
-      switch (sinfo->depth)
-	{
-	case JdwpConstants$StepDepth::INTO:
-	  /* This is the easy case. We ignore the method and
-	     simply stop at either the next insn, or the next source
-	     line. */
-	  handle_single_step (env, sinfo, thread, method, location);
-	  break;
-
-	case JdwpConstants$StepDepth::OVER:
-	  /* This is also a pretty easy case. We just make sure that
-	     the methods are the same and that we are at the same
-	     stack depth, but we should also stop on the next
-	     insn/line if the stack depth is LESS THAN it was when
-	     we started stepping. */
-	  if (method == sinfo->method)
-	    {
-	      // Still in the same method -- must be at same stack depth
-	      // to avoid confusion with recursive methods.
-	      if (frame->depth () == sinfo->stack_depth)
-		handle_single_step (env, sinfo, thread, method, location);
-	    }
-	  else if (frame->depth () < sinfo->stack_depth)
-	    {
-	      // The method in which we were stepping was popped off
-	      // the stack. We simply need to stop at the next insn/line.
-	      handle_single_step (env, sinfo, thread, method, location);
-	    }
-	  break;
-
-	case JdwpConstants$StepDepth::OUT:
-	  // All we need to do is check the stack depth
-	  if (sinfo->stack_depth > frame->depth ())
-	    handle_single_step (env, sinfo, thread, method, location);
-	  break;
-
-	default:
-	  /* This should not happen. The JDWP back-end should have
-	     validated the StepFilter. */
-	  fprintf (stderr,
-		   "libgcj: unknown step depth while single stepping\n");
-	  return;
-	}
-    }
-}
-
-static void JNICALL
-jdwpThreadEndCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
-		 jthread thread)
-{
-  using namespace gnu::classpath::jdwp::event;
-
-  ThreadEndEvent *e = new ThreadEndEvent (thread);
-  gnu::classpath::jdwp::Jdwp::notify (e);
-}
-
-static void JNICALL
-jdwpThreadStartCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
-		   jthread thread)
-{
-  using namespace gnu::classpath::jdwp::event;
-
-  ThreadStartEvent *e = new ThreadStartEvent (thread);
-  gnu::classpath::jdwp::Jdwp::notify (e);
-}
-
-static void JNICALL
-jdwpVMDeathCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env)
-{
-  using namespace gnu::classpath::jdwp::event;
-  gnu::classpath::jdwp::Jdwp::notify (new VmDeathEvent ());
-}
-
-static void JNICALL
-jdwpVMInitCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
-	      jthread thread)
-{
-  // The VM is now initialized, add our callbacks
-  jvmtiEventCallbacks callbacks;
-  DEFINE_CALLBACK (callbacks, Breakpoint);
-  DEFINE_CALLBACK (callbacks, ClassPrepare);
-  DEFINE_CALLBACK (callbacks, Exception);
-  DEFINE_CALLBACK (callbacks, SingleStep);
-  DEFINE_CALLBACK (callbacks, ThreadEnd);
-  DEFINE_CALLBACK (callbacks, ThreadStart);
-  DEFINE_CALLBACK (callbacks, VMDeath);
-  _jdwp_jvmtiEnv->SetEventCallbacks (&callbacks, sizeof (callbacks));
-
-  // Enable callbacks
-  ENABLE_EVENT (BREAKPOINT, NULL);
-  ENABLE_EVENT (CLASS_PREPARE, NULL);
-  ENABLE_EVENT (EXCEPTION, NULL);
-  // SingleStep is enabled only when needed
-  ENABLE_EVENT (THREAD_END, NULL);
-  ENABLE_EVENT (THREAD_START, NULL);
-  ENABLE_EVENT (VM_DEATH, NULL);
-
-  // Send JDWP VMInit
-  using namespace gnu::classpath::jdwp::event;
-  gnu::classpath::jdwp::Jdwp::notify (new VmInitEvent (thread));
-}
diff --git a/libjava/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.h
deleted file mode 100644
index 4bf187c..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ArrayReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ArrayReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ArrayReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ArrayReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ArrayReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeLength(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeGetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ArrayReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.h
deleted file mode 100644
index 6d7864a..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ArrayTypeCommandSet__
-#define __gnu_classpath_jdwp_processor_ArrayTypeCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ArrayTypeCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ArrayTypeCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ArrayTypeCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-  virtual void executeNewInstance(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ArrayTypeCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.h
deleted file mode 100644
index 3395a0e..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ClassLoaderReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ClassLoaderReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ClassLoaderReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ClassLoaderReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ClassLoaderReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-  virtual void executeVisibleClasses(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ClassLoaderReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.h
deleted file mode 100644
index 67b4583..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ClassObjectReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ClassObjectReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ClassObjectReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ClassObjectReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ClassObjectReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-  virtual void executeReflectedType(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ClassObjectReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ClassTypeCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ClassTypeCommandSet.h
deleted file mode 100644
index 6967d32..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ClassTypeCommandSet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ClassTypeCommandSet__
-#define __gnu_classpath_jdwp_processor_ClassTypeCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ClassTypeCommandSet;
-        }
-        namespace util
-        {
-            class MethodResult;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ClassTypeCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ClassTypeCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeSuperclass(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeInvokeMethod(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeNewInstance(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  ::gnu::classpath::jdwp::util::MethodResult * invokeMethod(::java::nio::ByteBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ClassTypeCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/CommandSet.h b/libjava/gnu/classpath/jdwp/processor/CommandSet.h
deleted file mode 100644
index 6833202..0000000
--- a/libjava/gnu/classpath/jdwp/processor/CommandSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_CommandSet__
-#define __gnu_classpath_jdwp_processor_CommandSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMIdManager;
-        namespace processor
-        {
-            class CommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::CommandSet : public ::java::lang::Object
-{
-
-public:
-  CommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte) = 0;
-public: // actually protected
-  ::gnu::classpath::jdwp::VMIdManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) idMan;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_CommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/EventRequestCommandSet.h b/libjava/gnu/classpath/jdwp/processor/EventRequestCommandSet.h
deleted file mode 100644
index 8a86b7b..0000000
--- a/libjava/gnu/classpath/jdwp/processor/EventRequestCommandSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_EventRequestCommandSet__
-#define __gnu_classpath_jdwp_processor_EventRequestCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class EventRequestCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::EventRequestCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  EventRequestCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeSet(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClear(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClearAllBreakpoints(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_EventRequestCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/FieldCommandSet.h b/libjava/gnu/classpath/jdwp/processor/FieldCommandSet.h
deleted file mode 100644
index 443cede..0000000
--- a/libjava/gnu/classpath/jdwp/processor/FieldCommandSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_FieldCommandSet__
-#define __gnu_classpath_jdwp_processor_FieldCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class FieldCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::FieldCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  FieldCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_FieldCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.h b/libjava/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.h
deleted file mode 100644
index 2348e79..0000000
--- a/libjava/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_InterfaceTypeCommandSet__
-#define __gnu_classpath_jdwp_processor_InterfaceTypeCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class InterfaceTypeCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::InterfaceTypeCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  InterfaceTypeCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_InterfaceTypeCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/MethodCommandSet.h b/libjava/gnu/classpath/jdwp/processor/MethodCommandSet.h
deleted file mode 100644
index 3dc3a67..0000000
--- a/libjava/gnu/classpath/jdwp/processor/MethodCommandSet.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_MethodCommandSet__
-#define __gnu_classpath_jdwp_processor_MethodCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class MethodCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::MethodCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  MethodCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeLineTable(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeVariableTable(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeByteCodes(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeIsObsolete(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeVariableTableWithGeneric(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_MethodCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.h
deleted file mode 100644
index 74a7aaa..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ObjectReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ObjectReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ObjectReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ObjectReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ObjectReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeReferenceType(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeGetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeMonitorInfo(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeInvokeMethod(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeDisableCollection(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeEnableCollection(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeIsCollected(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ObjectReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/PacketProcessor.h b/libjava/gnu/classpath/jdwp/processor/PacketProcessor.h
deleted file mode 100644
index d2e5057..0000000
--- a/libjava/gnu/classpath/jdwp/processor/PacketProcessor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_PacketProcessor__
-#define __gnu_classpath_jdwp_processor_PacketProcessor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class CommandSet;
-            class PacketProcessor;
-        }
-        namespace transport
-        {
-            class JdwpConnection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::PacketProcessor : public ::java::lang::Object
-{
-
-public:
-  PacketProcessor(::gnu::classpath::jdwp::transport::JdwpConnection *);
-  virtual ::java::lang::Object * run();
-  virtual void shutdown();
-private:
-  void _processOnePacket();
-  ::gnu::classpath::jdwp::transport::JdwpConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _connection;
-  jboolean _shutdown;
-  JArray< ::gnu::classpath::jdwp::processor::CommandSet * > * _sets;
-  ::java::io::ByteArrayOutputStream * _outputBytes;
-  ::java::io::DataOutputStream * _os;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_PacketProcessor__
diff --git a/libjava/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.h
deleted file mode 100644
index 056a5ca..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ReferenceTypeCommandSet__
-#define __gnu_classpath_jdwp_processor_ReferenceTypeCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ReferenceTypeCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ReferenceTypeCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ReferenceTypeCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeSignature(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClassLoader(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeModifiers(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeFields(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeMethods(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeGetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSourceFile(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeNestedTypes(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeStatus(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeInterfaces(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClassObject(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSourceDebugExtension(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSignatureWithGeneric(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeFieldWithGeneric(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeMethodsWithGeneric(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ReferenceTypeCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/StackFrameCommandSet.h b/libjava/gnu/classpath/jdwp/processor/StackFrameCommandSet.h
deleted file mode 100644
index be63456..0000000
--- a/libjava/gnu/classpath/jdwp/processor/StackFrameCommandSet.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_StackFrameCommandSet__
-#define __gnu_classpath_jdwp_processor_StackFrameCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class StackFrameCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::StackFrameCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  StackFrameCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeGetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSetValues(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeThisObject(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executePopFrames(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_StackFrameCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/StringReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/StringReferenceCommandSet.h
deleted file mode 100644
index 4904cbc..0000000
--- a/libjava/gnu/classpath/jdwp/processor/StringReferenceCommandSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_StringReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_StringReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class StringReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::StringReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  StringReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeValue(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_StringReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.h
deleted file mode 100644
index b7040d4..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ThreadGroupReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ThreadGroupReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ThreadGroupReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ThreadGroupReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ThreadGroupReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeName(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeParent(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeChildren(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ThreadGroupReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.h
deleted file mode 100644
index c3248e9..0000000
--- a/libjava/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_ThreadReferenceCommandSet__
-#define __gnu_classpath_jdwp_processor_ThreadReferenceCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class ThreadReferenceCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::ThreadReferenceCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  ThreadReferenceCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeName(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSuspend(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeResume(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeStatus(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeThreadGroup(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeFrames(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeFrameCount(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeOwnedMonitors(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeCurrentContendedMonitor(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeStop(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeInterrupt(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSuspendCount(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_ThreadReferenceCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.h b/libjava/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.h
deleted file mode 100644
index c2eaf87..0000000
--- a/libjava/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_processor_VirtualMachineCommandSet__
-#define __gnu_classpath_jdwp_processor_VirtualMachineCommandSet__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/processor/CommandSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace processor
-        {
-            class VirtualMachineCommandSet;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::processor::VirtualMachineCommandSet : public ::gnu::classpath::jdwp::processor::CommandSet
-{
-
-public:
-  VirtualMachineCommandSet();
-  virtual jboolean runCommand(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *, jbyte);
-private:
-  void executeVersion(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClassesBySignature(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeAllClasses(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeAllThreads(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeTopLevelThreadGroups(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeDispose(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeIDsizes(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSuspend(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeResume(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeExit(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeCreateString(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeCapabilities(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeClassPaths(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeDisposeObjects(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeHoldEvents(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeReleaseEvents(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeCapabilitiesNew(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeRedefineClasses(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeSetDefaultStratum(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  void executeAllClassesWithGeneric(::java::nio::ByteBuffer *, ::java::io::DataOutputStream *);
-  ::java::lang::ThreadGroup * getRootThreadGroup(::java::lang::ThreadGroup *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_processor_VirtualMachineCommandSet__
diff --git a/libjava/gnu/classpath/jdwp/transport/ITransport.h b/libjava/gnu/classpath/jdwp/transport/ITransport.h
deleted file mode 100644
index 572b615..0000000
--- a/libjava/gnu/classpath/jdwp/transport/ITransport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_ITransport__
-#define __gnu_classpath_jdwp_transport_ITransport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class ITransport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::ITransport : public ::java::lang::Object
-{
-
-public:
-  virtual void configure(::java::util::HashMap *) = 0;
-  virtual void initialize() = 0;
-  virtual void shutdown() = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  virtual ::java::io::OutputStream * getOutputStream() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_classpath_jdwp_transport_ITransport__
diff --git a/libjava/gnu/classpath/jdwp/transport/JdwpCommandPacket.h b/libjava/gnu/classpath/jdwp/transport/JdwpCommandPacket.h
deleted file mode 100644
index 6d67ad4..0000000
--- a/libjava/gnu/classpath/jdwp/transport/JdwpCommandPacket.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_JdwpCommandPacket__
-#define __gnu_classpath_jdwp_transport_JdwpCommandPacket__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/transport/JdwpPacket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class JdwpCommandPacket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::JdwpCommandPacket : public ::gnu::classpath::jdwp::transport::JdwpPacket
-{
-
-public:
-  JdwpCommandPacket();
-  JdwpCommandPacket(jbyte, jbyte);
-  virtual jint getLength();
-  virtual jbyte getCommandSet();
-  virtual void setCommandSet(jbyte);
-  virtual jbyte getCommand();
-  virtual void setCommand(jbyte);
-public: // actually protected
-  virtual jint myFromBytes(JArray< jbyte > *, jint);
-  virtual void myWrite(::java::io::DataOutputStream *);
-  jbyte __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::transport::JdwpPacket)))) _commandSet;
-  jbyte _command;
-private:
-  static const jint MINIMUM_LENGTH = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_JdwpCommandPacket__
diff --git a/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h b/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h
deleted file mode 100644
index a8333af..0000000
--- a/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_JdwpConnection__
-#define __gnu_classpath_jdwp_transport_JdwpConnection__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace event
-        {
-            class Event;
-            class EventRequest;
-        }
-        namespace transport
-        {
-            class ITransport;
-            class JdwpConnection;
-            class JdwpPacket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::JdwpConnection : public ::java::lang::Thread
-{
-
-public:
-  JdwpConnection(::java::lang::ThreadGroup *, ::gnu::classpath::jdwp::transport::ITransport *);
-  virtual void initialize();
-private:
-  void _doHandshake();
-public:
-  virtual void run();
-private:
-  void _readOnePacket();
-public:
-  virtual ::gnu::classpath::jdwp::transport::JdwpPacket * getPacket();
-  virtual void sendPacket(::gnu::classpath::jdwp::transport::JdwpPacket *);
-  virtual void sendEvents(JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, JArray< ::gnu::classpath::jdwp::event::Event * > *, jbyte);
-  virtual void shutdown();
-private:
-  static JArray< jbyte > * _HANDSHAKE;
-  ::gnu::classpath::jdwp::transport::ITransport * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) _transport;
-  ::java::util::ArrayList * _commandQueue;
-  jboolean _shutdown;
-  ::java::io::DataInputStream * _inStream;
-  ::java::io::DataOutputStream * _outStream;
-  ::java::io::ByteArrayOutputStream * _bytes;
-  ::java::io::DataOutputStream * _doStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_JdwpConnection__
diff --git a/libjava/gnu/classpath/jdwp/transport/JdwpPacket.h b/libjava/gnu/classpath/jdwp/transport/JdwpPacket.h
deleted file mode 100644
index bace852..0000000
--- a/libjava/gnu/classpath/jdwp/transport/JdwpPacket.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_JdwpPacket__
-#define __gnu_classpath_jdwp_transport_JdwpPacket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class JdwpPacket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::JdwpPacket : public ::java::lang::Object
-{
-
-public:
-  JdwpPacket();
-  JdwpPacket(::gnu::classpath::jdwp::transport::JdwpPacket *);
-  virtual jint getId();
-  virtual void setId(jint);
-  virtual jbyte getFlags();
-  virtual void setFlags(jbyte);
-  virtual JArray< jbyte > * getData();
-  virtual void setData(JArray< jbyte > *);
-  virtual jint getLength();
-public: // actually protected
-  virtual jint myFromBytes(JArray< jbyte > *, jint) = 0;
-public:
-  static ::gnu::classpath::jdwp::transport::JdwpPacket * fromBytes(JArray< jbyte > *);
-public: // actually protected
-  virtual void myWrite(::java::io::DataOutputStream *) = 0;
-public:
-  virtual void write(::java::io::DataOutputStream *);
-public: // actually protected
-  static jint _last_id;
-  static const jint JDWP_FLAG_REPLY = 128;
-  static const jint MINIMUM_SIZE = 9;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _id;
-  jbyte _flags;
-  JArray< jbyte > * _data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_JdwpPacket__
diff --git a/libjava/gnu/classpath/jdwp/transport/JdwpReplyPacket.h b/libjava/gnu/classpath/jdwp/transport/JdwpReplyPacket.h
deleted file mode 100644
index 0235334..0000000
--- a/libjava/gnu/classpath/jdwp/transport/JdwpReplyPacket.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_JdwpReplyPacket__
-#define __gnu_classpath_jdwp_transport_JdwpReplyPacket__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/transport/JdwpPacket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class JdwpPacket;
-            class JdwpReplyPacket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::JdwpReplyPacket : public ::gnu::classpath::jdwp::transport::JdwpPacket
-{
-
-public:
-  JdwpReplyPacket();
-  JdwpReplyPacket(::gnu::classpath::jdwp::transport::JdwpPacket *, jshort);
-  JdwpReplyPacket(::gnu::classpath::jdwp::transport::JdwpPacket *);
-  virtual jint getLength();
-  virtual jshort getErrorCode();
-  virtual void setErrorCode(jshort);
-public: // actually protected
-  virtual jint myFromBytes(JArray< jbyte > *, jint);
-  virtual void myWrite(::java::io::DataOutputStream *);
-  jshort __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::transport::JdwpPacket)))) _errorCode;
-private:
-  static const jint MINIMUM_LENGTH = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_JdwpReplyPacket__
diff --git a/libjava/gnu/classpath/jdwp/transport/SocketTransport.h b/libjava/gnu/classpath/jdwp/transport/SocketTransport.h
deleted file mode 100644
index b5fe5c3..0000000
--- a/libjava/gnu/classpath/jdwp/transport/SocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_SocketTransport__
-#define __gnu_classpath_jdwp_transport_SocketTransport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class SocketTransport;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::SocketTransport : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SocketTransport();
-public:
-  virtual void configure(::java::util::HashMap *);
-  virtual void initialize();
-  virtual void shutdown();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  static ::java::lang::String * NAME;
-private:
-  static ::java::lang::String * _PROPERTY_ADDRESS;
-  static ::java::lang::String * _PROPERTY_SERVER;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _port;
-  ::java::lang::String * _host;
-  jboolean _server;
-  ::java::net::Socket * _socket;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_SocketTransport__
diff --git a/libjava/gnu/classpath/jdwp/transport/TransportException.h b/libjava/gnu/classpath/jdwp/transport/TransportException.h
deleted file mode 100644
index 18c405c..0000000
--- a/libjava/gnu/classpath/jdwp/transport/TransportException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_TransportException__
-#define __gnu_classpath_jdwp_transport_TransportException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class TransportException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::TransportException : public ::java::lang::Exception
-{
-
-public:
-  TransportException(::java::lang::String *);
-  TransportException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_TransportException__
diff --git a/libjava/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.h b/libjava/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.h
deleted file mode 100644
index 4900baa..0000000
--- a/libjava/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_TransportFactory$TransportMethod__
-#define __gnu_classpath_jdwp_transport_TransportFactory$TransportMethod__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class TransportFactory$TransportMethod;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::TransportFactory$TransportMethod : public ::java::lang::Object
-{
-
-public:
-  TransportFactory$TransportMethod(::java::lang::String *, ::java::lang::Class *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::Class * clazz;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_TransportFactory$TransportMethod__
diff --git a/libjava/gnu/classpath/jdwp/transport/TransportFactory.h b/libjava/gnu/classpath/jdwp/transport/TransportFactory.h
deleted file mode 100644
index e3e0198..0000000
--- a/libjava/gnu/classpath/jdwp/transport/TransportFactory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_transport_TransportFactory__
-#define __gnu_classpath_jdwp_transport_TransportFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace transport
-        {
-            class ITransport;
-            class TransportFactory;
-            class TransportFactory$TransportMethod;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::transport::TransportFactory : public ::java::lang::Object
-{
-
-public:
-  TransportFactory();
-  static ::gnu::classpath::jdwp::transport::ITransport * newInstance(::java::util::HashMap *);
-private:
-  static ::java::lang::String * _TRANSPORT_PROPERTY;
-  static JArray< ::gnu::classpath::jdwp::transport::TransportFactory$TransportMethod * > * _transportMethods;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_transport_TransportFactory__
diff --git a/libjava/gnu/classpath/jdwp/util/JdwpString.h b/libjava/gnu/classpath/jdwp/util/JdwpString.h
deleted file mode 100644
index 0845ca8..0000000
--- a/libjava/gnu/classpath/jdwp/util/JdwpString.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_JdwpString__
-#define __gnu_classpath_jdwp_util_JdwpString__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class JdwpString;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::JdwpString : public ::java::lang::Object
-{
-
-public:
-  JdwpString();
-  static void writeString(::java::io::DataOutputStream *, ::java::lang::String *);
-  static ::java::lang::String * readString(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_JdwpString__
diff --git a/libjava/gnu/classpath/jdwp/util/LineTable.h b/libjava/gnu/classpath/jdwp/util/LineTable.h
deleted file mode 100644
index 6ca678c..0000000
--- a/libjava/gnu/classpath/jdwp/util/LineTable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_LineTable__
-#define __gnu_classpath_jdwp_util_LineTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class LineTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::LineTable : public ::java::lang::Object
-{
-
-public:
-  LineTable(jlong, jlong, JArray< jint > *, JArray< jlong > *);
-  virtual void write(::java::io::DataOutputStream *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) start;
-  jlong end;
-  JArray< jint > * lineNum;
-  JArray< jlong > * lineCI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_LineTable__
diff --git a/libjava/gnu/classpath/jdwp/util/Location.h b/libjava/gnu/classpath/jdwp/util/Location.h
deleted file mode 100644
index 2e87105..0000000
--- a/libjava/gnu/classpath/jdwp/util/Location.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_Location__
-#define __gnu_classpath_jdwp_util_Location__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-          class VMMethod;
-        namespace util
-        {
-            class Location;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::Location : public ::java::lang::Object
-{
-
-public:
-  Location(::gnu::classpath::jdwp::VMMethod *, jlong);
-  Location(::java::nio::ByteBuffer *);
-  virtual void write(::java::io::DataOutputStream *);
-  static ::gnu::classpath::jdwp::util::Location * getEmptyLocation();
-  virtual ::gnu::classpath::jdwp::VMMethod * getMethod();
-  virtual jlong getIndex();
-  virtual ::java::lang::String * toString();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::gnu::classpath::jdwp::VMMethod * __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
-  jlong index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_Location__
diff --git a/libjava/gnu/classpath/jdwp/util/MethodResult.h b/libjava/gnu/classpath/jdwp/util/MethodResult.h
deleted file mode 100644
index 11e26d3..0000000
--- a/libjava/gnu/classpath/jdwp/util/MethodResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_MethodResult__
-#define __gnu_classpath_jdwp_util_MethodResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class MethodResult;
-        }
-        namespace value
-        {
-            class Value;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::MethodResult : public ::java::lang::Object
-{
-
-public:
-  MethodResult(::gnu::classpath::jdwp::value::Value *, ::java::lang::Throwable *);
-  virtual ::gnu::classpath::jdwp::value::Value * getReturnedValue();
-  virtual ::java::lang::Throwable * getThrownException();
-private:
-  ::gnu::classpath::jdwp::value::Value * __attribute__((aligned(__alignof__( ::java::lang::Object)))) returnedValue;
-  ::java::lang::Throwable * thrownException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_MethodResult__
diff --git a/libjava/gnu/classpath/jdwp/util/MonitorInfo.h b/libjava/gnu/classpath/jdwp/util/MonitorInfo.h
deleted file mode 100644
index 8b7d65f..0000000
--- a/libjava/gnu/classpath/jdwp/util/MonitorInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_MonitorInfo__
-#define __gnu_classpath_jdwp_util_MonitorInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class MonitorInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::MonitorInfo : public ::java::lang::Object
-{
-
-public:
-  MonitorInfo();
-  virtual void write(::java::io::DataOutputStream *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) entryCount;
-  ::java::lang::Thread * owner;
-  JArray< ::java::lang::Thread * > * waiters;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_MonitorInfo__
diff --git a/libjava/gnu/classpath/jdwp/util/NullObject.h b/libjava/gnu/classpath/jdwp/util/NullObject.h
deleted file mode 100644
index c071e0a..0000000
--- a/libjava/gnu/classpath/jdwp/util/NullObject.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_NullObject__
-#define __gnu_classpath_jdwp_util_NullObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class NullObject;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::NullObject : public ::java::lang::Object
-{
-
-public:
-  NullObject();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_NullObject__
diff --git a/libjava/gnu/classpath/jdwp/util/Signature.h b/libjava/gnu/classpath/jdwp/util/Signature.h
deleted file mode 100644
index 310b1b8..0000000
--- a/libjava/gnu/classpath/jdwp/util/Signature.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_Signature__
-#define __gnu_classpath_jdwp_util_Signature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class Signature;
-        }
-      }
-    }
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::Signature : public ::java::lang::Object
-{
-
-public:
-  Signature();
-  static ::java::lang::String * computeClassSignature(::java::lang::Class *);
-  static ::java::lang::String * computeFieldSignature(::java::lang::reflect::Field *);
-  static ::java::lang::String * computeMethodSignature(::java::lang::reflect::Method *);
-private:
-  static ::java::lang::String * _computeSignature(::java::lang::Class *, JArray< ::java::lang::Class * > *);
-  static void _addToSignature(::gnu::java::lang::CPStringBuilder *, ::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_Signature__
diff --git a/libjava/gnu/classpath/jdwp/util/VariableTable.h b/libjava/gnu/classpath/jdwp/util/VariableTable.h
deleted file mode 100644
index 893348e..0000000
--- a/libjava/gnu/classpath/jdwp/util/VariableTable.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_VariableTable__
-#define __gnu_classpath_jdwp_util_VariableTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class VariableTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::VariableTable : public ::java::lang::Object
-{
-
-public:
-  VariableTable(jint, jint, JArray< jlong > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< jint > *, JArray< jint > *);
-  virtual void write(::java::io::DataOutputStream *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
-  jint slots;
-  JArray< jlong > * lineCI;
-  JArray< jint > * slot;
-  JArray< jint > * lengths;
-  JArray< ::java::lang::String * > * sigs;
-  JArray< ::java::lang::String * > * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_VariableTable__
diff --git a/libjava/gnu/classpath/jdwp/value/ArrayValue.h b/libjava/gnu/classpath/jdwp/value/ArrayValue.h
deleted file mode 100644
index 3c6e693..0000000
--- a/libjava/gnu/classpath/jdwp/value/ArrayValue.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_ArrayValue__
-#define __gnu_classpath_jdwp_value_ArrayValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class ArrayValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::ArrayValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  ArrayValue(::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::Object * getObject();
-  virtual void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_ArrayValue__
diff --git a/libjava/gnu/classpath/jdwp/value/BooleanValue.h b/libjava/gnu/classpath/jdwp/value/BooleanValue.h
deleted file mode 100644
index 57fa16c..0000000
--- a/libjava/gnu/classpath/jdwp/value/BooleanValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_BooleanValue__
-#define __gnu_classpath_jdwp_value_BooleanValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class BooleanValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::BooleanValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  BooleanValue(jboolean);
-  jboolean getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_BooleanValue__
diff --git a/libjava/gnu/classpath/jdwp/value/ByteValue.h b/libjava/gnu/classpath/jdwp/value/ByteValue.h
deleted file mode 100644
index 6fa45ac..0000000
--- a/libjava/gnu/classpath/jdwp/value/ByteValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_ByteValue__
-#define __gnu_classpath_jdwp_value_ByteValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class ByteValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::ByteValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  ByteValue(jbyte);
-  jbyte getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jbyte __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_ByteValue__
diff --git a/libjava/gnu/classpath/jdwp/value/CharValue.h b/libjava/gnu/classpath/jdwp/value/CharValue.h
deleted file mode 100644
index 2f87f77..0000000
--- a/libjava/gnu/classpath/jdwp/value/CharValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_CharValue__
-#define __gnu_classpath_jdwp_value_CharValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class CharValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::CharValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  CharValue(jchar);
-  jchar getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jchar __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_CharValue__
diff --git a/libjava/gnu/classpath/jdwp/value/DoubleValue.h b/libjava/gnu/classpath/jdwp/value/DoubleValue.h
deleted file mode 100644
index c68e683..0000000
--- a/libjava/gnu/classpath/jdwp/value/DoubleValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_DoubleValue__
-#define __gnu_classpath_jdwp_value_DoubleValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class DoubleValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::DoubleValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  DoubleValue(jdouble);
-  jdouble getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jdouble __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_DoubleValue__
diff --git a/libjava/gnu/classpath/jdwp/value/FloatValue.h b/libjava/gnu/classpath/jdwp/value/FloatValue.h
deleted file mode 100644
index d8917b9..0000000
--- a/libjava/gnu/classpath/jdwp/value/FloatValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_FloatValue__
-#define __gnu_classpath_jdwp_value_FloatValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class FloatValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::FloatValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  FloatValue(jfloat);
-  jfloat getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jfloat __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_FloatValue__
diff --git a/libjava/gnu/classpath/jdwp/value/IntValue.h b/libjava/gnu/classpath/jdwp/value/IntValue.h
deleted file mode 100644
index 0d09aff..0000000
--- a/libjava/gnu/classpath/jdwp/value/IntValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_IntValue__
-#define __gnu_classpath_jdwp_value_IntValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class IntValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::IntValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  IntValue(jint);
-  jint getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_IntValue__
diff --git a/libjava/gnu/classpath/jdwp/value/LongValue.h b/libjava/gnu/classpath/jdwp/value/LongValue.h
deleted file mode 100644
index 8416558..0000000
--- a/libjava/gnu/classpath/jdwp/value/LongValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_LongValue__
-#define __gnu_classpath_jdwp_value_LongValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class LongValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::LongValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  LongValue(jlong);
-  jlong getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_LongValue__
diff --git a/libjava/gnu/classpath/jdwp/value/ObjectValue.h b/libjava/gnu/classpath/jdwp/value/ObjectValue.h
deleted file mode 100644
index 46bef25..0000000
--- a/libjava/gnu/classpath/jdwp/value/ObjectValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_ObjectValue__
-#define __gnu_classpath_jdwp_value_ObjectValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class ObjectValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::ObjectValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  ObjectValue(::java::lang::Object *);
-  ::java::lang::Object * getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_ObjectValue__
diff --git a/libjava/gnu/classpath/jdwp/value/ShortValue.h b/libjava/gnu/classpath/jdwp/value/ShortValue.h
deleted file mode 100644
index 124d781..0000000
--- a/libjava/gnu/classpath/jdwp/value/ShortValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_ShortValue__
-#define __gnu_classpath_jdwp_value_ShortValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class ShortValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::ShortValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  ShortValue(jshort);
-  jshort getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_ShortValue__
diff --git a/libjava/gnu/classpath/jdwp/value/StringValue.h b/libjava/gnu/classpath/jdwp/value/StringValue.h
deleted file mode 100644
index dc8e52f..0000000
--- a/libjava/gnu/classpath/jdwp/value/StringValue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_StringValue__
-#define __gnu_classpath_jdwp_value_StringValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class StringValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::StringValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  StringValue(::java::lang::String *);
-  ::java::lang::String * getValue();
-public: // actually protected
-  ::java::lang::Object * getObject();
-  void write(::java::io::DataOutputStream *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_StringValue__
diff --git a/libjava/gnu/classpath/jdwp/value/Value.h b/libjava/gnu/classpath/jdwp/value/Value.h
deleted file mode 100644
index 8ab3d54..0000000
--- a/libjava/gnu/classpath/jdwp/value/Value.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_Value__
-#define __gnu_classpath_jdwp_value_Value__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class Value;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::Value : public ::java::lang::Object
-{
-
-public: // actually protected
-  Value(jbyte);
-public:
-  virtual jbyte getTag();
-  virtual void writeUntagged(::java::io::DataOutputStream *);
-  virtual void writeTagged(::java::io::DataOutputStream *);
-public: // actually protected
-  virtual void write(::java::io::DataOutputStream *) = 0;
-  virtual ::java::lang::Object * getObject() = 0;
-public:
-  static ::java::lang::Object * getUntaggedObject(::java::nio::ByteBuffer *, ::java::lang::Class *);
-  static ::java::lang::Object * getTaggedObject(::java::nio::ByteBuffer *);
-private:
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) _tag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_Value__
diff --git a/libjava/gnu/classpath/jdwp/value/ValueFactory.h b/libjava/gnu/classpath/jdwp/value/ValueFactory.h
deleted file mode 100644
index 316d5d0..0000000
--- a/libjava/gnu/classpath/jdwp/value/ValueFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_ValueFactory__
-#define __gnu_classpath_jdwp_value_ValueFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class Value;
-            class ValueFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::ValueFactory : public ::java::lang::Object
-{
-
-public:
-  ValueFactory();
-  static ::gnu::classpath::jdwp::value::Value * createFromTagged(::java::nio::ByteBuffer *);
-  static ::gnu::classpath::jdwp::value::Value * createFromUntagged(::java::nio::ByteBuffer *, ::java::lang::Class *);
-private:
-  static ::gnu::classpath::jdwp::value::Value * create(::java::nio::ByteBuffer *, jbyte);
-  static jbyte getTagForClass(::java::lang::Class *);
-public:
-  static ::gnu::classpath::jdwp::value::Value * createFromObject(::java::lang::Object *, ::java::lang::Class *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_ValueFactory__
diff --git a/libjava/gnu/classpath/jdwp/value/VoidValue.h b/libjava/gnu/classpath/jdwp/value/VoidValue.h
deleted file mode 100644
index 48a7277..0000000
--- a/libjava/gnu/classpath/jdwp/value/VoidValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_value_VoidValue__
-#define __gnu_classpath_jdwp_value_VoidValue__
-
-#pragma interface
-
-#include <gnu/classpath/jdwp/value/Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace value
-        {
-            class VoidValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::value::VoidValue : public ::gnu::classpath::jdwp::value::Value
-{
-
-public:
-  VoidValue();
-public: // actually protected
-  virtual ::java::lang::Object * getObject();
-  virtual void write(::java::io::DataOutputStream *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_value_VoidValue__
diff --git a/libjava/gnu/classpath/natConfiguration.cc b/libjava/gnu/classpath/natConfiguration.cc
deleted file mode 100644
index b7b8161..0000000
--- a/libjava/gnu/classpath/natConfiguration.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// natConfiguration.cc - native code for configuration.
-
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#include <gnu/classpath/Configuration.h>
-
-jstring
-gnu::classpath::Configuration::classpath_home()
-{
-  return JvNewStringLatin1(LIBGCJ_PREFIX);
-}
-
-jboolean
-gnu::classpath::Configuration::debug()
-{
-#ifdef __GCJ_DEBUG
-  return true;
-#else
-  return false;
-#endif
-}
-
-jstring
-gnu::classpath::Configuration::toolkit()
-{
-  return JvNewStringLatin1(AWT_TOOLKIT);
-}
-
-jstring
-gnu::classpath::Configuration::ecj()
-{
-  return JvNewStringLatin1(ECJ_JAR_FILE);
-}
diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc
deleted file mode 100644
index e259304..0000000
--- a/libjava/gnu/classpath/natSystemProperties.cc
+++ /dev/null
@@ -1,425 +0,0 @@
-// natSystemProperties.cc - Implementation of native side of
-// SystemProperties class.
-
-/* Copyright (C) 2005, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <stdlib.h>
-#include <errno.h>
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#ifdef HAVE_UNAME
-#include <sys/utsname.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <java-props.h>
-#include <gnu/classpath/SystemProperties.h>
-#include <java/lang/String.h>
-#include <jni.h>
-
-char *_Jv_Module_Load_Path = NULL;
-
-#ifdef USE_LTDL
-#include <ltdl.h>
-
-void
-_Jv_SetDLLSearchPath (const char *path)
-{
-  _Jv_Module_Load_Path = strdup (path);
-}
-
-#else
-
-void
-_Jv_SetDLLSearchPath (const char *)
-{
-  // Nothing.
-}
-
-#endif /* USE_LTDL */
-
-#if ! defined (DEFAULT_FILE_ENCODING) && defined (HAVE_ICONV) \
-    && defined (HAVE_NL_LANGINFO)
-
-static const char *
-file_encoding ()
-{
-  setlocale (LC_CTYPE, "");
-  const char *e = nl_langinfo (CODESET);
-  if (e == NULL || *e == '\0')
-    e = "8859_1";
-  return e;
-}
-
-#define DEFAULT_FILE_ENCODING file_encoding ()
-
-#endif
-
-#ifndef DEFAULT_FILE_ENCODING
-#define DEFAULT_FILE_ENCODING "8859_1"
-#endif
-
-static const char *default_file_encoding = DEFAULT_FILE_ENCODING;
-
-#if defined(HAVE_GETPWUID_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-/* Use overload resolution to find out the signature of getpwuid_r.  */
-
-  /* This is Posix getpwuid_r.  */
-template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
-static inline int
-getpwuid_adaptor(int (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
-				   T_buf *buf_r, T_len len_r,
-				   T_passwd **pwd_entry_ptr),
-		 uid_t user_id, struct passwd *pwd_r,
-		 char *buf_r, size_t len_r, struct passwd **pwd_entry)
-{
-  return getpwuid_r (user_id, pwd_r, buf_r, len_r, pwd_entry);
-}
-
-/* This is used on HPUX 10.20 */
-template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
-static inline int
-getpwuid_adaptor(int (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
-				   T_buf *buf_r, T_len len_r),
-		 uid_t user_id, struct passwd *pwd_r,
-		 char *buf_r, size_t len_r, struct passwd **pwd_entry)
-{
-  return getpwuid_r (user_id, pwd_r, buf_r, len_r);
-}
-
-/* This is used on IRIX 5.2.  */
-template <typename T_uid, typename T_passwd, typename T_buf, typename T_len>
-static inline int
-getpwuid_adaptor(T_passwd * (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
-					  T_buf *buf_r, T_len len_r),
-		 uid_t user_id, struct passwd *pwd_r,
-		 char *buf_r, size_t len_r, struct passwd **pwd_entry)
-{
-  *pwd_entry = getpwuid_r (user_id, pwd_r, buf_r, len_r);
-  return (*pwd_entry == NULL) ? errno : 0;
-}
-#endif
-
-// Prepend GCJ_VERSIONED_LIBDIR to a module search path stored in a
-// Java string, if the path is not already prefixed by
-// GCJ_VERSIONED_LIBDIR.  Return a newly JvMalloc'd char buffer.  The
-// result should be freed using JvFree.  See
-// _Jv_PrependVersionedLibdir in prims.cc.
-static char*
-PrependVersionedLibdir (::java::lang::String* libpath)
-{
-  char* retval = 0;
-
-  // Extract a C char array from libpath.
-  char* val = (char*) _Jv_Malloc (JvGetStringUTFLength (libpath) + 1);
-  jsize total = JvGetStringUTFRegion (libpath, 0, libpath->length(), val);
-  val[total] = '\0';
-  retval = _Jv_PrependVersionedLibdir (val);
-  JvFree (val);
-
-  return retval;
-}
-
-void
-gnu::classpath::SystemProperties::insertSystemProperties (::java::util::Properties *newprops)
-{
-  // A convenience define.
-#define SET(Prop,Val) \
-	newprops->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val))
-
-  // A mixture of the Java Product Versioning Specification
-  // (introduced in 1.2), and earlier versioning properties.  Some
-  // programs rely on seeing values that they expect, so we claim to
-  // be a 1.4-ish VM for their sake.
-  SET ("java.version", JV_VERSION);
-  SET ("java.runtime.version", JV_VERSION);
-  SET ("java.vendor", "Free Software Foundation, Inc.");
-  SET ("java.vendor.url", "http://gcc.gnu.org/java/");
-  SET ("java.class.version", "49.0");
-  SET ("java.vm.specification.version", "1.0");
-  SET ("java.vm.specification.name", "Java(tm) Virtual Machine Specification");
-  SET ("java.vm.specification.vendor", "Sun Microsystems Inc.");
-  SET ("java.vm.version", __VERSION__);
-  SET ("java.vm.vendor", "Free Software Foundation, Inc.");
-  SET ("java.vm.name", "GNU libgcj");
-  SET ("java.specification.version", JV_API_VERSION);
-  SET ("java.specification.name", "Java(tm) Platform API Specification");
-  SET ("java.specification.vendor", "Sun Microsystems Inc.");
-
-  char value[100];
-#define NAME "GNU libgcj "
-  strcpy (value, NAME);
-  strncpy (value + sizeof (NAME) - 1, __VERSION__,
-	   sizeof(value) - sizeof(NAME));
-  value[sizeof (value) - 1] = '\0';
-  jstring version = JvNewStringLatin1 (value);
-  newprops->put (JvNewStringLatin1 ("java.fullversion"), version);
-  newprops->put (JvNewStringLatin1 ("java.vm.info"), version);
-
-  // This definition is rather arbitrary: we choose $(prefix).  In
-  // part we do this because most people specify only --prefix and
-  // nothing else when installing gcj.  Plus, people are free to
-  // redefine `java.home' with `-D' if necessary.
-  SET ("java.home", JAVA_HOME);
-  SET ("gnu.classpath.home", PREFIX);
-  // This is set to $(toolexeclibdir) because we use this to find
-  // .security files at runtime.
-  char val2[sizeof ("file://") + sizeof (TOOLEXECLIBDIR) + 1];
-  strcpy (val2, "file://");
-  strcat (val2, TOOLEXECLIBDIR);
-  SET ("gnu.classpath.home.url", val2);
-
-  SET ("file.encoding", default_file_encoding);
-
-#ifdef HAVE_UNAME
-  struct utsname u;
-  if (! uname (&u))
-    {
-      SET ("os.name", u.sysname);
-      SET ("os.version", u.release);
-
-      // Normalize x86 architecture names to "i386" (except on Windows, which 
-      // is handled in win32.cc).
-      if (u.machine[0] == 'i'
-	  && u.machine[1] != 0
-	  && u.machine[2] == '8'
-	  && u.machine[3] == '6'
-	  && u.machine[4] == 0)
-	SET ("os.arch", "i386");
-      else
-	SET ("os.arch", u.machine);
-    }
-  else
-    {
-      SET ("os.name", "unknown");
-      SET ("os.arch", "unknown");
-      SET ("os.version", "unknown");
-    }
-#endif /* HAVE_UNAME */
-
-#ifndef NO_GETUID
-#ifdef HAVE_PWD_H
-  uid_t user_id = getuid ();
-  struct passwd *pwd_entry;
-
-#if defined(HAVE_GETPWUID_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-  struct passwd pwd_r;
-  size_t len_r = 200;
-  char *buf_r = (char *) _Jv_AllocBytes (len_r);
-
-  while (buf_r != NULL)
-    {
-      int r = getpwuid_adaptor (getpwuid_r, user_id, &pwd_r,
-				buf_r, len_r, &pwd_entry);
-      if (r == 0)
-	break;
-      else if (r != ERANGE)
-	{
-	  pwd_entry = NULL;
-	  break;
-	}
-      len_r *= 2;
-      buf_r = (char *) _Jv_AllocBytes (len_r);
-    }
-#else
-  pwd_entry = getpwuid (user_id);
-#endif /* HAVE_GETPWUID_R */
-
-  if (pwd_entry != NULL)
-    {
-      SET ("user.name", pwd_entry->pw_name);
-      SET ("user.home", pwd_entry->pw_dir);
-      SET ("gnu.gcj.user.realname", pwd_entry->pw_gecos);
-    }
-#endif /* HAVE_PWD_H */
-#endif /* NO_GETUID */
-
-#ifdef HAVE_GETCWD
-#ifdef HAVE_UNISTD_H
-  /* Use getcwd to set "user.dir". */
-  int buflen = 250;
-  char *buffer = (char *) malloc (buflen);
-  while (buffer != NULL)
-    {
-      if (getcwd (buffer, buflen) != NULL)
-	{
-	  SET ("user.dir", buffer);
-	  break;
-	}
-      if (errno != ERANGE)
-	break;
-      buflen = 2 * buflen;
-      char *orig_buf = buffer;
-      buffer = (char *) realloc (buffer, buflen);
-      if (buffer == NULL)
-	free (orig_buf);
-    }
-  if (buffer != NULL)
-    free (buffer);
-#endif /* HAVE_UNISTD_H */
-#endif /* HAVE_GETCWD */
-
-  // Set user locale properties based on setlocale()
-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-  // We let the user choose the locale.  However, since Java differs
-  // from POSIX, we arbitrarily pick LC_MESSAGES as determining the
-  // Java locale.  We can't use LC_ALL because it might return a full
-  // list of all the settings.  If we don't have LC_MESSAGES then we
-  // just default to `en_US'.
-  setlocale (LC_ALL, "");
-  char *locale = setlocale (LC_MESSAGES, "");
-  if (locale && strlen (locale) >= 2)
-    {
-      char buf[3];
-      buf[2] = '\0';
-      // copy the first two chars to user.language
-      strncpy (buf, locale, 2);
-      SET ("user.language", buf);
-      // if the next char is a '_', copy the two after that to user.region
-      locale += 2;
-      if (locale[0] == '_')
-        {
-	  locale++;
-	  strncpy (buf, locale, 2);
-	  SET ("user.region", buf);
-        }
-    }
-  else
-#endif /* HAVE_SETLOCALE and HAVE_LC_MESSAGES */
-    {
-      SET ("user.language", "en");
-      SET ("user.region", "US");
-    }  
-
-  // Set the java extension directories property if it has not yet been
-  // specified.
-  ::java::lang::String *extdirs = newprops->getProperty(JvNewStringLatin1("java.ext.dirs"));
-  if (! extdirs)
-    SET ("java.ext.dirs", JAVA_EXT_DIRS);
-
-  // The endorsed directories that libgcj knows about by default.
-  // This is a way to get other jars into the boot class loader
-  // without overriding java.endorsed.dirs.
-  SET ("gnu.gcj.runtime.endorsed.dirs", GCJ_ENDORSED_DIRS);
-
-  // The path to libgcj's boot classes
-  SET ("sun.boot.class.path", BOOT_CLASS_PATH);
-
-  // If there is a default system database, set it.
-  SET ("gnu.gcj.precompiled.db.path", LIBGCJ_DEFAULT_DATABASE);
-
-  // Set some properties according to whatever was compiled in with
-  // `-D'.  Important: after this point, the only properties that
-  // should be set are those which either the user cannot meaningfully
-  // override, or which augment whatever value the user has provided.
-  for (int i = 0; i < _Jv_Properties_Count; ++i)
-    {
-      const char *s, *p;
-      // Find the `='.
-      for (s = p = _Jv_Compiler_Properties[i]; *s && *s != '='; ++s)
-	;
-      jstring name = JvNewStringLatin1 (p, s - p);
-      jstring val = JvNewStringLatin1 (*s == '=' ? s + 1 : s);
-      newprops->put (name, val);
-    }
-
-  // Set the system properties from the user's environment.
-#ifndef DISABLE_GETENV_PROPERTIES
-  if (_Jv_Environment_Properties)
-    {
-      size_t i = 0;
-
-      while (_Jv_Environment_Properties[i].key)
-	{
-	  SET (_Jv_Environment_Properties[i].key, 
-	       _Jv_Environment_Properties[i].value);
-	  i++;
-	}
-    }
-#endif
-
-  // The name used to invoke this process (argv[0] in C).
-  SET ("gnu.gcj.progname", _Jv_GetSafeArg (0));
-
-  // Allow platform specific settings and overrides.
-  _Jv_platform_initProperties (newprops);
-
-  // If java.library.path is set, tell libltdl so we search the new
-  // directories as well.
-  ::java::lang::String *path = newprops->getProperty(JvNewStringLatin1("java.library.path"));
-  if (path)
-    {
-      // Prepend GCJ_VERSIONED_LIBDIR to the module load path so that
-      // libgcj will find its own JNI libraries, like libgtkpeer.so.
-      char* val = PrependVersionedLibdir (path);
-      _Jv_SetDLLSearchPath (val);
-      _Jv_Free (val);
-    }
-  else
-    {
-      // Set a value for user code to see.
-#ifdef USE_LTDL
-      char *libpath = getenv (LTDL_SHLIBPATH_VAR);
-      char* val = _Jv_PrependVersionedLibdir (libpath);
-      SET ("java.library.path", val);
-      _Jv_SetDLLSearchPath (val);
-      _Jv_Free (val);
-#else
-      SET ("java.library.path", "");
-#endif
-    }
-
-  // If java.class.path is still not set then set it according to the
-  // CLASSPATH environment variable if given.  See gij.cc main () and
-  // prims.cc _Jv_CreateJavaVM () for all the ways this could have
-  // been set much earlier.
-  // If CLASSPATH isn't set or if the path is empty fall back to "."
-  path = newprops->getProperty(JvNewStringLatin1("java.class.path"));
-  if (!path)
-    {
-      char *classpath = getenv("CLASSPATH");
-      if (classpath && classpath[0] != 0)
-	{
-	  path = JvNewStringLatin1 (classpath);
-	  newprops->put(JvNewStringLatin1 ("java.class.path"), path);
-	}
-    }
-
-  if (!path || path->length() == 0)
-    SET ("java.class.path", ".");
-}
-
-jboolean
-gnu::classpath::SystemProperties::isWordsBigEndian (void)
-{
-  union
-  {
-    long lval;
-    char cval;
-  } u;
-
-  u.lval = 1;
-  return u.cval == 0;
-}
-
diff --git a/libjava/gnu/classpath/natVMStackWalker.cc b/libjava/gnu/classpath/natVMStackWalker.cc
deleted file mode 100644
index 2f068ca..0000000
--- a/libjava/gnu/classpath/natVMStackWalker.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// natVMStackWalker.cc
-
-/* Copyright (C) 2006, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <java-stack.h>
-#include <gnu/classpath/VMStackWalker.h>
-#include <gnu/gcj/RawData.h>
-#include <java/lang/ClassLoader.h>
-#include <java/lang/Class.h>
-
-#ifndef __ARM_EABI_UNWINDER__
-// Return the class of the method that contains PC.
-// This is a macro not a function, since defining it as one would
-// introduce an extra frame on the stack.  */
-#define GET_CALLING_CLASS(PC)						\
-({									\
-  void *f = _Unwind_FindEnclosingFunction (PC);				\
-									\
-  /* FIXME: it might well be a good idea to cache pc values here in	\
-     order to avoid repeated invocations of				\
-     _Unwind_FindEnclosingFunction, which is quite expensive.  On the	\
-     other hand, which not simply write a caching version of		\
-     _Unwind_FindEnclosingFunction itself?  That would probably be	\
-     worthwhile.  */							\
-									\
-  _Jv_StackTrace::UpdateNCodeMap ();					\
-  jclass klass = (jclass) _Jv_StackTrace::ncodeMap->get ((jobject) f);	\
-									\
-  /* If the caller is a compiled frame and the caller of the caller is	\
-     an interpreted frame then klass will be null and we need to	\
-     unwind the stack.  */						\
-  if (!klass)								\
-    klass = _Jv_StackTrace::GetStackWalkerCallingClass ();		\
-									\
-  klass;								\
- })
-#else // __ARM_EABI_UNWINDER__
-// ARM EABI doesn't support _Unwind_FindEnclosingFunction.
-#define GET_CALLING_CLASS(PC)				\
-  (_Jv_StackTrace::GetStackWalkerCallingClass ())
-#endif
-
-JArray<jclass> *
-gnu::classpath::VMStackWalker::getClassContext(void)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  JArray<jclass> *result = _Jv_StackTrace::GetStackWalkerStack ();
-  // Prevent GetStackWalkerStack() from being sibcalled.
-  __asm__ __volatile__ ("" : : "g" (result));
-  return result;
-}
-
-jclass
-gnu::classpath::VMStackWalker::getCallingClass(void)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  jclass result = _Jv_StackTrace::GetStackWalkerCallingClass ();
-  __asm__ __volatile__ ("" : : "g" (result));
-  return result;
-}
-
-jclass
-gnu::classpath::VMStackWalker::getCallingClass(::gnu::gcj::RawData *pc)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  jclass result = GET_CALLING_CLASS(pc);
-  __asm__ __volatile__ ("" : : "g" (result));
-  return result;
-}
-
-::java::lang::ClassLoader *
-gnu::classpath::VMStackWalker::getClassLoader(::java::lang::Class *c)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  return c->getClassLoaderInternal ();
-}
-
-::java::lang::ClassLoader *
-gnu::classpath::VMStackWalker::getCallingClassLoader(void)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  jclass klass = _Jv_StackTrace::GetStackWalkerCallingClass ();
-  if (klass)
-    return klass->getClassLoaderInternal ();
-  else
-    return NULL;
-}
-
-::java::lang::ClassLoader *
-gnu::classpath::VMStackWalker::getCallingClassLoader(::gnu::gcj::RawData *pc)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  jclass klass = GET_CALLING_CLASS(pc);
-  if (klass)
-    return klass->getClassLoaderInternal ();
-  else
-    return NULL;
-}
-
-::java::lang::ClassLoader *
-gnu::classpath::VMStackWalker::firstNonNullClassLoader(void)
-{
-  _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$);
-  return _Jv_StackTrace::GetStackWalkerFirstNonNullLoader ();
-}
diff --git a/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h b/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h
deleted file mode 100644
index ae86fa1..0000000
--- a/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_toolkit_DefaultDaemonThreadFactory__
-#define __gnu_classpath_toolkit_DefaultDaemonThreadFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace toolkit
-      {
-          class DefaultDaemonThreadFactory;
-      }
-    }
-  }
-}
-
-class gnu::classpath::toolkit::DefaultDaemonThreadFactory : public ::java::lang::Object
-{
-
-public:
-  DefaultDaemonThreadFactory();
-  virtual ::java::lang::Thread * newThread(::java::lang::Runnable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_toolkit_DefaultDaemonThreadFactory__
diff --git a/libjava/gnu/gcj/Core.h b/libjava/gnu/gcj/Core.h
deleted file mode 100644
index ba28bf1..0000000
--- a/libjava/gnu/gcj/Core.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_Core__
-#define __gnu_gcj_Core__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-        class RawData;
-    }
-  }
-}
-
-class gnu::gcj::Core : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::gcj::Core * create(::java::lang::String *);
-  static ::gnu::gcj::Core * find(::java::lang::String *);
-public: // actually package-private
-  Core();
-public:
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ptr;
-  jint length;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_Core__
diff --git a/libjava/gnu/gcj/Core.java b/libjava/gnu/gcj/Core.java
deleted file mode 100644
index c632399..0000000
--- a/libjava/gnu/gcj/Core.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2001, 2003, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj;
-
-public class Core
-{
-  public native static Core create (String name) throws java.io.IOException;
-
-  // Same as create, except returns null if not found.
-  public native static Core find (String name);
-
-  public RawData ptr;
-  public int length;
-
-  Core ()
-  {
-  }
-}
diff --git a/libjava/gnu/gcj/RawData.h b/libjava/gnu/gcj/RawData.h
deleted file mode 100644
index 8cb1188..0000000
--- a/libjava/gnu/gcj/RawData.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_RawData__
-#define __gnu_gcj_RawData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class gnu::gcj::RawData : public ::java::lang::Object
-{
-
-  RawData();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_RawData__
diff --git a/libjava/gnu/gcj/RawData.java b/libjava/gnu/gcj/RawData.java
deleted file mode 100644
index 341c82f..0000000
--- a/libjava/gnu/gcj/RawData.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj;
-
-/** A type used to indicate special data used by native code that should not 
-    be marked by the garbage collector. */
-
-public final class RawData
-{
-   private RawData() { }
-}
diff --git a/libjava/gnu/gcj/RawDataManaged.h b/libjava/gnu/gcj/RawDataManaged.h
deleted file mode 100644
index cb9673e..0000000
--- a/libjava/gnu/gcj/RawDataManaged.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_RawDataManaged__
-#define __gnu_gcj_RawDataManaged__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawDataManaged;
-    }
-  }
-}
-
-class gnu::gcj::RawDataManaged : public ::java::lang::Object
-{
-
-  RawDataManaged();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_RawDataManaged__
diff --git a/libjava/gnu/gcj/RawDataManaged.java b/libjava/gnu/gcj/RawDataManaged.java
deleted file mode 100644
index 91a36ac..0000000
--- a/libjava/gnu/gcj/RawDataManaged.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj;
-
-/** A type used to indicate special data used by native code. Unlike the 
-    <code>RawData</code> type, fields declared as <code>RawDataManaged</code> 
-    will be "marked" by the memory manager and considered for garbage 
-    collection.  
-    
-    Native data which is allocated using CNI's <code>JvAllocBytes()</code> 
-    function and stored in a <code>RawDataManaged</code> will be automatically 
-    freed when the Java object it is associated with becomes unreachable.  */
-
-public final class RawDataManaged
-{
-   private RawDataManaged() { }
-}
diff --git a/libjava/gnu/gcj/convert/Blocks-3.txt b/libjava/gnu/gcj/convert/Blocks-3.txt
deleted file mode 100644
index 15c8957..0000000
--- a/libjava/gnu/gcj/convert/Blocks-3.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# Start Code; End Code; Block Name
-0000; 007F; Basic Latin
-0080; 00FF; Latin-1 Supplement
-0100; 017F; Latin Extended-A
-0180; 024F; Latin Extended-B
-0250; 02AF; IPA Extensions
-02B0; 02FF; Spacing Modifier Letters
-0300; 036F; Combining Diacritical Marks
-0370; 03FF; Greek
-0400; 04FF; Cyrillic
-0530; 058F; Armenian
-0590; 05FF; Hebrew
-0600; 06FF; Arabic
-0700; 074F; Syriac  
-0780; 07BF; Thaana
-0900; 097F; Devanagari
-0980; 09FF; Bengali
-0A00; 0A7F; Gurmukhi
-0A80; 0AFF; Gujarati
-0B00; 0B7F; Oriya
-0B80; 0BFF; Tamil
-0C00; 0C7F; Telugu
-0C80; 0CFF; Kannada
-0D00; 0D7F; Malayalam
-0D80; 0DFF; Sinhala
-0E00; 0E7F; Thai
-0E80; 0EFF; Lao
-0F00; 0FFF; Tibetan
-1000; 109F; Myanmar 
-10A0; 10FF; Georgian
-1100; 11FF; Hangul Jamo
-1200; 137F; Ethiopic
-13A0; 13FF; Cherokee
-1400; 167F; Unified Canadian Aboriginal Syllabics
-1680; 169F; Ogham
-16A0; 16FF; Runic
-1780; 17FF; Khmer
-1800; 18AF; Mongolian
-1E00; 1EFF; Latin Extended Additional
-1F00; 1FFF; Greek Extended
-2000; 206F; General Punctuation
-2070; 209F; Superscripts and Subscripts
-20A0; 20CF; Currency Symbols
-20D0; 20FF; Combining Marks for Symbols
-2100; 214F; Letterlike Symbols
-2150; 218F; Number Forms
-2190; 21FF; Arrows
-2200; 22FF; Mathematical Operators
-2300; 23FF; Miscellaneous Technical
-2400; 243F; Control Pictures
-2440; 245F; Optical Character Recognition
-2460; 24FF; Enclosed Alphanumerics
-2500; 257F; Box Drawing
-2580; 259F; Block Elements
-25A0; 25FF; Geometric Shapes
-2600; 26FF; Miscellaneous Symbols
-2700; 27BF; Dingbats
-2800; 28FF; Braille Patterns
-2E80; 2EFF; CJK Radicals Supplement
-2F00; 2FDF; Kangxi Radicals
-2FF0; 2FFF; Ideographic Description Characters
-3000; 303F; CJK Symbols and Punctuation
-3040; 309F; Hiragana
-30A0; 30FF; Katakana
-3100; 312F; Bopomofo
-3130; 318F; Hangul Compatibility Jamo
-3190; 319F; Kanbun
-31A0; 31BF; Bopomofo Extended
-3200; 32FF; Enclosed CJK Letters and Months
-3300; 33FF; CJK Compatibility
-3400; 4DB5; CJK Unified Ideographs Extension A
-4E00; 9FFF; CJK Unified Ideographs
-A000; A48F; Yi Syllables
-A490; A4CF; Yi Radicals
-AC00; D7A3; Hangul Syllables
-D800; DB7F; High Surrogates
-DB80; DBFF; High Private Use Surrogates
-DC00; DFFF; Low Surrogates
-E000; F8FF; Private Use
-F900; FAFF; CJK Compatibility Ideographs
-FB00; FB4F; Alphabetic Presentation Forms
-FB50; FDFF; Arabic Presentation Forms-A
-FE20; FE2F; Combining Half Marks
-FE30; FE4F; CJK Compatibility Forms
-FE50; FE6F; Small Form Variants
-FE70; FEFE; Arabic Presentation Forms-B
-FEFF; FEFF; Specials
-FF00; FFEF; Halfwidth and Fullwidth Forms
-FFF0; FFFD; Specials
-
diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h
deleted file mode 100644
index f9d4a88..0000000
--- a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_BytesToCharsetAdaptor__
-#define __gnu_gcj_convert_BytesToCharsetAdaptor__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class BytesToCharsetAdaptor;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::BytesToCharsetAdaptor : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  BytesToCharsetAdaptor(::java::nio::charset::Charset *);
-  BytesToCharsetAdaptor(::java::nio::charset::CharsetDecoder *);
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void done();
-private:
-  ::java::nio::charset::CharsetDecoder * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) decoder;
-  ::java::nio::ByteBuffer * inBuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_BytesToCharsetAdaptor__
diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
deleted file mode 100644
index 4b43d7b..0000000
--- a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright (C) 2005, 2007  Free Software Foundation
-
-This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.CoderResult;
-import gnu.java.nio.charset.EncodingHelper;
-
-/**
- * Adaptor class that allow any {@link Charset} to be used
- * as a BytesToUnicode converter.
- */
-public class BytesToCharsetAdaptor extends BytesToUnicode
-{
-  /**
-   * The CharsetDecoder that does all the work.
-   */
-  private final CharsetDecoder decoder;
-
-  /**
-   * ByteBuffer wrapper for this.buf.
-   */
-  private ByteBuffer inBuf;
-
-  /**
-   * Create a new BytesToCharsetAdaptor for the given Charset.
-   *
-   * @param cs the Charset.
-   */
-  public BytesToCharsetAdaptor(Charset cs)
-  {
-    this(cs.newDecoder());
-  }
-
-  /**
-   * Create a new BytesToCharsetAdaptor for the given CharsetDecoder.
-   *
-   * @param dec the CharsetDecoder.
-   */
-  public BytesToCharsetAdaptor(CharsetDecoder dec)
-  {
-    decoder = dec;
-    // Use default replacments on bad input so that we don't have to
-    // deal with errors.
-    decoder.onMalformedInput(CodingErrorAction.REPLACE);
-    decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
-  }
-
-  /**
-   * Return the decoder's name.  The backing Charset's name is
-   * returned.
-   *
-   * @return The name.
-   */
-  public String getName()
-  {
-    return EncodingHelper.getOldCanonical(decoder.charset().name());
-  }
-
-  public int read(char[] outbuffer, int outpos, int count)
-  {
-    if (inBuf == null || ! inBuf.hasArray() || inBuf.array() != inbuffer)
-      inBuf = ByteBuffer.wrap(inbuffer);
-    inBuf.limit(inlength);
-    inBuf.position(inpos);
-
-    CharBuffer outBuf = CharBuffer.wrap(outbuffer, outpos, count);
-    decoder.decode(inBuf, outBuf, false);
-
-    // Update this.inpos to reflect the bytes consumed.
-    inpos = inBuf.position();
-    // Return the number of characters that were written to outbuffer.
-    return outBuf.position() - outpos;
-  }
-
-  // These aren't cached.
-  public void done()
-  {
-  }
-}
diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.h b/libjava/gnu/gcj/convert/BytesToUnicode.h
deleted file mode 100644
index 15ff3ec..0000000
--- a/libjava/gnu/gcj/convert/BytesToUnicode.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_BytesToUnicode__
-#define __gnu_gcj_convert_BytesToUnicode__
-
-#pragma interface
-
-#include <gnu/gcj/convert/IOConverter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class BytesToUnicode;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::BytesToUnicode : public ::gnu::gcj::convert::IOConverter
-{
-
-public:
-  BytesToUnicode();
-  virtual ::java::lang::String * getName() = 0;
-  static ::gnu::gcj::convert::BytesToUnicode * getDefaultDecoder();
-  static ::gnu::gcj::convert::BytesToUnicode * getDecoder(::java::lang::String *);
-  virtual void setInput(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jchar > *, jint, jint) = 0;
-  virtual void done();
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::IOConverter)))) inbuffer;
-  jint inpos;
-  jint inlength;
-public: // actually package-private
-  static ::java::lang::String * defaultEncoding;
-private:
-  static const jint CACHE_SIZE = 4;
-  static JArray< ::gnu::gcj::convert::BytesToUnicode * > * decoderCache;
-  static jint currCachePos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_BytesToUnicode__
diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java
deleted file mode 100644
index e3afe3e..0000000
--- a/libjava/gnu/gcj/convert/BytesToUnicode.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-import java.nio.charset.Charset;
-
-public abstract class BytesToUnicode extends IOConverter
-{
-  /** Buffer to read bytes from.
-   * The characters inbuffer[inpos] ... inbuffer[inlength-1] are available. */
-  public byte[] inbuffer;
-  /** Starting index in buffer to read bytes from. */
-  public int inpos;
-  /** End of valid bytes in buffer. */
-  public int inlength;
-
-  // The name of the default encoding.
-  static String defaultEncoding;
-
-  /* These keep a small cache of decoders for reuse.  The array holds
-     the actual decoders.  The currCachePos is the next value we are
-     going to replace in the cache.  We don't just throw the data away
-     if the cache is full, because if the cache filled up with stuff
-     we don't need then the cache would be worthless.  We instead
-     circulate through the cache the implement kind of an LRU
-     algorithm. */
-  private static final int CACHE_SIZE = 4;  // A power of 2 for speed
-  private static BytesToUnicode[] decoderCache
-    = new BytesToUnicode[CACHE_SIZE];
-  private static int currCachePos = 0;
-
-  public abstract String getName();
-
-  public static BytesToUnicode getDefaultDecoder()
-  {
-    try
-      {
-	synchronized (BytesToUnicode.class)
-	  {
-	    if (defaultEncoding == null)
-	      {
-		String encoding
-		  = canonicalize (System.getProperty("file.encoding",
-						     "8859_1"));
-		String className = "gnu.gcj.convert.Input_" + encoding;
-		try
-		  {
-		    Class defaultDecodingClass = Class.forName(className);
-		    defaultEncoding = encoding;
-		  }
-		catch (ClassNotFoundException ex)
-		  {
-		    throw new NoClassDefFoundError("missing default encoding "
-						   + encoding + " (class "
-						   + className
-						   + " not found)");
-		  }
-	      }
-	  }
-	return getDecoder (defaultEncoding);
-      }
-    catch (Throwable ex)
-      {
-	return new Input_8859_1();
-      }
-  }
-
-  /** Get a byte-stream->char-stream converter given an encoding name. */
-  public static BytesToUnicode getDecoder (String encoding)
-    throws java.io.UnsupportedEncodingException
-  {
-    /* First hunt in our cache to see if we have a decoder that is
-       already allocated. */
-    String canonicalEncoding = canonicalize(encoding);
-    synchronized (BytesToUnicode.class)
-      {
-	int i;
-	for (i = 0; i < decoderCache.length; ++i)
-	  {
-	    if (decoderCache[i] != null
-		&& canonicalEncoding.equals(decoderCache[i].getName ()))
-	      {
-		BytesToUnicode rv = decoderCache[i];
-		decoderCache[i] = null;
-		return rv;
-	    }
-	  }
-      }
-
-    // It's not in the cache, so now we have to do real work.
-    String className = "gnu.gcj.convert.Input_" + canonicalEncoding;
-    Class decodingClass;
-    try 
-      { 
-	decodingClass = Class.forName(className); 
-	return (BytesToUnicode) decodingClass.newInstance();
-      } 
-    catch (Throwable ex) 
-      { 
-	try
-	  {
-	    // We pass the original name to iconv and let it handle
-	    // its own aliasing.  Note that we intentionally prefer
-	    // iconv over nio.
-	    return new Input_iconv (encoding);
-	  }
-	catch (Throwable _)
-	  {
-	    // Ignore, and try the next method.
-	  }
-	try
-	  {
-	    return new BytesToCharsetAdaptor(Charset.forName(encoding));
-	  }
-	catch (Throwable _)
-	  {
-	    throw new java.io.UnsupportedEncodingException(encoding
-							   + " (" + ex + ')');
-	  }
-      }
-  }
-
-  /** Make input bytes available to the conversion.
-   * @param buffer source of input bytes
-   * @param pos index of first available byte
-   * @param length one more than index of last available byte
-   */
-  public final void setInput(byte[] buffer, int pos, int length)
-  {
-    inbuffer = buffer;
-    inpos = pos;
-    inlength = length;
-  }
-
-  /** Convert bytes to chars.
-   * Input bytes are taken from this.inbuffer.  The available input
-   * bytes start at inbuffer[inpos], and end at inbuffer[inlength-1].
-   * @param outbuffer buffer for the converted character
-   * @param outpos position in buffer to start putting converted characters
-   * @param count the maximum number of characters to convert
-   * @return number of chars placed in outbuffer.
-   * Also, this.inpos is incremented by the number of bytes consumed.
-   *
-   * (Note the asymmetry in that the input upper bound is inbuffer[inlength-1],
-   * while the output upper bound is outbuffer[outpos+count-1].  The
-   * justification is that inlength is like the count field of a
-   * BufferedInputStream, while the count parameter is like the
-   * length parameter of a read request.)  The count parameter is
-   * also defined to be <= outbuffer.length - outpos (per the specification
-   * of the length parameter for a read request).
-   */
-  public abstract int read (char[] outbuffer, int outpos, int count);
-
-  /** Indicate that the converter is resuable.
-   * This class keeps track of converters on a per-encoding basis.
-   * When done with an encoder you may call this method to indicate
-   * that it can be reused later.
-   */
-  public void done ()
-  {
-    synchronized (BytesToUnicode.class)
-      {
-	this.inbuffer = null;
-	this.inpos = 0;
-	this.inlength = 0;
-
-	decoderCache[currCachePos] = this;
-	currCachePos = (currCachePos + 1) % CACHE_SIZE;
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h b/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h
deleted file mode 100644
index 4115ef49..0000000
--- a/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_CharsetToBytesAdaptor__
-#define __gnu_gcj_convert_CharsetToBytesAdaptor__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class CharsetToBytesAdaptor;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::CharsetToBytesAdaptor : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  CharsetToBytesAdaptor(::java::nio::charset::Charset *);
-  CharsetToBytesAdaptor(::java::nio::charset::CharsetEncoder *);
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jint write(::java::lang::String *, jint, jint, jchar);
-private:
-  void write(::java::nio::CharBuffer *);
-public:
-  virtual jboolean havePendingBytes();
-  virtual void setFinished();
-  virtual void done();
-private:
-  ::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) encoder;
-  ::java::nio::ByteBuffer * outBuf;
-  jboolean closedEncoder;
-  jboolean hasBytes;
-  jboolean finished;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_CharsetToBytesAdaptor__
diff --git a/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java b/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java
deleted file mode 100644
index 80e749c..0000000
--- a/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (C) 2005, 2006  Free Software Foundation
-
-This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.CoderResult;
-import gnu.java.nio.charset.EncodingHelper;
-
-/**
- * Adaptor class that allow any {@link Charset} to be used
- * as a UnicodeToBytes converter.
- */
-public class CharsetToBytesAdaptor extends UnicodeToBytes
-{
-  /**
-   * The CharsetEncoder that does all the work.
-   */
-  private final CharsetEncoder encoder;
-
-  /**
-   * ByteBuffer wrapper for this.buf.
-   */
-  private ByteBuffer outBuf;
-
-  /**
-   * True if we've told the CharsetEncoder that there are no more
-   * characters available.
-   */
-  private boolean closedEncoder;
-
-  /**
-   * True if there are bytes pending in the encoder.
-   */
-  private boolean hasBytes;
-
-  /**
-   * True if we're finished.
-   */
-  private boolean finished;
-
-  /**
-   * Create a new CharsetToBytesAdaptor for the given Charset.
-   *
-   * @param cs The Charset.
-   */
-  public CharsetToBytesAdaptor(Charset cs)
-  {
-    this(cs.newEncoder());
-  }
-
-  /**
-   * Create a new CharsetToBytesAdaptor for the given CharsetEncoder.
-   *
-   * @param enc The CharsetEncoder.
-   */
-  public CharsetToBytesAdaptor(CharsetEncoder enc)
-  {
-    encoder = enc;
-    // Use default replacments on bad input so that we don't have to
-    // deal with errors.
-    encoder.onMalformedInput(CodingErrorAction.REPLACE);
-    encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
-  }
-
-  /**
-   * Return the encoder's name.  The backing Charset's name is
-   * returned.
-   *
-   * @return The name.
-   */
-  public String getName()
-  {
-    return EncodingHelper.getOldCanonical(encoder.charset().name());
-  }
-
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    // Wrap the char array so it can be used by the encoder.
-    CharBuffer b = CharBuffer.wrap(inbuffer, inpos, inlength);
-    write(b);
-    return b.position() - inpos; // Number of chars consumed.
-  }
-
-  public int write (String str, int inpos, int inlength, char work)
-  {
-    // Wrap the String so it can be used by the encoder.
-    CharBuffer b = CharBuffer.wrap(str, inpos, inlength);
-    write(b);
-    return b.position() - inpos; // Number of chars consumed.
-  }
-
-  /**
-   * Encode as much of inBuf as will fit in buf.  The number of
-   * chars consumed is reflected by the new position of inBuf.  The
-   * output is put in buf and count is incremented by the number of
-   * bytes written.
-   *
-   * @param inBuf The input.
-   */
-  private void write(CharBuffer inBuf)
-  {
-    // Reuse existing outBuf if it is still wrapping the same array
-    // it was created with.
-    if (outBuf == null || !outBuf.hasArray() || outBuf.array() != buf)
-      outBuf = ByteBuffer.wrap(buf);
-
-    // Set the current position.
-    outBuf.position(count);
-
-    // Do the conversion.
-    CoderResult result = encoder.encode(inBuf, outBuf, closedEncoder);
-    hasBytes = result == CoderResult.OVERFLOW;
-    if (closedEncoder)
-      {
-	result = encoder.flush(outBuf);
-	if (result == CoderResult.UNDERFLOW)
-	  finished = true;
-	else
-	  hasBytes = true;
-      }
-
-    // Mark the new end of buf.
-    count = outBuf.position();
-  }
-
-  /**
-   * Check for cached output in the converter.
-   *
-   * @return true if there is cached output that has not been
-   * written to buf.
-   */
-  public boolean havePendingBytes()
-  {
-    return hasBytes;
-  }
-
-  public void setFinished()
-  {
-    closedEncoder = true;
-  }
-
-  // These aren't cached.
-  public void done()
-  {
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Convert.h b/libjava/gnu/gcj/convert/Convert.h
deleted file mode 100644
index 8a77702..0000000
--- a/libjava/gnu/gcj/convert/Convert.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Convert__
-#define __gnu_gcj_convert_Convert__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Convert;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Convert : public ::java::lang::Object
-{
-
-public:
-  Convert();
-public: // actually package-private
-  static void error(::java::lang::String *);
-  static void help();
-  static void version();
-  static void missing(::java::lang::String *);
-public:
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Convert__
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
deleted file mode 100644
index 1e2de9c..0000000
--- a/libjava/gnu/gcj/convert/Convert.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-import java.io.*;
-
-public class Convert
-{
-  static void error (String message)
-  {
-    System.err.print("jv-convert: ");
-    System.err.println(message);
-    System.err.println("Try `jv-convert --help' for more information.");
-    System.exit(1);
-  }
-
-  static void help ()
-  {
-    System.out.println("Usage: jv-convert [OPTIONS] [INPUTFILE [OUTPUTFILE]]");
-    System.out.println();
-    System.out.println("Convert from one encoding to another.");
-    System.out.println();
-    System.out.println("   --encoding FROM");
-    System.out.println("   --from FROM        use FROM as source encoding name");
-    System.out.println("   --to TO            use TO as target encoding name");
-    System.out.println("   -i FILE            read from FILE");
-    System.out.println("   -o FILE            print output to FILE");
-    System.out.println("   --reverse          swap FROM and TO encodings");
-    System.out.println("   --help             print this help, then exit");
-    System.out.println("   --version          print version number, then exit");
-    System.out.println();
-    System.out.println("`-' as a file name argument can be used to refer to stdin or stdout.");
-    System.exit(0);
-  }
-
-  static void version ()
-  {
-    System.out.println("jv-convert ("
-		       + System.getProperty("java.vm.name")
-		       + ") "
-		       + System.getProperty("java.vm.version"));
-    System.out.println();
-    System.out.println("Copyright (C) 2016 Free Software Foundation, Inc.");
-    System.out.println("This is free software; see the source for copying conditions.  There is NO");
-    System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
-    System.exit(0);
-  }
-
-  static void missing (String arg)
-  {
-    error("missing arg after `" + arg + "' option");
-  }
-
-  public static void main (String[] args)
-  {
-    String inName = "-";
-    String outName = "-";
-    String inEncodingName = null;
-    String outEncodingName = "JavaSrc";
-    int seenNames = 0;
-    boolean reverse = false;
-
-    for (int i = 0;  i < args.length;  i++)
-      {
-	String arg = args[i];
-	if (arg.length() == 0)
-	  error("zero-length argument");
-	if (arg.charAt(0) == '-')
-	  {
-	    if (arg.equals("-encoding") || arg.equals("--encoding")
-		|| args.equals("-from") || arg.equals("--from"))
-	      {
-		if (++i == args.length) missing(arg);
-		inEncodingName = args[i];
-	      }
-	    else if (arg.equals("-to") || arg.equals("--to"))
-	      {
-		if (++i == args.length) missing(arg);
-		outEncodingName = args[i];
-	      }
-	    else if (arg.equals("-i"))
-	      {
-		if (++i == args.length) missing(arg);
-		inName = args[i];
-	      }
-	    else if (arg.equals("-o"))
-	      {
-		if (++i == args.length) missing(arg);
-		outName = args[i];
-	      }
-	    else if (arg.equals("-reverse") || arg.equals("--reverse"))
-	      {
-		reverse = true;
-	      }
-	    else if (arg.equals("-help") || arg.equals("--help"))
-	      {
-		help ();
-	      }
-	    else if (arg.equals("-version") || arg.equals("--version"))
-	      {
-		version ();
-	      }
-	    else if (arg.equals("-"))
-	      {
-		switch (seenNames)
-		  {
-		  case 0:
-		    inName = "-";
-		    seenNames++;
-		    break;
-		  case 1:
-		    outName = "-";
-		    seenNames++;
-		    break;
-		  default:
-		    error("too many `-' arguments");
-		  }
-	      }
-	    else
-	      error("unrecognized argument `" + arg + "'");
-	  }
-	else
-	  {
-	    switch (seenNames)
-	      {
-	      case 0:
-		inName = arg;
-		seenNames++;
-		break;
-	      case 1:
-		outName = arg;
-		seenNames++;
-		break;
-	      default:
-		error("too many filename arguments");
-	      }
-	  }
-      }
-
-    if (reverse)
-      {
-	String tmp = inEncodingName;
-	inEncodingName = outEncodingName;
-	outEncodingName = tmp;
-      }
-
-    try
-      {
-	InputStream inStream = inName.equals("-") ? System.in
-	  : new FileInputStream(inName);
-	OutputStream outStream;
-	if (outName.equals("-"))
-	  outStream = System.out;
-	else
-	  outStream = new FileOutputStream(outName);
-	InputStreamReader in
-	  = (inEncodingName == null
-	     ? new InputStreamReader(inStream)
-	     : new InputStreamReader(inStream, inEncodingName));
-	OutputStreamWriter out
-	  = (outEncodingName == null
-	     ? new OutputStreamWriter(outStream)
-	     : new OutputStreamWriter(outStream, outEncodingName));
-	char[] buffer = new char[2048];
-	for (;;)
-	  {
-	    int count = in.read(buffer);
-	    if (count < 0)
-	      break;
-	    out.write(buffer, 0, count);
-	  }
-
-	in.close();
-	out.close();
-      }
-    catch (java.io.IOException ex)
-      {
-	System.err.print("jv-convert exception: ");
-	System.err.println(ex);
-	System.exit(-1);
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/convert/IOConverter.h b/libjava/gnu/gcj/convert/IOConverter.h
deleted file mode 100644
index 6654859..0000000
--- a/libjava/gnu/gcj/convert/IOConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_IOConverter__
-#define __gnu_gcj_convert_IOConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class IOConverter;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::IOConverter : public ::java::lang::Object
-{
-
-public:
-  IOConverter();
-private:
-  static jboolean iconv_init();
-public: // actually protected
-  static ::java::lang::String * canonicalize(::java::lang::String *);
-private:
-  static ::java::util::Hashtable * hash;
-public: // actually protected
-  static jboolean iconv_byte_swap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_IOConverter__
diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java
deleted file mode 100644
index a0d4667..0000000
--- a/libjava/gnu/gcj/convert/IOConverter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (C) 2000, 2001, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* This is a base class that handles aliasing issues for
-   UnicodeToBytes to BytesToUnicode.  */
-
-package gnu.gcj.convert;
-
-import java.util.Hashtable;
-
-public abstract class IOConverter
-{
-  // Map encoding aliases to our canonical form.
-  static private Hashtable hash = new Hashtable ();
-
-  // True if we have to do byte-order conversions on iconv()
-  // arguments.
-  static protected boolean iconv_byte_swap;
-
-  static
-  {
-    // Manually maintained aliases.  Note that the value must be our
-    // canonical name.
-    hash.put ("iso-latin-1", "8859_1");
-    hash.put ("iso8859_1", "8859_1");
-    hash.put ("utf-16le", "UnicodeLittle");
-    hash.put ("utf-16be", "UnicodeBig");
-    // At least one build script out there uses 'utf8'.
-    hash.put ("utf8", "UTF8");
-    // On Solaris the default encoding, as returned by nl_langinfo(),
-    // is `646' (aka ASCII), but the Solaris iconv_open() doesn't
-    // understand that.  We work around the problem by adding an
-    // explicit alias for Solaris users.
-    hash.put ("646", "ASCII");
-
-    // See PR 24552, PR 14358.
-    hash.put ("euc_jp", "EUCJIS");
-    hash.put ("eucjp", "EUCJIS");
-
-    // All aliases after this point are automatically generated by the
-    // `encodings.pl' script.  Run it to make any corrections.
-    hash.put ("ansi_x3.4-1968", "ASCII");
-    hash.put ("ansi_x3.4-1986", "ASCII");
-    hash.put ("ascii", "ASCII");
-    hash.put ("cp367", "ASCII");
-    hash.put ("cp819", "8859_1");
-    hash.put ("csascii", "ASCII");
-    hash.put ("cseucpkdfmtjapanese", "EUCJIS");
-    hash.put ("csisolatin1", "8859_1");
-    hash.put ("csshiftjis", "SJIS");
-    hash.put ("euc-jp", "EUCJIS");
-    hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS");
-    hash.put ("ibm367", "ASCII");
-    hash.put ("ibm819", "8859_1");
-    hash.put ("iso-8859-1", "8859_1");
-    hash.put ("iso-ir-100", "8859_1");
-    hash.put ("iso-ir-6", "ASCII");
-    hash.put ("iso646-us", "ASCII");
-    hash.put ("iso_646.irv:1991", "ASCII");
-    hash.put ("iso_8859-1", "8859_1");
-    hash.put ("iso_8859-1:1987", "8859_1");
-    hash.put ("l1", "8859_1");
-    hash.put ("latin1", "8859_1");
-    hash.put ("ms_kanji", "SJIS");
-    hash.put ("shift_jis", "SJIS");
-    hash.put ("us", "ASCII");
-    hash.put ("us-ascii", "ASCII");
-    hash.put ("utf-8", "UTF8");
-    hash.put ("utf16-be", "UnicodeBig");
-    hash.put ("utf16-le", "UnicodeLittle");
-    // End script-generated section.
-
-    iconv_byte_swap = iconv_init ();
-  }
-
-  private static native boolean iconv_init ();
-
-  // Turn an alias into the canonical form.
-  protected static final String canonicalize (String name)
-  {
-    String c = (String) hash.get (name.toLowerCase ());
-    return c == null ? name : c;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_8859_1.h b/libjava/gnu/gcj/convert/Input_8859_1.h
deleted file mode 100644
index eccb4b3..0000000
--- a/libjava/gnu/gcj/convert/Input_8859_1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_8859_1__
-#define __gnu_gcj_convert_Input_8859_1__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_8859_1;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_8859_1 : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_8859_1();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_8859_1__
diff --git a/libjava/gnu/gcj/convert/Input_8859_1.java b/libjava/gnu/gcj/convert/Input_8859_1.java
deleted file mode 100644
index bd5f779..0000000
--- a/libjava/gnu/gcj/convert/Input_8859_1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert ISO-Latin-1 (8859-1) text to Unicode.
- * @author Per Bothner <bothner@cygnus.com>
- * @date March 1999.
- */
-
-public class Input_8859_1 extends BytesToUnicode
-{
-  public String getName() { return "8859_1"; }
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origpos = outpos;
-    // Make sure fields of this are in registers.
-    int inpos = this.inpos;
-    byte[] inbuffer = this.inbuffer;
-    int inavail = this.inlength - inpos;
-    int outavail = count;
-    if (outavail > inavail)
-      outavail = inavail;
-    while (--outavail >= 0)
-      {
-	outbuffer[outpos++] = (char) (inbuffer[inpos++] & 0xFF);
-      }
-    this.inpos = inpos;
-    return outpos - origpos;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_ASCII.h b/libjava/gnu/gcj/convert/Input_ASCII.h
deleted file mode 100644
index fcc8c65..0000000
--- a/libjava/gnu/gcj/convert/Input_ASCII.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_ASCII__
-#define __gnu_gcj_convert_Input_ASCII__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_ASCII;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_ASCII : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_ASCII();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_ASCII__
diff --git a/libjava/gnu/gcj/convert/Input_ASCII.java b/libjava/gnu/gcj/convert/Input_ASCII.java
deleted file mode 100644
index cb531e9..0000000
--- a/libjava/gnu/gcj/convert/Input_ASCII.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert ASCII text to Unicode.
- * @date October 2000
- */
-
-public class Input_ASCII extends BytesToUnicode
-{
-  public String getName() { return "ASCII"; }
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origpos = outpos;
-    // Make sure fields of this are in registers.
-    int inpos = this.inpos;
-    byte[] inbuffer = this.inbuffer;
-    int inavail = this.inlength - inpos;
-    int outavail = count;
-    if (outavail > inavail)
-      outavail = inavail;
-    while (--outavail >= 0)
-      {
-	outbuffer[outpos++] = (char) (inbuffer[inpos++] & 0x7f);
-      }
-    this.inpos = inpos;
-    return outpos - origpos;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_EUCJIS.h b/libjava/gnu/gcj/convert/Input_EUCJIS.h
deleted file mode 100644
index 3a93c52..0000000
--- a/libjava/gnu/gcj/convert/Input_EUCJIS.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_EUCJIS__
-#define __gnu_gcj_convert_Input_EUCJIS__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_EUCJIS;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_EUCJIS : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_EUCJIS();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) codeset;
-  jint first_byte;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_EUCJIS__
diff --git a/libjava/gnu/gcj/convert/Input_EUCJIS.java b/libjava/gnu/gcj/convert/Input_EUCJIS.java
deleted file mode 100644
index d7088e1..0000000
--- a/libjava/gnu/gcj/convert/Input_EUCJIS.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert EUCJIS (Extended Unix Code for Japan) to Unicode.
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Input_EUCJIS extends BytesToUnicode
-{
-  public String getName() { return "EUCJIS"; }
-
-  int codeset = 0;
-  int first_byte;
-
-  public native int read (char[] outbuffer, int outpos, int count);
-}
diff --git a/libjava/gnu/gcj/convert/Input_JavaSrc.h b/libjava/gnu/gcj/convert/Input_JavaSrc.h
deleted file mode 100644
index 4509cf6..0000000
--- a/libjava/gnu/gcj/convert/Input_JavaSrc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_JavaSrc__
-#define __gnu_gcj_convert_Input_JavaSrc__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_JavaSrc;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_JavaSrc : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_JavaSrc();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) state;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_JavaSrc__
diff --git a/libjava/gnu/gcj/convert/Input_JavaSrc.java b/libjava/gnu/gcj/convert/Input_JavaSrc.java
deleted file mode 100644
index 12b8b69..0000000
--- a/libjava/gnu/gcj/convert/Input_JavaSrc.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
- 
-/**
- * Convert Ascii with \ u XXXX-escapes to Unicode.
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Input_JavaSrc extends BytesToUnicode
-{
-  public String getName() { return "JavaSrc"; }
-
-  // 0: normal
-  // 1: seen '\\'
-  // 2: seen '\\' and 'u'
-  // 3: seen '\\' and need to emit value.
-  // 4, 5, 6, 7:  seen '\\u', 'u' and (state-3) hex digits.
-  int state = 0;
-
-  int value;
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origpos = outpos;
-    for (;;)
-      {
-	if (inpos >= inlength)
-	  break;
-	if (outpos - origpos >= count)
-	  break;
-	char b = (char) (inbuffer[inpos++] & 0xFF);
-	switch (state)
-	  {
-	  case 0:
-	    if (b == '\\')
-	      {
-		state = 1;
-		continue;
-	      }
-	    break;
-	  case 1:
-	    if (b == 'u')
-	      {
-		state = 2;
-		continue;
-	      }
-	    if (b != '\\')
-	      {
-		value = b;
-		b = '\\';
-		state = 3;
-	      }
-	    break;
-	  case 3:
-	    b = (char) value;
-	    break;
-	  default:  //  case 4:  case 5:  case 6:  case 7:
-	    int digit = Character.digit(b, 16);
-	    if (digit < 0)
-	      {
-		b = '\uFFFD';
-		state = 0;
-	      }
-	    else
-	      {
-		value = value * 16 + digit;
-		if (state < 7)
-		  {
-		    state++;
-		    continue;
-		  }
-		b = (char) value;
-	      }
-	    state = 0;
-	  }
-	outbuffer[outpos++] = b;
-      }
-    return outpos - origpos;
-  }
-}
-
diff --git a/libjava/gnu/gcj/convert/Input_SJIS.h b/libjava/gnu/gcj/convert/Input_SJIS.h
deleted file mode 100644
index d2cacbe..0000000
--- a/libjava/gnu/gcj/convert/Input_SJIS.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_SJIS__
-#define __gnu_gcj_convert_Input_SJIS__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_SJIS;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_SJIS : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_SJIS();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) first_byte;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_SJIS__
diff --git a/libjava/gnu/gcj/convert/Input_SJIS.java b/libjava/gnu/gcj/convert/Input_SJIS.java
deleted file mode 100644
index 4660322..0000000
--- a/libjava/gnu/gcj/convert/Input_SJIS.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert SJIS (Shift JIS, used on Japanese MS-Windows) to Unicode.
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Input_SJIS extends BytesToUnicode
-{
-  public String getName() { return "SJIS"; }
-
-  public native int read (char[] outbuffer, int outpos, int count);
-
-  int first_byte;
-}
diff --git a/libjava/gnu/gcj/convert/Input_UTF8.h b/libjava/gnu/gcj/convert/Input_UTF8.h
deleted file mode 100644
index 347513b..0000000
--- a/libjava/gnu/gcj/convert/Input_UTF8.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_UTF8__
-#define __gnu_gcj_convert_Input_UTF8__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_UTF8;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_UTF8 : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_UTF8();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
-  jint partial_bytes_expected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_UTF8__
diff --git a/libjava/gnu/gcj/convert/Input_UTF8.java b/libjava/gnu/gcj/convert/Input_UTF8.java
deleted file mode 100644
index 433a0d1..0000000
--- a/libjava/gnu/gcj/convert/Input_UTF8.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert UTF8 to Unicode.
- * @author Per Bothner <bothner@cygnus.com>
- * @date March 1999.
- */
-
-public class Input_UTF8 extends BytesToUnicode
-{
-  public String getName() { return "UTF8"; }
-
-  int partial = 0;
-  int partial_bytes_expected = 0;
-  //int suggogate_second = -1;
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origpos = outpos;
-    for (;;)
-      {
-	if (outpos - origpos >= count)
-	  break;
-	if (inpos >= inlength)
-	  break;
-	int b = inbuffer[inpos++];
-	if (b >= 0)
-	  outbuffer[outpos++] = (char) b;
-	else
-	  {
-	    if ((b & 0xC0) == 0x80) // Continuation byte
-	      {
-		partial = (partial << 6) | (b & 0x3F);
-		--partial_bytes_expected;
-		if (partial_bytes_expected == 1)
-		  {
-		    if (partial > (0xFFFF>>6))
-		      {
-			// The next continuation byte will cause the result
-			// to exceed 0xFFFF, so we must use a surrogate pair.
-			// The "Unicode scalar value" (see D28 in section 3.7
-			// of the Unicode Standard 2.0) is defined as:
-			// value == (hi-0xD800)*0x400+(lo-0xDC00)+0x10000,
-			// where (hi, lo) is the Unicode surrogate pair.
-			// After reading the first three bytes, we have:
-			// partial == (value >> 6).
-			// Substituting and simplifying, we get:
-			// partial == (hi-0xD800)*0x10+((lo-0xDC00)>>6)+0x400.
-			// The definition lo>=0xDC00 && lo<=0xDFFF implies
-			// that (lo-0xDC00)>>6 is in the range 0..15.
-			// Hence we can solve for `hi' and we can emit
-			// the high-surrogate without waiting for the
-			// final byte:
-			outbuffer[outpos++]
-			  = (char) (0xD800 + ((partial - 0x400) >> 4));
-
-			// Now we want to set it up so that when we read
-			// the final byte on the next iteration, we will
-			// get the low-surrogate without special handling.
-			// I.e. we want:
-			// lo == (next_partial << 6) | (next & 0x3F)
-			// where next is the next input byte and next_partial
-			// is the value of partial at the end of this
-			// iteration.  This implies:  next_partial == lo >> 6.
-			// We can simplify the previous:
-			// partial == (hi-0xD800)*0x10+((lo-0xDC00)>>6)+0x400,
-			// to: partial == (hi-0xD800)*0x10+(lo>>6)+0x90.
-			// Inserting the values of hi and next_partial,
-			// and simplifying, we get:  partial ==
-			// ( (partial-0x400)&~0xF) + next_partial + 0x90.
-			// Solving for next_partial, we get:
-			// next_partial = partial+0x400-0x90-(partial&~0xF):
-			// or: next_partial = (partial&0xF) + 0x370.  Hence:
-			partial = (partial & 0xF) + 0x370;
-		      }
-		  }
-		else if (partial_bytes_expected == 0)
-		  {
-		    outbuffer[outpos++] = (char) partial;
-		    partial = 0;
-		    partial_bytes_expected = 0;
-		  }
-	      }
-	    else // prefix byte
-	      {
-		if ((b & 0xE0) == 0xC0)
-		  {
-		    partial = b & 0x1F;
-		    partial_bytes_expected = 1;
-		  }
-		else if ((b & 0xF0) == 0xE0)
-		  {
-		    partial = b & 0xF;
-		    partial_bytes_expected = 2;
-		  }
-		else
-		  {
-		    partial = b & 7;
-		    partial_bytes_expected = 3;
-		  }
-	      }
-	  }
-      }
-    return outpos - origpos;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeBig.h b/libjava/gnu/gcj/convert/Input_UnicodeBig.h
deleted file mode 100644
index ec834ed..0000000
--- a/libjava/gnu/gcj/convert/Input_UnicodeBig.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_UnicodeBig__
-#define __gnu_gcj_convert_Input_UnicodeBig__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_UnicodeBig;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_UnicodeBig : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_UnicodeBig();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jchar __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
-  jint partial_count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_UnicodeBig__
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeBig.java b/libjava/gnu/gcj/convert/Input_UnicodeBig.java
deleted file mode 100644
index c8da2b9..0000000
--- a/libjava/gnu/gcj/convert/Input_UnicodeBig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (C) 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-public class Input_UnicodeBig extends BytesToUnicode
-{
-  /** 0, 8, or 16 bits of a partially constructed character. */
-  char partial;
-  /** How many bytes of partial are valid. */
-  int partial_count;
-
-  public String getName() { return "UnicodeBig"; }
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origcount = count;
-    for (;;)
-      {
-	if (partial_count == 2)
-	  {
-	    if (count == 0)
-	      break;
-	    if (partial == 0xFEFF)
-	      ; // drop byte order mark
-	    // else if (partial >= 0xFFFe)  ERROR;
-	    else
-	      outbuffer[outpos++] = partial;
-	    count--;
-	    partial_count = 0;
-	    partial = 0;
-	  }
-	else if (inpos >= inlength)
-	  break;
-	else
-	  {
-	    int b = inbuffer[inpos++] & 0xFF;
-	    partial = (char) (((int) partial << 8) + b);
-	    partial_count++;
-	  }
-      }
-    return origcount - count;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeLittle.h b/libjava/gnu/gcj/convert/Input_UnicodeLittle.h
deleted file mode 100644
index ddc3c06..0000000
--- a/libjava/gnu/gcj/convert/Input_UnicodeLittle.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_UnicodeLittle__
-#define __gnu_gcj_convert_Input_UnicodeLittle__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Input_UnicodeLittle;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_UnicodeLittle : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_UnicodeLittle();
-  virtual ::java::lang::String * getName();
-  virtual jint read(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jchar __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
-  jint partial_count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_UnicodeLittle__
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeLittle.java b/libjava/gnu/gcj/convert/Input_UnicodeLittle.java
deleted file mode 100644
index 89d9c53..0000000
--- a/libjava/gnu/gcj/convert/Input_UnicodeLittle.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (C) 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-public class Input_UnicodeLittle extends BytesToUnicode
-{
-  /** 0, 8, or 16 bits of a partially constructed character. */
-  char partial;
-  /** How many bytes of partial are valid. */
-  int partial_count;
-
-  public String getName() { return "UnicodeLittle"; }
-
-  public int read (char[] outbuffer, int outpos, int count)
-  {
-    int origcount = count;
-    for (;;)
-      {
-	if (partial_count == 2)
-	  {
-	    if (count == 0)
-	      break;
-	    if (partial == 0xFEFF)
-	      ; // drop byte order mark
-	    // else if (partial >= 0xFFFe)  ERROR;
-	    else
-	      outbuffer[outpos++] = partial;
-	    count--;
-	    partial_count = 0;
-	    partial = 0;
-	  }
-	else if (inpos >= inlength)
-	  break;
-	else
-	  {
-	    int b = inbuffer[inpos++] & 0xFF;
-	    partial = (char) (partial | (b << (8 * partial_count)));
-	    partial_count++;
-	  }
-      }
-    return origcount - count;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Input_iconv.h b/libjava/gnu/gcj/convert/Input_iconv.h
deleted file mode 100644
index 7fd8893..0000000
--- a/libjava/gnu/gcj/convert/Input_iconv.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Input_iconv__
-#define __gnu_gcj_convert_Input_iconv__
-
-#pragma interface
-
-#include <gnu/gcj/convert/BytesToUnicode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace convert
-      {
-          class Input_iconv;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Input_iconv : public ::gnu::gcj::convert::BytesToUnicode
-{
-
-public:
-  Input_iconv(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void finalize();
-private:
-  void init(::java::lang::String *);
-public:
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void done();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) encoding;
-  ::gnu::gcj::RawData * handle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Input_iconv__
diff --git a/libjava/gnu/gcj/convert/Input_iconv.java b/libjava/gnu/gcj/convert/Input_iconv.java
deleted file mode 100644
index a87878e..0000000
--- a/libjava/gnu/gcj/convert/Input_iconv.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Input_iconv.java -- Java side of iconv() reader.
-
-/* Copyright (C) 2000, 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-import gnu.gcj.RawData;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Convert bytes in some iconv-supported encoding to Unicode.
- * @author Tom Tromey <tromey@redhat.com>
- * @date January 30, 2000
- */
-
-public class Input_iconv extends BytesToUnicode
-{
-  public Input_iconv (String encoding) throws UnsupportedEncodingException
-  {
-    this.encoding = encoding;
-    this.handle = null;
-    init (encoding);
-  }
-
-  public String getName() { return encoding; }
-
-  public native void finalize ();
-  private native void init (String encoding)
-    throws UnsupportedEncodingException;
-  public native int read (char[] outbuffer, int outpos, int count);
-  public native void done ();
-
-  // The encoding we're using.
-  private String encoding;
-
-  // The iconv handle.
-  private RawData handle;
-}
diff --git a/libjava/gnu/gcj/convert/JIS0201.h b/libjava/gnu/gcj/convert/JIS0201.h
deleted file mode 100644
index 3a3b4f1..0000000
--- a/libjava/gnu/gcj/convert/JIS0201.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This file is automatically generated from Unicode tables */
-MAP(0x00, 0x20, 0x0020)  /* SPACE */
-MAP(0x00, 0x21, 0x0021)  /* EXCLAMATION MARK */
-MAP(0x00, 0x22, 0x0022)  /* QUOTATION MARK */
-MAP(0x00, 0x23, 0x0023)  /* NUMBER SIGN */
-MAP(0x00, 0x24, 0x0024)  /* DOLLAR SIGN */
-MAP(0x00, 0x25, 0x0025)  /* PERCENT SIGN */
-MAP(0x00, 0x26, 0x0026)  /* AMPERSAND */
-MAP(0x00, 0x27, 0x0027)  /* APOSTROPHE */
-MAP(0x00, 0x28, 0x0028)  /* LEFT PARENTHESIS */
-MAP(0x00, 0x29, 0x0029)  /* RIGHT PARENTHESIS */
-MAP(0x00, 0x2A, 0x002A)  /* ASTERISK */
-MAP(0x00, 0x2B, 0x002B)  /* PLUS SIGN */
-MAP(0x00, 0x2C, 0x002C)  /* COMMA */
-MAP(0x00, 0x2D, 0x002D)  /* HYPHEN-MINUS */
-MAP(0x00, 0x2E, 0x002E)  /* FULL STOP */
-MAP(0x00, 0x2F, 0x002F)  /* SOLIDUS */
-MAP(0x00, 0x30, 0x0030)  /* DIGIT ZERO */
-MAP(0x00, 0x31, 0x0031)  /* DIGIT ONE */
-MAP(0x00, 0x32, 0x0032)  /* DIGIT TWO */
-MAP(0x00, 0x33, 0x0033)  /* DIGIT THREE */
-MAP(0x00, 0x34, 0x0034)  /* DIGIT FOUR */
-MAP(0x00, 0x35, 0x0035)  /* DIGIT FIVE */
-MAP(0x00, 0x36, 0x0036)  /* DIGIT SIX */
-MAP(0x00, 0x37, 0x0037)  /* DIGIT SEVEN */
-MAP(0x00, 0x38, 0x0038)  /* DIGIT EIGHT */
-MAP(0x00, 0x39, 0x0039)  /* DIGIT NINE */
-MAP(0x00, 0x3A, 0x003A)  /* COLON */
-MAP(0x00, 0x3B, 0x003B)  /* SEMICOLON */
-MAP(0x00, 0x3C, 0x003C)  /* LESS-THAN SIGN */
-MAP(0x00, 0x3D, 0x003D)  /* EQUALS SIGN */
-MAP(0x00, 0x3E, 0x003E)  /* GREATER-THAN SIGN */
-MAP(0x00, 0x3F, 0x003F)  /* QUESTION MARK */
-MAP(0x00, 0x40, 0x0040)  /* COMMERCIAL AT */
-MAP(0x00, 0x41, 0x0041)  /* LATIN CAPITAL LETTER A */
-MAP(0x00, 0x42, 0x0042)  /* LATIN CAPITAL LETTER B */
-MAP(0x00, 0x43, 0x0043)  /* LATIN CAPITAL LETTER C */
-MAP(0x00, 0x44, 0x0044)  /* LATIN CAPITAL LETTER D */
-MAP(0x00, 0x45, 0x0045)  /* LATIN CAPITAL LETTER E */
-MAP(0x00, 0x46, 0x0046)  /* LATIN CAPITAL LETTER F */
-MAP(0x00, 0x47, 0x0047)  /* LATIN CAPITAL LETTER G */
-MAP(0x00, 0x48, 0x0048)  /* LATIN CAPITAL LETTER H */
-MAP(0x00, 0x49, 0x0049)  /* LATIN CAPITAL LETTER I */
-MAP(0x00, 0x4A, 0x004A)  /* LATIN CAPITAL LETTER J */
-MAP(0x00, 0x4B, 0x004B)  /* LATIN CAPITAL LETTER K */
-MAP(0x00, 0x4C, 0x004C)  /* LATIN CAPITAL LETTER L */
-MAP(0x00, 0x4D, 0x004D)  /* LATIN CAPITAL LETTER M */
-MAP(0x00, 0x4E, 0x004E)  /* LATIN CAPITAL LETTER N */
-MAP(0x00, 0x4F, 0x004F)  /* LATIN CAPITAL LETTER O */
-MAP(0x00, 0x50, 0x0050)  /* LATIN CAPITAL LETTER P */
-MAP(0x00, 0x51, 0x0051)  /* LATIN CAPITAL LETTER Q */
-MAP(0x00, 0x52, 0x0052)  /* LATIN CAPITAL LETTER R */
-MAP(0x00, 0x53, 0x0053)  /* LATIN CAPITAL LETTER S */
-MAP(0x00, 0x54, 0x0054)  /* LATIN CAPITAL LETTER T */
-MAP(0x00, 0x55, 0x0055)  /* LATIN CAPITAL LETTER U */
-MAP(0x00, 0x56, 0x0056)  /* LATIN CAPITAL LETTER V */
-MAP(0x00, 0x57, 0x0057)  /* LATIN CAPITAL LETTER W */
-MAP(0x00, 0x58, 0x0058)  /* LATIN CAPITAL LETTER X */
-MAP(0x00, 0x59, 0x0059)  /* LATIN CAPITAL LETTER Y */
-MAP(0x00, 0x5A, 0x005A)  /* LATIN CAPITAL LETTER Z */
-MAP(0x00, 0x5B, 0x005B)  /* LEFT SQUARE BRACKET */
-MAP(0x00, 0x5C, 0x00A5)  /* YEN SIGN */
-MAP(0x00, 0x5D, 0x005D)  /* RIGHT SQUARE BRACKET */
-MAP(0x00, 0x5E, 0x005E)  /* CIRCUMFLEX ACCENT */
-MAP(0x00, 0x5F, 0x005F)  /* LOW LINE */
-MAP(0x00, 0x60, 0x0060)  /* GRAVE ACCENT */
-MAP(0x00, 0x61, 0x0061)  /* LATIN SMALL LETTER A */
-MAP(0x00, 0x62, 0x0062)  /* LATIN SMALL LETTER B */
-MAP(0x00, 0x63, 0x0063)  /* LATIN SMALL LETTER C */
-MAP(0x00, 0x64, 0x0064)  /* LATIN SMALL LETTER D */
-MAP(0x00, 0x65, 0x0065)  /* LATIN SMALL LETTER E */
-MAP(0x00, 0x66, 0x0066)  /* LATIN SMALL LETTER F */
-MAP(0x00, 0x67, 0x0067)  /* LATIN SMALL LETTER G */
-MAP(0x00, 0x68, 0x0068)  /* LATIN SMALL LETTER H */
-MAP(0x00, 0x69, 0x0069)  /* LATIN SMALL LETTER I */
-MAP(0x00, 0x6A, 0x006A)  /* LATIN SMALL LETTER J */
-MAP(0x00, 0x6B, 0x006B)  /* LATIN SMALL LETTER K */
-MAP(0x00, 0x6C, 0x006C)  /* LATIN SMALL LETTER L */
-MAP(0x00, 0x6D, 0x006D)  /* LATIN SMALL LETTER M */
-MAP(0x00, 0x6E, 0x006E)  /* LATIN SMALL LETTER N */
-MAP(0x00, 0x6F, 0x006F)  /* LATIN SMALL LETTER O */
-MAP(0x00, 0x70, 0x0070)  /* LATIN SMALL LETTER P */
-MAP(0x00, 0x71, 0x0071)  /* LATIN SMALL LETTER Q */
-MAP(0x00, 0x72, 0x0072)  /* LATIN SMALL LETTER R */
-MAP(0x00, 0x73, 0x0073)  /* LATIN SMALL LETTER S */
-MAP(0x00, 0x74, 0x0074)  /* LATIN SMALL LETTER T */
-MAP(0x00, 0x75, 0x0075)  /* LATIN SMALL LETTER U */
-MAP(0x00, 0x76, 0x0076)  /* LATIN SMALL LETTER V */
-MAP(0x00, 0x77, 0x0077)  /* LATIN SMALL LETTER W */
-MAP(0x00, 0x78, 0x0078)  /* LATIN SMALL LETTER X */
-MAP(0x00, 0x79, 0x0079)  /* LATIN SMALL LETTER Y */
-MAP(0x00, 0x7A, 0x007A)  /* LATIN SMALL LETTER Z */
-MAP(0x00, 0x7B, 0x007B)  /* LEFT CURLY BRACKET */
-MAP(0x00, 0x7C, 0x007C)  /* VERTICAL LINE */
-MAP(0x00, 0x7D, 0x007D)  /* RIGHT CURLY BRACKET */
-MAP(0x00, 0x7E, 0x203E)  /* OVERLINE */
-MAP(0x00, 0xA1, 0xFF61)  /* HALFWIDTH IDEOGRAPHIC FULL STOP */
-MAP(0x00, 0xA2, 0xFF62)  /* HALFWIDTH LEFT CORNER BRACKET */
-MAP(0x00, 0xA3, 0xFF63)  /* HALFWIDTH RIGHT CORNER BRACKET */
-MAP(0x00, 0xA4, 0xFF64)  /* HALFWIDTH IDEOGRAPHIC COMMA */
-MAP(0x00, 0xA5, 0xFF65)  /* HALFWIDTH KATAKANA MIDDLE DOT */
-MAP(0x00, 0xA6, 0xFF66)  /* HALFWIDTH KATAKANA LETTER WO */
-MAP(0x00, 0xA7, 0xFF67)  /* HALFWIDTH KATAKANA LETTER SMALL A */
-MAP(0x00, 0xA8, 0xFF68)  /* HALFWIDTH KATAKANA LETTER SMALL I */
-MAP(0x00, 0xA9, 0xFF69)  /* HALFWIDTH KATAKANA LETTER SMALL U */
-MAP(0x00, 0xAA, 0xFF6A)  /* HALFWIDTH KATAKANA LETTER SMALL E */
-MAP(0x00, 0xAB, 0xFF6B)  /* HALFWIDTH KATAKANA LETTER SMALL O */
-MAP(0x00, 0xAC, 0xFF6C)  /* HALFWIDTH KATAKANA LETTER SMALL YA */
-MAP(0x00, 0xAD, 0xFF6D)  /* HALFWIDTH KATAKANA LETTER SMALL YU */
-MAP(0x00, 0xAE, 0xFF6E)  /* HALFWIDTH KATAKANA LETTER SMALL YO */
-MAP(0x00, 0xAF, 0xFF6F)  /* HALFWIDTH KATAKANA LETTER SMALL TU */
-MAP(0x00, 0xB0, 0xFF70)  /* HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-MAP(0x00, 0xB1, 0xFF71)  /* HALFWIDTH KATAKANA LETTER A */
-MAP(0x00, 0xB2, 0xFF72)  /* HALFWIDTH KATAKANA LETTER I */
-MAP(0x00, 0xB3, 0xFF73)  /* HALFWIDTH KATAKANA LETTER U */
-MAP(0x00, 0xB4, 0xFF74)  /* HALFWIDTH KATAKANA LETTER E */
-MAP(0x00, 0xB5, 0xFF75)  /* HALFWIDTH KATAKANA LETTER O */
-MAP(0x00, 0xB6, 0xFF76)  /* HALFWIDTH KATAKANA LETTER KA */
-MAP(0x00, 0xB7, 0xFF77)  /* HALFWIDTH KATAKANA LETTER KI */
-MAP(0x00, 0xB8, 0xFF78)  /* HALFWIDTH KATAKANA LETTER KU */
-MAP(0x00, 0xB9, 0xFF79)  /* HALFWIDTH KATAKANA LETTER KE */
-MAP(0x00, 0xBA, 0xFF7A)  /* HALFWIDTH KATAKANA LETTER KO */
-MAP(0x00, 0xBB, 0xFF7B)  /* HALFWIDTH KATAKANA LETTER SA */
-MAP(0x00, 0xBC, 0xFF7C)  /* HALFWIDTH KATAKANA LETTER SI */
-MAP(0x00, 0xBD, 0xFF7D)  /* HALFWIDTH KATAKANA LETTER SU */
-MAP(0x00, 0xBE, 0xFF7E)  /* HALFWIDTH KATAKANA LETTER SE */
-MAP(0x00, 0xBF, 0xFF7F)  /* HALFWIDTH KATAKANA LETTER SO */
-MAP(0x00, 0xC0, 0xFF80)  /* HALFWIDTH KATAKANA LETTER TA */
-MAP(0x00, 0xC1, 0xFF81)  /* HALFWIDTH KATAKANA LETTER TI */
-MAP(0x00, 0xC2, 0xFF82)  /* HALFWIDTH KATAKANA LETTER TU */
-MAP(0x00, 0xC3, 0xFF83)  /* HALFWIDTH KATAKANA LETTER TE */
-MAP(0x00, 0xC4, 0xFF84)  /* HALFWIDTH KATAKANA LETTER TO */
-MAP(0x00, 0xC5, 0xFF85)  /* HALFWIDTH KATAKANA LETTER NA */
-MAP(0x00, 0xC6, 0xFF86)  /* HALFWIDTH KATAKANA LETTER NI */
-MAP(0x00, 0xC7, 0xFF87)  /* HALFWIDTH KATAKANA LETTER NU */
-MAP(0x00, 0xC8, 0xFF88)  /* HALFWIDTH KATAKANA LETTER NE */
-MAP(0x00, 0xC9, 0xFF89)  /* HALFWIDTH KATAKANA LETTER NO */
-MAP(0x00, 0xCA, 0xFF8A)  /* HALFWIDTH KATAKANA LETTER HA */
-MAP(0x00, 0xCB, 0xFF8B)  /* HALFWIDTH KATAKANA LETTER HI */
-MAP(0x00, 0xCC, 0xFF8C)  /* HALFWIDTH KATAKANA LETTER HU */
-MAP(0x00, 0xCD, 0xFF8D)  /* HALFWIDTH KATAKANA LETTER HE */
-MAP(0x00, 0xCE, 0xFF8E)  /* HALFWIDTH KATAKANA LETTER HO */
-MAP(0x00, 0xCF, 0xFF8F)  /* HALFWIDTH KATAKANA LETTER MA */
-MAP(0x00, 0xD0, 0xFF90)  /* HALFWIDTH KATAKANA LETTER MI */
-MAP(0x00, 0xD1, 0xFF91)  /* HALFWIDTH KATAKANA LETTER MU */
-MAP(0x00, 0xD2, 0xFF92)  /* HALFWIDTH KATAKANA LETTER ME */
-MAP(0x00, 0xD3, 0xFF93)  /* HALFWIDTH KATAKANA LETTER MO */
-MAP(0x00, 0xD4, 0xFF94)  /* HALFWIDTH KATAKANA LETTER YA */
-MAP(0x00, 0xD5, 0xFF95)  /* HALFWIDTH KATAKANA LETTER YU */
-MAP(0x00, 0xD6, 0xFF96)  /* HALFWIDTH KATAKANA LETTER YO */
-MAP(0x00, 0xD7, 0xFF97)  /* HALFWIDTH KATAKANA LETTER RA */
-MAP(0x00, 0xD8, 0xFF98)  /* HALFWIDTH KATAKANA LETTER RI */
-MAP(0x00, 0xD9, 0xFF99)  /* HALFWIDTH KATAKANA LETTER RU */
-MAP(0x00, 0xDA, 0xFF9A)  /* HALFWIDTH KATAKANA LETTER RE */
-MAP(0x00, 0xDB, 0xFF9B)  /* HALFWIDTH KATAKANA LETTER RO */
-MAP(0x00, 0xDC, 0xFF9C)  /* HALFWIDTH KATAKANA LETTER WA */
-MAP(0x00, 0xDD, 0xFF9D)  /* HALFWIDTH KATAKANA LETTER N */
-MAP(0x00, 0xDE, 0xFF9E)  /* HALFWIDTH KATAKANA VOICED SOUND MARK */
-MAP(0x00, 0xDF, 0xFF9F)  /* HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK */
diff --git a/libjava/gnu/gcj/convert/JIS0208.h b/libjava/gnu/gcj/convert/JIS0208.h
deleted file mode 100644
index d0406fa..0000000
--- a/libjava/gnu/gcj/convert/JIS0208.h
+++ /dev/null
@@ -1,6880 +0,0 @@
-/* This file is automatically generated from Unicode tables */
-MAP(0x21, 0x21, 0x3000)  /* IDEOGRAPHIC SPACE */
-MAP(0x21, 0x22, 0x3001)  /* IDEOGRAPHIC COMMA */
-MAP(0x21, 0x23, 0x3002)  /* IDEOGRAPHIC FULL STOP */
-MAP(0x21, 0x24, 0xFF0C)  /* FULLWIDTH COMMA */
-MAP(0x21, 0x25, 0xFF0E)  /* FULLWIDTH FULL STOP */
-MAP(0x21, 0x26, 0x30FB)  /* KATAKANA MIDDLE DOT */
-MAP(0x21, 0x27, 0xFF1A)  /* FULLWIDTH COLON */
-MAP(0x21, 0x28, 0xFF1B)  /* FULLWIDTH SEMICOLON */
-MAP(0x21, 0x29, 0xFF1F)  /* FULLWIDTH QUESTION MARK */
-MAP(0x21, 0x2A, 0xFF01)  /* FULLWIDTH EXCLAMATION MARK */
-MAP(0x21, 0x2B, 0x309B)  /* KATAKANA-HIRAGANA VOICED SOUND MARK */
-MAP(0x21, 0x2C, 0x309C)  /* KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-MAP(0x21, 0x2D, 0x00B4)  /* ACUTE ACCENT */
-MAP(0x21, 0x2E, 0xFF40)  /* FULLWIDTH GRAVE ACCENT */
-MAP(0x21, 0x2F, 0x00A8)  /* DIAERESIS */
-MAP(0x21, 0x30, 0xFF3E)  /* FULLWIDTH CIRCUMFLEX ACCENT */
-MAP(0x21, 0x31, 0xFFE3)  /* FULLWIDTH MACRON */
-MAP(0x21, 0x32, 0xFF3F)  /* FULLWIDTH LOW LINE */
-MAP(0x21, 0x33, 0x30FD)  /* KATAKANA ITERATION MARK */
-MAP(0x21, 0x34, 0x30FE)  /* KATAKANA VOICED ITERATION MARK */
-MAP(0x21, 0x35, 0x309D)  /* HIRAGANA ITERATION MARK */
-MAP(0x21, 0x36, 0x309E)  /* HIRAGANA VOICED ITERATION MARK */
-MAP(0x21, 0x37, 0x3003)  /* DITTO MARK */
-MAP(0x21, 0x38, 0x4EDD)  /* <CJK> */
-MAP(0x21, 0x39, 0x3005)  /* IDEOGRAPHIC ITERATION MARK */
-MAP(0x21, 0x3A, 0x3006)  /* IDEOGRAPHIC CLOSING MARK */
-MAP(0x21, 0x3B, 0x3007)  /* IDEOGRAPHIC NUMBER ZERO */
-MAP(0x21, 0x3C, 0x30FC)  /* KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-MAP(0x21, 0x3D, 0x2015)  /* HORIZONTAL BAR */
-MAP(0x21, 0x3E, 0x2010)  /* HYPHEN */
-MAP(0x21, 0x3F, 0xFF0F)  /* FULLWIDTH SOLIDUS */
-MAP(0x21, 0x40, 0x005C)  /* REVERSE SOLIDUS */
-MAP(0x21, 0x41, 0x301C)  /* WAVE DASH */
-MAP(0x21, 0x42, 0x2016)  /* DOUBLE VERTICAL LINE */
-MAP(0x21, 0x43, 0xFF5C)  /* FULLWIDTH VERTICAL LINE */
-MAP(0x21, 0x44, 0x2026)  /* HORIZONTAL ELLIPSIS */
-MAP(0x21, 0x45, 0x2025)  /* TWO DOT LEADER */
-MAP(0x21, 0x46, 0x2018)  /* LEFT SINGLE QUOTATION MARK */
-MAP(0x21, 0x47, 0x2019)  /* RIGHT SINGLE QUOTATION MARK */
-MAP(0x21, 0x48, 0x201C)  /* LEFT DOUBLE QUOTATION MARK */
-MAP(0x21, 0x49, 0x201D)  /* RIGHT DOUBLE QUOTATION MARK */
-MAP(0x21, 0x4A, 0xFF08)  /* FULLWIDTH LEFT PARENTHESIS */
-MAP(0x21, 0x4B, 0xFF09)  /* FULLWIDTH RIGHT PARENTHESIS */
-MAP(0x21, 0x4C, 0x3014)  /* LEFT TORTOISE SHELL BRACKET */
-MAP(0x21, 0x4D, 0x3015)  /* RIGHT TORTOISE SHELL BRACKET */
-MAP(0x21, 0x4E, 0xFF3B)  /* FULLWIDTH LEFT SQUARE BRACKET */
-MAP(0x21, 0x4F, 0xFF3D)  /* FULLWIDTH RIGHT SQUARE BRACKET */
-MAP(0x21, 0x50, 0xFF5B)  /* FULLWIDTH LEFT CURLY BRACKET */
-MAP(0x21, 0x51, 0xFF5D)  /* FULLWIDTH RIGHT CURLY BRACKET */
-MAP(0x21, 0x52, 0x3008)  /* LEFT ANGLE BRACKET */
-MAP(0x21, 0x53, 0x3009)  /* RIGHT ANGLE BRACKET */
-MAP(0x21, 0x54, 0x300A)  /* LEFT DOUBLE ANGLE BRACKET */
-MAP(0x21, 0x55, 0x300B)  /* RIGHT DOUBLE ANGLE BRACKET */
-MAP(0x21, 0x56, 0x300C)  /* LEFT CORNER BRACKET */
-MAP(0x21, 0x57, 0x300D)  /* RIGHT CORNER BRACKET */
-MAP(0x21, 0x58, 0x300E)  /* LEFT WHITE CORNER BRACKET */
-MAP(0x21, 0x59, 0x300F)  /* RIGHT WHITE CORNER BRACKET */
-MAP(0x21, 0x5A, 0x3010)  /* LEFT BLACK LENTICULAR BRACKET */
-MAP(0x21, 0x5B, 0x3011)  /* RIGHT BLACK LENTICULAR BRACKET */
-MAP(0x21, 0x5C, 0xFF0B)  /* FULLWIDTH PLUS SIGN */
-MAP(0x21, 0x5D, 0x2212)  /* MINUS SIGN */
-MAP(0x21, 0x5E, 0x00B1)  /* PLUS-MINUS SIGN */
-MAP(0x21, 0x5F, 0x00D7)  /* MULTIPLICATION SIGN */
-MAP(0x21, 0x60, 0x00F7)  /* DIVISION SIGN */
-MAP(0x21, 0x61, 0xFF1D)  /* FULLWIDTH EQUALS SIGN */
-MAP(0x21, 0x62, 0x2260)  /* NOT EQUAL TO */
-MAP(0x21, 0x63, 0xFF1C)  /* FULLWIDTH LESS-THAN SIGN */
-MAP(0x21, 0x64, 0xFF1E)  /* FULLWIDTH GREATER-THAN SIGN */
-MAP(0x21, 0x65, 0x2266)  /* LESS-THAN OVER EQUAL TO */
-MAP(0x21, 0x66, 0x2267)  /* GREATER-THAN OVER EQUAL TO */
-MAP(0x21, 0x67, 0x221E)  /* INFINITY */
-MAP(0x21, 0x68, 0x2234)  /* THEREFORE */
-MAP(0x21, 0x69, 0x2642)  /* MALE SIGN */
-MAP(0x21, 0x6A, 0x2640)  /* FEMALE SIGN */
-MAP(0x21, 0x6B, 0x00B0)  /* DEGREE SIGN */
-MAP(0x21, 0x6C, 0x2032)  /* PRIME */
-MAP(0x21, 0x6D, 0x2033)  /* DOUBLE PRIME */
-MAP(0x21, 0x6E, 0x2103)  /* DEGREE CELSIUS */
-MAP(0x21, 0x6F, 0xFFE5)  /* FULLWIDTH YEN SIGN */
-MAP(0x21, 0x70, 0xFF04)  /* FULLWIDTH DOLLAR SIGN */
-MAP(0x21, 0x71, 0x00A2)  /* CENT SIGN */
-MAP(0x21, 0x72, 0x00A3)  /* POUND SIGN */
-MAP(0x21, 0x73, 0xFF05)  /* FULLWIDTH PERCENT SIGN */
-MAP(0x21, 0x74, 0xFF03)  /* FULLWIDTH NUMBER SIGN */
-MAP(0x21, 0x75, 0xFF06)  /* FULLWIDTH AMPERSAND */
-MAP(0x21, 0x76, 0xFF0A)  /* FULLWIDTH ASTERISK */
-MAP(0x21, 0x77, 0xFF20)  /* FULLWIDTH COMMERCIAL AT */
-MAP(0x21, 0x78, 0x00A7)  /* SECTION SIGN */
-MAP(0x21, 0x79, 0x2606)  /* WHITE STAR */
-MAP(0x21, 0x7A, 0x2605)  /* BLACK STAR */
-MAP(0x21, 0x7B, 0x25CB)  /* WHITE CIRCLE */
-MAP(0x21, 0x7C, 0x25CF)  /* BLACK CIRCLE */
-MAP(0x21, 0x7D, 0x25CE)  /* BULLSEYE */
-MAP(0x21, 0x7E, 0x25C7)  /* WHITE DIAMOND */
-MAP(0x22, 0x21, 0x25C6)  /* BLACK DIAMOND */
-MAP(0x22, 0x22, 0x25A1)  /* WHITE SQUARE */
-MAP(0x22, 0x23, 0x25A0)  /* BLACK SQUARE */
-MAP(0x22, 0x24, 0x25B3)  /* WHITE UP-POINTING TRIANGLE */
-MAP(0x22, 0x25, 0x25B2)  /* BLACK UP-POINTING TRIANGLE */
-MAP(0x22, 0x26, 0x25BD)  /* WHITE DOWN-POINTING TRIANGLE */
-MAP(0x22, 0x27, 0x25BC)  /* BLACK DOWN-POINTING TRIANGLE */
-MAP(0x22, 0x28, 0x203B)  /* REFERENCE MARK */
-MAP(0x22, 0x29, 0x3012)  /* POSTAL MARK */
-MAP(0x22, 0x2A, 0x2192)  /* RIGHTWARDS ARROW */
-MAP(0x22, 0x2B, 0x2190)  /* LEFTWARDS ARROW */
-MAP(0x22, 0x2C, 0x2191)  /* UPWARDS ARROW */
-MAP(0x22, 0x2D, 0x2193)  /* DOWNWARDS ARROW */
-MAP(0x22, 0x2E, 0x3013)  /* GETA MARK */
-MAP(0x22, 0x3A, 0x2208)  /* ELEMENT OF */
-MAP(0x22, 0x3B, 0x220B)  /* CONTAINS AS MEMBER */
-MAP(0x22, 0x3C, 0x2286)  /* SUBSET OF OR EQUAL TO */
-MAP(0x22, 0x3D, 0x2287)  /* SUPERSET OF OR EQUAL TO */
-MAP(0x22, 0x3E, 0x2282)  /* SUBSET OF */
-MAP(0x22, 0x3F, 0x2283)  /* SUPERSET OF */
-MAP(0x22, 0x40, 0x222A)  /* UNION */
-MAP(0x22, 0x41, 0x2229)  /* INTERSECTION */
-MAP(0x22, 0x4A, 0x2227)  /* LOGICAL AND */
-MAP(0x22, 0x4B, 0x2228)  /* LOGICAL OR */
-MAP(0x22, 0x4C, 0x00AC)  /* NOT SIGN */
-MAP(0x22, 0x4D, 0x21D2)  /* RIGHTWARDS DOUBLE ARROW */
-MAP(0x22, 0x4E, 0x21D4)  /* LEFT RIGHT DOUBLE ARROW */
-MAP(0x22, 0x4F, 0x2200)  /* FOR ALL */
-MAP(0x22, 0x50, 0x2203)  /* THERE EXISTS */
-MAP(0x22, 0x5C, 0x2220)  /* ANGLE */
-MAP(0x22, 0x5D, 0x22A5)  /* UP TACK */
-MAP(0x22, 0x5E, 0x2312)  /* ARC */
-MAP(0x22, 0x5F, 0x2202)  /* PARTIAL DIFFERENTIAL */
-MAP(0x22, 0x60, 0x2207)  /* NABLA */
-MAP(0x22, 0x61, 0x2261)  /* IDENTICAL TO */
-MAP(0x22, 0x62, 0x2252)  /* APPROXIMATELY EQUAL TO OR THE IMAGE OF */
-MAP(0x22, 0x63, 0x226A)  /* MUCH LESS-THAN */
-MAP(0x22, 0x64, 0x226B)  /* MUCH GREATER-THAN */
-MAP(0x22, 0x65, 0x221A)  /* SQUARE ROOT */
-MAP(0x22, 0x66, 0x223D)  /* REVERSED TILDE */
-MAP(0x22, 0x67, 0x221D)  /* PROPORTIONAL TO */
-MAP(0x22, 0x68, 0x2235)  /* BECAUSE */
-MAP(0x22, 0x69, 0x222B)  /* INTEGRAL */
-MAP(0x22, 0x6A, 0x222C)  /* DOUBLE INTEGRAL */
-MAP(0x22, 0x72, 0x212B)  /* ANGSTROM SIGN */
-MAP(0x22, 0x73, 0x2030)  /* PER MILLE SIGN */
-MAP(0x22, 0x74, 0x266F)  /* MUSIC SHARP SIGN */
-MAP(0x22, 0x75, 0x266D)  /* MUSIC FLAT SIGN */
-MAP(0x22, 0x76, 0x266A)  /* EIGHTH NOTE */
-MAP(0x22, 0x77, 0x2020)  /* DAGGER */
-MAP(0x22, 0x78, 0x2021)  /* DOUBLE DAGGER */
-MAP(0x22, 0x79, 0x00B6)  /* PILCROW SIGN */
-MAP(0x22, 0x7E, 0x25EF)  /* LARGE CIRCLE */
-MAP(0x23, 0x30, 0xFF10)  /* FULLWIDTH DIGIT ZERO */
-MAP(0x23, 0x31, 0xFF11)  /* FULLWIDTH DIGIT ONE */
-MAP(0x23, 0x32, 0xFF12)  /* FULLWIDTH DIGIT TWO */
-MAP(0x23, 0x33, 0xFF13)  /* FULLWIDTH DIGIT THREE */
-MAP(0x23, 0x34, 0xFF14)  /* FULLWIDTH DIGIT FOUR */
-MAP(0x23, 0x35, 0xFF15)  /* FULLWIDTH DIGIT FIVE */
-MAP(0x23, 0x36, 0xFF16)  /* FULLWIDTH DIGIT SIX */
-MAP(0x23, 0x37, 0xFF17)  /* FULLWIDTH DIGIT SEVEN */
-MAP(0x23, 0x38, 0xFF18)  /* FULLWIDTH DIGIT EIGHT */
-MAP(0x23, 0x39, 0xFF19)  /* FULLWIDTH DIGIT NINE */
-MAP(0x23, 0x41, 0xFF21)  /* FULLWIDTH LATIN CAPITAL LETTER A */
-MAP(0x23, 0x42, 0xFF22)  /* FULLWIDTH LATIN CAPITAL LETTER B */
-MAP(0x23, 0x43, 0xFF23)  /* FULLWIDTH LATIN CAPITAL LETTER C */
-MAP(0x23, 0x44, 0xFF24)  /* FULLWIDTH LATIN CAPITAL LETTER D */
-MAP(0x23, 0x45, 0xFF25)  /* FULLWIDTH LATIN CAPITAL LETTER E */
-MAP(0x23, 0x46, 0xFF26)  /* FULLWIDTH LATIN CAPITAL LETTER F */
-MAP(0x23, 0x47, 0xFF27)  /* FULLWIDTH LATIN CAPITAL LETTER G */
-MAP(0x23, 0x48, 0xFF28)  /* FULLWIDTH LATIN CAPITAL LETTER H */
-MAP(0x23, 0x49, 0xFF29)  /* FULLWIDTH LATIN CAPITAL LETTER I */
-MAP(0x23, 0x4A, 0xFF2A)  /* FULLWIDTH LATIN CAPITAL LETTER J */
-MAP(0x23, 0x4B, 0xFF2B)  /* FULLWIDTH LATIN CAPITAL LETTER K */
-MAP(0x23, 0x4C, 0xFF2C)  /* FULLWIDTH LATIN CAPITAL LETTER L */
-MAP(0x23, 0x4D, 0xFF2D)  /* FULLWIDTH LATIN CAPITAL LETTER M */
-MAP(0x23, 0x4E, 0xFF2E)  /* FULLWIDTH LATIN CAPITAL LETTER N */
-MAP(0x23, 0x4F, 0xFF2F)  /* FULLWIDTH LATIN CAPITAL LETTER O */
-MAP(0x23, 0x50, 0xFF30)  /* FULLWIDTH LATIN CAPITAL LETTER P */
-MAP(0x23, 0x51, 0xFF31)  /* FULLWIDTH LATIN CAPITAL LETTER Q */
-MAP(0x23, 0x52, 0xFF32)  /* FULLWIDTH LATIN CAPITAL LETTER R */
-MAP(0x23, 0x53, 0xFF33)  /* FULLWIDTH LATIN CAPITAL LETTER S */
-MAP(0x23, 0x54, 0xFF34)  /* FULLWIDTH LATIN CAPITAL LETTER T */
-MAP(0x23, 0x55, 0xFF35)  /* FULLWIDTH LATIN CAPITAL LETTER U */
-MAP(0x23, 0x56, 0xFF36)  /* FULLWIDTH LATIN CAPITAL LETTER V */
-MAP(0x23, 0x57, 0xFF37)  /* FULLWIDTH LATIN CAPITAL LETTER W */
-MAP(0x23, 0x58, 0xFF38)  /* FULLWIDTH LATIN CAPITAL LETTER X */
-MAP(0x23, 0x59, 0xFF39)  /* FULLWIDTH LATIN CAPITAL LETTER Y */
-MAP(0x23, 0x5A, 0xFF3A)  /* FULLWIDTH LATIN CAPITAL LETTER Z */
-MAP(0x23, 0x61, 0xFF41)  /* FULLWIDTH LATIN SMALL LETTER A */
-MAP(0x23, 0x62, 0xFF42)  /* FULLWIDTH LATIN SMALL LETTER B */
-MAP(0x23, 0x63, 0xFF43)  /* FULLWIDTH LATIN SMALL LETTER C */
-MAP(0x23, 0x64, 0xFF44)  /* FULLWIDTH LATIN SMALL LETTER D */
-MAP(0x23, 0x65, 0xFF45)  /* FULLWIDTH LATIN SMALL LETTER E */
-MAP(0x23, 0x66, 0xFF46)  /* FULLWIDTH LATIN SMALL LETTER F */
-MAP(0x23, 0x67, 0xFF47)  /* FULLWIDTH LATIN SMALL LETTER G */
-MAP(0x23, 0x68, 0xFF48)  /* FULLWIDTH LATIN SMALL LETTER H */
-MAP(0x23, 0x69, 0xFF49)  /* FULLWIDTH LATIN SMALL LETTER I */
-MAP(0x23, 0x6A, 0xFF4A)  /* FULLWIDTH LATIN SMALL LETTER J */
-MAP(0x23, 0x6B, 0xFF4B)  /* FULLWIDTH LATIN SMALL LETTER K */
-MAP(0x23, 0x6C, 0xFF4C)  /* FULLWIDTH LATIN SMALL LETTER L */
-MAP(0x23, 0x6D, 0xFF4D)  /* FULLWIDTH LATIN SMALL LETTER M */
-MAP(0x23, 0x6E, 0xFF4E)  /* FULLWIDTH LATIN SMALL LETTER N */
-MAP(0x23, 0x6F, 0xFF4F)  /* FULLWIDTH LATIN SMALL LETTER O */
-MAP(0x23, 0x70, 0xFF50)  /* FULLWIDTH LATIN SMALL LETTER P */
-MAP(0x23, 0x71, 0xFF51)  /* FULLWIDTH LATIN SMALL LETTER Q */
-MAP(0x23, 0x72, 0xFF52)  /* FULLWIDTH LATIN SMALL LETTER R */
-MAP(0x23, 0x73, 0xFF53)  /* FULLWIDTH LATIN SMALL LETTER S */
-MAP(0x23, 0x74, 0xFF54)  /* FULLWIDTH LATIN SMALL LETTER T */
-MAP(0x23, 0x75, 0xFF55)  /* FULLWIDTH LATIN SMALL LETTER U */
-MAP(0x23, 0x76, 0xFF56)  /* FULLWIDTH LATIN SMALL LETTER V */
-MAP(0x23, 0x77, 0xFF57)  /* FULLWIDTH LATIN SMALL LETTER W */
-MAP(0x23, 0x78, 0xFF58)  /* FULLWIDTH LATIN SMALL LETTER X */
-MAP(0x23, 0x79, 0xFF59)  /* FULLWIDTH LATIN SMALL LETTER Y */
-MAP(0x23, 0x7A, 0xFF5A)  /* FULLWIDTH LATIN SMALL LETTER Z */
-MAP(0x24, 0x21, 0x3041)  /* HIRAGANA LETTER SMALL A */
-MAP(0x24, 0x22, 0x3042)  /* HIRAGANA LETTER A */
-MAP(0x24, 0x23, 0x3043)  /* HIRAGANA LETTER SMALL I */
-MAP(0x24, 0x24, 0x3044)  /* HIRAGANA LETTER I */
-MAP(0x24, 0x25, 0x3045)  /* HIRAGANA LETTER SMALL U */
-MAP(0x24, 0x26, 0x3046)  /* HIRAGANA LETTER U */
-MAP(0x24, 0x27, 0x3047)  /* HIRAGANA LETTER SMALL E */
-MAP(0x24, 0x28, 0x3048)  /* HIRAGANA LETTER E */
-MAP(0x24, 0x29, 0x3049)  /* HIRAGANA LETTER SMALL O */
-MAP(0x24, 0x2A, 0x304A)  /* HIRAGANA LETTER O */
-MAP(0x24, 0x2B, 0x304B)  /* HIRAGANA LETTER KA */
-MAP(0x24, 0x2C, 0x304C)  /* HIRAGANA LETTER GA */
-MAP(0x24, 0x2D, 0x304D)  /* HIRAGANA LETTER KI */
-MAP(0x24, 0x2E, 0x304E)  /* HIRAGANA LETTER GI */
-MAP(0x24, 0x2F, 0x304F)  /* HIRAGANA LETTER KU */
-MAP(0x24, 0x30, 0x3050)  /* HIRAGANA LETTER GU */
-MAP(0x24, 0x31, 0x3051)  /* HIRAGANA LETTER KE */
-MAP(0x24, 0x32, 0x3052)  /* HIRAGANA LETTER GE */
-MAP(0x24, 0x33, 0x3053)  /* HIRAGANA LETTER KO */
-MAP(0x24, 0x34, 0x3054)  /* HIRAGANA LETTER GO */
-MAP(0x24, 0x35, 0x3055)  /* HIRAGANA LETTER SA */
-MAP(0x24, 0x36, 0x3056)  /* HIRAGANA LETTER ZA */
-MAP(0x24, 0x37, 0x3057)  /* HIRAGANA LETTER SI */
-MAP(0x24, 0x38, 0x3058)  /* HIRAGANA LETTER ZI */
-MAP(0x24, 0x39, 0x3059)  /* HIRAGANA LETTER SU */
-MAP(0x24, 0x3A, 0x305A)  /* HIRAGANA LETTER ZU */
-MAP(0x24, 0x3B, 0x305B)  /* HIRAGANA LETTER SE */
-MAP(0x24, 0x3C, 0x305C)  /* HIRAGANA LETTER ZE */
-MAP(0x24, 0x3D, 0x305D)  /* HIRAGANA LETTER SO */
-MAP(0x24, 0x3E, 0x305E)  /* HIRAGANA LETTER ZO */
-MAP(0x24, 0x3F, 0x305F)  /* HIRAGANA LETTER TA */
-MAP(0x24, 0x40, 0x3060)  /* HIRAGANA LETTER DA */
-MAP(0x24, 0x41, 0x3061)  /* HIRAGANA LETTER TI */
-MAP(0x24, 0x42, 0x3062)  /* HIRAGANA LETTER DI */
-MAP(0x24, 0x43, 0x3063)  /* HIRAGANA LETTER SMALL TU */
-MAP(0x24, 0x44, 0x3064)  /* HIRAGANA LETTER TU */
-MAP(0x24, 0x45, 0x3065)  /* HIRAGANA LETTER DU */
-MAP(0x24, 0x46, 0x3066)  /* HIRAGANA LETTER TE */
-MAP(0x24, 0x47, 0x3067)  /* HIRAGANA LETTER DE */
-MAP(0x24, 0x48, 0x3068)  /* HIRAGANA LETTER TO */
-MAP(0x24, 0x49, 0x3069)  /* HIRAGANA LETTER DO */
-MAP(0x24, 0x4A, 0x306A)  /* HIRAGANA LETTER NA */
-MAP(0x24, 0x4B, 0x306B)  /* HIRAGANA LETTER NI */
-MAP(0x24, 0x4C, 0x306C)  /* HIRAGANA LETTER NU */
-MAP(0x24, 0x4D, 0x306D)  /* HIRAGANA LETTER NE */
-MAP(0x24, 0x4E, 0x306E)  /* HIRAGANA LETTER NO */
-MAP(0x24, 0x4F, 0x306F)  /* HIRAGANA LETTER HA */
-MAP(0x24, 0x50, 0x3070)  /* HIRAGANA LETTER BA */
-MAP(0x24, 0x51, 0x3071)  /* HIRAGANA LETTER PA */
-MAP(0x24, 0x52, 0x3072)  /* HIRAGANA LETTER HI */
-MAP(0x24, 0x53, 0x3073)  /* HIRAGANA LETTER BI */
-MAP(0x24, 0x54, 0x3074)  /* HIRAGANA LETTER PI */
-MAP(0x24, 0x55, 0x3075)  /* HIRAGANA LETTER HU */
-MAP(0x24, 0x56, 0x3076)  /* HIRAGANA LETTER BU */
-MAP(0x24, 0x57, 0x3077)  /* HIRAGANA LETTER PU */
-MAP(0x24, 0x58, 0x3078)  /* HIRAGANA LETTER HE */
-MAP(0x24, 0x59, 0x3079)  /* HIRAGANA LETTER BE */
-MAP(0x24, 0x5A, 0x307A)  /* HIRAGANA LETTER PE */
-MAP(0x24, 0x5B, 0x307B)  /* HIRAGANA LETTER HO */
-MAP(0x24, 0x5C, 0x307C)  /* HIRAGANA LETTER BO */
-MAP(0x24, 0x5D, 0x307D)  /* HIRAGANA LETTER PO */
-MAP(0x24, 0x5E, 0x307E)  /* HIRAGANA LETTER MA */
-MAP(0x24, 0x5F, 0x307F)  /* HIRAGANA LETTER MI */
-MAP(0x24, 0x60, 0x3080)  /* HIRAGANA LETTER MU */
-MAP(0x24, 0x61, 0x3081)  /* HIRAGANA LETTER ME */
-MAP(0x24, 0x62, 0x3082)  /* HIRAGANA LETTER MO */
-MAP(0x24, 0x63, 0x3083)  /* HIRAGANA LETTER SMALL YA */
-MAP(0x24, 0x64, 0x3084)  /* HIRAGANA LETTER YA */
-MAP(0x24, 0x65, 0x3085)  /* HIRAGANA LETTER SMALL YU */
-MAP(0x24, 0x66, 0x3086)  /* HIRAGANA LETTER YU */
-MAP(0x24, 0x67, 0x3087)  /* HIRAGANA LETTER SMALL YO */
-MAP(0x24, 0x68, 0x3088)  /* HIRAGANA LETTER YO */
-MAP(0x24, 0x69, 0x3089)  /* HIRAGANA LETTER RA */
-MAP(0x24, 0x6A, 0x308A)  /* HIRAGANA LETTER RI */
-MAP(0x24, 0x6B, 0x308B)  /* HIRAGANA LETTER RU */
-MAP(0x24, 0x6C, 0x308C)  /* HIRAGANA LETTER RE */
-MAP(0x24, 0x6D, 0x308D)  /* HIRAGANA LETTER RO */
-MAP(0x24, 0x6E, 0x308E)  /* HIRAGANA LETTER SMALL WA */
-MAP(0x24, 0x6F, 0x308F)  /* HIRAGANA LETTER WA */
-MAP(0x24, 0x70, 0x3090)  /* HIRAGANA LETTER WI */
-MAP(0x24, 0x71, 0x3091)  /* HIRAGANA LETTER WE */
-MAP(0x24, 0x72, 0x3092)  /* HIRAGANA LETTER WO */
-MAP(0x24, 0x73, 0x3093)  /* HIRAGANA LETTER N */
-MAP(0x25, 0x21, 0x30A1)  /* KATAKANA LETTER SMALL A */
-MAP(0x25, 0x22, 0x30A2)  /* KATAKANA LETTER A */
-MAP(0x25, 0x23, 0x30A3)  /* KATAKANA LETTER SMALL I */
-MAP(0x25, 0x24, 0x30A4)  /* KATAKANA LETTER I */
-MAP(0x25, 0x25, 0x30A5)  /* KATAKANA LETTER SMALL U */
-MAP(0x25, 0x26, 0x30A6)  /* KATAKANA LETTER U */
-MAP(0x25, 0x27, 0x30A7)  /* KATAKANA LETTER SMALL E */
-MAP(0x25, 0x28, 0x30A8)  /* KATAKANA LETTER E */
-MAP(0x25, 0x29, 0x30A9)  /* KATAKANA LETTER SMALL O */
-MAP(0x25, 0x2A, 0x30AA)  /* KATAKANA LETTER O */
-MAP(0x25, 0x2B, 0x30AB)  /* KATAKANA LETTER KA */
-MAP(0x25, 0x2C, 0x30AC)  /* KATAKANA LETTER GA */
-MAP(0x25, 0x2D, 0x30AD)  /* KATAKANA LETTER KI */
-MAP(0x25, 0x2E, 0x30AE)  /* KATAKANA LETTER GI */
-MAP(0x25, 0x2F, 0x30AF)  /* KATAKANA LETTER KU */
-MAP(0x25, 0x30, 0x30B0)  /* KATAKANA LETTER GU */
-MAP(0x25, 0x31, 0x30B1)  /* KATAKANA LETTER KE */
-MAP(0x25, 0x32, 0x30B2)  /* KATAKANA LETTER GE */
-MAP(0x25, 0x33, 0x30B3)  /* KATAKANA LETTER KO */
-MAP(0x25, 0x34, 0x30B4)  /* KATAKANA LETTER GO */
-MAP(0x25, 0x35, 0x30B5)  /* KATAKANA LETTER SA */
-MAP(0x25, 0x36, 0x30B6)  /* KATAKANA LETTER ZA */
-MAP(0x25, 0x37, 0x30B7)  /* KATAKANA LETTER SI */
-MAP(0x25, 0x38, 0x30B8)  /* KATAKANA LETTER ZI */
-MAP(0x25, 0x39, 0x30B9)  /* KATAKANA LETTER SU */
-MAP(0x25, 0x3A, 0x30BA)  /* KATAKANA LETTER ZU */
-MAP(0x25, 0x3B, 0x30BB)  /* KATAKANA LETTER SE */
-MAP(0x25, 0x3C, 0x30BC)  /* KATAKANA LETTER ZE */
-MAP(0x25, 0x3D, 0x30BD)  /* KATAKANA LETTER SO */
-MAP(0x25, 0x3E, 0x30BE)  /* KATAKANA LETTER ZO */
-MAP(0x25, 0x3F, 0x30BF)  /* KATAKANA LETTER TA */
-MAP(0x25, 0x40, 0x30C0)  /* KATAKANA LETTER DA */
-MAP(0x25, 0x41, 0x30C1)  /* KATAKANA LETTER TI */
-MAP(0x25, 0x42, 0x30C2)  /* KATAKANA LETTER DI */
-MAP(0x25, 0x43, 0x30C3)  /* KATAKANA LETTER SMALL TU */
-MAP(0x25, 0x44, 0x30C4)  /* KATAKANA LETTER TU */
-MAP(0x25, 0x45, 0x30C5)  /* KATAKANA LETTER DU */
-MAP(0x25, 0x46, 0x30C6)  /* KATAKANA LETTER TE */
-MAP(0x25, 0x47, 0x30C7)  /* KATAKANA LETTER DE */
-MAP(0x25, 0x48, 0x30C8)  /* KATAKANA LETTER TO */
-MAP(0x25, 0x49, 0x30C9)  /* KATAKANA LETTER DO */
-MAP(0x25, 0x4A, 0x30CA)  /* KATAKANA LETTER NA */
-MAP(0x25, 0x4B, 0x30CB)  /* KATAKANA LETTER NI */
-MAP(0x25, 0x4C, 0x30CC)  /* KATAKANA LETTER NU */
-MAP(0x25, 0x4D, 0x30CD)  /* KATAKANA LETTER NE */
-MAP(0x25, 0x4E, 0x30CE)  /* KATAKANA LETTER NO */
-MAP(0x25, 0x4F, 0x30CF)  /* KATAKANA LETTER HA */
-MAP(0x25, 0x50, 0x30D0)  /* KATAKANA LETTER BA */
-MAP(0x25, 0x51, 0x30D1)  /* KATAKANA LETTER PA */
-MAP(0x25, 0x52, 0x30D2)  /* KATAKANA LETTER HI */
-MAP(0x25, 0x53, 0x30D3)  /* KATAKANA LETTER BI */
-MAP(0x25, 0x54, 0x30D4)  /* KATAKANA LETTER PI */
-MAP(0x25, 0x55, 0x30D5)  /* KATAKANA LETTER HU */
-MAP(0x25, 0x56, 0x30D6)  /* KATAKANA LETTER BU */
-MAP(0x25, 0x57, 0x30D7)  /* KATAKANA LETTER PU */
-MAP(0x25, 0x58, 0x30D8)  /* KATAKANA LETTER HE */
-MAP(0x25, 0x59, 0x30D9)  /* KATAKANA LETTER BE */
-MAP(0x25, 0x5A, 0x30DA)  /* KATAKANA LETTER PE */
-MAP(0x25, 0x5B, 0x30DB)  /* KATAKANA LETTER HO */
-MAP(0x25, 0x5C, 0x30DC)  /* KATAKANA LETTER BO */
-MAP(0x25, 0x5D, 0x30DD)  /* KATAKANA LETTER PO */
-MAP(0x25, 0x5E, 0x30DE)  /* KATAKANA LETTER MA */
-MAP(0x25, 0x5F, 0x30DF)  /* KATAKANA LETTER MI */
-MAP(0x25, 0x60, 0x30E0)  /* KATAKANA LETTER MU */
-MAP(0x25, 0x61, 0x30E1)  /* KATAKANA LETTER ME */
-MAP(0x25, 0x62, 0x30E2)  /* KATAKANA LETTER MO */
-MAP(0x25, 0x63, 0x30E3)  /* KATAKANA LETTER SMALL YA */
-MAP(0x25, 0x64, 0x30E4)  /* KATAKANA LETTER YA */
-MAP(0x25, 0x65, 0x30E5)  /* KATAKANA LETTER SMALL YU */
-MAP(0x25, 0x66, 0x30E6)  /* KATAKANA LETTER YU */
-MAP(0x25, 0x67, 0x30E7)  /* KATAKANA LETTER SMALL YO */
-MAP(0x25, 0x68, 0x30E8)  /* KATAKANA LETTER YO */
-MAP(0x25, 0x69, 0x30E9)  /* KATAKANA LETTER RA */
-MAP(0x25, 0x6A, 0x30EA)  /* KATAKANA LETTER RI */
-MAP(0x25, 0x6B, 0x30EB)  /* KATAKANA LETTER RU */
-MAP(0x25, 0x6C, 0x30EC)  /* KATAKANA LETTER RE */
-MAP(0x25, 0x6D, 0x30ED)  /* KATAKANA LETTER RO */
-MAP(0x25, 0x6E, 0x30EE)  /* KATAKANA LETTER SMALL WA */
-MAP(0x25, 0x6F, 0x30EF)  /* KATAKANA LETTER WA */
-MAP(0x25, 0x70, 0x30F0)  /* KATAKANA LETTER WI */
-MAP(0x25, 0x71, 0x30F1)  /* KATAKANA LETTER WE */
-MAP(0x25, 0x72, 0x30F2)  /* KATAKANA LETTER WO */
-MAP(0x25, 0x73, 0x30F3)  /* KATAKANA LETTER N */
-MAP(0x25, 0x74, 0x30F4)  /* KATAKANA LETTER VU */
-MAP(0x25, 0x75, 0x30F5)  /* KATAKANA LETTER SMALL KA */
-MAP(0x25, 0x76, 0x30F6)  /* KATAKANA LETTER SMALL KE */
-MAP(0x26, 0x21, 0x0391)  /* GREEK CAPITAL LETTER ALPHA */
-MAP(0x26, 0x22, 0x0392)  /* GREEK CAPITAL LETTER BETA */
-MAP(0x26, 0x23, 0x0393)  /* GREEK CAPITAL LETTER GAMMA */
-MAP(0x26, 0x24, 0x0394)  /* GREEK CAPITAL LETTER DELTA */
-MAP(0x26, 0x25, 0x0395)  /* GREEK CAPITAL LETTER EPSILON */
-MAP(0x26, 0x26, 0x0396)  /* GREEK CAPITAL LETTER ZETA */
-MAP(0x26, 0x27, 0x0397)  /* GREEK CAPITAL LETTER ETA */
-MAP(0x26, 0x28, 0x0398)  /* GREEK CAPITAL LETTER THETA */
-MAP(0x26, 0x29, 0x0399)  /* GREEK CAPITAL LETTER IOTA */
-MAP(0x26, 0x2A, 0x039A)  /* GREEK CAPITAL LETTER KAPPA */
-MAP(0x26, 0x2B, 0x039B)  /* GREEK CAPITAL LETTER LAMDA */
-MAP(0x26, 0x2C, 0x039C)  /* GREEK CAPITAL LETTER MU */
-MAP(0x26, 0x2D, 0x039D)  /* GREEK CAPITAL LETTER NU */
-MAP(0x26, 0x2E, 0x039E)  /* GREEK CAPITAL LETTER XI */
-MAP(0x26, 0x2F, 0x039F)  /* GREEK CAPITAL LETTER OMICRON */
-MAP(0x26, 0x30, 0x03A0)  /* GREEK CAPITAL LETTER PI */
-MAP(0x26, 0x31, 0x03A1)  /* GREEK CAPITAL LETTER RHO */
-MAP(0x26, 0x32, 0x03A3)  /* GREEK CAPITAL LETTER SIGMA */
-MAP(0x26, 0x33, 0x03A4)  /* GREEK CAPITAL LETTER TAU */
-MAP(0x26, 0x34, 0x03A5)  /* GREEK CAPITAL LETTER UPSILON */
-MAP(0x26, 0x35, 0x03A6)  /* GREEK CAPITAL LETTER PHI */
-MAP(0x26, 0x36, 0x03A7)  /* GREEK CAPITAL LETTER CHI */
-MAP(0x26, 0x37, 0x03A8)  /* GREEK CAPITAL LETTER PSI */
-MAP(0x26, 0x38, 0x03A9)  /* GREEK CAPITAL LETTER OMEGA */
-MAP(0x26, 0x41, 0x03B1)  /* GREEK SMALL LETTER ALPHA */
-MAP(0x26, 0x42, 0x03B2)  /* GREEK SMALL LETTER BETA */
-MAP(0x26, 0x43, 0x03B3)  /* GREEK SMALL LETTER GAMMA */
-MAP(0x26, 0x44, 0x03B4)  /* GREEK SMALL LETTER DELTA */
-MAP(0x26, 0x45, 0x03B5)  /* GREEK SMALL LETTER EPSILON */
-MAP(0x26, 0x46, 0x03B6)  /* GREEK SMALL LETTER ZETA */
-MAP(0x26, 0x47, 0x03B7)  /* GREEK SMALL LETTER ETA */
-MAP(0x26, 0x48, 0x03B8)  /* GREEK SMALL LETTER THETA */
-MAP(0x26, 0x49, 0x03B9)  /* GREEK SMALL LETTER IOTA */
-MAP(0x26, 0x4A, 0x03BA)  /* GREEK SMALL LETTER KAPPA */
-MAP(0x26, 0x4B, 0x03BB)  /* GREEK SMALL LETTER LAMDA */
-MAP(0x26, 0x4C, 0x03BC)  /* GREEK SMALL LETTER MU */
-MAP(0x26, 0x4D, 0x03BD)  /* GREEK SMALL LETTER NU */
-MAP(0x26, 0x4E, 0x03BE)  /* GREEK SMALL LETTER XI */
-MAP(0x26, 0x4F, 0x03BF)  /* GREEK SMALL LETTER OMICRON */
-MAP(0x26, 0x50, 0x03C0)  /* GREEK SMALL LETTER PI */
-MAP(0x26, 0x51, 0x03C1)  /* GREEK SMALL LETTER RHO */
-MAP(0x26, 0x52, 0x03C3)  /* GREEK SMALL LETTER SIGMA */
-MAP(0x26, 0x53, 0x03C4)  /* GREEK SMALL LETTER TAU */
-MAP(0x26, 0x54, 0x03C5)  /* GREEK SMALL LETTER UPSILON */
-MAP(0x26, 0x55, 0x03C6)  /* GREEK SMALL LETTER PHI */
-MAP(0x26, 0x56, 0x03C7)  /* GREEK SMALL LETTER CHI */
-MAP(0x26, 0x57, 0x03C8)  /* GREEK SMALL LETTER PSI */
-MAP(0x26, 0x58, 0x03C9)  /* GREEK SMALL LETTER OMEGA */
-MAP(0x27, 0x21, 0x0410)  /* CYRILLIC CAPITAL LETTER A */
-MAP(0x27, 0x22, 0x0411)  /* CYRILLIC CAPITAL LETTER BE */
-MAP(0x27, 0x23, 0x0412)  /* CYRILLIC CAPITAL LETTER VE */
-MAP(0x27, 0x24, 0x0413)  /* CYRILLIC CAPITAL LETTER GHE */
-MAP(0x27, 0x25, 0x0414)  /* CYRILLIC CAPITAL LETTER DE */
-MAP(0x27, 0x26, 0x0415)  /* CYRILLIC CAPITAL LETTER IE */
-MAP(0x27, 0x27, 0x0401)  /* CYRILLIC CAPITAL LETTER IO */
-MAP(0x27, 0x28, 0x0416)  /* CYRILLIC CAPITAL LETTER ZHE */
-MAP(0x27, 0x29, 0x0417)  /* CYRILLIC CAPITAL LETTER ZE */
-MAP(0x27, 0x2A, 0x0418)  /* CYRILLIC CAPITAL LETTER I */
-MAP(0x27, 0x2B, 0x0419)  /* CYRILLIC CAPITAL LETTER SHORT I */
-MAP(0x27, 0x2C, 0x041A)  /* CYRILLIC CAPITAL LETTER KA */
-MAP(0x27, 0x2D, 0x041B)  /* CYRILLIC CAPITAL LETTER EL */
-MAP(0x27, 0x2E, 0x041C)  /* CYRILLIC CAPITAL LETTER EM */
-MAP(0x27, 0x2F, 0x041D)  /* CYRILLIC CAPITAL LETTER EN */
-MAP(0x27, 0x30, 0x041E)  /* CYRILLIC CAPITAL LETTER O */
-MAP(0x27, 0x31, 0x041F)  /* CYRILLIC CAPITAL LETTER PE */
-MAP(0x27, 0x32, 0x0420)  /* CYRILLIC CAPITAL LETTER ER */
-MAP(0x27, 0x33, 0x0421)  /* CYRILLIC CAPITAL LETTER ES */
-MAP(0x27, 0x34, 0x0422)  /* CYRILLIC CAPITAL LETTER TE */
-MAP(0x27, 0x35, 0x0423)  /* CYRILLIC CAPITAL LETTER U */
-MAP(0x27, 0x36, 0x0424)  /* CYRILLIC CAPITAL LETTER EF */
-MAP(0x27, 0x37, 0x0425)  /* CYRILLIC CAPITAL LETTER HA */
-MAP(0x27, 0x38, 0x0426)  /* CYRILLIC CAPITAL LETTER TSE */
-MAP(0x27, 0x39, 0x0427)  /* CYRILLIC CAPITAL LETTER CHE */
-MAP(0x27, 0x3A, 0x0428)  /* CYRILLIC CAPITAL LETTER SHA */
-MAP(0x27, 0x3B, 0x0429)  /* CYRILLIC CAPITAL LETTER SHCHA */
-MAP(0x27, 0x3C, 0x042A)  /* CYRILLIC CAPITAL LETTER HARD SIGN */
-MAP(0x27, 0x3D, 0x042B)  /* CYRILLIC CAPITAL LETTER YERU */
-MAP(0x27, 0x3E, 0x042C)  /* CYRILLIC CAPITAL LETTER SOFT SIGN */
-MAP(0x27, 0x3F, 0x042D)  /* CYRILLIC CAPITAL LETTER E */
-MAP(0x27, 0x40, 0x042E)  /* CYRILLIC CAPITAL LETTER YU */
-MAP(0x27, 0x41, 0x042F)  /* CYRILLIC CAPITAL LETTER YA */
-MAP(0x27, 0x51, 0x0430)  /* CYRILLIC SMALL LETTER A */
-MAP(0x27, 0x52, 0x0431)  /* CYRILLIC SMALL LETTER BE */
-MAP(0x27, 0x53, 0x0432)  /* CYRILLIC SMALL LETTER VE */
-MAP(0x27, 0x54, 0x0433)  /* CYRILLIC SMALL LETTER GHE */
-MAP(0x27, 0x55, 0x0434)  /* CYRILLIC SMALL LETTER DE */
-MAP(0x27, 0x56, 0x0435)  /* CYRILLIC SMALL LETTER IE */
-MAP(0x27, 0x57, 0x0451)  /* CYRILLIC SMALL LETTER IO */
-MAP(0x27, 0x58, 0x0436)  /* CYRILLIC SMALL LETTER ZHE */
-MAP(0x27, 0x59, 0x0437)  /* CYRILLIC SMALL LETTER ZE */
-MAP(0x27, 0x5A, 0x0438)  /* CYRILLIC SMALL LETTER I */
-MAP(0x27, 0x5B, 0x0439)  /* CYRILLIC SMALL LETTER SHORT I */
-MAP(0x27, 0x5C, 0x043A)  /* CYRILLIC SMALL LETTER KA */
-MAP(0x27, 0x5D, 0x043B)  /* CYRILLIC SMALL LETTER EL */
-MAP(0x27, 0x5E, 0x043C)  /* CYRILLIC SMALL LETTER EM */
-MAP(0x27, 0x5F, 0x043D)  /* CYRILLIC SMALL LETTER EN */
-MAP(0x27, 0x60, 0x043E)  /* CYRILLIC SMALL LETTER O */
-MAP(0x27, 0x61, 0x043F)  /* CYRILLIC SMALL LETTER PE */
-MAP(0x27, 0x62, 0x0440)  /* CYRILLIC SMALL LETTER ER */
-MAP(0x27, 0x63, 0x0441)  /* CYRILLIC SMALL LETTER ES */
-MAP(0x27, 0x64, 0x0442)  /* CYRILLIC SMALL LETTER TE */
-MAP(0x27, 0x65, 0x0443)  /* CYRILLIC SMALL LETTER U */
-MAP(0x27, 0x66, 0x0444)  /* CYRILLIC SMALL LETTER EF */
-MAP(0x27, 0x67, 0x0445)  /* CYRILLIC SMALL LETTER HA */
-MAP(0x27, 0x68, 0x0446)  /* CYRILLIC SMALL LETTER TSE */
-MAP(0x27, 0x69, 0x0447)  /* CYRILLIC SMALL LETTER CHE */
-MAP(0x27, 0x6A, 0x0448)  /* CYRILLIC SMALL LETTER SHA */
-MAP(0x27, 0x6B, 0x0449)  /* CYRILLIC SMALL LETTER SHCHA */
-MAP(0x27, 0x6C, 0x044A)  /* CYRILLIC SMALL LETTER HARD SIGN */
-MAP(0x27, 0x6D, 0x044B)  /* CYRILLIC SMALL LETTER YERU */
-MAP(0x27, 0x6E, 0x044C)  /* CYRILLIC SMALL LETTER SOFT SIGN */
-MAP(0x27, 0x6F, 0x044D)  /* CYRILLIC SMALL LETTER E */
-MAP(0x27, 0x70, 0x044E)  /* CYRILLIC SMALL LETTER YU */
-MAP(0x27, 0x71, 0x044F)  /* CYRILLIC SMALL LETTER YA */
-MAP(0x28, 0x21, 0x2500)  /* BOX DRAWINGS LIGHT HORIZONTAL */
-MAP(0x28, 0x22, 0x2502)  /* BOX DRAWINGS LIGHT VERTICAL */
-MAP(0x28, 0x23, 0x250C)  /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
-MAP(0x28, 0x24, 0x2510)  /* BOX DRAWINGS LIGHT DOWN AND LEFT */
-MAP(0x28, 0x25, 0x2518)  /* BOX DRAWINGS LIGHT UP AND LEFT */
-MAP(0x28, 0x26, 0x2514)  /* BOX DRAWINGS LIGHT UP AND RIGHT */
-MAP(0x28, 0x27, 0x251C)  /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-MAP(0x28, 0x28, 0x252C)  /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-MAP(0x28, 0x29, 0x2524)  /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-MAP(0x28, 0x2A, 0x2534)  /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-MAP(0x28, 0x2B, 0x253C)  /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-MAP(0x28, 0x2C, 0x2501)  /* BOX DRAWINGS HEAVY HORIZONTAL */
-MAP(0x28, 0x2D, 0x2503)  /* BOX DRAWINGS HEAVY VERTICAL */
-MAP(0x28, 0x2E, 0x250F)  /* BOX DRAWINGS HEAVY DOWN AND RIGHT */
-MAP(0x28, 0x2F, 0x2513)  /* BOX DRAWINGS HEAVY DOWN AND LEFT */
-MAP(0x28, 0x30, 0x251B)  /* BOX DRAWINGS HEAVY UP AND LEFT */
-MAP(0x28, 0x31, 0x2517)  /* BOX DRAWINGS HEAVY UP AND RIGHT */
-MAP(0x28, 0x32, 0x2523)  /* BOX DRAWINGS HEAVY VERTICAL AND RIGHT */
-MAP(0x28, 0x33, 0x2533)  /* BOX DRAWINGS HEAVY DOWN AND HORIZONTAL */
-MAP(0x28, 0x34, 0x252B)  /* BOX DRAWINGS HEAVY VERTICAL AND LEFT */
-MAP(0x28, 0x35, 0x253B)  /* BOX DRAWINGS HEAVY UP AND HORIZONTAL */
-MAP(0x28, 0x36, 0x254B)  /* BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL */
-MAP(0x28, 0x37, 0x2520)  /* BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT */
-MAP(0x28, 0x38, 0x252F)  /* BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY */
-MAP(0x28, 0x39, 0x2528)  /* BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT */
-MAP(0x28, 0x3A, 0x2537)  /* BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY */
-MAP(0x28, 0x3B, 0x253F)  /* BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY */
-MAP(0x28, 0x3C, 0x251D)  /* BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY */
-MAP(0x28, 0x3D, 0x2530)  /* BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT */
-MAP(0x28, 0x3E, 0x2525)  /* BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY */
-MAP(0x28, 0x3F, 0x2538)  /* BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT */
-MAP(0x28, 0x40, 0x2542)  /* BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT */
-MAP(0x30, 0x21, 0x4E9C)  /* <CJK> */
-MAP(0x30, 0x22, 0x5516)  /* <CJK> */
-MAP(0x30, 0x23, 0x5A03)  /* <CJK> */
-MAP(0x30, 0x24, 0x963F)  /* <CJK> */
-MAP(0x30, 0x25, 0x54C0)  /* <CJK> */
-MAP(0x30, 0x26, 0x611B)  /* <CJK> */
-MAP(0x30, 0x27, 0x6328)  /* <CJK> */
-MAP(0x30, 0x28, 0x59F6)  /* <CJK> */
-MAP(0x30, 0x29, 0x9022)  /* <CJK> */
-MAP(0x30, 0x2A, 0x8475)  /* <CJK> */
-MAP(0x30, 0x2B, 0x831C)  /* <CJK> */
-MAP(0x30, 0x2C, 0x7A50)  /* <CJK> */
-MAP(0x30, 0x2D, 0x60AA)  /* <CJK> */
-MAP(0x30, 0x2E, 0x63E1)  /* <CJK> */
-MAP(0x30, 0x2F, 0x6E25)  /* <CJK> */
-MAP(0x30, 0x30, 0x65ED)  /* <CJK> */
-MAP(0x30, 0x31, 0x8466)  /* <CJK> */
-MAP(0x30, 0x32, 0x82A6)  /* <CJK> */
-MAP(0x30, 0x33, 0x9BF5)  /* <CJK> */
-MAP(0x30, 0x34, 0x6893)  /* <CJK> */
-MAP(0x30, 0x35, 0x5727)  /* <CJK> */
-MAP(0x30, 0x36, 0x65A1)  /* <CJK> */
-MAP(0x30, 0x37, 0x6271)  /* <CJK> */
-MAP(0x30, 0x38, 0x5B9B)  /* <CJK> */
-MAP(0x30, 0x39, 0x59D0)  /* <CJK> */
-MAP(0x30, 0x3A, 0x867B)  /* <CJK> */
-MAP(0x30, 0x3B, 0x98F4)  /* <CJK> */
-MAP(0x30, 0x3C, 0x7D62)  /* <CJK> */
-MAP(0x30, 0x3D, 0x7DBE)  /* <CJK> */
-MAP(0x30, 0x3E, 0x9B8E)  /* <CJK> */
-MAP(0x30, 0x3F, 0x6216)  /* <CJK> */
-MAP(0x30, 0x40, 0x7C9F)  /* <CJK> */
-MAP(0x30, 0x41, 0x88B7)  /* <CJK> */
-MAP(0x30, 0x42, 0x5B89)  /* <CJK> */
-MAP(0x30, 0x43, 0x5EB5)  /* <CJK> */
-MAP(0x30, 0x44, 0x6309)  /* <CJK> */
-MAP(0x30, 0x45, 0x6697)  /* <CJK> */
-MAP(0x30, 0x46, 0x6848)  /* <CJK> */
-MAP(0x30, 0x47, 0x95C7)  /* <CJK> */
-MAP(0x30, 0x48, 0x978D)  /* <CJK> */
-MAP(0x30, 0x49, 0x674F)  /* <CJK> */
-MAP(0x30, 0x4A, 0x4EE5)  /* <CJK> */
-MAP(0x30, 0x4B, 0x4F0A)  /* <CJK> */
-MAP(0x30, 0x4C, 0x4F4D)  /* <CJK> */
-MAP(0x30, 0x4D, 0x4F9D)  /* <CJK> */
-MAP(0x30, 0x4E, 0x5049)  /* <CJK> */
-MAP(0x30, 0x4F, 0x56F2)  /* <CJK> */
-MAP(0x30, 0x50, 0x5937)  /* <CJK> */
-MAP(0x30, 0x51, 0x59D4)  /* <CJK> */
-MAP(0x30, 0x52, 0x5A01)  /* <CJK> */
-MAP(0x30, 0x53, 0x5C09)  /* <CJK> */
-MAP(0x30, 0x54, 0x60DF)  /* <CJK> */
-MAP(0x30, 0x55, 0x610F)  /* <CJK> */
-MAP(0x30, 0x56, 0x6170)  /* <CJK> */
-MAP(0x30, 0x57, 0x6613)  /* <CJK> */
-MAP(0x30, 0x58, 0x6905)  /* <CJK> */
-MAP(0x30, 0x59, 0x70BA)  /* <CJK> */
-MAP(0x30, 0x5A, 0x754F)  /* <CJK> */
-MAP(0x30, 0x5B, 0x7570)  /* <CJK> */
-MAP(0x30, 0x5C, 0x79FB)  /* <CJK> */
-MAP(0x30, 0x5D, 0x7DAD)  /* <CJK> */
-MAP(0x30, 0x5E, 0x7DEF)  /* <CJK> */
-MAP(0x30, 0x5F, 0x80C3)  /* <CJK> */
-MAP(0x30, 0x60, 0x840E)  /* <CJK> */
-MAP(0x30, 0x61, 0x8863)  /* <CJK> */
-MAP(0x30, 0x62, 0x8B02)  /* <CJK> */
-MAP(0x30, 0x63, 0x9055)  /* <CJK> */
-MAP(0x30, 0x64, 0x907A)  /* <CJK> */
-MAP(0x30, 0x65, 0x533B)  /* <CJK> */
-MAP(0x30, 0x66, 0x4E95)  /* <CJK> */
-MAP(0x30, 0x67, 0x4EA5)  /* <CJK> */
-MAP(0x30, 0x68, 0x57DF)  /* <CJK> */
-MAP(0x30, 0x69, 0x80B2)  /* <CJK> */
-MAP(0x30, 0x6A, 0x90C1)  /* <CJK> */
-MAP(0x30, 0x6B, 0x78EF)  /* <CJK> */
-MAP(0x30, 0x6C, 0x4E00)  /* <CJK> */
-MAP(0x30, 0x6D, 0x58F1)  /* <CJK> */
-MAP(0x30, 0x6E, 0x6EA2)  /* <CJK> */
-MAP(0x30, 0x6F, 0x9038)  /* <CJK> */
-MAP(0x30, 0x70, 0x7A32)  /* <CJK> */
-MAP(0x30, 0x71, 0x8328)  /* <CJK> */
-MAP(0x30, 0x72, 0x828B)  /* <CJK> */
-MAP(0x30, 0x73, 0x9C2F)  /* <CJK> */
-MAP(0x30, 0x74, 0x5141)  /* <CJK> */
-MAP(0x30, 0x75, 0x5370)  /* <CJK> */
-MAP(0x30, 0x76, 0x54BD)  /* <CJK> */
-MAP(0x30, 0x77, 0x54E1)  /* <CJK> */
-MAP(0x30, 0x78, 0x56E0)  /* <CJK> */
-MAP(0x30, 0x79, 0x59FB)  /* <CJK> */
-MAP(0x30, 0x7A, 0x5F15)  /* <CJK> */
-MAP(0x30, 0x7B, 0x98F2)  /* <CJK> */
-MAP(0x30, 0x7C, 0x6DEB)  /* <CJK> */
-MAP(0x30, 0x7D, 0x80E4)  /* <CJK> */
-MAP(0x30, 0x7E, 0x852D)  /* <CJK> */
-MAP(0x31, 0x21, 0x9662)  /* <CJK> */
-MAP(0x31, 0x22, 0x9670)  /* <CJK> */
-MAP(0x31, 0x23, 0x96A0)  /* <CJK> */
-MAP(0x31, 0x24, 0x97FB)  /* <CJK> */
-MAP(0x31, 0x25, 0x540B)  /* <CJK> */
-MAP(0x31, 0x26, 0x53F3)  /* <CJK> */
-MAP(0x31, 0x27, 0x5B87)  /* <CJK> */
-MAP(0x31, 0x28, 0x70CF)  /* <CJK> */
-MAP(0x31, 0x29, 0x7FBD)  /* <CJK> */
-MAP(0x31, 0x2A, 0x8FC2)  /* <CJK> */
-MAP(0x31, 0x2B, 0x96E8)  /* <CJK> */
-MAP(0x31, 0x2C, 0x536F)  /* <CJK> */
-MAP(0x31, 0x2D, 0x9D5C)  /* <CJK> */
-MAP(0x31, 0x2E, 0x7ABA)  /* <CJK> */
-MAP(0x31, 0x2F, 0x4E11)  /* <CJK> */
-MAP(0x31, 0x30, 0x7893)  /* <CJK> */
-MAP(0x31, 0x31, 0x81FC)  /* <CJK> */
-MAP(0x31, 0x32, 0x6E26)  /* <CJK> */
-MAP(0x31, 0x33, 0x5618)  /* <CJK> */
-MAP(0x31, 0x34, 0x5504)  /* <CJK> */
-MAP(0x31, 0x35, 0x6B1D)  /* <CJK> */
-MAP(0x31, 0x36, 0x851A)  /* <CJK> */
-MAP(0x31, 0x37, 0x9C3B)  /* <CJK> */
-MAP(0x31, 0x38, 0x59E5)  /* <CJK> */
-MAP(0x31, 0x39, 0x53A9)  /* <CJK> */
-MAP(0x31, 0x3A, 0x6D66)  /* <CJK> */
-MAP(0x31, 0x3B, 0x74DC)  /* <CJK> */
-MAP(0x31, 0x3C, 0x958F)  /* <CJK> */
-MAP(0x31, 0x3D, 0x5642)  /* <CJK> */
-MAP(0x31, 0x3E, 0x4E91)  /* <CJK> */
-MAP(0x31, 0x3F, 0x904B)  /* <CJK> */
-MAP(0x31, 0x40, 0x96F2)  /* <CJK> */
-MAP(0x31, 0x41, 0x834F)  /* <CJK> */
-MAP(0x31, 0x42, 0x990C)  /* <CJK> */
-MAP(0x31, 0x43, 0x53E1)  /* <CJK> */
-MAP(0x31, 0x44, 0x55B6)  /* <CJK> */
-MAP(0x31, 0x45, 0x5B30)  /* <CJK> */
-MAP(0x31, 0x46, 0x5F71)  /* <CJK> */
-MAP(0x31, 0x47, 0x6620)  /* <CJK> */
-MAP(0x31, 0x48, 0x66F3)  /* <CJK> */
-MAP(0x31, 0x49, 0x6804)  /* <CJK> */
-MAP(0x31, 0x4A, 0x6C38)  /* <CJK> */
-MAP(0x31, 0x4B, 0x6CF3)  /* <CJK> */
-MAP(0x31, 0x4C, 0x6D29)  /* <CJK> */
-MAP(0x31, 0x4D, 0x745B)  /* <CJK> */
-MAP(0x31, 0x4E, 0x76C8)  /* <CJK> */
-MAP(0x31, 0x4F, 0x7A4E)  /* <CJK> */
-MAP(0x31, 0x50, 0x9834)  /* <CJK> */
-MAP(0x31, 0x51, 0x82F1)  /* <CJK> */
-MAP(0x31, 0x52, 0x885B)  /* <CJK> */
-MAP(0x31, 0x53, 0x8A60)  /* <CJK> */
-MAP(0x31, 0x54, 0x92ED)  /* <CJK> */
-MAP(0x31, 0x55, 0x6DB2)  /* <CJK> */
-MAP(0x31, 0x56, 0x75AB)  /* <CJK> */
-MAP(0x31, 0x57, 0x76CA)  /* <CJK> */
-MAP(0x31, 0x58, 0x99C5)  /* <CJK> */
-MAP(0x31, 0x59, 0x60A6)  /* <CJK> */
-MAP(0x31, 0x5A, 0x8B01)  /* <CJK> */
-MAP(0x31, 0x5B, 0x8D8A)  /* <CJK> */
-MAP(0x31, 0x5C, 0x95B2)  /* <CJK> */
-MAP(0x31, 0x5D, 0x698E)  /* <CJK> */
-MAP(0x31, 0x5E, 0x53AD)  /* <CJK> */
-MAP(0x31, 0x5F, 0x5186)  /* <CJK> */
-MAP(0x31, 0x60, 0x5712)  /* <CJK> */
-MAP(0x31, 0x61, 0x5830)  /* <CJK> */
-MAP(0x31, 0x62, 0x5944)  /* <CJK> */
-MAP(0x31, 0x63, 0x5BB4)  /* <CJK> */
-MAP(0x31, 0x64, 0x5EF6)  /* <CJK> */
-MAP(0x31, 0x65, 0x6028)  /* <CJK> */
-MAP(0x31, 0x66, 0x63A9)  /* <CJK> */
-MAP(0x31, 0x67, 0x63F4)  /* <CJK> */
-MAP(0x31, 0x68, 0x6CBF)  /* <CJK> */
-MAP(0x31, 0x69, 0x6F14)  /* <CJK> */
-MAP(0x31, 0x6A, 0x708E)  /* <CJK> */
-MAP(0x31, 0x6B, 0x7114)  /* <CJK> */
-MAP(0x31, 0x6C, 0x7159)  /* <CJK> */
-MAP(0x31, 0x6D, 0x71D5)  /* <CJK> */
-MAP(0x31, 0x6E, 0x733F)  /* <CJK> */
-MAP(0x31, 0x6F, 0x7E01)  /* <CJK> */
-MAP(0x31, 0x70, 0x8276)  /* <CJK> */
-MAP(0x31, 0x71, 0x82D1)  /* <CJK> */
-MAP(0x31, 0x72, 0x8597)  /* <CJK> */
-MAP(0x31, 0x73, 0x9060)  /* <CJK> */
-MAP(0x31, 0x74, 0x925B)  /* <CJK> */
-MAP(0x31, 0x75, 0x9D1B)  /* <CJK> */
-MAP(0x31, 0x76, 0x5869)  /* <CJK> */
-MAP(0x31, 0x77, 0x65BC)  /* <CJK> */
-MAP(0x31, 0x78, 0x6C5A)  /* <CJK> */
-MAP(0x31, 0x79, 0x7525)  /* <CJK> */
-MAP(0x31, 0x7A, 0x51F9)  /* <CJK> */
-MAP(0x31, 0x7B, 0x592E)  /* <CJK> */
-MAP(0x31, 0x7C, 0x5965)  /* <CJK> */
-MAP(0x31, 0x7D, 0x5F80)  /* <CJK> */
-MAP(0x31, 0x7E, 0x5FDC)  /* <CJK> */
-MAP(0x32, 0x21, 0x62BC)  /* <CJK> */
-MAP(0x32, 0x22, 0x65FA)  /* <CJK> */
-MAP(0x32, 0x23, 0x6A2A)  /* <CJK> */
-MAP(0x32, 0x24, 0x6B27)  /* <CJK> */
-MAP(0x32, 0x25, 0x6BB4)  /* <CJK> */
-MAP(0x32, 0x26, 0x738B)  /* <CJK> */
-MAP(0x32, 0x27, 0x7FC1)  /* <CJK> */
-MAP(0x32, 0x28, 0x8956)  /* <CJK> */
-MAP(0x32, 0x29, 0x9D2C)  /* <CJK> */
-MAP(0x32, 0x2A, 0x9D0E)  /* <CJK> */
-MAP(0x32, 0x2B, 0x9EC4)  /* <CJK> */
-MAP(0x32, 0x2C, 0x5CA1)  /* <CJK> */
-MAP(0x32, 0x2D, 0x6C96)  /* <CJK> */
-MAP(0x32, 0x2E, 0x837B)  /* <CJK> */
-MAP(0x32, 0x2F, 0x5104)  /* <CJK> */
-MAP(0x32, 0x30, 0x5C4B)  /* <CJK> */
-MAP(0x32, 0x31, 0x61B6)  /* <CJK> */
-MAP(0x32, 0x32, 0x81C6)  /* <CJK> */
-MAP(0x32, 0x33, 0x6876)  /* <CJK> */
-MAP(0x32, 0x34, 0x7261)  /* <CJK> */
-MAP(0x32, 0x35, 0x4E59)  /* <CJK> */
-MAP(0x32, 0x36, 0x4FFA)  /* <CJK> */
-MAP(0x32, 0x37, 0x5378)  /* <CJK> */
-MAP(0x32, 0x38, 0x6069)  /* <CJK> */
-MAP(0x32, 0x39, 0x6E29)  /* <CJK> */
-MAP(0x32, 0x3A, 0x7A4F)  /* <CJK> */
-MAP(0x32, 0x3B, 0x97F3)  /* <CJK> */
-MAP(0x32, 0x3C, 0x4E0B)  /* <CJK> */
-MAP(0x32, 0x3D, 0x5316)  /* <CJK> */
-MAP(0x32, 0x3E, 0x4EEE)  /* <CJK> */
-MAP(0x32, 0x3F, 0x4F55)  /* <CJK> */
-MAP(0x32, 0x40, 0x4F3D)  /* <CJK> */
-MAP(0x32, 0x41, 0x4FA1)  /* <CJK> */
-MAP(0x32, 0x42, 0x4F73)  /* <CJK> */
-MAP(0x32, 0x43, 0x52A0)  /* <CJK> */
-MAP(0x32, 0x44, 0x53EF)  /* <CJK> */
-MAP(0x32, 0x45, 0x5609)  /* <CJK> */
-MAP(0x32, 0x46, 0x590F)  /* <CJK> */
-MAP(0x32, 0x47, 0x5AC1)  /* <CJK> */
-MAP(0x32, 0x48, 0x5BB6)  /* <CJK> */
-MAP(0x32, 0x49, 0x5BE1)  /* <CJK> */
-MAP(0x32, 0x4A, 0x79D1)  /* <CJK> */
-MAP(0x32, 0x4B, 0x6687)  /* <CJK> */
-MAP(0x32, 0x4C, 0x679C)  /* <CJK> */
-MAP(0x32, 0x4D, 0x67B6)  /* <CJK> */
-MAP(0x32, 0x4E, 0x6B4C)  /* <CJK> */
-MAP(0x32, 0x4F, 0x6CB3)  /* <CJK> */
-MAP(0x32, 0x50, 0x706B)  /* <CJK> */
-MAP(0x32, 0x51, 0x73C2)  /* <CJK> */
-MAP(0x32, 0x52, 0x798D)  /* <CJK> */
-MAP(0x32, 0x53, 0x79BE)  /* <CJK> */
-MAP(0x32, 0x54, 0x7A3C)  /* <CJK> */
-MAP(0x32, 0x55, 0x7B87)  /* <CJK> */
-MAP(0x32, 0x56, 0x82B1)  /* <CJK> */
-MAP(0x32, 0x57, 0x82DB)  /* <CJK> */
-MAP(0x32, 0x58, 0x8304)  /* <CJK> */
-MAP(0x32, 0x59, 0x8377)  /* <CJK> */
-MAP(0x32, 0x5A, 0x83EF)  /* <CJK> */
-MAP(0x32, 0x5B, 0x83D3)  /* <CJK> */
-MAP(0x32, 0x5C, 0x8766)  /* <CJK> */
-MAP(0x32, 0x5D, 0x8AB2)  /* <CJK> */
-MAP(0x32, 0x5E, 0x5629)  /* <CJK> */
-MAP(0x32, 0x5F, 0x8CA8)  /* <CJK> */
-MAP(0x32, 0x60, 0x8FE6)  /* <CJK> */
-MAP(0x32, 0x61, 0x904E)  /* <CJK> */
-MAP(0x32, 0x62, 0x971E)  /* <CJK> */
-MAP(0x32, 0x63, 0x868A)  /* <CJK> */
-MAP(0x32, 0x64, 0x4FC4)  /* <CJK> */
-MAP(0x32, 0x65, 0x5CE8)  /* <CJK> */
-MAP(0x32, 0x66, 0x6211)  /* <CJK> */
-MAP(0x32, 0x67, 0x7259)  /* <CJK> */
-MAP(0x32, 0x68, 0x753B)  /* <CJK> */
-MAP(0x32, 0x69, 0x81E5)  /* <CJK> */
-MAP(0x32, 0x6A, 0x82BD)  /* <CJK> */
-MAP(0x32, 0x6B, 0x86FE)  /* <CJK> */
-MAP(0x32, 0x6C, 0x8CC0)  /* <CJK> */
-MAP(0x32, 0x6D, 0x96C5)  /* <CJK> */
-MAP(0x32, 0x6E, 0x9913)  /* <CJK> */
-MAP(0x32, 0x6F, 0x99D5)  /* <CJK> */
-MAP(0x32, 0x70, 0x4ECB)  /* <CJK> */
-MAP(0x32, 0x71, 0x4F1A)  /* <CJK> */
-MAP(0x32, 0x72, 0x89E3)  /* <CJK> */
-MAP(0x32, 0x73, 0x56DE)  /* <CJK> */
-MAP(0x32, 0x74, 0x584A)  /* <CJK> */
-MAP(0x32, 0x75, 0x58CA)  /* <CJK> */
-MAP(0x32, 0x76, 0x5EFB)  /* <CJK> */
-MAP(0x32, 0x77, 0x5FEB)  /* <CJK> */
-MAP(0x32, 0x78, 0x602A)  /* <CJK> */
-MAP(0x32, 0x79, 0x6094)  /* <CJK> */
-MAP(0x32, 0x7A, 0x6062)  /* <CJK> */
-MAP(0x32, 0x7B, 0x61D0)  /* <CJK> */
-MAP(0x32, 0x7C, 0x6212)  /* <CJK> */
-MAP(0x32, 0x7D, 0x62D0)  /* <CJK> */
-MAP(0x32, 0x7E, 0x6539)  /* <CJK> */
-MAP(0x33, 0x21, 0x9B41)  /* <CJK> */
-MAP(0x33, 0x22, 0x6666)  /* <CJK> */
-MAP(0x33, 0x23, 0x68B0)  /* <CJK> */
-MAP(0x33, 0x24, 0x6D77)  /* <CJK> */
-MAP(0x33, 0x25, 0x7070)  /* <CJK> */
-MAP(0x33, 0x26, 0x754C)  /* <CJK> */
-MAP(0x33, 0x27, 0x7686)  /* <CJK> */
-MAP(0x33, 0x28, 0x7D75)  /* <CJK> */
-MAP(0x33, 0x29, 0x82A5)  /* <CJK> */
-MAP(0x33, 0x2A, 0x87F9)  /* <CJK> */
-MAP(0x33, 0x2B, 0x958B)  /* <CJK> */
-MAP(0x33, 0x2C, 0x968E)  /* <CJK> */
-MAP(0x33, 0x2D, 0x8C9D)  /* <CJK> */
-MAP(0x33, 0x2E, 0x51F1)  /* <CJK> */
-MAP(0x33, 0x2F, 0x52BE)  /* <CJK> */
-MAP(0x33, 0x30, 0x5916)  /* <CJK> */
-MAP(0x33, 0x31, 0x54B3)  /* <CJK> */
-MAP(0x33, 0x32, 0x5BB3)  /* <CJK> */
-MAP(0x33, 0x33, 0x5D16)  /* <CJK> */
-MAP(0x33, 0x34, 0x6168)  /* <CJK> */
-MAP(0x33, 0x35, 0x6982)  /* <CJK> */
-MAP(0x33, 0x36, 0x6DAF)  /* <CJK> */
-MAP(0x33, 0x37, 0x788D)  /* <CJK> */
-MAP(0x33, 0x38, 0x84CB)  /* <CJK> */
-MAP(0x33, 0x39, 0x8857)  /* <CJK> */
-MAP(0x33, 0x3A, 0x8A72)  /* <CJK> */
-MAP(0x33, 0x3B, 0x93A7)  /* <CJK> */
-MAP(0x33, 0x3C, 0x9AB8)  /* <CJK> */
-MAP(0x33, 0x3D, 0x6D6C)  /* <CJK> */
-MAP(0x33, 0x3E, 0x99A8)  /* <CJK> */
-MAP(0x33, 0x3F, 0x86D9)  /* <CJK> */
-MAP(0x33, 0x40, 0x57A3)  /* <CJK> */
-MAP(0x33, 0x41, 0x67FF)  /* <CJK> */
-MAP(0x33, 0x42, 0x86CE)  /* <CJK> */
-MAP(0x33, 0x43, 0x920E)  /* <CJK> */
-MAP(0x33, 0x44, 0x5283)  /* <CJK> */
-MAP(0x33, 0x45, 0x5687)  /* <CJK> */
-MAP(0x33, 0x46, 0x5404)  /* <CJK> */
-MAP(0x33, 0x47, 0x5ED3)  /* <CJK> */
-MAP(0x33, 0x48, 0x62E1)  /* <CJK> */
-MAP(0x33, 0x49, 0x64B9)  /* <CJK> */
-MAP(0x33, 0x4A, 0x683C)  /* <CJK> */
-MAP(0x33, 0x4B, 0x6838)  /* <CJK> */
-MAP(0x33, 0x4C, 0x6BBB)  /* <CJK> */
-MAP(0x33, 0x4D, 0x7372)  /* <CJK> */
-MAP(0x33, 0x4E, 0x78BA)  /* <CJK> */
-MAP(0x33, 0x4F, 0x7A6B)  /* <CJK> */
-MAP(0x33, 0x50, 0x899A)  /* <CJK> */
-MAP(0x33, 0x51, 0x89D2)  /* <CJK> */
-MAP(0x33, 0x52, 0x8D6B)  /* <CJK> */
-MAP(0x33, 0x53, 0x8F03)  /* <CJK> */
-MAP(0x33, 0x54, 0x90ED)  /* <CJK> */
-MAP(0x33, 0x55, 0x95A3)  /* <CJK> */
-MAP(0x33, 0x56, 0x9694)  /* <CJK> */
-MAP(0x33, 0x57, 0x9769)  /* <CJK> */
-MAP(0x33, 0x58, 0x5B66)  /* <CJK> */
-MAP(0x33, 0x59, 0x5CB3)  /* <CJK> */
-MAP(0x33, 0x5A, 0x697D)  /* <CJK> */
-MAP(0x33, 0x5B, 0x984D)  /* <CJK> */
-MAP(0x33, 0x5C, 0x984E)  /* <CJK> */
-MAP(0x33, 0x5D, 0x639B)  /* <CJK> */
-MAP(0x33, 0x5E, 0x7B20)  /* <CJK> */
-MAP(0x33, 0x5F, 0x6A2B)  /* <CJK> */
-MAP(0x33, 0x60, 0x6A7F)  /* <CJK> */
-MAP(0x33, 0x61, 0x68B6)  /* <CJK> */
-MAP(0x33, 0x62, 0x9C0D)  /* <CJK> */
-MAP(0x33, 0x63, 0x6F5F)  /* <CJK> */
-MAP(0x33, 0x64, 0x5272)  /* <CJK> */
-MAP(0x33, 0x65, 0x559D)  /* <CJK> */
-MAP(0x33, 0x66, 0x6070)  /* <CJK> */
-MAP(0x33, 0x67, 0x62EC)  /* <CJK> */
-MAP(0x33, 0x68, 0x6D3B)  /* <CJK> */
-MAP(0x33, 0x69, 0x6E07)  /* <CJK> */
-MAP(0x33, 0x6A, 0x6ED1)  /* <CJK> */
-MAP(0x33, 0x6B, 0x845B)  /* <CJK> */
-MAP(0x33, 0x6C, 0x8910)  /* <CJK> */
-MAP(0x33, 0x6D, 0x8F44)  /* <CJK> */
-MAP(0x33, 0x6E, 0x4E14)  /* <CJK> */
-MAP(0x33, 0x6F, 0x9C39)  /* <CJK> */
-MAP(0x33, 0x70, 0x53F6)  /* <CJK> */
-MAP(0x33, 0x71, 0x691B)  /* <CJK> */
-MAP(0x33, 0x72, 0x6A3A)  /* <CJK> */
-MAP(0x33, 0x73, 0x9784)  /* <CJK> */
-MAP(0x33, 0x74, 0x682A)  /* <CJK> */
-MAP(0x33, 0x75, 0x515C)  /* <CJK> */
-MAP(0x33, 0x76, 0x7AC3)  /* <CJK> */
-MAP(0x33, 0x77, 0x84B2)  /* <CJK> */
-MAP(0x33, 0x78, 0x91DC)  /* <CJK> */
-MAP(0x33, 0x79, 0x938C)  /* <CJK> */
-MAP(0x33, 0x7A, 0x565B)  /* <CJK> */
-MAP(0x33, 0x7B, 0x9D28)  /* <CJK> */
-MAP(0x33, 0x7C, 0x6822)  /* <CJK> */
-MAP(0x33, 0x7D, 0x8305)  /* <CJK> */
-MAP(0x33, 0x7E, 0x8431)  /* <CJK> */
-MAP(0x34, 0x21, 0x7CA5)  /* <CJK> */
-MAP(0x34, 0x22, 0x5208)  /* <CJK> */
-MAP(0x34, 0x23, 0x82C5)  /* <CJK> */
-MAP(0x34, 0x24, 0x74E6)  /* <CJK> */
-MAP(0x34, 0x25, 0x4E7E)  /* <CJK> */
-MAP(0x34, 0x26, 0x4F83)  /* <CJK> */
-MAP(0x34, 0x27, 0x51A0)  /* <CJK> */
-MAP(0x34, 0x28, 0x5BD2)  /* <CJK> */
-MAP(0x34, 0x29, 0x520A)  /* <CJK> */
-MAP(0x34, 0x2A, 0x52D8)  /* <CJK> */
-MAP(0x34, 0x2B, 0x52E7)  /* <CJK> */
-MAP(0x34, 0x2C, 0x5DFB)  /* <CJK> */
-MAP(0x34, 0x2D, 0x559A)  /* <CJK> */
-MAP(0x34, 0x2E, 0x582A)  /* <CJK> */
-MAP(0x34, 0x2F, 0x59E6)  /* <CJK> */
-MAP(0x34, 0x30, 0x5B8C)  /* <CJK> */
-MAP(0x34, 0x31, 0x5B98)  /* <CJK> */
-MAP(0x34, 0x32, 0x5BDB)  /* <CJK> */
-MAP(0x34, 0x33, 0x5E72)  /* <CJK> */
-MAP(0x34, 0x34, 0x5E79)  /* <CJK> */
-MAP(0x34, 0x35, 0x60A3)  /* <CJK> */
-MAP(0x34, 0x36, 0x611F)  /* <CJK> */
-MAP(0x34, 0x37, 0x6163)  /* <CJK> */
-MAP(0x34, 0x38, 0x61BE)  /* <CJK> */
-MAP(0x34, 0x39, 0x63DB)  /* <CJK> */
-MAP(0x34, 0x3A, 0x6562)  /* <CJK> */
-MAP(0x34, 0x3B, 0x67D1)  /* <CJK> */
-MAP(0x34, 0x3C, 0x6853)  /* <CJK> */
-MAP(0x34, 0x3D, 0x68FA)  /* <CJK> */
-MAP(0x34, 0x3E, 0x6B3E)  /* <CJK> */
-MAP(0x34, 0x3F, 0x6B53)  /* <CJK> */
-MAP(0x34, 0x40, 0x6C57)  /* <CJK> */
-MAP(0x34, 0x41, 0x6F22)  /* <CJK> */
-MAP(0x34, 0x42, 0x6F97)  /* <CJK> */
-MAP(0x34, 0x43, 0x6F45)  /* <CJK> */
-MAP(0x34, 0x44, 0x74B0)  /* <CJK> */
-MAP(0x34, 0x45, 0x7518)  /* <CJK> */
-MAP(0x34, 0x46, 0x76E3)  /* <CJK> */
-MAP(0x34, 0x47, 0x770B)  /* <CJK> */
-MAP(0x34, 0x48, 0x7AFF)  /* <CJK> */
-MAP(0x34, 0x49, 0x7BA1)  /* <CJK> */
-MAP(0x34, 0x4A, 0x7C21)  /* <CJK> */
-MAP(0x34, 0x4B, 0x7DE9)  /* <CJK> */
-MAP(0x34, 0x4C, 0x7F36)  /* <CJK> */
-MAP(0x34, 0x4D, 0x7FF0)  /* <CJK> */
-MAP(0x34, 0x4E, 0x809D)  /* <CJK> */
-MAP(0x34, 0x4F, 0x8266)  /* <CJK> */
-MAP(0x34, 0x50, 0x839E)  /* <CJK> */
-MAP(0x34, 0x51, 0x89B3)  /* <CJK> */
-MAP(0x34, 0x52, 0x8ACC)  /* <CJK> */
-MAP(0x34, 0x53, 0x8CAB)  /* <CJK> */
-MAP(0x34, 0x54, 0x9084)  /* <CJK> */
-MAP(0x34, 0x55, 0x9451)  /* <CJK> */
-MAP(0x34, 0x56, 0x9593)  /* <CJK> */
-MAP(0x34, 0x57, 0x9591)  /* <CJK> */
-MAP(0x34, 0x58, 0x95A2)  /* <CJK> */
-MAP(0x34, 0x59, 0x9665)  /* <CJK> */
-MAP(0x34, 0x5A, 0x97D3)  /* <CJK> */
-MAP(0x34, 0x5B, 0x9928)  /* <CJK> */
-MAP(0x34, 0x5C, 0x8218)  /* <CJK> */
-MAP(0x34, 0x5D, 0x4E38)  /* <CJK> */
-MAP(0x34, 0x5E, 0x542B)  /* <CJK> */
-MAP(0x34, 0x5F, 0x5CB8)  /* <CJK> */
-MAP(0x34, 0x60, 0x5DCC)  /* <CJK> */
-MAP(0x34, 0x61, 0x73A9)  /* <CJK> */
-MAP(0x34, 0x62, 0x764C)  /* <CJK> */
-MAP(0x34, 0x63, 0x773C)  /* <CJK> */
-MAP(0x34, 0x64, 0x5CA9)  /* <CJK> */
-MAP(0x34, 0x65, 0x7FEB)  /* <CJK> */
-MAP(0x34, 0x66, 0x8D0B)  /* <CJK> */
-MAP(0x34, 0x67, 0x96C1)  /* <CJK> */
-MAP(0x34, 0x68, 0x9811)  /* <CJK> */
-MAP(0x34, 0x69, 0x9854)  /* <CJK> */
-MAP(0x34, 0x6A, 0x9858)  /* <CJK> */
-MAP(0x34, 0x6B, 0x4F01)  /* <CJK> */
-MAP(0x34, 0x6C, 0x4F0E)  /* <CJK> */
-MAP(0x34, 0x6D, 0x5371)  /* <CJK> */
-MAP(0x34, 0x6E, 0x559C)  /* <CJK> */
-MAP(0x34, 0x6F, 0x5668)  /* <CJK> */
-MAP(0x34, 0x70, 0x57FA)  /* <CJK> */
-MAP(0x34, 0x71, 0x5947)  /* <CJK> */
-MAP(0x34, 0x72, 0x5B09)  /* <CJK> */
-MAP(0x34, 0x73, 0x5BC4)  /* <CJK> */
-MAP(0x34, 0x74, 0x5C90)  /* <CJK> */
-MAP(0x34, 0x75, 0x5E0C)  /* <CJK> */
-MAP(0x34, 0x76, 0x5E7E)  /* <CJK> */
-MAP(0x34, 0x77, 0x5FCC)  /* <CJK> */
-MAP(0x34, 0x78, 0x63EE)  /* <CJK> */
-MAP(0x34, 0x79, 0x673A)  /* <CJK> */
-MAP(0x34, 0x7A, 0x65D7)  /* <CJK> */
-MAP(0x34, 0x7B, 0x65E2)  /* <CJK> */
-MAP(0x34, 0x7C, 0x671F)  /* <CJK> */
-MAP(0x34, 0x7D, 0x68CB)  /* <CJK> */
-MAP(0x34, 0x7E, 0x68C4)  /* <CJK> */
-MAP(0x35, 0x21, 0x6A5F)  /* <CJK> */
-MAP(0x35, 0x22, 0x5E30)  /* <CJK> */
-MAP(0x35, 0x23, 0x6BC5)  /* <CJK> */
-MAP(0x35, 0x24, 0x6C17)  /* <CJK> */
-MAP(0x35, 0x25, 0x6C7D)  /* <CJK> */
-MAP(0x35, 0x26, 0x757F)  /* <CJK> */
-MAP(0x35, 0x27, 0x7948)  /* <CJK> */
-MAP(0x35, 0x28, 0x5B63)  /* <CJK> */
-MAP(0x35, 0x29, 0x7A00)  /* <CJK> */
-MAP(0x35, 0x2A, 0x7D00)  /* <CJK> */
-MAP(0x35, 0x2B, 0x5FBD)  /* <CJK> */
-MAP(0x35, 0x2C, 0x898F)  /* <CJK> */
-MAP(0x35, 0x2D, 0x8A18)  /* <CJK> */
-MAP(0x35, 0x2E, 0x8CB4)  /* <CJK> */
-MAP(0x35, 0x2F, 0x8D77)  /* <CJK> */
-MAP(0x35, 0x30, 0x8ECC)  /* <CJK> */
-MAP(0x35, 0x31, 0x8F1D)  /* <CJK> */
-MAP(0x35, 0x32, 0x98E2)  /* <CJK> */
-MAP(0x35, 0x33, 0x9A0E)  /* <CJK> */
-MAP(0x35, 0x34, 0x9B3C)  /* <CJK> */
-MAP(0x35, 0x35, 0x4E80)  /* <CJK> */
-MAP(0x35, 0x36, 0x507D)  /* <CJK> */
-MAP(0x35, 0x37, 0x5100)  /* <CJK> */
-MAP(0x35, 0x38, 0x5993)  /* <CJK> */
-MAP(0x35, 0x39, 0x5B9C)  /* <CJK> */
-MAP(0x35, 0x3A, 0x622F)  /* <CJK> */
-MAP(0x35, 0x3B, 0x6280)  /* <CJK> */
-MAP(0x35, 0x3C, 0x64EC)  /* <CJK> */
-MAP(0x35, 0x3D, 0x6B3A)  /* <CJK> */
-MAP(0x35, 0x3E, 0x72A0)  /* <CJK> */
-MAP(0x35, 0x3F, 0x7591)  /* <CJK> */
-MAP(0x35, 0x40, 0x7947)  /* <CJK> */
-MAP(0x35, 0x41, 0x7FA9)  /* <CJK> */
-MAP(0x35, 0x42, 0x87FB)  /* <CJK> */
-MAP(0x35, 0x43, 0x8ABC)  /* <CJK> */
-MAP(0x35, 0x44, 0x8B70)  /* <CJK> */
-MAP(0x35, 0x45, 0x63AC)  /* <CJK> */
-MAP(0x35, 0x46, 0x83CA)  /* <CJK> */
-MAP(0x35, 0x47, 0x97A0)  /* <CJK> */
-MAP(0x35, 0x48, 0x5409)  /* <CJK> */
-MAP(0x35, 0x49, 0x5403)  /* <CJK> */
-MAP(0x35, 0x4A, 0x55AB)  /* <CJK> */
-MAP(0x35, 0x4B, 0x6854)  /* <CJK> */
-MAP(0x35, 0x4C, 0x6A58)  /* <CJK> */
-MAP(0x35, 0x4D, 0x8A70)  /* <CJK> */
-MAP(0x35, 0x4E, 0x7827)  /* <CJK> */
-MAP(0x35, 0x4F, 0x6775)  /* <CJK> */
-MAP(0x35, 0x50, 0x9ECD)  /* <CJK> */
-MAP(0x35, 0x51, 0x5374)  /* <CJK> */
-MAP(0x35, 0x52, 0x5BA2)  /* <CJK> */
-MAP(0x35, 0x53, 0x811A)  /* <CJK> */
-MAP(0x35, 0x54, 0x8650)  /* <CJK> */
-MAP(0x35, 0x55, 0x9006)  /* <CJK> */
-MAP(0x35, 0x56, 0x4E18)  /* <CJK> */
-MAP(0x35, 0x57, 0x4E45)  /* <CJK> */
-MAP(0x35, 0x58, 0x4EC7)  /* <CJK> */
-MAP(0x35, 0x59, 0x4F11)  /* <CJK> */
-MAP(0x35, 0x5A, 0x53CA)  /* <CJK> */
-MAP(0x35, 0x5B, 0x5438)  /* <CJK> */
-MAP(0x35, 0x5C, 0x5BAE)  /* <CJK> */
-MAP(0x35, 0x5D, 0x5F13)  /* <CJK> */
-MAP(0x35, 0x5E, 0x6025)  /* <CJK> */
-MAP(0x35, 0x5F, 0x6551)  /* <CJK> */
-MAP(0x35, 0x60, 0x673D)  /* <CJK> */
-MAP(0x35, 0x61, 0x6C42)  /* <CJK> */
-MAP(0x35, 0x62, 0x6C72)  /* <CJK> */
-MAP(0x35, 0x63, 0x6CE3)  /* <CJK> */
-MAP(0x35, 0x64, 0x7078)  /* <CJK> */
-MAP(0x35, 0x65, 0x7403)  /* <CJK> */
-MAP(0x35, 0x66, 0x7A76)  /* <CJK> */
-MAP(0x35, 0x67, 0x7AAE)  /* <CJK> */
-MAP(0x35, 0x68, 0x7B08)  /* <CJK> */
-MAP(0x35, 0x69, 0x7D1A)  /* <CJK> */
-MAP(0x35, 0x6A, 0x7CFE)  /* <CJK> */
-MAP(0x35, 0x6B, 0x7D66)  /* <CJK> */
-MAP(0x35, 0x6C, 0x65E7)  /* <CJK> */
-MAP(0x35, 0x6D, 0x725B)  /* <CJK> */
-MAP(0x35, 0x6E, 0x53BB)  /* <CJK> */
-MAP(0x35, 0x6F, 0x5C45)  /* <CJK> */
-MAP(0x35, 0x70, 0x5DE8)  /* <CJK> */
-MAP(0x35, 0x71, 0x62D2)  /* <CJK> */
-MAP(0x35, 0x72, 0x62E0)  /* <CJK> */
-MAP(0x35, 0x73, 0x6319)  /* <CJK> */
-MAP(0x35, 0x74, 0x6E20)  /* <CJK> */
-MAP(0x35, 0x75, 0x865A)  /* <CJK> */
-MAP(0x35, 0x76, 0x8A31)  /* <CJK> */
-MAP(0x35, 0x77, 0x8DDD)  /* <CJK> */
-MAP(0x35, 0x78, 0x92F8)  /* <CJK> */
-MAP(0x35, 0x79, 0x6F01)  /* <CJK> */
-MAP(0x35, 0x7A, 0x79A6)  /* <CJK> */
-MAP(0x35, 0x7B, 0x9B5A)  /* <CJK> */
-MAP(0x35, 0x7C, 0x4EA8)  /* <CJK> */
-MAP(0x35, 0x7D, 0x4EAB)  /* <CJK> */
-MAP(0x35, 0x7E, 0x4EAC)  /* <CJK> */
-MAP(0x36, 0x21, 0x4F9B)  /* <CJK> */
-MAP(0x36, 0x22, 0x4FA0)  /* <CJK> */
-MAP(0x36, 0x23, 0x50D1)  /* <CJK> */
-MAP(0x36, 0x24, 0x5147)  /* <CJK> */
-MAP(0x36, 0x25, 0x7AF6)  /* <CJK> */
-MAP(0x36, 0x26, 0x5171)  /* <CJK> */
-MAP(0x36, 0x27, 0x51F6)  /* <CJK> */
-MAP(0x36, 0x28, 0x5354)  /* <CJK> */
-MAP(0x36, 0x29, 0x5321)  /* <CJK> */
-MAP(0x36, 0x2A, 0x537F)  /* <CJK> */
-MAP(0x36, 0x2B, 0x53EB)  /* <CJK> */
-MAP(0x36, 0x2C, 0x55AC)  /* <CJK> */
-MAP(0x36, 0x2D, 0x5883)  /* <CJK> */
-MAP(0x36, 0x2E, 0x5CE1)  /* <CJK> */
-MAP(0x36, 0x2F, 0x5F37)  /* <CJK> */
-MAP(0x36, 0x30, 0x5F4A)  /* <CJK> */
-MAP(0x36, 0x31, 0x602F)  /* <CJK> */
-MAP(0x36, 0x32, 0x6050)  /* <CJK> */
-MAP(0x36, 0x33, 0x606D)  /* <CJK> */
-MAP(0x36, 0x34, 0x631F)  /* <CJK> */
-MAP(0x36, 0x35, 0x6559)  /* <CJK> */
-MAP(0x36, 0x36, 0x6A4B)  /* <CJK> */
-MAP(0x36, 0x37, 0x6CC1)  /* <CJK> */
-MAP(0x36, 0x38, 0x72C2)  /* <CJK> */
-MAP(0x36, 0x39, 0x72ED)  /* <CJK> */
-MAP(0x36, 0x3A, 0x77EF)  /* <CJK> */
-MAP(0x36, 0x3B, 0x80F8)  /* <CJK> */
-MAP(0x36, 0x3C, 0x8105)  /* <CJK> */
-MAP(0x36, 0x3D, 0x8208)  /* <CJK> */
-MAP(0x36, 0x3E, 0x854E)  /* <CJK> */
-MAP(0x36, 0x3F, 0x90F7)  /* <CJK> */
-MAP(0x36, 0x40, 0x93E1)  /* <CJK> */
-MAP(0x36, 0x41, 0x97FF)  /* <CJK> */
-MAP(0x36, 0x42, 0x9957)  /* <CJK> */
-MAP(0x36, 0x43, 0x9A5A)  /* <CJK> */
-MAP(0x36, 0x44, 0x4EF0)  /* <CJK> */
-MAP(0x36, 0x45, 0x51DD)  /* <CJK> */
-MAP(0x36, 0x46, 0x5C2D)  /* <CJK> */
-MAP(0x36, 0x47, 0x6681)  /* <CJK> */
-MAP(0x36, 0x48, 0x696D)  /* <CJK> */
-MAP(0x36, 0x49, 0x5C40)  /* <CJK> */
-MAP(0x36, 0x4A, 0x66F2)  /* <CJK> */
-MAP(0x36, 0x4B, 0x6975)  /* <CJK> */
-MAP(0x36, 0x4C, 0x7389)  /* <CJK> */
-MAP(0x36, 0x4D, 0x6850)  /* <CJK> */
-MAP(0x36, 0x4E, 0x7C81)  /* <CJK> */
-MAP(0x36, 0x4F, 0x50C5)  /* <CJK> */
-MAP(0x36, 0x50, 0x52E4)  /* <CJK> */
-MAP(0x36, 0x51, 0x5747)  /* <CJK> */
-MAP(0x36, 0x52, 0x5DFE)  /* <CJK> */
-MAP(0x36, 0x53, 0x9326)  /* <CJK> */
-MAP(0x36, 0x54, 0x65A4)  /* <CJK> */
-MAP(0x36, 0x55, 0x6B23)  /* <CJK> */
-MAP(0x36, 0x56, 0x6B3D)  /* <CJK> */
-MAP(0x36, 0x57, 0x7434)  /* <CJK> */
-MAP(0x36, 0x58, 0x7981)  /* <CJK> */
-MAP(0x36, 0x59, 0x79BD)  /* <CJK> */
-MAP(0x36, 0x5A, 0x7B4B)  /* <CJK> */
-MAP(0x36, 0x5B, 0x7DCA)  /* <CJK> */
-MAP(0x36, 0x5C, 0x82B9)  /* <CJK> */
-MAP(0x36, 0x5D, 0x83CC)  /* <CJK> */
-MAP(0x36, 0x5E, 0x887F)  /* <CJK> */
-MAP(0x36, 0x5F, 0x895F)  /* <CJK> */
-MAP(0x36, 0x60, 0x8B39)  /* <CJK> */
-MAP(0x36, 0x61, 0x8FD1)  /* <CJK> */
-MAP(0x36, 0x62, 0x91D1)  /* <CJK> */
-MAP(0x36, 0x63, 0x541F)  /* <CJK> */
-MAP(0x36, 0x64, 0x9280)  /* <CJK> */
-MAP(0x36, 0x65, 0x4E5D)  /* <CJK> */
-MAP(0x36, 0x66, 0x5036)  /* <CJK> */
-MAP(0x36, 0x67, 0x53E5)  /* <CJK> */
-MAP(0x36, 0x68, 0x533A)  /* <CJK> */
-MAP(0x36, 0x69, 0x72D7)  /* <CJK> */
-MAP(0x36, 0x6A, 0x7396)  /* <CJK> */
-MAP(0x36, 0x6B, 0x77E9)  /* <CJK> */
-MAP(0x36, 0x6C, 0x82E6)  /* <CJK> */
-MAP(0x36, 0x6D, 0x8EAF)  /* <CJK> */
-MAP(0x36, 0x6E, 0x99C6)  /* <CJK> */
-MAP(0x36, 0x6F, 0x99C8)  /* <CJK> */
-MAP(0x36, 0x70, 0x99D2)  /* <CJK> */
-MAP(0x36, 0x71, 0x5177)  /* <CJK> */
-MAP(0x36, 0x72, 0x611A)  /* <CJK> */
-MAP(0x36, 0x73, 0x865E)  /* <CJK> */
-MAP(0x36, 0x74, 0x55B0)  /* <CJK> */
-MAP(0x36, 0x75, 0x7A7A)  /* <CJK> */
-MAP(0x36, 0x76, 0x5076)  /* <CJK> */
-MAP(0x36, 0x77, 0x5BD3)  /* <CJK> */
-MAP(0x36, 0x78, 0x9047)  /* <CJK> */
-MAP(0x36, 0x79, 0x9685)  /* <CJK> */
-MAP(0x36, 0x7A, 0x4E32)  /* <CJK> */
-MAP(0x36, 0x7B, 0x6ADB)  /* <CJK> */
-MAP(0x36, 0x7C, 0x91E7)  /* <CJK> */
-MAP(0x36, 0x7D, 0x5C51)  /* <CJK> */
-MAP(0x36, 0x7E, 0x5C48)  /* <CJK> */
-MAP(0x37, 0x21, 0x6398)  /* <CJK> */
-MAP(0x37, 0x22, 0x7A9F)  /* <CJK> */
-MAP(0x37, 0x23, 0x6C93)  /* <CJK> */
-MAP(0x37, 0x24, 0x9774)  /* <CJK> */
-MAP(0x37, 0x25, 0x8F61)  /* <CJK> */
-MAP(0x37, 0x26, 0x7AAA)  /* <CJK> */
-MAP(0x37, 0x27, 0x718A)  /* <CJK> */
-MAP(0x37, 0x28, 0x9688)  /* <CJK> */
-MAP(0x37, 0x29, 0x7C82)  /* <CJK> */
-MAP(0x37, 0x2A, 0x6817)  /* <CJK> */
-MAP(0x37, 0x2B, 0x7E70)  /* <CJK> */
-MAP(0x37, 0x2C, 0x6851)  /* <CJK> */
-MAP(0x37, 0x2D, 0x936C)  /* <CJK> */
-MAP(0x37, 0x2E, 0x52F2)  /* <CJK> */
-MAP(0x37, 0x2F, 0x541B)  /* <CJK> */
-MAP(0x37, 0x30, 0x85AB)  /* <CJK> */
-MAP(0x37, 0x31, 0x8A13)  /* <CJK> */
-MAP(0x37, 0x32, 0x7FA4)  /* <CJK> */
-MAP(0x37, 0x33, 0x8ECD)  /* <CJK> */
-MAP(0x37, 0x34, 0x90E1)  /* <CJK> */
-MAP(0x37, 0x35, 0x5366)  /* <CJK> */
-MAP(0x37, 0x36, 0x8888)  /* <CJK> */
-MAP(0x37, 0x37, 0x7941)  /* <CJK> */
-MAP(0x37, 0x38, 0x4FC2)  /* <CJK> */
-MAP(0x37, 0x39, 0x50BE)  /* <CJK> */
-MAP(0x37, 0x3A, 0x5211)  /* <CJK> */
-MAP(0x37, 0x3B, 0x5144)  /* <CJK> */
-MAP(0x37, 0x3C, 0x5553)  /* <CJK> */
-MAP(0x37, 0x3D, 0x572D)  /* <CJK> */
-MAP(0x37, 0x3E, 0x73EA)  /* <CJK> */
-MAP(0x37, 0x3F, 0x578B)  /* <CJK> */
-MAP(0x37, 0x40, 0x5951)  /* <CJK> */
-MAP(0x37, 0x41, 0x5F62)  /* <CJK> */
-MAP(0x37, 0x42, 0x5F84)  /* <CJK> */
-MAP(0x37, 0x43, 0x6075)  /* <CJK> */
-MAP(0x37, 0x44, 0x6176)  /* <CJK> */
-MAP(0x37, 0x45, 0x6167)  /* <CJK> */
-MAP(0x37, 0x46, 0x61A9)  /* <CJK> */
-MAP(0x37, 0x47, 0x63B2)  /* <CJK> */
-MAP(0x37, 0x48, 0x643A)  /* <CJK> */
-MAP(0x37, 0x49, 0x656C)  /* <CJK> */
-MAP(0x37, 0x4A, 0x666F)  /* <CJK> */
-MAP(0x37, 0x4B, 0x6842)  /* <CJK> */
-MAP(0x37, 0x4C, 0x6E13)  /* <CJK> */
-MAP(0x37, 0x4D, 0x7566)  /* <CJK> */
-MAP(0x37, 0x4E, 0x7A3D)  /* <CJK> */
-MAP(0x37, 0x4F, 0x7CFB)  /* <CJK> */
-MAP(0x37, 0x50, 0x7D4C)  /* <CJK> */
-MAP(0x37, 0x51, 0x7D99)  /* <CJK> */
-MAP(0x37, 0x52, 0x7E4B)  /* <CJK> */
-MAP(0x37, 0x53, 0x7F6B)  /* <CJK> */
-MAP(0x37, 0x54, 0x830E)  /* <CJK> */
-MAP(0x37, 0x55, 0x834A)  /* <CJK> */
-MAP(0x37, 0x56, 0x86CD)  /* <CJK> */
-MAP(0x37, 0x57, 0x8A08)  /* <CJK> */
-MAP(0x37, 0x58, 0x8A63)  /* <CJK> */
-MAP(0x37, 0x59, 0x8B66)  /* <CJK> */
-MAP(0x37, 0x5A, 0x8EFD)  /* <CJK> */
-MAP(0x37, 0x5B, 0x981A)  /* <CJK> */
-MAP(0x37, 0x5C, 0x9D8F)  /* <CJK> */
-MAP(0x37, 0x5D, 0x82B8)  /* <CJK> */
-MAP(0x37, 0x5E, 0x8FCE)  /* <CJK> */
-MAP(0x37, 0x5F, 0x9BE8)  /* <CJK> */
-MAP(0x37, 0x60, 0x5287)  /* <CJK> */
-MAP(0x37, 0x61, 0x621F)  /* <CJK> */
-MAP(0x37, 0x62, 0x6483)  /* <CJK> */
-MAP(0x37, 0x63, 0x6FC0)  /* <CJK> */
-MAP(0x37, 0x64, 0x9699)  /* <CJK> */
-MAP(0x37, 0x65, 0x6841)  /* <CJK> */
-MAP(0x37, 0x66, 0x5091)  /* <CJK> */
-MAP(0x37, 0x67, 0x6B20)  /* <CJK> */
-MAP(0x37, 0x68, 0x6C7A)  /* <CJK> */
-MAP(0x37, 0x69, 0x6F54)  /* <CJK> */
-MAP(0x37, 0x6A, 0x7A74)  /* <CJK> */
-MAP(0x37, 0x6B, 0x7D50)  /* <CJK> */
-MAP(0x37, 0x6C, 0x8840)  /* <CJK> */
-MAP(0x37, 0x6D, 0x8A23)  /* <CJK> */
-MAP(0x37, 0x6E, 0x6708)  /* <CJK> */
-MAP(0x37, 0x6F, 0x4EF6)  /* <CJK> */
-MAP(0x37, 0x70, 0x5039)  /* <CJK> */
-MAP(0x37, 0x71, 0x5026)  /* <CJK> */
-MAP(0x37, 0x72, 0x5065)  /* <CJK> */
-MAP(0x37, 0x73, 0x517C)  /* <CJK> */
-MAP(0x37, 0x74, 0x5238)  /* <CJK> */
-MAP(0x37, 0x75, 0x5263)  /* <CJK> */
-MAP(0x37, 0x76, 0x55A7)  /* <CJK> */
-MAP(0x37, 0x77, 0x570F)  /* <CJK> */
-MAP(0x37, 0x78, 0x5805)  /* <CJK> */
-MAP(0x37, 0x79, 0x5ACC)  /* <CJK> */
-MAP(0x37, 0x7A, 0x5EFA)  /* <CJK> */
-MAP(0x37, 0x7B, 0x61B2)  /* <CJK> */
-MAP(0x37, 0x7C, 0x61F8)  /* <CJK> */
-MAP(0x37, 0x7D, 0x62F3)  /* <CJK> */
-MAP(0x37, 0x7E, 0x6372)  /* <CJK> */
-MAP(0x38, 0x21, 0x691C)  /* <CJK> */
-MAP(0x38, 0x22, 0x6A29)  /* <CJK> */
-MAP(0x38, 0x23, 0x727D)  /* <CJK> */
-MAP(0x38, 0x24, 0x72AC)  /* <CJK> */
-MAP(0x38, 0x25, 0x732E)  /* <CJK> */
-MAP(0x38, 0x26, 0x7814)  /* <CJK> */
-MAP(0x38, 0x27, 0x786F)  /* <CJK> */
-MAP(0x38, 0x28, 0x7D79)  /* <CJK> */
-MAP(0x38, 0x29, 0x770C)  /* <CJK> */
-MAP(0x38, 0x2A, 0x80A9)  /* <CJK> */
-MAP(0x38, 0x2B, 0x898B)  /* <CJK> */
-MAP(0x38, 0x2C, 0x8B19)  /* <CJK> */
-MAP(0x38, 0x2D, 0x8CE2)  /* <CJK> */
-MAP(0x38, 0x2E, 0x8ED2)  /* <CJK> */
-MAP(0x38, 0x2F, 0x9063)  /* <CJK> */
-MAP(0x38, 0x30, 0x9375)  /* <CJK> */
-MAP(0x38, 0x31, 0x967A)  /* <CJK> */
-MAP(0x38, 0x32, 0x9855)  /* <CJK> */
-MAP(0x38, 0x33, 0x9A13)  /* <CJK> */
-MAP(0x38, 0x34, 0x9E78)  /* <CJK> */
-MAP(0x38, 0x35, 0x5143)  /* <CJK> */
-MAP(0x38, 0x36, 0x539F)  /* <CJK> */
-MAP(0x38, 0x37, 0x53B3)  /* <CJK> */
-MAP(0x38, 0x38, 0x5E7B)  /* <CJK> */
-MAP(0x38, 0x39, 0x5F26)  /* <CJK> */
-MAP(0x38, 0x3A, 0x6E1B)  /* <CJK> */
-MAP(0x38, 0x3B, 0x6E90)  /* <CJK> */
-MAP(0x38, 0x3C, 0x7384)  /* <CJK> */
-MAP(0x38, 0x3D, 0x73FE)  /* <CJK> */
-MAP(0x38, 0x3E, 0x7D43)  /* <CJK> */
-MAP(0x38, 0x3F, 0x8237)  /* <CJK> */
-MAP(0x38, 0x40, 0x8A00)  /* <CJK> */
-MAP(0x38, 0x41, 0x8AFA)  /* <CJK> */
-MAP(0x38, 0x42, 0x9650)  /* <CJK> */
-MAP(0x38, 0x43, 0x4E4E)  /* <CJK> */
-MAP(0x38, 0x44, 0x500B)  /* <CJK> */
-MAP(0x38, 0x45, 0x53E4)  /* <CJK> */
-MAP(0x38, 0x46, 0x547C)  /* <CJK> */
-MAP(0x38, 0x47, 0x56FA)  /* <CJK> */
-MAP(0x38, 0x48, 0x59D1)  /* <CJK> */
-MAP(0x38, 0x49, 0x5B64)  /* <CJK> */
-MAP(0x38, 0x4A, 0x5DF1)  /* <CJK> */
-MAP(0x38, 0x4B, 0x5EAB)  /* <CJK> */
-MAP(0x38, 0x4C, 0x5F27)  /* <CJK> */
-MAP(0x38, 0x4D, 0x6238)  /* <CJK> */
-MAP(0x38, 0x4E, 0x6545)  /* <CJK> */
-MAP(0x38, 0x4F, 0x67AF)  /* <CJK> */
-MAP(0x38, 0x50, 0x6E56)  /* <CJK> */
-MAP(0x38, 0x51, 0x72D0)  /* <CJK> */
-MAP(0x38, 0x52, 0x7CCA)  /* <CJK> */
-MAP(0x38, 0x53, 0x88B4)  /* <CJK> */
-MAP(0x38, 0x54, 0x80A1)  /* <CJK> */
-MAP(0x38, 0x55, 0x80E1)  /* <CJK> */
-MAP(0x38, 0x56, 0x83F0)  /* <CJK> */
-MAP(0x38, 0x57, 0x864E)  /* <CJK> */
-MAP(0x38, 0x58, 0x8A87)  /* <CJK> */
-MAP(0x38, 0x59, 0x8DE8)  /* <CJK> */
-MAP(0x38, 0x5A, 0x9237)  /* <CJK> */
-MAP(0x38, 0x5B, 0x96C7)  /* <CJK> */
-MAP(0x38, 0x5C, 0x9867)  /* <CJK> */
-MAP(0x38, 0x5D, 0x9F13)  /* <CJK> */
-MAP(0x38, 0x5E, 0x4E94)  /* <CJK> */
-MAP(0x38, 0x5F, 0x4E92)  /* <CJK> */
-MAP(0x38, 0x60, 0x4F0D)  /* <CJK> */
-MAP(0x38, 0x61, 0x5348)  /* <CJK> */
-MAP(0x38, 0x62, 0x5449)  /* <CJK> */
-MAP(0x38, 0x63, 0x543E)  /* <CJK> */
-MAP(0x38, 0x64, 0x5A2F)  /* <CJK> */
-MAP(0x38, 0x65, 0x5F8C)  /* <CJK> */
-MAP(0x38, 0x66, 0x5FA1)  /* <CJK> */
-MAP(0x38, 0x67, 0x609F)  /* <CJK> */
-MAP(0x38, 0x68, 0x68A7)  /* <CJK> */
-MAP(0x38, 0x69, 0x6A8E)  /* <CJK> */
-MAP(0x38, 0x6A, 0x745A)  /* <CJK> */
-MAP(0x38, 0x6B, 0x7881)  /* <CJK> */
-MAP(0x38, 0x6C, 0x8A9E)  /* <CJK> */
-MAP(0x38, 0x6D, 0x8AA4)  /* <CJK> */
-MAP(0x38, 0x6E, 0x8B77)  /* <CJK> */
-MAP(0x38, 0x6F, 0x9190)  /* <CJK> */
-MAP(0x38, 0x70, 0x4E5E)  /* <CJK> */
-MAP(0x38, 0x71, 0x9BC9)  /* <CJK> */
-MAP(0x38, 0x72, 0x4EA4)  /* <CJK> */
-MAP(0x38, 0x73, 0x4F7C)  /* <CJK> */
-MAP(0x38, 0x74, 0x4FAF)  /* <CJK> */
-MAP(0x38, 0x75, 0x5019)  /* <CJK> */
-MAP(0x38, 0x76, 0x5016)  /* <CJK> */
-MAP(0x38, 0x77, 0x5149)  /* <CJK> */
-MAP(0x38, 0x78, 0x516C)  /* <CJK> */
-MAP(0x38, 0x79, 0x529F)  /* <CJK> */
-MAP(0x38, 0x7A, 0x52B9)  /* <CJK> */
-MAP(0x38, 0x7B, 0x52FE)  /* <CJK> */
-MAP(0x38, 0x7C, 0x539A)  /* <CJK> */
-MAP(0x38, 0x7D, 0x53E3)  /* <CJK> */
-MAP(0x38, 0x7E, 0x5411)  /* <CJK> */
-MAP(0x39, 0x21, 0x540E)  /* <CJK> */
-MAP(0x39, 0x22, 0x5589)  /* <CJK> */
-MAP(0x39, 0x23, 0x5751)  /* <CJK> */
-MAP(0x39, 0x24, 0x57A2)  /* <CJK> */
-MAP(0x39, 0x25, 0x597D)  /* <CJK> */
-MAP(0x39, 0x26, 0x5B54)  /* <CJK> */
-MAP(0x39, 0x27, 0x5B5D)  /* <CJK> */
-MAP(0x39, 0x28, 0x5B8F)  /* <CJK> */
-MAP(0x39, 0x29, 0x5DE5)  /* <CJK> */
-MAP(0x39, 0x2A, 0x5DE7)  /* <CJK> */
-MAP(0x39, 0x2B, 0x5DF7)  /* <CJK> */
-MAP(0x39, 0x2C, 0x5E78)  /* <CJK> */
-MAP(0x39, 0x2D, 0x5E83)  /* <CJK> */
-MAP(0x39, 0x2E, 0x5E9A)  /* <CJK> */
-MAP(0x39, 0x2F, 0x5EB7)  /* <CJK> */
-MAP(0x39, 0x30, 0x5F18)  /* <CJK> */
-MAP(0x39, 0x31, 0x6052)  /* <CJK> */
-MAP(0x39, 0x32, 0x614C)  /* <CJK> */
-MAP(0x39, 0x33, 0x6297)  /* <CJK> */
-MAP(0x39, 0x34, 0x62D8)  /* <CJK> */
-MAP(0x39, 0x35, 0x63A7)  /* <CJK> */
-MAP(0x39, 0x36, 0x653B)  /* <CJK> */
-MAP(0x39, 0x37, 0x6602)  /* <CJK> */
-MAP(0x39, 0x38, 0x6643)  /* <CJK> */
-MAP(0x39, 0x39, 0x66F4)  /* <CJK> */
-MAP(0x39, 0x3A, 0x676D)  /* <CJK> */
-MAP(0x39, 0x3B, 0x6821)  /* <CJK> */
-MAP(0x39, 0x3C, 0x6897)  /* <CJK> */
-MAP(0x39, 0x3D, 0x69CB)  /* <CJK> */
-MAP(0x39, 0x3E, 0x6C5F)  /* <CJK> */
-MAP(0x39, 0x3F, 0x6D2A)  /* <CJK> */
-MAP(0x39, 0x40, 0x6D69)  /* <CJK> */
-MAP(0x39, 0x41, 0x6E2F)  /* <CJK> */
-MAP(0x39, 0x42, 0x6E9D)  /* <CJK> */
-MAP(0x39, 0x43, 0x7532)  /* <CJK> */
-MAP(0x39, 0x44, 0x7687)  /* <CJK> */
-MAP(0x39, 0x45, 0x786C)  /* <CJK> */
-MAP(0x39, 0x46, 0x7A3F)  /* <CJK> */
-MAP(0x39, 0x47, 0x7CE0)  /* <CJK> */
-MAP(0x39, 0x48, 0x7D05)  /* <CJK> */
-MAP(0x39, 0x49, 0x7D18)  /* <CJK> */
-MAP(0x39, 0x4A, 0x7D5E)  /* <CJK> */
-MAP(0x39, 0x4B, 0x7DB1)  /* <CJK> */
-MAP(0x39, 0x4C, 0x8015)  /* <CJK> */
-MAP(0x39, 0x4D, 0x8003)  /* <CJK> */
-MAP(0x39, 0x4E, 0x80AF)  /* <CJK> */
-MAP(0x39, 0x4F, 0x80B1)  /* <CJK> */
-MAP(0x39, 0x50, 0x8154)  /* <CJK> */
-MAP(0x39, 0x51, 0x818F)  /* <CJK> */
-MAP(0x39, 0x52, 0x822A)  /* <CJK> */
-MAP(0x39, 0x53, 0x8352)  /* <CJK> */
-MAP(0x39, 0x54, 0x884C)  /* <CJK> */
-MAP(0x39, 0x55, 0x8861)  /* <CJK> */
-MAP(0x39, 0x56, 0x8B1B)  /* <CJK> */
-MAP(0x39, 0x57, 0x8CA2)  /* <CJK> */
-MAP(0x39, 0x58, 0x8CFC)  /* <CJK> */
-MAP(0x39, 0x59, 0x90CA)  /* <CJK> */
-MAP(0x39, 0x5A, 0x9175)  /* <CJK> */
-MAP(0x39, 0x5B, 0x9271)  /* <CJK> */
-MAP(0x39, 0x5C, 0x783F)  /* <CJK> */
-MAP(0x39, 0x5D, 0x92FC)  /* <CJK> */
-MAP(0x39, 0x5E, 0x95A4)  /* <CJK> */
-MAP(0x39, 0x5F, 0x964D)  /* <CJK> */
-MAP(0x39, 0x60, 0x9805)  /* <CJK> */
-MAP(0x39, 0x61, 0x9999)  /* <CJK> */
-MAP(0x39, 0x62, 0x9AD8)  /* <CJK> */
-MAP(0x39, 0x63, 0x9D3B)  /* <CJK> */
-MAP(0x39, 0x64, 0x525B)  /* <CJK> */
-MAP(0x39, 0x65, 0x52AB)  /* <CJK> */
-MAP(0x39, 0x66, 0x53F7)  /* <CJK> */
-MAP(0x39, 0x67, 0x5408)  /* <CJK> */
-MAP(0x39, 0x68, 0x58D5)  /* <CJK> */
-MAP(0x39, 0x69, 0x62F7)  /* <CJK> */
-MAP(0x39, 0x6A, 0x6FE0)  /* <CJK> */
-MAP(0x39, 0x6B, 0x8C6A)  /* <CJK> */
-MAP(0x39, 0x6C, 0x8F5F)  /* <CJK> */
-MAP(0x39, 0x6D, 0x9EB9)  /* <CJK> */
-MAP(0x39, 0x6E, 0x514B)  /* <CJK> */
-MAP(0x39, 0x6F, 0x523B)  /* <CJK> */
-MAP(0x39, 0x70, 0x544A)  /* <CJK> */
-MAP(0x39, 0x71, 0x56FD)  /* <CJK> */
-MAP(0x39, 0x72, 0x7A40)  /* <CJK> */
-MAP(0x39, 0x73, 0x9177)  /* <CJK> */
-MAP(0x39, 0x74, 0x9D60)  /* <CJK> */
-MAP(0x39, 0x75, 0x9ED2)  /* <CJK> */
-MAP(0x39, 0x76, 0x7344)  /* <CJK> */
-MAP(0x39, 0x77, 0x6F09)  /* <CJK> */
-MAP(0x39, 0x78, 0x8170)  /* <CJK> */
-MAP(0x39, 0x79, 0x7511)  /* <CJK> */
-MAP(0x39, 0x7A, 0x5FFD)  /* <CJK> */
-MAP(0x39, 0x7B, 0x60DA)  /* <CJK> */
-MAP(0x39, 0x7C, 0x9AA8)  /* <CJK> */
-MAP(0x39, 0x7D, 0x72DB)  /* <CJK> */
-MAP(0x39, 0x7E, 0x8FBC)  /* <CJK> */
-MAP(0x3A, 0x21, 0x6B64)  /* <CJK> */
-MAP(0x3A, 0x22, 0x9803)  /* <CJK> */
-MAP(0x3A, 0x23, 0x4ECA)  /* <CJK> */
-MAP(0x3A, 0x24, 0x56F0)  /* <CJK> */
-MAP(0x3A, 0x25, 0x5764)  /* <CJK> */
-MAP(0x3A, 0x26, 0x58BE)  /* <CJK> */
-MAP(0x3A, 0x27, 0x5A5A)  /* <CJK> */
-MAP(0x3A, 0x28, 0x6068)  /* <CJK> */
-MAP(0x3A, 0x29, 0x61C7)  /* <CJK> */
-MAP(0x3A, 0x2A, 0x660F)  /* <CJK> */
-MAP(0x3A, 0x2B, 0x6606)  /* <CJK> */
-MAP(0x3A, 0x2C, 0x6839)  /* <CJK> */
-MAP(0x3A, 0x2D, 0x68B1)  /* <CJK> */
-MAP(0x3A, 0x2E, 0x6DF7)  /* <CJK> */
-MAP(0x3A, 0x2F, 0x75D5)  /* <CJK> */
-MAP(0x3A, 0x30, 0x7D3A)  /* <CJK> */
-MAP(0x3A, 0x31, 0x826E)  /* <CJK> */
-MAP(0x3A, 0x32, 0x9B42)  /* <CJK> */
-MAP(0x3A, 0x33, 0x4E9B)  /* <CJK> */
-MAP(0x3A, 0x34, 0x4F50)  /* <CJK> */
-MAP(0x3A, 0x35, 0x53C9)  /* <CJK> */
-MAP(0x3A, 0x36, 0x5506)  /* <CJK> */
-MAP(0x3A, 0x37, 0x5D6F)  /* <CJK> */
-MAP(0x3A, 0x38, 0x5DE6)  /* <CJK> */
-MAP(0x3A, 0x39, 0x5DEE)  /* <CJK> */
-MAP(0x3A, 0x3A, 0x67FB)  /* <CJK> */
-MAP(0x3A, 0x3B, 0x6C99)  /* <CJK> */
-MAP(0x3A, 0x3C, 0x7473)  /* <CJK> */
-MAP(0x3A, 0x3D, 0x7802)  /* <CJK> */
-MAP(0x3A, 0x3E, 0x8A50)  /* <CJK> */
-MAP(0x3A, 0x3F, 0x9396)  /* <CJK> */
-MAP(0x3A, 0x40, 0x88DF)  /* <CJK> */
-MAP(0x3A, 0x41, 0x5750)  /* <CJK> */
-MAP(0x3A, 0x42, 0x5EA7)  /* <CJK> */
-MAP(0x3A, 0x43, 0x632B)  /* <CJK> */
-MAP(0x3A, 0x44, 0x50B5)  /* <CJK> */
-MAP(0x3A, 0x45, 0x50AC)  /* <CJK> */
-MAP(0x3A, 0x46, 0x518D)  /* <CJK> */
-MAP(0x3A, 0x47, 0x6700)  /* <CJK> */
-MAP(0x3A, 0x48, 0x54C9)  /* <CJK> */
-MAP(0x3A, 0x49, 0x585E)  /* <CJK> */
-MAP(0x3A, 0x4A, 0x59BB)  /* <CJK> */
-MAP(0x3A, 0x4B, 0x5BB0)  /* <CJK> */
-MAP(0x3A, 0x4C, 0x5F69)  /* <CJK> */
-MAP(0x3A, 0x4D, 0x624D)  /* <CJK> */
-MAP(0x3A, 0x4E, 0x63A1)  /* <CJK> */
-MAP(0x3A, 0x4F, 0x683D)  /* <CJK> */
-MAP(0x3A, 0x50, 0x6B73)  /* <CJK> */
-MAP(0x3A, 0x51, 0x6E08)  /* <CJK> */
-MAP(0x3A, 0x52, 0x707D)  /* <CJK> */
-MAP(0x3A, 0x53, 0x91C7)  /* <CJK> */
-MAP(0x3A, 0x54, 0x7280)  /* <CJK> */
-MAP(0x3A, 0x55, 0x7815)  /* <CJK> */
-MAP(0x3A, 0x56, 0x7826)  /* <CJK> */
-MAP(0x3A, 0x57, 0x796D)  /* <CJK> */
-MAP(0x3A, 0x58, 0x658E)  /* <CJK> */
-MAP(0x3A, 0x59, 0x7D30)  /* <CJK> */
-MAP(0x3A, 0x5A, 0x83DC)  /* <CJK> */
-MAP(0x3A, 0x5B, 0x88C1)  /* <CJK> */
-MAP(0x3A, 0x5C, 0x8F09)  /* <CJK> */
-MAP(0x3A, 0x5D, 0x969B)  /* <CJK> */
-MAP(0x3A, 0x5E, 0x5264)  /* <CJK> */
-MAP(0x3A, 0x5F, 0x5728)  /* <CJK> */
-MAP(0x3A, 0x60, 0x6750)  /* <CJK> */
-MAP(0x3A, 0x61, 0x7F6A)  /* <CJK> */
-MAP(0x3A, 0x62, 0x8CA1)  /* <CJK> */
-MAP(0x3A, 0x63, 0x51B4)  /* <CJK> */
-MAP(0x3A, 0x64, 0x5742)  /* <CJK> */
-MAP(0x3A, 0x65, 0x962A)  /* <CJK> */
-MAP(0x3A, 0x66, 0x583A)  /* <CJK> */
-MAP(0x3A, 0x67, 0x698A)  /* <CJK> */
-MAP(0x3A, 0x68, 0x80B4)  /* <CJK> */
-MAP(0x3A, 0x69, 0x54B2)  /* <CJK> */
-MAP(0x3A, 0x6A, 0x5D0E)  /* <CJK> */
-MAP(0x3A, 0x6B, 0x57FC)  /* <CJK> */
-MAP(0x3A, 0x6C, 0x7895)  /* <CJK> */
-MAP(0x3A, 0x6D, 0x9DFA)  /* <CJK> */
-MAP(0x3A, 0x6E, 0x4F5C)  /* <CJK> */
-MAP(0x3A, 0x6F, 0x524A)  /* <CJK> */
-MAP(0x3A, 0x70, 0x548B)  /* <CJK> */
-MAP(0x3A, 0x71, 0x643E)  /* <CJK> */
-MAP(0x3A, 0x72, 0x6628)  /* <CJK> */
-MAP(0x3A, 0x73, 0x6714)  /* <CJK> */
-MAP(0x3A, 0x74, 0x67F5)  /* <CJK> */
-MAP(0x3A, 0x75, 0x7A84)  /* <CJK> */
-MAP(0x3A, 0x76, 0x7B56)  /* <CJK> */
-MAP(0x3A, 0x77, 0x7D22)  /* <CJK> */
-MAP(0x3A, 0x78, 0x932F)  /* <CJK> */
-MAP(0x3A, 0x79, 0x685C)  /* <CJK> */
-MAP(0x3A, 0x7A, 0x9BAD)  /* <CJK> */
-MAP(0x3A, 0x7B, 0x7B39)  /* <CJK> */
-MAP(0x3A, 0x7C, 0x5319)  /* <CJK> */
-MAP(0x3A, 0x7D, 0x518A)  /* <CJK> */
-MAP(0x3A, 0x7E, 0x5237)  /* <CJK> */
-MAP(0x3B, 0x21, 0x5BDF)  /* <CJK> */
-MAP(0x3B, 0x22, 0x62F6)  /* <CJK> */
-MAP(0x3B, 0x23, 0x64AE)  /* <CJK> */
-MAP(0x3B, 0x24, 0x64E6)  /* <CJK> */
-MAP(0x3B, 0x25, 0x672D)  /* <CJK> */
-MAP(0x3B, 0x26, 0x6BBA)  /* <CJK> */
-MAP(0x3B, 0x27, 0x85A9)  /* <CJK> */
-MAP(0x3B, 0x28, 0x96D1)  /* <CJK> */
-MAP(0x3B, 0x29, 0x7690)  /* <CJK> */
-MAP(0x3B, 0x2A, 0x9BD6)  /* <CJK> */
-MAP(0x3B, 0x2B, 0x634C)  /* <CJK> */
-MAP(0x3B, 0x2C, 0x9306)  /* <CJK> */
-MAP(0x3B, 0x2D, 0x9BAB)  /* <CJK> */
-MAP(0x3B, 0x2E, 0x76BF)  /* <CJK> */
-MAP(0x3B, 0x2F, 0x6652)  /* <CJK> */
-MAP(0x3B, 0x30, 0x4E09)  /* <CJK> */
-MAP(0x3B, 0x31, 0x5098)  /* <CJK> */
-MAP(0x3B, 0x32, 0x53C2)  /* <CJK> */
-MAP(0x3B, 0x33, 0x5C71)  /* <CJK> */
-MAP(0x3B, 0x34, 0x60E8)  /* <CJK> */
-MAP(0x3B, 0x35, 0x6492)  /* <CJK> */
-MAP(0x3B, 0x36, 0x6563)  /* <CJK> */
-MAP(0x3B, 0x37, 0x685F)  /* <CJK> */
-MAP(0x3B, 0x38, 0x71E6)  /* <CJK> */
-MAP(0x3B, 0x39, 0x73CA)  /* <CJK> */
-MAP(0x3B, 0x3A, 0x7523)  /* <CJK> */
-MAP(0x3B, 0x3B, 0x7B97)  /* <CJK> */
-MAP(0x3B, 0x3C, 0x7E82)  /* <CJK> */
-MAP(0x3B, 0x3D, 0x8695)  /* <CJK> */
-MAP(0x3B, 0x3E, 0x8B83)  /* <CJK> */
-MAP(0x3B, 0x3F, 0x8CDB)  /* <CJK> */
-MAP(0x3B, 0x40, 0x9178)  /* <CJK> */
-MAP(0x3B, 0x41, 0x9910)  /* <CJK> */
-MAP(0x3B, 0x42, 0x65AC)  /* <CJK> */
-MAP(0x3B, 0x43, 0x66AB)  /* <CJK> */
-MAP(0x3B, 0x44, 0x6B8B)  /* <CJK> */
-MAP(0x3B, 0x45, 0x4ED5)  /* <CJK> */
-MAP(0x3B, 0x46, 0x4ED4)  /* <CJK> */
-MAP(0x3B, 0x47, 0x4F3A)  /* <CJK> */
-MAP(0x3B, 0x48, 0x4F7F)  /* <CJK> */
-MAP(0x3B, 0x49, 0x523A)  /* <CJK> */
-MAP(0x3B, 0x4A, 0x53F8)  /* <CJK> */
-MAP(0x3B, 0x4B, 0x53F2)  /* <CJK> */
-MAP(0x3B, 0x4C, 0x55E3)  /* <CJK> */
-MAP(0x3B, 0x4D, 0x56DB)  /* <CJK> */
-MAP(0x3B, 0x4E, 0x58EB)  /* <CJK> */
-MAP(0x3B, 0x4F, 0x59CB)  /* <CJK> */
-MAP(0x3B, 0x50, 0x59C9)  /* <CJK> */
-MAP(0x3B, 0x51, 0x59FF)  /* <CJK> */
-MAP(0x3B, 0x52, 0x5B50)  /* <CJK> */
-MAP(0x3B, 0x53, 0x5C4D)  /* <CJK> */
-MAP(0x3B, 0x54, 0x5E02)  /* <CJK> */
-MAP(0x3B, 0x55, 0x5E2B)  /* <CJK> */
-MAP(0x3B, 0x56, 0x5FD7)  /* <CJK> */
-MAP(0x3B, 0x57, 0x601D)  /* <CJK> */
-MAP(0x3B, 0x58, 0x6307)  /* <CJK> */
-MAP(0x3B, 0x59, 0x652F)  /* <CJK> */
-MAP(0x3B, 0x5A, 0x5B5C)  /* <CJK> */
-MAP(0x3B, 0x5B, 0x65AF)  /* <CJK> */
-MAP(0x3B, 0x5C, 0x65BD)  /* <CJK> */
-MAP(0x3B, 0x5D, 0x65E8)  /* <CJK> */
-MAP(0x3B, 0x5E, 0x679D)  /* <CJK> */
-MAP(0x3B, 0x5F, 0x6B62)  /* <CJK> */
-MAP(0x3B, 0x60, 0x6B7B)  /* <CJK> */
-MAP(0x3B, 0x61, 0x6C0F)  /* <CJK> */
-MAP(0x3B, 0x62, 0x7345)  /* <CJK> */
-MAP(0x3B, 0x63, 0x7949)  /* <CJK> */
-MAP(0x3B, 0x64, 0x79C1)  /* <CJK> */
-MAP(0x3B, 0x65, 0x7CF8)  /* <CJK> */
-MAP(0x3B, 0x66, 0x7D19)  /* <CJK> */
-MAP(0x3B, 0x67, 0x7D2B)  /* <CJK> */
-MAP(0x3B, 0x68, 0x80A2)  /* <CJK> */
-MAP(0x3B, 0x69, 0x8102)  /* <CJK> */
-MAP(0x3B, 0x6A, 0x81F3)  /* <CJK> */
-MAP(0x3B, 0x6B, 0x8996)  /* <CJK> */
-MAP(0x3B, 0x6C, 0x8A5E)  /* <CJK> */
-MAP(0x3B, 0x6D, 0x8A69)  /* <CJK> */
-MAP(0x3B, 0x6E, 0x8A66)  /* <CJK> */
-MAP(0x3B, 0x6F, 0x8A8C)  /* <CJK> */
-MAP(0x3B, 0x70, 0x8AEE)  /* <CJK> */
-MAP(0x3B, 0x71, 0x8CC7)  /* <CJK> */
-MAP(0x3B, 0x72, 0x8CDC)  /* <CJK> */
-MAP(0x3B, 0x73, 0x96CC)  /* <CJK> */
-MAP(0x3B, 0x74, 0x98FC)  /* <CJK> */
-MAP(0x3B, 0x75, 0x6B6F)  /* <CJK> */
-MAP(0x3B, 0x76, 0x4E8B)  /* <CJK> */
-MAP(0x3B, 0x77, 0x4F3C)  /* <CJK> */
-MAP(0x3B, 0x78, 0x4F8D)  /* <CJK> */
-MAP(0x3B, 0x79, 0x5150)  /* <CJK> */
-MAP(0x3B, 0x7A, 0x5B57)  /* <CJK> */
-MAP(0x3B, 0x7B, 0x5BFA)  /* <CJK> */
-MAP(0x3B, 0x7C, 0x6148)  /* <CJK> */
-MAP(0x3B, 0x7D, 0x6301)  /* <CJK> */
-MAP(0x3B, 0x7E, 0x6642)  /* <CJK> */
-MAP(0x3C, 0x21, 0x6B21)  /* <CJK> */
-MAP(0x3C, 0x22, 0x6ECB)  /* <CJK> */
-MAP(0x3C, 0x23, 0x6CBB)  /* <CJK> */
-MAP(0x3C, 0x24, 0x723E)  /* <CJK> */
-MAP(0x3C, 0x25, 0x74BD)  /* <CJK> */
-MAP(0x3C, 0x26, 0x75D4)  /* <CJK> */
-MAP(0x3C, 0x27, 0x78C1)  /* <CJK> */
-MAP(0x3C, 0x28, 0x793A)  /* <CJK> */
-MAP(0x3C, 0x29, 0x800C)  /* <CJK> */
-MAP(0x3C, 0x2A, 0x8033)  /* <CJK> */
-MAP(0x3C, 0x2B, 0x81EA)  /* <CJK> */
-MAP(0x3C, 0x2C, 0x8494)  /* <CJK> */
-MAP(0x3C, 0x2D, 0x8F9E)  /* <CJK> */
-MAP(0x3C, 0x2E, 0x6C50)  /* <CJK> */
-MAP(0x3C, 0x2F, 0x9E7F)  /* <CJK> */
-MAP(0x3C, 0x30, 0x5F0F)  /* <CJK> */
-MAP(0x3C, 0x31, 0x8B58)  /* <CJK> */
-MAP(0x3C, 0x32, 0x9D2B)  /* <CJK> */
-MAP(0x3C, 0x33, 0x7AFA)  /* <CJK> */
-MAP(0x3C, 0x34, 0x8EF8)  /* <CJK> */
-MAP(0x3C, 0x35, 0x5B8D)  /* <CJK> */
-MAP(0x3C, 0x36, 0x96EB)  /* <CJK> */
-MAP(0x3C, 0x37, 0x4E03)  /* <CJK> */
-MAP(0x3C, 0x38, 0x53F1)  /* <CJK> */
-MAP(0x3C, 0x39, 0x57F7)  /* <CJK> */
-MAP(0x3C, 0x3A, 0x5931)  /* <CJK> */
-MAP(0x3C, 0x3B, 0x5AC9)  /* <CJK> */
-MAP(0x3C, 0x3C, 0x5BA4)  /* <CJK> */
-MAP(0x3C, 0x3D, 0x6089)  /* <CJK> */
-MAP(0x3C, 0x3E, 0x6E7F)  /* <CJK> */
-MAP(0x3C, 0x3F, 0x6F06)  /* <CJK> */
-MAP(0x3C, 0x40, 0x75BE)  /* <CJK> */
-MAP(0x3C, 0x41, 0x8CEA)  /* <CJK> */
-MAP(0x3C, 0x42, 0x5B9F)  /* <CJK> */
-MAP(0x3C, 0x43, 0x8500)  /* <CJK> */
-MAP(0x3C, 0x44, 0x7BE0)  /* <CJK> */
-MAP(0x3C, 0x45, 0x5072)  /* <CJK> */
-MAP(0x3C, 0x46, 0x67F4)  /* <CJK> */
-MAP(0x3C, 0x47, 0x829D)  /* <CJK> */
-MAP(0x3C, 0x48, 0x5C61)  /* <CJK> */
-MAP(0x3C, 0x49, 0x854A)  /* <CJK> */
-MAP(0x3C, 0x4A, 0x7E1E)  /* <CJK> */
-MAP(0x3C, 0x4B, 0x820E)  /* <CJK> */
-MAP(0x3C, 0x4C, 0x5199)  /* <CJK> */
-MAP(0x3C, 0x4D, 0x5C04)  /* <CJK> */
-MAP(0x3C, 0x4E, 0x6368)  /* <CJK> */
-MAP(0x3C, 0x4F, 0x8D66)  /* <CJK> */
-MAP(0x3C, 0x50, 0x659C)  /* <CJK> */
-MAP(0x3C, 0x51, 0x716E)  /* <CJK> */
-MAP(0x3C, 0x52, 0x793E)  /* <CJK> */
-MAP(0x3C, 0x53, 0x7D17)  /* <CJK> */
-MAP(0x3C, 0x54, 0x8005)  /* <CJK> */
-MAP(0x3C, 0x55, 0x8B1D)  /* <CJK> */
-MAP(0x3C, 0x56, 0x8ECA)  /* <CJK> */
-MAP(0x3C, 0x57, 0x906E)  /* <CJK> */
-MAP(0x3C, 0x58, 0x86C7)  /* <CJK> */
-MAP(0x3C, 0x59, 0x90AA)  /* <CJK> */
-MAP(0x3C, 0x5A, 0x501F)  /* <CJK> */
-MAP(0x3C, 0x5B, 0x52FA)  /* <CJK> */
-MAP(0x3C, 0x5C, 0x5C3A)  /* <CJK> */
-MAP(0x3C, 0x5D, 0x6753)  /* <CJK> */
-MAP(0x3C, 0x5E, 0x707C)  /* <CJK> */
-MAP(0x3C, 0x5F, 0x7235)  /* <CJK> */
-MAP(0x3C, 0x60, 0x914C)  /* <CJK> */
-MAP(0x3C, 0x61, 0x91C8)  /* <CJK> */
-MAP(0x3C, 0x62, 0x932B)  /* <CJK> */
-MAP(0x3C, 0x63, 0x82E5)  /* <CJK> */
-MAP(0x3C, 0x64, 0x5BC2)  /* <CJK> */
-MAP(0x3C, 0x65, 0x5F31)  /* <CJK> */
-MAP(0x3C, 0x66, 0x60F9)  /* <CJK> */
-MAP(0x3C, 0x67, 0x4E3B)  /* <CJK> */
-MAP(0x3C, 0x68, 0x53D6)  /* <CJK> */
-MAP(0x3C, 0x69, 0x5B88)  /* <CJK> */
-MAP(0x3C, 0x6A, 0x624B)  /* <CJK> */
-MAP(0x3C, 0x6B, 0x6731)  /* <CJK> */
-MAP(0x3C, 0x6C, 0x6B8A)  /* <CJK> */
-MAP(0x3C, 0x6D, 0x72E9)  /* <CJK> */
-MAP(0x3C, 0x6E, 0x73E0)  /* <CJK> */
-MAP(0x3C, 0x6F, 0x7A2E)  /* <CJK> */
-MAP(0x3C, 0x70, 0x816B)  /* <CJK> */
-MAP(0x3C, 0x71, 0x8DA3)  /* <CJK> */
-MAP(0x3C, 0x72, 0x9152)  /* <CJK> */
-MAP(0x3C, 0x73, 0x9996)  /* <CJK> */
-MAP(0x3C, 0x74, 0x5112)  /* <CJK> */
-MAP(0x3C, 0x75, 0x53D7)  /* <CJK> */
-MAP(0x3C, 0x76, 0x546A)  /* <CJK> */
-MAP(0x3C, 0x77, 0x5BFF)  /* <CJK> */
-MAP(0x3C, 0x78, 0x6388)  /* <CJK> */
-MAP(0x3C, 0x79, 0x6A39)  /* <CJK> */
-MAP(0x3C, 0x7A, 0x7DAC)  /* <CJK> */
-MAP(0x3C, 0x7B, 0x9700)  /* <CJK> */
-MAP(0x3C, 0x7C, 0x56DA)  /* <CJK> */
-MAP(0x3C, 0x7D, 0x53CE)  /* <CJK> */
-MAP(0x3C, 0x7E, 0x5468)  /* <CJK> */
-MAP(0x3D, 0x21, 0x5B97)  /* <CJK> */
-MAP(0x3D, 0x22, 0x5C31)  /* <CJK> */
-MAP(0x3D, 0x23, 0x5DDE)  /* <CJK> */
-MAP(0x3D, 0x24, 0x4FEE)  /* <CJK> */
-MAP(0x3D, 0x25, 0x6101)  /* <CJK> */
-MAP(0x3D, 0x26, 0x62FE)  /* <CJK> */
-MAP(0x3D, 0x27, 0x6D32)  /* <CJK> */
-MAP(0x3D, 0x28, 0x79C0)  /* <CJK> */
-MAP(0x3D, 0x29, 0x79CB)  /* <CJK> */
-MAP(0x3D, 0x2A, 0x7D42)  /* <CJK> */
-MAP(0x3D, 0x2B, 0x7E4D)  /* <CJK> */
-MAP(0x3D, 0x2C, 0x7FD2)  /* <CJK> */
-MAP(0x3D, 0x2D, 0x81ED)  /* <CJK> */
-MAP(0x3D, 0x2E, 0x821F)  /* <CJK> */
-MAP(0x3D, 0x2F, 0x8490)  /* <CJK> */
-MAP(0x3D, 0x30, 0x8846)  /* <CJK> */
-MAP(0x3D, 0x31, 0x8972)  /* <CJK> */
-MAP(0x3D, 0x32, 0x8B90)  /* <CJK> */
-MAP(0x3D, 0x33, 0x8E74)  /* <CJK> */
-MAP(0x3D, 0x34, 0x8F2F)  /* <CJK> */
-MAP(0x3D, 0x35, 0x9031)  /* <CJK> */
-MAP(0x3D, 0x36, 0x914B)  /* <CJK> */
-MAP(0x3D, 0x37, 0x916C)  /* <CJK> */
-MAP(0x3D, 0x38, 0x96C6)  /* <CJK> */
-MAP(0x3D, 0x39, 0x919C)  /* <CJK> */
-MAP(0x3D, 0x3A, 0x4EC0)  /* <CJK> */
-MAP(0x3D, 0x3B, 0x4F4F)  /* <CJK> */
-MAP(0x3D, 0x3C, 0x5145)  /* <CJK> */
-MAP(0x3D, 0x3D, 0x5341)  /* <CJK> */
-MAP(0x3D, 0x3E, 0x5F93)  /* <CJK> */
-MAP(0x3D, 0x3F, 0x620E)  /* <CJK> */
-MAP(0x3D, 0x40, 0x67D4)  /* <CJK> */
-MAP(0x3D, 0x41, 0x6C41)  /* <CJK> */
-MAP(0x3D, 0x42, 0x6E0B)  /* <CJK> */
-MAP(0x3D, 0x43, 0x7363)  /* <CJK> */
-MAP(0x3D, 0x44, 0x7E26)  /* <CJK> */
-MAP(0x3D, 0x45, 0x91CD)  /* <CJK> */
-MAP(0x3D, 0x46, 0x9283)  /* <CJK> */
-MAP(0x3D, 0x47, 0x53D4)  /* <CJK> */
-MAP(0x3D, 0x48, 0x5919)  /* <CJK> */
-MAP(0x3D, 0x49, 0x5BBF)  /* <CJK> */
-MAP(0x3D, 0x4A, 0x6DD1)  /* <CJK> */
-MAP(0x3D, 0x4B, 0x795D)  /* <CJK> */
-MAP(0x3D, 0x4C, 0x7E2E)  /* <CJK> */
-MAP(0x3D, 0x4D, 0x7C9B)  /* <CJK> */
-MAP(0x3D, 0x4E, 0x587E)  /* <CJK> */
-MAP(0x3D, 0x4F, 0x719F)  /* <CJK> */
-MAP(0x3D, 0x50, 0x51FA)  /* <CJK> */
-MAP(0x3D, 0x51, 0x8853)  /* <CJK> */
-MAP(0x3D, 0x52, 0x8FF0)  /* <CJK> */
-MAP(0x3D, 0x53, 0x4FCA)  /* <CJK> */
-MAP(0x3D, 0x54, 0x5CFB)  /* <CJK> */
-MAP(0x3D, 0x55, 0x6625)  /* <CJK> */
-MAP(0x3D, 0x56, 0x77AC)  /* <CJK> */
-MAP(0x3D, 0x57, 0x7AE3)  /* <CJK> */
-MAP(0x3D, 0x58, 0x821C)  /* <CJK> */
-MAP(0x3D, 0x59, 0x99FF)  /* <CJK> */
-MAP(0x3D, 0x5A, 0x51C6)  /* <CJK> */
-MAP(0x3D, 0x5B, 0x5FAA)  /* <CJK> */
-MAP(0x3D, 0x5C, 0x65EC)  /* <CJK> */
-MAP(0x3D, 0x5D, 0x696F)  /* <CJK> */
-MAP(0x3D, 0x5E, 0x6B89)  /* <CJK> */
-MAP(0x3D, 0x5F, 0x6DF3)  /* <CJK> */
-MAP(0x3D, 0x60, 0x6E96)  /* <CJK> */
-MAP(0x3D, 0x61, 0x6F64)  /* <CJK> */
-MAP(0x3D, 0x62, 0x76FE)  /* <CJK> */
-MAP(0x3D, 0x63, 0x7D14)  /* <CJK> */
-MAP(0x3D, 0x64, 0x5DE1)  /* <CJK> */
-MAP(0x3D, 0x65, 0x9075)  /* <CJK> */
-MAP(0x3D, 0x66, 0x9187)  /* <CJK> */
-MAP(0x3D, 0x67, 0x9806)  /* <CJK> */
-MAP(0x3D, 0x68, 0x51E6)  /* <CJK> */
-MAP(0x3D, 0x69, 0x521D)  /* <CJK> */
-MAP(0x3D, 0x6A, 0x6240)  /* <CJK> */
-MAP(0x3D, 0x6B, 0x6691)  /* <CJK> */
-MAP(0x3D, 0x6C, 0x66D9)  /* <CJK> */
-MAP(0x3D, 0x6D, 0x6E1A)  /* <CJK> */
-MAP(0x3D, 0x6E, 0x5EB6)  /* <CJK> */
-MAP(0x3D, 0x6F, 0x7DD2)  /* <CJK> */
-MAP(0x3D, 0x70, 0x7F72)  /* <CJK> */
-MAP(0x3D, 0x71, 0x66F8)  /* <CJK> */
-MAP(0x3D, 0x72, 0x85AF)  /* <CJK> */
-MAP(0x3D, 0x73, 0x85F7)  /* <CJK> */
-MAP(0x3D, 0x74, 0x8AF8)  /* <CJK> */
-MAP(0x3D, 0x75, 0x52A9)  /* <CJK> */
-MAP(0x3D, 0x76, 0x53D9)  /* <CJK> */
-MAP(0x3D, 0x77, 0x5973)  /* <CJK> */
-MAP(0x3D, 0x78, 0x5E8F)  /* <CJK> */
-MAP(0x3D, 0x79, 0x5F90)  /* <CJK> */
-MAP(0x3D, 0x7A, 0x6055)  /* <CJK> */
-MAP(0x3D, 0x7B, 0x92E4)  /* <CJK> */
-MAP(0x3D, 0x7C, 0x9664)  /* <CJK> */
-MAP(0x3D, 0x7D, 0x50B7)  /* <CJK> */
-MAP(0x3D, 0x7E, 0x511F)  /* <CJK> */
-MAP(0x3E, 0x21, 0x52DD)  /* <CJK> */
-MAP(0x3E, 0x22, 0x5320)  /* <CJK> */
-MAP(0x3E, 0x23, 0x5347)  /* <CJK> */
-MAP(0x3E, 0x24, 0x53EC)  /* <CJK> */
-MAP(0x3E, 0x25, 0x54E8)  /* <CJK> */
-MAP(0x3E, 0x26, 0x5546)  /* <CJK> */
-MAP(0x3E, 0x27, 0x5531)  /* <CJK> */
-MAP(0x3E, 0x28, 0x5617)  /* <CJK> */
-MAP(0x3E, 0x29, 0x5968)  /* <CJK> */
-MAP(0x3E, 0x2A, 0x59BE)  /* <CJK> */
-MAP(0x3E, 0x2B, 0x5A3C)  /* <CJK> */
-MAP(0x3E, 0x2C, 0x5BB5)  /* <CJK> */
-MAP(0x3E, 0x2D, 0x5C06)  /* <CJK> */
-MAP(0x3E, 0x2E, 0x5C0F)  /* <CJK> */
-MAP(0x3E, 0x2F, 0x5C11)  /* <CJK> */
-MAP(0x3E, 0x30, 0x5C1A)  /* <CJK> */
-MAP(0x3E, 0x31, 0x5E84)  /* <CJK> */
-MAP(0x3E, 0x32, 0x5E8A)  /* <CJK> */
-MAP(0x3E, 0x33, 0x5EE0)  /* <CJK> */
-MAP(0x3E, 0x34, 0x5F70)  /* <CJK> */
-MAP(0x3E, 0x35, 0x627F)  /* <CJK> */
-MAP(0x3E, 0x36, 0x6284)  /* <CJK> */
-MAP(0x3E, 0x37, 0x62DB)  /* <CJK> */
-MAP(0x3E, 0x38, 0x638C)  /* <CJK> */
-MAP(0x3E, 0x39, 0x6377)  /* <CJK> */
-MAP(0x3E, 0x3A, 0x6607)  /* <CJK> */
-MAP(0x3E, 0x3B, 0x660C)  /* <CJK> */
-MAP(0x3E, 0x3C, 0x662D)  /* <CJK> */
-MAP(0x3E, 0x3D, 0x6676)  /* <CJK> */
-MAP(0x3E, 0x3E, 0x677E)  /* <CJK> */
-MAP(0x3E, 0x3F, 0x68A2)  /* <CJK> */
-MAP(0x3E, 0x40, 0x6A1F)  /* <CJK> */
-MAP(0x3E, 0x41, 0x6A35)  /* <CJK> */
-MAP(0x3E, 0x42, 0x6CBC)  /* <CJK> */
-MAP(0x3E, 0x43, 0x6D88)  /* <CJK> */
-MAP(0x3E, 0x44, 0x6E09)  /* <CJK> */
-MAP(0x3E, 0x45, 0x6E58)  /* <CJK> */
-MAP(0x3E, 0x46, 0x713C)  /* <CJK> */
-MAP(0x3E, 0x47, 0x7126)  /* <CJK> */
-MAP(0x3E, 0x48, 0x7167)  /* <CJK> */
-MAP(0x3E, 0x49, 0x75C7)  /* <CJK> */
-MAP(0x3E, 0x4A, 0x7701)  /* <CJK> */
-MAP(0x3E, 0x4B, 0x785D)  /* <CJK> */
-MAP(0x3E, 0x4C, 0x7901)  /* <CJK> */
-MAP(0x3E, 0x4D, 0x7965)  /* <CJK> */
-MAP(0x3E, 0x4E, 0x79F0)  /* <CJK> */
-MAP(0x3E, 0x4F, 0x7AE0)  /* <CJK> */
-MAP(0x3E, 0x50, 0x7B11)  /* <CJK> */
-MAP(0x3E, 0x51, 0x7CA7)  /* <CJK> */
-MAP(0x3E, 0x52, 0x7D39)  /* <CJK> */
-MAP(0x3E, 0x53, 0x8096)  /* <CJK> */
-MAP(0x3E, 0x54, 0x83D6)  /* <CJK> */
-MAP(0x3E, 0x55, 0x848B)  /* <CJK> */
-MAP(0x3E, 0x56, 0x8549)  /* <CJK> */
-MAP(0x3E, 0x57, 0x885D)  /* <CJK> */
-MAP(0x3E, 0x58, 0x88F3)  /* <CJK> */
-MAP(0x3E, 0x59, 0x8A1F)  /* <CJK> */
-MAP(0x3E, 0x5A, 0x8A3C)  /* <CJK> */
-MAP(0x3E, 0x5B, 0x8A54)  /* <CJK> */
-MAP(0x3E, 0x5C, 0x8A73)  /* <CJK> */
-MAP(0x3E, 0x5D, 0x8C61)  /* <CJK> */
-MAP(0x3E, 0x5E, 0x8CDE)  /* <CJK> */
-MAP(0x3E, 0x5F, 0x91A4)  /* <CJK> */
-MAP(0x3E, 0x60, 0x9266)  /* <CJK> */
-MAP(0x3E, 0x61, 0x937E)  /* <CJK> */
-MAP(0x3E, 0x62, 0x9418)  /* <CJK> */
-MAP(0x3E, 0x63, 0x969C)  /* <CJK> */
-MAP(0x3E, 0x64, 0x9798)  /* <CJK> */
-MAP(0x3E, 0x65, 0x4E0A)  /* <CJK> */
-MAP(0x3E, 0x66, 0x4E08)  /* <CJK> */
-MAP(0x3E, 0x67, 0x4E1E)  /* <CJK> */
-MAP(0x3E, 0x68, 0x4E57)  /* <CJK> */
-MAP(0x3E, 0x69, 0x5197)  /* <CJK> */
-MAP(0x3E, 0x6A, 0x5270)  /* <CJK> */
-MAP(0x3E, 0x6B, 0x57CE)  /* <CJK> */
-MAP(0x3E, 0x6C, 0x5834)  /* <CJK> */
-MAP(0x3E, 0x6D, 0x58CC)  /* <CJK> */
-MAP(0x3E, 0x6E, 0x5B22)  /* <CJK> */
-MAP(0x3E, 0x6F, 0x5E38)  /* <CJK> */
-MAP(0x3E, 0x70, 0x60C5)  /* <CJK> */
-MAP(0x3E, 0x71, 0x64FE)  /* <CJK> */
-MAP(0x3E, 0x72, 0x6761)  /* <CJK> */
-MAP(0x3E, 0x73, 0x6756)  /* <CJK> */
-MAP(0x3E, 0x74, 0x6D44)  /* <CJK> */
-MAP(0x3E, 0x75, 0x72B6)  /* <CJK> */
-MAP(0x3E, 0x76, 0x7573)  /* <CJK> */
-MAP(0x3E, 0x77, 0x7A63)  /* <CJK> */
-MAP(0x3E, 0x78, 0x84B8)  /* <CJK> */
-MAP(0x3E, 0x79, 0x8B72)  /* <CJK> */
-MAP(0x3E, 0x7A, 0x91B8)  /* <CJK> */
-MAP(0x3E, 0x7B, 0x9320)  /* <CJK> */
-MAP(0x3E, 0x7C, 0x5631)  /* <CJK> */
-MAP(0x3E, 0x7D, 0x57F4)  /* <CJK> */
-MAP(0x3E, 0x7E, 0x98FE)  /* <CJK> */
-MAP(0x3F, 0x21, 0x62ED)  /* <CJK> */
-MAP(0x3F, 0x22, 0x690D)  /* <CJK> */
-MAP(0x3F, 0x23, 0x6B96)  /* <CJK> */
-MAP(0x3F, 0x24, 0x71ED)  /* <CJK> */
-MAP(0x3F, 0x25, 0x7E54)  /* <CJK> */
-MAP(0x3F, 0x26, 0x8077)  /* <CJK> */
-MAP(0x3F, 0x27, 0x8272)  /* <CJK> */
-MAP(0x3F, 0x28, 0x89E6)  /* <CJK> */
-MAP(0x3F, 0x29, 0x98DF)  /* <CJK> */
-MAP(0x3F, 0x2A, 0x8755)  /* <CJK> */
-MAP(0x3F, 0x2B, 0x8FB1)  /* <CJK> */
-MAP(0x3F, 0x2C, 0x5C3B)  /* <CJK> */
-MAP(0x3F, 0x2D, 0x4F38)  /* <CJK> */
-MAP(0x3F, 0x2E, 0x4FE1)  /* <CJK> */
-MAP(0x3F, 0x2F, 0x4FB5)  /* <CJK> */
-MAP(0x3F, 0x30, 0x5507)  /* <CJK> */
-MAP(0x3F, 0x31, 0x5A20)  /* <CJK> */
-MAP(0x3F, 0x32, 0x5BDD)  /* <CJK> */
-MAP(0x3F, 0x33, 0x5BE9)  /* <CJK> */
-MAP(0x3F, 0x34, 0x5FC3)  /* <CJK> */
-MAP(0x3F, 0x35, 0x614E)  /* <CJK> */
-MAP(0x3F, 0x36, 0x632F)  /* <CJK> */
-MAP(0x3F, 0x37, 0x65B0)  /* <CJK> */
-MAP(0x3F, 0x38, 0x664B)  /* <CJK> */
-MAP(0x3F, 0x39, 0x68EE)  /* <CJK> */
-MAP(0x3F, 0x3A, 0x699B)  /* <CJK> */
-MAP(0x3F, 0x3B, 0x6D78)  /* <CJK> */
-MAP(0x3F, 0x3C, 0x6DF1)  /* <CJK> */
-MAP(0x3F, 0x3D, 0x7533)  /* <CJK> */
-MAP(0x3F, 0x3E, 0x75B9)  /* <CJK> */
-MAP(0x3F, 0x3F, 0x771F)  /* <CJK> */
-MAP(0x3F, 0x40, 0x795E)  /* <CJK> */
-MAP(0x3F, 0x41, 0x79E6)  /* <CJK> */
-MAP(0x3F, 0x42, 0x7D33)  /* <CJK> */
-MAP(0x3F, 0x43, 0x81E3)  /* <CJK> */
-MAP(0x3F, 0x44, 0x82AF)  /* <CJK> */
-MAP(0x3F, 0x45, 0x85AA)  /* <CJK> */
-MAP(0x3F, 0x46, 0x89AA)  /* <CJK> */
-MAP(0x3F, 0x47, 0x8A3A)  /* <CJK> */
-MAP(0x3F, 0x48, 0x8EAB)  /* <CJK> */
-MAP(0x3F, 0x49, 0x8F9B)  /* <CJK> */
-MAP(0x3F, 0x4A, 0x9032)  /* <CJK> */
-MAP(0x3F, 0x4B, 0x91DD)  /* <CJK> */
-MAP(0x3F, 0x4C, 0x9707)  /* <CJK> */
-MAP(0x3F, 0x4D, 0x4EBA)  /* <CJK> */
-MAP(0x3F, 0x4E, 0x4EC1)  /* <CJK> */
-MAP(0x3F, 0x4F, 0x5203)  /* <CJK> */
-MAP(0x3F, 0x50, 0x5875)  /* <CJK> */
-MAP(0x3F, 0x51, 0x58EC)  /* <CJK> */
-MAP(0x3F, 0x52, 0x5C0B)  /* <CJK> */
-MAP(0x3F, 0x53, 0x751A)  /* <CJK> */
-MAP(0x3F, 0x54, 0x5C3D)  /* <CJK> */
-MAP(0x3F, 0x55, 0x814E)  /* <CJK> */
-MAP(0x3F, 0x56, 0x8A0A)  /* <CJK> */
-MAP(0x3F, 0x57, 0x8FC5)  /* <CJK> */
-MAP(0x3F, 0x58, 0x9663)  /* <CJK> */
-MAP(0x3F, 0x59, 0x976D)  /* <CJK> */
-MAP(0x3F, 0x5A, 0x7B25)  /* <CJK> */
-MAP(0x3F, 0x5B, 0x8ACF)  /* <CJK> */
-MAP(0x3F, 0x5C, 0x9808)  /* <CJK> */
-MAP(0x3F, 0x5D, 0x9162)  /* <CJK> */
-MAP(0x3F, 0x5E, 0x56F3)  /* <CJK> */
-MAP(0x3F, 0x5F, 0x53A8)  /* <CJK> */
-MAP(0x3F, 0x60, 0x9017)  /* <CJK> */
-MAP(0x3F, 0x61, 0x5439)  /* <CJK> */
-MAP(0x3F, 0x62, 0x5782)  /* <CJK> */
-MAP(0x3F, 0x63, 0x5E25)  /* <CJK> */
-MAP(0x3F, 0x64, 0x63A8)  /* <CJK> */
-MAP(0x3F, 0x65, 0x6C34)  /* <CJK> */
-MAP(0x3F, 0x66, 0x708A)  /* <CJK> */
-MAP(0x3F, 0x67, 0x7761)  /* <CJK> */
-MAP(0x3F, 0x68, 0x7C8B)  /* <CJK> */
-MAP(0x3F, 0x69, 0x7FE0)  /* <CJK> */
-MAP(0x3F, 0x6A, 0x8870)  /* <CJK> */
-MAP(0x3F, 0x6B, 0x9042)  /* <CJK> */
-MAP(0x3F, 0x6C, 0x9154)  /* <CJK> */
-MAP(0x3F, 0x6D, 0x9310)  /* <CJK> */
-MAP(0x3F, 0x6E, 0x9318)  /* <CJK> */
-MAP(0x3F, 0x6F, 0x968F)  /* <CJK> */
-MAP(0x3F, 0x70, 0x745E)  /* <CJK> */
-MAP(0x3F, 0x71, 0x9AC4)  /* <CJK> */
-MAP(0x3F, 0x72, 0x5D07)  /* <CJK> */
-MAP(0x3F, 0x73, 0x5D69)  /* <CJK> */
-MAP(0x3F, 0x74, 0x6570)  /* <CJK> */
-MAP(0x3F, 0x75, 0x67A2)  /* <CJK> */
-MAP(0x3F, 0x76, 0x8DA8)  /* <CJK> */
-MAP(0x3F, 0x77, 0x96DB)  /* <CJK> */
-MAP(0x3F, 0x78, 0x636E)  /* <CJK> */
-MAP(0x3F, 0x79, 0x6749)  /* <CJK> */
-MAP(0x3F, 0x7A, 0x6919)  /* <CJK> */
-MAP(0x3F, 0x7B, 0x83C5)  /* <CJK> */
-MAP(0x3F, 0x7C, 0x9817)  /* <CJK> */
-MAP(0x3F, 0x7D, 0x96C0)  /* <CJK> */
-MAP(0x3F, 0x7E, 0x88FE)  /* <CJK> */
-MAP(0x40, 0x21, 0x6F84)  /* <CJK> */
-MAP(0x40, 0x22, 0x647A)  /* <CJK> */
-MAP(0x40, 0x23, 0x5BF8)  /* <CJK> */
-MAP(0x40, 0x24, 0x4E16)  /* <CJK> */
-MAP(0x40, 0x25, 0x702C)  /* <CJK> */
-MAP(0x40, 0x26, 0x755D)  /* <CJK> */
-MAP(0x40, 0x27, 0x662F)  /* <CJK> */
-MAP(0x40, 0x28, 0x51C4)  /* <CJK> */
-MAP(0x40, 0x29, 0x5236)  /* <CJK> */
-MAP(0x40, 0x2A, 0x52E2)  /* <CJK> */
-MAP(0x40, 0x2B, 0x59D3)  /* <CJK> */
-MAP(0x40, 0x2C, 0x5F81)  /* <CJK> */
-MAP(0x40, 0x2D, 0x6027)  /* <CJK> */
-MAP(0x40, 0x2E, 0x6210)  /* <CJK> */
-MAP(0x40, 0x2F, 0x653F)  /* <CJK> */
-MAP(0x40, 0x30, 0x6574)  /* <CJK> */
-MAP(0x40, 0x31, 0x661F)  /* <CJK> */
-MAP(0x40, 0x32, 0x6674)  /* <CJK> */
-MAP(0x40, 0x33, 0x68F2)  /* <CJK> */
-MAP(0x40, 0x34, 0x6816)  /* <CJK> */
-MAP(0x40, 0x35, 0x6B63)  /* <CJK> */
-MAP(0x40, 0x36, 0x6E05)  /* <CJK> */
-MAP(0x40, 0x37, 0x7272)  /* <CJK> */
-MAP(0x40, 0x38, 0x751F)  /* <CJK> */
-MAP(0x40, 0x39, 0x76DB)  /* <CJK> */
-MAP(0x40, 0x3A, 0x7CBE)  /* <CJK> */
-MAP(0x40, 0x3B, 0x8056)  /* <CJK> */
-MAP(0x40, 0x3C, 0x58F0)  /* <CJK> */
-MAP(0x40, 0x3D, 0x88FD)  /* <CJK> */
-MAP(0x40, 0x3E, 0x897F)  /* <CJK> */
-MAP(0x40, 0x3F, 0x8AA0)  /* <CJK> */
-MAP(0x40, 0x40, 0x8A93)  /* <CJK> */
-MAP(0x40, 0x41, 0x8ACB)  /* <CJK> */
-MAP(0x40, 0x42, 0x901D)  /* <CJK> */
-MAP(0x40, 0x43, 0x9192)  /* <CJK> */
-MAP(0x40, 0x44, 0x9752)  /* <CJK> */
-MAP(0x40, 0x45, 0x9759)  /* <CJK> */
-MAP(0x40, 0x46, 0x6589)  /* <CJK> */
-MAP(0x40, 0x47, 0x7A0E)  /* <CJK> */
-MAP(0x40, 0x48, 0x8106)  /* <CJK> */
-MAP(0x40, 0x49, 0x96BB)  /* <CJK> */
-MAP(0x40, 0x4A, 0x5E2D)  /* <CJK> */
-MAP(0x40, 0x4B, 0x60DC)  /* <CJK> */
-MAP(0x40, 0x4C, 0x621A)  /* <CJK> */
-MAP(0x40, 0x4D, 0x65A5)  /* <CJK> */
-MAP(0x40, 0x4E, 0x6614)  /* <CJK> */
-MAP(0x40, 0x4F, 0x6790)  /* <CJK> */
-MAP(0x40, 0x50, 0x77F3)  /* <CJK> */
-MAP(0x40, 0x51, 0x7A4D)  /* <CJK> */
-MAP(0x40, 0x52, 0x7C4D)  /* <CJK> */
-MAP(0x40, 0x53, 0x7E3E)  /* <CJK> */
-MAP(0x40, 0x54, 0x810A)  /* <CJK> */
-MAP(0x40, 0x55, 0x8CAC)  /* <CJK> */
-MAP(0x40, 0x56, 0x8D64)  /* <CJK> */
-MAP(0x40, 0x57, 0x8DE1)  /* <CJK> */
-MAP(0x40, 0x58, 0x8E5F)  /* <CJK> */
-MAP(0x40, 0x59, 0x78A9)  /* <CJK> */
-MAP(0x40, 0x5A, 0x5207)  /* <CJK> */
-MAP(0x40, 0x5B, 0x62D9)  /* <CJK> */
-MAP(0x40, 0x5C, 0x63A5)  /* <CJK> */
-MAP(0x40, 0x5D, 0x6442)  /* <CJK> */
-MAP(0x40, 0x5E, 0x6298)  /* <CJK> */
-MAP(0x40, 0x5F, 0x8A2D)  /* <CJK> */
-MAP(0x40, 0x60, 0x7A83)  /* <CJK> */
-MAP(0x40, 0x61, 0x7BC0)  /* <CJK> */
-MAP(0x40, 0x62, 0x8AAC)  /* <CJK> */
-MAP(0x40, 0x63, 0x96EA)  /* <CJK> */
-MAP(0x40, 0x64, 0x7D76)  /* <CJK> */
-MAP(0x40, 0x65, 0x820C)  /* <CJK> */
-MAP(0x40, 0x66, 0x8749)  /* <CJK> */
-MAP(0x40, 0x67, 0x4ED9)  /* <CJK> */
-MAP(0x40, 0x68, 0x5148)  /* <CJK> */
-MAP(0x40, 0x69, 0x5343)  /* <CJK> */
-MAP(0x40, 0x6A, 0x5360)  /* <CJK> */
-MAP(0x40, 0x6B, 0x5BA3)  /* <CJK> */
-MAP(0x40, 0x6C, 0x5C02)  /* <CJK> */
-MAP(0x40, 0x6D, 0x5C16)  /* <CJK> */
-MAP(0x40, 0x6E, 0x5DDD)  /* <CJK> */
-MAP(0x40, 0x6F, 0x6226)  /* <CJK> */
-MAP(0x40, 0x70, 0x6247)  /* <CJK> */
-MAP(0x40, 0x71, 0x64B0)  /* <CJK> */
-MAP(0x40, 0x72, 0x6813)  /* <CJK> */
-MAP(0x40, 0x73, 0x6834)  /* <CJK> */
-MAP(0x40, 0x74, 0x6CC9)  /* <CJK> */
-MAP(0x40, 0x75, 0x6D45)  /* <CJK> */
-MAP(0x40, 0x76, 0x6D17)  /* <CJK> */
-MAP(0x40, 0x77, 0x67D3)  /* <CJK> */
-MAP(0x40, 0x78, 0x6F5C)  /* <CJK> */
-MAP(0x40, 0x79, 0x714E)  /* <CJK> */
-MAP(0x40, 0x7A, 0x717D)  /* <CJK> */
-MAP(0x40, 0x7B, 0x65CB)  /* <CJK> */
-MAP(0x40, 0x7C, 0x7A7F)  /* <CJK> */
-MAP(0x40, 0x7D, 0x7BAD)  /* <CJK> */
-MAP(0x40, 0x7E, 0x7DDA)  /* <CJK> */
-MAP(0x41, 0x21, 0x7E4A)  /* <CJK> */
-MAP(0x41, 0x22, 0x7FA8)  /* <CJK> */
-MAP(0x41, 0x23, 0x817A)  /* <CJK> */
-MAP(0x41, 0x24, 0x821B)  /* <CJK> */
-MAP(0x41, 0x25, 0x8239)  /* <CJK> */
-MAP(0x41, 0x26, 0x85A6)  /* <CJK> */
-MAP(0x41, 0x27, 0x8A6E)  /* <CJK> */
-MAP(0x41, 0x28, 0x8CCE)  /* <CJK> */
-MAP(0x41, 0x29, 0x8DF5)  /* <CJK> */
-MAP(0x41, 0x2A, 0x9078)  /* <CJK> */
-MAP(0x41, 0x2B, 0x9077)  /* <CJK> */
-MAP(0x41, 0x2C, 0x92AD)  /* <CJK> */
-MAP(0x41, 0x2D, 0x9291)  /* <CJK> */
-MAP(0x41, 0x2E, 0x9583)  /* <CJK> */
-MAP(0x41, 0x2F, 0x9BAE)  /* <CJK> */
-MAP(0x41, 0x30, 0x524D)  /* <CJK> */
-MAP(0x41, 0x31, 0x5584)  /* <CJK> */
-MAP(0x41, 0x32, 0x6F38)  /* <CJK> */
-MAP(0x41, 0x33, 0x7136)  /* <CJK> */
-MAP(0x41, 0x34, 0x5168)  /* <CJK> */
-MAP(0x41, 0x35, 0x7985)  /* <CJK> */
-MAP(0x41, 0x36, 0x7E55)  /* <CJK> */
-MAP(0x41, 0x37, 0x81B3)  /* <CJK> */
-MAP(0x41, 0x38, 0x7CCE)  /* <CJK> */
-MAP(0x41, 0x39, 0x564C)  /* <CJK> */
-MAP(0x41, 0x3A, 0x5851)  /* <CJK> */
-MAP(0x41, 0x3B, 0x5CA8)  /* <CJK> */
-MAP(0x41, 0x3C, 0x63AA)  /* <CJK> */
-MAP(0x41, 0x3D, 0x66FE)  /* <CJK> */
-MAP(0x41, 0x3E, 0x66FD)  /* <CJK> */
-MAP(0x41, 0x3F, 0x695A)  /* <CJK> */
-MAP(0x41, 0x40, 0x72D9)  /* <CJK> */
-MAP(0x41, 0x41, 0x758F)  /* <CJK> */
-MAP(0x41, 0x42, 0x758E)  /* <CJK> */
-MAP(0x41, 0x43, 0x790E)  /* <CJK> */
-MAP(0x41, 0x44, 0x7956)  /* <CJK> */
-MAP(0x41, 0x45, 0x79DF)  /* <CJK> */
-MAP(0x41, 0x46, 0x7C97)  /* <CJK> */
-MAP(0x41, 0x47, 0x7D20)  /* <CJK> */
-MAP(0x41, 0x48, 0x7D44)  /* <CJK> */
-MAP(0x41, 0x49, 0x8607)  /* <CJK> */
-MAP(0x41, 0x4A, 0x8A34)  /* <CJK> */
-MAP(0x41, 0x4B, 0x963B)  /* <CJK> */
-MAP(0x41, 0x4C, 0x9061)  /* <CJK> */
-MAP(0x41, 0x4D, 0x9F20)  /* <CJK> */
-MAP(0x41, 0x4E, 0x50E7)  /* <CJK> */
-MAP(0x41, 0x4F, 0x5275)  /* <CJK> */
-MAP(0x41, 0x50, 0x53CC)  /* <CJK> */
-MAP(0x41, 0x51, 0x53E2)  /* <CJK> */
-MAP(0x41, 0x52, 0x5009)  /* <CJK> */
-MAP(0x41, 0x53, 0x55AA)  /* <CJK> */
-MAP(0x41, 0x54, 0x58EE)  /* <CJK> */
-MAP(0x41, 0x55, 0x594F)  /* <CJK> */
-MAP(0x41, 0x56, 0x723D)  /* <CJK> */
-MAP(0x41, 0x57, 0x5B8B)  /* <CJK> */
-MAP(0x41, 0x58, 0x5C64)  /* <CJK> */
-MAP(0x41, 0x59, 0x531D)  /* <CJK> */
-MAP(0x41, 0x5A, 0x60E3)  /* <CJK> */
-MAP(0x41, 0x5B, 0x60F3)  /* <CJK> */
-MAP(0x41, 0x5C, 0x635C)  /* <CJK> */
-MAP(0x41, 0x5D, 0x6383)  /* <CJK> */
-MAP(0x41, 0x5E, 0x633F)  /* <CJK> */
-MAP(0x41, 0x5F, 0x63BB)  /* <CJK> */
-MAP(0x41, 0x60, 0x64CD)  /* <CJK> */
-MAP(0x41, 0x61, 0x65E9)  /* <CJK> */
-MAP(0x41, 0x62, 0x66F9)  /* <CJK> */
-MAP(0x41, 0x63, 0x5DE3)  /* <CJK> */
-MAP(0x41, 0x64, 0x69CD)  /* <CJK> */
-MAP(0x41, 0x65, 0x69FD)  /* <CJK> */
-MAP(0x41, 0x66, 0x6F15)  /* <CJK> */
-MAP(0x41, 0x67, 0x71E5)  /* <CJK> */
-MAP(0x41, 0x68, 0x4E89)  /* <CJK> */
-MAP(0x41, 0x69, 0x75E9)  /* <CJK> */
-MAP(0x41, 0x6A, 0x76F8)  /* <CJK> */
-MAP(0x41, 0x6B, 0x7A93)  /* <CJK> */
-MAP(0x41, 0x6C, 0x7CDF)  /* <CJK> */
-MAP(0x41, 0x6D, 0x7DCF)  /* <CJK> */
-MAP(0x41, 0x6E, 0x7D9C)  /* <CJK> */
-MAP(0x41, 0x6F, 0x8061)  /* <CJK> */
-MAP(0x41, 0x70, 0x8349)  /* <CJK> */
-MAP(0x41, 0x71, 0x8358)  /* <CJK> */
-MAP(0x41, 0x72, 0x846C)  /* <CJK> */
-MAP(0x41, 0x73, 0x84BC)  /* <CJK> */
-MAP(0x41, 0x74, 0x85FB)  /* <CJK> */
-MAP(0x41, 0x75, 0x88C5)  /* <CJK> */
-MAP(0x41, 0x76, 0x8D70)  /* <CJK> */
-MAP(0x41, 0x77, 0x9001)  /* <CJK> */
-MAP(0x41, 0x78, 0x906D)  /* <CJK> */
-MAP(0x41, 0x79, 0x9397)  /* <CJK> */
-MAP(0x41, 0x7A, 0x971C)  /* <CJK> */
-MAP(0x41, 0x7B, 0x9A12)  /* <CJK> */
-MAP(0x41, 0x7C, 0x50CF)  /* <CJK> */
-MAP(0x41, 0x7D, 0x5897)  /* <CJK> */
-MAP(0x41, 0x7E, 0x618E)  /* <CJK> */
-MAP(0x42, 0x21, 0x81D3)  /* <CJK> */
-MAP(0x42, 0x22, 0x8535)  /* <CJK> */
-MAP(0x42, 0x23, 0x8D08)  /* <CJK> */
-MAP(0x42, 0x24, 0x9020)  /* <CJK> */
-MAP(0x42, 0x25, 0x4FC3)  /* <CJK> */
-MAP(0x42, 0x26, 0x5074)  /* <CJK> */
-MAP(0x42, 0x27, 0x5247)  /* <CJK> */
-MAP(0x42, 0x28, 0x5373)  /* <CJK> */
-MAP(0x42, 0x29, 0x606F)  /* <CJK> */
-MAP(0x42, 0x2A, 0x6349)  /* <CJK> */
-MAP(0x42, 0x2B, 0x675F)  /* <CJK> */
-MAP(0x42, 0x2C, 0x6E2C)  /* <CJK> */
-MAP(0x42, 0x2D, 0x8DB3)  /* <CJK> */
-MAP(0x42, 0x2E, 0x901F)  /* <CJK> */
-MAP(0x42, 0x2F, 0x4FD7)  /* <CJK> */
-MAP(0x42, 0x30, 0x5C5E)  /* <CJK> */
-MAP(0x42, 0x31, 0x8CCA)  /* <CJK> */
-MAP(0x42, 0x32, 0x65CF)  /* <CJK> */
-MAP(0x42, 0x33, 0x7D9A)  /* <CJK> */
-MAP(0x42, 0x34, 0x5352)  /* <CJK> */
-MAP(0x42, 0x35, 0x8896)  /* <CJK> */
-MAP(0x42, 0x36, 0x5176)  /* <CJK> */
-MAP(0x42, 0x37, 0x63C3)  /* <CJK> */
-MAP(0x42, 0x38, 0x5B58)  /* <CJK> */
-MAP(0x42, 0x39, 0x5B6B)  /* <CJK> */
-MAP(0x42, 0x3A, 0x5C0A)  /* <CJK> */
-MAP(0x42, 0x3B, 0x640D)  /* <CJK> */
-MAP(0x42, 0x3C, 0x6751)  /* <CJK> */
-MAP(0x42, 0x3D, 0x905C)  /* <CJK> */
-MAP(0x42, 0x3E, 0x4ED6)  /* <CJK> */
-MAP(0x42, 0x3F, 0x591A)  /* <CJK> */
-MAP(0x42, 0x40, 0x592A)  /* <CJK> */
-MAP(0x42, 0x41, 0x6C70)  /* <CJK> */
-MAP(0x42, 0x42, 0x8A51)  /* <CJK> */
-MAP(0x42, 0x43, 0x553E)  /* <CJK> */
-MAP(0x42, 0x44, 0x5815)  /* <CJK> */
-MAP(0x42, 0x45, 0x59A5)  /* <CJK> */
-MAP(0x42, 0x46, 0x60F0)  /* <CJK> */
-MAP(0x42, 0x47, 0x6253)  /* <CJK> */
-MAP(0x42, 0x48, 0x67C1)  /* <CJK> */
-MAP(0x42, 0x49, 0x8235)  /* <CJK> */
-MAP(0x42, 0x4A, 0x6955)  /* <CJK> */
-MAP(0x42, 0x4B, 0x9640)  /* <CJK> */
-MAP(0x42, 0x4C, 0x99C4)  /* <CJK> */
-MAP(0x42, 0x4D, 0x9A28)  /* <CJK> */
-MAP(0x42, 0x4E, 0x4F53)  /* <CJK> */
-MAP(0x42, 0x4F, 0x5806)  /* <CJK> */
-MAP(0x42, 0x50, 0x5BFE)  /* <CJK> */
-MAP(0x42, 0x51, 0x8010)  /* <CJK> */
-MAP(0x42, 0x52, 0x5CB1)  /* <CJK> */
-MAP(0x42, 0x53, 0x5E2F)  /* <CJK> */
-MAP(0x42, 0x54, 0x5F85)  /* <CJK> */
-MAP(0x42, 0x55, 0x6020)  /* <CJK> */
-MAP(0x42, 0x56, 0x614B)  /* <CJK> */
-MAP(0x42, 0x57, 0x6234)  /* <CJK> */
-MAP(0x42, 0x58, 0x66FF)  /* <CJK> */
-MAP(0x42, 0x59, 0x6CF0)  /* <CJK> */
-MAP(0x42, 0x5A, 0x6EDE)  /* <CJK> */
-MAP(0x42, 0x5B, 0x80CE)  /* <CJK> */
-MAP(0x42, 0x5C, 0x817F)  /* <CJK> */
-MAP(0x42, 0x5D, 0x82D4)  /* <CJK> */
-MAP(0x42, 0x5E, 0x888B)  /* <CJK> */
-MAP(0x42, 0x5F, 0x8CB8)  /* <CJK> */
-MAP(0x42, 0x60, 0x9000)  /* <CJK> */
-MAP(0x42, 0x61, 0x902E)  /* <CJK> */
-MAP(0x42, 0x62, 0x968A)  /* <CJK> */
-MAP(0x42, 0x63, 0x9EDB)  /* <CJK> */
-MAP(0x42, 0x64, 0x9BDB)  /* <CJK> */
-MAP(0x42, 0x65, 0x4EE3)  /* <CJK> */
-MAP(0x42, 0x66, 0x53F0)  /* <CJK> */
-MAP(0x42, 0x67, 0x5927)  /* <CJK> */
-MAP(0x42, 0x68, 0x7B2C)  /* <CJK> */
-MAP(0x42, 0x69, 0x918D)  /* <CJK> */
-MAP(0x42, 0x6A, 0x984C)  /* <CJK> */
-MAP(0x42, 0x6B, 0x9DF9)  /* <CJK> */
-MAP(0x42, 0x6C, 0x6EDD)  /* <CJK> */
-MAP(0x42, 0x6D, 0x7027)  /* <CJK> */
-MAP(0x42, 0x6E, 0x5353)  /* <CJK> */
-MAP(0x42, 0x6F, 0x5544)  /* <CJK> */
-MAP(0x42, 0x70, 0x5B85)  /* <CJK> */
-MAP(0x42, 0x71, 0x6258)  /* <CJK> */
-MAP(0x42, 0x72, 0x629E)  /* <CJK> */
-MAP(0x42, 0x73, 0x62D3)  /* <CJK> */
-MAP(0x42, 0x74, 0x6CA2)  /* <CJK> */
-MAP(0x42, 0x75, 0x6FEF)  /* <CJK> */
-MAP(0x42, 0x76, 0x7422)  /* <CJK> */
-MAP(0x42, 0x77, 0x8A17)  /* <CJK> */
-MAP(0x42, 0x78, 0x9438)  /* <CJK> */
-MAP(0x42, 0x79, 0x6FC1)  /* <CJK> */
-MAP(0x42, 0x7A, 0x8AFE)  /* <CJK> */
-MAP(0x42, 0x7B, 0x8338)  /* <CJK> */
-MAP(0x42, 0x7C, 0x51E7)  /* <CJK> */
-MAP(0x42, 0x7D, 0x86F8)  /* <CJK> */
-MAP(0x42, 0x7E, 0x53EA)  /* <CJK> */
-MAP(0x43, 0x21, 0x53E9)  /* <CJK> */
-MAP(0x43, 0x22, 0x4F46)  /* <CJK> */
-MAP(0x43, 0x23, 0x9054)  /* <CJK> */
-MAP(0x43, 0x24, 0x8FB0)  /* <CJK> */
-MAP(0x43, 0x25, 0x596A)  /* <CJK> */
-MAP(0x43, 0x26, 0x8131)  /* <CJK> */
-MAP(0x43, 0x27, 0x5DFD)  /* <CJK> */
-MAP(0x43, 0x28, 0x7AEA)  /* <CJK> */
-MAP(0x43, 0x29, 0x8FBF)  /* <CJK> */
-MAP(0x43, 0x2A, 0x68DA)  /* <CJK> */
-MAP(0x43, 0x2B, 0x8C37)  /* <CJK> */
-MAP(0x43, 0x2C, 0x72F8)  /* <CJK> */
-MAP(0x43, 0x2D, 0x9C48)  /* <CJK> */
-MAP(0x43, 0x2E, 0x6A3D)  /* <CJK> */
-MAP(0x43, 0x2F, 0x8AB0)  /* <CJK> */
-MAP(0x43, 0x30, 0x4E39)  /* <CJK> */
-MAP(0x43, 0x31, 0x5358)  /* <CJK> */
-MAP(0x43, 0x32, 0x5606)  /* <CJK> */
-MAP(0x43, 0x33, 0x5766)  /* <CJK> */
-MAP(0x43, 0x34, 0x62C5)  /* <CJK> */
-MAP(0x43, 0x35, 0x63A2)  /* <CJK> */
-MAP(0x43, 0x36, 0x65E6)  /* <CJK> */
-MAP(0x43, 0x37, 0x6B4E)  /* <CJK> */
-MAP(0x43, 0x38, 0x6DE1)  /* <CJK> */
-MAP(0x43, 0x39, 0x6E5B)  /* <CJK> */
-MAP(0x43, 0x3A, 0x70AD)  /* <CJK> */
-MAP(0x43, 0x3B, 0x77ED)  /* <CJK> */
-MAP(0x43, 0x3C, 0x7AEF)  /* <CJK> */
-MAP(0x43, 0x3D, 0x7BAA)  /* <CJK> */
-MAP(0x43, 0x3E, 0x7DBB)  /* <CJK> */
-MAP(0x43, 0x3F, 0x803D)  /* <CJK> */
-MAP(0x43, 0x40, 0x80C6)  /* <CJK> */
-MAP(0x43, 0x41, 0x86CB)  /* <CJK> */
-MAP(0x43, 0x42, 0x8A95)  /* <CJK> */
-MAP(0x43, 0x43, 0x935B)  /* <CJK> */
-MAP(0x43, 0x44, 0x56E3)  /* <CJK> */
-MAP(0x43, 0x45, 0x58C7)  /* <CJK> */
-MAP(0x43, 0x46, 0x5F3E)  /* <CJK> */
-MAP(0x43, 0x47, 0x65AD)  /* <CJK> */
-MAP(0x43, 0x48, 0x6696)  /* <CJK> */
-MAP(0x43, 0x49, 0x6A80)  /* <CJK> */
-MAP(0x43, 0x4A, 0x6BB5)  /* <CJK> */
-MAP(0x43, 0x4B, 0x7537)  /* <CJK> */
-MAP(0x43, 0x4C, 0x8AC7)  /* <CJK> */
-MAP(0x43, 0x4D, 0x5024)  /* <CJK> */
-MAP(0x43, 0x4E, 0x77E5)  /* <CJK> */
-MAP(0x43, 0x4F, 0x5730)  /* <CJK> */
-MAP(0x43, 0x50, 0x5F1B)  /* <CJK> */
-MAP(0x43, 0x51, 0x6065)  /* <CJK> */
-MAP(0x43, 0x52, 0x667A)  /* <CJK> */
-MAP(0x43, 0x53, 0x6C60)  /* <CJK> */
-MAP(0x43, 0x54, 0x75F4)  /* <CJK> */
-MAP(0x43, 0x55, 0x7A1A)  /* <CJK> */
-MAP(0x43, 0x56, 0x7F6E)  /* <CJK> */
-MAP(0x43, 0x57, 0x81F4)  /* <CJK> */
-MAP(0x43, 0x58, 0x8718)  /* <CJK> */
-MAP(0x43, 0x59, 0x9045)  /* <CJK> */
-MAP(0x43, 0x5A, 0x99B3)  /* <CJK> */
-MAP(0x43, 0x5B, 0x7BC9)  /* <CJK> */
-MAP(0x43, 0x5C, 0x755C)  /* <CJK> */
-MAP(0x43, 0x5D, 0x7AF9)  /* <CJK> */
-MAP(0x43, 0x5E, 0x7B51)  /* <CJK> */
-MAP(0x43, 0x5F, 0x84C4)  /* <CJK> */
-MAP(0x43, 0x60, 0x9010)  /* <CJK> */
-MAP(0x43, 0x61, 0x79E9)  /* <CJK> */
-MAP(0x43, 0x62, 0x7A92)  /* <CJK> */
-MAP(0x43, 0x63, 0x8336)  /* <CJK> */
-MAP(0x43, 0x64, 0x5AE1)  /* <CJK> */
-MAP(0x43, 0x65, 0x7740)  /* <CJK> */
-MAP(0x43, 0x66, 0x4E2D)  /* <CJK> */
-MAP(0x43, 0x67, 0x4EF2)  /* <CJK> */
-MAP(0x43, 0x68, 0x5B99)  /* <CJK> */
-MAP(0x43, 0x69, 0x5FE0)  /* <CJK> */
-MAP(0x43, 0x6A, 0x62BD)  /* <CJK> */
-MAP(0x43, 0x6B, 0x663C)  /* <CJK> */
-MAP(0x43, 0x6C, 0x67F1)  /* <CJK> */
-MAP(0x43, 0x6D, 0x6CE8)  /* <CJK> */
-MAP(0x43, 0x6E, 0x866B)  /* <CJK> */
-MAP(0x43, 0x6F, 0x8877)  /* <CJK> */
-MAP(0x43, 0x70, 0x8A3B)  /* <CJK> */
-MAP(0x43, 0x71, 0x914E)  /* <CJK> */
-MAP(0x43, 0x72, 0x92F3)  /* <CJK> */
-MAP(0x43, 0x73, 0x99D0)  /* <CJK> */
-MAP(0x43, 0x74, 0x6A17)  /* <CJK> */
-MAP(0x43, 0x75, 0x7026)  /* <CJK> */
-MAP(0x43, 0x76, 0x732A)  /* <CJK> */
-MAP(0x43, 0x77, 0x82E7)  /* <CJK> */
-MAP(0x43, 0x78, 0x8457)  /* <CJK> */
-MAP(0x43, 0x79, 0x8CAF)  /* <CJK> */
-MAP(0x43, 0x7A, 0x4E01)  /* <CJK> */
-MAP(0x43, 0x7B, 0x5146)  /* <CJK> */
-MAP(0x43, 0x7C, 0x51CB)  /* <CJK> */
-MAP(0x43, 0x7D, 0x558B)  /* <CJK> */
-MAP(0x43, 0x7E, 0x5BF5)  /* <CJK> */
-MAP(0x44, 0x21, 0x5E16)  /* <CJK> */
-MAP(0x44, 0x22, 0x5E33)  /* <CJK> */
-MAP(0x44, 0x23, 0x5E81)  /* <CJK> */
-MAP(0x44, 0x24, 0x5F14)  /* <CJK> */
-MAP(0x44, 0x25, 0x5F35)  /* <CJK> */
-MAP(0x44, 0x26, 0x5F6B)  /* <CJK> */
-MAP(0x44, 0x27, 0x5FB4)  /* <CJK> */
-MAP(0x44, 0x28, 0x61F2)  /* <CJK> */
-MAP(0x44, 0x29, 0x6311)  /* <CJK> */
-MAP(0x44, 0x2A, 0x66A2)  /* <CJK> */
-MAP(0x44, 0x2B, 0x671D)  /* <CJK> */
-MAP(0x44, 0x2C, 0x6F6E)  /* <CJK> */
-MAP(0x44, 0x2D, 0x7252)  /* <CJK> */
-MAP(0x44, 0x2E, 0x753A)  /* <CJK> */
-MAP(0x44, 0x2F, 0x773A)  /* <CJK> */
-MAP(0x44, 0x30, 0x8074)  /* <CJK> */
-MAP(0x44, 0x31, 0x8139)  /* <CJK> */
-MAP(0x44, 0x32, 0x8178)  /* <CJK> */
-MAP(0x44, 0x33, 0x8776)  /* <CJK> */
-MAP(0x44, 0x34, 0x8ABF)  /* <CJK> */
-MAP(0x44, 0x35, 0x8ADC)  /* <CJK> */
-MAP(0x44, 0x36, 0x8D85)  /* <CJK> */
-MAP(0x44, 0x37, 0x8DF3)  /* <CJK> */
-MAP(0x44, 0x38, 0x929A)  /* <CJK> */
-MAP(0x44, 0x39, 0x9577)  /* <CJK> */
-MAP(0x44, 0x3A, 0x9802)  /* <CJK> */
-MAP(0x44, 0x3B, 0x9CE5)  /* <CJK> */
-MAP(0x44, 0x3C, 0x52C5)  /* <CJK> */
-MAP(0x44, 0x3D, 0x6357)  /* <CJK> */
-MAP(0x44, 0x3E, 0x76F4)  /* <CJK> */
-MAP(0x44, 0x3F, 0x6715)  /* <CJK> */
-MAP(0x44, 0x40, 0x6C88)  /* <CJK> */
-MAP(0x44, 0x41, 0x73CD)  /* <CJK> */
-MAP(0x44, 0x42, 0x8CC3)  /* <CJK> */
-MAP(0x44, 0x43, 0x93AE)  /* <CJK> */
-MAP(0x44, 0x44, 0x9673)  /* <CJK> */
-MAP(0x44, 0x45, 0x6D25)  /* <CJK> */
-MAP(0x44, 0x46, 0x589C)  /* <CJK> */
-MAP(0x44, 0x47, 0x690E)  /* <CJK> */
-MAP(0x44, 0x48, 0x69CC)  /* <CJK> */
-MAP(0x44, 0x49, 0x8FFD)  /* <CJK> */
-MAP(0x44, 0x4A, 0x939A)  /* <CJK> */
-MAP(0x44, 0x4B, 0x75DB)  /* <CJK> */
-MAP(0x44, 0x4C, 0x901A)  /* <CJK> */
-MAP(0x44, 0x4D, 0x585A)  /* <CJK> */
-MAP(0x44, 0x4E, 0x6802)  /* <CJK> */
-MAP(0x44, 0x4F, 0x63B4)  /* <CJK> */
-MAP(0x44, 0x50, 0x69FB)  /* <CJK> */
-MAP(0x44, 0x51, 0x4F43)  /* <CJK> */
-MAP(0x44, 0x52, 0x6F2C)  /* <CJK> */
-MAP(0x44, 0x53, 0x67D8)  /* <CJK> */
-MAP(0x44, 0x54, 0x8FBB)  /* <CJK> */
-MAP(0x44, 0x55, 0x8526)  /* <CJK> */
-MAP(0x44, 0x56, 0x7DB4)  /* <CJK> */
-MAP(0x44, 0x57, 0x9354)  /* <CJK> */
-MAP(0x44, 0x58, 0x693F)  /* <CJK> */
-MAP(0x44, 0x59, 0x6F70)  /* <CJK> */
-MAP(0x44, 0x5A, 0x576A)  /* <CJK> */
-MAP(0x44, 0x5B, 0x58F7)  /* <CJK> */
-MAP(0x44, 0x5C, 0x5B2C)  /* <CJK> */
-MAP(0x44, 0x5D, 0x7D2C)  /* <CJK> */
-MAP(0x44, 0x5E, 0x722A)  /* <CJK> */
-MAP(0x44, 0x5F, 0x540A)  /* <CJK> */
-MAP(0x44, 0x60, 0x91E3)  /* <CJK> */
-MAP(0x44, 0x61, 0x9DB4)  /* <CJK> */
-MAP(0x44, 0x62, 0x4EAD)  /* <CJK> */
-MAP(0x44, 0x63, 0x4F4E)  /* <CJK> */
-MAP(0x44, 0x64, 0x505C)  /* <CJK> */
-MAP(0x44, 0x65, 0x5075)  /* <CJK> */
-MAP(0x44, 0x66, 0x5243)  /* <CJK> */
-MAP(0x44, 0x67, 0x8C9E)  /* <CJK> */
-MAP(0x44, 0x68, 0x5448)  /* <CJK> */
-MAP(0x44, 0x69, 0x5824)  /* <CJK> */
-MAP(0x44, 0x6A, 0x5B9A)  /* <CJK> */
-MAP(0x44, 0x6B, 0x5E1D)  /* <CJK> */
-MAP(0x44, 0x6C, 0x5E95)  /* <CJK> */
-MAP(0x44, 0x6D, 0x5EAD)  /* <CJK> */
-MAP(0x44, 0x6E, 0x5EF7)  /* <CJK> */
-MAP(0x44, 0x6F, 0x5F1F)  /* <CJK> */
-MAP(0x44, 0x70, 0x608C)  /* <CJK> */
-MAP(0x44, 0x71, 0x62B5)  /* <CJK> */
-MAP(0x44, 0x72, 0x633A)  /* <CJK> */
-MAP(0x44, 0x73, 0x63D0)  /* <CJK> */
-MAP(0x44, 0x74, 0x68AF)  /* <CJK> */
-MAP(0x44, 0x75, 0x6C40)  /* <CJK> */
-MAP(0x44, 0x76, 0x7887)  /* <CJK> */
-MAP(0x44, 0x77, 0x798E)  /* <CJK> */
-MAP(0x44, 0x78, 0x7A0B)  /* <CJK> */
-MAP(0x44, 0x79, 0x7DE0)  /* <CJK> */
-MAP(0x44, 0x7A, 0x8247)  /* <CJK> */
-MAP(0x44, 0x7B, 0x8A02)  /* <CJK> */
-MAP(0x44, 0x7C, 0x8AE6)  /* <CJK> */
-MAP(0x44, 0x7D, 0x8E44)  /* <CJK> */
-MAP(0x44, 0x7E, 0x9013)  /* <CJK> */
-MAP(0x45, 0x21, 0x90B8)  /* <CJK> */
-MAP(0x45, 0x22, 0x912D)  /* <CJK> */
-MAP(0x45, 0x23, 0x91D8)  /* <CJK> */
-MAP(0x45, 0x24, 0x9F0E)  /* <CJK> */
-MAP(0x45, 0x25, 0x6CE5)  /* <CJK> */
-MAP(0x45, 0x26, 0x6458)  /* <CJK> */
-MAP(0x45, 0x27, 0x64E2)  /* <CJK> */
-MAP(0x45, 0x28, 0x6575)  /* <CJK> */
-MAP(0x45, 0x29, 0x6EF4)  /* <CJK> */
-MAP(0x45, 0x2A, 0x7684)  /* <CJK> */
-MAP(0x45, 0x2B, 0x7B1B)  /* <CJK> */
-MAP(0x45, 0x2C, 0x9069)  /* <CJK> */
-MAP(0x45, 0x2D, 0x93D1)  /* <CJK> */
-MAP(0x45, 0x2E, 0x6EBA)  /* <CJK> */
-MAP(0x45, 0x2F, 0x54F2)  /* <CJK> */
-MAP(0x45, 0x30, 0x5FB9)  /* <CJK> */
-MAP(0x45, 0x31, 0x64A4)  /* <CJK> */
-MAP(0x45, 0x32, 0x8F4D)  /* <CJK> */
-MAP(0x45, 0x33, 0x8FED)  /* <CJK> */
-MAP(0x45, 0x34, 0x9244)  /* <CJK> */
-MAP(0x45, 0x35, 0x5178)  /* <CJK> */
-MAP(0x45, 0x36, 0x586B)  /* <CJK> */
-MAP(0x45, 0x37, 0x5929)  /* <CJK> */
-MAP(0x45, 0x38, 0x5C55)  /* <CJK> */
-MAP(0x45, 0x39, 0x5E97)  /* <CJK> */
-MAP(0x45, 0x3A, 0x6DFB)  /* <CJK> */
-MAP(0x45, 0x3B, 0x7E8F)  /* <CJK> */
-MAP(0x45, 0x3C, 0x751C)  /* <CJK> */
-MAP(0x45, 0x3D, 0x8CBC)  /* <CJK> */
-MAP(0x45, 0x3E, 0x8EE2)  /* <CJK> */
-MAP(0x45, 0x3F, 0x985B)  /* <CJK> */
-MAP(0x45, 0x40, 0x70B9)  /* <CJK> */
-MAP(0x45, 0x41, 0x4F1D)  /* <CJK> */
-MAP(0x45, 0x42, 0x6BBF)  /* <CJK> */
-MAP(0x45, 0x43, 0x6FB1)  /* <CJK> */
-MAP(0x45, 0x44, 0x7530)  /* <CJK> */
-MAP(0x45, 0x45, 0x96FB)  /* <CJK> */
-MAP(0x45, 0x46, 0x514E)  /* <CJK> */
-MAP(0x45, 0x47, 0x5410)  /* <CJK> */
-MAP(0x45, 0x48, 0x5835)  /* <CJK> */
-MAP(0x45, 0x49, 0x5857)  /* <CJK> */
-MAP(0x45, 0x4A, 0x59AC)  /* <CJK> */
-MAP(0x45, 0x4B, 0x5C60)  /* <CJK> */
-MAP(0x45, 0x4C, 0x5F92)  /* <CJK> */
-MAP(0x45, 0x4D, 0x6597)  /* <CJK> */
-MAP(0x45, 0x4E, 0x675C)  /* <CJK> */
-MAP(0x45, 0x4F, 0x6E21)  /* <CJK> */
-MAP(0x45, 0x50, 0x767B)  /* <CJK> */
-MAP(0x45, 0x51, 0x83DF)  /* <CJK> */
-MAP(0x45, 0x52, 0x8CED)  /* <CJK> */
-MAP(0x45, 0x53, 0x9014)  /* <CJK> */
-MAP(0x45, 0x54, 0x90FD)  /* <CJK> */
-MAP(0x45, 0x55, 0x934D)  /* <CJK> */
-MAP(0x45, 0x56, 0x7825)  /* <CJK> */
-MAP(0x45, 0x57, 0x783A)  /* <CJK> */
-MAP(0x45, 0x58, 0x52AA)  /* <CJK> */
-MAP(0x45, 0x59, 0x5EA6)  /* <CJK> */
-MAP(0x45, 0x5A, 0x571F)  /* <CJK> */
-MAP(0x45, 0x5B, 0x5974)  /* <CJK> */
-MAP(0x45, 0x5C, 0x6012)  /* <CJK> */
-MAP(0x45, 0x5D, 0x5012)  /* <CJK> */
-MAP(0x45, 0x5E, 0x515A)  /* <CJK> */
-MAP(0x45, 0x5F, 0x51AC)  /* <CJK> */
-MAP(0x45, 0x60, 0x51CD)  /* <CJK> */
-MAP(0x45, 0x61, 0x5200)  /* <CJK> */
-MAP(0x45, 0x62, 0x5510)  /* <CJK> */
-MAP(0x45, 0x63, 0x5854)  /* <CJK> */
-MAP(0x45, 0x64, 0x5858)  /* <CJK> */
-MAP(0x45, 0x65, 0x5957)  /* <CJK> */
-MAP(0x45, 0x66, 0x5B95)  /* <CJK> */
-MAP(0x45, 0x67, 0x5CF6)  /* <CJK> */
-MAP(0x45, 0x68, 0x5D8B)  /* <CJK> */
-MAP(0x45, 0x69, 0x60BC)  /* <CJK> */
-MAP(0x45, 0x6A, 0x6295)  /* <CJK> */
-MAP(0x45, 0x6B, 0x642D)  /* <CJK> */
-MAP(0x45, 0x6C, 0x6771)  /* <CJK> */
-MAP(0x45, 0x6D, 0x6843)  /* <CJK> */
-MAP(0x45, 0x6E, 0x68BC)  /* <CJK> */
-MAP(0x45, 0x6F, 0x68DF)  /* <CJK> */
-MAP(0x45, 0x70, 0x76D7)  /* <CJK> */
-MAP(0x45, 0x71, 0x6DD8)  /* <CJK> */
-MAP(0x45, 0x72, 0x6E6F)  /* <CJK> */
-MAP(0x45, 0x73, 0x6D9B)  /* <CJK> */
-MAP(0x45, 0x74, 0x706F)  /* <CJK> */
-MAP(0x45, 0x75, 0x71C8)  /* <CJK> */
-MAP(0x45, 0x76, 0x5F53)  /* <CJK> */
-MAP(0x45, 0x77, 0x75D8)  /* <CJK> */
-MAP(0x45, 0x78, 0x7977)  /* <CJK> */
-MAP(0x45, 0x79, 0x7B49)  /* <CJK> */
-MAP(0x45, 0x7A, 0x7B54)  /* <CJK> */
-MAP(0x45, 0x7B, 0x7B52)  /* <CJK> */
-MAP(0x45, 0x7C, 0x7CD6)  /* <CJK> */
-MAP(0x45, 0x7D, 0x7D71)  /* <CJK> */
-MAP(0x45, 0x7E, 0x5230)  /* <CJK> */
-MAP(0x46, 0x21, 0x8463)  /* <CJK> */
-MAP(0x46, 0x22, 0x8569)  /* <CJK> */
-MAP(0x46, 0x23, 0x85E4)  /* <CJK> */
-MAP(0x46, 0x24, 0x8A0E)  /* <CJK> */
-MAP(0x46, 0x25, 0x8B04)  /* <CJK> */
-MAP(0x46, 0x26, 0x8C46)  /* <CJK> */
-MAP(0x46, 0x27, 0x8E0F)  /* <CJK> */
-MAP(0x46, 0x28, 0x9003)  /* <CJK> */
-MAP(0x46, 0x29, 0x900F)  /* <CJK> */
-MAP(0x46, 0x2A, 0x9419)  /* <CJK> */
-MAP(0x46, 0x2B, 0x9676)  /* <CJK> */
-MAP(0x46, 0x2C, 0x982D)  /* <CJK> */
-MAP(0x46, 0x2D, 0x9A30)  /* <CJK> */
-MAP(0x46, 0x2E, 0x95D8)  /* <CJK> */
-MAP(0x46, 0x2F, 0x50CD)  /* <CJK> */
-MAP(0x46, 0x30, 0x52D5)  /* <CJK> */
-MAP(0x46, 0x31, 0x540C)  /* <CJK> */
-MAP(0x46, 0x32, 0x5802)  /* <CJK> */
-MAP(0x46, 0x33, 0x5C0E)  /* <CJK> */
-MAP(0x46, 0x34, 0x61A7)  /* <CJK> */
-MAP(0x46, 0x35, 0x649E)  /* <CJK> */
-MAP(0x46, 0x36, 0x6D1E)  /* <CJK> */
-MAP(0x46, 0x37, 0x77B3)  /* <CJK> */
-MAP(0x46, 0x38, 0x7AE5)  /* <CJK> */
-MAP(0x46, 0x39, 0x80F4)  /* <CJK> */
-MAP(0x46, 0x3A, 0x8404)  /* <CJK> */
-MAP(0x46, 0x3B, 0x9053)  /* <CJK> */
-MAP(0x46, 0x3C, 0x9285)  /* <CJK> */
-MAP(0x46, 0x3D, 0x5CE0)  /* <CJK> */
-MAP(0x46, 0x3E, 0x9D07)  /* <CJK> */
-MAP(0x46, 0x3F, 0x533F)  /* <CJK> */
-MAP(0x46, 0x40, 0x5F97)  /* <CJK> */
-MAP(0x46, 0x41, 0x5FB3)  /* <CJK> */
-MAP(0x46, 0x42, 0x6D9C)  /* <CJK> */
-MAP(0x46, 0x43, 0x7279)  /* <CJK> */
-MAP(0x46, 0x44, 0x7763)  /* <CJK> */
-MAP(0x46, 0x45, 0x79BF)  /* <CJK> */
-MAP(0x46, 0x46, 0x7BE4)  /* <CJK> */
-MAP(0x46, 0x47, 0x6BD2)  /* <CJK> */
-MAP(0x46, 0x48, 0x72EC)  /* <CJK> */
-MAP(0x46, 0x49, 0x8AAD)  /* <CJK> */
-MAP(0x46, 0x4A, 0x6803)  /* <CJK> */
-MAP(0x46, 0x4B, 0x6A61)  /* <CJK> */
-MAP(0x46, 0x4C, 0x51F8)  /* <CJK> */
-MAP(0x46, 0x4D, 0x7A81)  /* <CJK> */
-MAP(0x46, 0x4E, 0x6934)  /* <CJK> */
-MAP(0x46, 0x4F, 0x5C4A)  /* <CJK> */
-MAP(0x46, 0x50, 0x9CF6)  /* <CJK> */
-MAP(0x46, 0x51, 0x82EB)  /* <CJK> */
-MAP(0x46, 0x52, 0x5BC5)  /* <CJK> */
-MAP(0x46, 0x53, 0x9149)  /* <CJK> */
-MAP(0x46, 0x54, 0x701E)  /* <CJK> */
-MAP(0x46, 0x55, 0x5678)  /* <CJK> */
-MAP(0x46, 0x56, 0x5C6F)  /* <CJK> */
-MAP(0x46, 0x57, 0x60C7)  /* <CJK> */
-MAP(0x46, 0x58, 0x6566)  /* <CJK> */
-MAP(0x46, 0x59, 0x6C8C)  /* <CJK> */
-MAP(0x46, 0x5A, 0x8C5A)  /* <CJK> */
-MAP(0x46, 0x5B, 0x9041)  /* <CJK> */
-MAP(0x46, 0x5C, 0x9813)  /* <CJK> */
-MAP(0x46, 0x5D, 0x5451)  /* <CJK> */
-MAP(0x46, 0x5E, 0x66C7)  /* <CJK> */
-MAP(0x46, 0x5F, 0x920D)  /* <CJK> */
-MAP(0x46, 0x60, 0x5948)  /* <CJK> */
-MAP(0x46, 0x61, 0x90A3)  /* <CJK> */
-MAP(0x46, 0x62, 0x5185)  /* <CJK> */
-MAP(0x46, 0x63, 0x4E4D)  /* <CJK> */
-MAP(0x46, 0x64, 0x51EA)  /* <CJK> */
-MAP(0x46, 0x65, 0x8599)  /* <CJK> */
-MAP(0x46, 0x66, 0x8B0E)  /* <CJK> */
-MAP(0x46, 0x67, 0x7058)  /* <CJK> */
-MAP(0x46, 0x68, 0x637A)  /* <CJK> */
-MAP(0x46, 0x69, 0x934B)  /* <CJK> */
-MAP(0x46, 0x6A, 0x6962)  /* <CJK> */
-MAP(0x46, 0x6B, 0x99B4)  /* <CJK> */
-MAP(0x46, 0x6C, 0x7E04)  /* <CJK> */
-MAP(0x46, 0x6D, 0x7577)  /* <CJK> */
-MAP(0x46, 0x6E, 0x5357)  /* <CJK> */
-MAP(0x46, 0x6F, 0x6960)  /* <CJK> */
-MAP(0x46, 0x70, 0x8EDF)  /* <CJK> */
-MAP(0x46, 0x71, 0x96E3)  /* <CJK> */
-MAP(0x46, 0x72, 0x6C5D)  /* <CJK> */
-MAP(0x46, 0x73, 0x4E8C)  /* <CJK> */
-MAP(0x46, 0x74, 0x5C3C)  /* <CJK> */
-MAP(0x46, 0x75, 0x5F10)  /* <CJK> */
-MAP(0x46, 0x76, 0x8FE9)  /* <CJK> */
-MAP(0x46, 0x77, 0x5302)  /* <CJK> */
-MAP(0x46, 0x78, 0x8CD1)  /* <CJK> */
-MAP(0x46, 0x79, 0x8089)  /* <CJK> */
-MAP(0x46, 0x7A, 0x8679)  /* <CJK> */
-MAP(0x46, 0x7B, 0x5EFF)  /* <CJK> */
-MAP(0x46, 0x7C, 0x65E5)  /* <CJK> */
-MAP(0x46, 0x7D, 0x4E73)  /* <CJK> */
-MAP(0x46, 0x7E, 0x5165)  /* <CJK> */
-MAP(0x47, 0x21, 0x5982)  /* <CJK> */
-MAP(0x47, 0x22, 0x5C3F)  /* <CJK> */
-MAP(0x47, 0x23, 0x97EE)  /* <CJK> */
-MAP(0x47, 0x24, 0x4EFB)  /* <CJK> */
-MAP(0x47, 0x25, 0x598A)  /* <CJK> */
-MAP(0x47, 0x26, 0x5FCD)  /* <CJK> */
-MAP(0x47, 0x27, 0x8A8D)  /* <CJK> */
-MAP(0x47, 0x28, 0x6FE1)  /* <CJK> */
-MAP(0x47, 0x29, 0x79B0)  /* <CJK> */
-MAP(0x47, 0x2A, 0x7962)  /* <CJK> */
-MAP(0x47, 0x2B, 0x5BE7)  /* <CJK> */
-MAP(0x47, 0x2C, 0x8471)  /* <CJK> */
-MAP(0x47, 0x2D, 0x732B)  /* <CJK> */
-MAP(0x47, 0x2E, 0x71B1)  /* <CJK> */
-MAP(0x47, 0x2F, 0x5E74)  /* <CJK> */
-MAP(0x47, 0x30, 0x5FF5)  /* <CJK> */
-MAP(0x47, 0x31, 0x637B)  /* <CJK> */
-MAP(0x47, 0x32, 0x649A)  /* <CJK> */
-MAP(0x47, 0x33, 0x71C3)  /* <CJK> */
-MAP(0x47, 0x34, 0x7C98)  /* <CJK> */
-MAP(0x47, 0x35, 0x4E43)  /* <CJK> */
-MAP(0x47, 0x36, 0x5EFC)  /* <CJK> */
-MAP(0x47, 0x37, 0x4E4B)  /* <CJK> */
-MAP(0x47, 0x38, 0x57DC)  /* <CJK> */
-MAP(0x47, 0x39, 0x56A2)  /* <CJK> */
-MAP(0x47, 0x3A, 0x60A9)  /* <CJK> */
-MAP(0x47, 0x3B, 0x6FC3)  /* <CJK> */
-MAP(0x47, 0x3C, 0x7D0D)  /* <CJK> */
-MAP(0x47, 0x3D, 0x80FD)  /* <CJK> */
-MAP(0x47, 0x3E, 0x8133)  /* <CJK> */
-MAP(0x47, 0x3F, 0x81BF)  /* <CJK> */
-MAP(0x47, 0x40, 0x8FB2)  /* <CJK> */
-MAP(0x47, 0x41, 0x8997)  /* <CJK> */
-MAP(0x47, 0x42, 0x86A4)  /* <CJK> */
-MAP(0x47, 0x43, 0x5DF4)  /* <CJK> */
-MAP(0x47, 0x44, 0x628A)  /* <CJK> */
-MAP(0x47, 0x45, 0x64AD)  /* <CJK> */
-MAP(0x47, 0x46, 0x8987)  /* <CJK> */
-MAP(0x47, 0x47, 0x6777)  /* <CJK> */
-MAP(0x47, 0x48, 0x6CE2)  /* <CJK> */
-MAP(0x47, 0x49, 0x6D3E)  /* <CJK> */
-MAP(0x47, 0x4A, 0x7436)  /* <CJK> */
-MAP(0x47, 0x4B, 0x7834)  /* <CJK> */
-MAP(0x47, 0x4C, 0x5A46)  /* <CJK> */
-MAP(0x47, 0x4D, 0x7F75)  /* <CJK> */
-MAP(0x47, 0x4E, 0x82AD)  /* <CJK> */
-MAP(0x47, 0x4F, 0x99AC)  /* <CJK> */
-MAP(0x47, 0x50, 0x4FF3)  /* <CJK> */
-MAP(0x47, 0x51, 0x5EC3)  /* <CJK> */
-MAP(0x47, 0x52, 0x62DD)  /* <CJK> */
-MAP(0x47, 0x53, 0x6392)  /* <CJK> */
-MAP(0x47, 0x54, 0x6557)  /* <CJK> */
-MAP(0x47, 0x55, 0x676F)  /* <CJK> */
-MAP(0x47, 0x56, 0x76C3)  /* <CJK> */
-MAP(0x47, 0x57, 0x724C)  /* <CJK> */
-MAP(0x47, 0x58, 0x80CC)  /* <CJK> */
-MAP(0x47, 0x59, 0x80BA)  /* <CJK> */
-MAP(0x47, 0x5A, 0x8F29)  /* <CJK> */
-MAP(0x47, 0x5B, 0x914D)  /* <CJK> */
-MAP(0x47, 0x5C, 0x500D)  /* <CJK> */
-MAP(0x47, 0x5D, 0x57F9)  /* <CJK> */
-MAP(0x47, 0x5E, 0x5A92)  /* <CJK> */
-MAP(0x47, 0x5F, 0x6885)  /* <CJK> */
-MAP(0x47, 0x60, 0x6973)  /* <CJK> */
-MAP(0x47, 0x61, 0x7164)  /* <CJK> */
-MAP(0x47, 0x62, 0x72FD)  /* <CJK> */
-MAP(0x47, 0x63, 0x8CB7)  /* <CJK> */
-MAP(0x47, 0x64, 0x58F2)  /* <CJK> */
-MAP(0x47, 0x65, 0x8CE0)  /* <CJK> */
-MAP(0x47, 0x66, 0x966A)  /* <CJK> */
-MAP(0x47, 0x67, 0x9019)  /* <CJK> */
-MAP(0x47, 0x68, 0x877F)  /* <CJK> */
-MAP(0x47, 0x69, 0x79E4)  /* <CJK> */
-MAP(0x47, 0x6A, 0x77E7)  /* <CJK> */
-MAP(0x47, 0x6B, 0x8429)  /* <CJK> */
-MAP(0x47, 0x6C, 0x4F2F)  /* <CJK> */
-MAP(0x47, 0x6D, 0x5265)  /* <CJK> */
-MAP(0x47, 0x6E, 0x535A)  /* <CJK> */
-MAP(0x47, 0x6F, 0x62CD)  /* <CJK> */
-MAP(0x47, 0x70, 0x67CF)  /* <CJK> */
-MAP(0x47, 0x71, 0x6CCA)  /* <CJK> */
-MAP(0x47, 0x72, 0x767D)  /* <CJK> */
-MAP(0x47, 0x73, 0x7B94)  /* <CJK> */
-MAP(0x47, 0x74, 0x7C95)  /* <CJK> */
-MAP(0x47, 0x75, 0x8236)  /* <CJK> */
-MAP(0x47, 0x76, 0x8584)  /* <CJK> */
-MAP(0x47, 0x77, 0x8FEB)  /* <CJK> */
-MAP(0x47, 0x78, 0x66DD)  /* <CJK> */
-MAP(0x47, 0x79, 0x6F20)  /* <CJK> */
-MAP(0x47, 0x7A, 0x7206)  /* <CJK> */
-MAP(0x47, 0x7B, 0x7E1B)  /* <CJK> */
-MAP(0x47, 0x7C, 0x83AB)  /* <CJK> */
-MAP(0x47, 0x7D, 0x99C1)  /* <CJK> */
-MAP(0x47, 0x7E, 0x9EA6)  /* <CJK> */
-MAP(0x48, 0x21, 0x51FD)  /* <CJK> */
-MAP(0x48, 0x22, 0x7BB1)  /* <CJK> */
-MAP(0x48, 0x23, 0x7872)  /* <CJK> */
-MAP(0x48, 0x24, 0x7BB8)  /* <CJK> */
-MAP(0x48, 0x25, 0x8087)  /* <CJK> */
-MAP(0x48, 0x26, 0x7B48)  /* <CJK> */
-MAP(0x48, 0x27, 0x6AE8)  /* <CJK> */
-MAP(0x48, 0x28, 0x5E61)  /* <CJK> */
-MAP(0x48, 0x29, 0x808C)  /* <CJK> */
-MAP(0x48, 0x2A, 0x7551)  /* <CJK> */
-MAP(0x48, 0x2B, 0x7560)  /* <CJK> */
-MAP(0x48, 0x2C, 0x516B)  /* <CJK> */
-MAP(0x48, 0x2D, 0x9262)  /* <CJK> */
-MAP(0x48, 0x2E, 0x6E8C)  /* <CJK> */
-MAP(0x48, 0x2F, 0x767A)  /* <CJK> */
-MAP(0x48, 0x30, 0x9197)  /* <CJK> */
-MAP(0x48, 0x31, 0x9AEA)  /* <CJK> */
-MAP(0x48, 0x32, 0x4F10)  /* <CJK> */
-MAP(0x48, 0x33, 0x7F70)  /* <CJK> */
-MAP(0x48, 0x34, 0x629C)  /* <CJK> */
-MAP(0x48, 0x35, 0x7B4F)  /* <CJK> */
-MAP(0x48, 0x36, 0x95A5)  /* <CJK> */
-MAP(0x48, 0x37, 0x9CE9)  /* <CJK> */
-MAP(0x48, 0x38, 0x567A)  /* <CJK> */
-MAP(0x48, 0x39, 0x5859)  /* <CJK> */
-MAP(0x48, 0x3A, 0x86E4)  /* <CJK> */
-MAP(0x48, 0x3B, 0x96BC)  /* <CJK> */
-MAP(0x48, 0x3C, 0x4F34)  /* <CJK> */
-MAP(0x48, 0x3D, 0x5224)  /* <CJK> */
-MAP(0x48, 0x3E, 0x534A)  /* <CJK> */
-MAP(0x48, 0x3F, 0x53CD)  /* <CJK> */
-MAP(0x48, 0x40, 0x53DB)  /* <CJK> */
-MAP(0x48, 0x41, 0x5E06)  /* <CJK> */
-MAP(0x48, 0x42, 0x642C)  /* <CJK> */
-MAP(0x48, 0x43, 0x6591)  /* <CJK> */
-MAP(0x48, 0x44, 0x677F)  /* <CJK> */
-MAP(0x48, 0x45, 0x6C3E)  /* <CJK> */
-MAP(0x48, 0x46, 0x6C4E)  /* <CJK> */
-MAP(0x48, 0x47, 0x7248)  /* <CJK> */
-MAP(0x48, 0x48, 0x72AF)  /* <CJK> */
-MAP(0x48, 0x49, 0x73ED)  /* <CJK> */
-MAP(0x48, 0x4A, 0x7554)  /* <CJK> */
-MAP(0x48, 0x4B, 0x7E41)  /* <CJK> */
-MAP(0x48, 0x4C, 0x822C)  /* <CJK> */
-MAP(0x48, 0x4D, 0x85E9)  /* <CJK> */
-MAP(0x48, 0x4E, 0x8CA9)  /* <CJK> */
-MAP(0x48, 0x4F, 0x7BC4)  /* <CJK> */
-MAP(0x48, 0x50, 0x91C6)  /* <CJK> */
-MAP(0x48, 0x51, 0x7169)  /* <CJK> */
-MAP(0x48, 0x52, 0x9812)  /* <CJK> */
-MAP(0x48, 0x53, 0x98EF)  /* <CJK> */
-MAP(0x48, 0x54, 0x633D)  /* <CJK> */
-MAP(0x48, 0x55, 0x6669)  /* <CJK> */
-MAP(0x48, 0x56, 0x756A)  /* <CJK> */
-MAP(0x48, 0x57, 0x76E4)  /* <CJK> */
-MAP(0x48, 0x58, 0x78D0)  /* <CJK> */
-MAP(0x48, 0x59, 0x8543)  /* <CJK> */
-MAP(0x48, 0x5A, 0x86EE)  /* <CJK> */
-MAP(0x48, 0x5B, 0x532A)  /* <CJK> */
-MAP(0x48, 0x5C, 0x5351)  /* <CJK> */
-MAP(0x48, 0x5D, 0x5426)  /* <CJK> */
-MAP(0x48, 0x5E, 0x5983)  /* <CJK> */
-MAP(0x48, 0x5F, 0x5E87)  /* <CJK> */
-MAP(0x48, 0x60, 0x5F7C)  /* <CJK> */
-MAP(0x48, 0x61, 0x60B2)  /* <CJK> */
-MAP(0x48, 0x62, 0x6249)  /* <CJK> */
-MAP(0x48, 0x63, 0x6279)  /* <CJK> */
-MAP(0x48, 0x64, 0x62AB)  /* <CJK> */
-MAP(0x48, 0x65, 0x6590)  /* <CJK> */
-MAP(0x48, 0x66, 0x6BD4)  /* <CJK> */
-MAP(0x48, 0x67, 0x6CCC)  /* <CJK> */
-MAP(0x48, 0x68, 0x75B2)  /* <CJK> */
-MAP(0x48, 0x69, 0x76AE)  /* <CJK> */
-MAP(0x48, 0x6A, 0x7891)  /* <CJK> */
-MAP(0x48, 0x6B, 0x79D8)  /* <CJK> */
-MAP(0x48, 0x6C, 0x7DCB)  /* <CJK> */
-MAP(0x48, 0x6D, 0x7F77)  /* <CJK> */
-MAP(0x48, 0x6E, 0x80A5)  /* <CJK> */
-MAP(0x48, 0x6F, 0x88AB)  /* <CJK> */
-MAP(0x48, 0x70, 0x8AB9)  /* <CJK> */
-MAP(0x48, 0x71, 0x8CBB)  /* <CJK> */
-MAP(0x48, 0x72, 0x907F)  /* <CJK> */
-MAP(0x48, 0x73, 0x975E)  /* <CJK> */
-MAP(0x48, 0x74, 0x98DB)  /* <CJK> */
-MAP(0x48, 0x75, 0x6A0B)  /* <CJK> */
-MAP(0x48, 0x76, 0x7C38)  /* <CJK> */
-MAP(0x48, 0x77, 0x5099)  /* <CJK> */
-MAP(0x48, 0x78, 0x5C3E)  /* <CJK> */
-MAP(0x48, 0x79, 0x5FAE)  /* <CJK> */
-MAP(0x48, 0x7A, 0x6787)  /* <CJK> */
-MAP(0x48, 0x7B, 0x6BD8)  /* <CJK> */
-MAP(0x48, 0x7C, 0x7435)  /* <CJK> */
-MAP(0x48, 0x7D, 0x7709)  /* <CJK> */
-MAP(0x48, 0x7E, 0x7F8E)  /* <CJK> */
-MAP(0x49, 0x21, 0x9F3B)  /* <CJK> */
-MAP(0x49, 0x22, 0x67CA)  /* <CJK> */
-MAP(0x49, 0x23, 0x7A17)  /* <CJK> */
-MAP(0x49, 0x24, 0x5339)  /* <CJK> */
-MAP(0x49, 0x25, 0x758B)  /* <CJK> */
-MAP(0x49, 0x26, 0x9AED)  /* <CJK> */
-MAP(0x49, 0x27, 0x5F66)  /* <CJK> */
-MAP(0x49, 0x28, 0x819D)  /* <CJK> */
-MAP(0x49, 0x29, 0x83F1)  /* <CJK> */
-MAP(0x49, 0x2A, 0x8098)  /* <CJK> */
-MAP(0x49, 0x2B, 0x5F3C)  /* <CJK> */
-MAP(0x49, 0x2C, 0x5FC5)  /* <CJK> */
-MAP(0x49, 0x2D, 0x7562)  /* <CJK> */
-MAP(0x49, 0x2E, 0x7B46)  /* <CJK> */
-MAP(0x49, 0x2F, 0x903C)  /* <CJK> */
-MAP(0x49, 0x30, 0x6867)  /* <CJK> */
-MAP(0x49, 0x31, 0x59EB)  /* <CJK> */
-MAP(0x49, 0x32, 0x5A9B)  /* <CJK> */
-MAP(0x49, 0x33, 0x7D10)  /* <CJK> */
-MAP(0x49, 0x34, 0x767E)  /* <CJK> */
-MAP(0x49, 0x35, 0x8B2C)  /* <CJK> */
-MAP(0x49, 0x36, 0x4FF5)  /* <CJK> */
-MAP(0x49, 0x37, 0x5F6A)  /* <CJK> */
-MAP(0x49, 0x38, 0x6A19)  /* <CJK> */
-MAP(0x49, 0x39, 0x6C37)  /* <CJK> */
-MAP(0x49, 0x3A, 0x6F02)  /* <CJK> */
-MAP(0x49, 0x3B, 0x74E2)  /* <CJK> */
-MAP(0x49, 0x3C, 0x7968)  /* <CJK> */
-MAP(0x49, 0x3D, 0x8868)  /* <CJK> */
-MAP(0x49, 0x3E, 0x8A55)  /* <CJK> */
-MAP(0x49, 0x3F, 0x8C79)  /* <CJK> */
-MAP(0x49, 0x40, 0x5EDF)  /* <CJK> */
-MAP(0x49, 0x41, 0x63CF)  /* <CJK> */
-MAP(0x49, 0x42, 0x75C5)  /* <CJK> */
-MAP(0x49, 0x43, 0x79D2)  /* <CJK> */
-MAP(0x49, 0x44, 0x82D7)  /* <CJK> */
-MAP(0x49, 0x45, 0x9328)  /* <CJK> */
-MAP(0x49, 0x46, 0x92F2)  /* <CJK> */
-MAP(0x49, 0x47, 0x849C)  /* <CJK> */
-MAP(0x49, 0x48, 0x86ED)  /* <CJK> */
-MAP(0x49, 0x49, 0x9C2D)  /* <CJK> */
-MAP(0x49, 0x4A, 0x54C1)  /* <CJK> */
-MAP(0x49, 0x4B, 0x5F6C)  /* <CJK> */
-MAP(0x49, 0x4C, 0x658C)  /* <CJK> */
-MAP(0x49, 0x4D, 0x6D5C)  /* <CJK> */
-MAP(0x49, 0x4E, 0x7015)  /* <CJK> */
-MAP(0x49, 0x4F, 0x8CA7)  /* <CJK> */
-MAP(0x49, 0x50, 0x8CD3)  /* <CJK> */
-MAP(0x49, 0x51, 0x983B)  /* <CJK> */
-MAP(0x49, 0x52, 0x654F)  /* <CJK> */
-MAP(0x49, 0x53, 0x74F6)  /* <CJK> */
-MAP(0x49, 0x54, 0x4E0D)  /* <CJK> */
-MAP(0x49, 0x55, 0x4ED8)  /* <CJK> */
-MAP(0x49, 0x56, 0x57E0)  /* <CJK> */
-MAP(0x49, 0x57, 0x592B)  /* <CJK> */
-MAP(0x49, 0x58, 0x5A66)  /* <CJK> */
-MAP(0x49, 0x59, 0x5BCC)  /* <CJK> */
-MAP(0x49, 0x5A, 0x51A8)  /* <CJK> */
-MAP(0x49, 0x5B, 0x5E03)  /* <CJK> */
-MAP(0x49, 0x5C, 0x5E9C)  /* <CJK> */
-MAP(0x49, 0x5D, 0x6016)  /* <CJK> */
-MAP(0x49, 0x5E, 0x6276)  /* <CJK> */
-MAP(0x49, 0x5F, 0x6577)  /* <CJK> */
-MAP(0x49, 0x60, 0x65A7)  /* <CJK> */
-MAP(0x49, 0x61, 0x666E)  /* <CJK> */
-MAP(0x49, 0x62, 0x6D6E)  /* <CJK> */
-MAP(0x49, 0x63, 0x7236)  /* <CJK> */
-MAP(0x49, 0x64, 0x7B26)  /* <CJK> */
-MAP(0x49, 0x65, 0x8150)  /* <CJK> */
-MAP(0x49, 0x66, 0x819A)  /* <CJK> */
-MAP(0x49, 0x67, 0x8299)  /* <CJK> */
-MAP(0x49, 0x68, 0x8B5C)  /* <CJK> */
-MAP(0x49, 0x69, 0x8CA0)  /* <CJK> */
-MAP(0x49, 0x6A, 0x8CE6)  /* <CJK> */
-MAP(0x49, 0x6B, 0x8D74)  /* <CJK> */
-MAP(0x49, 0x6C, 0x961C)  /* <CJK> */
-MAP(0x49, 0x6D, 0x9644)  /* <CJK> */
-MAP(0x49, 0x6E, 0x4FAE)  /* <CJK> */
-MAP(0x49, 0x6F, 0x64AB)  /* <CJK> */
-MAP(0x49, 0x70, 0x6B66)  /* <CJK> */
-MAP(0x49, 0x71, 0x821E)  /* <CJK> */
-MAP(0x49, 0x72, 0x8461)  /* <CJK> */
-MAP(0x49, 0x73, 0x856A)  /* <CJK> */
-MAP(0x49, 0x74, 0x90E8)  /* <CJK> */
-MAP(0x49, 0x75, 0x5C01)  /* <CJK> */
-MAP(0x49, 0x76, 0x6953)  /* <CJK> */
-MAP(0x49, 0x77, 0x98A8)  /* <CJK> */
-MAP(0x49, 0x78, 0x847A)  /* <CJK> */
-MAP(0x49, 0x79, 0x8557)  /* <CJK> */
-MAP(0x49, 0x7A, 0x4F0F)  /* <CJK> */
-MAP(0x49, 0x7B, 0x526F)  /* <CJK> */
-MAP(0x49, 0x7C, 0x5FA9)  /* <CJK> */
-MAP(0x49, 0x7D, 0x5E45)  /* <CJK> */
-MAP(0x49, 0x7E, 0x670D)  /* <CJK> */
-MAP(0x4A, 0x21, 0x798F)  /* <CJK> */
-MAP(0x4A, 0x22, 0x8179)  /* <CJK> */
-MAP(0x4A, 0x23, 0x8907)  /* <CJK> */
-MAP(0x4A, 0x24, 0x8986)  /* <CJK> */
-MAP(0x4A, 0x25, 0x6DF5)  /* <CJK> */
-MAP(0x4A, 0x26, 0x5F17)  /* <CJK> */
-MAP(0x4A, 0x27, 0x6255)  /* <CJK> */
-MAP(0x4A, 0x28, 0x6CB8)  /* <CJK> */
-MAP(0x4A, 0x29, 0x4ECF)  /* <CJK> */
-MAP(0x4A, 0x2A, 0x7269)  /* <CJK> */
-MAP(0x4A, 0x2B, 0x9B92)  /* <CJK> */
-MAP(0x4A, 0x2C, 0x5206)  /* <CJK> */
-MAP(0x4A, 0x2D, 0x543B)  /* <CJK> */
-MAP(0x4A, 0x2E, 0x5674)  /* <CJK> */
-MAP(0x4A, 0x2F, 0x58B3)  /* <CJK> */
-MAP(0x4A, 0x30, 0x61A4)  /* <CJK> */
-MAP(0x4A, 0x31, 0x626E)  /* <CJK> */
-MAP(0x4A, 0x32, 0x711A)  /* <CJK> */
-MAP(0x4A, 0x33, 0x596E)  /* <CJK> */
-MAP(0x4A, 0x34, 0x7C89)  /* <CJK> */
-MAP(0x4A, 0x35, 0x7CDE)  /* <CJK> */
-MAP(0x4A, 0x36, 0x7D1B)  /* <CJK> */
-MAP(0x4A, 0x37, 0x96F0)  /* <CJK> */
-MAP(0x4A, 0x38, 0x6587)  /* <CJK> */
-MAP(0x4A, 0x39, 0x805E)  /* <CJK> */
-MAP(0x4A, 0x3A, 0x4E19)  /* <CJK> */
-MAP(0x4A, 0x3B, 0x4F75)  /* <CJK> */
-MAP(0x4A, 0x3C, 0x5175)  /* <CJK> */
-MAP(0x4A, 0x3D, 0x5840)  /* <CJK> */
-MAP(0x4A, 0x3E, 0x5E63)  /* <CJK> */
-MAP(0x4A, 0x3F, 0x5E73)  /* <CJK> */
-MAP(0x4A, 0x40, 0x5F0A)  /* <CJK> */
-MAP(0x4A, 0x41, 0x67C4)  /* <CJK> */
-MAP(0x4A, 0x42, 0x4E26)  /* <CJK> */
-MAP(0x4A, 0x43, 0x853D)  /* <CJK> */
-MAP(0x4A, 0x44, 0x9589)  /* <CJK> */
-MAP(0x4A, 0x45, 0x965B)  /* <CJK> */
-MAP(0x4A, 0x46, 0x7C73)  /* <CJK> */
-MAP(0x4A, 0x47, 0x9801)  /* <CJK> */
-MAP(0x4A, 0x48, 0x50FB)  /* <CJK> */
-MAP(0x4A, 0x49, 0x58C1)  /* <CJK> */
-MAP(0x4A, 0x4A, 0x7656)  /* <CJK> */
-MAP(0x4A, 0x4B, 0x78A7)  /* <CJK> */
-MAP(0x4A, 0x4C, 0x5225)  /* <CJK> */
-MAP(0x4A, 0x4D, 0x77A5)  /* <CJK> */
-MAP(0x4A, 0x4E, 0x8511)  /* <CJK> */
-MAP(0x4A, 0x4F, 0x7B86)  /* <CJK> */
-MAP(0x4A, 0x50, 0x504F)  /* <CJK> */
-MAP(0x4A, 0x51, 0x5909)  /* <CJK> */
-MAP(0x4A, 0x52, 0x7247)  /* <CJK> */
-MAP(0x4A, 0x53, 0x7BC7)  /* <CJK> */
-MAP(0x4A, 0x54, 0x7DE8)  /* <CJK> */
-MAP(0x4A, 0x55, 0x8FBA)  /* <CJK> */
-MAP(0x4A, 0x56, 0x8FD4)  /* <CJK> */
-MAP(0x4A, 0x57, 0x904D)  /* <CJK> */
-MAP(0x4A, 0x58, 0x4FBF)  /* <CJK> */
-MAP(0x4A, 0x59, 0x52C9)  /* <CJK> */
-MAP(0x4A, 0x5A, 0x5A29)  /* <CJK> */
-MAP(0x4A, 0x5B, 0x5F01)  /* <CJK> */
-MAP(0x4A, 0x5C, 0x97AD)  /* <CJK> */
-MAP(0x4A, 0x5D, 0x4FDD)  /* <CJK> */
-MAP(0x4A, 0x5E, 0x8217)  /* <CJK> */
-MAP(0x4A, 0x5F, 0x92EA)  /* <CJK> */
-MAP(0x4A, 0x60, 0x5703)  /* <CJK> */
-MAP(0x4A, 0x61, 0x6355)  /* <CJK> */
-MAP(0x4A, 0x62, 0x6B69)  /* <CJK> */
-MAP(0x4A, 0x63, 0x752B)  /* <CJK> */
-MAP(0x4A, 0x64, 0x88DC)  /* <CJK> */
-MAP(0x4A, 0x65, 0x8F14)  /* <CJK> */
-MAP(0x4A, 0x66, 0x7A42)  /* <CJK> */
-MAP(0x4A, 0x67, 0x52DF)  /* <CJK> */
-MAP(0x4A, 0x68, 0x5893)  /* <CJK> */
-MAP(0x4A, 0x69, 0x6155)  /* <CJK> */
-MAP(0x4A, 0x6A, 0x620A)  /* <CJK> */
-MAP(0x4A, 0x6B, 0x66AE)  /* <CJK> */
-MAP(0x4A, 0x6C, 0x6BCD)  /* <CJK> */
-MAP(0x4A, 0x6D, 0x7C3F)  /* <CJK> */
-MAP(0x4A, 0x6E, 0x83E9)  /* <CJK> */
-MAP(0x4A, 0x6F, 0x5023)  /* <CJK> */
-MAP(0x4A, 0x70, 0x4FF8)  /* <CJK> */
-MAP(0x4A, 0x71, 0x5305)  /* <CJK> */
-MAP(0x4A, 0x72, 0x5446)  /* <CJK> */
-MAP(0x4A, 0x73, 0x5831)  /* <CJK> */
-MAP(0x4A, 0x74, 0x5949)  /* <CJK> */
-MAP(0x4A, 0x75, 0x5B9D)  /* <CJK> */
-MAP(0x4A, 0x76, 0x5CF0)  /* <CJK> */
-MAP(0x4A, 0x77, 0x5CEF)  /* <CJK> */
-MAP(0x4A, 0x78, 0x5D29)  /* <CJK> */
-MAP(0x4A, 0x79, 0x5E96)  /* <CJK> */
-MAP(0x4A, 0x7A, 0x62B1)  /* <CJK> */
-MAP(0x4A, 0x7B, 0x6367)  /* <CJK> */
-MAP(0x4A, 0x7C, 0x653E)  /* <CJK> */
-MAP(0x4A, 0x7D, 0x65B9)  /* <CJK> */
-MAP(0x4A, 0x7E, 0x670B)  /* <CJK> */
-MAP(0x4B, 0x21, 0x6CD5)  /* <CJK> */
-MAP(0x4B, 0x22, 0x6CE1)  /* <CJK> */
-MAP(0x4B, 0x23, 0x70F9)  /* <CJK> */
-MAP(0x4B, 0x24, 0x7832)  /* <CJK> */
-MAP(0x4B, 0x25, 0x7E2B)  /* <CJK> */
-MAP(0x4B, 0x26, 0x80DE)  /* <CJK> */
-MAP(0x4B, 0x27, 0x82B3)  /* <CJK> */
-MAP(0x4B, 0x28, 0x840C)  /* <CJK> */
-MAP(0x4B, 0x29, 0x84EC)  /* <CJK> */
-MAP(0x4B, 0x2A, 0x8702)  /* <CJK> */
-MAP(0x4B, 0x2B, 0x8912)  /* <CJK> */
-MAP(0x4B, 0x2C, 0x8A2A)  /* <CJK> */
-MAP(0x4B, 0x2D, 0x8C4A)  /* <CJK> */
-MAP(0x4B, 0x2E, 0x90A6)  /* <CJK> */
-MAP(0x4B, 0x2F, 0x92D2)  /* <CJK> */
-MAP(0x4B, 0x30, 0x98FD)  /* <CJK> */
-MAP(0x4B, 0x31, 0x9CF3)  /* <CJK> */
-MAP(0x4B, 0x32, 0x9D6C)  /* <CJK> */
-MAP(0x4B, 0x33, 0x4E4F)  /* <CJK> */
-MAP(0x4B, 0x34, 0x4EA1)  /* <CJK> */
-MAP(0x4B, 0x35, 0x508D)  /* <CJK> */
-MAP(0x4B, 0x36, 0x5256)  /* <CJK> */
-MAP(0x4B, 0x37, 0x574A)  /* <CJK> */
-MAP(0x4B, 0x38, 0x59A8)  /* <CJK> */
-MAP(0x4B, 0x39, 0x5E3D)  /* <CJK> */
-MAP(0x4B, 0x3A, 0x5FD8)  /* <CJK> */
-MAP(0x4B, 0x3B, 0x5FD9)  /* <CJK> */
-MAP(0x4B, 0x3C, 0x623F)  /* <CJK> */
-MAP(0x4B, 0x3D, 0x66B4)  /* <CJK> */
-MAP(0x4B, 0x3E, 0x671B)  /* <CJK> */
-MAP(0x4B, 0x3F, 0x67D0)  /* <CJK> */
-MAP(0x4B, 0x40, 0x68D2)  /* <CJK> */
-MAP(0x4B, 0x41, 0x5192)  /* <CJK> */
-MAP(0x4B, 0x42, 0x7D21)  /* <CJK> */
-MAP(0x4B, 0x43, 0x80AA)  /* <CJK> */
-MAP(0x4B, 0x44, 0x81A8)  /* <CJK> */
-MAP(0x4B, 0x45, 0x8B00)  /* <CJK> */
-MAP(0x4B, 0x46, 0x8C8C)  /* <CJK> */
-MAP(0x4B, 0x47, 0x8CBF)  /* <CJK> */
-MAP(0x4B, 0x48, 0x927E)  /* <CJK> */
-MAP(0x4B, 0x49, 0x9632)  /* <CJK> */
-MAP(0x4B, 0x4A, 0x5420)  /* <CJK> */
-MAP(0x4B, 0x4B, 0x982C)  /* <CJK> */
-MAP(0x4B, 0x4C, 0x5317)  /* <CJK> */
-MAP(0x4B, 0x4D, 0x50D5)  /* <CJK> */
-MAP(0x4B, 0x4E, 0x535C)  /* <CJK> */
-MAP(0x4B, 0x4F, 0x58A8)  /* <CJK> */
-MAP(0x4B, 0x50, 0x64B2)  /* <CJK> */
-MAP(0x4B, 0x51, 0x6734)  /* <CJK> */
-MAP(0x4B, 0x52, 0x7267)  /* <CJK> */
-MAP(0x4B, 0x53, 0x7766)  /* <CJK> */
-MAP(0x4B, 0x54, 0x7A46)  /* <CJK> */
-MAP(0x4B, 0x55, 0x91E6)  /* <CJK> */
-MAP(0x4B, 0x56, 0x52C3)  /* <CJK> */
-MAP(0x4B, 0x57, 0x6CA1)  /* <CJK> */
-MAP(0x4B, 0x58, 0x6B86)  /* <CJK> */
-MAP(0x4B, 0x59, 0x5800)  /* <CJK> */
-MAP(0x4B, 0x5A, 0x5E4C)  /* <CJK> */
-MAP(0x4B, 0x5B, 0x5954)  /* <CJK> */
-MAP(0x4B, 0x5C, 0x672C)  /* <CJK> */
-MAP(0x4B, 0x5D, 0x7FFB)  /* <CJK> */
-MAP(0x4B, 0x5E, 0x51E1)  /* <CJK> */
-MAP(0x4B, 0x5F, 0x76C6)  /* <CJK> */
-MAP(0x4B, 0x60, 0x6469)  /* <CJK> */
-MAP(0x4B, 0x61, 0x78E8)  /* <CJK> */
-MAP(0x4B, 0x62, 0x9B54)  /* <CJK> */
-MAP(0x4B, 0x63, 0x9EBB)  /* <CJK> */
-MAP(0x4B, 0x64, 0x57CB)  /* <CJK> */
-MAP(0x4B, 0x65, 0x59B9)  /* <CJK> */
-MAP(0x4B, 0x66, 0x6627)  /* <CJK> */
-MAP(0x4B, 0x67, 0x679A)  /* <CJK> */
-MAP(0x4B, 0x68, 0x6BCE)  /* <CJK> */
-MAP(0x4B, 0x69, 0x54E9)  /* <CJK> */
-MAP(0x4B, 0x6A, 0x69D9)  /* <CJK> */
-MAP(0x4B, 0x6B, 0x5E55)  /* <CJK> */
-MAP(0x4B, 0x6C, 0x819C)  /* <CJK> */
-MAP(0x4B, 0x6D, 0x6795)  /* <CJK> */
-MAP(0x4B, 0x6E, 0x9BAA)  /* <CJK> */
-MAP(0x4B, 0x6F, 0x67FE)  /* <CJK> */
-MAP(0x4B, 0x70, 0x9C52)  /* <CJK> */
-MAP(0x4B, 0x71, 0x685D)  /* <CJK> */
-MAP(0x4B, 0x72, 0x4EA6)  /* <CJK> */
-MAP(0x4B, 0x73, 0x4FE3)  /* <CJK> */
-MAP(0x4B, 0x74, 0x53C8)  /* <CJK> */
-MAP(0x4B, 0x75, 0x62B9)  /* <CJK> */
-MAP(0x4B, 0x76, 0x672B)  /* <CJK> */
-MAP(0x4B, 0x77, 0x6CAB)  /* <CJK> */
-MAP(0x4B, 0x78, 0x8FC4)  /* <CJK> */
-MAP(0x4B, 0x79, 0x4FAD)  /* <CJK> */
-MAP(0x4B, 0x7A, 0x7E6D)  /* <CJK> */
-MAP(0x4B, 0x7B, 0x9EBF)  /* <CJK> */
-MAP(0x4B, 0x7C, 0x4E07)  /* <CJK> */
-MAP(0x4B, 0x7D, 0x6162)  /* <CJK> */
-MAP(0x4B, 0x7E, 0x6E80)  /* <CJK> */
-MAP(0x4C, 0x21, 0x6F2B)  /* <CJK> */
-MAP(0x4C, 0x22, 0x8513)  /* <CJK> */
-MAP(0x4C, 0x23, 0x5473)  /* <CJK> */
-MAP(0x4C, 0x24, 0x672A)  /* <CJK> */
-MAP(0x4C, 0x25, 0x9B45)  /* <CJK> */
-MAP(0x4C, 0x26, 0x5DF3)  /* <CJK> */
-MAP(0x4C, 0x27, 0x7B95)  /* <CJK> */
-MAP(0x4C, 0x28, 0x5CAC)  /* <CJK> */
-MAP(0x4C, 0x29, 0x5BC6)  /* <CJK> */
-MAP(0x4C, 0x2A, 0x871C)  /* <CJK> */
-MAP(0x4C, 0x2B, 0x6E4A)  /* <CJK> */
-MAP(0x4C, 0x2C, 0x84D1)  /* <CJK> */
-MAP(0x4C, 0x2D, 0x7A14)  /* <CJK> */
-MAP(0x4C, 0x2E, 0x8108)  /* <CJK> */
-MAP(0x4C, 0x2F, 0x5999)  /* <CJK> */
-MAP(0x4C, 0x30, 0x7C8D)  /* <CJK> */
-MAP(0x4C, 0x31, 0x6C11)  /* <CJK> */
-MAP(0x4C, 0x32, 0x7720)  /* <CJK> */
-MAP(0x4C, 0x33, 0x52D9)  /* <CJK> */
-MAP(0x4C, 0x34, 0x5922)  /* <CJK> */
-MAP(0x4C, 0x35, 0x7121)  /* <CJK> */
-MAP(0x4C, 0x36, 0x725F)  /* <CJK> */
-MAP(0x4C, 0x37, 0x77DB)  /* <CJK> */
-MAP(0x4C, 0x38, 0x9727)  /* <CJK> */
-MAP(0x4C, 0x39, 0x9D61)  /* <CJK> */
-MAP(0x4C, 0x3A, 0x690B)  /* <CJK> */
-MAP(0x4C, 0x3B, 0x5A7F)  /* <CJK> */
-MAP(0x4C, 0x3C, 0x5A18)  /* <CJK> */
-MAP(0x4C, 0x3D, 0x51A5)  /* <CJK> */
-MAP(0x4C, 0x3E, 0x540D)  /* <CJK> */
-MAP(0x4C, 0x3F, 0x547D)  /* <CJK> */
-MAP(0x4C, 0x40, 0x660E)  /* <CJK> */
-MAP(0x4C, 0x41, 0x76DF)  /* <CJK> */
-MAP(0x4C, 0x42, 0x8FF7)  /* <CJK> */
-MAP(0x4C, 0x43, 0x9298)  /* <CJK> */
-MAP(0x4C, 0x44, 0x9CF4)  /* <CJK> */
-MAP(0x4C, 0x45, 0x59EA)  /* <CJK> */
-MAP(0x4C, 0x46, 0x725D)  /* <CJK> */
-MAP(0x4C, 0x47, 0x6EC5)  /* <CJK> */
-MAP(0x4C, 0x48, 0x514D)  /* <CJK> */
-MAP(0x4C, 0x49, 0x68C9)  /* <CJK> */
-MAP(0x4C, 0x4A, 0x7DBF)  /* <CJK> */
-MAP(0x4C, 0x4B, 0x7DEC)  /* <CJK> */
-MAP(0x4C, 0x4C, 0x9762)  /* <CJK> */
-MAP(0x4C, 0x4D, 0x9EBA)  /* <CJK> */
-MAP(0x4C, 0x4E, 0x6478)  /* <CJK> */
-MAP(0x4C, 0x4F, 0x6A21)  /* <CJK> */
-MAP(0x4C, 0x50, 0x8302)  /* <CJK> */
-MAP(0x4C, 0x51, 0x5984)  /* <CJK> */
-MAP(0x4C, 0x52, 0x5B5F)  /* <CJK> */
-MAP(0x4C, 0x53, 0x6BDB)  /* <CJK> */
-MAP(0x4C, 0x54, 0x731B)  /* <CJK> */
-MAP(0x4C, 0x55, 0x76F2)  /* <CJK> */
-MAP(0x4C, 0x56, 0x7DB2)  /* <CJK> */
-MAP(0x4C, 0x57, 0x8017)  /* <CJK> */
-MAP(0x4C, 0x58, 0x8499)  /* <CJK> */
-MAP(0x4C, 0x59, 0x5132)  /* <CJK> */
-MAP(0x4C, 0x5A, 0x6728)  /* <CJK> */
-MAP(0x4C, 0x5B, 0x9ED9)  /* <CJK> */
-MAP(0x4C, 0x5C, 0x76EE)  /* <CJK> */
-MAP(0x4C, 0x5D, 0x6762)  /* <CJK> */
-MAP(0x4C, 0x5E, 0x52FF)  /* <CJK> */
-MAP(0x4C, 0x5F, 0x9905)  /* <CJK> */
-MAP(0x4C, 0x60, 0x5C24)  /* <CJK> */
-MAP(0x4C, 0x61, 0x623B)  /* <CJK> */
-MAP(0x4C, 0x62, 0x7C7E)  /* <CJK> */
-MAP(0x4C, 0x63, 0x8CB0)  /* <CJK> */
-MAP(0x4C, 0x64, 0x554F)  /* <CJK> */
-MAP(0x4C, 0x65, 0x60B6)  /* <CJK> */
-MAP(0x4C, 0x66, 0x7D0B)  /* <CJK> */
-MAP(0x4C, 0x67, 0x9580)  /* <CJK> */
-MAP(0x4C, 0x68, 0x5301)  /* <CJK> */
-MAP(0x4C, 0x69, 0x4E5F)  /* <CJK> */
-MAP(0x4C, 0x6A, 0x51B6)  /* <CJK> */
-MAP(0x4C, 0x6B, 0x591C)  /* <CJK> */
-MAP(0x4C, 0x6C, 0x723A)  /* <CJK> */
-MAP(0x4C, 0x6D, 0x8036)  /* <CJK> */
-MAP(0x4C, 0x6E, 0x91CE)  /* <CJK> */
-MAP(0x4C, 0x6F, 0x5F25)  /* <CJK> */
-MAP(0x4C, 0x70, 0x77E2)  /* <CJK> */
-MAP(0x4C, 0x71, 0x5384)  /* <CJK> */
-MAP(0x4C, 0x72, 0x5F79)  /* <CJK> */
-MAP(0x4C, 0x73, 0x7D04)  /* <CJK> */
-MAP(0x4C, 0x74, 0x85AC)  /* <CJK> */
-MAP(0x4C, 0x75, 0x8A33)  /* <CJK> */
-MAP(0x4C, 0x76, 0x8E8D)  /* <CJK> */
-MAP(0x4C, 0x77, 0x9756)  /* <CJK> */
-MAP(0x4C, 0x78, 0x67F3)  /* <CJK> */
-MAP(0x4C, 0x79, 0x85AE)  /* <CJK> */
-MAP(0x4C, 0x7A, 0x9453)  /* <CJK> */
-MAP(0x4C, 0x7B, 0x6109)  /* <CJK> */
-MAP(0x4C, 0x7C, 0x6108)  /* <CJK> */
-MAP(0x4C, 0x7D, 0x6CB9)  /* <CJK> */
-MAP(0x4C, 0x7E, 0x7652)  /* <CJK> */
-MAP(0x4D, 0x21, 0x8AED)  /* <CJK> */
-MAP(0x4D, 0x22, 0x8F38)  /* <CJK> */
-MAP(0x4D, 0x23, 0x552F)  /* <CJK> */
-MAP(0x4D, 0x24, 0x4F51)  /* <CJK> */
-MAP(0x4D, 0x25, 0x512A)  /* <CJK> */
-MAP(0x4D, 0x26, 0x52C7)  /* <CJK> */
-MAP(0x4D, 0x27, 0x53CB)  /* <CJK> */
-MAP(0x4D, 0x28, 0x5BA5)  /* <CJK> */
-MAP(0x4D, 0x29, 0x5E7D)  /* <CJK> */
-MAP(0x4D, 0x2A, 0x60A0)  /* <CJK> */
-MAP(0x4D, 0x2B, 0x6182)  /* <CJK> */
-MAP(0x4D, 0x2C, 0x63D6)  /* <CJK> */
-MAP(0x4D, 0x2D, 0x6709)  /* <CJK> */
-MAP(0x4D, 0x2E, 0x67DA)  /* <CJK> */
-MAP(0x4D, 0x2F, 0x6E67)  /* <CJK> */
-MAP(0x4D, 0x30, 0x6D8C)  /* <CJK> */
-MAP(0x4D, 0x31, 0x7336)  /* <CJK> */
-MAP(0x4D, 0x32, 0x7337)  /* <CJK> */
-MAP(0x4D, 0x33, 0x7531)  /* <CJK> */
-MAP(0x4D, 0x34, 0x7950)  /* <CJK> */
-MAP(0x4D, 0x35, 0x88D5)  /* <CJK> */
-MAP(0x4D, 0x36, 0x8A98)  /* <CJK> */
-MAP(0x4D, 0x37, 0x904A)  /* <CJK> */
-MAP(0x4D, 0x38, 0x9091)  /* <CJK> */
-MAP(0x4D, 0x39, 0x90F5)  /* <CJK> */
-MAP(0x4D, 0x3A, 0x96C4)  /* <CJK> */
-MAP(0x4D, 0x3B, 0x878D)  /* <CJK> */
-MAP(0x4D, 0x3C, 0x5915)  /* <CJK> */
-MAP(0x4D, 0x3D, 0x4E88)  /* <CJK> */
-MAP(0x4D, 0x3E, 0x4F59)  /* <CJK> */
-MAP(0x4D, 0x3F, 0x4E0E)  /* <CJK> */
-MAP(0x4D, 0x40, 0x8A89)  /* <CJK> */
-MAP(0x4D, 0x41, 0x8F3F)  /* <CJK> */
-MAP(0x4D, 0x42, 0x9810)  /* <CJK> */
-MAP(0x4D, 0x43, 0x50AD)  /* <CJK> */
-MAP(0x4D, 0x44, 0x5E7C)  /* <CJK> */
-MAP(0x4D, 0x45, 0x5996)  /* <CJK> */
-MAP(0x4D, 0x46, 0x5BB9)  /* <CJK> */
-MAP(0x4D, 0x47, 0x5EB8)  /* <CJK> */
-MAP(0x4D, 0x48, 0x63DA)  /* <CJK> */
-MAP(0x4D, 0x49, 0x63FA)  /* <CJK> */
-MAP(0x4D, 0x4A, 0x64C1)  /* <CJK> */
-MAP(0x4D, 0x4B, 0x66DC)  /* <CJK> */
-MAP(0x4D, 0x4C, 0x694A)  /* <CJK> */
-MAP(0x4D, 0x4D, 0x69D8)  /* <CJK> */
-MAP(0x4D, 0x4E, 0x6D0B)  /* <CJK> */
-MAP(0x4D, 0x4F, 0x6EB6)  /* <CJK> */
-MAP(0x4D, 0x50, 0x7194)  /* <CJK> */
-MAP(0x4D, 0x51, 0x7528)  /* <CJK> */
-MAP(0x4D, 0x52, 0x7AAF)  /* <CJK> */
-MAP(0x4D, 0x53, 0x7F8A)  /* <CJK> */
-MAP(0x4D, 0x54, 0x8000)  /* <CJK> */
-MAP(0x4D, 0x55, 0x8449)  /* <CJK> */
-MAP(0x4D, 0x56, 0x84C9)  /* <CJK> */
-MAP(0x4D, 0x57, 0x8981)  /* <CJK> */
-MAP(0x4D, 0x58, 0x8B21)  /* <CJK> */
-MAP(0x4D, 0x59, 0x8E0A)  /* <CJK> */
-MAP(0x4D, 0x5A, 0x9065)  /* <CJK> */
-MAP(0x4D, 0x5B, 0x967D)  /* <CJK> */
-MAP(0x4D, 0x5C, 0x990A)  /* <CJK> */
-MAP(0x4D, 0x5D, 0x617E)  /* <CJK> */
-MAP(0x4D, 0x5E, 0x6291)  /* <CJK> */
-MAP(0x4D, 0x5F, 0x6B32)  /* <CJK> */
-MAP(0x4D, 0x60, 0x6C83)  /* <CJK> */
-MAP(0x4D, 0x61, 0x6D74)  /* <CJK> */
-MAP(0x4D, 0x62, 0x7FCC)  /* <CJK> */
-MAP(0x4D, 0x63, 0x7FFC)  /* <CJK> */
-MAP(0x4D, 0x64, 0x6DC0)  /* <CJK> */
-MAP(0x4D, 0x65, 0x7F85)  /* <CJK> */
-MAP(0x4D, 0x66, 0x87BA)  /* <CJK> */
-MAP(0x4D, 0x67, 0x88F8)  /* <CJK> */
-MAP(0x4D, 0x68, 0x6765)  /* <CJK> */
-MAP(0x4D, 0x69, 0x83B1)  /* <CJK> */
-MAP(0x4D, 0x6A, 0x983C)  /* <CJK> */
-MAP(0x4D, 0x6B, 0x96F7)  /* <CJK> */
-MAP(0x4D, 0x6C, 0x6D1B)  /* <CJK> */
-MAP(0x4D, 0x6D, 0x7D61)  /* <CJK> */
-MAP(0x4D, 0x6E, 0x843D)  /* <CJK> */
-MAP(0x4D, 0x6F, 0x916A)  /* <CJK> */
-MAP(0x4D, 0x70, 0x4E71)  /* <CJK> */
-MAP(0x4D, 0x71, 0x5375)  /* <CJK> */
-MAP(0x4D, 0x72, 0x5D50)  /* <CJK> */
-MAP(0x4D, 0x73, 0x6B04)  /* <CJK> */
-MAP(0x4D, 0x74, 0x6FEB)  /* <CJK> */
-MAP(0x4D, 0x75, 0x85CD)  /* <CJK> */
-MAP(0x4D, 0x76, 0x862D)  /* <CJK> */
-MAP(0x4D, 0x77, 0x89A7)  /* <CJK> */
-MAP(0x4D, 0x78, 0x5229)  /* <CJK> */
-MAP(0x4D, 0x79, 0x540F)  /* <CJK> */
-MAP(0x4D, 0x7A, 0x5C65)  /* <CJK> */
-MAP(0x4D, 0x7B, 0x674E)  /* <CJK> */
-MAP(0x4D, 0x7C, 0x68A8)  /* <CJK> */
-MAP(0x4D, 0x7D, 0x7406)  /* <CJK> */
-MAP(0x4D, 0x7E, 0x7483)  /* <CJK> */
-MAP(0x4E, 0x21, 0x75E2)  /* <CJK> */
-MAP(0x4E, 0x22, 0x88CF)  /* <CJK> */
-MAP(0x4E, 0x23, 0x88E1)  /* <CJK> */
-MAP(0x4E, 0x24, 0x91CC)  /* <CJK> */
-MAP(0x4E, 0x25, 0x96E2)  /* <CJK> */
-MAP(0x4E, 0x26, 0x9678)  /* <CJK> */
-MAP(0x4E, 0x27, 0x5F8B)  /* <CJK> */
-MAP(0x4E, 0x28, 0x7387)  /* <CJK> */
-MAP(0x4E, 0x29, 0x7ACB)  /* <CJK> */
-MAP(0x4E, 0x2A, 0x844E)  /* <CJK> */
-MAP(0x4E, 0x2B, 0x63A0)  /* <CJK> */
-MAP(0x4E, 0x2C, 0x7565)  /* <CJK> */
-MAP(0x4E, 0x2D, 0x5289)  /* <CJK> */
-MAP(0x4E, 0x2E, 0x6D41)  /* <CJK> */
-MAP(0x4E, 0x2F, 0x6E9C)  /* <CJK> */
-MAP(0x4E, 0x30, 0x7409)  /* <CJK> */
-MAP(0x4E, 0x31, 0x7559)  /* <CJK> */
-MAP(0x4E, 0x32, 0x786B)  /* <CJK> */
-MAP(0x4E, 0x33, 0x7C92)  /* <CJK> */
-MAP(0x4E, 0x34, 0x9686)  /* <CJK> */
-MAP(0x4E, 0x35, 0x7ADC)  /* <CJK> */
-MAP(0x4E, 0x36, 0x9F8D)  /* <CJK> */
-MAP(0x4E, 0x37, 0x4FB6)  /* <CJK> */
-MAP(0x4E, 0x38, 0x616E)  /* <CJK> */
-MAP(0x4E, 0x39, 0x65C5)  /* <CJK> */
-MAP(0x4E, 0x3A, 0x865C)  /* <CJK> */
-MAP(0x4E, 0x3B, 0x4E86)  /* <CJK> */
-MAP(0x4E, 0x3C, 0x4EAE)  /* <CJK> */
-MAP(0x4E, 0x3D, 0x50DA)  /* <CJK> */
-MAP(0x4E, 0x3E, 0x4E21)  /* <CJK> */
-MAP(0x4E, 0x3F, 0x51CC)  /* <CJK> */
-MAP(0x4E, 0x40, 0x5BEE)  /* <CJK> */
-MAP(0x4E, 0x41, 0x6599)  /* <CJK> */
-MAP(0x4E, 0x42, 0x6881)  /* <CJK> */
-MAP(0x4E, 0x43, 0x6DBC)  /* <CJK> */
-MAP(0x4E, 0x44, 0x731F)  /* <CJK> */
-MAP(0x4E, 0x45, 0x7642)  /* <CJK> */
-MAP(0x4E, 0x46, 0x77AD)  /* <CJK> */
-MAP(0x4E, 0x47, 0x7A1C)  /* <CJK> */
-MAP(0x4E, 0x48, 0x7CE7)  /* <CJK> */
-MAP(0x4E, 0x49, 0x826F)  /* <CJK> */
-MAP(0x4E, 0x4A, 0x8AD2)  /* <CJK> */
-MAP(0x4E, 0x4B, 0x907C)  /* <CJK> */
-MAP(0x4E, 0x4C, 0x91CF)  /* <CJK> */
-MAP(0x4E, 0x4D, 0x9675)  /* <CJK> */
-MAP(0x4E, 0x4E, 0x9818)  /* <CJK> */
-MAP(0x4E, 0x4F, 0x529B)  /* <CJK> */
-MAP(0x4E, 0x50, 0x7DD1)  /* <CJK> */
-MAP(0x4E, 0x51, 0x502B)  /* <CJK> */
-MAP(0x4E, 0x52, 0x5398)  /* <CJK> */
-MAP(0x4E, 0x53, 0x6797)  /* <CJK> */
-MAP(0x4E, 0x54, 0x6DCB)  /* <CJK> */
-MAP(0x4E, 0x55, 0x71D0)  /* <CJK> */
-MAP(0x4E, 0x56, 0x7433)  /* <CJK> */
-MAP(0x4E, 0x57, 0x81E8)  /* <CJK> */
-MAP(0x4E, 0x58, 0x8F2A)  /* <CJK> */
-MAP(0x4E, 0x59, 0x96A3)  /* <CJK> */
-MAP(0x4E, 0x5A, 0x9C57)  /* <CJK> */
-MAP(0x4E, 0x5B, 0x9E9F)  /* <CJK> */
-MAP(0x4E, 0x5C, 0x7460)  /* <CJK> */
-MAP(0x4E, 0x5D, 0x5841)  /* <CJK> */
-MAP(0x4E, 0x5E, 0x6D99)  /* <CJK> */
-MAP(0x4E, 0x5F, 0x7D2F)  /* <CJK> */
-MAP(0x4E, 0x60, 0x985E)  /* <CJK> */
-MAP(0x4E, 0x61, 0x4EE4)  /* <CJK> */
-MAP(0x4E, 0x62, 0x4F36)  /* <CJK> */
-MAP(0x4E, 0x63, 0x4F8B)  /* <CJK> */
-MAP(0x4E, 0x64, 0x51B7)  /* <CJK> */
-MAP(0x4E, 0x65, 0x52B1)  /* <CJK> */
-MAP(0x4E, 0x66, 0x5DBA)  /* <CJK> */
-MAP(0x4E, 0x67, 0x601C)  /* <CJK> */
-MAP(0x4E, 0x68, 0x73B2)  /* <CJK> */
-MAP(0x4E, 0x69, 0x793C)  /* <CJK> */
-MAP(0x4E, 0x6A, 0x82D3)  /* <CJK> */
-MAP(0x4E, 0x6B, 0x9234)  /* <CJK> */
-MAP(0x4E, 0x6C, 0x96B7)  /* <CJK> */
-MAP(0x4E, 0x6D, 0x96F6)  /* <CJK> */
-MAP(0x4E, 0x6E, 0x970A)  /* <CJK> */
-MAP(0x4E, 0x6F, 0x9E97)  /* <CJK> */
-MAP(0x4E, 0x70, 0x9F62)  /* <CJK> */
-MAP(0x4E, 0x71, 0x66A6)  /* <CJK> */
-MAP(0x4E, 0x72, 0x6B74)  /* <CJK> */
-MAP(0x4E, 0x73, 0x5217)  /* <CJK> */
-MAP(0x4E, 0x74, 0x52A3)  /* <CJK> */
-MAP(0x4E, 0x75, 0x70C8)  /* <CJK> */
-MAP(0x4E, 0x76, 0x88C2)  /* <CJK> */
-MAP(0x4E, 0x77, 0x5EC9)  /* <CJK> */
-MAP(0x4E, 0x78, 0x604B)  /* <CJK> */
-MAP(0x4E, 0x79, 0x6190)  /* <CJK> */
-MAP(0x4E, 0x7A, 0x6F23)  /* <CJK> */
-MAP(0x4E, 0x7B, 0x7149)  /* <CJK> */
-MAP(0x4E, 0x7C, 0x7C3E)  /* <CJK> */
-MAP(0x4E, 0x7D, 0x7DF4)  /* <CJK> */
-MAP(0x4E, 0x7E, 0x806F)  /* <CJK> */
-MAP(0x4F, 0x21, 0x84EE)  /* <CJK> */
-MAP(0x4F, 0x22, 0x9023)  /* <CJK> */
-MAP(0x4F, 0x23, 0x932C)  /* <CJK> */
-MAP(0x4F, 0x24, 0x5442)  /* <CJK> */
-MAP(0x4F, 0x25, 0x9B6F)  /* <CJK> */
-MAP(0x4F, 0x26, 0x6AD3)  /* <CJK> */
-MAP(0x4F, 0x27, 0x7089)  /* <CJK> */
-MAP(0x4F, 0x28, 0x8CC2)  /* <CJK> */
-MAP(0x4F, 0x29, 0x8DEF)  /* <CJK> */
-MAP(0x4F, 0x2A, 0x9732)  /* <CJK> */
-MAP(0x4F, 0x2B, 0x52B4)  /* <CJK> */
-MAP(0x4F, 0x2C, 0x5A41)  /* <CJK> */
-MAP(0x4F, 0x2D, 0x5ECA)  /* <CJK> */
-MAP(0x4F, 0x2E, 0x5F04)  /* <CJK> */
-MAP(0x4F, 0x2F, 0x6717)  /* <CJK> */
-MAP(0x4F, 0x30, 0x697C)  /* <CJK> */
-MAP(0x4F, 0x31, 0x6994)  /* <CJK> */
-MAP(0x4F, 0x32, 0x6D6A)  /* <CJK> */
-MAP(0x4F, 0x33, 0x6F0F)  /* <CJK> */
-MAP(0x4F, 0x34, 0x7262)  /* <CJK> */
-MAP(0x4F, 0x35, 0x72FC)  /* <CJK> */
-MAP(0x4F, 0x36, 0x7BED)  /* <CJK> */
-MAP(0x4F, 0x37, 0x8001)  /* <CJK> */
-MAP(0x4F, 0x38, 0x807E)  /* <CJK> */
-MAP(0x4F, 0x39, 0x874B)  /* <CJK> */
-MAP(0x4F, 0x3A, 0x90CE)  /* <CJK> */
-MAP(0x4F, 0x3B, 0x516D)  /* <CJK> */
-MAP(0x4F, 0x3C, 0x9E93)  /* <CJK> */
-MAP(0x4F, 0x3D, 0x7984)  /* <CJK> */
-MAP(0x4F, 0x3E, 0x808B)  /* <CJK> */
-MAP(0x4F, 0x3F, 0x9332)  /* <CJK> */
-MAP(0x4F, 0x40, 0x8AD6)  /* <CJK> */
-MAP(0x4F, 0x41, 0x502D)  /* <CJK> */
-MAP(0x4F, 0x42, 0x548C)  /* <CJK> */
-MAP(0x4F, 0x43, 0x8A71)  /* <CJK> */
-MAP(0x4F, 0x44, 0x6B6A)  /* <CJK> */
-MAP(0x4F, 0x45, 0x8CC4)  /* <CJK> */
-MAP(0x4F, 0x46, 0x8107)  /* <CJK> */
-MAP(0x4F, 0x47, 0x60D1)  /* <CJK> */
-MAP(0x4F, 0x48, 0x67A0)  /* <CJK> */
-MAP(0x4F, 0x49, 0x9DF2)  /* <CJK> */
-MAP(0x4F, 0x4A, 0x4E99)  /* <CJK> */
-MAP(0x4F, 0x4B, 0x4E98)  /* <CJK> */
-MAP(0x4F, 0x4C, 0x9C10)  /* <CJK> */
-MAP(0x4F, 0x4D, 0x8A6B)  /* <CJK> */
-MAP(0x4F, 0x4E, 0x85C1)  /* <CJK> */
-MAP(0x4F, 0x4F, 0x8568)  /* <CJK> */
-MAP(0x4F, 0x50, 0x6900)  /* <CJK> */
-MAP(0x4F, 0x51, 0x6E7E)  /* <CJK> */
-MAP(0x4F, 0x52, 0x7897)  /* <CJK> */
-MAP(0x4F, 0x53, 0x8155)  /* <CJK> */
-MAP(0x50, 0x21, 0x5F0C)  /* <CJK> */
-MAP(0x50, 0x22, 0x4E10)  /* <CJK> */
-MAP(0x50, 0x23, 0x4E15)  /* <CJK> */
-MAP(0x50, 0x24, 0x4E2A)  /* <CJK> */
-MAP(0x50, 0x25, 0x4E31)  /* <CJK> */
-MAP(0x50, 0x26, 0x4E36)  /* <CJK> */
-MAP(0x50, 0x27, 0x4E3C)  /* <CJK> */
-MAP(0x50, 0x28, 0x4E3F)  /* <CJK> */
-MAP(0x50, 0x29, 0x4E42)  /* <CJK> */
-MAP(0x50, 0x2A, 0x4E56)  /* <CJK> */
-MAP(0x50, 0x2B, 0x4E58)  /* <CJK> */
-MAP(0x50, 0x2C, 0x4E82)  /* <CJK> */
-MAP(0x50, 0x2D, 0x4E85)  /* <CJK> */
-MAP(0x50, 0x2E, 0x8C6B)  /* <CJK> */
-MAP(0x50, 0x2F, 0x4E8A)  /* <CJK> */
-MAP(0x50, 0x30, 0x8212)  /* <CJK> */
-MAP(0x50, 0x31, 0x5F0D)  /* <CJK> */
-MAP(0x50, 0x32, 0x4E8E)  /* <CJK> */
-MAP(0x50, 0x33, 0x4E9E)  /* <CJK> */
-MAP(0x50, 0x34, 0x4E9F)  /* <CJK> */
-MAP(0x50, 0x35, 0x4EA0)  /* <CJK> */
-MAP(0x50, 0x36, 0x4EA2)  /* <CJK> */
-MAP(0x50, 0x37, 0x4EB0)  /* <CJK> */
-MAP(0x50, 0x38, 0x4EB3)  /* <CJK> */
-MAP(0x50, 0x39, 0x4EB6)  /* <CJK> */
-MAP(0x50, 0x3A, 0x4ECE)  /* <CJK> */
-MAP(0x50, 0x3B, 0x4ECD)  /* <CJK> */
-MAP(0x50, 0x3C, 0x4EC4)  /* <CJK> */
-MAP(0x50, 0x3D, 0x4EC6)  /* <CJK> */
-MAP(0x50, 0x3E, 0x4EC2)  /* <CJK> */
-MAP(0x50, 0x3F, 0x4ED7)  /* <CJK> */
-MAP(0x50, 0x40, 0x4EDE)  /* <CJK> */
-MAP(0x50, 0x41, 0x4EED)  /* <CJK> */
-MAP(0x50, 0x42, 0x4EDF)  /* <CJK> */
-MAP(0x50, 0x43, 0x4EF7)  /* <CJK> */
-MAP(0x50, 0x44, 0x4F09)  /* <CJK> */
-MAP(0x50, 0x45, 0x4F5A)  /* <CJK> */
-MAP(0x50, 0x46, 0x4F30)  /* <CJK> */
-MAP(0x50, 0x47, 0x4F5B)  /* <CJK> */
-MAP(0x50, 0x48, 0x4F5D)  /* <CJK> */
-MAP(0x50, 0x49, 0x4F57)  /* <CJK> */
-MAP(0x50, 0x4A, 0x4F47)  /* <CJK> */
-MAP(0x50, 0x4B, 0x4F76)  /* <CJK> */
-MAP(0x50, 0x4C, 0x4F88)  /* <CJK> */
-MAP(0x50, 0x4D, 0x4F8F)  /* <CJK> */
-MAP(0x50, 0x4E, 0x4F98)  /* <CJK> */
-MAP(0x50, 0x4F, 0x4F7B)  /* <CJK> */
-MAP(0x50, 0x50, 0x4F69)  /* <CJK> */
-MAP(0x50, 0x51, 0x4F70)  /* <CJK> */
-MAP(0x50, 0x52, 0x4F91)  /* <CJK> */
-MAP(0x50, 0x53, 0x4F6F)  /* <CJK> */
-MAP(0x50, 0x54, 0x4F86)  /* <CJK> */
-MAP(0x50, 0x55, 0x4F96)  /* <CJK> */
-MAP(0x50, 0x56, 0x5118)  /* <CJK> */
-MAP(0x50, 0x57, 0x4FD4)  /* <CJK> */
-MAP(0x50, 0x58, 0x4FDF)  /* <CJK> */
-MAP(0x50, 0x59, 0x4FCE)  /* <CJK> */
-MAP(0x50, 0x5A, 0x4FD8)  /* <CJK> */
-MAP(0x50, 0x5B, 0x4FDB)  /* <CJK> */
-MAP(0x50, 0x5C, 0x4FD1)  /* <CJK> */
-MAP(0x50, 0x5D, 0x4FDA)  /* <CJK> */
-MAP(0x50, 0x5E, 0x4FD0)  /* <CJK> */
-MAP(0x50, 0x5F, 0x4FE4)  /* <CJK> */
-MAP(0x50, 0x60, 0x4FE5)  /* <CJK> */
-MAP(0x50, 0x61, 0x501A)  /* <CJK> */
-MAP(0x50, 0x62, 0x5028)  /* <CJK> */
-MAP(0x50, 0x63, 0x5014)  /* <CJK> */
-MAP(0x50, 0x64, 0x502A)  /* <CJK> */
-MAP(0x50, 0x65, 0x5025)  /* <CJK> */
-MAP(0x50, 0x66, 0x5005)  /* <CJK> */
-MAP(0x50, 0x67, 0x4F1C)  /* <CJK> */
-MAP(0x50, 0x68, 0x4FF6)  /* <CJK> */
-MAP(0x50, 0x69, 0x5021)  /* <CJK> */
-MAP(0x50, 0x6A, 0x5029)  /* <CJK> */
-MAP(0x50, 0x6B, 0x502C)  /* <CJK> */
-MAP(0x50, 0x6C, 0x4FFE)  /* <CJK> */
-MAP(0x50, 0x6D, 0x4FEF)  /* <CJK> */
-MAP(0x50, 0x6E, 0x5011)  /* <CJK> */
-MAP(0x50, 0x6F, 0x5006)  /* <CJK> */
-MAP(0x50, 0x70, 0x5043)  /* <CJK> */
-MAP(0x50, 0x71, 0x5047)  /* <CJK> */
-MAP(0x50, 0x72, 0x6703)  /* <CJK> */
-MAP(0x50, 0x73, 0x5055)  /* <CJK> */
-MAP(0x50, 0x74, 0x5050)  /* <CJK> */
-MAP(0x50, 0x75, 0x5048)  /* <CJK> */
-MAP(0x50, 0x76, 0x505A)  /* <CJK> */
-MAP(0x50, 0x77, 0x5056)  /* <CJK> */
-MAP(0x50, 0x78, 0x506C)  /* <CJK> */
-MAP(0x50, 0x79, 0x5078)  /* <CJK> */
-MAP(0x50, 0x7A, 0x5080)  /* <CJK> */
-MAP(0x50, 0x7B, 0x509A)  /* <CJK> */
-MAP(0x50, 0x7C, 0x5085)  /* <CJK> */
-MAP(0x50, 0x7D, 0x50B4)  /* <CJK> */
-MAP(0x50, 0x7E, 0x50B2)  /* <CJK> */
-MAP(0x51, 0x21, 0x50C9)  /* <CJK> */
-MAP(0x51, 0x22, 0x50CA)  /* <CJK> */
-MAP(0x51, 0x23, 0x50B3)  /* <CJK> */
-MAP(0x51, 0x24, 0x50C2)  /* <CJK> */
-MAP(0x51, 0x25, 0x50D6)  /* <CJK> */
-MAP(0x51, 0x26, 0x50DE)  /* <CJK> */
-MAP(0x51, 0x27, 0x50E5)  /* <CJK> */
-MAP(0x51, 0x28, 0x50ED)  /* <CJK> */
-MAP(0x51, 0x29, 0x50E3)  /* <CJK> */
-MAP(0x51, 0x2A, 0x50EE)  /* <CJK> */
-MAP(0x51, 0x2B, 0x50F9)  /* <CJK> */
-MAP(0x51, 0x2C, 0x50F5)  /* <CJK> */
-MAP(0x51, 0x2D, 0x5109)  /* <CJK> */
-MAP(0x51, 0x2E, 0x5101)  /* <CJK> */
-MAP(0x51, 0x2F, 0x5102)  /* <CJK> */
-MAP(0x51, 0x30, 0x5116)  /* <CJK> */
-MAP(0x51, 0x31, 0x5115)  /* <CJK> */
-MAP(0x51, 0x32, 0x5114)  /* <CJK> */
-MAP(0x51, 0x33, 0x511A)  /* <CJK> */
-MAP(0x51, 0x34, 0x5121)  /* <CJK> */
-MAP(0x51, 0x35, 0x513A)  /* <CJK> */
-MAP(0x51, 0x36, 0x5137)  /* <CJK> */
-MAP(0x51, 0x37, 0x513C)  /* <CJK> */
-MAP(0x51, 0x38, 0x513B)  /* <CJK> */
-MAP(0x51, 0x39, 0x513F)  /* <CJK> */
-MAP(0x51, 0x3A, 0x5140)  /* <CJK> */
-MAP(0x51, 0x3B, 0x5152)  /* <CJK> */
-MAP(0x51, 0x3C, 0x514C)  /* <CJK> */
-MAP(0x51, 0x3D, 0x5154)  /* <CJK> */
-MAP(0x51, 0x3E, 0x5162)  /* <CJK> */
-MAP(0x51, 0x3F, 0x7AF8)  /* <CJK> */
-MAP(0x51, 0x40, 0x5169)  /* <CJK> */
-MAP(0x51, 0x41, 0x516A)  /* <CJK> */
-MAP(0x51, 0x42, 0x516E)  /* <CJK> */
-MAP(0x51, 0x43, 0x5180)  /* <CJK> */
-MAP(0x51, 0x44, 0x5182)  /* <CJK> */
-MAP(0x51, 0x45, 0x56D8)  /* <CJK> */
-MAP(0x51, 0x46, 0x518C)  /* <CJK> */
-MAP(0x51, 0x47, 0x5189)  /* <CJK> */
-MAP(0x51, 0x48, 0x518F)  /* <CJK> */
-MAP(0x51, 0x49, 0x5191)  /* <CJK> */
-MAP(0x51, 0x4A, 0x5193)  /* <CJK> */
-MAP(0x51, 0x4B, 0x5195)  /* <CJK> */
-MAP(0x51, 0x4C, 0x5196)  /* <CJK> */
-MAP(0x51, 0x4D, 0x51A4)  /* <CJK> */
-MAP(0x51, 0x4E, 0x51A6)  /* <CJK> */
-MAP(0x51, 0x4F, 0x51A2)  /* <CJK> */
-MAP(0x51, 0x50, 0x51A9)  /* <CJK> */
-MAP(0x51, 0x51, 0x51AA)  /* <CJK> */
-MAP(0x51, 0x52, 0x51AB)  /* <CJK> */
-MAP(0x51, 0x53, 0x51B3)  /* <CJK> */
-MAP(0x51, 0x54, 0x51B1)  /* <CJK> */
-MAP(0x51, 0x55, 0x51B2)  /* <CJK> */
-MAP(0x51, 0x56, 0x51B0)  /* <CJK> */
-MAP(0x51, 0x57, 0x51B5)  /* <CJK> */
-MAP(0x51, 0x58, 0x51BD)  /* <CJK> */
-MAP(0x51, 0x59, 0x51C5)  /* <CJK> */
-MAP(0x51, 0x5A, 0x51C9)  /* <CJK> */
-MAP(0x51, 0x5B, 0x51DB)  /* <CJK> */
-MAP(0x51, 0x5C, 0x51E0)  /* <CJK> */
-MAP(0x51, 0x5D, 0x8655)  /* <CJK> */
-MAP(0x51, 0x5E, 0x51E9)  /* <CJK> */
-MAP(0x51, 0x5F, 0x51ED)  /* <CJK> */
-MAP(0x51, 0x60, 0x51F0)  /* <CJK> */
-MAP(0x51, 0x61, 0x51F5)  /* <CJK> */
-MAP(0x51, 0x62, 0x51FE)  /* <CJK> */
-MAP(0x51, 0x63, 0x5204)  /* <CJK> */
-MAP(0x51, 0x64, 0x520B)  /* <CJK> */
-MAP(0x51, 0x65, 0x5214)  /* <CJK> */
-MAP(0x51, 0x66, 0x520E)  /* <CJK> */
-MAP(0x51, 0x67, 0x5227)  /* <CJK> */
-MAP(0x51, 0x68, 0x522A)  /* <CJK> */
-MAP(0x51, 0x69, 0x522E)  /* <CJK> */
-MAP(0x51, 0x6A, 0x5233)  /* <CJK> */
-MAP(0x51, 0x6B, 0x5239)  /* <CJK> */
-MAP(0x51, 0x6C, 0x524F)  /* <CJK> */
-MAP(0x51, 0x6D, 0x5244)  /* <CJK> */
-MAP(0x51, 0x6E, 0x524B)  /* <CJK> */
-MAP(0x51, 0x6F, 0x524C)  /* <CJK> */
-MAP(0x51, 0x70, 0x525E)  /* <CJK> */
-MAP(0x51, 0x71, 0x5254)  /* <CJK> */
-MAP(0x51, 0x72, 0x526A)  /* <CJK> */
-MAP(0x51, 0x73, 0x5274)  /* <CJK> */
-MAP(0x51, 0x74, 0x5269)  /* <CJK> */
-MAP(0x51, 0x75, 0x5273)  /* <CJK> */
-MAP(0x51, 0x76, 0x527F)  /* <CJK> */
-MAP(0x51, 0x77, 0x527D)  /* <CJK> */
-MAP(0x51, 0x78, 0x528D)  /* <CJK> */
-MAP(0x51, 0x79, 0x5294)  /* <CJK> */
-MAP(0x51, 0x7A, 0x5292)  /* <CJK> */
-MAP(0x51, 0x7B, 0x5271)  /* <CJK> */
-MAP(0x51, 0x7C, 0x5288)  /* <CJK> */
-MAP(0x51, 0x7D, 0x5291)  /* <CJK> */
-MAP(0x51, 0x7E, 0x8FA8)  /* <CJK> */
-MAP(0x52, 0x21, 0x8FA7)  /* <CJK> */
-MAP(0x52, 0x22, 0x52AC)  /* <CJK> */
-MAP(0x52, 0x23, 0x52AD)  /* <CJK> */
-MAP(0x52, 0x24, 0x52BC)  /* <CJK> */
-MAP(0x52, 0x25, 0x52B5)  /* <CJK> */
-MAP(0x52, 0x26, 0x52C1)  /* <CJK> */
-MAP(0x52, 0x27, 0x52CD)  /* <CJK> */
-MAP(0x52, 0x28, 0x52D7)  /* <CJK> */
-MAP(0x52, 0x29, 0x52DE)  /* <CJK> */
-MAP(0x52, 0x2A, 0x52E3)  /* <CJK> */
-MAP(0x52, 0x2B, 0x52E6)  /* <CJK> */
-MAP(0x52, 0x2C, 0x98ED)  /* <CJK> */
-MAP(0x52, 0x2D, 0x52E0)  /* <CJK> */
-MAP(0x52, 0x2E, 0x52F3)  /* <CJK> */
-MAP(0x52, 0x2F, 0x52F5)  /* <CJK> */
-MAP(0x52, 0x30, 0x52F8)  /* <CJK> */
-MAP(0x52, 0x31, 0x52F9)  /* <CJK> */
-MAP(0x52, 0x32, 0x5306)  /* <CJK> */
-MAP(0x52, 0x33, 0x5308)  /* <CJK> */
-MAP(0x52, 0x34, 0x7538)  /* <CJK> */
-MAP(0x52, 0x35, 0x530D)  /* <CJK> */
-MAP(0x52, 0x36, 0x5310)  /* <CJK> */
-MAP(0x52, 0x37, 0x530F)  /* <CJK> */
-MAP(0x52, 0x38, 0x5315)  /* <CJK> */
-MAP(0x52, 0x39, 0x531A)  /* <CJK> */
-MAP(0x52, 0x3A, 0x5323)  /* <CJK> */
-MAP(0x52, 0x3B, 0x532F)  /* <CJK> */
-MAP(0x52, 0x3C, 0x5331)  /* <CJK> */
-MAP(0x52, 0x3D, 0x5333)  /* <CJK> */
-MAP(0x52, 0x3E, 0x5338)  /* <CJK> */
-MAP(0x52, 0x3F, 0x5340)  /* <CJK> */
-MAP(0x52, 0x40, 0x5346)  /* <CJK> */
-MAP(0x52, 0x41, 0x5345)  /* <CJK> */
-MAP(0x52, 0x42, 0x4E17)  /* <CJK> */
-MAP(0x52, 0x43, 0x5349)  /* <CJK> */
-MAP(0x52, 0x44, 0x534D)  /* <CJK> */
-MAP(0x52, 0x45, 0x51D6)  /* <CJK> */
-MAP(0x52, 0x46, 0x535E)  /* <CJK> */
-MAP(0x52, 0x47, 0x5369)  /* <CJK> */
-MAP(0x52, 0x48, 0x536E)  /* <CJK> */
-MAP(0x52, 0x49, 0x5918)  /* <CJK> */
-MAP(0x52, 0x4A, 0x537B)  /* <CJK> */
-MAP(0x52, 0x4B, 0x5377)  /* <CJK> */
-MAP(0x52, 0x4C, 0x5382)  /* <CJK> */
-MAP(0x52, 0x4D, 0x5396)  /* <CJK> */
-MAP(0x52, 0x4E, 0x53A0)  /* <CJK> */
-MAP(0x52, 0x4F, 0x53A6)  /* <CJK> */
-MAP(0x52, 0x50, 0x53A5)  /* <CJK> */
-MAP(0x52, 0x51, 0x53AE)  /* <CJK> */
-MAP(0x52, 0x52, 0x53B0)  /* <CJK> */
-MAP(0x52, 0x53, 0x53B6)  /* <CJK> */
-MAP(0x52, 0x54, 0x53C3)  /* <CJK> */
-MAP(0x52, 0x55, 0x7C12)  /* <CJK> */
-MAP(0x52, 0x56, 0x96D9)  /* <CJK> */
-MAP(0x52, 0x57, 0x53DF)  /* <CJK> */
-MAP(0x52, 0x58, 0x66FC)  /* <CJK> */
-MAP(0x52, 0x59, 0x71EE)  /* <CJK> */
-MAP(0x52, 0x5A, 0x53EE)  /* <CJK> */
-MAP(0x52, 0x5B, 0x53E8)  /* <CJK> */
-MAP(0x52, 0x5C, 0x53ED)  /* <CJK> */
-MAP(0x52, 0x5D, 0x53FA)  /* <CJK> */
-MAP(0x52, 0x5E, 0x5401)  /* <CJK> */
-MAP(0x52, 0x5F, 0x543D)  /* <CJK> */
-MAP(0x52, 0x60, 0x5440)  /* <CJK> */
-MAP(0x52, 0x61, 0x542C)  /* <CJK> */
-MAP(0x52, 0x62, 0x542D)  /* <CJK> */
-MAP(0x52, 0x63, 0x543C)  /* <CJK> */
-MAP(0x52, 0x64, 0x542E)  /* <CJK> */
-MAP(0x52, 0x65, 0x5436)  /* <CJK> */
-MAP(0x52, 0x66, 0x5429)  /* <CJK> */
-MAP(0x52, 0x67, 0x541D)  /* <CJK> */
-MAP(0x52, 0x68, 0x544E)  /* <CJK> */
-MAP(0x52, 0x69, 0x548F)  /* <CJK> */
-MAP(0x52, 0x6A, 0x5475)  /* <CJK> */
-MAP(0x52, 0x6B, 0x548E)  /* <CJK> */
-MAP(0x52, 0x6C, 0x545F)  /* <CJK> */
-MAP(0x52, 0x6D, 0x5471)  /* <CJK> */
-MAP(0x52, 0x6E, 0x5477)  /* <CJK> */
-MAP(0x52, 0x6F, 0x5470)  /* <CJK> */
-MAP(0x52, 0x70, 0x5492)  /* <CJK> */
-MAP(0x52, 0x71, 0x547B)  /* <CJK> */
-MAP(0x52, 0x72, 0x5480)  /* <CJK> */
-MAP(0x52, 0x73, 0x5476)  /* <CJK> */
-MAP(0x52, 0x74, 0x5484)  /* <CJK> */
-MAP(0x52, 0x75, 0x5490)  /* <CJK> */
-MAP(0x52, 0x76, 0x5486)  /* <CJK> */
-MAP(0x52, 0x77, 0x54C7)  /* <CJK> */
-MAP(0x52, 0x78, 0x54A2)  /* <CJK> */
-MAP(0x52, 0x79, 0x54B8)  /* <CJK> */
-MAP(0x52, 0x7A, 0x54A5)  /* <CJK> */
-MAP(0x52, 0x7B, 0x54AC)  /* <CJK> */
-MAP(0x52, 0x7C, 0x54C4)  /* <CJK> */
-MAP(0x52, 0x7D, 0x54C8)  /* <CJK> */
-MAP(0x52, 0x7E, 0x54A8)  /* <CJK> */
-MAP(0x53, 0x21, 0x54AB)  /* <CJK> */
-MAP(0x53, 0x22, 0x54C2)  /* <CJK> */
-MAP(0x53, 0x23, 0x54A4)  /* <CJK> */
-MAP(0x53, 0x24, 0x54BE)  /* <CJK> */
-MAP(0x53, 0x25, 0x54BC)  /* <CJK> */
-MAP(0x53, 0x26, 0x54D8)  /* <CJK> */
-MAP(0x53, 0x27, 0x54E5)  /* <CJK> */
-MAP(0x53, 0x28, 0x54E6)  /* <CJK> */
-MAP(0x53, 0x29, 0x550F)  /* <CJK> */
-MAP(0x53, 0x2A, 0x5514)  /* <CJK> */
-MAP(0x53, 0x2B, 0x54FD)  /* <CJK> */
-MAP(0x53, 0x2C, 0x54EE)  /* <CJK> */
-MAP(0x53, 0x2D, 0x54ED)  /* <CJK> */
-MAP(0x53, 0x2E, 0x54FA)  /* <CJK> */
-MAP(0x53, 0x2F, 0x54E2)  /* <CJK> */
-MAP(0x53, 0x30, 0x5539)  /* <CJK> */
-MAP(0x53, 0x31, 0x5540)  /* <CJK> */
-MAP(0x53, 0x32, 0x5563)  /* <CJK> */
-MAP(0x53, 0x33, 0x554C)  /* <CJK> */
-MAP(0x53, 0x34, 0x552E)  /* <CJK> */
-MAP(0x53, 0x35, 0x555C)  /* <CJK> */
-MAP(0x53, 0x36, 0x5545)  /* <CJK> */
-MAP(0x53, 0x37, 0x5556)  /* <CJK> */
-MAP(0x53, 0x38, 0x5557)  /* <CJK> */
-MAP(0x53, 0x39, 0x5538)  /* <CJK> */
-MAP(0x53, 0x3A, 0x5533)  /* <CJK> */
-MAP(0x53, 0x3B, 0x555D)  /* <CJK> */
-MAP(0x53, 0x3C, 0x5599)  /* <CJK> */
-MAP(0x53, 0x3D, 0x5580)  /* <CJK> */
-MAP(0x53, 0x3E, 0x54AF)  /* <CJK> */
-MAP(0x53, 0x3F, 0x558A)  /* <CJK> */
-MAP(0x53, 0x40, 0x559F)  /* <CJK> */
-MAP(0x53, 0x41, 0x557B)  /* <CJK> */
-MAP(0x53, 0x42, 0x557E)  /* <CJK> */
-MAP(0x53, 0x43, 0x5598)  /* <CJK> */
-MAP(0x53, 0x44, 0x559E)  /* <CJK> */
-MAP(0x53, 0x45, 0x55AE)  /* <CJK> */
-MAP(0x53, 0x46, 0x557C)  /* <CJK> */
-MAP(0x53, 0x47, 0x5583)  /* <CJK> */
-MAP(0x53, 0x48, 0x55A9)  /* <CJK> */
-MAP(0x53, 0x49, 0x5587)  /* <CJK> */
-MAP(0x53, 0x4A, 0x55A8)  /* <CJK> */
-MAP(0x53, 0x4B, 0x55DA)  /* <CJK> */
-MAP(0x53, 0x4C, 0x55C5)  /* <CJK> */
-MAP(0x53, 0x4D, 0x55DF)  /* <CJK> */
-MAP(0x53, 0x4E, 0x55C4)  /* <CJK> */
-MAP(0x53, 0x4F, 0x55DC)  /* <CJK> */
-MAP(0x53, 0x50, 0x55E4)  /* <CJK> */
-MAP(0x53, 0x51, 0x55D4)  /* <CJK> */
-MAP(0x53, 0x52, 0x5614)  /* <CJK> */
-MAP(0x53, 0x53, 0x55F7)  /* <CJK> */
-MAP(0x53, 0x54, 0x5616)  /* <CJK> */
-MAP(0x53, 0x55, 0x55FE)  /* <CJK> */
-MAP(0x53, 0x56, 0x55FD)  /* <CJK> */
-MAP(0x53, 0x57, 0x561B)  /* <CJK> */
-MAP(0x53, 0x58, 0x55F9)  /* <CJK> */
-MAP(0x53, 0x59, 0x564E)  /* <CJK> */
-MAP(0x53, 0x5A, 0x5650)  /* <CJK> */
-MAP(0x53, 0x5B, 0x71DF)  /* <CJK> */
-MAP(0x53, 0x5C, 0x5634)  /* <CJK> */
-MAP(0x53, 0x5D, 0x5636)  /* <CJK> */
-MAP(0x53, 0x5E, 0x5632)  /* <CJK> */
-MAP(0x53, 0x5F, 0x5638)  /* <CJK> */
-MAP(0x53, 0x60, 0x566B)  /* <CJK> */
-MAP(0x53, 0x61, 0x5664)  /* <CJK> */
-MAP(0x53, 0x62, 0x562F)  /* <CJK> */
-MAP(0x53, 0x63, 0x566C)  /* <CJK> */
-MAP(0x53, 0x64, 0x566A)  /* <CJK> */
-MAP(0x53, 0x65, 0x5686)  /* <CJK> */
-MAP(0x53, 0x66, 0x5680)  /* <CJK> */
-MAP(0x53, 0x67, 0x568A)  /* <CJK> */
-MAP(0x53, 0x68, 0x56A0)  /* <CJK> */
-MAP(0x53, 0x69, 0x5694)  /* <CJK> */
-MAP(0x53, 0x6A, 0x568F)  /* <CJK> */
-MAP(0x53, 0x6B, 0x56A5)  /* <CJK> */
-MAP(0x53, 0x6C, 0x56AE)  /* <CJK> */
-MAP(0x53, 0x6D, 0x56B6)  /* <CJK> */
-MAP(0x53, 0x6E, 0x56B4)  /* <CJK> */
-MAP(0x53, 0x6F, 0x56C2)  /* <CJK> */
-MAP(0x53, 0x70, 0x56BC)  /* <CJK> */
-MAP(0x53, 0x71, 0x56C1)  /* <CJK> */
-MAP(0x53, 0x72, 0x56C3)  /* <CJK> */
-MAP(0x53, 0x73, 0x56C0)  /* <CJK> */
-MAP(0x53, 0x74, 0x56C8)  /* <CJK> */
-MAP(0x53, 0x75, 0x56CE)  /* <CJK> */
-MAP(0x53, 0x76, 0x56D1)  /* <CJK> */
-MAP(0x53, 0x77, 0x56D3)  /* <CJK> */
-MAP(0x53, 0x78, 0x56D7)  /* <CJK> */
-MAP(0x53, 0x79, 0x56EE)  /* <CJK> */
-MAP(0x53, 0x7A, 0x56F9)  /* <CJK> */
-MAP(0x53, 0x7B, 0x5700)  /* <CJK> */
-MAP(0x53, 0x7C, 0x56FF)  /* <CJK> */
-MAP(0x53, 0x7D, 0x5704)  /* <CJK> */
-MAP(0x53, 0x7E, 0x5709)  /* <CJK> */
-MAP(0x54, 0x21, 0x5708)  /* <CJK> */
-MAP(0x54, 0x22, 0x570B)  /* <CJK> */
-MAP(0x54, 0x23, 0x570D)  /* <CJK> */
-MAP(0x54, 0x24, 0x5713)  /* <CJK> */
-MAP(0x54, 0x25, 0x5718)  /* <CJK> */
-MAP(0x54, 0x26, 0x5716)  /* <CJK> */
-MAP(0x54, 0x27, 0x55C7)  /* <CJK> */
-MAP(0x54, 0x28, 0x571C)  /* <CJK> */
-MAP(0x54, 0x29, 0x5726)  /* <CJK> */
-MAP(0x54, 0x2A, 0x5737)  /* <CJK> */
-MAP(0x54, 0x2B, 0x5738)  /* <CJK> */
-MAP(0x54, 0x2C, 0x574E)  /* <CJK> */
-MAP(0x54, 0x2D, 0x573B)  /* <CJK> */
-MAP(0x54, 0x2E, 0x5740)  /* <CJK> */
-MAP(0x54, 0x2F, 0x574F)  /* <CJK> */
-MAP(0x54, 0x30, 0x5769)  /* <CJK> */
-MAP(0x54, 0x31, 0x57C0)  /* <CJK> */
-MAP(0x54, 0x32, 0x5788)  /* <CJK> */
-MAP(0x54, 0x33, 0x5761)  /* <CJK> */
-MAP(0x54, 0x34, 0x577F)  /* <CJK> */
-MAP(0x54, 0x35, 0x5789)  /* <CJK> */
-MAP(0x54, 0x36, 0x5793)  /* <CJK> */
-MAP(0x54, 0x37, 0x57A0)  /* <CJK> */
-MAP(0x54, 0x38, 0x57B3)  /* <CJK> */
-MAP(0x54, 0x39, 0x57A4)  /* <CJK> */
-MAP(0x54, 0x3A, 0x57AA)  /* <CJK> */
-MAP(0x54, 0x3B, 0x57B0)  /* <CJK> */
-MAP(0x54, 0x3C, 0x57C3)  /* <CJK> */
-MAP(0x54, 0x3D, 0x57C6)  /* <CJK> */
-MAP(0x54, 0x3E, 0x57D4)  /* <CJK> */
-MAP(0x54, 0x3F, 0x57D2)  /* <CJK> */
-MAP(0x54, 0x40, 0x57D3)  /* <CJK> */
-MAP(0x54, 0x41, 0x580A)  /* <CJK> */
-MAP(0x54, 0x42, 0x57D6)  /* <CJK> */
-MAP(0x54, 0x43, 0x57E3)  /* <CJK> */
-MAP(0x54, 0x44, 0x580B)  /* <CJK> */
-MAP(0x54, 0x45, 0x5819)  /* <CJK> */
-MAP(0x54, 0x46, 0x581D)  /* <CJK> */
-MAP(0x54, 0x47, 0x5872)  /* <CJK> */
-MAP(0x54, 0x48, 0x5821)  /* <CJK> */
-MAP(0x54, 0x49, 0x5862)  /* <CJK> */
-MAP(0x54, 0x4A, 0x584B)  /* <CJK> */
-MAP(0x54, 0x4B, 0x5870)  /* <CJK> */
-MAP(0x54, 0x4C, 0x6BC0)  /* <CJK> */
-MAP(0x54, 0x4D, 0x5852)  /* <CJK> */
-MAP(0x54, 0x4E, 0x583D)  /* <CJK> */
-MAP(0x54, 0x4F, 0x5879)  /* <CJK> */
-MAP(0x54, 0x50, 0x5885)  /* <CJK> */
-MAP(0x54, 0x51, 0x58B9)  /* <CJK> */
-MAP(0x54, 0x52, 0x589F)  /* <CJK> */
-MAP(0x54, 0x53, 0x58AB)  /* <CJK> */
-MAP(0x54, 0x54, 0x58BA)  /* <CJK> */
-MAP(0x54, 0x55, 0x58DE)  /* <CJK> */
-MAP(0x54, 0x56, 0x58BB)  /* <CJK> */
-MAP(0x54, 0x57, 0x58B8)  /* <CJK> */
-MAP(0x54, 0x58, 0x58AE)  /* <CJK> */
-MAP(0x54, 0x59, 0x58C5)  /* <CJK> */
-MAP(0x54, 0x5A, 0x58D3)  /* <CJK> */
-MAP(0x54, 0x5B, 0x58D1)  /* <CJK> */
-MAP(0x54, 0x5C, 0x58D7)  /* <CJK> */
-MAP(0x54, 0x5D, 0x58D9)  /* <CJK> */
-MAP(0x54, 0x5E, 0x58D8)  /* <CJK> */
-MAP(0x54, 0x5F, 0x58E5)  /* <CJK> */
-MAP(0x54, 0x60, 0x58DC)  /* <CJK> */
-MAP(0x54, 0x61, 0x58E4)  /* <CJK> */
-MAP(0x54, 0x62, 0x58DF)  /* <CJK> */
-MAP(0x54, 0x63, 0x58EF)  /* <CJK> */
-MAP(0x54, 0x64, 0x58FA)  /* <CJK> */
-MAP(0x54, 0x65, 0x58F9)  /* <CJK> */
-MAP(0x54, 0x66, 0x58FB)  /* <CJK> */
-MAP(0x54, 0x67, 0x58FC)  /* <CJK> */
-MAP(0x54, 0x68, 0x58FD)  /* <CJK> */
-MAP(0x54, 0x69, 0x5902)  /* <CJK> */
-MAP(0x54, 0x6A, 0x590A)  /* <CJK> */
-MAP(0x54, 0x6B, 0x5910)  /* <CJK> */
-MAP(0x54, 0x6C, 0x591B)  /* <CJK> */
-MAP(0x54, 0x6D, 0x68A6)  /* <CJK> */
-MAP(0x54, 0x6E, 0x5925)  /* <CJK> */
-MAP(0x54, 0x6F, 0x592C)  /* <CJK> */
-MAP(0x54, 0x70, 0x592D)  /* <CJK> */
-MAP(0x54, 0x71, 0x5932)  /* <CJK> */
-MAP(0x54, 0x72, 0x5938)  /* <CJK> */
-MAP(0x54, 0x73, 0x593E)  /* <CJK> */
-MAP(0x54, 0x74, 0x7AD2)  /* <CJK> */
-MAP(0x54, 0x75, 0x5955)  /* <CJK> */
-MAP(0x54, 0x76, 0x5950)  /* <CJK> */
-MAP(0x54, 0x77, 0x594E)  /* <CJK> */
-MAP(0x54, 0x78, 0x595A)  /* <CJK> */
-MAP(0x54, 0x79, 0x5958)  /* <CJK> */
-MAP(0x54, 0x7A, 0x5962)  /* <CJK> */
-MAP(0x54, 0x7B, 0x5960)  /* <CJK> */
-MAP(0x54, 0x7C, 0x5967)  /* <CJK> */
-MAP(0x54, 0x7D, 0x596C)  /* <CJK> */
-MAP(0x54, 0x7E, 0x5969)  /* <CJK> */
-MAP(0x55, 0x21, 0x5978)  /* <CJK> */
-MAP(0x55, 0x22, 0x5981)  /* <CJK> */
-MAP(0x55, 0x23, 0x599D)  /* <CJK> */
-MAP(0x55, 0x24, 0x4F5E)  /* <CJK> */
-MAP(0x55, 0x25, 0x4FAB)  /* <CJK> */
-MAP(0x55, 0x26, 0x59A3)  /* <CJK> */
-MAP(0x55, 0x27, 0x59B2)  /* <CJK> */
-MAP(0x55, 0x28, 0x59C6)  /* <CJK> */
-MAP(0x55, 0x29, 0x59E8)  /* <CJK> */
-MAP(0x55, 0x2A, 0x59DC)  /* <CJK> */
-MAP(0x55, 0x2B, 0x598D)  /* <CJK> */
-MAP(0x55, 0x2C, 0x59D9)  /* <CJK> */
-MAP(0x55, 0x2D, 0x59DA)  /* <CJK> */
-MAP(0x55, 0x2E, 0x5A25)  /* <CJK> */
-MAP(0x55, 0x2F, 0x5A1F)  /* <CJK> */
-MAP(0x55, 0x30, 0x5A11)  /* <CJK> */
-MAP(0x55, 0x31, 0x5A1C)  /* <CJK> */
-MAP(0x55, 0x32, 0x5A09)  /* <CJK> */
-MAP(0x55, 0x33, 0x5A1A)  /* <CJK> */
-MAP(0x55, 0x34, 0x5A40)  /* <CJK> */
-MAP(0x55, 0x35, 0x5A6C)  /* <CJK> */
-MAP(0x55, 0x36, 0x5A49)  /* <CJK> */
-MAP(0x55, 0x37, 0x5A35)  /* <CJK> */
-MAP(0x55, 0x38, 0x5A36)  /* <CJK> */
-MAP(0x55, 0x39, 0x5A62)  /* <CJK> */
-MAP(0x55, 0x3A, 0x5A6A)  /* <CJK> */
-MAP(0x55, 0x3B, 0x5A9A)  /* <CJK> */
-MAP(0x55, 0x3C, 0x5ABC)  /* <CJK> */
-MAP(0x55, 0x3D, 0x5ABE)  /* <CJK> */
-MAP(0x55, 0x3E, 0x5ACB)  /* <CJK> */
-MAP(0x55, 0x3F, 0x5AC2)  /* <CJK> */
-MAP(0x55, 0x40, 0x5ABD)  /* <CJK> */
-MAP(0x55, 0x41, 0x5AE3)  /* <CJK> */
-MAP(0x55, 0x42, 0x5AD7)  /* <CJK> */
-MAP(0x55, 0x43, 0x5AE6)  /* <CJK> */
-MAP(0x55, 0x44, 0x5AE9)  /* <CJK> */
-MAP(0x55, 0x45, 0x5AD6)  /* <CJK> */
-MAP(0x55, 0x46, 0x5AFA)  /* <CJK> */
-MAP(0x55, 0x47, 0x5AFB)  /* <CJK> */
-MAP(0x55, 0x48, 0x5B0C)  /* <CJK> */
-MAP(0x55, 0x49, 0x5B0B)  /* <CJK> */
-MAP(0x55, 0x4A, 0x5B16)  /* <CJK> */
-MAP(0x55, 0x4B, 0x5B32)  /* <CJK> */
-MAP(0x55, 0x4C, 0x5AD0)  /* <CJK> */
-MAP(0x55, 0x4D, 0x5B2A)  /* <CJK> */
-MAP(0x55, 0x4E, 0x5B36)  /* <CJK> */
-MAP(0x55, 0x4F, 0x5B3E)  /* <CJK> */
-MAP(0x55, 0x50, 0x5B43)  /* <CJK> */
-MAP(0x55, 0x51, 0x5B45)  /* <CJK> */
-MAP(0x55, 0x52, 0x5B40)  /* <CJK> */
-MAP(0x55, 0x53, 0x5B51)  /* <CJK> */
-MAP(0x55, 0x54, 0x5B55)  /* <CJK> */
-MAP(0x55, 0x55, 0x5B5A)  /* <CJK> */
-MAP(0x55, 0x56, 0x5B5B)  /* <CJK> */
-MAP(0x55, 0x57, 0x5B65)  /* <CJK> */
-MAP(0x55, 0x58, 0x5B69)  /* <CJK> */
-MAP(0x55, 0x59, 0x5B70)  /* <CJK> */
-MAP(0x55, 0x5A, 0x5B73)  /* <CJK> */
-MAP(0x55, 0x5B, 0x5B75)  /* <CJK> */
-MAP(0x55, 0x5C, 0x5B78)  /* <CJK> */
-MAP(0x55, 0x5D, 0x6588)  /* <CJK> */
-MAP(0x55, 0x5E, 0x5B7A)  /* <CJK> */
-MAP(0x55, 0x5F, 0x5B80)  /* <CJK> */
-MAP(0x55, 0x60, 0x5B83)  /* <CJK> */
-MAP(0x55, 0x61, 0x5BA6)  /* <CJK> */
-MAP(0x55, 0x62, 0x5BB8)  /* <CJK> */
-MAP(0x55, 0x63, 0x5BC3)  /* <CJK> */
-MAP(0x55, 0x64, 0x5BC7)  /* <CJK> */
-MAP(0x55, 0x65, 0x5BC9)  /* <CJK> */
-MAP(0x55, 0x66, 0x5BD4)  /* <CJK> */
-MAP(0x55, 0x67, 0x5BD0)  /* <CJK> */
-MAP(0x55, 0x68, 0x5BE4)  /* <CJK> */
-MAP(0x55, 0x69, 0x5BE6)  /* <CJK> */
-MAP(0x55, 0x6A, 0x5BE2)  /* <CJK> */
-MAP(0x55, 0x6B, 0x5BDE)  /* <CJK> */
-MAP(0x55, 0x6C, 0x5BE5)  /* <CJK> */
-MAP(0x55, 0x6D, 0x5BEB)  /* <CJK> */
-MAP(0x55, 0x6E, 0x5BF0)  /* <CJK> */
-MAP(0x55, 0x6F, 0x5BF6)  /* <CJK> */
-MAP(0x55, 0x70, 0x5BF3)  /* <CJK> */
-MAP(0x55, 0x71, 0x5C05)  /* <CJK> */
-MAP(0x55, 0x72, 0x5C07)  /* <CJK> */
-MAP(0x55, 0x73, 0x5C08)  /* <CJK> */
-MAP(0x55, 0x74, 0x5C0D)  /* <CJK> */
-MAP(0x55, 0x75, 0x5C13)  /* <CJK> */
-MAP(0x55, 0x76, 0x5C20)  /* <CJK> */
-MAP(0x55, 0x77, 0x5C22)  /* <CJK> */
-MAP(0x55, 0x78, 0x5C28)  /* <CJK> */
-MAP(0x55, 0x79, 0x5C38)  /* <CJK> */
-MAP(0x55, 0x7A, 0x5C39)  /* <CJK> */
-MAP(0x55, 0x7B, 0x5C41)  /* <CJK> */
-MAP(0x55, 0x7C, 0x5C46)  /* <CJK> */
-MAP(0x55, 0x7D, 0x5C4E)  /* <CJK> */
-MAP(0x55, 0x7E, 0x5C53)  /* <CJK> */
-MAP(0x56, 0x21, 0x5C50)  /* <CJK> */
-MAP(0x56, 0x22, 0x5C4F)  /* <CJK> */
-MAP(0x56, 0x23, 0x5B71)  /* <CJK> */
-MAP(0x56, 0x24, 0x5C6C)  /* <CJK> */
-MAP(0x56, 0x25, 0x5C6E)  /* <CJK> */
-MAP(0x56, 0x26, 0x4E62)  /* <CJK> */
-MAP(0x56, 0x27, 0x5C76)  /* <CJK> */
-MAP(0x56, 0x28, 0x5C79)  /* <CJK> */
-MAP(0x56, 0x29, 0x5C8C)  /* <CJK> */
-MAP(0x56, 0x2A, 0x5C91)  /* <CJK> */
-MAP(0x56, 0x2B, 0x5C94)  /* <CJK> */
-MAP(0x56, 0x2C, 0x599B)  /* <CJK> */
-MAP(0x56, 0x2D, 0x5CAB)  /* <CJK> */
-MAP(0x56, 0x2E, 0x5CBB)  /* <CJK> */
-MAP(0x56, 0x2F, 0x5CB6)  /* <CJK> */
-MAP(0x56, 0x30, 0x5CBC)  /* <CJK> */
-MAP(0x56, 0x31, 0x5CB7)  /* <CJK> */
-MAP(0x56, 0x32, 0x5CC5)  /* <CJK> */
-MAP(0x56, 0x33, 0x5CBE)  /* <CJK> */
-MAP(0x56, 0x34, 0x5CC7)  /* <CJK> */
-MAP(0x56, 0x35, 0x5CD9)  /* <CJK> */
-MAP(0x56, 0x36, 0x5CE9)  /* <CJK> */
-MAP(0x56, 0x37, 0x5CFD)  /* <CJK> */
-MAP(0x56, 0x38, 0x5CFA)  /* <CJK> */
-MAP(0x56, 0x39, 0x5CED)  /* <CJK> */
-MAP(0x56, 0x3A, 0x5D8C)  /* <CJK> */
-MAP(0x56, 0x3B, 0x5CEA)  /* <CJK> */
-MAP(0x56, 0x3C, 0x5D0B)  /* <CJK> */
-MAP(0x56, 0x3D, 0x5D15)  /* <CJK> */
-MAP(0x56, 0x3E, 0x5D17)  /* <CJK> */
-MAP(0x56, 0x3F, 0x5D5C)  /* <CJK> */
-MAP(0x56, 0x40, 0x5D1F)  /* <CJK> */
-MAP(0x56, 0x41, 0x5D1B)  /* <CJK> */
-MAP(0x56, 0x42, 0x5D11)  /* <CJK> */
-MAP(0x56, 0x43, 0x5D14)  /* <CJK> */
-MAP(0x56, 0x44, 0x5D22)  /* <CJK> */
-MAP(0x56, 0x45, 0x5D1A)  /* <CJK> */
-MAP(0x56, 0x46, 0x5D19)  /* <CJK> */
-MAP(0x56, 0x47, 0x5D18)  /* <CJK> */
-MAP(0x56, 0x48, 0x5D4C)  /* <CJK> */
-MAP(0x56, 0x49, 0x5D52)  /* <CJK> */
-MAP(0x56, 0x4A, 0x5D4E)  /* <CJK> */
-MAP(0x56, 0x4B, 0x5D4B)  /* <CJK> */
-MAP(0x56, 0x4C, 0x5D6C)  /* <CJK> */
-MAP(0x56, 0x4D, 0x5D73)  /* <CJK> */
-MAP(0x56, 0x4E, 0x5D76)  /* <CJK> */
-MAP(0x56, 0x4F, 0x5D87)  /* <CJK> */
-MAP(0x56, 0x50, 0x5D84)  /* <CJK> */
-MAP(0x56, 0x51, 0x5D82)  /* <CJK> */
-MAP(0x56, 0x52, 0x5DA2)  /* <CJK> */
-MAP(0x56, 0x53, 0x5D9D)  /* <CJK> */
-MAP(0x56, 0x54, 0x5DAC)  /* <CJK> */
-MAP(0x56, 0x55, 0x5DAE)  /* <CJK> */
-MAP(0x56, 0x56, 0x5DBD)  /* <CJK> */
-MAP(0x56, 0x57, 0x5D90)  /* <CJK> */
-MAP(0x56, 0x58, 0x5DB7)  /* <CJK> */
-MAP(0x56, 0x59, 0x5DBC)  /* <CJK> */
-MAP(0x56, 0x5A, 0x5DC9)  /* <CJK> */
-MAP(0x56, 0x5B, 0x5DCD)  /* <CJK> */
-MAP(0x56, 0x5C, 0x5DD3)  /* <CJK> */
-MAP(0x56, 0x5D, 0x5DD2)  /* <CJK> */
-MAP(0x56, 0x5E, 0x5DD6)  /* <CJK> */
-MAP(0x56, 0x5F, 0x5DDB)  /* <CJK> */
-MAP(0x56, 0x60, 0x5DEB)  /* <CJK> */
-MAP(0x56, 0x61, 0x5DF2)  /* <CJK> */
-MAP(0x56, 0x62, 0x5DF5)  /* <CJK> */
-MAP(0x56, 0x63, 0x5E0B)  /* <CJK> */
-MAP(0x56, 0x64, 0x5E1A)  /* <CJK> */
-MAP(0x56, 0x65, 0x5E19)  /* <CJK> */
-MAP(0x56, 0x66, 0x5E11)  /* <CJK> */
-MAP(0x56, 0x67, 0x5E1B)  /* <CJK> */
-MAP(0x56, 0x68, 0x5E36)  /* <CJK> */
-MAP(0x56, 0x69, 0x5E37)  /* <CJK> */
-MAP(0x56, 0x6A, 0x5E44)  /* <CJK> */
-MAP(0x56, 0x6B, 0x5E43)  /* <CJK> */
-MAP(0x56, 0x6C, 0x5E40)  /* <CJK> */
-MAP(0x56, 0x6D, 0x5E4E)  /* <CJK> */
-MAP(0x56, 0x6E, 0x5E57)  /* <CJK> */
-MAP(0x56, 0x6F, 0x5E54)  /* <CJK> */
-MAP(0x56, 0x70, 0x5E5F)  /* <CJK> */
-MAP(0x56, 0x71, 0x5E62)  /* <CJK> */
-MAP(0x56, 0x72, 0x5E64)  /* <CJK> */
-MAP(0x56, 0x73, 0x5E47)  /* <CJK> */
-MAP(0x56, 0x74, 0x5E75)  /* <CJK> */
-MAP(0x56, 0x75, 0x5E76)  /* <CJK> */
-MAP(0x56, 0x76, 0x5E7A)  /* <CJK> */
-MAP(0x56, 0x77, 0x9EBC)  /* <CJK> */
-MAP(0x56, 0x78, 0x5E7F)  /* <CJK> */
-MAP(0x56, 0x79, 0x5EA0)  /* <CJK> */
-MAP(0x56, 0x7A, 0x5EC1)  /* <CJK> */
-MAP(0x56, 0x7B, 0x5EC2)  /* <CJK> */
-MAP(0x56, 0x7C, 0x5EC8)  /* <CJK> */
-MAP(0x56, 0x7D, 0x5ED0)  /* <CJK> */
-MAP(0x56, 0x7E, 0x5ECF)  /* <CJK> */
-MAP(0x57, 0x21, 0x5ED6)  /* <CJK> */
-MAP(0x57, 0x22, 0x5EE3)  /* <CJK> */
-MAP(0x57, 0x23, 0x5EDD)  /* <CJK> */
-MAP(0x57, 0x24, 0x5EDA)  /* <CJK> */
-MAP(0x57, 0x25, 0x5EDB)  /* <CJK> */
-MAP(0x57, 0x26, 0x5EE2)  /* <CJK> */
-MAP(0x57, 0x27, 0x5EE1)  /* <CJK> */
-MAP(0x57, 0x28, 0x5EE8)  /* <CJK> */
-MAP(0x57, 0x29, 0x5EE9)  /* <CJK> */
-MAP(0x57, 0x2A, 0x5EEC)  /* <CJK> */
-MAP(0x57, 0x2B, 0x5EF1)  /* <CJK> */
-MAP(0x57, 0x2C, 0x5EF3)  /* <CJK> */
-MAP(0x57, 0x2D, 0x5EF0)  /* <CJK> */
-MAP(0x57, 0x2E, 0x5EF4)  /* <CJK> */
-MAP(0x57, 0x2F, 0x5EF8)  /* <CJK> */
-MAP(0x57, 0x30, 0x5EFE)  /* <CJK> */
-MAP(0x57, 0x31, 0x5F03)  /* <CJK> */
-MAP(0x57, 0x32, 0x5F09)  /* <CJK> */
-MAP(0x57, 0x33, 0x5F5D)  /* <CJK> */
-MAP(0x57, 0x34, 0x5F5C)  /* <CJK> */
-MAP(0x57, 0x35, 0x5F0B)  /* <CJK> */
-MAP(0x57, 0x36, 0x5F11)  /* <CJK> */
-MAP(0x57, 0x37, 0x5F16)  /* <CJK> */
-MAP(0x57, 0x38, 0x5F29)  /* <CJK> */
-MAP(0x57, 0x39, 0x5F2D)  /* <CJK> */
-MAP(0x57, 0x3A, 0x5F38)  /* <CJK> */
-MAP(0x57, 0x3B, 0x5F41)  /* <CJK> */
-MAP(0x57, 0x3C, 0x5F48)  /* <CJK> */
-MAP(0x57, 0x3D, 0x5F4C)  /* <CJK> */
-MAP(0x57, 0x3E, 0x5F4E)  /* <CJK> */
-MAP(0x57, 0x3F, 0x5F2F)  /* <CJK> */
-MAP(0x57, 0x40, 0x5F51)  /* <CJK> */
-MAP(0x57, 0x41, 0x5F56)  /* <CJK> */
-MAP(0x57, 0x42, 0x5F57)  /* <CJK> */
-MAP(0x57, 0x43, 0x5F59)  /* <CJK> */
-MAP(0x57, 0x44, 0x5F61)  /* <CJK> */
-MAP(0x57, 0x45, 0x5F6D)  /* <CJK> */
-MAP(0x57, 0x46, 0x5F73)  /* <CJK> */
-MAP(0x57, 0x47, 0x5F77)  /* <CJK> */
-MAP(0x57, 0x48, 0x5F83)  /* <CJK> */
-MAP(0x57, 0x49, 0x5F82)  /* <CJK> */
-MAP(0x57, 0x4A, 0x5F7F)  /* <CJK> */
-MAP(0x57, 0x4B, 0x5F8A)  /* <CJK> */
-MAP(0x57, 0x4C, 0x5F88)  /* <CJK> */
-MAP(0x57, 0x4D, 0x5F91)  /* <CJK> */
-MAP(0x57, 0x4E, 0x5F87)  /* <CJK> */
-MAP(0x57, 0x4F, 0x5F9E)  /* <CJK> */
-MAP(0x57, 0x50, 0x5F99)  /* <CJK> */
-MAP(0x57, 0x51, 0x5F98)  /* <CJK> */
-MAP(0x57, 0x52, 0x5FA0)  /* <CJK> */
-MAP(0x57, 0x53, 0x5FA8)  /* <CJK> */
-MAP(0x57, 0x54, 0x5FAD)  /* <CJK> */
-MAP(0x57, 0x55, 0x5FBC)  /* <CJK> */
-MAP(0x57, 0x56, 0x5FD6)  /* <CJK> */
-MAP(0x57, 0x57, 0x5FFB)  /* <CJK> */
-MAP(0x57, 0x58, 0x5FE4)  /* <CJK> */
-MAP(0x57, 0x59, 0x5FF8)  /* <CJK> */
-MAP(0x57, 0x5A, 0x5FF1)  /* <CJK> */
-MAP(0x57, 0x5B, 0x5FDD)  /* <CJK> */
-MAP(0x57, 0x5C, 0x60B3)  /* <CJK> */
-MAP(0x57, 0x5D, 0x5FFF)  /* <CJK> */
-MAP(0x57, 0x5E, 0x6021)  /* <CJK> */
-MAP(0x57, 0x5F, 0x6060)  /* <CJK> */
-MAP(0x57, 0x60, 0x6019)  /* <CJK> */
-MAP(0x57, 0x61, 0x6010)  /* <CJK> */
-MAP(0x57, 0x62, 0x6029)  /* <CJK> */
-MAP(0x57, 0x63, 0x600E)  /* <CJK> */
-MAP(0x57, 0x64, 0x6031)  /* <CJK> */
-MAP(0x57, 0x65, 0x601B)  /* <CJK> */
-MAP(0x57, 0x66, 0x6015)  /* <CJK> */
-MAP(0x57, 0x67, 0x602B)  /* <CJK> */
-MAP(0x57, 0x68, 0x6026)  /* <CJK> */
-MAP(0x57, 0x69, 0x600F)  /* <CJK> */
-MAP(0x57, 0x6A, 0x603A)  /* <CJK> */
-MAP(0x57, 0x6B, 0x605A)  /* <CJK> */
-MAP(0x57, 0x6C, 0x6041)  /* <CJK> */
-MAP(0x57, 0x6D, 0x606A)  /* <CJK> */
-MAP(0x57, 0x6E, 0x6077)  /* <CJK> */
-MAP(0x57, 0x6F, 0x605F)  /* <CJK> */
-MAP(0x57, 0x70, 0x604A)  /* <CJK> */
-MAP(0x57, 0x71, 0x6046)  /* <CJK> */
-MAP(0x57, 0x72, 0x604D)  /* <CJK> */
-MAP(0x57, 0x73, 0x6063)  /* <CJK> */
-MAP(0x57, 0x74, 0x6043)  /* <CJK> */
-MAP(0x57, 0x75, 0x6064)  /* <CJK> */
-MAP(0x57, 0x76, 0x6042)  /* <CJK> */
-MAP(0x57, 0x77, 0x606C)  /* <CJK> */
-MAP(0x57, 0x78, 0x606B)  /* <CJK> */
-MAP(0x57, 0x79, 0x6059)  /* <CJK> */
-MAP(0x57, 0x7A, 0x6081)  /* <CJK> */
-MAP(0x57, 0x7B, 0x608D)  /* <CJK> */
-MAP(0x57, 0x7C, 0x60E7)  /* <CJK> */
-MAP(0x57, 0x7D, 0x6083)  /* <CJK> */
-MAP(0x57, 0x7E, 0x609A)  /* <CJK> */
-MAP(0x58, 0x21, 0x6084)  /* <CJK> */
-MAP(0x58, 0x22, 0x609B)  /* <CJK> */
-MAP(0x58, 0x23, 0x6096)  /* <CJK> */
-MAP(0x58, 0x24, 0x6097)  /* <CJK> */
-MAP(0x58, 0x25, 0x6092)  /* <CJK> */
-MAP(0x58, 0x26, 0x60A7)  /* <CJK> */
-MAP(0x58, 0x27, 0x608B)  /* <CJK> */
-MAP(0x58, 0x28, 0x60E1)  /* <CJK> */
-MAP(0x58, 0x29, 0x60B8)  /* <CJK> */
-MAP(0x58, 0x2A, 0x60E0)  /* <CJK> */
-MAP(0x58, 0x2B, 0x60D3)  /* <CJK> */
-MAP(0x58, 0x2C, 0x60B4)  /* <CJK> */
-MAP(0x58, 0x2D, 0x5FF0)  /* <CJK> */
-MAP(0x58, 0x2E, 0x60BD)  /* <CJK> */
-MAP(0x58, 0x2F, 0x60C6)  /* <CJK> */
-MAP(0x58, 0x30, 0x60B5)  /* <CJK> */
-MAP(0x58, 0x31, 0x60D8)  /* <CJK> */
-MAP(0x58, 0x32, 0x614D)  /* <CJK> */
-MAP(0x58, 0x33, 0x6115)  /* <CJK> */
-MAP(0x58, 0x34, 0x6106)  /* <CJK> */
-MAP(0x58, 0x35, 0x60F6)  /* <CJK> */
-MAP(0x58, 0x36, 0x60F7)  /* <CJK> */
-MAP(0x58, 0x37, 0x6100)  /* <CJK> */
-MAP(0x58, 0x38, 0x60F4)  /* <CJK> */
-MAP(0x58, 0x39, 0x60FA)  /* <CJK> */
-MAP(0x58, 0x3A, 0x6103)  /* <CJK> */
-MAP(0x58, 0x3B, 0x6121)  /* <CJK> */
-MAP(0x58, 0x3C, 0x60FB)  /* <CJK> */
-MAP(0x58, 0x3D, 0x60F1)  /* <CJK> */
-MAP(0x58, 0x3E, 0x610D)  /* <CJK> */
-MAP(0x58, 0x3F, 0x610E)  /* <CJK> */
-MAP(0x58, 0x40, 0x6147)  /* <CJK> */
-MAP(0x58, 0x41, 0x613E)  /* <CJK> */
-MAP(0x58, 0x42, 0x6128)  /* <CJK> */
-MAP(0x58, 0x43, 0x6127)  /* <CJK> */
-MAP(0x58, 0x44, 0x614A)  /* <CJK> */
-MAP(0x58, 0x45, 0x613F)  /* <CJK> */
-MAP(0x58, 0x46, 0x613C)  /* <CJK> */
-MAP(0x58, 0x47, 0x612C)  /* <CJK> */
-MAP(0x58, 0x48, 0x6134)  /* <CJK> */
-MAP(0x58, 0x49, 0x613D)  /* <CJK> */
-MAP(0x58, 0x4A, 0x6142)  /* <CJK> */
-MAP(0x58, 0x4B, 0x6144)  /* <CJK> */
-MAP(0x58, 0x4C, 0x6173)  /* <CJK> */
-MAP(0x58, 0x4D, 0x6177)  /* <CJK> */
-MAP(0x58, 0x4E, 0x6158)  /* <CJK> */
-MAP(0x58, 0x4F, 0x6159)  /* <CJK> */
-MAP(0x58, 0x50, 0x615A)  /* <CJK> */
-MAP(0x58, 0x51, 0x616B)  /* <CJK> */
-MAP(0x58, 0x52, 0x6174)  /* <CJK> */
-MAP(0x58, 0x53, 0x616F)  /* <CJK> */
-MAP(0x58, 0x54, 0x6165)  /* <CJK> */
-MAP(0x58, 0x55, 0x6171)  /* <CJK> */
-MAP(0x58, 0x56, 0x615F)  /* <CJK> */
-MAP(0x58, 0x57, 0x615D)  /* <CJK> */
-MAP(0x58, 0x58, 0x6153)  /* <CJK> */
-MAP(0x58, 0x59, 0x6175)  /* <CJK> */
-MAP(0x58, 0x5A, 0x6199)  /* <CJK> */
-MAP(0x58, 0x5B, 0x6196)  /* <CJK> */
-MAP(0x58, 0x5C, 0x6187)  /* <CJK> */
-MAP(0x58, 0x5D, 0x61AC)  /* <CJK> */
-MAP(0x58, 0x5E, 0x6194)  /* <CJK> */
-MAP(0x58, 0x5F, 0x619A)  /* <CJK> */
-MAP(0x58, 0x60, 0x618A)  /* <CJK> */
-MAP(0x58, 0x61, 0x6191)  /* <CJK> */
-MAP(0x58, 0x62, 0x61AB)  /* <CJK> */
-MAP(0x58, 0x63, 0x61AE)  /* <CJK> */
-MAP(0x58, 0x64, 0x61CC)  /* <CJK> */
-MAP(0x58, 0x65, 0x61CA)  /* <CJK> */
-MAP(0x58, 0x66, 0x61C9)  /* <CJK> */
-MAP(0x58, 0x67, 0x61F7)  /* <CJK> */
-MAP(0x58, 0x68, 0x61C8)  /* <CJK> */
-MAP(0x58, 0x69, 0x61C3)  /* <CJK> */
-MAP(0x58, 0x6A, 0x61C6)  /* <CJK> */
-MAP(0x58, 0x6B, 0x61BA)  /* <CJK> */
-MAP(0x58, 0x6C, 0x61CB)  /* <CJK> */
-MAP(0x58, 0x6D, 0x7F79)  /* <CJK> */
-MAP(0x58, 0x6E, 0x61CD)  /* <CJK> */
-MAP(0x58, 0x6F, 0x61E6)  /* <CJK> */
-MAP(0x58, 0x70, 0x61E3)  /* <CJK> */
-MAP(0x58, 0x71, 0x61F6)  /* <CJK> */
-MAP(0x58, 0x72, 0x61FA)  /* <CJK> */
-MAP(0x58, 0x73, 0x61F4)  /* <CJK> */
-MAP(0x58, 0x74, 0x61FF)  /* <CJK> */
-MAP(0x58, 0x75, 0x61FD)  /* <CJK> */
-MAP(0x58, 0x76, 0x61FC)  /* <CJK> */
-MAP(0x58, 0x77, 0x61FE)  /* <CJK> */
-MAP(0x58, 0x78, 0x6200)  /* <CJK> */
-MAP(0x58, 0x79, 0x6208)  /* <CJK> */
-MAP(0x58, 0x7A, 0x6209)  /* <CJK> */
-MAP(0x58, 0x7B, 0x620D)  /* <CJK> */
-MAP(0x58, 0x7C, 0x620C)  /* <CJK> */
-MAP(0x58, 0x7D, 0x6214)  /* <CJK> */
-MAP(0x58, 0x7E, 0x621B)  /* <CJK> */
-MAP(0x59, 0x21, 0x621E)  /* <CJK> */
-MAP(0x59, 0x22, 0x6221)  /* <CJK> */
-MAP(0x59, 0x23, 0x622A)  /* <CJK> */
-MAP(0x59, 0x24, 0x622E)  /* <CJK> */
-MAP(0x59, 0x25, 0x6230)  /* <CJK> */
-MAP(0x59, 0x26, 0x6232)  /* <CJK> */
-MAP(0x59, 0x27, 0x6233)  /* <CJK> */
-MAP(0x59, 0x28, 0x6241)  /* <CJK> */
-MAP(0x59, 0x29, 0x624E)  /* <CJK> */
-MAP(0x59, 0x2A, 0x625E)  /* <CJK> */
-MAP(0x59, 0x2B, 0x6263)  /* <CJK> */
-MAP(0x59, 0x2C, 0x625B)  /* <CJK> */
-MAP(0x59, 0x2D, 0x6260)  /* <CJK> */
-MAP(0x59, 0x2E, 0x6268)  /* <CJK> */
-MAP(0x59, 0x2F, 0x627C)  /* <CJK> */
-MAP(0x59, 0x30, 0x6282)  /* <CJK> */
-MAP(0x59, 0x31, 0x6289)  /* <CJK> */
-MAP(0x59, 0x32, 0x627E)  /* <CJK> */
-MAP(0x59, 0x33, 0x6292)  /* <CJK> */
-MAP(0x59, 0x34, 0x6293)  /* <CJK> */
-MAP(0x59, 0x35, 0x6296)  /* <CJK> */
-MAP(0x59, 0x36, 0x62D4)  /* <CJK> */
-MAP(0x59, 0x37, 0x6283)  /* <CJK> */
-MAP(0x59, 0x38, 0x6294)  /* <CJK> */
-MAP(0x59, 0x39, 0x62D7)  /* <CJK> */
-MAP(0x59, 0x3A, 0x62D1)  /* <CJK> */
-MAP(0x59, 0x3B, 0x62BB)  /* <CJK> */
-MAP(0x59, 0x3C, 0x62CF)  /* <CJK> */
-MAP(0x59, 0x3D, 0x62FF)  /* <CJK> */
-MAP(0x59, 0x3E, 0x62C6)  /* <CJK> */
-MAP(0x59, 0x3F, 0x64D4)  /* <CJK> */
-MAP(0x59, 0x40, 0x62C8)  /* <CJK> */
-MAP(0x59, 0x41, 0x62DC)  /* <CJK> */
-MAP(0x59, 0x42, 0x62CC)  /* <CJK> */
-MAP(0x59, 0x43, 0x62CA)  /* <CJK> */
-MAP(0x59, 0x44, 0x62C2)  /* <CJK> */
-MAP(0x59, 0x45, 0x62C7)  /* <CJK> */
-MAP(0x59, 0x46, 0x629B)  /* <CJK> */
-MAP(0x59, 0x47, 0x62C9)  /* <CJK> */
-MAP(0x59, 0x48, 0x630C)  /* <CJK> */
-MAP(0x59, 0x49, 0x62EE)  /* <CJK> */
-MAP(0x59, 0x4A, 0x62F1)  /* <CJK> */
-MAP(0x59, 0x4B, 0x6327)  /* <CJK> */
-MAP(0x59, 0x4C, 0x6302)  /* <CJK> */
-MAP(0x59, 0x4D, 0x6308)  /* <CJK> */
-MAP(0x59, 0x4E, 0x62EF)  /* <CJK> */
-MAP(0x59, 0x4F, 0x62F5)  /* <CJK> */
-MAP(0x59, 0x50, 0x6350)  /* <CJK> */
-MAP(0x59, 0x51, 0x633E)  /* <CJK> */
-MAP(0x59, 0x52, 0x634D)  /* <CJK> */
-MAP(0x59, 0x53, 0x641C)  /* <CJK> */
-MAP(0x59, 0x54, 0x634F)  /* <CJK> */
-MAP(0x59, 0x55, 0x6396)  /* <CJK> */
-MAP(0x59, 0x56, 0x638E)  /* <CJK> */
-MAP(0x59, 0x57, 0x6380)  /* <CJK> */
-MAP(0x59, 0x58, 0x63AB)  /* <CJK> */
-MAP(0x59, 0x59, 0x6376)  /* <CJK> */
-MAP(0x59, 0x5A, 0x63A3)  /* <CJK> */
-MAP(0x59, 0x5B, 0x638F)  /* <CJK> */
-MAP(0x59, 0x5C, 0x6389)  /* <CJK> */
-MAP(0x59, 0x5D, 0x639F)  /* <CJK> */
-MAP(0x59, 0x5E, 0x63B5)  /* <CJK> */
-MAP(0x59, 0x5F, 0x636B)  /* <CJK> */
-MAP(0x59, 0x60, 0x6369)  /* <CJK> */
-MAP(0x59, 0x61, 0x63BE)  /* <CJK> */
-MAP(0x59, 0x62, 0x63E9)  /* <CJK> */
-MAP(0x59, 0x63, 0x63C0)  /* <CJK> */
-MAP(0x59, 0x64, 0x63C6)  /* <CJK> */
-MAP(0x59, 0x65, 0x63E3)  /* <CJK> */
-MAP(0x59, 0x66, 0x63C9)  /* <CJK> */
-MAP(0x59, 0x67, 0x63D2)  /* <CJK> */
-MAP(0x59, 0x68, 0x63F6)  /* <CJK> */
-MAP(0x59, 0x69, 0x63C4)  /* <CJK> */
-MAP(0x59, 0x6A, 0x6416)  /* <CJK> */
-MAP(0x59, 0x6B, 0x6434)  /* <CJK> */
-MAP(0x59, 0x6C, 0x6406)  /* <CJK> */
-MAP(0x59, 0x6D, 0x6413)  /* <CJK> */
-MAP(0x59, 0x6E, 0x6426)  /* <CJK> */
-MAP(0x59, 0x6F, 0x6436)  /* <CJK> */
-MAP(0x59, 0x70, 0x651D)  /* <CJK> */
-MAP(0x59, 0x71, 0x6417)  /* <CJK> */
-MAP(0x59, 0x72, 0x6428)  /* <CJK> */
-MAP(0x59, 0x73, 0x640F)  /* <CJK> */
-MAP(0x59, 0x74, 0x6467)  /* <CJK> */
-MAP(0x59, 0x75, 0x646F)  /* <CJK> */
-MAP(0x59, 0x76, 0x6476)  /* <CJK> */
-MAP(0x59, 0x77, 0x644E)  /* <CJK> */
-MAP(0x59, 0x78, 0x652A)  /* <CJK> */
-MAP(0x59, 0x79, 0x6495)  /* <CJK> */
-MAP(0x59, 0x7A, 0x6493)  /* <CJK> */
-MAP(0x59, 0x7B, 0x64A5)  /* <CJK> */
-MAP(0x59, 0x7C, 0x64A9)  /* <CJK> */
-MAP(0x59, 0x7D, 0x6488)  /* <CJK> */
-MAP(0x59, 0x7E, 0x64BC)  /* <CJK> */
-MAP(0x5A, 0x21, 0x64DA)  /* <CJK> */
-MAP(0x5A, 0x22, 0x64D2)  /* <CJK> */
-MAP(0x5A, 0x23, 0x64C5)  /* <CJK> */
-MAP(0x5A, 0x24, 0x64C7)  /* <CJK> */
-MAP(0x5A, 0x25, 0x64BB)  /* <CJK> */
-MAP(0x5A, 0x26, 0x64D8)  /* <CJK> */
-MAP(0x5A, 0x27, 0x64C2)  /* <CJK> */
-MAP(0x5A, 0x28, 0x64F1)  /* <CJK> */
-MAP(0x5A, 0x29, 0x64E7)  /* <CJK> */
-MAP(0x5A, 0x2A, 0x8209)  /* <CJK> */
-MAP(0x5A, 0x2B, 0x64E0)  /* <CJK> */
-MAP(0x5A, 0x2C, 0x64E1)  /* <CJK> */
-MAP(0x5A, 0x2D, 0x62AC)  /* <CJK> */
-MAP(0x5A, 0x2E, 0x64E3)  /* <CJK> */
-MAP(0x5A, 0x2F, 0x64EF)  /* <CJK> */
-MAP(0x5A, 0x30, 0x652C)  /* <CJK> */
-MAP(0x5A, 0x31, 0x64F6)  /* <CJK> */
-MAP(0x5A, 0x32, 0x64F4)  /* <CJK> */
-MAP(0x5A, 0x33, 0x64F2)  /* <CJK> */
-MAP(0x5A, 0x34, 0x64FA)  /* <CJK> */
-MAP(0x5A, 0x35, 0x6500)  /* <CJK> */
-MAP(0x5A, 0x36, 0x64FD)  /* <CJK> */
-MAP(0x5A, 0x37, 0x6518)  /* <CJK> */
-MAP(0x5A, 0x38, 0x651C)  /* <CJK> */
-MAP(0x5A, 0x39, 0x6505)  /* <CJK> */
-MAP(0x5A, 0x3A, 0x6524)  /* <CJK> */
-MAP(0x5A, 0x3B, 0x6523)  /* <CJK> */
-MAP(0x5A, 0x3C, 0x652B)  /* <CJK> */
-MAP(0x5A, 0x3D, 0x6534)  /* <CJK> */
-MAP(0x5A, 0x3E, 0x6535)  /* <CJK> */
-MAP(0x5A, 0x3F, 0x6537)  /* <CJK> */
-MAP(0x5A, 0x40, 0x6536)  /* <CJK> */
-MAP(0x5A, 0x41, 0x6538)  /* <CJK> */
-MAP(0x5A, 0x42, 0x754B)  /* <CJK> */
-MAP(0x5A, 0x43, 0x6548)  /* <CJK> */
-MAP(0x5A, 0x44, 0x6556)  /* <CJK> */
-MAP(0x5A, 0x45, 0x6555)  /* <CJK> */
-MAP(0x5A, 0x46, 0x654D)  /* <CJK> */
-MAP(0x5A, 0x47, 0x6558)  /* <CJK> */
-MAP(0x5A, 0x48, 0x655E)  /* <CJK> */
-MAP(0x5A, 0x49, 0x655D)  /* <CJK> */
-MAP(0x5A, 0x4A, 0x6572)  /* <CJK> */
-MAP(0x5A, 0x4B, 0x6578)  /* <CJK> */
-MAP(0x5A, 0x4C, 0x6582)  /* <CJK> */
-MAP(0x5A, 0x4D, 0x6583)  /* <CJK> */
-MAP(0x5A, 0x4E, 0x8B8A)  /* <CJK> */
-MAP(0x5A, 0x4F, 0x659B)  /* <CJK> */
-MAP(0x5A, 0x50, 0x659F)  /* <CJK> */
-MAP(0x5A, 0x51, 0x65AB)  /* <CJK> */
-MAP(0x5A, 0x52, 0x65B7)  /* <CJK> */
-MAP(0x5A, 0x53, 0x65C3)  /* <CJK> */
-MAP(0x5A, 0x54, 0x65C6)  /* <CJK> */
-MAP(0x5A, 0x55, 0x65C1)  /* <CJK> */
-MAP(0x5A, 0x56, 0x65C4)  /* <CJK> */
-MAP(0x5A, 0x57, 0x65CC)  /* <CJK> */
-MAP(0x5A, 0x58, 0x65D2)  /* <CJK> */
-MAP(0x5A, 0x59, 0x65DB)  /* <CJK> */
-MAP(0x5A, 0x5A, 0x65D9)  /* <CJK> */
-MAP(0x5A, 0x5B, 0x65E0)  /* <CJK> */
-MAP(0x5A, 0x5C, 0x65E1)  /* <CJK> */
-MAP(0x5A, 0x5D, 0x65F1)  /* <CJK> */
-MAP(0x5A, 0x5E, 0x6772)  /* <CJK> */
-MAP(0x5A, 0x5F, 0x660A)  /* <CJK> */
-MAP(0x5A, 0x60, 0x6603)  /* <CJK> */
-MAP(0x5A, 0x61, 0x65FB)  /* <CJK> */
-MAP(0x5A, 0x62, 0x6773)  /* <CJK> */
-MAP(0x5A, 0x63, 0x6635)  /* <CJK> */
-MAP(0x5A, 0x64, 0x6636)  /* <CJK> */
-MAP(0x5A, 0x65, 0x6634)  /* <CJK> */
-MAP(0x5A, 0x66, 0x661C)  /* <CJK> */
-MAP(0x5A, 0x67, 0x664F)  /* <CJK> */
-MAP(0x5A, 0x68, 0x6644)  /* <CJK> */
-MAP(0x5A, 0x69, 0x6649)  /* <CJK> */
-MAP(0x5A, 0x6A, 0x6641)  /* <CJK> */
-MAP(0x5A, 0x6B, 0x665E)  /* <CJK> */
-MAP(0x5A, 0x6C, 0x665D)  /* <CJK> */
-MAP(0x5A, 0x6D, 0x6664)  /* <CJK> */
-MAP(0x5A, 0x6E, 0x6667)  /* <CJK> */
-MAP(0x5A, 0x6F, 0x6668)  /* <CJK> */
-MAP(0x5A, 0x70, 0x665F)  /* <CJK> */
-MAP(0x5A, 0x71, 0x6662)  /* <CJK> */
-MAP(0x5A, 0x72, 0x6670)  /* <CJK> */
-MAP(0x5A, 0x73, 0x6683)  /* <CJK> */
-MAP(0x5A, 0x74, 0x6688)  /* <CJK> */
-MAP(0x5A, 0x75, 0x668E)  /* <CJK> */
-MAP(0x5A, 0x76, 0x6689)  /* <CJK> */
-MAP(0x5A, 0x77, 0x6684)  /* <CJK> */
-MAP(0x5A, 0x78, 0x6698)  /* <CJK> */
-MAP(0x5A, 0x79, 0x669D)  /* <CJK> */
-MAP(0x5A, 0x7A, 0x66C1)  /* <CJK> */
-MAP(0x5A, 0x7B, 0x66B9)  /* <CJK> */
-MAP(0x5A, 0x7C, 0x66C9)  /* <CJK> */
-MAP(0x5A, 0x7D, 0x66BE)  /* <CJK> */
-MAP(0x5A, 0x7E, 0x66BC)  /* <CJK> */
-MAP(0x5B, 0x21, 0x66C4)  /* <CJK> */
-MAP(0x5B, 0x22, 0x66B8)  /* <CJK> */
-MAP(0x5B, 0x23, 0x66D6)  /* <CJK> */
-MAP(0x5B, 0x24, 0x66DA)  /* <CJK> */
-MAP(0x5B, 0x25, 0x66E0)  /* <CJK> */
-MAP(0x5B, 0x26, 0x663F)  /* <CJK> */
-MAP(0x5B, 0x27, 0x66E6)  /* <CJK> */
-MAP(0x5B, 0x28, 0x66E9)  /* <CJK> */
-MAP(0x5B, 0x29, 0x66F0)  /* <CJK> */
-MAP(0x5B, 0x2A, 0x66F5)  /* <CJK> */
-MAP(0x5B, 0x2B, 0x66F7)  /* <CJK> */
-MAP(0x5B, 0x2C, 0x670F)  /* <CJK> */
-MAP(0x5B, 0x2D, 0x6716)  /* <CJK> */
-MAP(0x5B, 0x2E, 0x671E)  /* <CJK> */
-MAP(0x5B, 0x2F, 0x6726)  /* <CJK> */
-MAP(0x5B, 0x30, 0x6727)  /* <CJK> */
-MAP(0x5B, 0x31, 0x9738)  /* <CJK> */
-MAP(0x5B, 0x32, 0x672E)  /* <CJK> */
-MAP(0x5B, 0x33, 0x673F)  /* <CJK> */
-MAP(0x5B, 0x34, 0x6736)  /* <CJK> */
-MAP(0x5B, 0x35, 0x6741)  /* <CJK> */
-MAP(0x5B, 0x36, 0x6738)  /* <CJK> */
-MAP(0x5B, 0x37, 0x6737)  /* <CJK> */
-MAP(0x5B, 0x38, 0x6746)  /* <CJK> */
-MAP(0x5B, 0x39, 0x675E)  /* <CJK> */
-MAP(0x5B, 0x3A, 0x6760)  /* <CJK> */
-MAP(0x5B, 0x3B, 0x6759)  /* <CJK> */
-MAP(0x5B, 0x3C, 0x6763)  /* <CJK> */
-MAP(0x5B, 0x3D, 0x6764)  /* <CJK> */
-MAP(0x5B, 0x3E, 0x6789)  /* <CJK> */
-MAP(0x5B, 0x3F, 0x6770)  /* <CJK> */
-MAP(0x5B, 0x40, 0x67A9)  /* <CJK> */
-MAP(0x5B, 0x41, 0x677C)  /* <CJK> */
-MAP(0x5B, 0x42, 0x676A)  /* <CJK> */
-MAP(0x5B, 0x43, 0x678C)  /* <CJK> */
-MAP(0x5B, 0x44, 0x678B)  /* <CJK> */
-MAP(0x5B, 0x45, 0x67A6)  /* <CJK> */
-MAP(0x5B, 0x46, 0x67A1)  /* <CJK> */
-MAP(0x5B, 0x47, 0x6785)  /* <CJK> */
-MAP(0x5B, 0x48, 0x67B7)  /* <CJK> */
-MAP(0x5B, 0x49, 0x67EF)  /* <CJK> */
-MAP(0x5B, 0x4A, 0x67B4)  /* <CJK> */
-MAP(0x5B, 0x4B, 0x67EC)  /* <CJK> */
-MAP(0x5B, 0x4C, 0x67B3)  /* <CJK> */
-MAP(0x5B, 0x4D, 0x67E9)  /* <CJK> */
-MAP(0x5B, 0x4E, 0x67B8)  /* <CJK> */
-MAP(0x5B, 0x4F, 0x67E4)  /* <CJK> */
-MAP(0x5B, 0x50, 0x67DE)  /* <CJK> */
-MAP(0x5B, 0x51, 0x67DD)  /* <CJK> */
-MAP(0x5B, 0x52, 0x67E2)  /* <CJK> */
-MAP(0x5B, 0x53, 0x67EE)  /* <CJK> */
-MAP(0x5B, 0x54, 0x67B9)  /* <CJK> */
-MAP(0x5B, 0x55, 0x67CE)  /* <CJK> */
-MAP(0x5B, 0x56, 0x67C6)  /* <CJK> */
-MAP(0x5B, 0x57, 0x67E7)  /* <CJK> */
-MAP(0x5B, 0x58, 0x6A9C)  /* <CJK> */
-MAP(0x5B, 0x59, 0x681E)  /* <CJK> */
-MAP(0x5B, 0x5A, 0x6846)  /* <CJK> */
-MAP(0x5B, 0x5B, 0x6829)  /* <CJK> */
-MAP(0x5B, 0x5C, 0x6840)  /* <CJK> */
-MAP(0x5B, 0x5D, 0x684D)  /* <CJK> */
-MAP(0x5B, 0x5E, 0x6832)  /* <CJK> */
-MAP(0x5B, 0x5F, 0x684E)  /* <CJK> */
-MAP(0x5B, 0x60, 0x68B3)  /* <CJK> */
-MAP(0x5B, 0x61, 0x682B)  /* <CJK> */
-MAP(0x5B, 0x62, 0x6859)  /* <CJK> */
-MAP(0x5B, 0x63, 0x6863)  /* <CJK> */
-MAP(0x5B, 0x64, 0x6877)  /* <CJK> */
-MAP(0x5B, 0x65, 0x687F)  /* <CJK> */
-MAP(0x5B, 0x66, 0x689F)  /* <CJK> */
-MAP(0x5B, 0x67, 0x688F)  /* <CJK> */
-MAP(0x5B, 0x68, 0x68AD)  /* <CJK> */
-MAP(0x5B, 0x69, 0x6894)  /* <CJK> */
-MAP(0x5B, 0x6A, 0x689D)  /* <CJK> */
-MAP(0x5B, 0x6B, 0x689B)  /* <CJK> */
-MAP(0x5B, 0x6C, 0x6883)  /* <CJK> */
-MAP(0x5B, 0x6D, 0x6AAE)  /* <CJK> */
-MAP(0x5B, 0x6E, 0x68B9)  /* <CJK> */
-MAP(0x5B, 0x6F, 0x6874)  /* <CJK> */
-MAP(0x5B, 0x70, 0x68B5)  /* <CJK> */
-MAP(0x5B, 0x71, 0x68A0)  /* <CJK> */
-MAP(0x5B, 0x72, 0x68BA)  /* <CJK> */
-MAP(0x5B, 0x73, 0x690F)  /* <CJK> */
-MAP(0x5B, 0x74, 0x688D)  /* <CJK> */
-MAP(0x5B, 0x75, 0x687E)  /* <CJK> */
-MAP(0x5B, 0x76, 0x6901)  /* <CJK> */
-MAP(0x5B, 0x77, 0x68CA)  /* <CJK> */
-MAP(0x5B, 0x78, 0x6908)  /* <CJK> */
-MAP(0x5B, 0x79, 0x68D8)  /* <CJK> */
-MAP(0x5B, 0x7A, 0x6922)  /* <CJK> */
-MAP(0x5B, 0x7B, 0x6926)  /* <CJK> */
-MAP(0x5B, 0x7C, 0x68E1)  /* <CJK> */
-MAP(0x5B, 0x7D, 0x690C)  /* <CJK> */
-MAP(0x5B, 0x7E, 0x68CD)  /* <CJK> */
-MAP(0x5C, 0x21, 0x68D4)  /* <CJK> */
-MAP(0x5C, 0x22, 0x68E7)  /* <CJK> */
-MAP(0x5C, 0x23, 0x68D5)  /* <CJK> */
-MAP(0x5C, 0x24, 0x6936)  /* <CJK> */
-MAP(0x5C, 0x25, 0x6912)  /* <CJK> */
-MAP(0x5C, 0x26, 0x6904)  /* <CJK> */
-MAP(0x5C, 0x27, 0x68D7)  /* <CJK> */
-MAP(0x5C, 0x28, 0x68E3)  /* <CJK> */
-MAP(0x5C, 0x29, 0x6925)  /* <CJK> */
-MAP(0x5C, 0x2A, 0x68F9)  /* <CJK> */
-MAP(0x5C, 0x2B, 0x68E0)  /* <CJK> */
-MAP(0x5C, 0x2C, 0x68EF)  /* <CJK> */
-MAP(0x5C, 0x2D, 0x6928)  /* <CJK> */
-MAP(0x5C, 0x2E, 0x692A)  /* <CJK> */
-MAP(0x5C, 0x2F, 0x691A)  /* <CJK> */
-MAP(0x5C, 0x30, 0x6923)  /* <CJK> */
-MAP(0x5C, 0x31, 0x6921)  /* <CJK> */
-MAP(0x5C, 0x32, 0x68C6)  /* <CJK> */
-MAP(0x5C, 0x33, 0x6979)  /* <CJK> */
-MAP(0x5C, 0x34, 0x6977)  /* <CJK> */
-MAP(0x5C, 0x35, 0x695C)  /* <CJK> */
-MAP(0x5C, 0x36, 0x6978)  /* <CJK> */
-MAP(0x5C, 0x37, 0x696B)  /* <CJK> */
-MAP(0x5C, 0x38, 0x6954)  /* <CJK> */
-MAP(0x5C, 0x39, 0x697E)  /* <CJK> */
-MAP(0x5C, 0x3A, 0x696E)  /* <CJK> */
-MAP(0x5C, 0x3B, 0x6939)  /* <CJK> */
-MAP(0x5C, 0x3C, 0x6974)  /* <CJK> */
-MAP(0x5C, 0x3D, 0x693D)  /* <CJK> */
-MAP(0x5C, 0x3E, 0x6959)  /* <CJK> */
-MAP(0x5C, 0x3F, 0x6930)  /* <CJK> */
-MAP(0x5C, 0x40, 0x6961)  /* <CJK> */
-MAP(0x5C, 0x41, 0x695E)  /* <CJK> */
-MAP(0x5C, 0x42, 0x695D)  /* <CJK> */
-MAP(0x5C, 0x43, 0x6981)  /* <CJK> */
-MAP(0x5C, 0x44, 0x696A)  /* <CJK> */
-MAP(0x5C, 0x45, 0x69B2)  /* <CJK> */
-MAP(0x5C, 0x46, 0x69AE)  /* <CJK> */
-MAP(0x5C, 0x47, 0x69D0)  /* <CJK> */
-MAP(0x5C, 0x48, 0x69BF)  /* <CJK> */
-MAP(0x5C, 0x49, 0x69C1)  /* <CJK> */
-MAP(0x5C, 0x4A, 0x69D3)  /* <CJK> */
-MAP(0x5C, 0x4B, 0x69BE)  /* <CJK> */
-MAP(0x5C, 0x4C, 0x69CE)  /* <CJK> */
-MAP(0x5C, 0x4D, 0x5BE8)  /* <CJK> */
-MAP(0x5C, 0x4E, 0x69CA)  /* <CJK> */
-MAP(0x5C, 0x4F, 0x69DD)  /* <CJK> */
-MAP(0x5C, 0x50, 0x69BB)  /* <CJK> */
-MAP(0x5C, 0x51, 0x69C3)  /* <CJK> */
-MAP(0x5C, 0x52, 0x69A7)  /* <CJK> */
-MAP(0x5C, 0x53, 0x6A2E)  /* <CJK> */
-MAP(0x5C, 0x54, 0x6991)  /* <CJK> */
-MAP(0x5C, 0x55, 0x69A0)  /* <CJK> */
-MAP(0x5C, 0x56, 0x699C)  /* <CJK> */
-MAP(0x5C, 0x57, 0x6995)  /* <CJK> */
-MAP(0x5C, 0x58, 0x69B4)  /* <CJK> */
-MAP(0x5C, 0x59, 0x69DE)  /* <CJK> */
-MAP(0x5C, 0x5A, 0x69E8)  /* <CJK> */
-MAP(0x5C, 0x5B, 0x6A02)  /* <CJK> */
-MAP(0x5C, 0x5C, 0x6A1B)  /* <CJK> */
-MAP(0x5C, 0x5D, 0x69FF)  /* <CJK> */
-MAP(0x5C, 0x5E, 0x6B0A)  /* <CJK> */
-MAP(0x5C, 0x5F, 0x69F9)  /* <CJK> */
-MAP(0x5C, 0x60, 0x69F2)  /* <CJK> */
-MAP(0x5C, 0x61, 0x69E7)  /* <CJK> */
-MAP(0x5C, 0x62, 0x6A05)  /* <CJK> */
-MAP(0x5C, 0x63, 0x69B1)  /* <CJK> */
-MAP(0x5C, 0x64, 0x6A1E)  /* <CJK> */
-MAP(0x5C, 0x65, 0x69ED)  /* <CJK> */
-MAP(0x5C, 0x66, 0x6A14)  /* <CJK> */
-MAP(0x5C, 0x67, 0x69EB)  /* <CJK> */
-MAP(0x5C, 0x68, 0x6A0A)  /* <CJK> */
-MAP(0x5C, 0x69, 0x6A12)  /* <CJK> */
-MAP(0x5C, 0x6A, 0x6AC1)  /* <CJK> */
-MAP(0x5C, 0x6B, 0x6A23)  /* <CJK> */
-MAP(0x5C, 0x6C, 0x6A13)  /* <CJK> */
-MAP(0x5C, 0x6D, 0x6A44)  /* <CJK> */
-MAP(0x5C, 0x6E, 0x6A0C)  /* <CJK> */
-MAP(0x5C, 0x6F, 0x6A72)  /* <CJK> */
-MAP(0x5C, 0x70, 0x6A36)  /* <CJK> */
-MAP(0x5C, 0x71, 0x6A78)  /* <CJK> */
-MAP(0x5C, 0x72, 0x6A47)  /* <CJK> */
-MAP(0x5C, 0x73, 0x6A62)  /* <CJK> */
-MAP(0x5C, 0x74, 0x6A59)  /* <CJK> */
-MAP(0x5C, 0x75, 0x6A66)  /* <CJK> */
-MAP(0x5C, 0x76, 0x6A48)  /* <CJK> */
-MAP(0x5C, 0x77, 0x6A38)  /* <CJK> */
-MAP(0x5C, 0x78, 0x6A22)  /* <CJK> */
-MAP(0x5C, 0x79, 0x6A90)  /* <CJK> */
-MAP(0x5C, 0x7A, 0x6A8D)  /* <CJK> */
-MAP(0x5C, 0x7B, 0x6AA0)  /* <CJK> */
-MAP(0x5C, 0x7C, 0x6A84)  /* <CJK> */
-MAP(0x5C, 0x7D, 0x6AA2)  /* <CJK> */
-MAP(0x5C, 0x7E, 0x6AA3)  /* <CJK> */
-MAP(0x5D, 0x21, 0x6A97)  /* <CJK> */
-MAP(0x5D, 0x22, 0x8617)  /* <CJK> */
-MAP(0x5D, 0x23, 0x6ABB)  /* <CJK> */
-MAP(0x5D, 0x24, 0x6AC3)  /* <CJK> */
-MAP(0x5D, 0x25, 0x6AC2)  /* <CJK> */
-MAP(0x5D, 0x26, 0x6AB8)  /* <CJK> */
-MAP(0x5D, 0x27, 0x6AB3)  /* <CJK> */
-MAP(0x5D, 0x28, 0x6AAC)  /* <CJK> */
-MAP(0x5D, 0x29, 0x6ADE)  /* <CJK> */
-MAP(0x5D, 0x2A, 0x6AD1)  /* <CJK> */
-MAP(0x5D, 0x2B, 0x6ADF)  /* <CJK> */
-MAP(0x5D, 0x2C, 0x6AAA)  /* <CJK> */
-MAP(0x5D, 0x2D, 0x6ADA)  /* <CJK> */
-MAP(0x5D, 0x2E, 0x6AEA)  /* <CJK> */
-MAP(0x5D, 0x2F, 0x6AFB)  /* <CJK> */
-MAP(0x5D, 0x30, 0x6B05)  /* <CJK> */
-MAP(0x5D, 0x31, 0x8616)  /* <CJK> */
-MAP(0x5D, 0x32, 0x6AFA)  /* <CJK> */
-MAP(0x5D, 0x33, 0x6B12)  /* <CJK> */
-MAP(0x5D, 0x34, 0x6B16)  /* <CJK> */
-MAP(0x5D, 0x35, 0x9B31)  /* <CJK> */
-MAP(0x5D, 0x36, 0x6B1F)  /* <CJK> */
-MAP(0x5D, 0x37, 0x6B38)  /* <CJK> */
-MAP(0x5D, 0x38, 0x6B37)  /* <CJK> */
-MAP(0x5D, 0x39, 0x76DC)  /* <CJK> */
-MAP(0x5D, 0x3A, 0x6B39)  /* <CJK> */
-MAP(0x5D, 0x3B, 0x98EE)  /* <CJK> */
-MAP(0x5D, 0x3C, 0x6B47)  /* <CJK> */
-MAP(0x5D, 0x3D, 0x6B43)  /* <CJK> */
-MAP(0x5D, 0x3E, 0x6B49)  /* <CJK> */
-MAP(0x5D, 0x3F, 0x6B50)  /* <CJK> */
-MAP(0x5D, 0x40, 0x6B59)  /* <CJK> */
-MAP(0x5D, 0x41, 0x6B54)  /* <CJK> */
-MAP(0x5D, 0x42, 0x6B5B)  /* <CJK> */
-MAP(0x5D, 0x43, 0x6B5F)  /* <CJK> */
-MAP(0x5D, 0x44, 0x6B61)  /* <CJK> */
-MAP(0x5D, 0x45, 0x6B78)  /* <CJK> */
-MAP(0x5D, 0x46, 0x6B79)  /* <CJK> */
-MAP(0x5D, 0x47, 0x6B7F)  /* <CJK> */
-MAP(0x5D, 0x48, 0x6B80)  /* <CJK> */
-MAP(0x5D, 0x49, 0x6B84)  /* <CJK> */
-MAP(0x5D, 0x4A, 0x6B83)  /* <CJK> */
-MAP(0x5D, 0x4B, 0x6B8D)  /* <CJK> */
-MAP(0x5D, 0x4C, 0x6B98)  /* <CJK> */
-MAP(0x5D, 0x4D, 0x6B95)  /* <CJK> */
-MAP(0x5D, 0x4E, 0x6B9E)  /* <CJK> */
-MAP(0x5D, 0x4F, 0x6BA4)  /* <CJK> */
-MAP(0x5D, 0x50, 0x6BAA)  /* <CJK> */
-MAP(0x5D, 0x51, 0x6BAB)  /* <CJK> */
-MAP(0x5D, 0x52, 0x6BAF)  /* <CJK> */
-MAP(0x5D, 0x53, 0x6BB2)  /* <CJK> */
-MAP(0x5D, 0x54, 0x6BB1)  /* <CJK> */
-MAP(0x5D, 0x55, 0x6BB3)  /* <CJK> */
-MAP(0x5D, 0x56, 0x6BB7)  /* <CJK> */
-MAP(0x5D, 0x57, 0x6BBC)  /* <CJK> */
-MAP(0x5D, 0x58, 0x6BC6)  /* <CJK> */
-MAP(0x5D, 0x59, 0x6BCB)  /* <CJK> */
-MAP(0x5D, 0x5A, 0x6BD3)  /* <CJK> */
-MAP(0x5D, 0x5B, 0x6BDF)  /* <CJK> */
-MAP(0x5D, 0x5C, 0x6BEC)  /* <CJK> */
-MAP(0x5D, 0x5D, 0x6BEB)  /* <CJK> */
-MAP(0x5D, 0x5E, 0x6BF3)  /* <CJK> */
-MAP(0x5D, 0x5F, 0x6BEF)  /* <CJK> */
-MAP(0x5D, 0x60, 0x9EBE)  /* <CJK> */
-MAP(0x5D, 0x61, 0x6C08)  /* <CJK> */
-MAP(0x5D, 0x62, 0x6C13)  /* <CJK> */
-MAP(0x5D, 0x63, 0x6C14)  /* <CJK> */
-MAP(0x5D, 0x64, 0x6C1B)  /* <CJK> */
-MAP(0x5D, 0x65, 0x6C24)  /* <CJK> */
-MAP(0x5D, 0x66, 0x6C23)  /* <CJK> */
-MAP(0x5D, 0x67, 0x6C5E)  /* <CJK> */
-MAP(0x5D, 0x68, 0x6C55)  /* <CJK> */
-MAP(0x5D, 0x69, 0x6C62)  /* <CJK> */
-MAP(0x5D, 0x6A, 0x6C6A)  /* <CJK> */
-MAP(0x5D, 0x6B, 0x6C82)  /* <CJK> */
-MAP(0x5D, 0x6C, 0x6C8D)  /* <CJK> */
-MAP(0x5D, 0x6D, 0x6C9A)  /* <CJK> */
-MAP(0x5D, 0x6E, 0x6C81)  /* <CJK> */
-MAP(0x5D, 0x6F, 0x6C9B)  /* <CJK> */
-MAP(0x5D, 0x70, 0x6C7E)  /* <CJK> */
-MAP(0x5D, 0x71, 0x6C68)  /* <CJK> */
-MAP(0x5D, 0x72, 0x6C73)  /* <CJK> */
-MAP(0x5D, 0x73, 0x6C92)  /* <CJK> */
-MAP(0x5D, 0x74, 0x6C90)  /* <CJK> */
-MAP(0x5D, 0x75, 0x6CC4)  /* <CJK> */
-MAP(0x5D, 0x76, 0x6CF1)  /* <CJK> */
-MAP(0x5D, 0x77, 0x6CD3)  /* <CJK> */
-MAP(0x5D, 0x78, 0x6CBD)  /* <CJK> */
-MAP(0x5D, 0x79, 0x6CD7)  /* <CJK> */
-MAP(0x5D, 0x7A, 0x6CC5)  /* <CJK> */
-MAP(0x5D, 0x7B, 0x6CDD)  /* <CJK> */
-MAP(0x5D, 0x7C, 0x6CAE)  /* <CJK> */
-MAP(0x5D, 0x7D, 0x6CB1)  /* <CJK> */
-MAP(0x5D, 0x7E, 0x6CBE)  /* <CJK> */
-MAP(0x5E, 0x21, 0x6CBA)  /* <CJK> */
-MAP(0x5E, 0x22, 0x6CDB)  /* <CJK> */
-MAP(0x5E, 0x23, 0x6CEF)  /* <CJK> */
-MAP(0x5E, 0x24, 0x6CD9)  /* <CJK> */
-MAP(0x5E, 0x25, 0x6CEA)  /* <CJK> */
-MAP(0x5E, 0x26, 0x6D1F)  /* <CJK> */
-MAP(0x5E, 0x27, 0x884D)  /* <CJK> */
-MAP(0x5E, 0x28, 0x6D36)  /* <CJK> */
-MAP(0x5E, 0x29, 0x6D2B)  /* <CJK> */
-MAP(0x5E, 0x2A, 0x6D3D)  /* <CJK> */
-MAP(0x5E, 0x2B, 0x6D38)  /* <CJK> */
-MAP(0x5E, 0x2C, 0x6D19)  /* <CJK> */
-MAP(0x5E, 0x2D, 0x6D35)  /* <CJK> */
-MAP(0x5E, 0x2E, 0x6D33)  /* <CJK> */
-MAP(0x5E, 0x2F, 0x6D12)  /* <CJK> */
-MAP(0x5E, 0x30, 0x6D0C)  /* <CJK> */
-MAP(0x5E, 0x31, 0x6D63)  /* <CJK> */
-MAP(0x5E, 0x32, 0x6D93)  /* <CJK> */
-MAP(0x5E, 0x33, 0x6D64)  /* <CJK> */
-MAP(0x5E, 0x34, 0x6D5A)  /* <CJK> */
-MAP(0x5E, 0x35, 0x6D79)  /* <CJK> */
-MAP(0x5E, 0x36, 0x6D59)  /* <CJK> */
-MAP(0x5E, 0x37, 0x6D8E)  /* <CJK> */
-MAP(0x5E, 0x38, 0x6D95)  /* <CJK> */
-MAP(0x5E, 0x39, 0x6FE4)  /* <CJK> */
-MAP(0x5E, 0x3A, 0x6D85)  /* <CJK> */
-MAP(0x5E, 0x3B, 0x6DF9)  /* <CJK> */
-MAP(0x5E, 0x3C, 0x6E15)  /* <CJK> */
-MAP(0x5E, 0x3D, 0x6E0A)  /* <CJK> */
-MAP(0x5E, 0x3E, 0x6DB5)  /* <CJK> */
-MAP(0x5E, 0x3F, 0x6DC7)  /* <CJK> */
-MAP(0x5E, 0x40, 0x6DE6)  /* <CJK> */
-MAP(0x5E, 0x41, 0x6DB8)  /* <CJK> */
-MAP(0x5E, 0x42, 0x6DC6)  /* <CJK> */
-MAP(0x5E, 0x43, 0x6DEC)  /* <CJK> */
-MAP(0x5E, 0x44, 0x6DDE)  /* <CJK> */
-MAP(0x5E, 0x45, 0x6DCC)  /* <CJK> */
-MAP(0x5E, 0x46, 0x6DE8)  /* <CJK> */
-MAP(0x5E, 0x47, 0x6DD2)  /* <CJK> */
-MAP(0x5E, 0x48, 0x6DC5)  /* <CJK> */
-MAP(0x5E, 0x49, 0x6DFA)  /* <CJK> */
-MAP(0x5E, 0x4A, 0x6DD9)  /* <CJK> */
-MAP(0x5E, 0x4B, 0x6DE4)  /* <CJK> */
-MAP(0x5E, 0x4C, 0x6DD5)  /* <CJK> */
-MAP(0x5E, 0x4D, 0x6DEA)  /* <CJK> */
-MAP(0x5E, 0x4E, 0x6DEE)  /* <CJK> */
-MAP(0x5E, 0x4F, 0x6E2D)  /* <CJK> */
-MAP(0x5E, 0x50, 0x6E6E)  /* <CJK> */
-MAP(0x5E, 0x51, 0x6E2E)  /* <CJK> */
-MAP(0x5E, 0x52, 0x6E19)  /* <CJK> */
-MAP(0x5E, 0x53, 0x6E72)  /* <CJK> */
-MAP(0x5E, 0x54, 0x6E5F)  /* <CJK> */
-MAP(0x5E, 0x55, 0x6E3E)  /* <CJK> */
-MAP(0x5E, 0x56, 0x6E23)  /* <CJK> */
-MAP(0x5E, 0x57, 0x6E6B)  /* <CJK> */
-MAP(0x5E, 0x58, 0x6E2B)  /* <CJK> */
-MAP(0x5E, 0x59, 0x6E76)  /* <CJK> */
-MAP(0x5E, 0x5A, 0x6E4D)  /* <CJK> */
-MAP(0x5E, 0x5B, 0x6E1F)  /* <CJK> */
-MAP(0x5E, 0x5C, 0x6E43)  /* <CJK> */
-MAP(0x5E, 0x5D, 0x6E3A)  /* <CJK> */
-MAP(0x5E, 0x5E, 0x6E4E)  /* <CJK> */
-MAP(0x5E, 0x5F, 0x6E24)  /* <CJK> */
-MAP(0x5E, 0x60, 0x6EFF)  /* <CJK> */
-MAP(0x5E, 0x61, 0x6E1D)  /* <CJK> */
-MAP(0x5E, 0x62, 0x6E38)  /* <CJK> */
-MAP(0x5E, 0x63, 0x6E82)  /* <CJK> */
-MAP(0x5E, 0x64, 0x6EAA)  /* <CJK> */
-MAP(0x5E, 0x65, 0x6E98)  /* <CJK> */
-MAP(0x5E, 0x66, 0x6EC9)  /* <CJK> */
-MAP(0x5E, 0x67, 0x6EB7)  /* <CJK> */
-MAP(0x5E, 0x68, 0x6ED3)  /* <CJK> */
-MAP(0x5E, 0x69, 0x6EBD)  /* <CJK> */
-MAP(0x5E, 0x6A, 0x6EAF)  /* <CJK> */
-MAP(0x5E, 0x6B, 0x6EC4)  /* <CJK> */
-MAP(0x5E, 0x6C, 0x6EB2)  /* <CJK> */
-MAP(0x5E, 0x6D, 0x6ED4)  /* <CJK> */
-MAP(0x5E, 0x6E, 0x6ED5)  /* <CJK> */
-MAP(0x5E, 0x6F, 0x6E8F)  /* <CJK> */
-MAP(0x5E, 0x70, 0x6EA5)  /* <CJK> */
-MAP(0x5E, 0x71, 0x6EC2)  /* <CJK> */
-MAP(0x5E, 0x72, 0x6E9F)  /* <CJK> */
-MAP(0x5E, 0x73, 0x6F41)  /* <CJK> */
-MAP(0x5E, 0x74, 0x6F11)  /* <CJK> */
-MAP(0x5E, 0x75, 0x704C)  /* <CJK> */
-MAP(0x5E, 0x76, 0x6EEC)  /* <CJK> */
-MAP(0x5E, 0x77, 0x6EF8)  /* <CJK> */
-MAP(0x5E, 0x78, 0x6EFE)  /* <CJK> */
-MAP(0x5E, 0x79, 0x6F3F)  /* <CJK> */
-MAP(0x5E, 0x7A, 0x6EF2)  /* <CJK> */
-MAP(0x5E, 0x7B, 0x6F31)  /* <CJK> */
-MAP(0x5E, 0x7C, 0x6EEF)  /* <CJK> */
-MAP(0x5E, 0x7D, 0x6F32)  /* <CJK> */
-MAP(0x5E, 0x7E, 0x6ECC)  /* <CJK> */
-MAP(0x5F, 0x21, 0x6F3E)  /* <CJK> */
-MAP(0x5F, 0x22, 0x6F13)  /* <CJK> */
-MAP(0x5F, 0x23, 0x6EF7)  /* <CJK> */
-MAP(0x5F, 0x24, 0x6F86)  /* <CJK> */
-MAP(0x5F, 0x25, 0x6F7A)  /* <CJK> */
-MAP(0x5F, 0x26, 0x6F78)  /* <CJK> */
-MAP(0x5F, 0x27, 0x6F81)  /* <CJK> */
-MAP(0x5F, 0x28, 0x6F80)  /* <CJK> */
-MAP(0x5F, 0x29, 0x6F6F)  /* <CJK> */
-MAP(0x5F, 0x2A, 0x6F5B)  /* <CJK> */
-MAP(0x5F, 0x2B, 0x6FF3)  /* <CJK> */
-MAP(0x5F, 0x2C, 0x6F6D)  /* <CJK> */
-MAP(0x5F, 0x2D, 0x6F82)  /* <CJK> */
-MAP(0x5F, 0x2E, 0x6F7C)  /* <CJK> */
-MAP(0x5F, 0x2F, 0x6F58)  /* <CJK> */
-MAP(0x5F, 0x30, 0x6F8E)  /* <CJK> */
-MAP(0x5F, 0x31, 0x6F91)  /* <CJK> */
-MAP(0x5F, 0x32, 0x6FC2)  /* <CJK> */
-MAP(0x5F, 0x33, 0x6F66)  /* <CJK> */
-MAP(0x5F, 0x34, 0x6FB3)  /* <CJK> */
-MAP(0x5F, 0x35, 0x6FA3)  /* <CJK> */
-MAP(0x5F, 0x36, 0x6FA1)  /* <CJK> */
-MAP(0x5F, 0x37, 0x6FA4)  /* <CJK> */
-MAP(0x5F, 0x38, 0x6FB9)  /* <CJK> */
-MAP(0x5F, 0x39, 0x6FC6)  /* <CJK> */
-MAP(0x5F, 0x3A, 0x6FAA)  /* <CJK> */
-MAP(0x5F, 0x3B, 0x6FDF)  /* <CJK> */
-MAP(0x5F, 0x3C, 0x6FD5)  /* <CJK> */
-MAP(0x5F, 0x3D, 0x6FEC)  /* <CJK> */
-MAP(0x5F, 0x3E, 0x6FD4)  /* <CJK> */
-MAP(0x5F, 0x3F, 0x6FD8)  /* <CJK> */
-MAP(0x5F, 0x40, 0x6FF1)  /* <CJK> */
-MAP(0x5F, 0x41, 0x6FEE)  /* <CJK> */
-MAP(0x5F, 0x42, 0x6FDB)  /* <CJK> */
-MAP(0x5F, 0x43, 0x7009)  /* <CJK> */
-MAP(0x5F, 0x44, 0x700B)  /* <CJK> */
-MAP(0x5F, 0x45, 0x6FFA)  /* <CJK> */
-MAP(0x5F, 0x46, 0x7011)  /* <CJK> */
-MAP(0x5F, 0x47, 0x7001)  /* <CJK> */
-MAP(0x5F, 0x48, 0x700F)  /* <CJK> */
-MAP(0x5F, 0x49, 0x6FFE)  /* <CJK> */
-MAP(0x5F, 0x4A, 0x701B)  /* <CJK> */
-MAP(0x5F, 0x4B, 0x701A)  /* <CJK> */
-MAP(0x5F, 0x4C, 0x6F74)  /* <CJK> */
-MAP(0x5F, 0x4D, 0x701D)  /* <CJK> */
-MAP(0x5F, 0x4E, 0x7018)  /* <CJK> */
-MAP(0x5F, 0x4F, 0x701F)  /* <CJK> */
-MAP(0x5F, 0x50, 0x7030)  /* <CJK> */
-MAP(0x5F, 0x51, 0x703E)  /* <CJK> */
-MAP(0x5F, 0x52, 0x7032)  /* <CJK> */
-MAP(0x5F, 0x53, 0x7051)  /* <CJK> */
-MAP(0x5F, 0x54, 0x7063)  /* <CJK> */
-MAP(0x5F, 0x55, 0x7099)  /* <CJK> */
-MAP(0x5F, 0x56, 0x7092)  /* <CJK> */
-MAP(0x5F, 0x57, 0x70AF)  /* <CJK> */
-MAP(0x5F, 0x58, 0x70F1)  /* <CJK> */
-MAP(0x5F, 0x59, 0x70AC)  /* <CJK> */
-MAP(0x5F, 0x5A, 0x70B8)  /* <CJK> */
-MAP(0x5F, 0x5B, 0x70B3)  /* <CJK> */
-MAP(0x5F, 0x5C, 0x70AE)  /* <CJK> */
-MAP(0x5F, 0x5D, 0x70DF)  /* <CJK> */
-MAP(0x5F, 0x5E, 0x70CB)  /* <CJK> */
-MAP(0x5F, 0x5F, 0x70DD)  /* <CJK> */
-MAP(0x5F, 0x60, 0x70D9)  /* <CJK> */
-MAP(0x5F, 0x61, 0x7109)  /* <CJK> */
-MAP(0x5F, 0x62, 0x70FD)  /* <CJK> */
-MAP(0x5F, 0x63, 0x711C)  /* <CJK> */
-MAP(0x5F, 0x64, 0x7119)  /* <CJK> */
-MAP(0x5F, 0x65, 0x7165)  /* <CJK> */
-MAP(0x5F, 0x66, 0x7155)  /* <CJK> */
-MAP(0x5F, 0x67, 0x7188)  /* <CJK> */
-MAP(0x5F, 0x68, 0x7166)  /* <CJK> */
-MAP(0x5F, 0x69, 0x7162)  /* <CJK> */
-MAP(0x5F, 0x6A, 0x714C)  /* <CJK> */
-MAP(0x5F, 0x6B, 0x7156)  /* <CJK> */
-MAP(0x5F, 0x6C, 0x716C)  /* <CJK> */
-MAP(0x5F, 0x6D, 0x718F)  /* <CJK> */
-MAP(0x5F, 0x6E, 0x71FB)  /* <CJK> */
-MAP(0x5F, 0x6F, 0x7184)  /* <CJK> */
-MAP(0x5F, 0x70, 0x7195)  /* <CJK> */
-MAP(0x5F, 0x71, 0x71A8)  /* <CJK> */
-MAP(0x5F, 0x72, 0x71AC)  /* <CJK> */
-MAP(0x5F, 0x73, 0x71D7)  /* <CJK> */
-MAP(0x5F, 0x74, 0x71B9)  /* <CJK> */
-MAP(0x5F, 0x75, 0x71BE)  /* <CJK> */
-MAP(0x5F, 0x76, 0x71D2)  /* <CJK> */
-MAP(0x5F, 0x77, 0x71C9)  /* <CJK> */
-MAP(0x5F, 0x78, 0x71D4)  /* <CJK> */
-MAP(0x5F, 0x79, 0x71CE)  /* <CJK> */
-MAP(0x5F, 0x7A, 0x71E0)  /* <CJK> */
-MAP(0x5F, 0x7B, 0x71EC)  /* <CJK> */
-MAP(0x5F, 0x7C, 0x71E7)  /* <CJK> */
-MAP(0x5F, 0x7D, 0x71F5)  /* <CJK> */
-MAP(0x5F, 0x7E, 0x71FC)  /* <CJK> */
-MAP(0x60, 0x21, 0x71F9)  /* <CJK> */
-MAP(0x60, 0x22, 0x71FF)  /* <CJK> */
-MAP(0x60, 0x23, 0x720D)  /* <CJK> */
-MAP(0x60, 0x24, 0x7210)  /* <CJK> */
-MAP(0x60, 0x25, 0x721B)  /* <CJK> */
-MAP(0x60, 0x26, 0x7228)  /* <CJK> */
-MAP(0x60, 0x27, 0x722D)  /* <CJK> */
-MAP(0x60, 0x28, 0x722C)  /* <CJK> */
-MAP(0x60, 0x29, 0x7230)  /* <CJK> */
-MAP(0x60, 0x2A, 0x7232)  /* <CJK> */
-MAP(0x60, 0x2B, 0x723B)  /* <CJK> */
-MAP(0x60, 0x2C, 0x723C)  /* <CJK> */
-MAP(0x60, 0x2D, 0x723F)  /* <CJK> */
-MAP(0x60, 0x2E, 0x7240)  /* <CJK> */
-MAP(0x60, 0x2F, 0x7246)  /* <CJK> */
-MAP(0x60, 0x30, 0x724B)  /* <CJK> */
-MAP(0x60, 0x31, 0x7258)  /* <CJK> */
-MAP(0x60, 0x32, 0x7274)  /* <CJK> */
-MAP(0x60, 0x33, 0x727E)  /* <CJK> */
-MAP(0x60, 0x34, 0x7282)  /* <CJK> */
-MAP(0x60, 0x35, 0x7281)  /* <CJK> */
-MAP(0x60, 0x36, 0x7287)  /* <CJK> */
-MAP(0x60, 0x37, 0x7292)  /* <CJK> */
-MAP(0x60, 0x38, 0x7296)  /* <CJK> */
-MAP(0x60, 0x39, 0x72A2)  /* <CJK> */
-MAP(0x60, 0x3A, 0x72A7)  /* <CJK> */
-MAP(0x60, 0x3B, 0x72B9)  /* <CJK> */
-MAP(0x60, 0x3C, 0x72B2)  /* <CJK> */
-MAP(0x60, 0x3D, 0x72C3)  /* <CJK> */
-MAP(0x60, 0x3E, 0x72C6)  /* <CJK> */
-MAP(0x60, 0x3F, 0x72C4)  /* <CJK> */
-MAP(0x60, 0x40, 0x72CE)  /* <CJK> */
-MAP(0x60, 0x41, 0x72D2)  /* <CJK> */
-MAP(0x60, 0x42, 0x72E2)  /* <CJK> */
-MAP(0x60, 0x43, 0x72E0)  /* <CJK> */
-MAP(0x60, 0x44, 0x72E1)  /* <CJK> */
-MAP(0x60, 0x45, 0x72F9)  /* <CJK> */
-MAP(0x60, 0x46, 0x72F7)  /* <CJK> */
-MAP(0x60, 0x47, 0x500F)  /* <CJK> */
-MAP(0x60, 0x48, 0x7317)  /* <CJK> */
-MAP(0x60, 0x49, 0x730A)  /* <CJK> */
-MAP(0x60, 0x4A, 0x731C)  /* <CJK> */
-MAP(0x60, 0x4B, 0x7316)  /* <CJK> */
-MAP(0x60, 0x4C, 0x731D)  /* <CJK> */
-MAP(0x60, 0x4D, 0x7334)  /* <CJK> */
-MAP(0x60, 0x4E, 0x732F)  /* <CJK> */
-MAP(0x60, 0x4F, 0x7329)  /* <CJK> */
-MAP(0x60, 0x50, 0x7325)  /* <CJK> */
-MAP(0x60, 0x51, 0x733E)  /* <CJK> */
-MAP(0x60, 0x52, 0x734E)  /* <CJK> */
-MAP(0x60, 0x53, 0x734F)  /* <CJK> */
-MAP(0x60, 0x54, 0x9ED8)  /* <CJK> */
-MAP(0x60, 0x55, 0x7357)  /* <CJK> */
-MAP(0x60, 0x56, 0x736A)  /* <CJK> */
-MAP(0x60, 0x57, 0x7368)  /* <CJK> */
-MAP(0x60, 0x58, 0x7370)  /* <CJK> */
-MAP(0x60, 0x59, 0x7378)  /* <CJK> */
-MAP(0x60, 0x5A, 0x7375)  /* <CJK> */
-MAP(0x60, 0x5B, 0x737B)  /* <CJK> */
-MAP(0x60, 0x5C, 0x737A)  /* <CJK> */
-MAP(0x60, 0x5D, 0x73C8)  /* <CJK> */
-MAP(0x60, 0x5E, 0x73B3)  /* <CJK> */
-MAP(0x60, 0x5F, 0x73CE)  /* <CJK> */
-MAP(0x60, 0x60, 0x73BB)  /* <CJK> */
-MAP(0x60, 0x61, 0x73C0)  /* <CJK> */
-MAP(0x60, 0x62, 0x73E5)  /* <CJK> */
-MAP(0x60, 0x63, 0x73EE)  /* <CJK> */
-MAP(0x60, 0x64, 0x73DE)  /* <CJK> */
-MAP(0x60, 0x65, 0x74A2)  /* <CJK> */
-MAP(0x60, 0x66, 0x7405)  /* <CJK> */
-MAP(0x60, 0x67, 0x746F)  /* <CJK> */
-MAP(0x60, 0x68, 0x7425)  /* <CJK> */
-MAP(0x60, 0x69, 0x73F8)  /* <CJK> */
-MAP(0x60, 0x6A, 0x7432)  /* <CJK> */
-MAP(0x60, 0x6B, 0x743A)  /* <CJK> */
-MAP(0x60, 0x6C, 0x7455)  /* <CJK> */
-MAP(0x60, 0x6D, 0x743F)  /* <CJK> */
-MAP(0x60, 0x6E, 0x745F)  /* <CJK> */
-MAP(0x60, 0x6F, 0x7459)  /* <CJK> */
-MAP(0x60, 0x70, 0x7441)  /* <CJK> */
-MAP(0x60, 0x71, 0x745C)  /* <CJK> */
-MAP(0x60, 0x72, 0x7469)  /* <CJK> */
-MAP(0x60, 0x73, 0x7470)  /* <CJK> */
-MAP(0x60, 0x74, 0x7463)  /* <CJK> */
-MAP(0x60, 0x75, 0x746A)  /* <CJK> */
-MAP(0x60, 0x76, 0x7476)  /* <CJK> */
-MAP(0x60, 0x77, 0x747E)  /* <CJK> */
-MAP(0x60, 0x78, 0x748B)  /* <CJK> */
-MAP(0x60, 0x79, 0x749E)  /* <CJK> */
-MAP(0x60, 0x7A, 0x74A7)  /* <CJK> */
-MAP(0x60, 0x7B, 0x74CA)  /* <CJK> */
-MAP(0x60, 0x7C, 0x74CF)  /* <CJK> */
-MAP(0x60, 0x7D, 0x74D4)  /* <CJK> */
-MAP(0x60, 0x7E, 0x73F1)  /* <CJK> */
-MAP(0x61, 0x21, 0x74E0)  /* <CJK> */
-MAP(0x61, 0x22, 0x74E3)  /* <CJK> */
-MAP(0x61, 0x23, 0x74E7)  /* <CJK> */
-MAP(0x61, 0x24, 0x74E9)  /* <CJK> */
-MAP(0x61, 0x25, 0x74EE)  /* <CJK> */
-MAP(0x61, 0x26, 0x74F2)  /* <CJK> */
-MAP(0x61, 0x27, 0x74F0)  /* <CJK> */
-MAP(0x61, 0x28, 0x74F1)  /* <CJK> */
-MAP(0x61, 0x29, 0x74F8)  /* <CJK> */
-MAP(0x61, 0x2A, 0x74F7)  /* <CJK> */
-MAP(0x61, 0x2B, 0x7504)  /* <CJK> */
-MAP(0x61, 0x2C, 0x7503)  /* <CJK> */
-MAP(0x61, 0x2D, 0x7505)  /* <CJK> */
-MAP(0x61, 0x2E, 0x750C)  /* <CJK> */
-MAP(0x61, 0x2F, 0x750E)  /* <CJK> */
-MAP(0x61, 0x30, 0x750D)  /* <CJK> */
-MAP(0x61, 0x31, 0x7515)  /* <CJK> */
-MAP(0x61, 0x32, 0x7513)  /* <CJK> */
-MAP(0x61, 0x33, 0x751E)  /* <CJK> */
-MAP(0x61, 0x34, 0x7526)  /* <CJK> */
-MAP(0x61, 0x35, 0x752C)  /* <CJK> */
-MAP(0x61, 0x36, 0x753C)  /* <CJK> */
-MAP(0x61, 0x37, 0x7544)  /* <CJK> */
-MAP(0x61, 0x38, 0x754D)  /* <CJK> */
-MAP(0x61, 0x39, 0x754A)  /* <CJK> */
-MAP(0x61, 0x3A, 0x7549)  /* <CJK> */
-MAP(0x61, 0x3B, 0x755B)  /* <CJK> */
-MAP(0x61, 0x3C, 0x7546)  /* <CJK> */
-MAP(0x61, 0x3D, 0x755A)  /* <CJK> */
-MAP(0x61, 0x3E, 0x7569)  /* <CJK> */
-MAP(0x61, 0x3F, 0x7564)  /* <CJK> */
-MAP(0x61, 0x40, 0x7567)  /* <CJK> */
-MAP(0x61, 0x41, 0x756B)  /* <CJK> */
-MAP(0x61, 0x42, 0x756D)  /* <CJK> */
-MAP(0x61, 0x43, 0x7578)  /* <CJK> */
-MAP(0x61, 0x44, 0x7576)  /* <CJK> */
-MAP(0x61, 0x45, 0x7586)  /* <CJK> */
-MAP(0x61, 0x46, 0x7587)  /* <CJK> */
-MAP(0x61, 0x47, 0x7574)  /* <CJK> */
-MAP(0x61, 0x48, 0x758A)  /* <CJK> */
-MAP(0x61, 0x49, 0x7589)  /* <CJK> */
-MAP(0x61, 0x4A, 0x7582)  /* <CJK> */
-MAP(0x61, 0x4B, 0x7594)  /* <CJK> */
-MAP(0x61, 0x4C, 0x759A)  /* <CJK> */
-MAP(0x61, 0x4D, 0x759D)  /* <CJK> */
-MAP(0x61, 0x4E, 0x75A5)  /* <CJK> */
-MAP(0x61, 0x4F, 0x75A3)  /* <CJK> */
-MAP(0x61, 0x50, 0x75C2)  /* <CJK> */
-MAP(0x61, 0x51, 0x75B3)  /* <CJK> */
-MAP(0x61, 0x52, 0x75C3)  /* <CJK> */
-MAP(0x61, 0x53, 0x75B5)  /* <CJK> */
-MAP(0x61, 0x54, 0x75BD)  /* <CJK> */
-MAP(0x61, 0x55, 0x75B8)  /* <CJK> */
-MAP(0x61, 0x56, 0x75BC)  /* <CJK> */
-MAP(0x61, 0x57, 0x75B1)  /* <CJK> */
-MAP(0x61, 0x58, 0x75CD)  /* <CJK> */
-MAP(0x61, 0x59, 0x75CA)  /* <CJK> */
-MAP(0x61, 0x5A, 0x75D2)  /* <CJK> */
-MAP(0x61, 0x5B, 0x75D9)  /* <CJK> */
-MAP(0x61, 0x5C, 0x75E3)  /* <CJK> */
-MAP(0x61, 0x5D, 0x75DE)  /* <CJK> */
-MAP(0x61, 0x5E, 0x75FE)  /* <CJK> */
-MAP(0x61, 0x5F, 0x75FF)  /* <CJK> */
-MAP(0x61, 0x60, 0x75FC)  /* <CJK> */
-MAP(0x61, 0x61, 0x7601)  /* <CJK> */
-MAP(0x61, 0x62, 0x75F0)  /* <CJK> */
-MAP(0x61, 0x63, 0x75FA)  /* <CJK> */
-MAP(0x61, 0x64, 0x75F2)  /* <CJK> */
-MAP(0x61, 0x65, 0x75F3)  /* <CJK> */
-MAP(0x61, 0x66, 0x760B)  /* <CJK> */
-MAP(0x61, 0x67, 0x760D)  /* <CJK> */
-MAP(0x61, 0x68, 0x7609)  /* <CJK> */
-MAP(0x61, 0x69, 0x761F)  /* <CJK> */
-MAP(0x61, 0x6A, 0x7627)  /* <CJK> */
-MAP(0x61, 0x6B, 0x7620)  /* <CJK> */
-MAP(0x61, 0x6C, 0x7621)  /* <CJK> */
-MAP(0x61, 0x6D, 0x7622)  /* <CJK> */
-MAP(0x61, 0x6E, 0x7624)  /* <CJK> */
-MAP(0x61, 0x6F, 0x7634)  /* <CJK> */
-MAP(0x61, 0x70, 0x7630)  /* <CJK> */
-MAP(0x61, 0x71, 0x763B)  /* <CJK> */
-MAP(0x61, 0x72, 0x7647)  /* <CJK> */
-MAP(0x61, 0x73, 0x7648)  /* <CJK> */
-MAP(0x61, 0x74, 0x7646)  /* <CJK> */
-MAP(0x61, 0x75, 0x765C)  /* <CJK> */
-MAP(0x61, 0x76, 0x7658)  /* <CJK> */
-MAP(0x61, 0x77, 0x7661)  /* <CJK> */
-MAP(0x61, 0x78, 0x7662)  /* <CJK> */
-MAP(0x61, 0x79, 0x7668)  /* <CJK> */
-MAP(0x61, 0x7A, 0x7669)  /* <CJK> */
-MAP(0x61, 0x7B, 0x766A)  /* <CJK> */
-MAP(0x61, 0x7C, 0x7667)  /* <CJK> */
-MAP(0x61, 0x7D, 0x766C)  /* <CJK> */
-MAP(0x61, 0x7E, 0x7670)  /* <CJK> */
-MAP(0x62, 0x21, 0x7672)  /* <CJK> */
-MAP(0x62, 0x22, 0x7676)  /* <CJK> */
-MAP(0x62, 0x23, 0x7678)  /* <CJK> */
-MAP(0x62, 0x24, 0x767C)  /* <CJK> */
-MAP(0x62, 0x25, 0x7680)  /* <CJK> */
-MAP(0x62, 0x26, 0x7683)  /* <CJK> */
-MAP(0x62, 0x27, 0x7688)  /* <CJK> */
-MAP(0x62, 0x28, 0x768B)  /* <CJK> */
-MAP(0x62, 0x29, 0x768E)  /* <CJK> */
-MAP(0x62, 0x2A, 0x7696)  /* <CJK> */
-MAP(0x62, 0x2B, 0x7693)  /* <CJK> */
-MAP(0x62, 0x2C, 0x7699)  /* <CJK> */
-MAP(0x62, 0x2D, 0x769A)  /* <CJK> */
-MAP(0x62, 0x2E, 0x76B0)  /* <CJK> */
-MAP(0x62, 0x2F, 0x76B4)  /* <CJK> */
-MAP(0x62, 0x30, 0x76B8)  /* <CJK> */
-MAP(0x62, 0x31, 0x76B9)  /* <CJK> */
-MAP(0x62, 0x32, 0x76BA)  /* <CJK> */
-MAP(0x62, 0x33, 0x76C2)  /* <CJK> */
-MAP(0x62, 0x34, 0x76CD)  /* <CJK> */
-MAP(0x62, 0x35, 0x76D6)  /* <CJK> */
-MAP(0x62, 0x36, 0x76D2)  /* <CJK> */
-MAP(0x62, 0x37, 0x76DE)  /* <CJK> */
-MAP(0x62, 0x38, 0x76E1)  /* <CJK> */
-MAP(0x62, 0x39, 0x76E5)  /* <CJK> */
-MAP(0x62, 0x3A, 0x76E7)  /* <CJK> */
-MAP(0x62, 0x3B, 0x76EA)  /* <CJK> */
-MAP(0x62, 0x3C, 0x862F)  /* <CJK> */
-MAP(0x62, 0x3D, 0x76FB)  /* <CJK> */
-MAP(0x62, 0x3E, 0x7708)  /* <CJK> */
-MAP(0x62, 0x3F, 0x7707)  /* <CJK> */
-MAP(0x62, 0x40, 0x7704)  /* <CJK> */
-MAP(0x62, 0x41, 0x7729)  /* <CJK> */
-MAP(0x62, 0x42, 0x7724)  /* <CJK> */
-MAP(0x62, 0x43, 0x771E)  /* <CJK> */
-MAP(0x62, 0x44, 0x7725)  /* <CJK> */
-MAP(0x62, 0x45, 0x7726)  /* <CJK> */
-MAP(0x62, 0x46, 0x771B)  /* <CJK> */
-MAP(0x62, 0x47, 0x7737)  /* <CJK> */
-MAP(0x62, 0x48, 0x7738)  /* <CJK> */
-MAP(0x62, 0x49, 0x7747)  /* <CJK> */
-MAP(0x62, 0x4A, 0x775A)  /* <CJK> */
-MAP(0x62, 0x4B, 0x7768)  /* <CJK> */
-MAP(0x62, 0x4C, 0x776B)  /* <CJK> */
-MAP(0x62, 0x4D, 0x775B)  /* <CJK> */
-MAP(0x62, 0x4E, 0x7765)  /* <CJK> */
-MAP(0x62, 0x4F, 0x777F)  /* <CJK> */
-MAP(0x62, 0x50, 0x777E)  /* <CJK> */
-MAP(0x62, 0x51, 0x7779)  /* <CJK> */
-MAP(0x62, 0x52, 0x778E)  /* <CJK> */
-MAP(0x62, 0x53, 0x778B)  /* <CJK> */
-MAP(0x62, 0x54, 0x7791)  /* <CJK> */
-MAP(0x62, 0x55, 0x77A0)  /* <CJK> */
-MAP(0x62, 0x56, 0x779E)  /* <CJK> */
-MAP(0x62, 0x57, 0x77B0)  /* <CJK> */
-MAP(0x62, 0x58, 0x77B6)  /* <CJK> */
-MAP(0x62, 0x59, 0x77B9)  /* <CJK> */
-MAP(0x62, 0x5A, 0x77BF)  /* <CJK> */
-MAP(0x62, 0x5B, 0x77BC)  /* <CJK> */
-MAP(0x62, 0x5C, 0x77BD)  /* <CJK> */
-MAP(0x62, 0x5D, 0x77BB)  /* <CJK> */
-MAP(0x62, 0x5E, 0x77C7)  /* <CJK> */
-MAP(0x62, 0x5F, 0x77CD)  /* <CJK> */
-MAP(0x62, 0x60, 0x77D7)  /* <CJK> */
-MAP(0x62, 0x61, 0x77DA)  /* <CJK> */
-MAP(0x62, 0x62, 0x77DC)  /* <CJK> */
-MAP(0x62, 0x63, 0x77E3)  /* <CJK> */
-MAP(0x62, 0x64, 0x77EE)  /* <CJK> */
-MAP(0x62, 0x65, 0x77FC)  /* <CJK> */
-MAP(0x62, 0x66, 0x780C)  /* <CJK> */
-MAP(0x62, 0x67, 0x7812)  /* <CJK> */
-MAP(0x62, 0x68, 0x7926)  /* <CJK> */
-MAP(0x62, 0x69, 0x7820)  /* <CJK> */
-MAP(0x62, 0x6A, 0x792A)  /* <CJK> */
-MAP(0x62, 0x6B, 0x7845)  /* <CJK> */
-MAP(0x62, 0x6C, 0x788E)  /* <CJK> */
-MAP(0x62, 0x6D, 0x7874)  /* <CJK> */
-MAP(0x62, 0x6E, 0x7886)  /* <CJK> */
-MAP(0x62, 0x6F, 0x787C)  /* <CJK> */
-MAP(0x62, 0x70, 0x789A)  /* <CJK> */
-MAP(0x62, 0x71, 0x788C)  /* <CJK> */
-MAP(0x62, 0x72, 0x78A3)  /* <CJK> */
-MAP(0x62, 0x73, 0x78B5)  /* <CJK> */
-MAP(0x62, 0x74, 0x78AA)  /* <CJK> */
-MAP(0x62, 0x75, 0x78AF)  /* <CJK> */
-MAP(0x62, 0x76, 0x78D1)  /* <CJK> */
-MAP(0x62, 0x77, 0x78C6)  /* <CJK> */
-MAP(0x62, 0x78, 0x78CB)  /* <CJK> */
-MAP(0x62, 0x79, 0x78D4)  /* <CJK> */
-MAP(0x62, 0x7A, 0x78BE)  /* <CJK> */
-MAP(0x62, 0x7B, 0x78BC)  /* <CJK> */
-MAP(0x62, 0x7C, 0x78C5)  /* <CJK> */
-MAP(0x62, 0x7D, 0x78CA)  /* <CJK> */
-MAP(0x62, 0x7E, 0x78EC)  /* <CJK> */
-MAP(0x63, 0x21, 0x78E7)  /* <CJK> */
-MAP(0x63, 0x22, 0x78DA)  /* <CJK> */
-MAP(0x63, 0x23, 0x78FD)  /* <CJK> */
-MAP(0x63, 0x24, 0x78F4)  /* <CJK> */
-MAP(0x63, 0x25, 0x7907)  /* <CJK> */
-MAP(0x63, 0x26, 0x7912)  /* <CJK> */
-MAP(0x63, 0x27, 0x7911)  /* <CJK> */
-MAP(0x63, 0x28, 0x7919)  /* <CJK> */
-MAP(0x63, 0x29, 0x792C)  /* <CJK> */
-MAP(0x63, 0x2A, 0x792B)  /* <CJK> */
-MAP(0x63, 0x2B, 0x7940)  /* <CJK> */
-MAP(0x63, 0x2C, 0x7960)  /* <CJK> */
-MAP(0x63, 0x2D, 0x7957)  /* <CJK> */
-MAP(0x63, 0x2E, 0x795F)  /* <CJK> */
-MAP(0x63, 0x2F, 0x795A)  /* <CJK> */
-MAP(0x63, 0x30, 0x7955)  /* <CJK> */
-MAP(0x63, 0x31, 0x7953)  /* <CJK> */
-MAP(0x63, 0x32, 0x797A)  /* <CJK> */
-MAP(0x63, 0x33, 0x797F)  /* <CJK> */
-MAP(0x63, 0x34, 0x798A)  /* <CJK> */
-MAP(0x63, 0x35, 0x799D)  /* <CJK> */
-MAP(0x63, 0x36, 0x79A7)  /* <CJK> */
-MAP(0x63, 0x37, 0x9F4B)  /* <CJK> */
-MAP(0x63, 0x38, 0x79AA)  /* <CJK> */
-MAP(0x63, 0x39, 0x79AE)  /* <CJK> */
-MAP(0x63, 0x3A, 0x79B3)  /* <CJK> */
-MAP(0x63, 0x3B, 0x79B9)  /* <CJK> */
-MAP(0x63, 0x3C, 0x79BA)  /* <CJK> */
-MAP(0x63, 0x3D, 0x79C9)  /* <CJK> */
-MAP(0x63, 0x3E, 0x79D5)  /* <CJK> */
-MAP(0x63, 0x3F, 0x79E7)  /* <CJK> */
-MAP(0x63, 0x40, 0x79EC)  /* <CJK> */
-MAP(0x63, 0x41, 0x79E1)  /* <CJK> */
-MAP(0x63, 0x42, 0x79E3)  /* <CJK> */
-MAP(0x63, 0x43, 0x7A08)  /* <CJK> */
-MAP(0x63, 0x44, 0x7A0D)  /* <CJK> */
-MAP(0x63, 0x45, 0x7A18)  /* <CJK> */
-MAP(0x63, 0x46, 0x7A19)  /* <CJK> */
-MAP(0x63, 0x47, 0x7A20)  /* <CJK> */
-MAP(0x63, 0x48, 0x7A1F)  /* <CJK> */
-MAP(0x63, 0x49, 0x7980)  /* <CJK> */
-MAP(0x63, 0x4A, 0x7A31)  /* <CJK> */
-MAP(0x63, 0x4B, 0x7A3B)  /* <CJK> */
-MAP(0x63, 0x4C, 0x7A3E)  /* <CJK> */
-MAP(0x63, 0x4D, 0x7A37)  /* <CJK> */
-MAP(0x63, 0x4E, 0x7A43)  /* <CJK> */
-MAP(0x63, 0x4F, 0x7A57)  /* <CJK> */
-MAP(0x63, 0x50, 0x7A49)  /* <CJK> */
-MAP(0x63, 0x51, 0x7A61)  /* <CJK> */
-MAP(0x63, 0x52, 0x7A62)  /* <CJK> */
-MAP(0x63, 0x53, 0x7A69)  /* <CJK> */
-MAP(0x63, 0x54, 0x9F9D)  /* <CJK> */
-MAP(0x63, 0x55, 0x7A70)  /* <CJK> */
-MAP(0x63, 0x56, 0x7A79)  /* <CJK> */
-MAP(0x63, 0x57, 0x7A7D)  /* <CJK> */
-MAP(0x63, 0x58, 0x7A88)  /* <CJK> */
-MAP(0x63, 0x59, 0x7A97)  /* <CJK> */
-MAP(0x63, 0x5A, 0x7A95)  /* <CJK> */
-MAP(0x63, 0x5B, 0x7A98)  /* <CJK> */
-MAP(0x63, 0x5C, 0x7A96)  /* <CJK> */
-MAP(0x63, 0x5D, 0x7AA9)  /* <CJK> */
-MAP(0x63, 0x5E, 0x7AC8)  /* <CJK> */
-MAP(0x63, 0x5F, 0x7AB0)  /* <CJK> */
-MAP(0x63, 0x60, 0x7AB6)  /* <CJK> */
-MAP(0x63, 0x61, 0x7AC5)  /* <CJK> */
-MAP(0x63, 0x62, 0x7AC4)  /* <CJK> */
-MAP(0x63, 0x63, 0x7ABF)  /* <CJK> */
-MAP(0x63, 0x64, 0x9083)  /* <CJK> */
-MAP(0x63, 0x65, 0x7AC7)  /* <CJK> */
-MAP(0x63, 0x66, 0x7ACA)  /* <CJK> */
-MAP(0x63, 0x67, 0x7ACD)  /* <CJK> */
-MAP(0x63, 0x68, 0x7ACF)  /* <CJK> */
-MAP(0x63, 0x69, 0x7AD5)  /* <CJK> */
-MAP(0x63, 0x6A, 0x7AD3)  /* <CJK> */
-MAP(0x63, 0x6B, 0x7AD9)  /* <CJK> */
-MAP(0x63, 0x6C, 0x7ADA)  /* <CJK> */
-MAP(0x63, 0x6D, 0x7ADD)  /* <CJK> */
-MAP(0x63, 0x6E, 0x7AE1)  /* <CJK> */
-MAP(0x63, 0x6F, 0x7AE2)  /* <CJK> */
-MAP(0x63, 0x70, 0x7AE6)  /* <CJK> */
-MAP(0x63, 0x71, 0x7AED)  /* <CJK> */
-MAP(0x63, 0x72, 0x7AF0)  /* <CJK> */
-MAP(0x63, 0x73, 0x7B02)  /* <CJK> */
-MAP(0x63, 0x74, 0x7B0F)  /* <CJK> */
-MAP(0x63, 0x75, 0x7B0A)  /* <CJK> */
-MAP(0x63, 0x76, 0x7B06)  /* <CJK> */
-MAP(0x63, 0x77, 0x7B33)  /* <CJK> */
-MAP(0x63, 0x78, 0x7B18)  /* <CJK> */
-MAP(0x63, 0x79, 0x7B19)  /* <CJK> */
-MAP(0x63, 0x7A, 0x7B1E)  /* <CJK> */
-MAP(0x63, 0x7B, 0x7B35)  /* <CJK> */
-MAP(0x63, 0x7C, 0x7B28)  /* <CJK> */
-MAP(0x63, 0x7D, 0x7B36)  /* <CJK> */
-MAP(0x63, 0x7E, 0x7B50)  /* <CJK> */
-MAP(0x64, 0x21, 0x7B7A)  /* <CJK> */
-MAP(0x64, 0x22, 0x7B04)  /* <CJK> */
-MAP(0x64, 0x23, 0x7B4D)  /* <CJK> */
-MAP(0x64, 0x24, 0x7B0B)  /* <CJK> */
-MAP(0x64, 0x25, 0x7B4C)  /* <CJK> */
-MAP(0x64, 0x26, 0x7B45)  /* <CJK> */
-MAP(0x64, 0x27, 0x7B75)  /* <CJK> */
-MAP(0x64, 0x28, 0x7B65)  /* <CJK> */
-MAP(0x64, 0x29, 0x7B74)  /* <CJK> */
-MAP(0x64, 0x2A, 0x7B67)  /* <CJK> */
-MAP(0x64, 0x2B, 0x7B70)  /* <CJK> */
-MAP(0x64, 0x2C, 0x7B71)  /* <CJK> */
-MAP(0x64, 0x2D, 0x7B6C)  /* <CJK> */
-MAP(0x64, 0x2E, 0x7B6E)  /* <CJK> */
-MAP(0x64, 0x2F, 0x7B9D)  /* <CJK> */
-MAP(0x64, 0x30, 0x7B98)  /* <CJK> */
-MAP(0x64, 0x31, 0x7B9F)  /* <CJK> */
-MAP(0x64, 0x32, 0x7B8D)  /* <CJK> */
-MAP(0x64, 0x33, 0x7B9C)  /* <CJK> */
-MAP(0x64, 0x34, 0x7B9A)  /* <CJK> */
-MAP(0x64, 0x35, 0x7B8B)  /* <CJK> */
-MAP(0x64, 0x36, 0x7B92)  /* <CJK> */
-MAP(0x64, 0x37, 0x7B8F)  /* <CJK> */
-MAP(0x64, 0x38, 0x7B5D)  /* <CJK> */
-MAP(0x64, 0x39, 0x7B99)  /* <CJK> */
-MAP(0x64, 0x3A, 0x7BCB)  /* <CJK> */
-MAP(0x64, 0x3B, 0x7BC1)  /* <CJK> */
-MAP(0x64, 0x3C, 0x7BCC)  /* <CJK> */
-MAP(0x64, 0x3D, 0x7BCF)  /* <CJK> */
-MAP(0x64, 0x3E, 0x7BB4)  /* <CJK> */
-MAP(0x64, 0x3F, 0x7BC6)  /* <CJK> */
-MAP(0x64, 0x40, 0x7BDD)  /* <CJK> */
-MAP(0x64, 0x41, 0x7BE9)  /* <CJK> */
-MAP(0x64, 0x42, 0x7C11)  /* <CJK> */
-MAP(0x64, 0x43, 0x7C14)  /* <CJK> */
-MAP(0x64, 0x44, 0x7BE6)  /* <CJK> */
-MAP(0x64, 0x45, 0x7BE5)  /* <CJK> */
-MAP(0x64, 0x46, 0x7C60)  /* <CJK> */
-MAP(0x64, 0x47, 0x7C00)  /* <CJK> */
-MAP(0x64, 0x48, 0x7C07)  /* <CJK> */
-MAP(0x64, 0x49, 0x7C13)  /* <CJK> */
-MAP(0x64, 0x4A, 0x7BF3)  /* <CJK> */
-MAP(0x64, 0x4B, 0x7BF7)  /* <CJK> */
-MAP(0x64, 0x4C, 0x7C17)  /* <CJK> */
-MAP(0x64, 0x4D, 0x7C0D)  /* <CJK> */
-MAP(0x64, 0x4E, 0x7BF6)  /* <CJK> */
-MAP(0x64, 0x4F, 0x7C23)  /* <CJK> */
-MAP(0x64, 0x50, 0x7C27)  /* <CJK> */
-MAP(0x64, 0x51, 0x7C2A)  /* <CJK> */
-MAP(0x64, 0x52, 0x7C1F)  /* <CJK> */
-MAP(0x64, 0x53, 0x7C37)  /* <CJK> */
-MAP(0x64, 0x54, 0x7C2B)  /* <CJK> */
-MAP(0x64, 0x55, 0x7C3D)  /* <CJK> */
-MAP(0x64, 0x56, 0x7C4C)  /* <CJK> */
-MAP(0x64, 0x57, 0x7C43)  /* <CJK> */
-MAP(0x64, 0x58, 0x7C54)  /* <CJK> */
-MAP(0x64, 0x59, 0x7C4F)  /* <CJK> */
-MAP(0x64, 0x5A, 0x7C40)  /* <CJK> */
-MAP(0x64, 0x5B, 0x7C50)  /* <CJK> */
-MAP(0x64, 0x5C, 0x7C58)  /* <CJK> */
-MAP(0x64, 0x5D, 0x7C5F)  /* <CJK> */
-MAP(0x64, 0x5E, 0x7C64)  /* <CJK> */
-MAP(0x64, 0x5F, 0x7C56)  /* <CJK> */
-MAP(0x64, 0x60, 0x7C65)  /* <CJK> */
-MAP(0x64, 0x61, 0x7C6C)  /* <CJK> */
-MAP(0x64, 0x62, 0x7C75)  /* <CJK> */
-MAP(0x64, 0x63, 0x7C83)  /* <CJK> */
-MAP(0x64, 0x64, 0x7C90)  /* <CJK> */
-MAP(0x64, 0x65, 0x7CA4)  /* <CJK> */
-MAP(0x64, 0x66, 0x7CAD)  /* <CJK> */
-MAP(0x64, 0x67, 0x7CA2)  /* <CJK> */
-MAP(0x64, 0x68, 0x7CAB)  /* <CJK> */
-MAP(0x64, 0x69, 0x7CA1)  /* <CJK> */
-MAP(0x64, 0x6A, 0x7CA8)  /* <CJK> */
-MAP(0x64, 0x6B, 0x7CB3)  /* <CJK> */
-MAP(0x64, 0x6C, 0x7CB2)  /* <CJK> */
-MAP(0x64, 0x6D, 0x7CB1)  /* <CJK> */
-MAP(0x64, 0x6E, 0x7CAE)  /* <CJK> */
-MAP(0x64, 0x6F, 0x7CB9)  /* <CJK> */
-MAP(0x64, 0x70, 0x7CBD)  /* <CJK> */
-MAP(0x64, 0x71, 0x7CC0)  /* <CJK> */
-MAP(0x64, 0x72, 0x7CC5)  /* <CJK> */
-MAP(0x64, 0x73, 0x7CC2)  /* <CJK> */
-MAP(0x64, 0x74, 0x7CD8)  /* <CJK> */
-MAP(0x64, 0x75, 0x7CD2)  /* <CJK> */
-MAP(0x64, 0x76, 0x7CDC)  /* <CJK> */
-MAP(0x64, 0x77, 0x7CE2)  /* <CJK> */
-MAP(0x64, 0x78, 0x9B3B)  /* <CJK> */
-MAP(0x64, 0x79, 0x7CEF)  /* <CJK> */
-MAP(0x64, 0x7A, 0x7CF2)  /* <CJK> */
-MAP(0x64, 0x7B, 0x7CF4)  /* <CJK> */
-MAP(0x64, 0x7C, 0x7CF6)  /* <CJK> */
-MAP(0x64, 0x7D, 0x7CFA)  /* <CJK> */
-MAP(0x64, 0x7E, 0x7D06)  /* <CJK> */
-MAP(0x65, 0x21, 0x7D02)  /* <CJK> */
-MAP(0x65, 0x22, 0x7D1C)  /* <CJK> */
-MAP(0x65, 0x23, 0x7D15)  /* <CJK> */
-MAP(0x65, 0x24, 0x7D0A)  /* <CJK> */
-MAP(0x65, 0x25, 0x7D45)  /* <CJK> */
-MAP(0x65, 0x26, 0x7D4B)  /* <CJK> */
-MAP(0x65, 0x27, 0x7D2E)  /* <CJK> */
-MAP(0x65, 0x28, 0x7D32)  /* <CJK> */
-MAP(0x65, 0x29, 0x7D3F)  /* <CJK> */
-MAP(0x65, 0x2A, 0x7D35)  /* <CJK> */
-MAP(0x65, 0x2B, 0x7D46)  /* <CJK> */
-MAP(0x65, 0x2C, 0x7D73)  /* <CJK> */
-MAP(0x65, 0x2D, 0x7D56)  /* <CJK> */
-MAP(0x65, 0x2E, 0x7D4E)  /* <CJK> */
-MAP(0x65, 0x2F, 0x7D72)  /* <CJK> */
-MAP(0x65, 0x30, 0x7D68)  /* <CJK> */
-MAP(0x65, 0x31, 0x7D6E)  /* <CJK> */
-MAP(0x65, 0x32, 0x7D4F)  /* <CJK> */
-MAP(0x65, 0x33, 0x7D63)  /* <CJK> */
-MAP(0x65, 0x34, 0x7D93)  /* <CJK> */
-MAP(0x65, 0x35, 0x7D89)  /* <CJK> */
-MAP(0x65, 0x36, 0x7D5B)  /* <CJK> */
-MAP(0x65, 0x37, 0x7D8F)  /* <CJK> */
-MAP(0x65, 0x38, 0x7D7D)  /* <CJK> */
-MAP(0x65, 0x39, 0x7D9B)  /* <CJK> */
-MAP(0x65, 0x3A, 0x7DBA)  /* <CJK> */
-MAP(0x65, 0x3B, 0x7DAE)  /* <CJK> */
-MAP(0x65, 0x3C, 0x7DA3)  /* <CJK> */
-MAP(0x65, 0x3D, 0x7DB5)  /* <CJK> */
-MAP(0x65, 0x3E, 0x7DC7)  /* <CJK> */
-MAP(0x65, 0x3F, 0x7DBD)  /* <CJK> */
-MAP(0x65, 0x40, 0x7DAB)  /* <CJK> */
-MAP(0x65, 0x41, 0x7E3D)  /* <CJK> */
-MAP(0x65, 0x42, 0x7DA2)  /* <CJK> */
-MAP(0x65, 0x43, 0x7DAF)  /* <CJK> */
-MAP(0x65, 0x44, 0x7DDC)  /* <CJK> */
-MAP(0x65, 0x45, 0x7DB8)  /* <CJK> */
-MAP(0x65, 0x46, 0x7D9F)  /* <CJK> */
-MAP(0x65, 0x47, 0x7DB0)  /* <CJK> */
-MAP(0x65, 0x48, 0x7DD8)  /* <CJK> */
-MAP(0x65, 0x49, 0x7DDD)  /* <CJK> */
-MAP(0x65, 0x4A, 0x7DE4)  /* <CJK> */
-MAP(0x65, 0x4B, 0x7DDE)  /* <CJK> */
-MAP(0x65, 0x4C, 0x7DFB)  /* <CJK> */
-MAP(0x65, 0x4D, 0x7DF2)  /* <CJK> */
-MAP(0x65, 0x4E, 0x7DE1)  /* <CJK> */
-MAP(0x65, 0x4F, 0x7E05)  /* <CJK> */
-MAP(0x65, 0x50, 0x7E0A)  /* <CJK> */
-MAP(0x65, 0x51, 0x7E23)  /* <CJK> */
-MAP(0x65, 0x52, 0x7E21)  /* <CJK> */
-MAP(0x65, 0x53, 0x7E12)  /* <CJK> */
-MAP(0x65, 0x54, 0x7E31)  /* <CJK> */
-MAP(0x65, 0x55, 0x7E1F)  /* <CJK> */
-MAP(0x65, 0x56, 0x7E09)  /* <CJK> */
-MAP(0x65, 0x57, 0x7E0B)  /* <CJK> */
-MAP(0x65, 0x58, 0x7E22)  /* <CJK> */
-MAP(0x65, 0x59, 0x7E46)  /* <CJK> */
-MAP(0x65, 0x5A, 0x7E66)  /* <CJK> */
-MAP(0x65, 0x5B, 0x7E3B)  /* <CJK> */
-MAP(0x65, 0x5C, 0x7E35)  /* <CJK> */
-MAP(0x65, 0x5D, 0x7E39)  /* <CJK> */
-MAP(0x65, 0x5E, 0x7E43)  /* <CJK> */
-MAP(0x65, 0x5F, 0x7E37)  /* <CJK> */
-MAP(0x65, 0x60, 0x7E32)  /* <CJK> */
-MAP(0x65, 0x61, 0x7E3A)  /* <CJK> */
-MAP(0x65, 0x62, 0x7E67)  /* <CJK> */
-MAP(0x65, 0x63, 0x7E5D)  /* <CJK> */
-MAP(0x65, 0x64, 0x7E56)  /* <CJK> */
-MAP(0x65, 0x65, 0x7E5E)  /* <CJK> */
-MAP(0x65, 0x66, 0x7E59)  /* <CJK> */
-MAP(0x65, 0x67, 0x7E5A)  /* <CJK> */
-MAP(0x65, 0x68, 0x7E79)  /* <CJK> */
-MAP(0x65, 0x69, 0x7E6A)  /* <CJK> */
-MAP(0x65, 0x6A, 0x7E69)  /* <CJK> */
-MAP(0x65, 0x6B, 0x7E7C)  /* <CJK> */
-MAP(0x65, 0x6C, 0x7E7B)  /* <CJK> */
-MAP(0x65, 0x6D, 0x7E83)  /* <CJK> */
-MAP(0x65, 0x6E, 0x7DD5)  /* <CJK> */
-MAP(0x65, 0x6F, 0x7E7D)  /* <CJK> */
-MAP(0x65, 0x70, 0x8FAE)  /* <CJK> */
-MAP(0x65, 0x71, 0x7E7F)  /* <CJK> */
-MAP(0x65, 0x72, 0x7E88)  /* <CJK> */
-MAP(0x65, 0x73, 0x7E89)  /* <CJK> */
-MAP(0x65, 0x74, 0x7E8C)  /* <CJK> */
-MAP(0x65, 0x75, 0x7E92)  /* <CJK> */
-MAP(0x65, 0x76, 0x7E90)  /* <CJK> */
-MAP(0x65, 0x77, 0x7E93)  /* <CJK> */
-MAP(0x65, 0x78, 0x7E94)  /* <CJK> */
-MAP(0x65, 0x79, 0x7E96)  /* <CJK> */
-MAP(0x65, 0x7A, 0x7E8E)  /* <CJK> */
-MAP(0x65, 0x7B, 0x7E9B)  /* <CJK> */
-MAP(0x65, 0x7C, 0x7E9C)  /* <CJK> */
-MAP(0x65, 0x7D, 0x7F38)  /* <CJK> */
-MAP(0x65, 0x7E, 0x7F3A)  /* <CJK> */
-MAP(0x66, 0x21, 0x7F45)  /* <CJK> */
-MAP(0x66, 0x22, 0x7F4C)  /* <CJK> */
-MAP(0x66, 0x23, 0x7F4D)  /* <CJK> */
-MAP(0x66, 0x24, 0x7F4E)  /* <CJK> */
-MAP(0x66, 0x25, 0x7F50)  /* <CJK> */
-MAP(0x66, 0x26, 0x7F51)  /* <CJK> */
-MAP(0x66, 0x27, 0x7F55)  /* <CJK> */
-MAP(0x66, 0x28, 0x7F54)  /* <CJK> */
-MAP(0x66, 0x29, 0x7F58)  /* <CJK> */
-MAP(0x66, 0x2A, 0x7F5F)  /* <CJK> */
-MAP(0x66, 0x2B, 0x7F60)  /* <CJK> */
-MAP(0x66, 0x2C, 0x7F68)  /* <CJK> */
-MAP(0x66, 0x2D, 0x7F69)  /* <CJK> */
-MAP(0x66, 0x2E, 0x7F67)  /* <CJK> */
-MAP(0x66, 0x2F, 0x7F78)  /* <CJK> */
-MAP(0x66, 0x30, 0x7F82)  /* <CJK> */
-MAP(0x66, 0x31, 0x7F86)  /* <CJK> */
-MAP(0x66, 0x32, 0x7F83)  /* <CJK> */
-MAP(0x66, 0x33, 0x7F88)  /* <CJK> */
-MAP(0x66, 0x34, 0x7F87)  /* <CJK> */
-MAP(0x66, 0x35, 0x7F8C)  /* <CJK> */
-MAP(0x66, 0x36, 0x7F94)  /* <CJK> */
-MAP(0x66, 0x37, 0x7F9E)  /* <CJK> */
-MAP(0x66, 0x38, 0x7F9D)  /* <CJK> */
-MAP(0x66, 0x39, 0x7F9A)  /* <CJK> */
-MAP(0x66, 0x3A, 0x7FA3)  /* <CJK> */
-MAP(0x66, 0x3B, 0x7FAF)  /* <CJK> */
-MAP(0x66, 0x3C, 0x7FB2)  /* <CJK> */
-MAP(0x66, 0x3D, 0x7FB9)  /* <CJK> */
-MAP(0x66, 0x3E, 0x7FAE)  /* <CJK> */
-MAP(0x66, 0x3F, 0x7FB6)  /* <CJK> */
-MAP(0x66, 0x40, 0x7FB8)  /* <CJK> */
-MAP(0x66, 0x41, 0x8B71)  /* <CJK> */
-MAP(0x66, 0x42, 0x7FC5)  /* <CJK> */
-MAP(0x66, 0x43, 0x7FC6)  /* <CJK> */
-MAP(0x66, 0x44, 0x7FCA)  /* <CJK> */
-MAP(0x66, 0x45, 0x7FD5)  /* <CJK> */
-MAP(0x66, 0x46, 0x7FD4)  /* <CJK> */
-MAP(0x66, 0x47, 0x7FE1)  /* <CJK> */
-MAP(0x66, 0x48, 0x7FE6)  /* <CJK> */
-MAP(0x66, 0x49, 0x7FE9)  /* <CJK> */
-MAP(0x66, 0x4A, 0x7FF3)  /* <CJK> */
-MAP(0x66, 0x4B, 0x7FF9)  /* <CJK> */
-MAP(0x66, 0x4C, 0x98DC)  /* <CJK> */
-MAP(0x66, 0x4D, 0x8006)  /* <CJK> */
-MAP(0x66, 0x4E, 0x8004)  /* <CJK> */
-MAP(0x66, 0x4F, 0x800B)  /* <CJK> */
-MAP(0x66, 0x50, 0x8012)  /* <CJK> */
-MAP(0x66, 0x51, 0x8018)  /* <CJK> */
-MAP(0x66, 0x52, 0x8019)  /* <CJK> */
-MAP(0x66, 0x53, 0x801C)  /* <CJK> */
-MAP(0x66, 0x54, 0x8021)  /* <CJK> */
-MAP(0x66, 0x55, 0x8028)  /* <CJK> */
-MAP(0x66, 0x56, 0x803F)  /* <CJK> */
-MAP(0x66, 0x57, 0x803B)  /* <CJK> */
-MAP(0x66, 0x58, 0x804A)  /* <CJK> */
-MAP(0x66, 0x59, 0x8046)  /* <CJK> */
-MAP(0x66, 0x5A, 0x8052)  /* <CJK> */
-MAP(0x66, 0x5B, 0x8058)  /* <CJK> */
-MAP(0x66, 0x5C, 0x805A)  /* <CJK> */
-MAP(0x66, 0x5D, 0x805F)  /* <CJK> */
-MAP(0x66, 0x5E, 0x8062)  /* <CJK> */
-MAP(0x66, 0x5F, 0x8068)  /* <CJK> */
-MAP(0x66, 0x60, 0x8073)  /* <CJK> */
-MAP(0x66, 0x61, 0x8072)  /* <CJK> */
-MAP(0x66, 0x62, 0x8070)  /* <CJK> */
-MAP(0x66, 0x63, 0x8076)  /* <CJK> */
-MAP(0x66, 0x64, 0x8079)  /* <CJK> */
-MAP(0x66, 0x65, 0x807D)  /* <CJK> */
-MAP(0x66, 0x66, 0x807F)  /* <CJK> */
-MAP(0x66, 0x67, 0x8084)  /* <CJK> */
-MAP(0x66, 0x68, 0x8086)  /* <CJK> */
-MAP(0x66, 0x69, 0x8085)  /* <CJK> */
-MAP(0x66, 0x6A, 0x809B)  /* <CJK> */
-MAP(0x66, 0x6B, 0x8093)  /* <CJK> */
-MAP(0x66, 0x6C, 0x809A)  /* <CJK> */
-MAP(0x66, 0x6D, 0x80AD)  /* <CJK> */
-MAP(0x66, 0x6E, 0x5190)  /* <CJK> */
-MAP(0x66, 0x6F, 0x80AC)  /* <CJK> */
-MAP(0x66, 0x70, 0x80DB)  /* <CJK> */
-MAP(0x66, 0x71, 0x80E5)  /* <CJK> */
-MAP(0x66, 0x72, 0x80D9)  /* <CJK> */
-MAP(0x66, 0x73, 0x80DD)  /* <CJK> */
-MAP(0x66, 0x74, 0x80C4)  /* <CJK> */
-MAP(0x66, 0x75, 0x80DA)  /* <CJK> */
-MAP(0x66, 0x76, 0x80D6)  /* <CJK> */
-MAP(0x66, 0x77, 0x8109)  /* <CJK> */
-MAP(0x66, 0x78, 0x80EF)  /* <CJK> */
-MAP(0x66, 0x79, 0x80F1)  /* <CJK> */
-MAP(0x66, 0x7A, 0x811B)  /* <CJK> */
-MAP(0x66, 0x7B, 0x8129)  /* <CJK> */
-MAP(0x66, 0x7C, 0x8123)  /* <CJK> */
-MAP(0x66, 0x7D, 0x812F)  /* <CJK> */
-MAP(0x66, 0x7E, 0x814B)  /* <CJK> */
-MAP(0x67, 0x21, 0x968B)  /* <CJK> */
-MAP(0x67, 0x22, 0x8146)  /* <CJK> */
-MAP(0x67, 0x23, 0x813E)  /* <CJK> */
-MAP(0x67, 0x24, 0x8153)  /* <CJK> */
-MAP(0x67, 0x25, 0x8151)  /* <CJK> */
-MAP(0x67, 0x26, 0x80FC)  /* <CJK> */
-MAP(0x67, 0x27, 0x8171)  /* <CJK> */
-MAP(0x67, 0x28, 0x816E)  /* <CJK> */
-MAP(0x67, 0x29, 0x8165)  /* <CJK> */
-MAP(0x67, 0x2A, 0x8166)  /* <CJK> */
-MAP(0x67, 0x2B, 0x8174)  /* <CJK> */
-MAP(0x67, 0x2C, 0x8183)  /* <CJK> */
-MAP(0x67, 0x2D, 0x8188)  /* <CJK> */
-MAP(0x67, 0x2E, 0x818A)  /* <CJK> */
-MAP(0x67, 0x2F, 0x8180)  /* <CJK> */
-MAP(0x67, 0x30, 0x8182)  /* <CJK> */
-MAP(0x67, 0x31, 0x81A0)  /* <CJK> */
-MAP(0x67, 0x32, 0x8195)  /* <CJK> */
-MAP(0x67, 0x33, 0x81A4)  /* <CJK> */
-MAP(0x67, 0x34, 0x81A3)  /* <CJK> */
-MAP(0x67, 0x35, 0x815F)  /* <CJK> */
-MAP(0x67, 0x36, 0x8193)  /* <CJK> */
-MAP(0x67, 0x37, 0x81A9)  /* <CJK> */
-MAP(0x67, 0x38, 0x81B0)  /* <CJK> */
-MAP(0x67, 0x39, 0x81B5)  /* <CJK> */
-MAP(0x67, 0x3A, 0x81BE)  /* <CJK> */
-MAP(0x67, 0x3B, 0x81B8)  /* <CJK> */
-MAP(0x67, 0x3C, 0x81BD)  /* <CJK> */
-MAP(0x67, 0x3D, 0x81C0)  /* <CJK> */
-MAP(0x67, 0x3E, 0x81C2)  /* <CJK> */
-MAP(0x67, 0x3F, 0x81BA)  /* <CJK> */
-MAP(0x67, 0x40, 0x81C9)  /* <CJK> */
-MAP(0x67, 0x41, 0x81CD)  /* <CJK> */
-MAP(0x67, 0x42, 0x81D1)  /* <CJK> */
-MAP(0x67, 0x43, 0x81D9)  /* <CJK> */
-MAP(0x67, 0x44, 0x81D8)  /* <CJK> */
-MAP(0x67, 0x45, 0x81C8)  /* <CJK> */
-MAP(0x67, 0x46, 0x81DA)  /* <CJK> */
-MAP(0x67, 0x47, 0x81DF)  /* <CJK> */
-MAP(0x67, 0x48, 0x81E0)  /* <CJK> */
-MAP(0x67, 0x49, 0x81E7)  /* <CJK> */
-MAP(0x67, 0x4A, 0x81FA)  /* <CJK> */
-MAP(0x67, 0x4B, 0x81FB)  /* <CJK> */
-MAP(0x67, 0x4C, 0x81FE)  /* <CJK> */
-MAP(0x67, 0x4D, 0x8201)  /* <CJK> */
-MAP(0x67, 0x4E, 0x8202)  /* <CJK> */
-MAP(0x67, 0x4F, 0x8205)  /* <CJK> */
-MAP(0x67, 0x50, 0x8207)  /* <CJK> */
-MAP(0x67, 0x51, 0x820A)  /* <CJK> */
-MAP(0x67, 0x52, 0x820D)  /* <CJK> */
-MAP(0x67, 0x53, 0x8210)  /* <CJK> */
-MAP(0x67, 0x54, 0x8216)  /* <CJK> */
-MAP(0x67, 0x55, 0x8229)  /* <CJK> */
-MAP(0x67, 0x56, 0x822B)  /* <CJK> */
-MAP(0x67, 0x57, 0x8238)  /* <CJK> */
-MAP(0x67, 0x58, 0x8233)  /* <CJK> */
-MAP(0x67, 0x59, 0x8240)  /* <CJK> */
-MAP(0x67, 0x5A, 0x8259)  /* <CJK> */
-MAP(0x67, 0x5B, 0x8258)  /* <CJK> */
-MAP(0x67, 0x5C, 0x825D)  /* <CJK> */
-MAP(0x67, 0x5D, 0x825A)  /* <CJK> */
-MAP(0x67, 0x5E, 0x825F)  /* <CJK> */
-MAP(0x67, 0x5F, 0x8264)  /* <CJK> */
-MAP(0x67, 0x60, 0x8262)  /* <CJK> */
-MAP(0x67, 0x61, 0x8268)  /* <CJK> */
-MAP(0x67, 0x62, 0x826A)  /* <CJK> */
-MAP(0x67, 0x63, 0x826B)  /* <CJK> */
-MAP(0x67, 0x64, 0x822E)  /* <CJK> */
-MAP(0x67, 0x65, 0x8271)  /* <CJK> */
-MAP(0x67, 0x66, 0x8277)  /* <CJK> */
-MAP(0x67, 0x67, 0x8278)  /* <CJK> */
-MAP(0x67, 0x68, 0x827E)  /* <CJK> */
-MAP(0x67, 0x69, 0x828D)  /* <CJK> */
-MAP(0x67, 0x6A, 0x8292)  /* <CJK> */
-MAP(0x67, 0x6B, 0x82AB)  /* <CJK> */
-MAP(0x67, 0x6C, 0x829F)  /* <CJK> */
-MAP(0x67, 0x6D, 0x82BB)  /* <CJK> */
-MAP(0x67, 0x6E, 0x82AC)  /* <CJK> */
-MAP(0x67, 0x6F, 0x82E1)  /* <CJK> */
-MAP(0x67, 0x70, 0x82E3)  /* <CJK> */
-MAP(0x67, 0x71, 0x82DF)  /* <CJK> */
-MAP(0x67, 0x72, 0x82D2)  /* <CJK> */
-MAP(0x67, 0x73, 0x82F4)  /* <CJK> */
-MAP(0x67, 0x74, 0x82F3)  /* <CJK> */
-MAP(0x67, 0x75, 0x82FA)  /* <CJK> */
-MAP(0x67, 0x76, 0x8393)  /* <CJK> */
-MAP(0x67, 0x77, 0x8303)  /* <CJK> */
-MAP(0x67, 0x78, 0x82FB)  /* <CJK> */
-MAP(0x67, 0x79, 0x82F9)  /* <CJK> */
-MAP(0x67, 0x7A, 0x82DE)  /* <CJK> */
-MAP(0x67, 0x7B, 0x8306)  /* <CJK> */
-MAP(0x67, 0x7C, 0x82DC)  /* <CJK> */
-MAP(0x67, 0x7D, 0x8309)  /* <CJK> */
-MAP(0x67, 0x7E, 0x82D9)  /* <CJK> */
-MAP(0x68, 0x21, 0x8335)  /* <CJK> */
-MAP(0x68, 0x22, 0x8334)  /* <CJK> */
-MAP(0x68, 0x23, 0x8316)  /* <CJK> */
-MAP(0x68, 0x24, 0x8332)  /* <CJK> */
-MAP(0x68, 0x25, 0x8331)  /* <CJK> */
-MAP(0x68, 0x26, 0x8340)  /* <CJK> */
-MAP(0x68, 0x27, 0x8339)  /* <CJK> */
-MAP(0x68, 0x28, 0x8350)  /* <CJK> */
-MAP(0x68, 0x29, 0x8345)  /* <CJK> */
-MAP(0x68, 0x2A, 0x832F)  /* <CJK> */
-MAP(0x68, 0x2B, 0x832B)  /* <CJK> */
-MAP(0x68, 0x2C, 0x8317)  /* <CJK> */
-MAP(0x68, 0x2D, 0x8318)  /* <CJK> */
-MAP(0x68, 0x2E, 0x8385)  /* <CJK> */
-MAP(0x68, 0x2F, 0x839A)  /* <CJK> */
-MAP(0x68, 0x30, 0x83AA)  /* <CJK> */
-MAP(0x68, 0x31, 0x839F)  /* <CJK> */
-MAP(0x68, 0x32, 0x83A2)  /* <CJK> */
-MAP(0x68, 0x33, 0x8396)  /* <CJK> */
-MAP(0x68, 0x34, 0x8323)  /* <CJK> */
-MAP(0x68, 0x35, 0x838E)  /* <CJK> */
-MAP(0x68, 0x36, 0x8387)  /* <CJK> */
-MAP(0x68, 0x37, 0x838A)  /* <CJK> */
-MAP(0x68, 0x38, 0x837C)  /* <CJK> */
-MAP(0x68, 0x39, 0x83B5)  /* <CJK> */
-MAP(0x68, 0x3A, 0x8373)  /* <CJK> */
-MAP(0x68, 0x3B, 0x8375)  /* <CJK> */
-MAP(0x68, 0x3C, 0x83A0)  /* <CJK> */
-MAP(0x68, 0x3D, 0x8389)  /* <CJK> */
-MAP(0x68, 0x3E, 0x83A8)  /* <CJK> */
-MAP(0x68, 0x3F, 0x83F4)  /* <CJK> */
-MAP(0x68, 0x40, 0x8413)  /* <CJK> */
-MAP(0x68, 0x41, 0x83EB)  /* <CJK> */
-MAP(0x68, 0x42, 0x83CE)  /* <CJK> */
-MAP(0x68, 0x43, 0x83FD)  /* <CJK> */
-MAP(0x68, 0x44, 0x8403)  /* <CJK> */
-MAP(0x68, 0x45, 0x83D8)  /* <CJK> */
-MAP(0x68, 0x46, 0x840B)  /* <CJK> */
-MAP(0x68, 0x47, 0x83C1)  /* <CJK> */
-MAP(0x68, 0x48, 0x83F7)  /* <CJK> */
-MAP(0x68, 0x49, 0x8407)  /* <CJK> */
-MAP(0x68, 0x4A, 0x83E0)  /* <CJK> */
-MAP(0x68, 0x4B, 0x83F2)  /* <CJK> */
-MAP(0x68, 0x4C, 0x840D)  /* <CJK> */
-MAP(0x68, 0x4D, 0x8422)  /* <CJK> */
-MAP(0x68, 0x4E, 0x8420)  /* <CJK> */
-MAP(0x68, 0x4F, 0x83BD)  /* <CJK> */
-MAP(0x68, 0x50, 0x8438)  /* <CJK> */
-MAP(0x68, 0x51, 0x8506)  /* <CJK> */
-MAP(0x68, 0x52, 0x83FB)  /* <CJK> */
-MAP(0x68, 0x53, 0x846D)  /* <CJK> */
-MAP(0x68, 0x54, 0x842A)  /* <CJK> */
-MAP(0x68, 0x55, 0x843C)  /* <CJK> */
-MAP(0x68, 0x56, 0x855A)  /* <CJK> */
-MAP(0x68, 0x57, 0x8484)  /* <CJK> */
-MAP(0x68, 0x58, 0x8477)  /* <CJK> */
-MAP(0x68, 0x59, 0x846B)  /* <CJK> */
-MAP(0x68, 0x5A, 0x84AD)  /* <CJK> */
-MAP(0x68, 0x5B, 0x846E)  /* <CJK> */
-MAP(0x68, 0x5C, 0x8482)  /* <CJK> */
-MAP(0x68, 0x5D, 0x8469)  /* <CJK> */
-MAP(0x68, 0x5E, 0x8446)  /* <CJK> */
-MAP(0x68, 0x5F, 0x842C)  /* <CJK> */
-MAP(0x68, 0x60, 0x846F)  /* <CJK> */
-MAP(0x68, 0x61, 0x8479)  /* <CJK> */
-MAP(0x68, 0x62, 0x8435)  /* <CJK> */
-MAP(0x68, 0x63, 0x84CA)  /* <CJK> */
-MAP(0x68, 0x64, 0x8462)  /* <CJK> */
-MAP(0x68, 0x65, 0x84B9)  /* <CJK> */
-MAP(0x68, 0x66, 0x84BF)  /* <CJK> */
-MAP(0x68, 0x67, 0x849F)  /* <CJK> */
-MAP(0x68, 0x68, 0x84D9)  /* <CJK> */
-MAP(0x68, 0x69, 0x84CD)  /* <CJK> */
-MAP(0x68, 0x6A, 0x84BB)  /* <CJK> */
-MAP(0x68, 0x6B, 0x84DA)  /* <CJK> */
-MAP(0x68, 0x6C, 0x84D0)  /* <CJK> */
-MAP(0x68, 0x6D, 0x84C1)  /* <CJK> */
-MAP(0x68, 0x6E, 0x84C6)  /* <CJK> */
-MAP(0x68, 0x6F, 0x84D6)  /* <CJK> */
-MAP(0x68, 0x70, 0x84A1)  /* <CJK> */
-MAP(0x68, 0x71, 0x8521)  /* <CJK> */
-MAP(0x68, 0x72, 0x84FF)  /* <CJK> */
-MAP(0x68, 0x73, 0x84F4)  /* <CJK> */
-MAP(0x68, 0x74, 0x8517)  /* <CJK> */
-MAP(0x68, 0x75, 0x8518)  /* <CJK> */
-MAP(0x68, 0x76, 0x852C)  /* <CJK> */
-MAP(0x68, 0x77, 0x851F)  /* <CJK> */
-MAP(0x68, 0x78, 0x8515)  /* <CJK> */
-MAP(0x68, 0x79, 0x8514)  /* <CJK> */
-MAP(0x68, 0x7A, 0x84FC)  /* <CJK> */
-MAP(0x68, 0x7B, 0x8540)  /* <CJK> */
-MAP(0x68, 0x7C, 0x8563)  /* <CJK> */
-MAP(0x68, 0x7D, 0x8558)  /* <CJK> */
-MAP(0x68, 0x7E, 0x8548)  /* <CJK> */
-MAP(0x69, 0x21, 0x8541)  /* <CJK> */
-MAP(0x69, 0x22, 0x8602)  /* <CJK> */
-MAP(0x69, 0x23, 0x854B)  /* <CJK> */
-MAP(0x69, 0x24, 0x8555)  /* <CJK> */
-MAP(0x69, 0x25, 0x8580)  /* <CJK> */
-MAP(0x69, 0x26, 0x85A4)  /* <CJK> */
-MAP(0x69, 0x27, 0x8588)  /* <CJK> */
-MAP(0x69, 0x28, 0x8591)  /* <CJK> */
-MAP(0x69, 0x29, 0x858A)  /* <CJK> */
-MAP(0x69, 0x2A, 0x85A8)  /* <CJK> */
-MAP(0x69, 0x2B, 0x856D)  /* <CJK> */
-MAP(0x69, 0x2C, 0x8594)  /* <CJK> */
-MAP(0x69, 0x2D, 0x859B)  /* <CJK> */
-MAP(0x69, 0x2E, 0x85EA)  /* <CJK> */
-MAP(0x69, 0x2F, 0x8587)  /* <CJK> */
-MAP(0x69, 0x30, 0x859C)  /* <CJK> */
-MAP(0x69, 0x31, 0x8577)  /* <CJK> */
-MAP(0x69, 0x32, 0x857E)  /* <CJK> */
-MAP(0x69, 0x33, 0x8590)  /* <CJK> */
-MAP(0x69, 0x34, 0x85C9)  /* <CJK> */
-MAP(0x69, 0x35, 0x85BA)  /* <CJK> */
-MAP(0x69, 0x36, 0x85CF)  /* <CJK> */
-MAP(0x69, 0x37, 0x85B9)  /* <CJK> */
-MAP(0x69, 0x38, 0x85D0)  /* <CJK> */
-MAP(0x69, 0x39, 0x85D5)  /* <CJK> */
-MAP(0x69, 0x3A, 0x85DD)  /* <CJK> */
-MAP(0x69, 0x3B, 0x85E5)  /* <CJK> */
-MAP(0x69, 0x3C, 0x85DC)  /* <CJK> */
-MAP(0x69, 0x3D, 0x85F9)  /* <CJK> */
-MAP(0x69, 0x3E, 0x860A)  /* <CJK> */
-MAP(0x69, 0x3F, 0x8613)  /* <CJK> */
-MAP(0x69, 0x40, 0x860B)  /* <CJK> */
-MAP(0x69, 0x41, 0x85FE)  /* <CJK> */
-MAP(0x69, 0x42, 0x85FA)  /* <CJK> */
-MAP(0x69, 0x43, 0x8606)  /* <CJK> */
-MAP(0x69, 0x44, 0x8622)  /* <CJK> */
-MAP(0x69, 0x45, 0x861A)  /* <CJK> */
-MAP(0x69, 0x46, 0x8630)  /* <CJK> */
-MAP(0x69, 0x47, 0x863F)  /* <CJK> */
-MAP(0x69, 0x48, 0x864D)  /* <CJK> */
-MAP(0x69, 0x49, 0x4E55)  /* <CJK> */
-MAP(0x69, 0x4A, 0x8654)  /* <CJK> */
-MAP(0x69, 0x4B, 0x865F)  /* <CJK> */
-MAP(0x69, 0x4C, 0x8667)  /* <CJK> */
-MAP(0x69, 0x4D, 0x8671)  /* <CJK> */
-MAP(0x69, 0x4E, 0x8693)  /* <CJK> */
-MAP(0x69, 0x4F, 0x86A3)  /* <CJK> */
-MAP(0x69, 0x50, 0x86A9)  /* <CJK> */
-MAP(0x69, 0x51, 0x86AA)  /* <CJK> */
-MAP(0x69, 0x52, 0x868B)  /* <CJK> */
-MAP(0x69, 0x53, 0x868C)  /* <CJK> */
-MAP(0x69, 0x54, 0x86B6)  /* <CJK> */
-MAP(0x69, 0x55, 0x86AF)  /* <CJK> */
-MAP(0x69, 0x56, 0x86C4)  /* <CJK> */
-MAP(0x69, 0x57, 0x86C6)  /* <CJK> */
-MAP(0x69, 0x58, 0x86B0)  /* <CJK> */
-MAP(0x69, 0x59, 0x86C9)  /* <CJK> */
-MAP(0x69, 0x5A, 0x8823)  /* <CJK> */
-MAP(0x69, 0x5B, 0x86AB)  /* <CJK> */
-MAP(0x69, 0x5C, 0x86D4)  /* <CJK> */
-MAP(0x69, 0x5D, 0x86DE)  /* <CJK> */
-MAP(0x69, 0x5E, 0x86E9)  /* <CJK> */
-MAP(0x69, 0x5F, 0x86EC)  /* <CJK> */
-MAP(0x69, 0x60, 0x86DF)  /* <CJK> */
-MAP(0x69, 0x61, 0x86DB)  /* <CJK> */
-MAP(0x69, 0x62, 0x86EF)  /* <CJK> */
-MAP(0x69, 0x63, 0x8712)  /* <CJK> */
-MAP(0x69, 0x64, 0x8706)  /* <CJK> */
-MAP(0x69, 0x65, 0x8708)  /* <CJK> */
-MAP(0x69, 0x66, 0x8700)  /* <CJK> */
-MAP(0x69, 0x67, 0x8703)  /* <CJK> */
-MAP(0x69, 0x68, 0x86FB)  /* <CJK> */
-MAP(0x69, 0x69, 0x8711)  /* <CJK> */
-MAP(0x69, 0x6A, 0x8709)  /* <CJK> */
-MAP(0x69, 0x6B, 0x870D)  /* <CJK> */
-MAP(0x69, 0x6C, 0x86F9)  /* <CJK> */
-MAP(0x69, 0x6D, 0x870A)  /* <CJK> */
-MAP(0x69, 0x6E, 0x8734)  /* <CJK> */
-MAP(0x69, 0x6F, 0x873F)  /* <CJK> */
-MAP(0x69, 0x70, 0x8737)  /* <CJK> */
-MAP(0x69, 0x71, 0x873B)  /* <CJK> */
-MAP(0x69, 0x72, 0x8725)  /* <CJK> */
-MAP(0x69, 0x73, 0x8729)  /* <CJK> */
-MAP(0x69, 0x74, 0x871A)  /* <CJK> */
-MAP(0x69, 0x75, 0x8760)  /* <CJK> */
-MAP(0x69, 0x76, 0x875F)  /* <CJK> */
-MAP(0x69, 0x77, 0x8778)  /* <CJK> */
-MAP(0x69, 0x78, 0x874C)  /* <CJK> */
-MAP(0x69, 0x79, 0x874E)  /* <CJK> */
-MAP(0x69, 0x7A, 0x8774)  /* <CJK> */
-MAP(0x69, 0x7B, 0x8757)  /* <CJK> */
-MAP(0x69, 0x7C, 0x8768)  /* <CJK> */
-MAP(0x69, 0x7D, 0x876E)  /* <CJK> */
-MAP(0x69, 0x7E, 0x8759)  /* <CJK> */
-MAP(0x6A, 0x21, 0x8753)  /* <CJK> */
-MAP(0x6A, 0x22, 0x8763)  /* <CJK> */
-MAP(0x6A, 0x23, 0x876A)  /* <CJK> */
-MAP(0x6A, 0x24, 0x8805)  /* <CJK> */
-MAP(0x6A, 0x25, 0x87A2)  /* <CJK> */
-MAP(0x6A, 0x26, 0x879F)  /* <CJK> */
-MAP(0x6A, 0x27, 0x8782)  /* <CJK> */
-MAP(0x6A, 0x28, 0x87AF)  /* <CJK> */
-MAP(0x6A, 0x29, 0x87CB)  /* <CJK> */
-MAP(0x6A, 0x2A, 0x87BD)  /* <CJK> */
-MAP(0x6A, 0x2B, 0x87C0)  /* <CJK> */
-MAP(0x6A, 0x2C, 0x87D0)  /* <CJK> */
-MAP(0x6A, 0x2D, 0x96D6)  /* <CJK> */
-MAP(0x6A, 0x2E, 0x87AB)  /* <CJK> */
-MAP(0x6A, 0x2F, 0x87C4)  /* <CJK> */
-MAP(0x6A, 0x30, 0x87B3)  /* <CJK> */
-MAP(0x6A, 0x31, 0x87C7)  /* <CJK> */
-MAP(0x6A, 0x32, 0x87C6)  /* <CJK> */
-MAP(0x6A, 0x33, 0x87BB)  /* <CJK> */
-MAP(0x6A, 0x34, 0x87EF)  /* <CJK> */
-MAP(0x6A, 0x35, 0x87F2)  /* <CJK> */
-MAP(0x6A, 0x36, 0x87E0)  /* <CJK> */
-MAP(0x6A, 0x37, 0x880F)  /* <CJK> */
-MAP(0x6A, 0x38, 0x880D)  /* <CJK> */
-MAP(0x6A, 0x39, 0x87FE)  /* <CJK> */
-MAP(0x6A, 0x3A, 0x87F6)  /* <CJK> */
-MAP(0x6A, 0x3B, 0x87F7)  /* <CJK> */
-MAP(0x6A, 0x3C, 0x880E)  /* <CJK> */
-MAP(0x6A, 0x3D, 0x87D2)  /* <CJK> */
-MAP(0x6A, 0x3E, 0x8811)  /* <CJK> */
-MAP(0x6A, 0x3F, 0x8816)  /* <CJK> */
-MAP(0x6A, 0x40, 0x8815)  /* <CJK> */
-MAP(0x6A, 0x41, 0x8822)  /* <CJK> */
-MAP(0x6A, 0x42, 0x8821)  /* <CJK> */
-MAP(0x6A, 0x43, 0x8831)  /* <CJK> */
-MAP(0x6A, 0x44, 0x8836)  /* <CJK> */
-MAP(0x6A, 0x45, 0x8839)  /* <CJK> */
-MAP(0x6A, 0x46, 0x8827)  /* <CJK> */
-MAP(0x6A, 0x47, 0x883B)  /* <CJK> */
-MAP(0x6A, 0x48, 0x8844)  /* <CJK> */
-MAP(0x6A, 0x49, 0x8842)  /* <CJK> */
-MAP(0x6A, 0x4A, 0x8852)  /* <CJK> */
-MAP(0x6A, 0x4B, 0x8859)  /* <CJK> */
-MAP(0x6A, 0x4C, 0x885E)  /* <CJK> */
-MAP(0x6A, 0x4D, 0x8862)  /* <CJK> */
-MAP(0x6A, 0x4E, 0x886B)  /* <CJK> */
-MAP(0x6A, 0x4F, 0x8881)  /* <CJK> */
-MAP(0x6A, 0x50, 0x887E)  /* <CJK> */
-MAP(0x6A, 0x51, 0x889E)  /* <CJK> */
-MAP(0x6A, 0x52, 0x8875)  /* <CJK> */
-MAP(0x6A, 0x53, 0x887D)  /* <CJK> */
-MAP(0x6A, 0x54, 0x88B5)  /* <CJK> */
-MAP(0x6A, 0x55, 0x8872)  /* <CJK> */
-MAP(0x6A, 0x56, 0x8882)  /* <CJK> */
-MAP(0x6A, 0x57, 0x8897)  /* <CJK> */
-MAP(0x6A, 0x58, 0x8892)  /* <CJK> */
-MAP(0x6A, 0x59, 0x88AE)  /* <CJK> */
-MAP(0x6A, 0x5A, 0x8899)  /* <CJK> */
-MAP(0x6A, 0x5B, 0x88A2)  /* <CJK> */
-MAP(0x6A, 0x5C, 0x888D)  /* <CJK> */
-MAP(0x6A, 0x5D, 0x88A4)  /* <CJK> */
-MAP(0x6A, 0x5E, 0x88B0)  /* <CJK> */
-MAP(0x6A, 0x5F, 0x88BF)  /* <CJK> */
-MAP(0x6A, 0x60, 0x88B1)  /* <CJK> */
-MAP(0x6A, 0x61, 0x88C3)  /* <CJK> */
-MAP(0x6A, 0x62, 0x88C4)  /* <CJK> */
-MAP(0x6A, 0x63, 0x88D4)  /* <CJK> */
-MAP(0x6A, 0x64, 0x88D8)  /* <CJK> */
-MAP(0x6A, 0x65, 0x88D9)  /* <CJK> */
-MAP(0x6A, 0x66, 0x88DD)  /* <CJK> */
-MAP(0x6A, 0x67, 0x88F9)  /* <CJK> */
-MAP(0x6A, 0x68, 0x8902)  /* <CJK> */
-MAP(0x6A, 0x69, 0x88FC)  /* <CJK> */
-MAP(0x6A, 0x6A, 0x88F4)  /* <CJK> */
-MAP(0x6A, 0x6B, 0x88E8)  /* <CJK> */
-MAP(0x6A, 0x6C, 0x88F2)  /* <CJK> */
-MAP(0x6A, 0x6D, 0x8904)  /* <CJK> */
-MAP(0x6A, 0x6E, 0x890C)  /* <CJK> */
-MAP(0x6A, 0x6F, 0x890A)  /* <CJK> */
-MAP(0x6A, 0x70, 0x8913)  /* <CJK> */
-MAP(0x6A, 0x71, 0x8943)  /* <CJK> */
-MAP(0x6A, 0x72, 0x891E)  /* <CJK> */
-MAP(0x6A, 0x73, 0x8925)  /* <CJK> */
-MAP(0x6A, 0x74, 0x892A)  /* <CJK> */
-MAP(0x6A, 0x75, 0x892B)  /* <CJK> */
-MAP(0x6A, 0x76, 0x8941)  /* <CJK> */
-MAP(0x6A, 0x77, 0x8944)  /* <CJK> */
-MAP(0x6A, 0x78, 0x893B)  /* <CJK> */
-MAP(0x6A, 0x79, 0x8936)  /* <CJK> */
-MAP(0x6A, 0x7A, 0x8938)  /* <CJK> */
-MAP(0x6A, 0x7B, 0x894C)  /* <CJK> */
-MAP(0x6A, 0x7C, 0x891D)  /* <CJK> */
-MAP(0x6A, 0x7D, 0x8960)  /* <CJK> */
-MAP(0x6A, 0x7E, 0x895E)  /* <CJK> */
-MAP(0x6B, 0x21, 0x8966)  /* <CJK> */
-MAP(0x6B, 0x22, 0x8964)  /* <CJK> */
-MAP(0x6B, 0x23, 0x896D)  /* <CJK> */
-MAP(0x6B, 0x24, 0x896A)  /* <CJK> */
-MAP(0x6B, 0x25, 0x896F)  /* <CJK> */
-MAP(0x6B, 0x26, 0x8974)  /* <CJK> */
-MAP(0x6B, 0x27, 0x8977)  /* <CJK> */
-MAP(0x6B, 0x28, 0x897E)  /* <CJK> */
-MAP(0x6B, 0x29, 0x8983)  /* <CJK> */
-MAP(0x6B, 0x2A, 0x8988)  /* <CJK> */
-MAP(0x6B, 0x2B, 0x898A)  /* <CJK> */
-MAP(0x6B, 0x2C, 0x8993)  /* <CJK> */
-MAP(0x6B, 0x2D, 0x8998)  /* <CJK> */
-MAP(0x6B, 0x2E, 0x89A1)  /* <CJK> */
-MAP(0x6B, 0x2F, 0x89A9)  /* <CJK> */
-MAP(0x6B, 0x30, 0x89A6)  /* <CJK> */
-MAP(0x6B, 0x31, 0x89AC)  /* <CJK> */
-MAP(0x6B, 0x32, 0x89AF)  /* <CJK> */
-MAP(0x6B, 0x33, 0x89B2)  /* <CJK> */
-MAP(0x6B, 0x34, 0x89BA)  /* <CJK> */
-MAP(0x6B, 0x35, 0x89BD)  /* <CJK> */
-MAP(0x6B, 0x36, 0x89BF)  /* <CJK> */
-MAP(0x6B, 0x37, 0x89C0)  /* <CJK> */
-MAP(0x6B, 0x38, 0x89DA)  /* <CJK> */
-MAP(0x6B, 0x39, 0x89DC)  /* <CJK> */
-MAP(0x6B, 0x3A, 0x89DD)  /* <CJK> */
-MAP(0x6B, 0x3B, 0x89E7)  /* <CJK> */
-MAP(0x6B, 0x3C, 0x89F4)  /* <CJK> */
-MAP(0x6B, 0x3D, 0x89F8)  /* <CJK> */
-MAP(0x6B, 0x3E, 0x8A03)  /* <CJK> */
-MAP(0x6B, 0x3F, 0x8A16)  /* <CJK> */
-MAP(0x6B, 0x40, 0x8A10)  /* <CJK> */
-MAP(0x6B, 0x41, 0x8A0C)  /* <CJK> */
-MAP(0x6B, 0x42, 0x8A1B)  /* <CJK> */
-MAP(0x6B, 0x43, 0x8A1D)  /* <CJK> */
-MAP(0x6B, 0x44, 0x8A25)  /* <CJK> */
-MAP(0x6B, 0x45, 0x8A36)  /* <CJK> */
-MAP(0x6B, 0x46, 0x8A41)  /* <CJK> */
-MAP(0x6B, 0x47, 0x8A5B)  /* <CJK> */
-MAP(0x6B, 0x48, 0x8A52)  /* <CJK> */
-MAP(0x6B, 0x49, 0x8A46)  /* <CJK> */
-MAP(0x6B, 0x4A, 0x8A48)  /* <CJK> */
-MAP(0x6B, 0x4B, 0x8A7C)  /* <CJK> */
-MAP(0x6B, 0x4C, 0x8A6D)  /* <CJK> */
-MAP(0x6B, 0x4D, 0x8A6C)  /* <CJK> */
-MAP(0x6B, 0x4E, 0x8A62)  /* <CJK> */
-MAP(0x6B, 0x4F, 0x8A85)  /* <CJK> */
-MAP(0x6B, 0x50, 0x8A82)  /* <CJK> */
-MAP(0x6B, 0x51, 0x8A84)  /* <CJK> */
-MAP(0x6B, 0x52, 0x8AA8)  /* <CJK> */
-MAP(0x6B, 0x53, 0x8AA1)  /* <CJK> */
-MAP(0x6B, 0x54, 0x8A91)  /* <CJK> */
-MAP(0x6B, 0x55, 0x8AA5)  /* <CJK> */
-MAP(0x6B, 0x56, 0x8AA6)  /* <CJK> */
-MAP(0x6B, 0x57, 0x8A9A)  /* <CJK> */
-MAP(0x6B, 0x58, 0x8AA3)  /* <CJK> */
-MAP(0x6B, 0x59, 0x8AC4)  /* <CJK> */
-MAP(0x6B, 0x5A, 0x8ACD)  /* <CJK> */
-MAP(0x6B, 0x5B, 0x8AC2)  /* <CJK> */
-MAP(0x6B, 0x5C, 0x8ADA)  /* <CJK> */
-MAP(0x6B, 0x5D, 0x8AEB)  /* <CJK> */
-MAP(0x6B, 0x5E, 0x8AF3)  /* <CJK> */
-MAP(0x6B, 0x5F, 0x8AE7)  /* <CJK> */
-MAP(0x6B, 0x60, 0x8AE4)  /* <CJK> */
-MAP(0x6B, 0x61, 0x8AF1)  /* <CJK> */
-MAP(0x6B, 0x62, 0x8B14)  /* <CJK> */
-MAP(0x6B, 0x63, 0x8AE0)  /* <CJK> */
-MAP(0x6B, 0x64, 0x8AE2)  /* <CJK> */
-MAP(0x6B, 0x65, 0x8AF7)  /* <CJK> */
-MAP(0x6B, 0x66, 0x8ADE)  /* <CJK> */
-MAP(0x6B, 0x67, 0x8ADB)  /* <CJK> */
-MAP(0x6B, 0x68, 0x8B0C)  /* <CJK> */
-MAP(0x6B, 0x69, 0x8B07)  /* <CJK> */
-MAP(0x6B, 0x6A, 0x8B1A)  /* <CJK> */
-MAP(0x6B, 0x6B, 0x8AE1)  /* <CJK> */
-MAP(0x6B, 0x6C, 0x8B16)  /* <CJK> */
-MAP(0x6B, 0x6D, 0x8B10)  /* <CJK> */
-MAP(0x6B, 0x6E, 0x8B17)  /* <CJK> */
-MAP(0x6B, 0x6F, 0x8B20)  /* <CJK> */
-MAP(0x6B, 0x70, 0x8B33)  /* <CJK> */
-MAP(0x6B, 0x71, 0x97AB)  /* <CJK> */
-MAP(0x6B, 0x72, 0x8B26)  /* <CJK> */
-MAP(0x6B, 0x73, 0x8B2B)  /* <CJK> */
-MAP(0x6B, 0x74, 0x8B3E)  /* <CJK> */
-MAP(0x6B, 0x75, 0x8B28)  /* <CJK> */
-MAP(0x6B, 0x76, 0x8B41)  /* <CJK> */
-MAP(0x6B, 0x77, 0x8B4C)  /* <CJK> */
-MAP(0x6B, 0x78, 0x8B4F)  /* <CJK> */
-MAP(0x6B, 0x79, 0x8B4E)  /* <CJK> */
-MAP(0x6B, 0x7A, 0x8B49)  /* <CJK> */
-MAP(0x6B, 0x7B, 0x8B56)  /* <CJK> */
-MAP(0x6B, 0x7C, 0x8B5B)  /* <CJK> */
-MAP(0x6B, 0x7D, 0x8B5A)  /* <CJK> */
-MAP(0x6B, 0x7E, 0x8B6B)  /* <CJK> */
-MAP(0x6C, 0x21, 0x8B5F)  /* <CJK> */
-MAP(0x6C, 0x22, 0x8B6C)  /* <CJK> */
-MAP(0x6C, 0x23, 0x8B6F)  /* <CJK> */
-MAP(0x6C, 0x24, 0x8B74)  /* <CJK> */
-MAP(0x6C, 0x25, 0x8B7D)  /* <CJK> */
-MAP(0x6C, 0x26, 0x8B80)  /* <CJK> */
-MAP(0x6C, 0x27, 0x8B8C)  /* <CJK> */
-MAP(0x6C, 0x28, 0x8B8E)  /* <CJK> */
-MAP(0x6C, 0x29, 0x8B92)  /* <CJK> */
-MAP(0x6C, 0x2A, 0x8B93)  /* <CJK> */
-MAP(0x6C, 0x2B, 0x8B96)  /* <CJK> */
-MAP(0x6C, 0x2C, 0x8B99)  /* <CJK> */
-MAP(0x6C, 0x2D, 0x8B9A)  /* <CJK> */
-MAP(0x6C, 0x2E, 0x8C3A)  /* <CJK> */
-MAP(0x6C, 0x2F, 0x8C41)  /* <CJK> */
-MAP(0x6C, 0x30, 0x8C3F)  /* <CJK> */
-MAP(0x6C, 0x31, 0x8C48)  /* <CJK> */
-MAP(0x6C, 0x32, 0x8C4C)  /* <CJK> */
-MAP(0x6C, 0x33, 0x8C4E)  /* <CJK> */
-MAP(0x6C, 0x34, 0x8C50)  /* <CJK> */
-MAP(0x6C, 0x35, 0x8C55)  /* <CJK> */
-MAP(0x6C, 0x36, 0x8C62)  /* <CJK> */
-MAP(0x6C, 0x37, 0x8C6C)  /* <CJK> */
-MAP(0x6C, 0x38, 0x8C78)  /* <CJK> */
-MAP(0x6C, 0x39, 0x8C7A)  /* <CJK> */
-MAP(0x6C, 0x3A, 0x8C82)  /* <CJK> */
-MAP(0x6C, 0x3B, 0x8C89)  /* <CJK> */
-MAP(0x6C, 0x3C, 0x8C85)  /* <CJK> */
-MAP(0x6C, 0x3D, 0x8C8A)  /* <CJK> */
-MAP(0x6C, 0x3E, 0x8C8D)  /* <CJK> */
-MAP(0x6C, 0x3F, 0x8C8E)  /* <CJK> */
-MAP(0x6C, 0x40, 0x8C94)  /* <CJK> */
-MAP(0x6C, 0x41, 0x8C7C)  /* <CJK> */
-MAP(0x6C, 0x42, 0x8C98)  /* <CJK> */
-MAP(0x6C, 0x43, 0x621D)  /* <CJK> */
-MAP(0x6C, 0x44, 0x8CAD)  /* <CJK> */
-MAP(0x6C, 0x45, 0x8CAA)  /* <CJK> */
-MAP(0x6C, 0x46, 0x8CBD)  /* <CJK> */
-MAP(0x6C, 0x47, 0x8CB2)  /* <CJK> */
-MAP(0x6C, 0x48, 0x8CB3)  /* <CJK> */
-MAP(0x6C, 0x49, 0x8CAE)  /* <CJK> */
-MAP(0x6C, 0x4A, 0x8CB6)  /* <CJK> */
-MAP(0x6C, 0x4B, 0x8CC8)  /* <CJK> */
-MAP(0x6C, 0x4C, 0x8CC1)  /* <CJK> */
-MAP(0x6C, 0x4D, 0x8CE4)  /* <CJK> */
-MAP(0x6C, 0x4E, 0x8CE3)  /* <CJK> */
-MAP(0x6C, 0x4F, 0x8CDA)  /* <CJK> */
-MAP(0x6C, 0x50, 0x8CFD)  /* <CJK> */
-MAP(0x6C, 0x51, 0x8CFA)  /* <CJK> */
-MAP(0x6C, 0x52, 0x8CFB)  /* <CJK> */
-MAP(0x6C, 0x53, 0x8D04)  /* <CJK> */
-MAP(0x6C, 0x54, 0x8D05)  /* <CJK> */
-MAP(0x6C, 0x55, 0x8D0A)  /* <CJK> */
-MAP(0x6C, 0x56, 0x8D07)  /* <CJK> */
-MAP(0x6C, 0x57, 0x8D0F)  /* <CJK> */
-MAP(0x6C, 0x58, 0x8D0D)  /* <CJK> */
-MAP(0x6C, 0x59, 0x8D10)  /* <CJK> */
-MAP(0x6C, 0x5A, 0x9F4E)  /* <CJK> */
-MAP(0x6C, 0x5B, 0x8D13)  /* <CJK> */
-MAP(0x6C, 0x5C, 0x8CCD)  /* <CJK> */
-MAP(0x6C, 0x5D, 0x8D14)  /* <CJK> */
-MAP(0x6C, 0x5E, 0x8D16)  /* <CJK> */
-MAP(0x6C, 0x5F, 0x8D67)  /* <CJK> */
-MAP(0x6C, 0x60, 0x8D6D)  /* <CJK> */
-MAP(0x6C, 0x61, 0x8D71)  /* <CJK> */
-MAP(0x6C, 0x62, 0x8D73)  /* <CJK> */
-MAP(0x6C, 0x63, 0x8D81)  /* <CJK> */
-MAP(0x6C, 0x64, 0x8D99)  /* <CJK> */
-MAP(0x6C, 0x65, 0x8DC2)  /* <CJK> */
-MAP(0x6C, 0x66, 0x8DBE)  /* <CJK> */
-MAP(0x6C, 0x67, 0x8DBA)  /* <CJK> */
-MAP(0x6C, 0x68, 0x8DCF)  /* <CJK> */
-MAP(0x6C, 0x69, 0x8DDA)  /* <CJK> */
-MAP(0x6C, 0x6A, 0x8DD6)  /* <CJK> */
-MAP(0x6C, 0x6B, 0x8DCC)  /* <CJK> */
-MAP(0x6C, 0x6C, 0x8DDB)  /* <CJK> */
-MAP(0x6C, 0x6D, 0x8DCB)  /* <CJK> */
-MAP(0x6C, 0x6E, 0x8DEA)  /* <CJK> */
-MAP(0x6C, 0x6F, 0x8DEB)  /* <CJK> */
-MAP(0x6C, 0x70, 0x8DDF)  /* <CJK> */
-MAP(0x6C, 0x71, 0x8DE3)  /* <CJK> */
-MAP(0x6C, 0x72, 0x8DFC)  /* <CJK> */
-MAP(0x6C, 0x73, 0x8E08)  /* <CJK> */
-MAP(0x6C, 0x74, 0x8E09)  /* <CJK> */
-MAP(0x6C, 0x75, 0x8DFF)  /* <CJK> */
-MAP(0x6C, 0x76, 0x8E1D)  /* <CJK> */
-MAP(0x6C, 0x77, 0x8E1E)  /* <CJK> */
-MAP(0x6C, 0x78, 0x8E10)  /* <CJK> */
-MAP(0x6C, 0x79, 0x8E1F)  /* <CJK> */
-MAP(0x6C, 0x7A, 0x8E42)  /* <CJK> */
-MAP(0x6C, 0x7B, 0x8E35)  /* <CJK> */
-MAP(0x6C, 0x7C, 0x8E30)  /* <CJK> */
-MAP(0x6C, 0x7D, 0x8E34)  /* <CJK> */
-MAP(0x6C, 0x7E, 0x8E4A)  /* <CJK> */
-MAP(0x6D, 0x21, 0x8E47)  /* <CJK> */
-MAP(0x6D, 0x22, 0x8E49)  /* <CJK> */
-MAP(0x6D, 0x23, 0x8E4C)  /* <CJK> */
-MAP(0x6D, 0x24, 0x8E50)  /* <CJK> */
-MAP(0x6D, 0x25, 0x8E48)  /* <CJK> */
-MAP(0x6D, 0x26, 0x8E59)  /* <CJK> */
-MAP(0x6D, 0x27, 0x8E64)  /* <CJK> */
-MAP(0x6D, 0x28, 0x8E60)  /* <CJK> */
-MAP(0x6D, 0x29, 0x8E2A)  /* <CJK> */
-MAP(0x6D, 0x2A, 0x8E63)  /* <CJK> */
-MAP(0x6D, 0x2B, 0x8E55)  /* <CJK> */
-MAP(0x6D, 0x2C, 0x8E76)  /* <CJK> */
-MAP(0x6D, 0x2D, 0x8E72)  /* <CJK> */
-MAP(0x6D, 0x2E, 0x8E7C)  /* <CJK> */
-MAP(0x6D, 0x2F, 0x8E81)  /* <CJK> */
-MAP(0x6D, 0x30, 0x8E87)  /* <CJK> */
-MAP(0x6D, 0x31, 0x8E85)  /* <CJK> */
-MAP(0x6D, 0x32, 0x8E84)  /* <CJK> */
-MAP(0x6D, 0x33, 0x8E8B)  /* <CJK> */
-MAP(0x6D, 0x34, 0x8E8A)  /* <CJK> */
-MAP(0x6D, 0x35, 0x8E93)  /* <CJK> */
-MAP(0x6D, 0x36, 0x8E91)  /* <CJK> */
-MAP(0x6D, 0x37, 0x8E94)  /* <CJK> */
-MAP(0x6D, 0x38, 0x8E99)  /* <CJK> */
-MAP(0x6D, 0x39, 0x8EAA)  /* <CJK> */
-MAP(0x6D, 0x3A, 0x8EA1)  /* <CJK> */
-MAP(0x6D, 0x3B, 0x8EAC)  /* <CJK> */
-MAP(0x6D, 0x3C, 0x8EB0)  /* <CJK> */
-MAP(0x6D, 0x3D, 0x8EC6)  /* <CJK> */
-MAP(0x6D, 0x3E, 0x8EB1)  /* <CJK> */
-MAP(0x6D, 0x3F, 0x8EBE)  /* <CJK> */
-MAP(0x6D, 0x40, 0x8EC5)  /* <CJK> */
-MAP(0x6D, 0x41, 0x8EC8)  /* <CJK> */
-MAP(0x6D, 0x42, 0x8ECB)  /* <CJK> */
-MAP(0x6D, 0x43, 0x8EDB)  /* <CJK> */
-MAP(0x6D, 0x44, 0x8EE3)  /* <CJK> */
-MAP(0x6D, 0x45, 0x8EFC)  /* <CJK> */
-MAP(0x6D, 0x46, 0x8EFB)  /* <CJK> */
-MAP(0x6D, 0x47, 0x8EEB)  /* <CJK> */
-MAP(0x6D, 0x48, 0x8EFE)  /* <CJK> */
-MAP(0x6D, 0x49, 0x8F0A)  /* <CJK> */
-MAP(0x6D, 0x4A, 0x8F05)  /* <CJK> */
-MAP(0x6D, 0x4B, 0x8F15)  /* <CJK> */
-MAP(0x6D, 0x4C, 0x8F12)  /* <CJK> */
-MAP(0x6D, 0x4D, 0x8F19)  /* <CJK> */
-MAP(0x6D, 0x4E, 0x8F13)  /* <CJK> */
-MAP(0x6D, 0x4F, 0x8F1C)  /* <CJK> */
-MAP(0x6D, 0x50, 0x8F1F)  /* <CJK> */
-MAP(0x6D, 0x51, 0x8F1B)  /* <CJK> */
-MAP(0x6D, 0x52, 0x8F0C)  /* <CJK> */
-MAP(0x6D, 0x53, 0x8F26)  /* <CJK> */
-MAP(0x6D, 0x54, 0x8F33)  /* <CJK> */
-MAP(0x6D, 0x55, 0x8F3B)  /* <CJK> */
-MAP(0x6D, 0x56, 0x8F39)  /* <CJK> */
-MAP(0x6D, 0x57, 0x8F45)  /* <CJK> */
-MAP(0x6D, 0x58, 0x8F42)  /* <CJK> */
-MAP(0x6D, 0x59, 0x8F3E)  /* <CJK> */
-MAP(0x6D, 0x5A, 0x8F4C)  /* <CJK> */
-MAP(0x6D, 0x5B, 0x8F49)  /* <CJK> */
-MAP(0x6D, 0x5C, 0x8F46)  /* <CJK> */
-MAP(0x6D, 0x5D, 0x8F4E)  /* <CJK> */
-MAP(0x6D, 0x5E, 0x8F57)  /* <CJK> */
-MAP(0x6D, 0x5F, 0x8F5C)  /* <CJK> */
-MAP(0x6D, 0x60, 0x8F62)  /* <CJK> */
-MAP(0x6D, 0x61, 0x8F63)  /* <CJK> */
-MAP(0x6D, 0x62, 0x8F64)  /* <CJK> */
-MAP(0x6D, 0x63, 0x8F9C)  /* <CJK> */
-MAP(0x6D, 0x64, 0x8F9F)  /* <CJK> */
-MAP(0x6D, 0x65, 0x8FA3)  /* <CJK> */
-MAP(0x6D, 0x66, 0x8FAD)  /* <CJK> */
-MAP(0x6D, 0x67, 0x8FAF)  /* <CJK> */
-MAP(0x6D, 0x68, 0x8FB7)  /* <CJK> */
-MAP(0x6D, 0x69, 0x8FDA)  /* <CJK> */
-MAP(0x6D, 0x6A, 0x8FE5)  /* <CJK> */
-MAP(0x6D, 0x6B, 0x8FE2)  /* <CJK> */
-MAP(0x6D, 0x6C, 0x8FEA)  /* <CJK> */
-MAP(0x6D, 0x6D, 0x8FEF)  /* <CJK> */
-MAP(0x6D, 0x6E, 0x9087)  /* <CJK> */
-MAP(0x6D, 0x6F, 0x8FF4)  /* <CJK> */
-MAP(0x6D, 0x70, 0x9005)  /* <CJK> */
-MAP(0x6D, 0x71, 0x8FF9)  /* <CJK> */
-MAP(0x6D, 0x72, 0x8FFA)  /* <CJK> */
-MAP(0x6D, 0x73, 0x9011)  /* <CJK> */
-MAP(0x6D, 0x74, 0x9015)  /* <CJK> */
-MAP(0x6D, 0x75, 0x9021)  /* <CJK> */
-MAP(0x6D, 0x76, 0x900D)  /* <CJK> */
-MAP(0x6D, 0x77, 0x901E)  /* <CJK> */
-MAP(0x6D, 0x78, 0x9016)  /* <CJK> */
-MAP(0x6D, 0x79, 0x900B)  /* <CJK> */
-MAP(0x6D, 0x7A, 0x9027)  /* <CJK> */
-MAP(0x6D, 0x7B, 0x9036)  /* <CJK> */
-MAP(0x6D, 0x7C, 0x9035)  /* <CJK> */
-MAP(0x6D, 0x7D, 0x9039)  /* <CJK> */
-MAP(0x6D, 0x7E, 0x8FF8)  /* <CJK> */
-MAP(0x6E, 0x21, 0x904F)  /* <CJK> */
-MAP(0x6E, 0x22, 0x9050)  /* <CJK> */
-MAP(0x6E, 0x23, 0x9051)  /* <CJK> */
-MAP(0x6E, 0x24, 0x9052)  /* <CJK> */
-MAP(0x6E, 0x25, 0x900E)  /* <CJK> */
-MAP(0x6E, 0x26, 0x9049)  /* <CJK> */
-MAP(0x6E, 0x27, 0x903E)  /* <CJK> */
-MAP(0x6E, 0x28, 0x9056)  /* <CJK> */
-MAP(0x6E, 0x29, 0x9058)  /* <CJK> */
-MAP(0x6E, 0x2A, 0x905E)  /* <CJK> */
-MAP(0x6E, 0x2B, 0x9068)  /* <CJK> */
-MAP(0x6E, 0x2C, 0x906F)  /* <CJK> */
-MAP(0x6E, 0x2D, 0x9076)  /* <CJK> */
-MAP(0x6E, 0x2E, 0x96A8)  /* <CJK> */
-MAP(0x6E, 0x2F, 0x9072)  /* <CJK> */
-MAP(0x6E, 0x30, 0x9082)  /* <CJK> */
-MAP(0x6E, 0x31, 0x907D)  /* <CJK> */
-MAP(0x6E, 0x32, 0x9081)  /* <CJK> */
-MAP(0x6E, 0x33, 0x9080)  /* <CJK> */
-MAP(0x6E, 0x34, 0x908A)  /* <CJK> */
-MAP(0x6E, 0x35, 0x9089)  /* <CJK> */
-MAP(0x6E, 0x36, 0x908F)  /* <CJK> */
-MAP(0x6E, 0x37, 0x90A8)  /* <CJK> */
-MAP(0x6E, 0x38, 0x90AF)  /* <CJK> */
-MAP(0x6E, 0x39, 0x90B1)  /* <CJK> */
-MAP(0x6E, 0x3A, 0x90B5)  /* <CJK> */
-MAP(0x6E, 0x3B, 0x90E2)  /* <CJK> */
-MAP(0x6E, 0x3C, 0x90E4)  /* <CJK> */
-MAP(0x6E, 0x3D, 0x6248)  /* <CJK> */
-MAP(0x6E, 0x3E, 0x90DB)  /* <CJK> */
-MAP(0x6E, 0x3F, 0x9102)  /* <CJK> */
-MAP(0x6E, 0x40, 0x9112)  /* <CJK> */
-MAP(0x6E, 0x41, 0x9119)  /* <CJK> */
-MAP(0x6E, 0x42, 0x9132)  /* <CJK> */
-MAP(0x6E, 0x43, 0x9130)  /* <CJK> */
-MAP(0x6E, 0x44, 0x914A)  /* <CJK> */
-MAP(0x6E, 0x45, 0x9156)  /* <CJK> */
-MAP(0x6E, 0x46, 0x9158)  /* <CJK> */
-MAP(0x6E, 0x47, 0x9163)  /* <CJK> */
-MAP(0x6E, 0x48, 0x9165)  /* <CJK> */
-MAP(0x6E, 0x49, 0x9169)  /* <CJK> */
-MAP(0x6E, 0x4A, 0x9173)  /* <CJK> */
-MAP(0x6E, 0x4B, 0x9172)  /* <CJK> */
-MAP(0x6E, 0x4C, 0x918B)  /* <CJK> */
-MAP(0x6E, 0x4D, 0x9189)  /* <CJK> */
-MAP(0x6E, 0x4E, 0x9182)  /* <CJK> */
-MAP(0x6E, 0x4F, 0x91A2)  /* <CJK> */
-MAP(0x6E, 0x50, 0x91AB)  /* <CJK> */
-MAP(0x6E, 0x51, 0x91AF)  /* <CJK> */
-MAP(0x6E, 0x52, 0x91AA)  /* <CJK> */
-MAP(0x6E, 0x53, 0x91B5)  /* <CJK> */
-MAP(0x6E, 0x54, 0x91B4)  /* <CJK> */
-MAP(0x6E, 0x55, 0x91BA)  /* <CJK> */
-MAP(0x6E, 0x56, 0x91C0)  /* <CJK> */
-MAP(0x6E, 0x57, 0x91C1)  /* <CJK> */
-MAP(0x6E, 0x58, 0x91C9)  /* <CJK> */
-MAP(0x6E, 0x59, 0x91CB)  /* <CJK> */
-MAP(0x6E, 0x5A, 0x91D0)  /* <CJK> */
-MAP(0x6E, 0x5B, 0x91D6)  /* <CJK> */
-MAP(0x6E, 0x5C, 0x91DF)  /* <CJK> */
-MAP(0x6E, 0x5D, 0x91E1)  /* <CJK> */
-MAP(0x6E, 0x5E, 0x91DB)  /* <CJK> */
-MAP(0x6E, 0x5F, 0x91FC)  /* <CJK> */
-MAP(0x6E, 0x60, 0x91F5)  /* <CJK> */
-MAP(0x6E, 0x61, 0x91F6)  /* <CJK> */
-MAP(0x6E, 0x62, 0x921E)  /* <CJK> */
-MAP(0x6E, 0x63, 0x91FF)  /* <CJK> */
-MAP(0x6E, 0x64, 0x9214)  /* <CJK> */
-MAP(0x6E, 0x65, 0x922C)  /* <CJK> */
-MAP(0x6E, 0x66, 0x9215)  /* <CJK> */
-MAP(0x6E, 0x67, 0x9211)  /* <CJK> */
-MAP(0x6E, 0x68, 0x925E)  /* <CJK> */
-MAP(0x6E, 0x69, 0x9257)  /* <CJK> */
-MAP(0x6E, 0x6A, 0x9245)  /* <CJK> */
-MAP(0x6E, 0x6B, 0x9249)  /* <CJK> */
-MAP(0x6E, 0x6C, 0x9264)  /* <CJK> */
-MAP(0x6E, 0x6D, 0x9248)  /* <CJK> */
-MAP(0x6E, 0x6E, 0x9295)  /* <CJK> */
-MAP(0x6E, 0x6F, 0x923F)  /* <CJK> */
-MAP(0x6E, 0x70, 0x924B)  /* <CJK> */
-MAP(0x6E, 0x71, 0x9250)  /* <CJK> */
-MAP(0x6E, 0x72, 0x929C)  /* <CJK> */
-MAP(0x6E, 0x73, 0x9296)  /* <CJK> */
-MAP(0x6E, 0x74, 0x9293)  /* <CJK> */
-MAP(0x6E, 0x75, 0x929B)  /* <CJK> */
-MAP(0x6E, 0x76, 0x925A)  /* <CJK> */
-MAP(0x6E, 0x77, 0x92CF)  /* <CJK> */
-MAP(0x6E, 0x78, 0x92B9)  /* <CJK> */
-MAP(0x6E, 0x79, 0x92B7)  /* <CJK> */
-MAP(0x6E, 0x7A, 0x92E9)  /* <CJK> */
-MAP(0x6E, 0x7B, 0x930F)  /* <CJK> */
-MAP(0x6E, 0x7C, 0x92FA)  /* <CJK> */
-MAP(0x6E, 0x7D, 0x9344)  /* <CJK> */
-MAP(0x6E, 0x7E, 0x932E)  /* <CJK> */
-MAP(0x6F, 0x21, 0x9319)  /* <CJK> */
-MAP(0x6F, 0x22, 0x9322)  /* <CJK> */
-MAP(0x6F, 0x23, 0x931A)  /* <CJK> */
-MAP(0x6F, 0x24, 0x9323)  /* <CJK> */
-MAP(0x6F, 0x25, 0x933A)  /* <CJK> */
-MAP(0x6F, 0x26, 0x9335)  /* <CJK> */
-MAP(0x6F, 0x27, 0x933B)  /* <CJK> */
-MAP(0x6F, 0x28, 0x935C)  /* <CJK> */
-MAP(0x6F, 0x29, 0x9360)  /* <CJK> */
-MAP(0x6F, 0x2A, 0x937C)  /* <CJK> */
-MAP(0x6F, 0x2B, 0x936E)  /* <CJK> */
-MAP(0x6F, 0x2C, 0x9356)  /* <CJK> */
-MAP(0x6F, 0x2D, 0x93B0)  /* <CJK> */
-MAP(0x6F, 0x2E, 0x93AC)  /* <CJK> */
-MAP(0x6F, 0x2F, 0x93AD)  /* <CJK> */
-MAP(0x6F, 0x30, 0x9394)  /* <CJK> */
-MAP(0x6F, 0x31, 0x93B9)  /* <CJK> */
-MAP(0x6F, 0x32, 0x93D6)  /* <CJK> */
-MAP(0x6F, 0x33, 0x93D7)  /* <CJK> */
-MAP(0x6F, 0x34, 0x93E8)  /* <CJK> */
-MAP(0x6F, 0x35, 0x93E5)  /* <CJK> */
-MAP(0x6F, 0x36, 0x93D8)  /* <CJK> */
-MAP(0x6F, 0x37, 0x93C3)  /* <CJK> */
-MAP(0x6F, 0x38, 0x93DD)  /* <CJK> */
-MAP(0x6F, 0x39, 0x93D0)  /* <CJK> */
-MAP(0x6F, 0x3A, 0x93C8)  /* <CJK> */
-MAP(0x6F, 0x3B, 0x93E4)  /* <CJK> */
-MAP(0x6F, 0x3C, 0x941A)  /* <CJK> */
-MAP(0x6F, 0x3D, 0x9414)  /* <CJK> */
-MAP(0x6F, 0x3E, 0x9413)  /* <CJK> */
-MAP(0x6F, 0x3F, 0x9403)  /* <CJK> */
-MAP(0x6F, 0x40, 0x9407)  /* <CJK> */
-MAP(0x6F, 0x41, 0x9410)  /* <CJK> */
-MAP(0x6F, 0x42, 0x9436)  /* <CJK> */
-MAP(0x6F, 0x43, 0x942B)  /* <CJK> */
-MAP(0x6F, 0x44, 0x9435)  /* <CJK> */
-MAP(0x6F, 0x45, 0x9421)  /* <CJK> */
-MAP(0x6F, 0x46, 0x943A)  /* <CJK> */
-MAP(0x6F, 0x47, 0x9441)  /* <CJK> */
-MAP(0x6F, 0x48, 0x9452)  /* <CJK> */
-MAP(0x6F, 0x49, 0x9444)  /* <CJK> */
-MAP(0x6F, 0x4A, 0x945B)  /* <CJK> */
-MAP(0x6F, 0x4B, 0x9460)  /* <CJK> */
-MAP(0x6F, 0x4C, 0x9462)  /* <CJK> */
-MAP(0x6F, 0x4D, 0x945E)  /* <CJK> */
-MAP(0x6F, 0x4E, 0x946A)  /* <CJK> */
-MAP(0x6F, 0x4F, 0x9229)  /* <CJK> */
-MAP(0x6F, 0x50, 0x9470)  /* <CJK> */
-MAP(0x6F, 0x51, 0x9475)  /* <CJK> */
-MAP(0x6F, 0x52, 0x9477)  /* <CJK> */
-MAP(0x6F, 0x53, 0x947D)  /* <CJK> */
-MAP(0x6F, 0x54, 0x945A)  /* <CJK> */
-MAP(0x6F, 0x55, 0x947C)  /* <CJK> */
-MAP(0x6F, 0x56, 0x947E)  /* <CJK> */
-MAP(0x6F, 0x57, 0x9481)  /* <CJK> */
-MAP(0x6F, 0x58, 0x947F)  /* <CJK> */
-MAP(0x6F, 0x59, 0x9582)  /* <CJK> */
-MAP(0x6F, 0x5A, 0x9587)  /* <CJK> */
-MAP(0x6F, 0x5B, 0x958A)  /* <CJK> */
-MAP(0x6F, 0x5C, 0x9594)  /* <CJK> */
-MAP(0x6F, 0x5D, 0x9596)  /* <CJK> */
-MAP(0x6F, 0x5E, 0x9598)  /* <CJK> */
-MAP(0x6F, 0x5F, 0x9599)  /* <CJK> */
-MAP(0x6F, 0x60, 0x95A0)  /* <CJK> */
-MAP(0x6F, 0x61, 0x95A8)  /* <CJK> */
-MAP(0x6F, 0x62, 0x95A7)  /* <CJK> */
-MAP(0x6F, 0x63, 0x95AD)  /* <CJK> */
-MAP(0x6F, 0x64, 0x95BC)  /* <CJK> */
-MAP(0x6F, 0x65, 0x95BB)  /* <CJK> */
-MAP(0x6F, 0x66, 0x95B9)  /* <CJK> */
-MAP(0x6F, 0x67, 0x95BE)  /* <CJK> */
-MAP(0x6F, 0x68, 0x95CA)  /* <CJK> */
-MAP(0x6F, 0x69, 0x6FF6)  /* <CJK> */
-MAP(0x6F, 0x6A, 0x95C3)  /* <CJK> */
-MAP(0x6F, 0x6B, 0x95CD)  /* <CJK> */
-MAP(0x6F, 0x6C, 0x95CC)  /* <CJK> */
-MAP(0x6F, 0x6D, 0x95D5)  /* <CJK> */
-MAP(0x6F, 0x6E, 0x95D4)  /* <CJK> */
-MAP(0x6F, 0x6F, 0x95D6)  /* <CJK> */
-MAP(0x6F, 0x70, 0x95DC)  /* <CJK> */
-MAP(0x6F, 0x71, 0x95E1)  /* <CJK> */
-MAP(0x6F, 0x72, 0x95E5)  /* <CJK> */
-MAP(0x6F, 0x73, 0x95E2)  /* <CJK> */
-MAP(0x6F, 0x74, 0x9621)  /* <CJK> */
-MAP(0x6F, 0x75, 0x9628)  /* <CJK> */
-MAP(0x6F, 0x76, 0x962E)  /* <CJK> */
-MAP(0x6F, 0x77, 0x962F)  /* <CJK> */
-MAP(0x6F, 0x78, 0x9642)  /* <CJK> */
-MAP(0x6F, 0x79, 0x964C)  /* <CJK> */
-MAP(0x6F, 0x7A, 0x964F)  /* <CJK> */
-MAP(0x6F, 0x7B, 0x964B)  /* <CJK> */
-MAP(0x6F, 0x7C, 0x9677)  /* <CJK> */
-MAP(0x6F, 0x7D, 0x965C)  /* <CJK> */
-MAP(0x6F, 0x7E, 0x965E)  /* <CJK> */
-MAP(0x70, 0x21, 0x965D)  /* <CJK> */
-MAP(0x70, 0x22, 0x965F)  /* <CJK> */
-MAP(0x70, 0x23, 0x9666)  /* <CJK> */
-MAP(0x70, 0x24, 0x9672)  /* <CJK> */
-MAP(0x70, 0x25, 0x966C)  /* <CJK> */
-MAP(0x70, 0x26, 0x968D)  /* <CJK> */
-MAP(0x70, 0x27, 0x9698)  /* <CJK> */
-MAP(0x70, 0x28, 0x9695)  /* <CJK> */
-MAP(0x70, 0x29, 0x9697)  /* <CJK> */
-MAP(0x70, 0x2A, 0x96AA)  /* <CJK> */
-MAP(0x70, 0x2B, 0x96A7)  /* <CJK> */
-MAP(0x70, 0x2C, 0x96B1)  /* <CJK> */
-MAP(0x70, 0x2D, 0x96B2)  /* <CJK> */
-MAP(0x70, 0x2E, 0x96B0)  /* <CJK> */
-MAP(0x70, 0x2F, 0x96B4)  /* <CJK> */
-MAP(0x70, 0x30, 0x96B6)  /* <CJK> */
-MAP(0x70, 0x31, 0x96B8)  /* <CJK> */
-MAP(0x70, 0x32, 0x96B9)  /* <CJK> */
-MAP(0x70, 0x33, 0x96CE)  /* <CJK> */
-MAP(0x70, 0x34, 0x96CB)  /* <CJK> */
-MAP(0x70, 0x35, 0x96C9)  /* <CJK> */
-MAP(0x70, 0x36, 0x96CD)  /* <CJK> */
-MAP(0x70, 0x37, 0x894D)  /* <CJK> */
-MAP(0x70, 0x38, 0x96DC)  /* <CJK> */
-MAP(0x70, 0x39, 0x970D)  /* <CJK> */
-MAP(0x70, 0x3A, 0x96D5)  /* <CJK> */
-MAP(0x70, 0x3B, 0x96F9)  /* <CJK> */
-MAP(0x70, 0x3C, 0x9704)  /* <CJK> */
-MAP(0x70, 0x3D, 0x9706)  /* <CJK> */
-MAP(0x70, 0x3E, 0x9708)  /* <CJK> */
-MAP(0x70, 0x3F, 0x9713)  /* <CJK> */
-MAP(0x70, 0x40, 0x970E)  /* <CJK> */
-MAP(0x70, 0x41, 0x9711)  /* <CJK> */
-MAP(0x70, 0x42, 0x970F)  /* <CJK> */
-MAP(0x70, 0x43, 0x9716)  /* <CJK> */
-MAP(0x70, 0x44, 0x9719)  /* <CJK> */
-MAP(0x70, 0x45, 0x9724)  /* <CJK> */
-MAP(0x70, 0x46, 0x972A)  /* <CJK> */
-MAP(0x70, 0x47, 0x9730)  /* <CJK> */
-MAP(0x70, 0x48, 0x9739)  /* <CJK> */
-MAP(0x70, 0x49, 0x973D)  /* <CJK> */
-MAP(0x70, 0x4A, 0x973E)  /* <CJK> */
-MAP(0x70, 0x4B, 0x9744)  /* <CJK> */
-MAP(0x70, 0x4C, 0x9746)  /* <CJK> */
-MAP(0x70, 0x4D, 0x9748)  /* <CJK> */
-MAP(0x70, 0x4E, 0x9742)  /* <CJK> */
-MAP(0x70, 0x4F, 0x9749)  /* <CJK> */
-MAP(0x70, 0x50, 0x975C)  /* <CJK> */
-MAP(0x70, 0x51, 0x9760)  /* <CJK> */
-MAP(0x70, 0x52, 0x9764)  /* <CJK> */
-MAP(0x70, 0x53, 0x9766)  /* <CJK> */
-MAP(0x70, 0x54, 0x9768)  /* <CJK> */
-MAP(0x70, 0x55, 0x52D2)  /* <CJK> */
-MAP(0x70, 0x56, 0x976B)  /* <CJK> */
-MAP(0x70, 0x57, 0x9771)  /* <CJK> */
-MAP(0x70, 0x58, 0x9779)  /* <CJK> */
-MAP(0x70, 0x59, 0x9785)  /* <CJK> */
-MAP(0x70, 0x5A, 0x977C)  /* <CJK> */
-MAP(0x70, 0x5B, 0x9781)  /* <CJK> */
-MAP(0x70, 0x5C, 0x977A)  /* <CJK> */
-MAP(0x70, 0x5D, 0x9786)  /* <CJK> */
-MAP(0x70, 0x5E, 0x978B)  /* <CJK> */
-MAP(0x70, 0x5F, 0x978F)  /* <CJK> */
-MAP(0x70, 0x60, 0x9790)  /* <CJK> */
-MAP(0x70, 0x61, 0x979C)  /* <CJK> */
-MAP(0x70, 0x62, 0x97A8)  /* <CJK> */
-MAP(0x70, 0x63, 0x97A6)  /* <CJK> */
-MAP(0x70, 0x64, 0x97A3)  /* <CJK> */
-MAP(0x70, 0x65, 0x97B3)  /* <CJK> */
-MAP(0x70, 0x66, 0x97B4)  /* <CJK> */
-MAP(0x70, 0x67, 0x97C3)  /* <CJK> */
-MAP(0x70, 0x68, 0x97C6)  /* <CJK> */
-MAP(0x70, 0x69, 0x97C8)  /* <CJK> */
-MAP(0x70, 0x6A, 0x97CB)  /* <CJK> */
-MAP(0x70, 0x6B, 0x97DC)  /* <CJK> */
-MAP(0x70, 0x6C, 0x97ED)  /* <CJK> */
-MAP(0x70, 0x6D, 0x9F4F)  /* <CJK> */
-MAP(0x70, 0x6E, 0x97F2)  /* <CJK> */
-MAP(0x70, 0x6F, 0x7ADF)  /* <CJK> */
-MAP(0x70, 0x70, 0x97F6)  /* <CJK> */
-MAP(0x70, 0x71, 0x97F5)  /* <CJK> */
-MAP(0x70, 0x72, 0x980F)  /* <CJK> */
-MAP(0x70, 0x73, 0x980C)  /* <CJK> */
-MAP(0x70, 0x74, 0x9838)  /* <CJK> */
-MAP(0x70, 0x75, 0x9824)  /* <CJK> */
-MAP(0x70, 0x76, 0x9821)  /* <CJK> */
-MAP(0x70, 0x77, 0x9837)  /* <CJK> */
-MAP(0x70, 0x78, 0x983D)  /* <CJK> */
-MAP(0x70, 0x79, 0x9846)  /* <CJK> */
-MAP(0x70, 0x7A, 0x984F)  /* <CJK> */
-MAP(0x70, 0x7B, 0x984B)  /* <CJK> */
-MAP(0x70, 0x7C, 0x986B)  /* <CJK> */
-MAP(0x70, 0x7D, 0x986F)  /* <CJK> */
-MAP(0x70, 0x7E, 0x9870)  /* <CJK> */
-MAP(0x71, 0x21, 0x9871)  /* <CJK> */
-MAP(0x71, 0x22, 0x9874)  /* <CJK> */
-MAP(0x71, 0x23, 0x9873)  /* <CJK> */
-MAP(0x71, 0x24, 0x98AA)  /* <CJK> */
-MAP(0x71, 0x25, 0x98AF)  /* <CJK> */
-MAP(0x71, 0x26, 0x98B1)  /* <CJK> */
-MAP(0x71, 0x27, 0x98B6)  /* <CJK> */
-MAP(0x71, 0x28, 0x98C4)  /* <CJK> */
-MAP(0x71, 0x29, 0x98C3)  /* <CJK> */
-MAP(0x71, 0x2A, 0x98C6)  /* <CJK> */
-MAP(0x71, 0x2B, 0x98E9)  /* <CJK> */
-MAP(0x71, 0x2C, 0x98EB)  /* <CJK> */
-MAP(0x71, 0x2D, 0x9903)  /* <CJK> */
-MAP(0x71, 0x2E, 0x9909)  /* <CJK> */
-MAP(0x71, 0x2F, 0x9912)  /* <CJK> */
-MAP(0x71, 0x30, 0x9914)  /* <CJK> */
-MAP(0x71, 0x31, 0x9918)  /* <CJK> */
-MAP(0x71, 0x32, 0x9921)  /* <CJK> */
-MAP(0x71, 0x33, 0x991D)  /* <CJK> */
-MAP(0x71, 0x34, 0x991E)  /* <CJK> */
-MAP(0x71, 0x35, 0x9924)  /* <CJK> */
-MAP(0x71, 0x36, 0x9920)  /* <CJK> */
-MAP(0x71, 0x37, 0x992C)  /* <CJK> */
-MAP(0x71, 0x38, 0x992E)  /* <CJK> */
-MAP(0x71, 0x39, 0x993D)  /* <CJK> */
-MAP(0x71, 0x3A, 0x993E)  /* <CJK> */
-MAP(0x71, 0x3B, 0x9942)  /* <CJK> */
-MAP(0x71, 0x3C, 0x9949)  /* <CJK> */
-MAP(0x71, 0x3D, 0x9945)  /* <CJK> */
-MAP(0x71, 0x3E, 0x9950)  /* <CJK> */
-MAP(0x71, 0x3F, 0x994B)  /* <CJK> */
-MAP(0x71, 0x40, 0x9951)  /* <CJK> */
-MAP(0x71, 0x41, 0x9952)  /* <CJK> */
-MAP(0x71, 0x42, 0x994C)  /* <CJK> */
-MAP(0x71, 0x43, 0x9955)  /* <CJK> */
-MAP(0x71, 0x44, 0x9997)  /* <CJK> */
-MAP(0x71, 0x45, 0x9998)  /* <CJK> */
-MAP(0x71, 0x46, 0x99A5)  /* <CJK> */
-MAP(0x71, 0x47, 0x99AD)  /* <CJK> */
-MAP(0x71, 0x48, 0x99AE)  /* <CJK> */
-MAP(0x71, 0x49, 0x99BC)  /* <CJK> */
-MAP(0x71, 0x4A, 0x99DF)  /* <CJK> */
-MAP(0x71, 0x4B, 0x99DB)  /* <CJK> */
-MAP(0x71, 0x4C, 0x99DD)  /* <CJK> */
-MAP(0x71, 0x4D, 0x99D8)  /* <CJK> */
-MAP(0x71, 0x4E, 0x99D1)  /* <CJK> */
-MAP(0x71, 0x4F, 0x99ED)  /* <CJK> */
-MAP(0x71, 0x50, 0x99EE)  /* <CJK> */
-MAP(0x71, 0x51, 0x99F1)  /* <CJK> */
-MAP(0x71, 0x52, 0x99F2)  /* <CJK> */
-MAP(0x71, 0x53, 0x99FB)  /* <CJK> */
-MAP(0x71, 0x54, 0x99F8)  /* <CJK> */
-MAP(0x71, 0x55, 0x9A01)  /* <CJK> */
-MAP(0x71, 0x56, 0x9A0F)  /* <CJK> */
-MAP(0x71, 0x57, 0x9A05)  /* <CJK> */
-MAP(0x71, 0x58, 0x99E2)  /* <CJK> */
-MAP(0x71, 0x59, 0x9A19)  /* <CJK> */
-MAP(0x71, 0x5A, 0x9A2B)  /* <CJK> */
-MAP(0x71, 0x5B, 0x9A37)  /* <CJK> */
-MAP(0x71, 0x5C, 0x9A45)  /* <CJK> */
-MAP(0x71, 0x5D, 0x9A42)  /* <CJK> */
-MAP(0x71, 0x5E, 0x9A40)  /* <CJK> */
-MAP(0x71, 0x5F, 0x9A43)  /* <CJK> */
-MAP(0x71, 0x60, 0x9A3E)  /* <CJK> */
-MAP(0x71, 0x61, 0x9A55)  /* <CJK> */
-MAP(0x71, 0x62, 0x9A4D)  /* <CJK> */
-MAP(0x71, 0x63, 0x9A5B)  /* <CJK> */
-MAP(0x71, 0x64, 0x9A57)  /* <CJK> */
-MAP(0x71, 0x65, 0x9A5F)  /* <CJK> */
-MAP(0x71, 0x66, 0x9A62)  /* <CJK> */
-MAP(0x71, 0x67, 0x9A65)  /* <CJK> */
-MAP(0x71, 0x68, 0x9A64)  /* <CJK> */
-MAP(0x71, 0x69, 0x9A69)  /* <CJK> */
-MAP(0x71, 0x6A, 0x9A6B)  /* <CJK> */
-MAP(0x71, 0x6B, 0x9A6A)  /* <CJK> */
-MAP(0x71, 0x6C, 0x9AAD)  /* <CJK> */
-MAP(0x71, 0x6D, 0x9AB0)  /* <CJK> */
-MAP(0x71, 0x6E, 0x9ABC)  /* <CJK> */
-MAP(0x71, 0x6F, 0x9AC0)  /* <CJK> */
-MAP(0x71, 0x70, 0x9ACF)  /* <CJK> */
-MAP(0x71, 0x71, 0x9AD1)  /* <CJK> */
-MAP(0x71, 0x72, 0x9AD3)  /* <CJK> */
-MAP(0x71, 0x73, 0x9AD4)  /* <CJK> */
-MAP(0x71, 0x74, 0x9ADE)  /* <CJK> */
-MAP(0x71, 0x75, 0x9ADF)  /* <CJK> */
-MAP(0x71, 0x76, 0x9AE2)  /* <CJK> */
-MAP(0x71, 0x77, 0x9AE3)  /* <CJK> */
-MAP(0x71, 0x78, 0x9AE6)  /* <CJK> */
-MAP(0x71, 0x79, 0x9AEF)  /* <CJK> */
-MAP(0x71, 0x7A, 0x9AEB)  /* <CJK> */
-MAP(0x71, 0x7B, 0x9AEE)  /* <CJK> */
-MAP(0x71, 0x7C, 0x9AF4)  /* <CJK> */
-MAP(0x71, 0x7D, 0x9AF1)  /* <CJK> */
-MAP(0x71, 0x7E, 0x9AF7)  /* <CJK> */
-MAP(0x72, 0x21, 0x9AFB)  /* <CJK> */
-MAP(0x72, 0x22, 0x9B06)  /* <CJK> */
-MAP(0x72, 0x23, 0x9B18)  /* <CJK> */
-MAP(0x72, 0x24, 0x9B1A)  /* <CJK> */
-MAP(0x72, 0x25, 0x9B1F)  /* <CJK> */
-MAP(0x72, 0x26, 0x9B22)  /* <CJK> */
-MAP(0x72, 0x27, 0x9B23)  /* <CJK> */
-MAP(0x72, 0x28, 0x9B25)  /* <CJK> */
-MAP(0x72, 0x29, 0x9B27)  /* <CJK> */
-MAP(0x72, 0x2A, 0x9B28)  /* <CJK> */
-MAP(0x72, 0x2B, 0x9B29)  /* <CJK> */
-MAP(0x72, 0x2C, 0x9B2A)  /* <CJK> */
-MAP(0x72, 0x2D, 0x9B2E)  /* <CJK> */
-MAP(0x72, 0x2E, 0x9B2F)  /* <CJK> */
-MAP(0x72, 0x2F, 0x9B32)  /* <CJK> */
-MAP(0x72, 0x30, 0x9B44)  /* <CJK> */
-MAP(0x72, 0x31, 0x9B43)  /* <CJK> */
-MAP(0x72, 0x32, 0x9B4F)  /* <CJK> */
-MAP(0x72, 0x33, 0x9B4D)  /* <CJK> */
-MAP(0x72, 0x34, 0x9B4E)  /* <CJK> */
-MAP(0x72, 0x35, 0x9B51)  /* <CJK> */
-MAP(0x72, 0x36, 0x9B58)  /* <CJK> */
-MAP(0x72, 0x37, 0x9B74)  /* <CJK> */
-MAP(0x72, 0x38, 0x9B93)  /* <CJK> */
-MAP(0x72, 0x39, 0x9B83)  /* <CJK> */
-MAP(0x72, 0x3A, 0x9B91)  /* <CJK> */
-MAP(0x72, 0x3B, 0x9B96)  /* <CJK> */
-MAP(0x72, 0x3C, 0x9B97)  /* <CJK> */
-MAP(0x72, 0x3D, 0x9B9F)  /* <CJK> */
-MAP(0x72, 0x3E, 0x9BA0)  /* <CJK> */
-MAP(0x72, 0x3F, 0x9BA8)  /* <CJK> */
-MAP(0x72, 0x40, 0x9BB4)  /* <CJK> */
-MAP(0x72, 0x41, 0x9BC0)  /* <CJK> */
-MAP(0x72, 0x42, 0x9BCA)  /* <CJK> */
-MAP(0x72, 0x43, 0x9BB9)  /* <CJK> */
-MAP(0x72, 0x44, 0x9BC6)  /* <CJK> */
-MAP(0x72, 0x45, 0x9BCF)  /* <CJK> */
-MAP(0x72, 0x46, 0x9BD1)  /* <CJK> */
-MAP(0x72, 0x47, 0x9BD2)  /* <CJK> */
-MAP(0x72, 0x48, 0x9BE3)  /* <CJK> */
-MAP(0x72, 0x49, 0x9BE2)  /* <CJK> */
-MAP(0x72, 0x4A, 0x9BE4)  /* <CJK> */
-MAP(0x72, 0x4B, 0x9BD4)  /* <CJK> */
-MAP(0x72, 0x4C, 0x9BE1)  /* <CJK> */
-MAP(0x72, 0x4D, 0x9C3A)  /* <CJK> */
-MAP(0x72, 0x4E, 0x9BF2)  /* <CJK> */
-MAP(0x72, 0x4F, 0x9BF1)  /* <CJK> */
-MAP(0x72, 0x50, 0x9BF0)  /* <CJK> */
-MAP(0x72, 0x51, 0x9C15)  /* <CJK> */
-MAP(0x72, 0x52, 0x9C14)  /* <CJK> */
-MAP(0x72, 0x53, 0x9C09)  /* <CJK> */
-MAP(0x72, 0x54, 0x9C13)  /* <CJK> */
-MAP(0x72, 0x55, 0x9C0C)  /* <CJK> */
-MAP(0x72, 0x56, 0x9C06)  /* <CJK> */
-MAP(0x72, 0x57, 0x9C08)  /* <CJK> */
-MAP(0x72, 0x58, 0x9C12)  /* <CJK> */
-MAP(0x72, 0x59, 0x9C0A)  /* <CJK> */
-MAP(0x72, 0x5A, 0x9C04)  /* <CJK> */
-MAP(0x72, 0x5B, 0x9C2E)  /* <CJK> */
-MAP(0x72, 0x5C, 0x9C1B)  /* <CJK> */
-MAP(0x72, 0x5D, 0x9C25)  /* <CJK> */
-MAP(0x72, 0x5E, 0x9C24)  /* <CJK> */
-MAP(0x72, 0x5F, 0x9C21)  /* <CJK> */
-MAP(0x72, 0x60, 0x9C30)  /* <CJK> */
-MAP(0x72, 0x61, 0x9C47)  /* <CJK> */
-MAP(0x72, 0x62, 0x9C32)  /* <CJK> */
-MAP(0x72, 0x63, 0x9C46)  /* <CJK> */
-MAP(0x72, 0x64, 0x9C3E)  /* <CJK> */
-MAP(0x72, 0x65, 0x9C5A)  /* <CJK> */
-MAP(0x72, 0x66, 0x9C60)  /* <CJK> */
-MAP(0x72, 0x67, 0x9C67)  /* <CJK> */
-MAP(0x72, 0x68, 0x9C76)  /* <CJK> */
-MAP(0x72, 0x69, 0x9C78)  /* <CJK> */
-MAP(0x72, 0x6A, 0x9CE7)  /* <CJK> */
-MAP(0x72, 0x6B, 0x9CEC)  /* <CJK> */
-MAP(0x72, 0x6C, 0x9CF0)  /* <CJK> */
-MAP(0x72, 0x6D, 0x9D09)  /* <CJK> */
-MAP(0x72, 0x6E, 0x9D08)  /* <CJK> */
-MAP(0x72, 0x6F, 0x9CEB)  /* <CJK> */
-MAP(0x72, 0x70, 0x9D03)  /* <CJK> */
-MAP(0x72, 0x71, 0x9D06)  /* <CJK> */
-MAP(0x72, 0x72, 0x9D2A)  /* <CJK> */
-MAP(0x72, 0x73, 0x9D26)  /* <CJK> */
-MAP(0x72, 0x74, 0x9DAF)  /* <CJK> */
-MAP(0x72, 0x75, 0x9D23)  /* <CJK> */
-MAP(0x72, 0x76, 0x9D1F)  /* <CJK> */
-MAP(0x72, 0x77, 0x9D44)  /* <CJK> */
-MAP(0x72, 0x78, 0x9D15)  /* <CJK> */
-MAP(0x72, 0x79, 0x9D12)  /* <CJK> */
-MAP(0x72, 0x7A, 0x9D41)  /* <CJK> */
-MAP(0x72, 0x7B, 0x9D3F)  /* <CJK> */
-MAP(0x72, 0x7C, 0x9D3E)  /* <CJK> */
-MAP(0x72, 0x7D, 0x9D46)  /* <CJK> */
-MAP(0x72, 0x7E, 0x9D48)  /* <CJK> */
-MAP(0x73, 0x21, 0x9D5D)  /* <CJK> */
-MAP(0x73, 0x22, 0x9D5E)  /* <CJK> */
-MAP(0x73, 0x23, 0x9D64)  /* <CJK> */
-MAP(0x73, 0x24, 0x9D51)  /* <CJK> */
-MAP(0x73, 0x25, 0x9D50)  /* <CJK> */
-MAP(0x73, 0x26, 0x9D59)  /* <CJK> */
-MAP(0x73, 0x27, 0x9D72)  /* <CJK> */
-MAP(0x73, 0x28, 0x9D89)  /* <CJK> */
-MAP(0x73, 0x29, 0x9D87)  /* <CJK> */
-MAP(0x73, 0x2A, 0x9DAB)  /* <CJK> */
-MAP(0x73, 0x2B, 0x9D6F)  /* <CJK> */
-MAP(0x73, 0x2C, 0x9D7A)  /* <CJK> */
-MAP(0x73, 0x2D, 0x9D9A)  /* <CJK> */
-MAP(0x73, 0x2E, 0x9DA4)  /* <CJK> */
-MAP(0x73, 0x2F, 0x9DA9)  /* <CJK> */
-MAP(0x73, 0x30, 0x9DB2)  /* <CJK> */
-MAP(0x73, 0x31, 0x9DC4)  /* <CJK> */
-MAP(0x73, 0x32, 0x9DC1)  /* <CJK> */
-MAP(0x73, 0x33, 0x9DBB)  /* <CJK> */
-MAP(0x73, 0x34, 0x9DB8)  /* <CJK> */
-MAP(0x73, 0x35, 0x9DBA)  /* <CJK> */
-MAP(0x73, 0x36, 0x9DC6)  /* <CJK> */
-MAP(0x73, 0x37, 0x9DCF)  /* <CJK> */
-MAP(0x73, 0x38, 0x9DC2)  /* <CJK> */
-MAP(0x73, 0x39, 0x9DD9)  /* <CJK> */
-MAP(0x73, 0x3A, 0x9DD3)  /* <CJK> */
-MAP(0x73, 0x3B, 0x9DF8)  /* <CJK> */
-MAP(0x73, 0x3C, 0x9DE6)  /* <CJK> */
-MAP(0x73, 0x3D, 0x9DED)  /* <CJK> */
-MAP(0x73, 0x3E, 0x9DEF)  /* <CJK> */
-MAP(0x73, 0x3F, 0x9DFD)  /* <CJK> */
-MAP(0x73, 0x40, 0x9E1A)  /* <CJK> */
-MAP(0x73, 0x41, 0x9E1B)  /* <CJK> */
-MAP(0x73, 0x42, 0x9E1E)  /* <CJK> */
-MAP(0x73, 0x43, 0x9E75)  /* <CJK> */
-MAP(0x73, 0x44, 0x9E79)  /* <CJK> */
-MAP(0x73, 0x45, 0x9E7D)  /* <CJK> */
-MAP(0x73, 0x46, 0x9E81)  /* <CJK> */
-MAP(0x73, 0x47, 0x9E88)  /* <CJK> */
-MAP(0x73, 0x48, 0x9E8B)  /* <CJK> */
-MAP(0x73, 0x49, 0x9E8C)  /* <CJK> */
-MAP(0x73, 0x4A, 0x9E92)  /* <CJK> */
-MAP(0x73, 0x4B, 0x9E95)  /* <CJK> */
-MAP(0x73, 0x4C, 0x9E91)  /* <CJK> */
-MAP(0x73, 0x4D, 0x9E9D)  /* <CJK> */
-MAP(0x73, 0x4E, 0x9EA5)  /* <CJK> */
-MAP(0x73, 0x4F, 0x9EA9)  /* <CJK> */
-MAP(0x73, 0x50, 0x9EB8)  /* <CJK> */
-MAP(0x73, 0x51, 0x9EAA)  /* <CJK> */
-MAP(0x73, 0x52, 0x9EAD)  /* <CJK> */
-MAP(0x73, 0x53, 0x9761)  /* <CJK> */
-MAP(0x73, 0x54, 0x9ECC)  /* <CJK> */
-MAP(0x73, 0x55, 0x9ECE)  /* <CJK> */
-MAP(0x73, 0x56, 0x9ECF)  /* <CJK> */
-MAP(0x73, 0x57, 0x9ED0)  /* <CJK> */
-MAP(0x73, 0x58, 0x9ED4)  /* <CJK> */
-MAP(0x73, 0x59, 0x9EDC)  /* <CJK> */
-MAP(0x73, 0x5A, 0x9EDE)  /* <CJK> */
-MAP(0x73, 0x5B, 0x9EDD)  /* <CJK> */
-MAP(0x73, 0x5C, 0x9EE0)  /* <CJK> */
-MAP(0x73, 0x5D, 0x9EE5)  /* <CJK> */
-MAP(0x73, 0x5E, 0x9EE8)  /* <CJK> */
-MAP(0x73, 0x5F, 0x9EEF)  /* <CJK> */
-MAP(0x73, 0x60, 0x9EF4)  /* <CJK> */
-MAP(0x73, 0x61, 0x9EF6)  /* <CJK> */
-MAP(0x73, 0x62, 0x9EF7)  /* <CJK> */
-MAP(0x73, 0x63, 0x9EF9)  /* <CJK> */
-MAP(0x73, 0x64, 0x9EFB)  /* <CJK> */
-MAP(0x73, 0x65, 0x9EFC)  /* <CJK> */
-MAP(0x73, 0x66, 0x9EFD)  /* <CJK> */
-MAP(0x73, 0x67, 0x9F07)  /* <CJK> */
-MAP(0x73, 0x68, 0x9F08)  /* <CJK> */
-MAP(0x73, 0x69, 0x76B7)  /* <CJK> */
-MAP(0x73, 0x6A, 0x9F15)  /* <CJK> */
-MAP(0x73, 0x6B, 0x9F21)  /* <CJK> */
-MAP(0x73, 0x6C, 0x9F2C)  /* <CJK> */
-MAP(0x73, 0x6D, 0x9F3E)  /* <CJK> */
-MAP(0x73, 0x6E, 0x9F4A)  /* <CJK> */
-MAP(0x73, 0x6F, 0x9F52)  /* <CJK> */
-MAP(0x73, 0x70, 0x9F54)  /* <CJK> */
-MAP(0x73, 0x71, 0x9F63)  /* <CJK> */
-MAP(0x73, 0x72, 0x9F5F)  /* <CJK> */
-MAP(0x73, 0x73, 0x9F60)  /* <CJK> */
-MAP(0x73, 0x74, 0x9F61)  /* <CJK> */
-MAP(0x73, 0x75, 0x9F66)  /* <CJK> */
-MAP(0x73, 0x76, 0x9F67)  /* <CJK> */
-MAP(0x73, 0x77, 0x9F6C)  /* <CJK> */
-MAP(0x73, 0x78, 0x9F6A)  /* <CJK> */
-MAP(0x73, 0x79, 0x9F77)  /* <CJK> */
-MAP(0x73, 0x7A, 0x9F72)  /* <CJK> */
-MAP(0x73, 0x7B, 0x9F76)  /* <CJK> */
-MAP(0x73, 0x7C, 0x9F95)  /* <CJK> */
-MAP(0x73, 0x7D, 0x9F9C)  /* <CJK> */
-MAP(0x73, 0x7E, 0x9FA0)  /* <CJK> */
-MAP(0x74, 0x21, 0x582F)  /* <CJK> */
-MAP(0x74, 0x22, 0x69C7)  /* <CJK> */
-MAP(0x74, 0x23, 0x9059)  /* <CJK> */
-MAP(0x74, 0x24, 0x7464)  /* <CJK> */
-MAP(0x74, 0x25, 0x51DC)  /* <CJK> */
-MAP(0x74, 0x26, 0x7199)  /* <CJK> */
diff --git a/libjava/gnu/gcj/convert/JIS0208_to_Unicode.cc b/libjava/gnu/gcj/convert/JIS0208_to_Unicode.cc
deleted file mode 100644
index 44b4630..0000000
--- a/libjava/gnu/gcj/convert/JIS0208_to_Unicode.cc
+++ /dev/null
@@ -1,7326 +0,0 @@
-/* This file is automatically generated from JIS0208.TXT. */
-#pragma GCC java_exceptions
-unsigned short JIS0208_to_Unicode[84][94] = {
-/* 1st byte: 33 */ { 
-  /* 2nd byte: 33 */ 0x3000,
-  /* 2nd byte: 34 */ 0x3001,
-  /* 2nd byte: 35 */ 0x3002,
-  /* 2nd byte: 36 */ 0xff0c,
-  /* 2nd byte: 37 */ 0xff0e,
-  /* 2nd byte: 38 */ 0x30fb,
-  /* 2nd byte: 39 */ 0xff1a,
-  /* 2nd byte: 40 */ 0xff1b,
-  /* 2nd byte: 41 */ 0xff1f,
-  /* 2nd byte: 42 */ 0xff01,
-  /* 2nd byte: 43 */ 0x309b,
-  /* 2nd byte: 44 */ 0x309c,
-  /* 2nd byte: 45 */ 0x00b4,
-  /* 2nd byte: 46 */ 0xff40,
-  /* 2nd byte: 47 */ 0x00a8,
-  /* 2nd byte: 48 */ 0xff3e,
-  /* 2nd byte: 49 */ 0xffe3,
-  /* 2nd byte: 50 */ 0xff3f,
-  /* 2nd byte: 51 */ 0x30fd,
-  /* 2nd byte: 52 */ 0x30fe,
-  /* 2nd byte: 53 */ 0x309d,
-  /* 2nd byte: 54 */ 0x309e,
-  /* 2nd byte: 55 */ 0x3003,
-  /* 2nd byte: 56 */ 0x4edd,
-  /* 2nd byte: 57 */ 0x3005,
-  /* 2nd byte: 58 */ 0x3006,
-  /* 2nd byte: 59 */ 0x3007,
-  /* 2nd byte: 60 */ 0x30fc,
-  /* 2nd byte: 61 */ 0x2015,
-  /* 2nd byte: 62 */ 0x2010,
-  /* 2nd byte: 63 */ 0xff0f,
-  /* 2nd byte: 64 */ 0x005c,
-  /* 2nd byte: 65 */ 0x301c,
-  /* 2nd byte: 66 */ 0x2016,
-  /* 2nd byte: 67 */ 0xff5c,
-  /* 2nd byte: 68 */ 0x2026,
-  /* 2nd byte: 69 */ 0x2025,
-  /* 2nd byte: 70 */ 0x2018,
-  /* 2nd byte: 71 */ 0x2019,
-  /* 2nd byte: 72 */ 0x201c,
-  /* 2nd byte: 73 */ 0x201d,
-  /* 2nd byte: 74 */ 0xff08,
-  /* 2nd byte: 75 */ 0xff09,
-  /* 2nd byte: 76 */ 0x3014,
-  /* 2nd byte: 77 */ 0x3015,
-  /* 2nd byte: 78 */ 0xff3b,
-  /* 2nd byte: 79 */ 0xff3d,
-  /* 2nd byte: 80 */ 0xff5b,
-  /* 2nd byte: 81 */ 0xff5d,
-  /* 2nd byte: 82 */ 0x3008,
-  /* 2nd byte: 83 */ 0x3009,
-  /* 2nd byte: 84 */ 0x300a,
-  /* 2nd byte: 85 */ 0x300b,
-  /* 2nd byte: 86 */ 0x300c,
-  /* 2nd byte: 87 */ 0x300d,
-  /* 2nd byte: 88 */ 0x300e,
-  /* 2nd byte: 89 */ 0x300f,
-  /* 2nd byte: 90 */ 0x3010,
-  /* 2nd byte: 91 */ 0x3011,
-  /* 2nd byte: 92 */ 0xff0b,
-  /* 2nd byte: 93 */ 0x2212,
-  /* 2nd byte: 94 */ 0x00b1,
-  /* 2nd byte: 95 */ 0x00d7,
-  /* 2nd byte: 96 */ 0x00f7,
-  /* 2nd byte: 97 */ 0xff1d,
-  /* 2nd byte: 98 */ 0x2260,
-  /* 2nd byte: 99 */ 0xff1c,
-  /* 2nd byte: 100 */ 0xff1e,
-  /* 2nd byte: 101 */ 0x2266,
-  /* 2nd byte: 102 */ 0x2267,
-  /* 2nd byte: 103 */ 0x221e,
-  /* 2nd byte: 104 */ 0x2234,
-  /* 2nd byte: 105 */ 0x2642,
-  /* 2nd byte: 106 */ 0x2640,
-  /* 2nd byte: 107 */ 0x00b0,
-  /* 2nd byte: 108 */ 0x2032,
-  /* 2nd byte: 109 */ 0x2033,
-  /* 2nd byte: 110 */ 0x2103,
-  /* 2nd byte: 111 */ 0xffe5,
-  /* 2nd byte: 112 */ 0xff04,
-  /* 2nd byte: 113 */ 0x00a2,
-  /* 2nd byte: 114 */ 0x00a3,
-  /* 2nd byte: 115 */ 0xff05,
-  /* 2nd byte: 116 */ 0xff03,
-  /* 2nd byte: 117 */ 0xff06,
-  /* 2nd byte: 118 */ 0xff0a,
-  /* 2nd byte: 119 */ 0xff20,
-  /* 2nd byte: 120 */ 0x00a7,
-  /* 2nd byte: 121 */ 0x2606,
-  /* 2nd byte: 122 */ 0x2605,
-  /* 2nd byte: 123 */ 0x25cb,
-  /* 2nd byte: 124 */ 0x25cf,
-  /* 2nd byte: 125 */ 0x25ce,
-  /* 2nd byte: 126 */ 0x25c7},
-/* 1st byte: 34 */ { 
-  /* 2nd byte: 33 */ 0x25c6,
-  /* 2nd byte: 34 */ 0x25a1,
-  /* 2nd byte: 35 */ 0x25a0,
-  /* 2nd byte: 36 */ 0x25b3,
-  /* 2nd byte: 37 */ 0x25b2,
-  /* 2nd byte: 38 */ 0x25bd,
-  /* 2nd byte: 39 */ 0x25bc,
-  /* 2nd byte: 40 */ 0x203b,
-  /* 2nd byte: 41 */ 0x3012,
-  /* 2nd byte: 42 */ 0x2192,
-  /* 2nd byte: 43 */ 0x2190,
-  /* 2nd byte: 44 */ 0x2191,
-  /* 2nd byte: 45 */ 0x2193,
-  /* 2nd byte: 46 */ 0x3013,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 58 */ 0x2208,
-  /* 2nd byte: 59 */ 0x220b,
-  /* 2nd byte: 60 */ 0x2286,
-  /* 2nd byte: 61 */ 0x2287,
-  /* 2nd byte: 62 */ 0x2282,
-  /* 2nd byte: 63 */ 0x2283,
-  /* 2nd byte: 64 */ 0x222a,
-  /* 2nd byte: 65 */ 0x2229,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 74 */ 0x2227,
-  /* 2nd byte: 75 */ 0x2228,
-  /* 2nd byte: 76 */ 0x00ac,
-  /* 2nd byte: 77 */ 0x21d2,
-  /* 2nd byte: 78 */ 0x21d4,
-  /* 2nd byte: 79 */ 0x2200,
-  /* 2nd byte: 80 */ 0x2203,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 92 */ 0x2220,
-  /* 2nd byte: 93 */ 0x22a5,
-  /* 2nd byte: 94 */ 0x2312,
-  /* 2nd byte: 95 */ 0x2202,
-  /* 2nd byte: 96 */ 0x2207,
-  /* 2nd byte: 97 */ 0x2261,
-  /* 2nd byte: 98 */ 0x2252,
-  /* 2nd byte: 99 */ 0x226a,
-  /* 2nd byte: 100 */ 0x226b,
-  /* 2nd byte: 101 */ 0x221a,
-  /* 2nd byte: 102 */ 0x223d,
-  /* 2nd byte: 103 */ 0x221d,
-  /* 2nd byte: 104 */ 0x2235,
-  /* 2nd byte: 105 */ 0x222b,
-  /* 2nd byte: 106 */ 0x222c,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 114 */ 0x212b,
-  /* 2nd byte: 115 */ 0x2030,
-  /* 2nd byte: 116 */ 0x266f,
-  /* 2nd byte: 117 */ 0x266d,
-  /* 2nd byte: 118 */ 0x266a,
-  /* 2nd byte: 119 */ 0x2020,
-  /* 2nd byte: 120 */ 0x2021,
-  /* 2nd byte: 121 */ 0x00b6,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 126 */ 0x25ef},
-/* 1st byte: 35 */ { 
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 48 */ 0xff10,
-  /* 2nd byte: 49 */ 0xff11,
-  /* 2nd byte: 50 */ 0xff12,
-  /* 2nd byte: 51 */ 0xff13,
-  /* 2nd byte: 52 */ 0xff14,
-  /* 2nd byte: 53 */ 0xff15,
-  /* 2nd byte: 54 */ 0xff16,
-  /* 2nd byte: 55 */ 0xff17,
-  /* 2nd byte: 56 */ 0xff18,
-  /* 2nd byte: 57 */ 0xff19,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 65 */ 0xff21,
-  /* 2nd byte: 66 */ 0xff22,
-  /* 2nd byte: 67 */ 0xff23,
-  /* 2nd byte: 68 */ 0xff24,
-  /* 2nd byte: 69 */ 0xff25,
-  /* 2nd byte: 70 */ 0xff26,
-  /* 2nd byte: 71 */ 0xff27,
-  /* 2nd byte: 72 */ 0xff28,
-  /* 2nd byte: 73 */ 0xff29,
-  /* 2nd byte: 74 */ 0xff2a,
-  /* 2nd byte: 75 */ 0xff2b,
-  /* 2nd byte: 76 */ 0xff2c,
-  /* 2nd byte: 77 */ 0xff2d,
-  /* 2nd byte: 78 */ 0xff2e,
-  /* 2nd byte: 79 */ 0xff2f,
-  /* 2nd byte: 80 */ 0xff30,
-  /* 2nd byte: 81 */ 0xff31,
-  /* 2nd byte: 82 */ 0xff32,
-  /* 2nd byte: 83 */ 0xff33,
-  /* 2nd byte: 84 */ 0xff34,
-  /* 2nd byte: 85 */ 0xff35,
-  /* 2nd byte: 86 */ 0xff36,
-  /* 2nd byte: 87 */ 0xff37,
-  /* 2nd byte: 88 */ 0xff38,
-  /* 2nd byte: 89 */ 0xff39,
-  /* 2nd byte: 90 */ 0xff3a,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 97 */ 0xff41,
-  /* 2nd byte: 98 */ 0xff42,
-  /* 2nd byte: 99 */ 0xff43,
-  /* 2nd byte: 100 */ 0xff44,
-  /* 2nd byte: 101 */ 0xff45,
-  /* 2nd byte: 102 */ 0xff46,
-  /* 2nd byte: 103 */ 0xff47,
-  /* 2nd byte: 104 */ 0xff48,
-  /* 2nd byte: 105 */ 0xff49,
-  /* 2nd byte: 106 */ 0xff4a,
-  /* 2nd byte: 107 */ 0xff4b,
-  /* 2nd byte: 108 */ 0xff4c,
-  /* 2nd byte: 109 */ 0xff4d,
-  /* 2nd byte: 110 */ 0xff4e,
-  /* 2nd byte: 111 */ 0xff4f,
-  /* 2nd byte: 112 */ 0xff50,
-  /* 2nd byte: 113 */ 0xff51,
-  /* 2nd byte: 114 */ 0xff52,
-  /* 2nd byte: 115 */ 0xff53,
-  /* 2nd byte: 116 */ 0xff54,
-  /* 2nd byte: 117 */ 0xff55,
-  /* 2nd byte: 118 */ 0xff56,
-  /* 2nd byte: 119 */ 0xff57,
-  /* 2nd byte: 120 */ 0xff58,
-  /* 2nd byte: 121 */ 0xff59,
-  /* 2nd byte: 122 */ 0xff5a,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 36 */ { 
-  /* 2nd byte: 33 */ 0x3041,
-  /* 2nd byte: 34 */ 0x3042,
-  /* 2nd byte: 35 */ 0x3043,
-  /* 2nd byte: 36 */ 0x3044,
-  /* 2nd byte: 37 */ 0x3045,
-  /* 2nd byte: 38 */ 0x3046,
-  /* 2nd byte: 39 */ 0x3047,
-  /* 2nd byte: 40 */ 0x3048,
-  /* 2nd byte: 41 */ 0x3049,
-  /* 2nd byte: 42 */ 0x304a,
-  /* 2nd byte: 43 */ 0x304b,
-  /* 2nd byte: 44 */ 0x304c,
-  /* 2nd byte: 45 */ 0x304d,
-  /* 2nd byte: 46 */ 0x304e,
-  /* 2nd byte: 47 */ 0x304f,
-  /* 2nd byte: 48 */ 0x3050,
-  /* 2nd byte: 49 */ 0x3051,
-  /* 2nd byte: 50 */ 0x3052,
-  /* 2nd byte: 51 */ 0x3053,
-  /* 2nd byte: 52 */ 0x3054,
-  /* 2nd byte: 53 */ 0x3055,
-  /* 2nd byte: 54 */ 0x3056,
-  /* 2nd byte: 55 */ 0x3057,
-  /* 2nd byte: 56 */ 0x3058,
-  /* 2nd byte: 57 */ 0x3059,
-  /* 2nd byte: 58 */ 0x305a,
-  /* 2nd byte: 59 */ 0x305b,
-  /* 2nd byte: 60 */ 0x305c,
-  /* 2nd byte: 61 */ 0x305d,
-  /* 2nd byte: 62 */ 0x305e,
-  /* 2nd byte: 63 */ 0x305f,
-  /* 2nd byte: 64 */ 0x3060,
-  /* 2nd byte: 65 */ 0x3061,
-  /* 2nd byte: 66 */ 0x3062,
-  /* 2nd byte: 67 */ 0x3063,
-  /* 2nd byte: 68 */ 0x3064,
-  /* 2nd byte: 69 */ 0x3065,
-  /* 2nd byte: 70 */ 0x3066,
-  /* 2nd byte: 71 */ 0x3067,
-  /* 2nd byte: 72 */ 0x3068,
-  /* 2nd byte: 73 */ 0x3069,
-  /* 2nd byte: 74 */ 0x306a,
-  /* 2nd byte: 75 */ 0x306b,
-  /* 2nd byte: 76 */ 0x306c,
-  /* 2nd byte: 77 */ 0x306d,
-  /* 2nd byte: 78 */ 0x306e,
-  /* 2nd byte: 79 */ 0x306f,
-  /* 2nd byte: 80 */ 0x3070,
-  /* 2nd byte: 81 */ 0x3071,
-  /* 2nd byte: 82 */ 0x3072,
-  /* 2nd byte: 83 */ 0x3073,
-  /* 2nd byte: 84 */ 0x3074,
-  /* 2nd byte: 85 */ 0x3075,
-  /* 2nd byte: 86 */ 0x3076,
-  /* 2nd byte: 87 */ 0x3077,
-  /* 2nd byte: 88 */ 0x3078,
-  /* 2nd byte: 89 */ 0x3079,
-  /* 2nd byte: 90 */ 0x307a,
-  /* 2nd byte: 91 */ 0x307b,
-  /* 2nd byte: 92 */ 0x307c,
-  /* 2nd byte: 93 */ 0x307d,
-  /* 2nd byte: 94 */ 0x307e,
-  /* 2nd byte: 95 */ 0x307f,
-  /* 2nd byte: 96 */ 0x3080,
-  /* 2nd byte: 97 */ 0x3081,
-  /* 2nd byte: 98 */ 0x3082,
-  /* 2nd byte: 99 */ 0x3083,
-  /* 2nd byte: 100 */ 0x3084,
-  /* 2nd byte: 101 */ 0x3085,
-  /* 2nd byte: 102 */ 0x3086,
-  /* 2nd byte: 103 */ 0x3087,
-  /* 2nd byte: 104 */ 0x3088,
-  /* 2nd byte: 105 */ 0x3089,
-  /* 2nd byte: 106 */ 0x308a,
-  /* 2nd byte: 107 */ 0x308b,
-  /* 2nd byte: 108 */ 0x308c,
-  /* 2nd byte: 109 */ 0x308d,
-  /* 2nd byte: 110 */ 0x308e,
-  /* 2nd byte: 111 */ 0x308f,
-  /* 2nd byte: 112 */ 0x3090,
-  /* 2nd byte: 113 */ 0x3091,
-  /* 2nd byte: 114 */ 0x3092,
-  /* 2nd byte: 115 */ 0x3093,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 37 */ { 
-  /* 2nd byte: 33 */ 0x30a1,
-  /* 2nd byte: 34 */ 0x30a2,
-  /* 2nd byte: 35 */ 0x30a3,
-  /* 2nd byte: 36 */ 0x30a4,
-  /* 2nd byte: 37 */ 0x30a5,
-  /* 2nd byte: 38 */ 0x30a6,
-  /* 2nd byte: 39 */ 0x30a7,
-  /* 2nd byte: 40 */ 0x30a8,
-  /* 2nd byte: 41 */ 0x30a9,
-  /* 2nd byte: 42 */ 0x30aa,
-  /* 2nd byte: 43 */ 0x30ab,
-  /* 2nd byte: 44 */ 0x30ac,
-  /* 2nd byte: 45 */ 0x30ad,
-  /* 2nd byte: 46 */ 0x30ae,
-  /* 2nd byte: 47 */ 0x30af,
-  /* 2nd byte: 48 */ 0x30b0,
-  /* 2nd byte: 49 */ 0x30b1,
-  /* 2nd byte: 50 */ 0x30b2,
-  /* 2nd byte: 51 */ 0x30b3,
-  /* 2nd byte: 52 */ 0x30b4,
-  /* 2nd byte: 53 */ 0x30b5,
-  /* 2nd byte: 54 */ 0x30b6,
-  /* 2nd byte: 55 */ 0x30b7,
-  /* 2nd byte: 56 */ 0x30b8,
-  /* 2nd byte: 57 */ 0x30b9,
-  /* 2nd byte: 58 */ 0x30ba,
-  /* 2nd byte: 59 */ 0x30bb,
-  /* 2nd byte: 60 */ 0x30bc,
-  /* 2nd byte: 61 */ 0x30bd,
-  /* 2nd byte: 62 */ 0x30be,
-  /* 2nd byte: 63 */ 0x30bf,
-  /* 2nd byte: 64 */ 0x30c0,
-  /* 2nd byte: 65 */ 0x30c1,
-  /* 2nd byte: 66 */ 0x30c2,
-  /* 2nd byte: 67 */ 0x30c3,
-  /* 2nd byte: 68 */ 0x30c4,
-  /* 2nd byte: 69 */ 0x30c5,
-  /* 2nd byte: 70 */ 0x30c6,
-  /* 2nd byte: 71 */ 0x30c7,
-  /* 2nd byte: 72 */ 0x30c8,
-  /* 2nd byte: 73 */ 0x30c9,
-  /* 2nd byte: 74 */ 0x30ca,
-  /* 2nd byte: 75 */ 0x30cb,
-  /* 2nd byte: 76 */ 0x30cc,
-  /* 2nd byte: 77 */ 0x30cd,
-  /* 2nd byte: 78 */ 0x30ce,
-  /* 2nd byte: 79 */ 0x30cf,
-  /* 2nd byte: 80 */ 0x30d0,
-  /* 2nd byte: 81 */ 0x30d1,
-  /* 2nd byte: 82 */ 0x30d2,
-  /* 2nd byte: 83 */ 0x30d3,
-  /* 2nd byte: 84 */ 0x30d4,
-  /* 2nd byte: 85 */ 0x30d5,
-  /* 2nd byte: 86 */ 0x30d6,
-  /* 2nd byte: 87 */ 0x30d7,
-  /* 2nd byte: 88 */ 0x30d8,
-  /* 2nd byte: 89 */ 0x30d9,
-  /* 2nd byte: 90 */ 0x30da,
-  /* 2nd byte: 91 */ 0x30db,
-  /* 2nd byte: 92 */ 0x30dc,
-  /* 2nd byte: 93 */ 0x30dd,
-  /* 2nd byte: 94 */ 0x30de,
-  /* 2nd byte: 95 */ 0x30df,
-  /* 2nd byte: 96 */ 0x30e0,
-  /* 2nd byte: 97 */ 0x30e1,
-  /* 2nd byte: 98 */ 0x30e2,
-  /* 2nd byte: 99 */ 0x30e3,
-  /* 2nd byte: 100 */ 0x30e4,
-  /* 2nd byte: 101 */ 0x30e5,
-  /* 2nd byte: 102 */ 0x30e6,
-  /* 2nd byte: 103 */ 0x30e7,
-  /* 2nd byte: 104 */ 0x30e8,
-  /* 2nd byte: 105 */ 0x30e9,
-  /* 2nd byte: 106 */ 0x30ea,
-  /* 2nd byte: 107 */ 0x30eb,
-  /* 2nd byte: 108 */ 0x30ec,
-  /* 2nd byte: 109 */ 0x30ed,
-  /* 2nd byte: 110 */ 0x30ee,
-  /* 2nd byte: 111 */ 0x30ef,
-  /* 2nd byte: 112 */ 0x30f0,
-  /* 2nd byte: 113 */ 0x30f1,
-  /* 2nd byte: 114 */ 0x30f2,
-  /* 2nd byte: 115 */ 0x30f3,
-  /* 2nd byte: 116 */ 0x30f4,
-  /* 2nd byte: 117 */ 0x30f5,
-  /* 2nd byte: 118 */ 0x30f6,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 38 */ { 
-  /* 2nd byte: 33 */ 0x0391,
-  /* 2nd byte: 34 */ 0x0392,
-  /* 2nd byte: 35 */ 0x0393,
-  /* 2nd byte: 36 */ 0x0394,
-  /* 2nd byte: 37 */ 0x0395,
-  /* 2nd byte: 38 */ 0x0396,
-  /* 2nd byte: 39 */ 0x0397,
-  /* 2nd byte: 40 */ 0x0398,
-  /* 2nd byte: 41 */ 0x0399,
-  /* 2nd byte: 42 */ 0x039a,
-  /* 2nd byte: 43 */ 0x039b,
-  /* 2nd byte: 44 */ 0x039c,
-  /* 2nd byte: 45 */ 0x039d,
-  /* 2nd byte: 46 */ 0x039e,
-  /* 2nd byte: 47 */ 0x039f,
-  /* 2nd byte: 48 */ 0x03a0,
-  /* 2nd byte: 49 */ 0x03a1,
-  /* 2nd byte: 50 */ 0x03a3,
-  /* 2nd byte: 51 */ 0x03a4,
-  /* 2nd byte: 52 */ 0x03a5,
-  /* 2nd byte: 53 */ 0x03a6,
-  /* 2nd byte: 54 */ 0x03a7,
-  /* 2nd byte: 55 */ 0x03a8,
-  /* 2nd byte: 56 */ 0x03a9,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 65 */ 0x03b1,
-  /* 2nd byte: 66 */ 0x03b2,
-  /* 2nd byte: 67 */ 0x03b3,
-  /* 2nd byte: 68 */ 0x03b4,
-  /* 2nd byte: 69 */ 0x03b5,
-  /* 2nd byte: 70 */ 0x03b6,
-  /* 2nd byte: 71 */ 0x03b7,
-  /* 2nd byte: 72 */ 0x03b8,
-  /* 2nd byte: 73 */ 0x03b9,
-  /* 2nd byte: 74 */ 0x03ba,
-  /* 2nd byte: 75 */ 0x03bb,
-  /* 2nd byte: 76 */ 0x03bc,
-  /* 2nd byte: 77 */ 0x03bd,
-  /* 2nd byte: 78 */ 0x03be,
-  /* 2nd byte: 79 */ 0x03bf,
-  /* 2nd byte: 80 */ 0x03c0,
-  /* 2nd byte: 81 */ 0x03c1,
-  /* 2nd byte: 82 */ 0x03c3,
-  /* 2nd byte: 83 */ 0x03c4,
-  /* 2nd byte: 84 */ 0x03c5,
-  /* 2nd byte: 85 */ 0x03c6,
-  /* 2nd byte: 86 */ 0x03c7,
-  /* 2nd byte: 87 */ 0x03c8,
-  /* 2nd byte: 88 */ 0x03c9,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 39 */ { 
-  /* 2nd byte: 33 */ 0x0410,
-  /* 2nd byte: 34 */ 0x0411,
-  /* 2nd byte: 35 */ 0x0412,
-  /* 2nd byte: 36 */ 0x0413,
-  /* 2nd byte: 37 */ 0x0414,
-  /* 2nd byte: 38 */ 0x0415,
-  /* 2nd byte: 39 */ 0x0401,
-  /* 2nd byte: 40 */ 0x0416,
-  /* 2nd byte: 41 */ 0x0417,
-  /* 2nd byte: 42 */ 0x0418,
-  /* 2nd byte: 43 */ 0x0419,
-  /* 2nd byte: 44 */ 0x041a,
-  /* 2nd byte: 45 */ 0x041b,
-  /* 2nd byte: 46 */ 0x041c,
-  /* 2nd byte: 47 */ 0x041d,
-  /* 2nd byte: 48 */ 0x041e,
-  /* 2nd byte: 49 */ 0x041f,
-  /* 2nd byte: 50 */ 0x0420,
-  /* 2nd byte: 51 */ 0x0421,
-  /* 2nd byte: 52 */ 0x0422,
-  /* 2nd byte: 53 */ 0x0423,
-  /* 2nd byte: 54 */ 0x0424,
-  /* 2nd byte: 55 */ 0x0425,
-  /* 2nd byte: 56 */ 0x0426,
-  /* 2nd byte: 57 */ 0x0427,
-  /* 2nd byte: 58 */ 0x0428,
-  /* 2nd byte: 59 */ 0x0429,
-  /* 2nd byte: 60 */ 0x042a,
-  /* 2nd byte: 61 */ 0x042b,
-  /* 2nd byte: 62 */ 0x042c,
-  /* 2nd byte: 63 */ 0x042d,
-  /* 2nd byte: 64 */ 0x042e,
-  /* 2nd byte: 65 */ 0x042f,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 81 */ 0x0430,
-  /* 2nd byte: 82 */ 0x0431,
-  /* 2nd byte: 83 */ 0x0432,
-  /* 2nd byte: 84 */ 0x0433,
-  /* 2nd byte: 85 */ 0x0434,
-  /* 2nd byte: 86 */ 0x0435,
-  /* 2nd byte: 87 */ 0x0451,
-  /* 2nd byte: 88 */ 0x0436,
-  /* 2nd byte: 89 */ 0x0437,
-  /* 2nd byte: 90 */ 0x0438,
-  /* 2nd byte: 91 */ 0x0439,
-  /* 2nd byte: 92 */ 0x043a,
-  /* 2nd byte: 93 */ 0x043b,
-  /* 2nd byte: 94 */ 0x043c,
-  /* 2nd byte: 95 */ 0x043d,
-  /* 2nd byte: 96 */ 0x043e,
-  /* 2nd byte: 97 */ 0x043f,
-  /* 2nd byte: 98 */ 0x0440,
-  /* 2nd byte: 99 */ 0x0441,
-  /* 2nd byte: 100 */ 0x0442,
-  /* 2nd byte: 101 */ 0x0443,
-  /* 2nd byte: 102 */ 0x0444,
-  /* 2nd byte: 103 */ 0x0445,
-  /* 2nd byte: 104 */ 0x0446,
-  /* 2nd byte: 105 */ 0x0447,
-  /* 2nd byte: 106 */ 0x0448,
-  /* 2nd byte: 107 */ 0x0449,
-  /* 2nd byte: 108 */ 0x044a,
-  /* 2nd byte: 109 */ 0x044b,
-  /* 2nd byte: 110 */ 0x044c,
-  /* 2nd byte: 111 */ 0x044d,
-  /* 2nd byte: 112 */ 0x044e,
-  /* 2nd byte: 113 */ 0x044f,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 40 */ { 
-  /* 2nd byte: 33 */ 0x2500,
-  /* 2nd byte: 34 */ 0x2502,
-  /* 2nd byte: 35 */ 0x250c,
-  /* 2nd byte: 36 */ 0x2510,
-  /* 2nd byte: 37 */ 0x2518,
-  /* 2nd byte: 38 */ 0x2514,
-  /* 2nd byte: 39 */ 0x251c,
-  /* 2nd byte: 40 */ 0x252c,
-  /* 2nd byte: 41 */ 0x2524,
-  /* 2nd byte: 42 */ 0x2534,
-  /* 2nd byte: 43 */ 0x253c,
-  /* 2nd byte: 44 */ 0x2501,
-  /* 2nd byte: 45 */ 0x2503,
-  /* 2nd byte: 46 */ 0x250f,
-  /* 2nd byte: 47 */ 0x2513,
-  /* 2nd byte: 48 */ 0x251b,
-  /* 2nd byte: 49 */ 0x2517,
-  /* 2nd byte: 50 */ 0x2523,
-  /* 2nd byte: 51 */ 0x2533,
-  /* 2nd byte: 52 */ 0x252b,
-  /* 2nd byte: 53 */ 0x253b,
-  /* 2nd byte: 54 */ 0x254b,
-  /* 2nd byte: 55 */ 0x2520,
-  /* 2nd byte: 56 */ 0x252f,
-  /* 2nd byte: 57 */ 0x2528,
-  /* 2nd byte: 58 */ 0x2537,
-  /* 2nd byte: 59 */ 0x253f,
-  /* 2nd byte: 60 */ 0x251d,
-  /* 2nd byte: 61 */ 0x2530,
-  /* 2nd byte: 62 */ 0x2525,
-  /* 2nd byte: 63 */ 0x2538,
-  /* 2nd byte: 64 */ 0x2542,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 41 */ { 0 }, /* unused row */
-/* 1st byte: 42 */ { 0 }, /* unused row */
-/* 1st byte: 43 */ { 0 }, /* unused row */
-/* 1st byte: 44 */ { 0 }, /* unused row */
-/* 1st byte: 45 */ { 0 }, /* unused row */
-/* 1st byte: 46 */ { 0 }, /* unused row */
-/* 1st byte: 47 */ { 0 }, /* unused row */
-/* 1st byte: 48 */ { 
-  /* 2nd byte: 33 */ 0x4e9c,
-  /* 2nd byte: 34 */ 0x5516,
-  /* 2nd byte: 35 */ 0x5a03,
-  /* 2nd byte: 36 */ 0x963f,
-  /* 2nd byte: 37 */ 0x54c0,
-  /* 2nd byte: 38 */ 0x611b,
-  /* 2nd byte: 39 */ 0x6328,
-  /* 2nd byte: 40 */ 0x59f6,
-  /* 2nd byte: 41 */ 0x9022,
-  /* 2nd byte: 42 */ 0x8475,
-  /* 2nd byte: 43 */ 0x831c,
-  /* 2nd byte: 44 */ 0x7a50,
-  /* 2nd byte: 45 */ 0x60aa,
-  /* 2nd byte: 46 */ 0x63e1,
-  /* 2nd byte: 47 */ 0x6e25,
-  /* 2nd byte: 48 */ 0x65ed,
-  /* 2nd byte: 49 */ 0x8466,
-  /* 2nd byte: 50 */ 0x82a6,
-  /* 2nd byte: 51 */ 0x9bf5,
-  /* 2nd byte: 52 */ 0x6893,
-  /* 2nd byte: 53 */ 0x5727,
-  /* 2nd byte: 54 */ 0x65a1,
-  /* 2nd byte: 55 */ 0x6271,
-  /* 2nd byte: 56 */ 0x5b9b,
-  /* 2nd byte: 57 */ 0x59d0,
-  /* 2nd byte: 58 */ 0x867b,
-  /* 2nd byte: 59 */ 0x98f4,
-  /* 2nd byte: 60 */ 0x7d62,
-  /* 2nd byte: 61 */ 0x7dbe,
-  /* 2nd byte: 62 */ 0x9b8e,
-  /* 2nd byte: 63 */ 0x6216,
-  /* 2nd byte: 64 */ 0x7c9f,
-  /* 2nd byte: 65 */ 0x88b7,
-  /* 2nd byte: 66 */ 0x5b89,
-  /* 2nd byte: 67 */ 0x5eb5,
-  /* 2nd byte: 68 */ 0x6309,
-  /* 2nd byte: 69 */ 0x6697,
-  /* 2nd byte: 70 */ 0x6848,
-  /* 2nd byte: 71 */ 0x95c7,
-  /* 2nd byte: 72 */ 0x978d,
-  /* 2nd byte: 73 */ 0x674f,
-  /* 2nd byte: 74 */ 0x4ee5,
-  /* 2nd byte: 75 */ 0x4f0a,
-  /* 2nd byte: 76 */ 0x4f4d,
-  /* 2nd byte: 77 */ 0x4f9d,
-  /* 2nd byte: 78 */ 0x5049,
-  /* 2nd byte: 79 */ 0x56f2,
-  /* 2nd byte: 80 */ 0x5937,
-  /* 2nd byte: 81 */ 0x59d4,
-  /* 2nd byte: 82 */ 0x5a01,
-  /* 2nd byte: 83 */ 0x5c09,
-  /* 2nd byte: 84 */ 0x60df,
-  /* 2nd byte: 85 */ 0x610f,
-  /* 2nd byte: 86 */ 0x6170,
-  /* 2nd byte: 87 */ 0x6613,
-  /* 2nd byte: 88 */ 0x6905,
-  /* 2nd byte: 89 */ 0x70ba,
-  /* 2nd byte: 90 */ 0x754f,
-  /* 2nd byte: 91 */ 0x7570,
-  /* 2nd byte: 92 */ 0x79fb,
-  /* 2nd byte: 93 */ 0x7dad,
-  /* 2nd byte: 94 */ 0x7def,
-  /* 2nd byte: 95 */ 0x80c3,
-  /* 2nd byte: 96 */ 0x840e,
-  /* 2nd byte: 97 */ 0x8863,
-  /* 2nd byte: 98 */ 0x8b02,
-  /* 2nd byte: 99 */ 0x9055,
-  /* 2nd byte: 100 */ 0x907a,
-  /* 2nd byte: 101 */ 0x533b,
-  /* 2nd byte: 102 */ 0x4e95,
-  /* 2nd byte: 103 */ 0x4ea5,
-  /* 2nd byte: 104 */ 0x57df,
-  /* 2nd byte: 105 */ 0x80b2,
-  /* 2nd byte: 106 */ 0x90c1,
-  /* 2nd byte: 107 */ 0x78ef,
-  /* 2nd byte: 108 */ 0x4e00,
-  /* 2nd byte: 109 */ 0x58f1,
-  /* 2nd byte: 110 */ 0x6ea2,
-  /* 2nd byte: 111 */ 0x9038,
-  /* 2nd byte: 112 */ 0x7a32,
-  /* 2nd byte: 113 */ 0x8328,
-  /* 2nd byte: 114 */ 0x828b,
-  /* 2nd byte: 115 */ 0x9c2f,
-  /* 2nd byte: 116 */ 0x5141,
-  /* 2nd byte: 117 */ 0x5370,
-  /* 2nd byte: 118 */ 0x54bd,
-  /* 2nd byte: 119 */ 0x54e1,
-  /* 2nd byte: 120 */ 0x56e0,
-  /* 2nd byte: 121 */ 0x59fb,
-  /* 2nd byte: 122 */ 0x5f15,
-  /* 2nd byte: 123 */ 0x98f2,
-  /* 2nd byte: 124 */ 0x6deb,
-  /* 2nd byte: 125 */ 0x80e4,
-  /* 2nd byte: 126 */ 0x852d},
-/* 1st byte: 49 */ { 
-  /* 2nd byte: 33 */ 0x9662,
-  /* 2nd byte: 34 */ 0x9670,
-  /* 2nd byte: 35 */ 0x96a0,
-  /* 2nd byte: 36 */ 0x97fb,
-  /* 2nd byte: 37 */ 0x540b,
-  /* 2nd byte: 38 */ 0x53f3,
-  /* 2nd byte: 39 */ 0x5b87,
-  /* 2nd byte: 40 */ 0x70cf,
-  /* 2nd byte: 41 */ 0x7fbd,
-  /* 2nd byte: 42 */ 0x8fc2,
-  /* 2nd byte: 43 */ 0x96e8,
-  /* 2nd byte: 44 */ 0x536f,
-  /* 2nd byte: 45 */ 0x9d5c,
-  /* 2nd byte: 46 */ 0x7aba,
-  /* 2nd byte: 47 */ 0x4e11,
-  /* 2nd byte: 48 */ 0x7893,
-  /* 2nd byte: 49 */ 0x81fc,
-  /* 2nd byte: 50 */ 0x6e26,
-  /* 2nd byte: 51 */ 0x5618,
-  /* 2nd byte: 52 */ 0x5504,
-  /* 2nd byte: 53 */ 0x6b1d,
-  /* 2nd byte: 54 */ 0x851a,
-  /* 2nd byte: 55 */ 0x9c3b,
-  /* 2nd byte: 56 */ 0x59e5,
-  /* 2nd byte: 57 */ 0x53a9,
-  /* 2nd byte: 58 */ 0x6d66,
-  /* 2nd byte: 59 */ 0x74dc,
-  /* 2nd byte: 60 */ 0x958f,
-  /* 2nd byte: 61 */ 0x5642,
-  /* 2nd byte: 62 */ 0x4e91,
-  /* 2nd byte: 63 */ 0x904b,
-  /* 2nd byte: 64 */ 0x96f2,
-  /* 2nd byte: 65 */ 0x834f,
-  /* 2nd byte: 66 */ 0x990c,
-  /* 2nd byte: 67 */ 0x53e1,
-  /* 2nd byte: 68 */ 0x55b6,
-  /* 2nd byte: 69 */ 0x5b30,
-  /* 2nd byte: 70 */ 0x5f71,
-  /* 2nd byte: 71 */ 0x6620,
-  /* 2nd byte: 72 */ 0x66f3,
-  /* 2nd byte: 73 */ 0x6804,
-  /* 2nd byte: 74 */ 0x6c38,
-  /* 2nd byte: 75 */ 0x6cf3,
-  /* 2nd byte: 76 */ 0x6d29,
-  /* 2nd byte: 77 */ 0x745b,
-  /* 2nd byte: 78 */ 0x76c8,
-  /* 2nd byte: 79 */ 0x7a4e,
-  /* 2nd byte: 80 */ 0x9834,
-  /* 2nd byte: 81 */ 0x82f1,
-  /* 2nd byte: 82 */ 0x885b,
-  /* 2nd byte: 83 */ 0x8a60,
-  /* 2nd byte: 84 */ 0x92ed,
-  /* 2nd byte: 85 */ 0x6db2,
-  /* 2nd byte: 86 */ 0x75ab,
-  /* 2nd byte: 87 */ 0x76ca,
-  /* 2nd byte: 88 */ 0x99c5,
-  /* 2nd byte: 89 */ 0x60a6,
-  /* 2nd byte: 90 */ 0x8b01,
-  /* 2nd byte: 91 */ 0x8d8a,
-  /* 2nd byte: 92 */ 0x95b2,
-  /* 2nd byte: 93 */ 0x698e,
-  /* 2nd byte: 94 */ 0x53ad,
-  /* 2nd byte: 95 */ 0x5186,
-  /* 2nd byte: 96 */ 0x5712,
-  /* 2nd byte: 97 */ 0x5830,
-  /* 2nd byte: 98 */ 0x5944,
-  /* 2nd byte: 99 */ 0x5bb4,
-  /* 2nd byte: 100 */ 0x5ef6,
-  /* 2nd byte: 101 */ 0x6028,
-  /* 2nd byte: 102 */ 0x63a9,
-  /* 2nd byte: 103 */ 0x63f4,
-  /* 2nd byte: 104 */ 0x6cbf,
-  /* 2nd byte: 105 */ 0x6f14,
-  /* 2nd byte: 106 */ 0x708e,
-  /* 2nd byte: 107 */ 0x7114,
-  /* 2nd byte: 108 */ 0x7159,
-  /* 2nd byte: 109 */ 0x71d5,
-  /* 2nd byte: 110 */ 0x733f,
-  /* 2nd byte: 111 */ 0x7e01,
-  /* 2nd byte: 112 */ 0x8276,
-  /* 2nd byte: 113 */ 0x82d1,
-  /* 2nd byte: 114 */ 0x8597,
-  /* 2nd byte: 115 */ 0x9060,
-  /* 2nd byte: 116 */ 0x925b,
-  /* 2nd byte: 117 */ 0x9d1b,
-  /* 2nd byte: 118 */ 0x5869,
-  /* 2nd byte: 119 */ 0x65bc,
-  /* 2nd byte: 120 */ 0x6c5a,
-  /* 2nd byte: 121 */ 0x7525,
-  /* 2nd byte: 122 */ 0x51f9,
-  /* 2nd byte: 123 */ 0x592e,
-  /* 2nd byte: 124 */ 0x5965,
-  /* 2nd byte: 125 */ 0x5f80,
-  /* 2nd byte: 126 */ 0x5fdc},
-/* 1st byte: 50 */ { 
-  /* 2nd byte: 33 */ 0x62bc,
-  /* 2nd byte: 34 */ 0x65fa,
-  /* 2nd byte: 35 */ 0x6a2a,
-  /* 2nd byte: 36 */ 0x6b27,
-  /* 2nd byte: 37 */ 0x6bb4,
-  /* 2nd byte: 38 */ 0x738b,
-  /* 2nd byte: 39 */ 0x7fc1,
-  /* 2nd byte: 40 */ 0x8956,
-  /* 2nd byte: 41 */ 0x9d2c,
-  /* 2nd byte: 42 */ 0x9d0e,
-  /* 2nd byte: 43 */ 0x9ec4,
-  /* 2nd byte: 44 */ 0x5ca1,
-  /* 2nd byte: 45 */ 0x6c96,
-  /* 2nd byte: 46 */ 0x837b,
-  /* 2nd byte: 47 */ 0x5104,
-  /* 2nd byte: 48 */ 0x5c4b,
-  /* 2nd byte: 49 */ 0x61b6,
-  /* 2nd byte: 50 */ 0x81c6,
-  /* 2nd byte: 51 */ 0x6876,
-  /* 2nd byte: 52 */ 0x7261,
-  /* 2nd byte: 53 */ 0x4e59,
-  /* 2nd byte: 54 */ 0x4ffa,
-  /* 2nd byte: 55 */ 0x5378,
-  /* 2nd byte: 56 */ 0x6069,
-  /* 2nd byte: 57 */ 0x6e29,
-  /* 2nd byte: 58 */ 0x7a4f,
-  /* 2nd byte: 59 */ 0x97f3,
-  /* 2nd byte: 60 */ 0x4e0b,
-  /* 2nd byte: 61 */ 0x5316,
-  /* 2nd byte: 62 */ 0x4eee,
-  /* 2nd byte: 63 */ 0x4f55,
-  /* 2nd byte: 64 */ 0x4f3d,
-  /* 2nd byte: 65 */ 0x4fa1,
-  /* 2nd byte: 66 */ 0x4f73,
-  /* 2nd byte: 67 */ 0x52a0,
-  /* 2nd byte: 68 */ 0x53ef,
-  /* 2nd byte: 69 */ 0x5609,
-  /* 2nd byte: 70 */ 0x590f,
-  /* 2nd byte: 71 */ 0x5ac1,
-  /* 2nd byte: 72 */ 0x5bb6,
-  /* 2nd byte: 73 */ 0x5be1,
-  /* 2nd byte: 74 */ 0x79d1,
-  /* 2nd byte: 75 */ 0x6687,
-  /* 2nd byte: 76 */ 0x679c,
-  /* 2nd byte: 77 */ 0x67b6,
-  /* 2nd byte: 78 */ 0x6b4c,
-  /* 2nd byte: 79 */ 0x6cb3,
-  /* 2nd byte: 80 */ 0x706b,
-  /* 2nd byte: 81 */ 0x73c2,
-  /* 2nd byte: 82 */ 0x798d,
-  /* 2nd byte: 83 */ 0x79be,
-  /* 2nd byte: 84 */ 0x7a3c,
-  /* 2nd byte: 85 */ 0x7b87,
-  /* 2nd byte: 86 */ 0x82b1,
-  /* 2nd byte: 87 */ 0x82db,
-  /* 2nd byte: 88 */ 0x8304,
-  /* 2nd byte: 89 */ 0x8377,
-  /* 2nd byte: 90 */ 0x83ef,
-  /* 2nd byte: 91 */ 0x83d3,
-  /* 2nd byte: 92 */ 0x8766,
-  /* 2nd byte: 93 */ 0x8ab2,
-  /* 2nd byte: 94 */ 0x5629,
-  /* 2nd byte: 95 */ 0x8ca8,
-  /* 2nd byte: 96 */ 0x8fe6,
-  /* 2nd byte: 97 */ 0x904e,
-  /* 2nd byte: 98 */ 0x971e,
-  /* 2nd byte: 99 */ 0x868a,
-  /* 2nd byte: 100 */ 0x4fc4,
-  /* 2nd byte: 101 */ 0x5ce8,
-  /* 2nd byte: 102 */ 0x6211,
-  /* 2nd byte: 103 */ 0x7259,
-  /* 2nd byte: 104 */ 0x753b,
-  /* 2nd byte: 105 */ 0x81e5,
-  /* 2nd byte: 106 */ 0x82bd,
-  /* 2nd byte: 107 */ 0x86fe,
-  /* 2nd byte: 108 */ 0x8cc0,
-  /* 2nd byte: 109 */ 0x96c5,
-  /* 2nd byte: 110 */ 0x9913,
-  /* 2nd byte: 111 */ 0x99d5,
-  /* 2nd byte: 112 */ 0x4ecb,
-  /* 2nd byte: 113 */ 0x4f1a,
-  /* 2nd byte: 114 */ 0x89e3,
-  /* 2nd byte: 115 */ 0x56de,
-  /* 2nd byte: 116 */ 0x584a,
-  /* 2nd byte: 117 */ 0x58ca,
-  /* 2nd byte: 118 */ 0x5efb,
-  /* 2nd byte: 119 */ 0x5feb,
-  /* 2nd byte: 120 */ 0x602a,
-  /* 2nd byte: 121 */ 0x6094,
-  /* 2nd byte: 122 */ 0x6062,
-  /* 2nd byte: 123 */ 0x61d0,
-  /* 2nd byte: 124 */ 0x6212,
-  /* 2nd byte: 125 */ 0x62d0,
-  /* 2nd byte: 126 */ 0x6539},
-/* 1st byte: 51 */ { 
-  /* 2nd byte: 33 */ 0x9b41,
-  /* 2nd byte: 34 */ 0x6666,
-  /* 2nd byte: 35 */ 0x68b0,
-  /* 2nd byte: 36 */ 0x6d77,
-  /* 2nd byte: 37 */ 0x7070,
-  /* 2nd byte: 38 */ 0x754c,
-  /* 2nd byte: 39 */ 0x7686,
-  /* 2nd byte: 40 */ 0x7d75,
-  /* 2nd byte: 41 */ 0x82a5,
-  /* 2nd byte: 42 */ 0x87f9,
-  /* 2nd byte: 43 */ 0x958b,
-  /* 2nd byte: 44 */ 0x968e,
-  /* 2nd byte: 45 */ 0x8c9d,
-  /* 2nd byte: 46 */ 0x51f1,
-  /* 2nd byte: 47 */ 0x52be,
-  /* 2nd byte: 48 */ 0x5916,
-  /* 2nd byte: 49 */ 0x54b3,
-  /* 2nd byte: 50 */ 0x5bb3,
-  /* 2nd byte: 51 */ 0x5d16,
-  /* 2nd byte: 52 */ 0x6168,
-  /* 2nd byte: 53 */ 0x6982,
-  /* 2nd byte: 54 */ 0x6daf,
-  /* 2nd byte: 55 */ 0x788d,
-  /* 2nd byte: 56 */ 0x84cb,
-  /* 2nd byte: 57 */ 0x8857,
-  /* 2nd byte: 58 */ 0x8a72,
-  /* 2nd byte: 59 */ 0x93a7,
-  /* 2nd byte: 60 */ 0x9ab8,
-  /* 2nd byte: 61 */ 0x6d6c,
-  /* 2nd byte: 62 */ 0x99a8,
-  /* 2nd byte: 63 */ 0x86d9,
-  /* 2nd byte: 64 */ 0x57a3,
-  /* 2nd byte: 65 */ 0x67ff,
-  /* 2nd byte: 66 */ 0x86ce,
-  /* 2nd byte: 67 */ 0x920e,
-  /* 2nd byte: 68 */ 0x5283,
-  /* 2nd byte: 69 */ 0x5687,
-  /* 2nd byte: 70 */ 0x5404,
-  /* 2nd byte: 71 */ 0x5ed3,
-  /* 2nd byte: 72 */ 0x62e1,
-  /* 2nd byte: 73 */ 0x64b9,
-  /* 2nd byte: 74 */ 0x683c,
-  /* 2nd byte: 75 */ 0x6838,
-  /* 2nd byte: 76 */ 0x6bbb,
-  /* 2nd byte: 77 */ 0x7372,
-  /* 2nd byte: 78 */ 0x78ba,
-  /* 2nd byte: 79 */ 0x7a6b,
-  /* 2nd byte: 80 */ 0x899a,
-  /* 2nd byte: 81 */ 0x89d2,
-  /* 2nd byte: 82 */ 0x8d6b,
-  /* 2nd byte: 83 */ 0x8f03,
-  /* 2nd byte: 84 */ 0x90ed,
-  /* 2nd byte: 85 */ 0x95a3,
-  /* 2nd byte: 86 */ 0x9694,
-  /* 2nd byte: 87 */ 0x9769,
-  /* 2nd byte: 88 */ 0x5b66,
-  /* 2nd byte: 89 */ 0x5cb3,
-  /* 2nd byte: 90 */ 0x697d,
-  /* 2nd byte: 91 */ 0x984d,
-  /* 2nd byte: 92 */ 0x984e,
-  /* 2nd byte: 93 */ 0x639b,
-  /* 2nd byte: 94 */ 0x7b20,
-  /* 2nd byte: 95 */ 0x6a2b,
-  /* 2nd byte: 96 */ 0x6a7f,
-  /* 2nd byte: 97 */ 0x68b6,
-  /* 2nd byte: 98 */ 0x9c0d,
-  /* 2nd byte: 99 */ 0x6f5f,
-  /* 2nd byte: 100 */ 0x5272,
-  /* 2nd byte: 101 */ 0x559d,
-  /* 2nd byte: 102 */ 0x6070,
-  /* 2nd byte: 103 */ 0x62ec,
-  /* 2nd byte: 104 */ 0x6d3b,
-  /* 2nd byte: 105 */ 0x6e07,
-  /* 2nd byte: 106 */ 0x6ed1,
-  /* 2nd byte: 107 */ 0x845b,
-  /* 2nd byte: 108 */ 0x8910,
-  /* 2nd byte: 109 */ 0x8f44,
-  /* 2nd byte: 110 */ 0x4e14,
-  /* 2nd byte: 111 */ 0x9c39,
-  /* 2nd byte: 112 */ 0x53f6,
-  /* 2nd byte: 113 */ 0x691b,
-  /* 2nd byte: 114 */ 0x6a3a,
-  /* 2nd byte: 115 */ 0x9784,
-  /* 2nd byte: 116 */ 0x682a,
-  /* 2nd byte: 117 */ 0x515c,
-  /* 2nd byte: 118 */ 0x7ac3,
-  /* 2nd byte: 119 */ 0x84b2,
-  /* 2nd byte: 120 */ 0x91dc,
-  /* 2nd byte: 121 */ 0x938c,
-  /* 2nd byte: 122 */ 0x565b,
-  /* 2nd byte: 123 */ 0x9d28,
-  /* 2nd byte: 124 */ 0x6822,
-  /* 2nd byte: 125 */ 0x8305,
-  /* 2nd byte: 126 */ 0x8431},
-/* 1st byte: 52 */ { 
-  /* 2nd byte: 33 */ 0x7ca5,
-  /* 2nd byte: 34 */ 0x5208,
-  /* 2nd byte: 35 */ 0x82c5,
-  /* 2nd byte: 36 */ 0x74e6,
-  /* 2nd byte: 37 */ 0x4e7e,
-  /* 2nd byte: 38 */ 0x4f83,
-  /* 2nd byte: 39 */ 0x51a0,
-  /* 2nd byte: 40 */ 0x5bd2,
-  /* 2nd byte: 41 */ 0x520a,
-  /* 2nd byte: 42 */ 0x52d8,
-  /* 2nd byte: 43 */ 0x52e7,
-  /* 2nd byte: 44 */ 0x5dfb,
-  /* 2nd byte: 45 */ 0x559a,
-  /* 2nd byte: 46 */ 0x582a,
-  /* 2nd byte: 47 */ 0x59e6,
-  /* 2nd byte: 48 */ 0x5b8c,
-  /* 2nd byte: 49 */ 0x5b98,
-  /* 2nd byte: 50 */ 0x5bdb,
-  /* 2nd byte: 51 */ 0x5e72,
-  /* 2nd byte: 52 */ 0x5e79,
-  /* 2nd byte: 53 */ 0x60a3,
-  /* 2nd byte: 54 */ 0x611f,
-  /* 2nd byte: 55 */ 0x6163,
-  /* 2nd byte: 56 */ 0x61be,
-  /* 2nd byte: 57 */ 0x63db,
-  /* 2nd byte: 58 */ 0x6562,
-  /* 2nd byte: 59 */ 0x67d1,
-  /* 2nd byte: 60 */ 0x6853,
-  /* 2nd byte: 61 */ 0x68fa,
-  /* 2nd byte: 62 */ 0x6b3e,
-  /* 2nd byte: 63 */ 0x6b53,
-  /* 2nd byte: 64 */ 0x6c57,
-  /* 2nd byte: 65 */ 0x6f22,
-  /* 2nd byte: 66 */ 0x6f97,
-  /* 2nd byte: 67 */ 0x6f45,
-  /* 2nd byte: 68 */ 0x74b0,
-  /* 2nd byte: 69 */ 0x7518,
-  /* 2nd byte: 70 */ 0x76e3,
-  /* 2nd byte: 71 */ 0x770b,
-  /* 2nd byte: 72 */ 0x7aff,
-  /* 2nd byte: 73 */ 0x7ba1,
-  /* 2nd byte: 74 */ 0x7c21,
-  /* 2nd byte: 75 */ 0x7de9,
-  /* 2nd byte: 76 */ 0x7f36,
-  /* 2nd byte: 77 */ 0x7ff0,
-  /* 2nd byte: 78 */ 0x809d,
-  /* 2nd byte: 79 */ 0x8266,
-  /* 2nd byte: 80 */ 0x839e,
-  /* 2nd byte: 81 */ 0x89b3,
-  /* 2nd byte: 82 */ 0x8acc,
-  /* 2nd byte: 83 */ 0x8cab,
-  /* 2nd byte: 84 */ 0x9084,
-  /* 2nd byte: 85 */ 0x9451,
-  /* 2nd byte: 86 */ 0x9593,
-  /* 2nd byte: 87 */ 0x9591,
-  /* 2nd byte: 88 */ 0x95a2,
-  /* 2nd byte: 89 */ 0x9665,
-  /* 2nd byte: 90 */ 0x97d3,
-  /* 2nd byte: 91 */ 0x9928,
-  /* 2nd byte: 92 */ 0x8218,
-  /* 2nd byte: 93 */ 0x4e38,
-  /* 2nd byte: 94 */ 0x542b,
-  /* 2nd byte: 95 */ 0x5cb8,
-  /* 2nd byte: 96 */ 0x5dcc,
-  /* 2nd byte: 97 */ 0x73a9,
-  /* 2nd byte: 98 */ 0x764c,
-  /* 2nd byte: 99 */ 0x773c,
-  /* 2nd byte: 100 */ 0x5ca9,
-  /* 2nd byte: 101 */ 0x7feb,
-  /* 2nd byte: 102 */ 0x8d0b,
-  /* 2nd byte: 103 */ 0x96c1,
-  /* 2nd byte: 104 */ 0x9811,
-  /* 2nd byte: 105 */ 0x9854,
-  /* 2nd byte: 106 */ 0x9858,
-  /* 2nd byte: 107 */ 0x4f01,
-  /* 2nd byte: 108 */ 0x4f0e,
-  /* 2nd byte: 109 */ 0x5371,
-  /* 2nd byte: 110 */ 0x559c,
-  /* 2nd byte: 111 */ 0x5668,
-  /* 2nd byte: 112 */ 0x57fa,
-  /* 2nd byte: 113 */ 0x5947,
-  /* 2nd byte: 114 */ 0x5b09,
-  /* 2nd byte: 115 */ 0x5bc4,
-  /* 2nd byte: 116 */ 0x5c90,
-  /* 2nd byte: 117 */ 0x5e0c,
-  /* 2nd byte: 118 */ 0x5e7e,
-  /* 2nd byte: 119 */ 0x5fcc,
-  /* 2nd byte: 120 */ 0x63ee,
-  /* 2nd byte: 121 */ 0x673a,
-  /* 2nd byte: 122 */ 0x65d7,
-  /* 2nd byte: 123 */ 0x65e2,
-  /* 2nd byte: 124 */ 0x671f,
-  /* 2nd byte: 125 */ 0x68cb,
-  /* 2nd byte: 126 */ 0x68c4},
-/* 1st byte: 53 */ { 
-  /* 2nd byte: 33 */ 0x6a5f,
-  /* 2nd byte: 34 */ 0x5e30,
-  /* 2nd byte: 35 */ 0x6bc5,
-  /* 2nd byte: 36 */ 0x6c17,
-  /* 2nd byte: 37 */ 0x6c7d,
-  /* 2nd byte: 38 */ 0x757f,
-  /* 2nd byte: 39 */ 0x7948,
-  /* 2nd byte: 40 */ 0x5b63,
-  /* 2nd byte: 41 */ 0x7a00,
-  /* 2nd byte: 42 */ 0x7d00,
-  /* 2nd byte: 43 */ 0x5fbd,
-  /* 2nd byte: 44 */ 0x898f,
-  /* 2nd byte: 45 */ 0x8a18,
-  /* 2nd byte: 46 */ 0x8cb4,
-  /* 2nd byte: 47 */ 0x8d77,
-  /* 2nd byte: 48 */ 0x8ecc,
-  /* 2nd byte: 49 */ 0x8f1d,
-  /* 2nd byte: 50 */ 0x98e2,
-  /* 2nd byte: 51 */ 0x9a0e,
-  /* 2nd byte: 52 */ 0x9b3c,
-  /* 2nd byte: 53 */ 0x4e80,
-  /* 2nd byte: 54 */ 0x507d,
-  /* 2nd byte: 55 */ 0x5100,
-  /* 2nd byte: 56 */ 0x5993,
-  /* 2nd byte: 57 */ 0x5b9c,
-  /* 2nd byte: 58 */ 0x622f,
-  /* 2nd byte: 59 */ 0x6280,
-  /* 2nd byte: 60 */ 0x64ec,
-  /* 2nd byte: 61 */ 0x6b3a,
-  /* 2nd byte: 62 */ 0x72a0,
-  /* 2nd byte: 63 */ 0x7591,
-  /* 2nd byte: 64 */ 0x7947,
-  /* 2nd byte: 65 */ 0x7fa9,
-  /* 2nd byte: 66 */ 0x87fb,
-  /* 2nd byte: 67 */ 0x8abc,
-  /* 2nd byte: 68 */ 0x8b70,
-  /* 2nd byte: 69 */ 0x63ac,
-  /* 2nd byte: 70 */ 0x83ca,
-  /* 2nd byte: 71 */ 0x97a0,
-  /* 2nd byte: 72 */ 0x5409,
-  /* 2nd byte: 73 */ 0x5403,
-  /* 2nd byte: 74 */ 0x55ab,
-  /* 2nd byte: 75 */ 0x6854,
-  /* 2nd byte: 76 */ 0x6a58,
-  /* 2nd byte: 77 */ 0x8a70,
-  /* 2nd byte: 78 */ 0x7827,
-  /* 2nd byte: 79 */ 0x6775,
-  /* 2nd byte: 80 */ 0x9ecd,
-  /* 2nd byte: 81 */ 0x5374,
-  /* 2nd byte: 82 */ 0x5ba2,
-  /* 2nd byte: 83 */ 0x811a,
-  /* 2nd byte: 84 */ 0x8650,
-  /* 2nd byte: 85 */ 0x9006,
-  /* 2nd byte: 86 */ 0x4e18,
-  /* 2nd byte: 87 */ 0x4e45,
-  /* 2nd byte: 88 */ 0x4ec7,
-  /* 2nd byte: 89 */ 0x4f11,
-  /* 2nd byte: 90 */ 0x53ca,
-  /* 2nd byte: 91 */ 0x5438,
-  /* 2nd byte: 92 */ 0x5bae,
-  /* 2nd byte: 93 */ 0x5f13,
-  /* 2nd byte: 94 */ 0x6025,
-  /* 2nd byte: 95 */ 0x6551,
-  /* 2nd byte: 96 */ 0x673d,
-  /* 2nd byte: 97 */ 0x6c42,
-  /* 2nd byte: 98 */ 0x6c72,
-  /* 2nd byte: 99 */ 0x6ce3,
-  /* 2nd byte: 100 */ 0x7078,
-  /* 2nd byte: 101 */ 0x7403,
-  /* 2nd byte: 102 */ 0x7a76,
-  /* 2nd byte: 103 */ 0x7aae,
-  /* 2nd byte: 104 */ 0x7b08,
-  /* 2nd byte: 105 */ 0x7d1a,
-  /* 2nd byte: 106 */ 0x7cfe,
-  /* 2nd byte: 107 */ 0x7d66,
-  /* 2nd byte: 108 */ 0x65e7,
-  /* 2nd byte: 109 */ 0x725b,
-  /* 2nd byte: 110 */ 0x53bb,
-  /* 2nd byte: 111 */ 0x5c45,
-  /* 2nd byte: 112 */ 0x5de8,
-  /* 2nd byte: 113 */ 0x62d2,
-  /* 2nd byte: 114 */ 0x62e0,
-  /* 2nd byte: 115 */ 0x6319,
-  /* 2nd byte: 116 */ 0x6e20,
-  /* 2nd byte: 117 */ 0x865a,
-  /* 2nd byte: 118 */ 0x8a31,
-  /* 2nd byte: 119 */ 0x8ddd,
-  /* 2nd byte: 120 */ 0x92f8,
-  /* 2nd byte: 121 */ 0x6f01,
-  /* 2nd byte: 122 */ 0x79a6,
-  /* 2nd byte: 123 */ 0x9b5a,
-  /* 2nd byte: 124 */ 0x4ea8,
-  /* 2nd byte: 125 */ 0x4eab,
-  /* 2nd byte: 126 */ 0x4eac},
-/* 1st byte: 54 */ { 
-  /* 2nd byte: 33 */ 0x4f9b,
-  /* 2nd byte: 34 */ 0x4fa0,
-  /* 2nd byte: 35 */ 0x50d1,
-  /* 2nd byte: 36 */ 0x5147,
-  /* 2nd byte: 37 */ 0x7af6,
-  /* 2nd byte: 38 */ 0x5171,
-  /* 2nd byte: 39 */ 0x51f6,
-  /* 2nd byte: 40 */ 0x5354,
-  /* 2nd byte: 41 */ 0x5321,
-  /* 2nd byte: 42 */ 0x537f,
-  /* 2nd byte: 43 */ 0x53eb,
-  /* 2nd byte: 44 */ 0x55ac,
-  /* 2nd byte: 45 */ 0x5883,
-  /* 2nd byte: 46 */ 0x5ce1,
-  /* 2nd byte: 47 */ 0x5f37,
-  /* 2nd byte: 48 */ 0x5f4a,
-  /* 2nd byte: 49 */ 0x602f,
-  /* 2nd byte: 50 */ 0x6050,
-  /* 2nd byte: 51 */ 0x606d,
-  /* 2nd byte: 52 */ 0x631f,
-  /* 2nd byte: 53 */ 0x6559,
-  /* 2nd byte: 54 */ 0x6a4b,
-  /* 2nd byte: 55 */ 0x6cc1,
-  /* 2nd byte: 56 */ 0x72c2,
-  /* 2nd byte: 57 */ 0x72ed,
-  /* 2nd byte: 58 */ 0x77ef,
-  /* 2nd byte: 59 */ 0x80f8,
-  /* 2nd byte: 60 */ 0x8105,
-  /* 2nd byte: 61 */ 0x8208,
-  /* 2nd byte: 62 */ 0x854e,
-  /* 2nd byte: 63 */ 0x90f7,
-  /* 2nd byte: 64 */ 0x93e1,
-  /* 2nd byte: 65 */ 0x97ff,
-  /* 2nd byte: 66 */ 0x9957,
-  /* 2nd byte: 67 */ 0x9a5a,
-  /* 2nd byte: 68 */ 0x4ef0,
-  /* 2nd byte: 69 */ 0x51dd,
-  /* 2nd byte: 70 */ 0x5c2d,
-  /* 2nd byte: 71 */ 0x6681,
-  /* 2nd byte: 72 */ 0x696d,
-  /* 2nd byte: 73 */ 0x5c40,
-  /* 2nd byte: 74 */ 0x66f2,
-  /* 2nd byte: 75 */ 0x6975,
-  /* 2nd byte: 76 */ 0x7389,
-  /* 2nd byte: 77 */ 0x6850,
-  /* 2nd byte: 78 */ 0x7c81,
-  /* 2nd byte: 79 */ 0x50c5,
-  /* 2nd byte: 80 */ 0x52e4,
-  /* 2nd byte: 81 */ 0x5747,
-  /* 2nd byte: 82 */ 0x5dfe,
-  /* 2nd byte: 83 */ 0x9326,
-  /* 2nd byte: 84 */ 0x65a4,
-  /* 2nd byte: 85 */ 0x6b23,
-  /* 2nd byte: 86 */ 0x6b3d,
-  /* 2nd byte: 87 */ 0x7434,
-  /* 2nd byte: 88 */ 0x7981,
-  /* 2nd byte: 89 */ 0x79bd,
-  /* 2nd byte: 90 */ 0x7b4b,
-  /* 2nd byte: 91 */ 0x7dca,
-  /* 2nd byte: 92 */ 0x82b9,
-  /* 2nd byte: 93 */ 0x83cc,
-  /* 2nd byte: 94 */ 0x887f,
-  /* 2nd byte: 95 */ 0x895f,
-  /* 2nd byte: 96 */ 0x8b39,
-  /* 2nd byte: 97 */ 0x8fd1,
-  /* 2nd byte: 98 */ 0x91d1,
-  /* 2nd byte: 99 */ 0x541f,
-  /* 2nd byte: 100 */ 0x9280,
-  /* 2nd byte: 101 */ 0x4e5d,
-  /* 2nd byte: 102 */ 0x5036,
-  /* 2nd byte: 103 */ 0x53e5,
-  /* 2nd byte: 104 */ 0x533a,
-  /* 2nd byte: 105 */ 0x72d7,
-  /* 2nd byte: 106 */ 0x7396,
-  /* 2nd byte: 107 */ 0x77e9,
-  /* 2nd byte: 108 */ 0x82e6,
-  /* 2nd byte: 109 */ 0x8eaf,
-  /* 2nd byte: 110 */ 0x99c6,
-  /* 2nd byte: 111 */ 0x99c8,
-  /* 2nd byte: 112 */ 0x99d2,
-  /* 2nd byte: 113 */ 0x5177,
-  /* 2nd byte: 114 */ 0x611a,
-  /* 2nd byte: 115 */ 0x865e,
-  /* 2nd byte: 116 */ 0x55b0,
-  /* 2nd byte: 117 */ 0x7a7a,
-  /* 2nd byte: 118 */ 0x5076,
-  /* 2nd byte: 119 */ 0x5bd3,
-  /* 2nd byte: 120 */ 0x9047,
-  /* 2nd byte: 121 */ 0x9685,
-  /* 2nd byte: 122 */ 0x4e32,
-  /* 2nd byte: 123 */ 0x6adb,
-  /* 2nd byte: 124 */ 0x91e7,
-  /* 2nd byte: 125 */ 0x5c51,
-  /* 2nd byte: 126 */ 0x5c48},
-/* 1st byte: 55 */ { 
-  /* 2nd byte: 33 */ 0x6398,
-  /* 2nd byte: 34 */ 0x7a9f,
-  /* 2nd byte: 35 */ 0x6c93,
-  /* 2nd byte: 36 */ 0x9774,
-  /* 2nd byte: 37 */ 0x8f61,
-  /* 2nd byte: 38 */ 0x7aaa,
-  /* 2nd byte: 39 */ 0x718a,
-  /* 2nd byte: 40 */ 0x9688,
-  /* 2nd byte: 41 */ 0x7c82,
-  /* 2nd byte: 42 */ 0x6817,
-  /* 2nd byte: 43 */ 0x7e70,
-  /* 2nd byte: 44 */ 0x6851,
-  /* 2nd byte: 45 */ 0x936c,
-  /* 2nd byte: 46 */ 0x52f2,
-  /* 2nd byte: 47 */ 0x541b,
-  /* 2nd byte: 48 */ 0x85ab,
-  /* 2nd byte: 49 */ 0x8a13,
-  /* 2nd byte: 50 */ 0x7fa4,
-  /* 2nd byte: 51 */ 0x8ecd,
-  /* 2nd byte: 52 */ 0x90e1,
-  /* 2nd byte: 53 */ 0x5366,
-  /* 2nd byte: 54 */ 0x8888,
-  /* 2nd byte: 55 */ 0x7941,
-  /* 2nd byte: 56 */ 0x4fc2,
-  /* 2nd byte: 57 */ 0x50be,
-  /* 2nd byte: 58 */ 0x5211,
-  /* 2nd byte: 59 */ 0x5144,
-  /* 2nd byte: 60 */ 0x5553,
-  /* 2nd byte: 61 */ 0x572d,
-  /* 2nd byte: 62 */ 0x73ea,
-  /* 2nd byte: 63 */ 0x578b,
-  /* 2nd byte: 64 */ 0x5951,
-  /* 2nd byte: 65 */ 0x5f62,
-  /* 2nd byte: 66 */ 0x5f84,
-  /* 2nd byte: 67 */ 0x6075,
-  /* 2nd byte: 68 */ 0x6176,
-  /* 2nd byte: 69 */ 0x6167,
-  /* 2nd byte: 70 */ 0x61a9,
-  /* 2nd byte: 71 */ 0x63b2,
-  /* 2nd byte: 72 */ 0x643a,
-  /* 2nd byte: 73 */ 0x656c,
-  /* 2nd byte: 74 */ 0x666f,
-  /* 2nd byte: 75 */ 0x6842,
-  /* 2nd byte: 76 */ 0x6e13,
-  /* 2nd byte: 77 */ 0x7566,
-  /* 2nd byte: 78 */ 0x7a3d,
-  /* 2nd byte: 79 */ 0x7cfb,
-  /* 2nd byte: 80 */ 0x7d4c,
-  /* 2nd byte: 81 */ 0x7d99,
-  /* 2nd byte: 82 */ 0x7e4b,
-  /* 2nd byte: 83 */ 0x7f6b,
-  /* 2nd byte: 84 */ 0x830e,
-  /* 2nd byte: 85 */ 0x834a,
-  /* 2nd byte: 86 */ 0x86cd,
-  /* 2nd byte: 87 */ 0x8a08,
-  /* 2nd byte: 88 */ 0x8a63,
-  /* 2nd byte: 89 */ 0x8b66,
-  /* 2nd byte: 90 */ 0x8efd,
-  /* 2nd byte: 91 */ 0x981a,
-  /* 2nd byte: 92 */ 0x9d8f,
-  /* 2nd byte: 93 */ 0x82b8,
-  /* 2nd byte: 94 */ 0x8fce,
-  /* 2nd byte: 95 */ 0x9be8,
-  /* 2nd byte: 96 */ 0x5287,
-  /* 2nd byte: 97 */ 0x621f,
-  /* 2nd byte: 98 */ 0x6483,
-  /* 2nd byte: 99 */ 0x6fc0,
-  /* 2nd byte: 100 */ 0x9699,
-  /* 2nd byte: 101 */ 0x6841,
-  /* 2nd byte: 102 */ 0x5091,
-  /* 2nd byte: 103 */ 0x6b20,
-  /* 2nd byte: 104 */ 0x6c7a,
-  /* 2nd byte: 105 */ 0x6f54,
-  /* 2nd byte: 106 */ 0x7a74,
-  /* 2nd byte: 107 */ 0x7d50,
-  /* 2nd byte: 108 */ 0x8840,
-  /* 2nd byte: 109 */ 0x8a23,
-  /* 2nd byte: 110 */ 0x6708,
-  /* 2nd byte: 111 */ 0x4ef6,
-  /* 2nd byte: 112 */ 0x5039,
-  /* 2nd byte: 113 */ 0x5026,
-  /* 2nd byte: 114 */ 0x5065,
-  /* 2nd byte: 115 */ 0x517c,
-  /* 2nd byte: 116 */ 0x5238,
-  /* 2nd byte: 117 */ 0x5263,
-  /* 2nd byte: 118 */ 0x55a7,
-  /* 2nd byte: 119 */ 0x570f,
-  /* 2nd byte: 120 */ 0x5805,
-  /* 2nd byte: 121 */ 0x5acc,
-  /* 2nd byte: 122 */ 0x5efa,
-  /* 2nd byte: 123 */ 0x61b2,
-  /* 2nd byte: 124 */ 0x61f8,
-  /* 2nd byte: 125 */ 0x62f3,
-  /* 2nd byte: 126 */ 0x6372},
-/* 1st byte: 56 */ { 
-  /* 2nd byte: 33 */ 0x691c,
-  /* 2nd byte: 34 */ 0x6a29,
-  /* 2nd byte: 35 */ 0x727d,
-  /* 2nd byte: 36 */ 0x72ac,
-  /* 2nd byte: 37 */ 0x732e,
-  /* 2nd byte: 38 */ 0x7814,
-  /* 2nd byte: 39 */ 0x786f,
-  /* 2nd byte: 40 */ 0x7d79,
-  /* 2nd byte: 41 */ 0x770c,
-  /* 2nd byte: 42 */ 0x80a9,
-  /* 2nd byte: 43 */ 0x898b,
-  /* 2nd byte: 44 */ 0x8b19,
-  /* 2nd byte: 45 */ 0x8ce2,
-  /* 2nd byte: 46 */ 0x8ed2,
-  /* 2nd byte: 47 */ 0x9063,
-  /* 2nd byte: 48 */ 0x9375,
-  /* 2nd byte: 49 */ 0x967a,
-  /* 2nd byte: 50 */ 0x9855,
-  /* 2nd byte: 51 */ 0x9a13,
-  /* 2nd byte: 52 */ 0x9e78,
-  /* 2nd byte: 53 */ 0x5143,
-  /* 2nd byte: 54 */ 0x539f,
-  /* 2nd byte: 55 */ 0x53b3,
-  /* 2nd byte: 56 */ 0x5e7b,
-  /* 2nd byte: 57 */ 0x5f26,
-  /* 2nd byte: 58 */ 0x6e1b,
-  /* 2nd byte: 59 */ 0x6e90,
-  /* 2nd byte: 60 */ 0x7384,
-  /* 2nd byte: 61 */ 0x73fe,
-  /* 2nd byte: 62 */ 0x7d43,
-  /* 2nd byte: 63 */ 0x8237,
-  /* 2nd byte: 64 */ 0x8a00,
-  /* 2nd byte: 65 */ 0x8afa,
-  /* 2nd byte: 66 */ 0x9650,
-  /* 2nd byte: 67 */ 0x4e4e,
-  /* 2nd byte: 68 */ 0x500b,
-  /* 2nd byte: 69 */ 0x53e4,
-  /* 2nd byte: 70 */ 0x547c,
-  /* 2nd byte: 71 */ 0x56fa,
-  /* 2nd byte: 72 */ 0x59d1,
-  /* 2nd byte: 73 */ 0x5b64,
-  /* 2nd byte: 74 */ 0x5df1,
-  /* 2nd byte: 75 */ 0x5eab,
-  /* 2nd byte: 76 */ 0x5f27,
-  /* 2nd byte: 77 */ 0x6238,
-  /* 2nd byte: 78 */ 0x6545,
-  /* 2nd byte: 79 */ 0x67af,
-  /* 2nd byte: 80 */ 0x6e56,
-  /* 2nd byte: 81 */ 0x72d0,
-  /* 2nd byte: 82 */ 0x7cca,
-  /* 2nd byte: 83 */ 0x88b4,
-  /* 2nd byte: 84 */ 0x80a1,
-  /* 2nd byte: 85 */ 0x80e1,
-  /* 2nd byte: 86 */ 0x83f0,
-  /* 2nd byte: 87 */ 0x864e,
-  /* 2nd byte: 88 */ 0x8a87,
-  /* 2nd byte: 89 */ 0x8de8,
-  /* 2nd byte: 90 */ 0x9237,
-  /* 2nd byte: 91 */ 0x96c7,
-  /* 2nd byte: 92 */ 0x9867,
-  /* 2nd byte: 93 */ 0x9f13,
-  /* 2nd byte: 94 */ 0x4e94,
-  /* 2nd byte: 95 */ 0x4e92,
-  /* 2nd byte: 96 */ 0x4f0d,
-  /* 2nd byte: 97 */ 0x5348,
-  /* 2nd byte: 98 */ 0x5449,
-  /* 2nd byte: 99 */ 0x543e,
-  /* 2nd byte: 100 */ 0x5a2f,
-  /* 2nd byte: 101 */ 0x5f8c,
-  /* 2nd byte: 102 */ 0x5fa1,
-  /* 2nd byte: 103 */ 0x609f,
-  /* 2nd byte: 104 */ 0x68a7,
-  /* 2nd byte: 105 */ 0x6a8e,
-  /* 2nd byte: 106 */ 0x745a,
-  /* 2nd byte: 107 */ 0x7881,
-  /* 2nd byte: 108 */ 0x8a9e,
-  /* 2nd byte: 109 */ 0x8aa4,
-  /* 2nd byte: 110 */ 0x8b77,
-  /* 2nd byte: 111 */ 0x9190,
-  /* 2nd byte: 112 */ 0x4e5e,
-  /* 2nd byte: 113 */ 0x9bc9,
-  /* 2nd byte: 114 */ 0x4ea4,
-  /* 2nd byte: 115 */ 0x4f7c,
-  /* 2nd byte: 116 */ 0x4faf,
-  /* 2nd byte: 117 */ 0x5019,
-  /* 2nd byte: 118 */ 0x5016,
-  /* 2nd byte: 119 */ 0x5149,
-  /* 2nd byte: 120 */ 0x516c,
-  /* 2nd byte: 121 */ 0x529f,
-  /* 2nd byte: 122 */ 0x52b9,
-  /* 2nd byte: 123 */ 0x52fe,
-  /* 2nd byte: 124 */ 0x539a,
-  /* 2nd byte: 125 */ 0x53e3,
-  /* 2nd byte: 126 */ 0x5411},
-/* 1st byte: 57 */ { 
-  /* 2nd byte: 33 */ 0x540e,
-  /* 2nd byte: 34 */ 0x5589,
-  /* 2nd byte: 35 */ 0x5751,
-  /* 2nd byte: 36 */ 0x57a2,
-  /* 2nd byte: 37 */ 0x597d,
-  /* 2nd byte: 38 */ 0x5b54,
-  /* 2nd byte: 39 */ 0x5b5d,
-  /* 2nd byte: 40 */ 0x5b8f,
-  /* 2nd byte: 41 */ 0x5de5,
-  /* 2nd byte: 42 */ 0x5de7,
-  /* 2nd byte: 43 */ 0x5df7,
-  /* 2nd byte: 44 */ 0x5e78,
-  /* 2nd byte: 45 */ 0x5e83,
-  /* 2nd byte: 46 */ 0x5e9a,
-  /* 2nd byte: 47 */ 0x5eb7,
-  /* 2nd byte: 48 */ 0x5f18,
-  /* 2nd byte: 49 */ 0x6052,
-  /* 2nd byte: 50 */ 0x614c,
-  /* 2nd byte: 51 */ 0x6297,
-  /* 2nd byte: 52 */ 0x62d8,
-  /* 2nd byte: 53 */ 0x63a7,
-  /* 2nd byte: 54 */ 0x653b,
-  /* 2nd byte: 55 */ 0x6602,
-  /* 2nd byte: 56 */ 0x6643,
-  /* 2nd byte: 57 */ 0x66f4,
-  /* 2nd byte: 58 */ 0x676d,
-  /* 2nd byte: 59 */ 0x6821,
-  /* 2nd byte: 60 */ 0x6897,
-  /* 2nd byte: 61 */ 0x69cb,
-  /* 2nd byte: 62 */ 0x6c5f,
-  /* 2nd byte: 63 */ 0x6d2a,
-  /* 2nd byte: 64 */ 0x6d69,
-  /* 2nd byte: 65 */ 0x6e2f,
-  /* 2nd byte: 66 */ 0x6e9d,
-  /* 2nd byte: 67 */ 0x7532,
-  /* 2nd byte: 68 */ 0x7687,
-  /* 2nd byte: 69 */ 0x786c,
-  /* 2nd byte: 70 */ 0x7a3f,
-  /* 2nd byte: 71 */ 0x7ce0,
-  /* 2nd byte: 72 */ 0x7d05,
-  /* 2nd byte: 73 */ 0x7d18,
-  /* 2nd byte: 74 */ 0x7d5e,
-  /* 2nd byte: 75 */ 0x7db1,
-  /* 2nd byte: 76 */ 0x8015,
-  /* 2nd byte: 77 */ 0x8003,
-  /* 2nd byte: 78 */ 0x80af,
-  /* 2nd byte: 79 */ 0x80b1,
-  /* 2nd byte: 80 */ 0x8154,
-  /* 2nd byte: 81 */ 0x818f,
-  /* 2nd byte: 82 */ 0x822a,
-  /* 2nd byte: 83 */ 0x8352,
-  /* 2nd byte: 84 */ 0x884c,
-  /* 2nd byte: 85 */ 0x8861,
-  /* 2nd byte: 86 */ 0x8b1b,
-  /* 2nd byte: 87 */ 0x8ca2,
-  /* 2nd byte: 88 */ 0x8cfc,
-  /* 2nd byte: 89 */ 0x90ca,
-  /* 2nd byte: 90 */ 0x9175,
-  /* 2nd byte: 91 */ 0x9271,
-  /* 2nd byte: 92 */ 0x783f,
-  /* 2nd byte: 93 */ 0x92fc,
-  /* 2nd byte: 94 */ 0x95a4,
-  /* 2nd byte: 95 */ 0x964d,
-  /* 2nd byte: 96 */ 0x9805,
-  /* 2nd byte: 97 */ 0x9999,
-  /* 2nd byte: 98 */ 0x9ad8,
-  /* 2nd byte: 99 */ 0x9d3b,
-  /* 2nd byte: 100 */ 0x525b,
-  /* 2nd byte: 101 */ 0x52ab,
-  /* 2nd byte: 102 */ 0x53f7,
-  /* 2nd byte: 103 */ 0x5408,
-  /* 2nd byte: 104 */ 0x58d5,
-  /* 2nd byte: 105 */ 0x62f7,
-  /* 2nd byte: 106 */ 0x6fe0,
-  /* 2nd byte: 107 */ 0x8c6a,
-  /* 2nd byte: 108 */ 0x8f5f,
-  /* 2nd byte: 109 */ 0x9eb9,
-  /* 2nd byte: 110 */ 0x514b,
-  /* 2nd byte: 111 */ 0x523b,
-  /* 2nd byte: 112 */ 0x544a,
-  /* 2nd byte: 113 */ 0x56fd,
-  /* 2nd byte: 114 */ 0x7a40,
-  /* 2nd byte: 115 */ 0x9177,
-  /* 2nd byte: 116 */ 0x9d60,
-  /* 2nd byte: 117 */ 0x9ed2,
-  /* 2nd byte: 118 */ 0x7344,
-  /* 2nd byte: 119 */ 0x6f09,
-  /* 2nd byte: 120 */ 0x8170,
-  /* 2nd byte: 121 */ 0x7511,
-  /* 2nd byte: 122 */ 0x5ffd,
-  /* 2nd byte: 123 */ 0x60da,
-  /* 2nd byte: 124 */ 0x9aa8,
-  /* 2nd byte: 125 */ 0x72db,
-  /* 2nd byte: 126 */ 0x8fbc},
-/* 1st byte: 58 */ { 
-  /* 2nd byte: 33 */ 0x6b64,
-  /* 2nd byte: 34 */ 0x9803,
-  /* 2nd byte: 35 */ 0x4eca,
-  /* 2nd byte: 36 */ 0x56f0,
-  /* 2nd byte: 37 */ 0x5764,
-  /* 2nd byte: 38 */ 0x58be,
-  /* 2nd byte: 39 */ 0x5a5a,
-  /* 2nd byte: 40 */ 0x6068,
-  /* 2nd byte: 41 */ 0x61c7,
-  /* 2nd byte: 42 */ 0x660f,
-  /* 2nd byte: 43 */ 0x6606,
-  /* 2nd byte: 44 */ 0x6839,
-  /* 2nd byte: 45 */ 0x68b1,
-  /* 2nd byte: 46 */ 0x6df7,
-  /* 2nd byte: 47 */ 0x75d5,
-  /* 2nd byte: 48 */ 0x7d3a,
-  /* 2nd byte: 49 */ 0x826e,
-  /* 2nd byte: 50 */ 0x9b42,
-  /* 2nd byte: 51 */ 0x4e9b,
-  /* 2nd byte: 52 */ 0x4f50,
-  /* 2nd byte: 53 */ 0x53c9,
-  /* 2nd byte: 54 */ 0x5506,
-  /* 2nd byte: 55 */ 0x5d6f,
-  /* 2nd byte: 56 */ 0x5de6,
-  /* 2nd byte: 57 */ 0x5dee,
-  /* 2nd byte: 58 */ 0x67fb,
-  /* 2nd byte: 59 */ 0x6c99,
-  /* 2nd byte: 60 */ 0x7473,
-  /* 2nd byte: 61 */ 0x7802,
-  /* 2nd byte: 62 */ 0x8a50,
-  /* 2nd byte: 63 */ 0x9396,
-  /* 2nd byte: 64 */ 0x88df,
-  /* 2nd byte: 65 */ 0x5750,
-  /* 2nd byte: 66 */ 0x5ea7,
-  /* 2nd byte: 67 */ 0x632b,
-  /* 2nd byte: 68 */ 0x50b5,
-  /* 2nd byte: 69 */ 0x50ac,
-  /* 2nd byte: 70 */ 0x518d,
-  /* 2nd byte: 71 */ 0x6700,
-  /* 2nd byte: 72 */ 0x54c9,
-  /* 2nd byte: 73 */ 0x585e,
-  /* 2nd byte: 74 */ 0x59bb,
-  /* 2nd byte: 75 */ 0x5bb0,
-  /* 2nd byte: 76 */ 0x5f69,
-  /* 2nd byte: 77 */ 0x624d,
-  /* 2nd byte: 78 */ 0x63a1,
-  /* 2nd byte: 79 */ 0x683d,
-  /* 2nd byte: 80 */ 0x6b73,
-  /* 2nd byte: 81 */ 0x6e08,
-  /* 2nd byte: 82 */ 0x707d,
-  /* 2nd byte: 83 */ 0x91c7,
-  /* 2nd byte: 84 */ 0x7280,
-  /* 2nd byte: 85 */ 0x7815,
-  /* 2nd byte: 86 */ 0x7826,
-  /* 2nd byte: 87 */ 0x796d,
-  /* 2nd byte: 88 */ 0x658e,
-  /* 2nd byte: 89 */ 0x7d30,
-  /* 2nd byte: 90 */ 0x83dc,
-  /* 2nd byte: 91 */ 0x88c1,
-  /* 2nd byte: 92 */ 0x8f09,
-  /* 2nd byte: 93 */ 0x969b,
-  /* 2nd byte: 94 */ 0x5264,
-  /* 2nd byte: 95 */ 0x5728,
-  /* 2nd byte: 96 */ 0x6750,
-  /* 2nd byte: 97 */ 0x7f6a,
-  /* 2nd byte: 98 */ 0x8ca1,
-  /* 2nd byte: 99 */ 0x51b4,
-  /* 2nd byte: 100 */ 0x5742,
-  /* 2nd byte: 101 */ 0x962a,
-  /* 2nd byte: 102 */ 0x583a,
-  /* 2nd byte: 103 */ 0x698a,
-  /* 2nd byte: 104 */ 0x80b4,
-  /* 2nd byte: 105 */ 0x54b2,
-  /* 2nd byte: 106 */ 0x5d0e,
-  /* 2nd byte: 107 */ 0x57fc,
-  /* 2nd byte: 108 */ 0x7895,
-  /* 2nd byte: 109 */ 0x9dfa,
-  /* 2nd byte: 110 */ 0x4f5c,
-  /* 2nd byte: 111 */ 0x524a,
-  /* 2nd byte: 112 */ 0x548b,
-  /* 2nd byte: 113 */ 0x643e,
-  /* 2nd byte: 114 */ 0x6628,
-  /* 2nd byte: 115 */ 0x6714,
-  /* 2nd byte: 116 */ 0x67f5,
-  /* 2nd byte: 117 */ 0x7a84,
-  /* 2nd byte: 118 */ 0x7b56,
-  /* 2nd byte: 119 */ 0x7d22,
-  /* 2nd byte: 120 */ 0x932f,
-  /* 2nd byte: 121 */ 0x685c,
-  /* 2nd byte: 122 */ 0x9bad,
-  /* 2nd byte: 123 */ 0x7b39,
-  /* 2nd byte: 124 */ 0x5319,
-  /* 2nd byte: 125 */ 0x518a,
-  /* 2nd byte: 126 */ 0x5237},
-/* 1st byte: 59 */ { 
-  /* 2nd byte: 33 */ 0x5bdf,
-  /* 2nd byte: 34 */ 0x62f6,
-  /* 2nd byte: 35 */ 0x64ae,
-  /* 2nd byte: 36 */ 0x64e6,
-  /* 2nd byte: 37 */ 0x672d,
-  /* 2nd byte: 38 */ 0x6bba,
-  /* 2nd byte: 39 */ 0x85a9,
-  /* 2nd byte: 40 */ 0x96d1,
-  /* 2nd byte: 41 */ 0x7690,
-  /* 2nd byte: 42 */ 0x9bd6,
-  /* 2nd byte: 43 */ 0x634c,
-  /* 2nd byte: 44 */ 0x9306,
-  /* 2nd byte: 45 */ 0x9bab,
-  /* 2nd byte: 46 */ 0x76bf,
-  /* 2nd byte: 47 */ 0x6652,
-  /* 2nd byte: 48 */ 0x4e09,
-  /* 2nd byte: 49 */ 0x5098,
-  /* 2nd byte: 50 */ 0x53c2,
-  /* 2nd byte: 51 */ 0x5c71,
-  /* 2nd byte: 52 */ 0x60e8,
-  /* 2nd byte: 53 */ 0x6492,
-  /* 2nd byte: 54 */ 0x6563,
-  /* 2nd byte: 55 */ 0x685f,
-  /* 2nd byte: 56 */ 0x71e6,
-  /* 2nd byte: 57 */ 0x73ca,
-  /* 2nd byte: 58 */ 0x7523,
-  /* 2nd byte: 59 */ 0x7b97,
-  /* 2nd byte: 60 */ 0x7e82,
-  /* 2nd byte: 61 */ 0x8695,
-  /* 2nd byte: 62 */ 0x8b83,
-  /* 2nd byte: 63 */ 0x8cdb,
-  /* 2nd byte: 64 */ 0x9178,
-  /* 2nd byte: 65 */ 0x9910,
-  /* 2nd byte: 66 */ 0x65ac,
-  /* 2nd byte: 67 */ 0x66ab,
-  /* 2nd byte: 68 */ 0x6b8b,
-  /* 2nd byte: 69 */ 0x4ed5,
-  /* 2nd byte: 70 */ 0x4ed4,
-  /* 2nd byte: 71 */ 0x4f3a,
-  /* 2nd byte: 72 */ 0x4f7f,
-  /* 2nd byte: 73 */ 0x523a,
-  /* 2nd byte: 74 */ 0x53f8,
-  /* 2nd byte: 75 */ 0x53f2,
-  /* 2nd byte: 76 */ 0x55e3,
-  /* 2nd byte: 77 */ 0x56db,
-  /* 2nd byte: 78 */ 0x58eb,
-  /* 2nd byte: 79 */ 0x59cb,
-  /* 2nd byte: 80 */ 0x59c9,
-  /* 2nd byte: 81 */ 0x59ff,
-  /* 2nd byte: 82 */ 0x5b50,
-  /* 2nd byte: 83 */ 0x5c4d,
-  /* 2nd byte: 84 */ 0x5e02,
-  /* 2nd byte: 85 */ 0x5e2b,
-  /* 2nd byte: 86 */ 0x5fd7,
-  /* 2nd byte: 87 */ 0x601d,
-  /* 2nd byte: 88 */ 0x6307,
-  /* 2nd byte: 89 */ 0x652f,
-  /* 2nd byte: 90 */ 0x5b5c,
-  /* 2nd byte: 91 */ 0x65af,
-  /* 2nd byte: 92 */ 0x65bd,
-  /* 2nd byte: 93 */ 0x65e8,
-  /* 2nd byte: 94 */ 0x679d,
-  /* 2nd byte: 95 */ 0x6b62,
-  /* 2nd byte: 96 */ 0x6b7b,
-  /* 2nd byte: 97 */ 0x6c0f,
-  /* 2nd byte: 98 */ 0x7345,
-  /* 2nd byte: 99 */ 0x7949,
-  /* 2nd byte: 100 */ 0x79c1,
-  /* 2nd byte: 101 */ 0x7cf8,
-  /* 2nd byte: 102 */ 0x7d19,
-  /* 2nd byte: 103 */ 0x7d2b,
-  /* 2nd byte: 104 */ 0x80a2,
-  /* 2nd byte: 105 */ 0x8102,
-  /* 2nd byte: 106 */ 0x81f3,
-  /* 2nd byte: 107 */ 0x8996,
-  /* 2nd byte: 108 */ 0x8a5e,
-  /* 2nd byte: 109 */ 0x8a69,
-  /* 2nd byte: 110 */ 0x8a66,
-  /* 2nd byte: 111 */ 0x8a8c,
-  /* 2nd byte: 112 */ 0x8aee,
-  /* 2nd byte: 113 */ 0x8cc7,
-  /* 2nd byte: 114 */ 0x8cdc,
-  /* 2nd byte: 115 */ 0x96cc,
-  /* 2nd byte: 116 */ 0x98fc,
-  /* 2nd byte: 117 */ 0x6b6f,
-  /* 2nd byte: 118 */ 0x4e8b,
-  /* 2nd byte: 119 */ 0x4f3c,
-  /* 2nd byte: 120 */ 0x4f8d,
-  /* 2nd byte: 121 */ 0x5150,
-  /* 2nd byte: 122 */ 0x5b57,
-  /* 2nd byte: 123 */ 0x5bfa,
-  /* 2nd byte: 124 */ 0x6148,
-  /* 2nd byte: 125 */ 0x6301,
-  /* 2nd byte: 126 */ 0x6642},
-/* 1st byte: 60 */ { 
-  /* 2nd byte: 33 */ 0x6b21,
-  /* 2nd byte: 34 */ 0x6ecb,
-  /* 2nd byte: 35 */ 0x6cbb,
-  /* 2nd byte: 36 */ 0x723e,
-  /* 2nd byte: 37 */ 0x74bd,
-  /* 2nd byte: 38 */ 0x75d4,
-  /* 2nd byte: 39 */ 0x78c1,
-  /* 2nd byte: 40 */ 0x793a,
-  /* 2nd byte: 41 */ 0x800c,
-  /* 2nd byte: 42 */ 0x8033,
-  /* 2nd byte: 43 */ 0x81ea,
-  /* 2nd byte: 44 */ 0x8494,
-  /* 2nd byte: 45 */ 0x8f9e,
-  /* 2nd byte: 46 */ 0x6c50,
-  /* 2nd byte: 47 */ 0x9e7f,
-  /* 2nd byte: 48 */ 0x5f0f,
-  /* 2nd byte: 49 */ 0x8b58,
-  /* 2nd byte: 50 */ 0x9d2b,
-  /* 2nd byte: 51 */ 0x7afa,
-  /* 2nd byte: 52 */ 0x8ef8,
-  /* 2nd byte: 53 */ 0x5b8d,
-  /* 2nd byte: 54 */ 0x96eb,
-  /* 2nd byte: 55 */ 0x4e03,
-  /* 2nd byte: 56 */ 0x53f1,
-  /* 2nd byte: 57 */ 0x57f7,
-  /* 2nd byte: 58 */ 0x5931,
-  /* 2nd byte: 59 */ 0x5ac9,
-  /* 2nd byte: 60 */ 0x5ba4,
-  /* 2nd byte: 61 */ 0x6089,
-  /* 2nd byte: 62 */ 0x6e7f,
-  /* 2nd byte: 63 */ 0x6f06,
-  /* 2nd byte: 64 */ 0x75be,
-  /* 2nd byte: 65 */ 0x8cea,
-  /* 2nd byte: 66 */ 0x5b9f,
-  /* 2nd byte: 67 */ 0x8500,
-  /* 2nd byte: 68 */ 0x7be0,
-  /* 2nd byte: 69 */ 0x5072,
-  /* 2nd byte: 70 */ 0x67f4,
-  /* 2nd byte: 71 */ 0x829d,
-  /* 2nd byte: 72 */ 0x5c61,
-  /* 2nd byte: 73 */ 0x854a,
-  /* 2nd byte: 74 */ 0x7e1e,
-  /* 2nd byte: 75 */ 0x820e,
-  /* 2nd byte: 76 */ 0x5199,
-  /* 2nd byte: 77 */ 0x5c04,
-  /* 2nd byte: 78 */ 0x6368,
-  /* 2nd byte: 79 */ 0x8d66,
-  /* 2nd byte: 80 */ 0x659c,
-  /* 2nd byte: 81 */ 0x716e,
-  /* 2nd byte: 82 */ 0x793e,
-  /* 2nd byte: 83 */ 0x7d17,
-  /* 2nd byte: 84 */ 0x8005,
-  /* 2nd byte: 85 */ 0x8b1d,
-  /* 2nd byte: 86 */ 0x8eca,
-  /* 2nd byte: 87 */ 0x906e,
-  /* 2nd byte: 88 */ 0x86c7,
-  /* 2nd byte: 89 */ 0x90aa,
-  /* 2nd byte: 90 */ 0x501f,
-  /* 2nd byte: 91 */ 0x52fa,
-  /* 2nd byte: 92 */ 0x5c3a,
-  /* 2nd byte: 93 */ 0x6753,
-  /* 2nd byte: 94 */ 0x707c,
-  /* 2nd byte: 95 */ 0x7235,
-  /* 2nd byte: 96 */ 0x914c,
-  /* 2nd byte: 97 */ 0x91c8,
-  /* 2nd byte: 98 */ 0x932b,
-  /* 2nd byte: 99 */ 0x82e5,
-  /* 2nd byte: 100 */ 0x5bc2,
-  /* 2nd byte: 101 */ 0x5f31,
-  /* 2nd byte: 102 */ 0x60f9,
-  /* 2nd byte: 103 */ 0x4e3b,
-  /* 2nd byte: 104 */ 0x53d6,
-  /* 2nd byte: 105 */ 0x5b88,
-  /* 2nd byte: 106 */ 0x624b,
-  /* 2nd byte: 107 */ 0x6731,
-  /* 2nd byte: 108 */ 0x6b8a,
-  /* 2nd byte: 109 */ 0x72e9,
-  /* 2nd byte: 110 */ 0x73e0,
-  /* 2nd byte: 111 */ 0x7a2e,
-  /* 2nd byte: 112 */ 0x816b,
-  /* 2nd byte: 113 */ 0x8da3,
-  /* 2nd byte: 114 */ 0x9152,
-  /* 2nd byte: 115 */ 0x9996,
-  /* 2nd byte: 116 */ 0x5112,
-  /* 2nd byte: 117 */ 0x53d7,
-  /* 2nd byte: 118 */ 0x546a,
-  /* 2nd byte: 119 */ 0x5bff,
-  /* 2nd byte: 120 */ 0x6388,
-  /* 2nd byte: 121 */ 0x6a39,
-  /* 2nd byte: 122 */ 0x7dac,
-  /* 2nd byte: 123 */ 0x9700,
-  /* 2nd byte: 124 */ 0x56da,
-  /* 2nd byte: 125 */ 0x53ce,
-  /* 2nd byte: 126 */ 0x5468},
-/* 1st byte: 61 */ { 
-  /* 2nd byte: 33 */ 0x5b97,
-  /* 2nd byte: 34 */ 0x5c31,
-  /* 2nd byte: 35 */ 0x5dde,
-  /* 2nd byte: 36 */ 0x4fee,
-  /* 2nd byte: 37 */ 0x6101,
-  /* 2nd byte: 38 */ 0x62fe,
-  /* 2nd byte: 39 */ 0x6d32,
-  /* 2nd byte: 40 */ 0x79c0,
-  /* 2nd byte: 41 */ 0x79cb,
-  /* 2nd byte: 42 */ 0x7d42,
-  /* 2nd byte: 43 */ 0x7e4d,
-  /* 2nd byte: 44 */ 0x7fd2,
-  /* 2nd byte: 45 */ 0x81ed,
-  /* 2nd byte: 46 */ 0x821f,
-  /* 2nd byte: 47 */ 0x8490,
-  /* 2nd byte: 48 */ 0x8846,
-  /* 2nd byte: 49 */ 0x8972,
-  /* 2nd byte: 50 */ 0x8b90,
-  /* 2nd byte: 51 */ 0x8e74,
-  /* 2nd byte: 52 */ 0x8f2f,
-  /* 2nd byte: 53 */ 0x9031,
-  /* 2nd byte: 54 */ 0x914b,
-  /* 2nd byte: 55 */ 0x916c,
-  /* 2nd byte: 56 */ 0x96c6,
-  /* 2nd byte: 57 */ 0x919c,
-  /* 2nd byte: 58 */ 0x4ec0,
-  /* 2nd byte: 59 */ 0x4f4f,
-  /* 2nd byte: 60 */ 0x5145,
-  /* 2nd byte: 61 */ 0x5341,
-  /* 2nd byte: 62 */ 0x5f93,
-  /* 2nd byte: 63 */ 0x620e,
-  /* 2nd byte: 64 */ 0x67d4,
-  /* 2nd byte: 65 */ 0x6c41,
-  /* 2nd byte: 66 */ 0x6e0b,
-  /* 2nd byte: 67 */ 0x7363,
-  /* 2nd byte: 68 */ 0x7e26,
-  /* 2nd byte: 69 */ 0x91cd,
-  /* 2nd byte: 70 */ 0x9283,
-  /* 2nd byte: 71 */ 0x53d4,
-  /* 2nd byte: 72 */ 0x5919,
-  /* 2nd byte: 73 */ 0x5bbf,
-  /* 2nd byte: 74 */ 0x6dd1,
-  /* 2nd byte: 75 */ 0x795d,
-  /* 2nd byte: 76 */ 0x7e2e,
-  /* 2nd byte: 77 */ 0x7c9b,
-  /* 2nd byte: 78 */ 0x587e,
-  /* 2nd byte: 79 */ 0x719f,
-  /* 2nd byte: 80 */ 0x51fa,
-  /* 2nd byte: 81 */ 0x8853,
-  /* 2nd byte: 82 */ 0x8ff0,
-  /* 2nd byte: 83 */ 0x4fca,
-  /* 2nd byte: 84 */ 0x5cfb,
-  /* 2nd byte: 85 */ 0x6625,
-  /* 2nd byte: 86 */ 0x77ac,
-  /* 2nd byte: 87 */ 0x7ae3,
-  /* 2nd byte: 88 */ 0x821c,
-  /* 2nd byte: 89 */ 0x99ff,
-  /* 2nd byte: 90 */ 0x51c6,
-  /* 2nd byte: 91 */ 0x5faa,
-  /* 2nd byte: 92 */ 0x65ec,
-  /* 2nd byte: 93 */ 0x696f,
-  /* 2nd byte: 94 */ 0x6b89,
-  /* 2nd byte: 95 */ 0x6df3,
-  /* 2nd byte: 96 */ 0x6e96,
-  /* 2nd byte: 97 */ 0x6f64,
-  /* 2nd byte: 98 */ 0x76fe,
-  /* 2nd byte: 99 */ 0x7d14,
-  /* 2nd byte: 100 */ 0x5de1,
-  /* 2nd byte: 101 */ 0x9075,
-  /* 2nd byte: 102 */ 0x9187,
-  /* 2nd byte: 103 */ 0x9806,
-  /* 2nd byte: 104 */ 0x51e6,
-  /* 2nd byte: 105 */ 0x521d,
-  /* 2nd byte: 106 */ 0x6240,
-  /* 2nd byte: 107 */ 0x6691,
-  /* 2nd byte: 108 */ 0x66d9,
-  /* 2nd byte: 109 */ 0x6e1a,
-  /* 2nd byte: 110 */ 0x5eb6,
-  /* 2nd byte: 111 */ 0x7dd2,
-  /* 2nd byte: 112 */ 0x7f72,
-  /* 2nd byte: 113 */ 0x66f8,
-  /* 2nd byte: 114 */ 0x85af,
-  /* 2nd byte: 115 */ 0x85f7,
-  /* 2nd byte: 116 */ 0x8af8,
-  /* 2nd byte: 117 */ 0x52a9,
-  /* 2nd byte: 118 */ 0x53d9,
-  /* 2nd byte: 119 */ 0x5973,
-  /* 2nd byte: 120 */ 0x5e8f,
-  /* 2nd byte: 121 */ 0x5f90,
-  /* 2nd byte: 122 */ 0x6055,
-  /* 2nd byte: 123 */ 0x92e4,
-  /* 2nd byte: 124 */ 0x9664,
-  /* 2nd byte: 125 */ 0x50b7,
-  /* 2nd byte: 126 */ 0x511f},
-/* 1st byte: 62 */ { 
-  /* 2nd byte: 33 */ 0x52dd,
-  /* 2nd byte: 34 */ 0x5320,
-  /* 2nd byte: 35 */ 0x5347,
-  /* 2nd byte: 36 */ 0x53ec,
-  /* 2nd byte: 37 */ 0x54e8,
-  /* 2nd byte: 38 */ 0x5546,
-  /* 2nd byte: 39 */ 0x5531,
-  /* 2nd byte: 40 */ 0x5617,
-  /* 2nd byte: 41 */ 0x5968,
-  /* 2nd byte: 42 */ 0x59be,
-  /* 2nd byte: 43 */ 0x5a3c,
-  /* 2nd byte: 44 */ 0x5bb5,
-  /* 2nd byte: 45 */ 0x5c06,
-  /* 2nd byte: 46 */ 0x5c0f,
-  /* 2nd byte: 47 */ 0x5c11,
-  /* 2nd byte: 48 */ 0x5c1a,
-  /* 2nd byte: 49 */ 0x5e84,
-  /* 2nd byte: 50 */ 0x5e8a,
-  /* 2nd byte: 51 */ 0x5ee0,
-  /* 2nd byte: 52 */ 0x5f70,
-  /* 2nd byte: 53 */ 0x627f,
-  /* 2nd byte: 54 */ 0x6284,
-  /* 2nd byte: 55 */ 0x62db,
-  /* 2nd byte: 56 */ 0x638c,
-  /* 2nd byte: 57 */ 0x6377,
-  /* 2nd byte: 58 */ 0x6607,
-  /* 2nd byte: 59 */ 0x660c,
-  /* 2nd byte: 60 */ 0x662d,
-  /* 2nd byte: 61 */ 0x6676,
-  /* 2nd byte: 62 */ 0x677e,
-  /* 2nd byte: 63 */ 0x68a2,
-  /* 2nd byte: 64 */ 0x6a1f,
-  /* 2nd byte: 65 */ 0x6a35,
-  /* 2nd byte: 66 */ 0x6cbc,
-  /* 2nd byte: 67 */ 0x6d88,
-  /* 2nd byte: 68 */ 0x6e09,
-  /* 2nd byte: 69 */ 0x6e58,
-  /* 2nd byte: 70 */ 0x713c,
-  /* 2nd byte: 71 */ 0x7126,
-  /* 2nd byte: 72 */ 0x7167,
-  /* 2nd byte: 73 */ 0x75c7,
-  /* 2nd byte: 74 */ 0x7701,
-  /* 2nd byte: 75 */ 0x785d,
-  /* 2nd byte: 76 */ 0x7901,
-  /* 2nd byte: 77 */ 0x7965,
-  /* 2nd byte: 78 */ 0x79f0,
-  /* 2nd byte: 79 */ 0x7ae0,
-  /* 2nd byte: 80 */ 0x7b11,
-  /* 2nd byte: 81 */ 0x7ca7,
-  /* 2nd byte: 82 */ 0x7d39,
-  /* 2nd byte: 83 */ 0x8096,
-  /* 2nd byte: 84 */ 0x83d6,
-  /* 2nd byte: 85 */ 0x848b,
-  /* 2nd byte: 86 */ 0x8549,
-  /* 2nd byte: 87 */ 0x885d,
-  /* 2nd byte: 88 */ 0x88f3,
-  /* 2nd byte: 89 */ 0x8a1f,
-  /* 2nd byte: 90 */ 0x8a3c,
-  /* 2nd byte: 91 */ 0x8a54,
-  /* 2nd byte: 92 */ 0x8a73,
-  /* 2nd byte: 93 */ 0x8c61,
-  /* 2nd byte: 94 */ 0x8cde,
-  /* 2nd byte: 95 */ 0x91a4,
-  /* 2nd byte: 96 */ 0x9266,
-  /* 2nd byte: 97 */ 0x937e,
-  /* 2nd byte: 98 */ 0x9418,
-  /* 2nd byte: 99 */ 0x969c,
-  /* 2nd byte: 100 */ 0x9798,
-  /* 2nd byte: 101 */ 0x4e0a,
-  /* 2nd byte: 102 */ 0x4e08,
-  /* 2nd byte: 103 */ 0x4e1e,
-  /* 2nd byte: 104 */ 0x4e57,
-  /* 2nd byte: 105 */ 0x5197,
-  /* 2nd byte: 106 */ 0x5270,
-  /* 2nd byte: 107 */ 0x57ce,
-  /* 2nd byte: 108 */ 0x5834,
-  /* 2nd byte: 109 */ 0x58cc,
-  /* 2nd byte: 110 */ 0x5b22,
-  /* 2nd byte: 111 */ 0x5e38,
-  /* 2nd byte: 112 */ 0x60c5,
-  /* 2nd byte: 113 */ 0x64fe,
-  /* 2nd byte: 114 */ 0x6761,
-  /* 2nd byte: 115 */ 0x6756,
-  /* 2nd byte: 116 */ 0x6d44,
-  /* 2nd byte: 117 */ 0x72b6,
-  /* 2nd byte: 118 */ 0x7573,
-  /* 2nd byte: 119 */ 0x7a63,
-  /* 2nd byte: 120 */ 0x84b8,
-  /* 2nd byte: 121 */ 0x8b72,
-  /* 2nd byte: 122 */ 0x91b8,
-  /* 2nd byte: 123 */ 0x9320,
-  /* 2nd byte: 124 */ 0x5631,
-  /* 2nd byte: 125 */ 0x57f4,
-  /* 2nd byte: 126 */ 0x98fe},
-/* 1st byte: 63 */ { 
-  /* 2nd byte: 33 */ 0x62ed,
-  /* 2nd byte: 34 */ 0x690d,
-  /* 2nd byte: 35 */ 0x6b96,
-  /* 2nd byte: 36 */ 0x71ed,
-  /* 2nd byte: 37 */ 0x7e54,
-  /* 2nd byte: 38 */ 0x8077,
-  /* 2nd byte: 39 */ 0x8272,
-  /* 2nd byte: 40 */ 0x89e6,
-  /* 2nd byte: 41 */ 0x98df,
-  /* 2nd byte: 42 */ 0x8755,
-  /* 2nd byte: 43 */ 0x8fb1,
-  /* 2nd byte: 44 */ 0x5c3b,
-  /* 2nd byte: 45 */ 0x4f38,
-  /* 2nd byte: 46 */ 0x4fe1,
-  /* 2nd byte: 47 */ 0x4fb5,
-  /* 2nd byte: 48 */ 0x5507,
-  /* 2nd byte: 49 */ 0x5a20,
-  /* 2nd byte: 50 */ 0x5bdd,
-  /* 2nd byte: 51 */ 0x5be9,
-  /* 2nd byte: 52 */ 0x5fc3,
-  /* 2nd byte: 53 */ 0x614e,
-  /* 2nd byte: 54 */ 0x632f,
-  /* 2nd byte: 55 */ 0x65b0,
-  /* 2nd byte: 56 */ 0x664b,
-  /* 2nd byte: 57 */ 0x68ee,
-  /* 2nd byte: 58 */ 0x699b,
-  /* 2nd byte: 59 */ 0x6d78,
-  /* 2nd byte: 60 */ 0x6df1,
-  /* 2nd byte: 61 */ 0x7533,
-  /* 2nd byte: 62 */ 0x75b9,
-  /* 2nd byte: 63 */ 0x771f,
-  /* 2nd byte: 64 */ 0x795e,
-  /* 2nd byte: 65 */ 0x79e6,
-  /* 2nd byte: 66 */ 0x7d33,
-  /* 2nd byte: 67 */ 0x81e3,
-  /* 2nd byte: 68 */ 0x82af,
-  /* 2nd byte: 69 */ 0x85aa,
-  /* 2nd byte: 70 */ 0x89aa,
-  /* 2nd byte: 71 */ 0x8a3a,
-  /* 2nd byte: 72 */ 0x8eab,
-  /* 2nd byte: 73 */ 0x8f9b,
-  /* 2nd byte: 74 */ 0x9032,
-  /* 2nd byte: 75 */ 0x91dd,
-  /* 2nd byte: 76 */ 0x9707,
-  /* 2nd byte: 77 */ 0x4eba,
-  /* 2nd byte: 78 */ 0x4ec1,
-  /* 2nd byte: 79 */ 0x5203,
-  /* 2nd byte: 80 */ 0x5875,
-  /* 2nd byte: 81 */ 0x58ec,
-  /* 2nd byte: 82 */ 0x5c0b,
-  /* 2nd byte: 83 */ 0x751a,
-  /* 2nd byte: 84 */ 0x5c3d,
-  /* 2nd byte: 85 */ 0x814e,
-  /* 2nd byte: 86 */ 0x8a0a,
-  /* 2nd byte: 87 */ 0x8fc5,
-  /* 2nd byte: 88 */ 0x9663,
-  /* 2nd byte: 89 */ 0x976d,
-  /* 2nd byte: 90 */ 0x7b25,
-  /* 2nd byte: 91 */ 0x8acf,
-  /* 2nd byte: 92 */ 0x9808,
-  /* 2nd byte: 93 */ 0x9162,
-  /* 2nd byte: 94 */ 0x56f3,
-  /* 2nd byte: 95 */ 0x53a8,
-  /* 2nd byte: 96 */ 0x9017,
-  /* 2nd byte: 97 */ 0x5439,
-  /* 2nd byte: 98 */ 0x5782,
-  /* 2nd byte: 99 */ 0x5e25,
-  /* 2nd byte: 100 */ 0x63a8,
-  /* 2nd byte: 101 */ 0x6c34,
-  /* 2nd byte: 102 */ 0x708a,
-  /* 2nd byte: 103 */ 0x7761,
-  /* 2nd byte: 104 */ 0x7c8b,
-  /* 2nd byte: 105 */ 0x7fe0,
-  /* 2nd byte: 106 */ 0x8870,
-  /* 2nd byte: 107 */ 0x9042,
-  /* 2nd byte: 108 */ 0x9154,
-  /* 2nd byte: 109 */ 0x9310,
-  /* 2nd byte: 110 */ 0x9318,
-  /* 2nd byte: 111 */ 0x968f,
-  /* 2nd byte: 112 */ 0x745e,
-  /* 2nd byte: 113 */ 0x9ac4,
-  /* 2nd byte: 114 */ 0x5d07,
-  /* 2nd byte: 115 */ 0x5d69,
-  /* 2nd byte: 116 */ 0x6570,
-  /* 2nd byte: 117 */ 0x67a2,
-  /* 2nd byte: 118 */ 0x8da8,
-  /* 2nd byte: 119 */ 0x96db,
-  /* 2nd byte: 120 */ 0x636e,
-  /* 2nd byte: 121 */ 0x6749,
-  /* 2nd byte: 122 */ 0x6919,
-  /* 2nd byte: 123 */ 0x83c5,
-  /* 2nd byte: 124 */ 0x9817,
-  /* 2nd byte: 125 */ 0x96c0,
-  /* 2nd byte: 126 */ 0x88fe},
-/* 1st byte: 64 */ { 
-  /* 2nd byte: 33 */ 0x6f84,
-  /* 2nd byte: 34 */ 0x647a,
-  /* 2nd byte: 35 */ 0x5bf8,
-  /* 2nd byte: 36 */ 0x4e16,
-  /* 2nd byte: 37 */ 0x702c,
-  /* 2nd byte: 38 */ 0x755d,
-  /* 2nd byte: 39 */ 0x662f,
-  /* 2nd byte: 40 */ 0x51c4,
-  /* 2nd byte: 41 */ 0x5236,
-  /* 2nd byte: 42 */ 0x52e2,
-  /* 2nd byte: 43 */ 0x59d3,
-  /* 2nd byte: 44 */ 0x5f81,
-  /* 2nd byte: 45 */ 0x6027,
-  /* 2nd byte: 46 */ 0x6210,
-  /* 2nd byte: 47 */ 0x653f,
-  /* 2nd byte: 48 */ 0x6574,
-  /* 2nd byte: 49 */ 0x661f,
-  /* 2nd byte: 50 */ 0x6674,
-  /* 2nd byte: 51 */ 0x68f2,
-  /* 2nd byte: 52 */ 0x6816,
-  /* 2nd byte: 53 */ 0x6b63,
-  /* 2nd byte: 54 */ 0x6e05,
-  /* 2nd byte: 55 */ 0x7272,
-  /* 2nd byte: 56 */ 0x751f,
-  /* 2nd byte: 57 */ 0x76db,
-  /* 2nd byte: 58 */ 0x7cbe,
-  /* 2nd byte: 59 */ 0x8056,
-  /* 2nd byte: 60 */ 0x58f0,
-  /* 2nd byte: 61 */ 0x88fd,
-  /* 2nd byte: 62 */ 0x897f,
-  /* 2nd byte: 63 */ 0x8aa0,
-  /* 2nd byte: 64 */ 0x8a93,
-  /* 2nd byte: 65 */ 0x8acb,
-  /* 2nd byte: 66 */ 0x901d,
-  /* 2nd byte: 67 */ 0x9192,
-  /* 2nd byte: 68 */ 0x9752,
-  /* 2nd byte: 69 */ 0x9759,
-  /* 2nd byte: 70 */ 0x6589,
-  /* 2nd byte: 71 */ 0x7a0e,
-  /* 2nd byte: 72 */ 0x8106,
-  /* 2nd byte: 73 */ 0x96bb,
-  /* 2nd byte: 74 */ 0x5e2d,
-  /* 2nd byte: 75 */ 0x60dc,
-  /* 2nd byte: 76 */ 0x621a,
-  /* 2nd byte: 77 */ 0x65a5,
-  /* 2nd byte: 78 */ 0x6614,
-  /* 2nd byte: 79 */ 0x6790,
-  /* 2nd byte: 80 */ 0x77f3,
-  /* 2nd byte: 81 */ 0x7a4d,
-  /* 2nd byte: 82 */ 0x7c4d,
-  /* 2nd byte: 83 */ 0x7e3e,
-  /* 2nd byte: 84 */ 0x810a,
-  /* 2nd byte: 85 */ 0x8cac,
-  /* 2nd byte: 86 */ 0x8d64,
-  /* 2nd byte: 87 */ 0x8de1,
-  /* 2nd byte: 88 */ 0x8e5f,
-  /* 2nd byte: 89 */ 0x78a9,
-  /* 2nd byte: 90 */ 0x5207,
-  /* 2nd byte: 91 */ 0x62d9,
-  /* 2nd byte: 92 */ 0x63a5,
-  /* 2nd byte: 93 */ 0x6442,
-  /* 2nd byte: 94 */ 0x6298,
-  /* 2nd byte: 95 */ 0x8a2d,
-  /* 2nd byte: 96 */ 0x7a83,
-  /* 2nd byte: 97 */ 0x7bc0,
-  /* 2nd byte: 98 */ 0x8aac,
-  /* 2nd byte: 99 */ 0x96ea,
-  /* 2nd byte: 100 */ 0x7d76,
-  /* 2nd byte: 101 */ 0x820c,
-  /* 2nd byte: 102 */ 0x8749,
-  /* 2nd byte: 103 */ 0x4ed9,
-  /* 2nd byte: 104 */ 0x5148,
-  /* 2nd byte: 105 */ 0x5343,
-  /* 2nd byte: 106 */ 0x5360,
-  /* 2nd byte: 107 */ 0x5ba3,
-  /* 2nd byte: 108 */ 0x5c02,
-  /* 2nd byte: 109 */ 0x5c16,
-  /* 2nd byte: 110 */ 0x5ddd,
-  /* 2nd byte: 111 */ 0x6226,
-  /* 2nd byte: 112 */ 0x6247,
-  /* 2nd byte: 113 */ 0x64b0,
-  /* 2nd byte: 114 */ 0x6813,
-  /* 2nd byte: 115 */ 0x6834,
-  /* 2nd byte: 116 */ 0x6cc9,
-  /* 2nd byte: 117 */ 0x6d45,
-  /* 2nd byte: 118 */ 0x6d17,
-  /* 2nd byte: 119 */ 0x67d3,
-  /* 2nd byte: 120 */ 0x6f5c,
-  /* 2nd byte: 121 */ 0x714e,
-  /* 2nd byte: 122 */ 0x717d,
-  /* 2nd byte: 123 */ 0x65cb,
-  /* 2nd byte: 124 */ 0x7a7f,
-  /* 2nd byte: 125 */ 0x7bad,
-  /* 2nd byte: 126 */ 0x7dda},
-/* 1st byte: 65 */ { 
-  /* 2nd byte: 33 */ 0x7e4a,
-  /* 2nd byte: 34 */ 0x7fa8,
-  /* 2nd byte: 35 */ 0x817a,
-  /* 2nd byte: 36 */ 0x821b,
-  /* 2nd byte: 37 */ 0x8239,
-  /* 2nd byte: 38 */ 0x85a6,
-  /* 2nd byte: 39 */ 0x8a6e,
-  /* 2nd byte: 40 */ 0x8cce,
-  /* 2nd byte: 41 */ 0x8df5,
-  /* 2nd byte: 42 */ 0x9078,
-  /* 2nd byte: 43 */ 0x9077,
-  /* 2nd byte: 44 */ 0x92ad,
-  /* 2nd byte: 45 */ 0x9291,
-  /* 2nd byte: 46 */ 0x9583,
-  /* 2nd byte: 47 */ 0x9bae,
-  /* 2nd byte: 48 */ 0x524d,
-  /* 2nd byte: 49 */ 0x5584,
-  /* 2nd byte: 50 */ 0x6f38,
-  /* 2nd byte: 51 */ 0x7136,
-  /* 2nd byte: 52 */ 0x5168,
-  /* 2nd byte: 53 */ 0x7985,
-  /* 2nd byte: 54 */ 0x7e55,
-  /* 2nd byte: 55 */ 0x81b3,
-  /* 2nd byte: 56 */ 0x7cce,
-  /* 2nd byte: 57 */ 0x564c,
-  /* 2nd byte: 58 */ 0x5851,
-  /* 2nd byte: 59 */ 0x5ca8,
-  /* 2nd byte: 60 */ 0x63aa,
-  /* 2nd byte: 61 */ 0x66fe,
-  /* 2nd byte: 62 */ 0x66fd,
-  /* 2nd byte: 63 */ 0x695a,
-  /* 2nd byte: 64 */ 0x72d9,
-  /* 2nd byte: 65 */ 0x758f,
-  /* 2nd byte: 66 */ 0x758e,
-  /* 2nd byte: 67 */ 0x790e,
-  /* 2nd byte: 68 */ 0x7956,
-  /* 2nd byte: 69 */ 0x79df,
-  /* 2nd byte: 70 */ 0x7c97,
-  /* 2nd byte: 71 */ 0x7d20,
-  /* 2nd byte: 72 */ 0x7d44,
-  /* 2nd byte: 73 */ 0x8607,
-  /* 2nd byte: 74 */ 0x8a34,
-  /* 2nd byte: 75 */ 0x963b,
-  /* 2nd byte: 76 */ 0x9061,
-  /* 2nd byte: 77 */ 0x9f20,
-  /* 2nd byte: 78 */ 0x50e7,
-  /* 2nd byte: 79 */ 0x5275,
-  /* 2nd byte: 80 */ 0x53cc,
-  /* 2nd byte: 81 */ 0x53e2,
-  /* 2nd byte: 82 */ 0x5009,
-  /* 2nd byte: 83 */ 0x55aa,
-  /* 2nd byte: 84 */ 0x58ee,
-  /* 2nd byte: 85 */ 0x594f,
-  /* 2nd byte: 86 */ 0x723d,
-  /* 2nd byte: 87 */ 0x5b8b,
-  /* 2nd byte: 88 */ 0x5c64,
-  /* 2nd byte: 89 */ 0x531d,
-  /* 2nd byte: 90 */ 0x60e3,
-  /* 2nd byte: 91 */ 0x60f3,
-  /* 2nd byte: 92 */ 0x635c,
-  /* 2nd byte: 93 */ 0x6383,
-  /* 2nd byte: 94 */ 0x633f,
-  /* 2nd byte: 95 */ 0x63bb,
-  /* 2nd byte: 96 */ 0x64cd,
-  /* 2nd byte: 97 */ 0x65e9,
-  /* 2nd byte: 98 */ 0x66f9,
-  /* 2nd byte: 99 */ 0x5de3,
-  /* 2nd byte: 100 */ 0x69cd,
-  /* 2nd byte: 101 */ 0x69fd,
-  /* 2nd byte: 102 */ 0x6f15,
-  /* 2nd byte: 103 */ 0x71e5,
-  /* 2nd byte: 104 */ 0x4e89,
-  /* 2nd byte: 105 */ 0x75e9,
-  /* 2nd byte: 106 */ 0x76f8,
-  /* 2nd byte: 107 */ 0x7a93,
-  /* 2nd byte: 108 */ 0x7cdf,
-  /* 2nd byte: 109 */ 0x7dcf,
-  /* 2nd byte: 110 */ 0x7d9c,
-  /* 2nd byte: 111 */ 0x8061,
-  /* 2nd byte: 112 */ 0x8349,
-  /* 2nd byte: 113 */ 0x8358,
-  /* 2nd byte: 114 */ 0x846c,
-  /* 2nd byte: 115 */ 0x84bc,
-  /* 2nd byte: 116 */ 0x85fb,
-  /* 2nd byte: 117 */ 0x88c5,
-  /* 2nd byte: 118 */ 0x8d70,
-  /* 2nd byte: 119 */ 0x9001,
-  /* 2nd byte: 120 */ 0x906d,
-  /* 2nd byte: 121 */ 0x9397,
-  /* 2nd byte: 122 */ 0x971c,
-  /* 2nd byte: 123 */ 0x9a12,
-  /* 2nd byte: 124 */ 0x50cf,
-  /* 2nd byte: 125 */ 0x5897,
-  /* 2nd byte: 126 */ 0x618e},
-/* 1st byte: 66 */ { 
-  /* 2nd byte: 33 */ 0x81d3,
-  /* 2nd byte: 34 */ 0x8535,
-  /* 2nd byte: 35 */ 0x8d08,
-  /* 2nd byte: 36 */ 0x9020,
-  /* 2nd byte: 37 */ 0x4fc3,
-  /* 2nd byte: 38 */ 0x5074,
-  /* 2nd byte: 39 */ 0x5247,
-  /* 2nd byte: 40 */ 0x5373,
-  /* 2nd byte: 41 */ 0x606f,
-  /* 2nd byte: 42 */ 0x6349,
-  /* 2nd byte: 43 */ 0x675f,
-  /* 2nd byte: 44 */ 0x6e2c,
-  /* 2nd byte: 45 */ 0x8db3,
-  /* 2nd byte: 46 */ 0x901f,
-  /* 2nd byte: 47 */ 0x4fd7,
-  /* 2nd byte: 48 */ 0x5c5e,
-  /* 2nd byte: 49 */ 0x8cca,
-  /* 2nd byte: 50 */ 0x65cf,
-  /* 2nd byte: 51 */ 0x7d9a,
-  /* 2nd byte: 52 */ 0x5352,
-  /* 2nd byte: 53 */ 0x8896,
-  /* 2nd byte: 54 */ 0x5176,
-  /* 2nd byte: 55 */ 0x63c3,
-  /* 2nd byte: 56 */ 0x5b58,
-  /* 2nd byte: 57 */ 0x5b6b,
-  /* 2nd byte: 58 */ 0x5c0a,
-  /* 2nd byte: 59 */ 0x640d,
-  /* 2nd byte: 60 */ 0x6751,
-  /* 2nd byte: 61 */ 0x905c,
-  /* 2nd byte: 62 */ 0x4ed6,
-  /* 2nd byte: 63 */ 0x591a,
-  /* 2nd byte: 64 */ 0x592a,
-  /* 2nd byte: 65 */ 0x6c70,
-  /* 2nd byte: 66 */ 0x8a51,
-  /* 2nd byte: 67 */ 0x553e,
-  /* 2nd byte: 68 */ 0x5815,
-  /* 2nd byte: 69 */ 0x59a5,
-  /* 2nd byte: 70 */ 0x60f0,
-  /* 2nd byte: 71 */ 0x6253,
-  /* 2nd byte: 72 */ 0x67c1,
-  /* 2nd byte: 73 */ 0x8235,
-  /* 2nd byte: 74 */ 0x6955,
-  /* 2nd byte: 75 */ 0x9640,
-  /* 2nd byte: 76 */ 0x99c4,
-  /* 2nd byte: 77 */ 0x9a28,
-  /* 2nd byte: 78 */ 0x4f53,
-  /* 2nd byte: 79 */ 0x5806,
-  /* 2nd byte: 80 */ 0x5bfe,
-  /* 2nd byte: 81 */ 0x8010,
-  /* 2nd byte: 82 */ 0x5cb1,
-  /* 2nd byte: 83 */ 0x5e2f,
-  /* 2nd byte: 84 */ 0x5f85,
-  /* 2nd byte: 85 */ 0x6020,
-  /* 2nd byte: 86 */ 0x614b,
-  /* 2nd byte: 87 */ 0x6234,
-  /* 2nd byte: 88 */ 0x66ff,
-  /* 2nd byte: 89 */ 0x6cf0,
-  /* 2nd byte: 90 */ 0x6ede,
-  /* 2nd byte: 91 */ 0x80ce,
-  /* 2nd byte: 92 */ 0x817f,
-  /* 2nd byte: 93 */ 0x82d4,
-  /* 2nd byte: 94 */ 0x888b,
-  /* 2nd byte: 95 */ 0x8cb8,
-  /* 2nd byte: 96 */ 0x9000,
-  /* 2nd byte: 97 */ 0x902e,
-  /* 2nd byte: 98 */ 0x968a,
-  /* 2nd byte: 99 */ 0x9edb,
-  /* 2nd byte: 100 */ 0x9bdb,
-  /* 2nd byte: 101 */ 0x4ee3,
-  /* 2nd byte: 102 */ 0x53f0,
-  /* 2nd byte: 103 */ 0x5927,
-  /* 2nd byte: 104 */ 0x7b2c,
-  /* 2nd byte: 105 */ 0x918d,
-  /* 2nd byte: 106 */ 0x984c,
-  /* 2nd byte: 107 */ 0x9df9,
-  /* 2nd byte: 108 */ 0x6edd,
-  /* 2nd byte: 109 */ 0x7027,
-  /* 2nd byte: 110 */ 0x5353,
-  /* 2nd byte: 111 */ 0x5544,
-  /* 2nd byte: 112 */ 0x5b85,
-  /* 2nd byte: 113 */ 0x6258,
-  /* 2nd byte: 114 */ 0x629e,
-  /* 2nd byte: 115 */ 0x62d3,
-  /* 2nd byte: 116 */ 0x6ca2,
-  /* 2nd byte: 117 */ 0x6fef,
-  /* 2nd byte: 118 */ 0x7422,
-  /* 2nd byte: 119 */ 0x8a17,
-  /* 2nd byte: 120 */ 0x9438,
-  /* 2nd byte: 121 */ 0x6fc1,
-  /* 2nd byte: 122 */ 0x8afe,
-  /* 2nd byte: 123 */ 0x8338,
-  /* 2nd byte: 124 */ 0x51e7,
-  /* 2nd byte: 125 */ 0x86f8,
-  /* 2nd byte: 126 */ 0x53ea},
-/* 1st byte: 67 */ { 
-  /* 2nd byte: 33 */ 0x53e9,
-  /* 2nd byte: 34 */ 0x4f46,
-  /* 2nd byte: 35 */ 0x9054,
-  /* 2nd byte: 36 */ 0x8fb0,
-  /* 2nd byte: 37 */ 0x596a,
-  /* 2nd byte: 38 */ 0x8131,
-  /* 2nd byte: 39 */ 0x5dfd,
-  /* 2nd byte: 40 */ 0x7aea,
-  /* 2nd byte: 41 */ 0x8fbf,
-  /* 2nd byte: 42 */ 0x68da,
-  /* 2nd byte: 43 */ 0x8c37,
-  /* 2nd byte: 44 */ 0x72f8,
-  /* 2nd byte: 45 */ 0x9c48,
-  /* 2nd byte: 46 */ 0x6a3d,
-  /* 2nd byte: 47 */ 0x8ab0,
-  /* 2nd byte: 48 */ 0x4e39,
-  /* 2nd byte: 49 */ 0x5358,
-  /* 2nd byte: 50 */ 0x5606,
-  /* 2nd byte: 51 */ 0x5766,
-  /* 2nd byte: 52 */ 0x62c5,
-  /* 2nd byte: 53 */ 0x63a2,
-  /* 2nd byte: 54 */ 0x65e6,
-  /* 2nd byte: 55 */ 0x6b4e,
-  /* 2nd byte: 56 */ 0x6de1,
-  /* 2nd byte: 57 */ 0x6e5b,
-  /* 2nd byte: 58 */ 0x70ad,
-  /* 2nd byte: 59 */ 0x77ed,
-  /* 2nd byte: 60 */ 0x7aef,
-  /* 2nd byte: 61 */ 0x7baa,
-  /* 2nd byte: 62 */ 0x7dbb,
-  /* 2nd byte: 63 */ 0x803d,
-  /* 2nd byte: 64 */ 0x80c6,
-  /* 2nd byte: 65 */ 0x86cb,
-  /* 2nd byte: 66 */ 0x8a95,
-  /* 2nd byte: 67 */ 0x935b,
-  /* 2nd byte: 68 */ 0x56e3,
-  /* 2nd byte: 69 */ 0x58c7,
-  /* 2nd byte: 70 */ 0x5f3e,
-  /* 2nd byte: 71 */ 0x65ad,
-  /* 2nd byte: 72 */ 0x6696,
-  /* 2nd byte: 73 */ 0x6a80,
-  /* 2nd byte: 74 */ 0x6bb5,
-  /* 2nd byte: 75 */ 0x7537,
-  /* 2nd byte: 76 */ 0x8ac7,
-  /* 2nd byte: 77 */ 0x5024,
-  /* 2nd byte: 78 */ 0x77e5,
-  /* 2nd byte: 79 */ 0x5730,
-  /* 2nd byte: 80 */ 0x5f1b,
-  /* 2nd byte: 81 */ 0x6065,
-  /* 2nd byte: 82 */ 0x667a,
-  /* 2nd byte: 83 */ 0x6c60,
-  /* 2nd byte: 84 */ 0x75f4,
-  /* 2nd byte: 85 */ 0x7a1a,
-  /* 2nd byte: 86 */ 0x7f6e,
-  /* 2nd byte: 87 */ 0x81f4,
-  /* 2nd byte: 88 */ 0x8718,
-  /* 2nd byte: 89 */ 0x9045,
-  /* 2nd byte: 90 */ 0x99b3,
-  /* 2nd byte: 91 */ 0x7bc9,
-  /* 2nd byte: 92 */ 0x755c,
-  /* 2nd byte: 93 */ 0x7af9,
-  /* 2nd byte: 94 */ 0x7b51,
-  /* 2nd byte: 95 */ 0x84c4,
-  /* 2nd byte: 96 */ 0x9010,
-  /* 2nd byte: 97 */ 0x79e9,
-  /* 2nd byte: 98 */ 0x7a92,
-  /* 2nd byte: 99 */ 0x8336,
-  /* 2nd byte: 100 */ 0x5ae1,
-  /* 2nd byte: 101 */ 0x7740,
-  /* 2nd byte: 102 */ 0x4e2d,
-  /* 2nd byte: 103 */ 0x4ef2,
-  /* 2nd byte: 104 */ 0x5b99,
-  /* 2nd byte: 105 */ 0x5fe0,
-  /* 2nd byte: 106 */ 0x62bd,
-  /* 2nd byte: 107 */ 0x663c,
-  /* 2nd byte: 108 */ 0x67f1,
-  /* 2nd byte: 109 */ 0x6ce8,
-  /* 2nd byte: 110 */ 0x866b,
-  /* 2nd byte: 111 */ 0x8877,
-  /* 2nd byte: 112 */ 0x8a3b,
-  /* 2nd byte: 113 */ 0x914e,
-  /* 2nd byte: 114 */ 0x92f3,
-  /* 2nd byte: 115 */ 0x99d0,
-  /* 2nd byte: 116 */ 0x6a17,
-  /* 2nd byte: 117 */ 0x7026,
-  /* 2nd byte: 118 */ 0x732a,
-  /* 2nd byte: 119 */ 0x82e7,
-  /* 2nd byte: 120 */ 0x8457,
-  /* 2nd byte: 121 */ 0x8caf,
-  /* 2nd byte: 122 */ 0x4e01,
-  /* 2nd byte: 123 */ 0x5146,
-  /* 2nd byte: 124 */ 0x51cb,
-  /* 2nd byte: 125 */ 0x558b,
-  /* 2nd byte: 126 */ 0x5bf5},
-/* 1st byte: 68 */ { 
-  /* 2nd byte: 33 */ 0x5e16,
-  /* 2nd byte: 34 */ 0x5e33,
-  /* 2nd byte: 35 */ 0x5e81,
-  /* 2nd byte: 36 */ 0x5f14,
-  /* 2nd byte: 37 */ 0x5f35,
-  /* 2nd byte: 38 */ 0x5f6b,
-  /* 2nd byte: 39 */ 0x5fb4,
-  /* 2nd byte: 40 */ 0x61f2,
-  /* 2nd byte: 41 */ 0x6311,
-  /* 2nd byte: 42 */ 0x66a2,
-  /* 2nd byte: 43 */ 0x671d,
-  /* 2nd byte: 44 */ 0x6f6e,
-  /* 2nd byte: 45 */ 0x7252,
-  /* 2nd byte: 46 */ 0x753a,
-  /* 2nd byte: 47 */ 0x773a,
-  /* 2nd byte: 48 */ 0x8074,
-  /* 2nd byte: 49 */ 0x8139,
-  /* 2nd byte: 50 */ 0x8178,
-  /* 2nd byte: 51 */ 0x8776,
-  /* 2nd byte: 52 */ 0x8abf,
-  /* 2nd byte: 53 */ 0x8adc,
-  /* 2nd byte: 54 */ 0x8d85,
-  /* 2nd byte: 55 */ 0x8df3,
-  /* 2nd byte: 56 */ 0x929a,
-  /* 2nd byte: 57 */ 0x9577,
-  /* 2nd byte: 58 */ 0x9802,
-  /* 2nd byte: 59 */ 0x9ce5,
-  /* 2nd byte: 60 */ 0x52c5,
-  /* 2nd byte: 61 */ 0x6357,
-  /* 2nd byte: 62 */ 0x76f4,
-  /* 2nd byte: 63 */ 0x6715,
-  /* 2nd byte: 64 */ 0x6c88,
-  /* 2nd byte: 65 */ 0x73cd,
-  /* 2nd byte: 66 */ 0x8cc3,
-  /* 2nd byte: 67 */ 0x93ae,
-  /* 2nd byte: 68 */ 0x9673,
-  /* 2nd byte: 69 */ 0x6d25,
-  /* 2nd byte: 70 */ 0x589c,
-  /* 2nd byte: 71 */ 0x690e,
-  /* 2nd byte: 72 */ 0x69cc,
-  /* 2nd byte: 73 */ 0x8ffd,
-  /* 2nd byte: 74 */ 0x939a,
-  /* 2nd byte: 75 */ 0x75db,
-  /* 2nd byte: 76 */ 0x901a,
-  /* 2nd byte: 77 */ 0x585a,
-  /* 2nd byte: 78 */ 0x6802,
-  /* 2nd byte: 79 */ 0x63b4,
-  /* 2nd byte: 80 */ 0x69fb,
-  /* 2nd byte: 81 */ 0x4f43,
-  /* 2nd byte: 82 */ 0x6f2c,
-  /* 2nd byte: 83 */ 0x67d8,
-  /* 2nd byte: 84 */ 0x8fbb,
-  /* 2nd byte: 85 */ 0x8526,
-  /* 2nd byte: 86 */ 0x7db4,
-  /* 2nd byte: 87 */ 0x9354,
-  /* 2nd byte: 88 */ 0x693f,
-  /* 2nd byte: 89 */ 0x6f70,
-  /* 2nd byte: 90 */ 0x576a,
-  /* 2nd byte: 91 */ 0x58f7,
-  /* 2nd byte: 92 */ 0x5b2c,
-  /* 2nd byte: 93 */ 0x7d2c,
-  /* 2nd byte: 94 */ 0x722a,
-  /* 2nd byte: 95 */ 0x540a,
-  /* 2nd byte: 96 */ 0x91e3,
-  /* 2nd byte: 97 */ 0x9db4,
-  /* 2nd byte: 98 */ 0x4ead,
-  /* 2nd byte: 99 */ 0x4f4e,
-  /* 2nd byte: 100 */ 0x505c,
-  /* 2nd byte: 101 */ 0x5075,
-  /* 2nd byte: 102 */ 0x5243,
-  /* 2nd byte: 103 */ 0x8c9e,
-  /* 2nd byte: 104 */ 0x5448,
-  /* 2nd byte: 105 */ 0x5824,
-  /* 2nd byte: 106 */ 0x5b9a,
-  /* 2nd byte: 107 */ 0x5e1d,
-  /* 2nd byte: 108 */ 0x5e95,
-  /* 2nd byte: 109 */ 0x5ead,
-  /* 2nd byte: 110 */ 0x5ef7,
-  /* 2nd byte: 111 */ 0x5f1f,
-  /* 2nd byte: 112 */ 0x608c,
-  /* 2nd byte: 113 */ 0x62b5,
-  /* 2nd byte: 114 */ 0x633a,
-  /* 2nd byte: 115 */ 0x63d0,
-  /* 2nd byte: 116 */ 0x68af,
-  /* 2nd byte: 117 */ 0x6c40,
-  /* 2nd byte: 118 */ 0x7887,
-  /* 2nd byte: 119 */ 0x798e,
-  /* 2nd byte: 120 */ 0x7a0b,
-  /* 2nd byte: 121 */ 0x7de0,
-  /* 2nd byte: 122 */ 0x8247,
-  /* 2nd byte: 123 */ 0x8a02,
-  /* 2nd byte: 124 */ 0x8ae6,
-  /* 2nd byte: 125 */ 0x8e44,
-  /* 2nd byte: 126 */ 0x9013},
-/* 1st byte: 69 */ { 
-  /* 2nd byte: 33 */ 0x90b8,
-  /* 2nd byte: 34 */ 0x912d,
-  /* 2nd byte: 35 */ 0x91d8,
-  /* 2nd byte: 36 */ 0x9f0e,
-  /* 2nd byte: 37 */ 0x6ce5,
-  /* 2nd byte: 38 */ 0x6458,
-  /* 2nd byte: 39 */ 0x64e2,
-  /* 2nd byte: 40 */ 0x6575,
-  /* 2nd byte: 41 */ 0x6ef4,
-  /* 2nd byte: 42 */ 0x7684,
-  /* 2nd byte: 43 */ 0x7b1b,
-  /* 2nd byte: 44 */ 0x9069,
-  /* 2nd byte: 45 */ 0x93d1,
-  /* 2nd byte: 46 */ 0x6eba,
-  /* 2nd byte: 47 */ 0x54f2,
-  /* 2nd byte: 48 */ 0x5fb9,
-  /* 2nd byte: 49 */ 0x64a4,
-  /* 2nd byte: 50 */ 0x8f4d,
-  /* 2nd byte: 51 */ 0x8fed,
-  /* 2nd byte: 52 */ 0x9244,
-  /* 2nd byte: 53 */ 0x5178,
-  /* 2nd byte: 54 */ 0x586b,
-  /* 2nd byte: 55 */ 0x5929,
-  /* 2nd byte: 56 */ 0x5c55,
-  /* 2nd byte: 57 */ 0x5e97,
-  /* 2nd byte: 58 */ 0x6dfb,
-  /* 2nd byte: 59 */ 0x7e8f,
-  /* 2nd byte: 60 */ 0x751c,
-  /* 2nd byte: 61 */ 0x8cbc,
-  /* 2nd byte: 62 */ 0x8ee2,
-  /* 2nd byte: 63 */ 0x985b,
-  /* 2nd byte: 64 */ 0x70b9,
-  /* 2nd byte: 65 */ 0x4f1d,
-  /* 2nd byte: 66 */ 0x6bbf,
-  /* 2nd byte: 67 */ 0x6fb1,
-  /* 2nd byte: 68 */ 0x7530,
-  /* 2nd byte: 69 */ 0x96fb,
-  /* 2nd byte: 70 */ 0x514e,
-  /* 2nd byte: 71 */ 0x5410,
-  /* 2nd byte: 72 */ 0x5835,
-  /* 2nd byte: 73 */ 0x5857,
-  /* 2nd byte: 74 */ 0x59ac,
-  /* 2nd byte: 75 */ 0x5c60,
-  /* 2nd byte: 76 */ 0x5f92,
-  /* 2nd byte: 77 */ 0x6597,
-  /* 2nd byte: 78 */ 0x675c,
-  /* 2nd byte: 79 */ 0x6e21,
-  /* 2nd byte: 80 */ 0x767b,
-  /* 2nd byte: 81 */ 0x83df,
-  /* 2nd byte: 82 */ 0x8ced,
-  /* 2nd byte: 83 */ 0x9014,
-  /* 2nd byte: 84 */ 0x90fd,
-  /* 2nd byte: 85 */ 0x934d,
-  /* 2nd byte: 86 */ 0x7825,
-  /* 2nd byte: 87 */ 0x783a,
-  /* 2nd byte: 88 */ 0x52aa,
-  /* 2nd byte: 89 */ 0x5ea6,
-  /* 2nd byte: 90 */ 0x571f,
-  /* 2nd byte: 91 */ 0x5974,
-  /* 2nd byte: 92 */ 0x6012,
-  /* 2nd byte: 93 */ 0x5012,
-  /* 2nd byte: 94 */ 0x515a,
-  /* 2nd byte: 95 */ 0x51ac,
-  /* 2nd byte: 96 */ 0x51cd,
-  /* 2nd byte: 97 */ 0x5200,
-  /* 2nd byte: 98 */ 0x5510,
-  /* 2nd byte: 99 */ 0x5854,
-  /* 2nd byte: 100 */ 0x5858,
-  /* 2nd byte: 101 */ 0x5957,
-  /* 2nd byte: 102 */ 0x5b95,
-  /* 2nd byte: 103 */ 0x5cf6,
-  /* 2nd byte: 104 */ 0x5d8b,
-  /* 2nd byte: 105 */ 0x60bc,
-  /* 2nd byte: 106 */ 0x6295,
-  /* 2nd byte: 107 */ 0x642d,
-  /* 2nd byte: 108 */ 0x6771,
-  /* 2nd byte: 109 */ 0x6843,
-  /* 2nd byte: 110 */ 0x68bc,
-  /* 2nd byte: 111 */ 0x68df,
-  /* 2nd byte: 112 */ 0x76d7,
-  /* 2nd byte: 113 */ 0x6dd8,
-  /* 2nd byte: 114 */ 0x6e6f,
-  /* 2nd byte: 115 */ 0x6d9b,
-  /* 2nd byte: 116 */ 0x706f,
-  /* 2nd byte: 117 */ 0x71c8,
-  /* 2nd byte: 118 */ 0x5f53,
-  /* 2nd byte: 119 */ 0x75d8,
-  /* 2nd byte: 120 */ 0x7977,
-  /* 2nd byte: 121 */ 0x7b49,
-  /* 2nd byte: 122 */ 0x7b54,
-  /* 2nd byte: 123 */ 0x7b52,
-  /* 2nd byte: 124 */ 0x7cd6,
-  /* 2nd byte: 125 */ 0x7d71,
-  /* 2nd byte: 126 */ 0x5230},
-/* 1st byte: 70 */ { 
-  /* 2nd byte: 33 */ 0x8463,
-  /* 2nd byte: 34 */ 0x8569,
-  /* 2nd byte: 35 */ 0x85e4,
-  /* 2nd byte: 36 */ 0x8a0e,
-  /* 2nd byte: 37 */ 0x8b04,
-  /* 2nd byte: 38 */ 0x8c46,
-  /* 2nd byte: 39 */ 0x8e0f,
-  /* 2nd byte: 40 */ 0x9003,
-  /* 2nd byte: 41 */ 0x900f,
-  /* 2nd byte: 42 */ 0x9419,
-  /* 2nd byte: 43 */ 0x9676,
-  /* 2nd byte: 44 */ 0x982d,
-  /* 2nd byte: 45 */ 0x9a30,
-  /* 2nd byte: 46 */ 0x95d8,
-  /* 2nd byte: 47 */ 0x50cd,
-  /* 2nd byte: 48 */ 0x52d5,
-  /* 2nd byte: 49 */ 0x540c,
-  /* 2nd byte: 50 */ 0x5802,
-  /* 2nd byte: 51 */ 0x5c0e,
-  /* 2nd byte: 52 */ 0x61a7,
-  /* 2nd byte: 53 */ 0x649e,
-  /* 2nd byte: 54 */ 0x6d1e,
-  /* 2nd byte: 55 */ 0x77b3,
-  /* 2nd byte: 56 */ 0x7ae5,
-  /* 2nd byte: 57 */ 0x80f4,
-  /* 2nd byte: 58 */ 0x8404,
-  /* 2nd byte: 59 */ 0x9053,
-  /* 2nd byte: 60 */ 0x9285,
-  /* 2nd byte: 61 */ 0x5ce0,
-  /* 2nd byte: 62 */ 0x9d07,
-  /* 2nd byte: 63 */ 0x533f,
-  /* 2nd byte: 64 */ 0x5f97,
-  /* 2nd byte: 65 */ 0x5fb3,
-  /* 2nd byte: 66 */ 0x6d9c,
-  /* 2nd byte: 67 */ 0x7279,
-  /* 2nd byte: 68 */ 0x7763,
-  /* 2nd byte: 69 */ 0x79bf,
-  /* 2nd byte: 70 */ 0x7be4,
-  /* 2nd byte: 71 */ 0x6bd2,
-  /* 2nd byte: 72 */ 0x72ec,
-  /* 2nd byte: 73 */ 0x8aad,
-  /* 2nd byte: 74 */ 0x6803,
-  /* 2nd byte: 75 */ 0x6a61,
-  /* 2nd byte: 76 */ 0x51f8,
-  /* 2nd byte: 77 */ 0x7a81,
-  /* 2nd byte: 78 */ 0x6934,
-  /* 2nd byte: 79 */ 0x5c4a,
-  /* 2nd byte: 80 */ 0x9cf6,
-  /* 2nd byte: 81 */ 0x82eb,
-  /* 2nd byte: 82 */ 0x5bc5,
-  /* 2nd byte: 83 */ 0x9149,
-  /* 2nd byte: 84 */ 0x701e,
-  /* 2nd byte: 85 */ 0x5678,
-  /* 2nd byte: 86 */ 0x5c6f,
-  /* 2nd byte: 87 */ 0x60c7,
-  /* 2nd byte: 88 */ 0x6566,
-  /* 2nd byte: 89 */ 0x6c8c,
-  /* 2nd byte: 90 */ 0x8c5a,
-  /* 2nd byte: 91 */ 0x9041,
-  /* 2nd byte: 92 */ 0x9813,
-  /* 2nd byte: 93 */ 0x5451,
-  /* 2nd byte: 94 */ 0x66c7,
-  /* 2nd byte: 95 */ 0x920d,
-  /* 2nd byte: 96 */ 0x5948,
-  /* 2nd byte: 97 */ 0x90a3,
-  /* 2nd byte: 98 */ 0x5185,
-  /* 2nd byte: 99 */ 0x4e4d,
-  /* 2nd byte: 100 */ 0x51ea,
-  /* 2nd byte: 101 */ 0x8599,
-  /* 2nd byte: 102 */ 0x8b0e,
-  /* 2nd byte: 103 */ 0x7058,
-  /* 2nd byte: 104 */ 0x637a,
-  /* 2nd byte: 105 */ 0x934b,
-  /* 2nd byte: 106 */ 0x6962,
-  /* 2nd byte: 107 */ 0x99b4,
-  /* 2nd byte: 108 */ 0x7e04,
-  /* 2nd byte: 109 */ 0x7577,
-  /* 2nd byte: 110 */ 0x5357,
-  /* 2nd byte: 111 */ 0x6960,
-  /* 2nd byte: 112 */ 0x8edf,
-  /* 2nd byte: 113 */ 0x96e3,
-  /* 2nd byte: 114 */ 0x6c5d,
-  /* 2nd byte: 115 */ 0x4e8c,
-  /* 2nd byte: 116 */ 0x5c3c,
-  /* 2nd byte: 117 */ 0x5f10,
-  /* 2nd byte: 118 */ 0x8fe9,
-  /* 2nd byte: 119 */ 0x5302,
-  /* 2nd byte: 120 */ 0x8cd1,
-  /* 2nd byte: 121 */ 0x8089,
-  /* 2nd byte: 122 */ 0x8679,
-  /* 2nd byte: 123 */ 0x5eff,
-  /* 2nd byte: 124 */ 0x65e5,
-  /* 2nd byte: 125 */ 0x4e73,
-  /* 2nd byte: 126 */ 0x5165},
-/* 1st byte: 71 */ { 
-  /* 2nd byte: 33 */ 0x5982,
-  /* 2nd byte: 34 */ 0x5c3f,
-  /* 2nd byte: 35 */ 0x97ee,
-  /* 2nd byte: 36 */ 0x4efb,
-  /* 2nd byte: 37 */ 0x598a,
-  /* 2nd byte: 38 */ 0x5fcd,
-  /* 2nd byte: 39 */ 0x8a8d,
-  /* 2nd byte: 40 */ 0x6fe1,
-  /* 2nd byte: 41 */ 0x79b0,
-  /* 2nd byte: 42 */ 0x7962,
-  /* 2nd byte: 43 */ 0x5be7,
-  /* 2nd byte: 44 */ 0x8471,
-  /* 2nd byte: 45 */ 0x732b,
-  /* 2nd byte: 46 */ 0x71b1,
-  /* 2nd byte: 47 */ 0x5e74,
-  /* 2nd byte: 48 */ 0x5ff5,
-  /* 2nd byte: 49 */ 0x637b,
-  /* 2nd byte: 50 */ 0x649a,
-  /* 2nd byte: 51 */ 0x71c3,
-  /* 2nd byte: 52 */ 0x7c98,
-  /* 2nd byte: 53 */ 0x4e43,
-  /* 2nd byte: 54 */ 0x5efc,
-  /* 2nd byte: 55 */ 0x4e4b,
-  /* 2nd byte: 56 */ 0x57dc,
-  /* 2nd byte: 57 */ 0x56a2,
-  /* 2nd byte: 58 */ 0x60a9,
-  /* 2nd byte: 59 */ 0x6fc3,
-  /* 2nd byte: 60 */ 0x7d0d,
-  /* 2nd byte: 61 */ 0x80fd,
-  /* 2nd byte: 62 */ 0x8133,
-  /* 2nd byte: 63 */ 0x81bf,
-  /* 2nd byte: 64 */ 0x8fb2,
-  /* 2nd byte: 65 */ 0x8997,
-  /* 2nd byte: 66 */ 0x86a4,
-  /* 2nd byte: 67 */ 0x5df4,
-  /* 2nd byte: 68 */ 0x628a,
-  /* 2nd byte: 69 */ 0x64ad,
-  /* 2nd byte: 70 */ 0x8987,
-  /* 2nd byte: 71 */ 0x6777,
-  /* 2nd byte: 72 */ 0x6ce2,
-  /* 2nd byte: 73 */ 0x6d3e,
-  /* 2nd byte: 74 */ 0x7436,
-  /* 2nd byte: 75 */ 0x7834,
-  /* 2nd byte: 76 */ 0x5a46,
-  /* 2nd byte: 77 */ 0x7f75,
-  /* 2nd byte: 78 */ 0x82ad,
-  /* 2nd byte: 79 */ 0x99ac,
-  /* 2nd byte: 80 */ 0x4ff3,
-  /* 2nd byte: 81 */ 0x5ec3,
-  /* 2nd byte: 82 */ 0x62dd,
-  /* 2nd byte: 83 */ 0x6392,
-  /* 2nd byte: 84 */ 0x6557,
-  /* 2nd byte: 85 */ 0x676f,
-  /* 2nd byte: 86 */ 0x76c3,
-  /* 2nd byte: 87 */ 0x724c,
-  /* 2nd byte: 88 */ 0x80cc,
-  /* 2nd byte: 89 */ 0x80ba,
-  /* 2nd byte: 90 */ 0x8f29,
-  /* 2nd byte: 91 */ 0x914d,
-  /* 2nd byte: 92 */ 0x500d,
-  /* 2nd byte: 93 */ 0x57f9,
-  /* 2nd byte: 94 */ 0x5a92,
-  /* 2nd byte: 95 */ 0x6885,
-  /* 2nd byte: 96 */ 0x6973,
-  /* 2nd byte: 97 */ 0x7164,
-  /* 2nd byte: 98 */ 0x72fd,
-  /* 2nd byte: 99 */ 0x8cb7,
-  /* 2nd byte: 100 */ 0x58f2,
-  /* 2nd byte: 101 */ 0x8ce0,
-  /* 2nd byte: 102 */ 0x966a,
-  /* 2nd byte: 103 */ 0x9019,
-  /* 2nd byte: 104 */ 0x877f,
-  /* 2nd byte: 105 */ 0x79e4,
-  /* 2nd byte: 106 */ 0x77e7,
-  /* 2nd byte: 107 */ 0x8429,
-  /* 2nd byte: 108 */ 0x4f2f,
-  /* 2nd byte: 109 */ 0x5265,
-  /* 2nd byte: 110 */ 0x535a,
-  /* 2nd byte: 111 */ 0x62cd,
-  /* 2nd byte: 112 */ 0x67cf,
-  /* 2nd byte: 113 */ 0x6cca,
-  /* 2nd byte: 114 */ 0x767d,
-  /* 2nd byte: 115 */ 0x7b94,
-  /* 2nd byte: 116 */ 0x7c95,
-  /* 2nd byte: 117 */ 0x8236,
-  /* 2nd byte: 118 */ 0x8584,
-  /* 2nd byte: 119 */ 0x8feb,
-  /* 2nd byte: 120 */ 0x66dd,
-  /* 2nd byte: 121 */ 0x6f20,
-  /* 2nd byte: 122 */ 0x7206,
-  /* 2nd byte: 123 */ 0x7e1b,
-  /* 2nd byte: 124 */ 0x83ab,
-  /* 2nd byte: 125 */ 0x99c1,
-  /* 2nd byte: 126 */ 0x9ea6},
-/* 1st byte: 72 */ { 
-  /* 2nd byte: 33 */ 0x51fd,
-  /* 2nd byte: 34 */ 0x7bb1,
-  /* 2nd byte: 35 */ 0x7872,
-  /* 2nd byte: 36 */ 0x7bb8,
-  /* 2nd byte: 37 */ 0x8087,
-  /* 2nd byte: 38 */ 0x7b48,
-  /* 2nd byte: 39 */ 0x6ae8,
-  /* 2nd byte: 40 */ 0x5e61,
-  /* 2nd byte: 41 */ 0x808c,
-  /* 2nd byte: 42 */ 0x7551,
-  /* 2nd byte: 43 */ 0x7560,
-  /* 2nd byte: 44 */ 0x516b,
-  /* 2nd byte: 45 */ 0x9262,
-  /* 2nd byte: 46 */ 0x6e8c,
-  /* 2nd byte: 47 */ 0x767a,
-  /* 2nd byte: 48 */ 0x9197,
-  /* 2nd byte: 49 */ 0x9aea,
-  /* 2nd byte: 50 */ 0x4f10,
-  /* 2nd byte: 51 */ 0x7f70,
-  /* 2nd byte: 52 */ 0x629c,
-  /* 2nd byte: 53 */ 0x7b4f,
-  /* 2nd byte: 54 */ 0x95a5,
-  /* 2nd byte: 55 */ 0x9ce9,
-  /* 2nd byte: 56 */ 0x567a,
-  /* 2nd byte: 57 */ 0x5859,
-  /* 2nd byte: 58 */ 0x86e4,
-  /* 2nd byte: 59 */ 0x96bc,
-  /* 2nd byte: 60 */ 0x4f34,
-  /* 2nd byte: 61 */ 0x5224,
-  /* 2nd byte: 62 */ 0x534a,
-  /* 2nd byte: 63 */ 0x53cd,
-  /* 2nd byte: 64 */ 0x53db,
-  /* 2nd byte: 65 */ 0x5e06,
-  /* 2nd byte: 66 */ 0x642c,
-  /* 2nd byte: 67 */ 0x6591,
-  /* 2nd byte: 68 */ 0x677f,
-  /* 2nd byte: 69 */ 0x6c3e,
-  /* 2nd byte: 70 */ 0x6c4e,
-  /* 2nd byte: 71 */ 0x7248,
-  /* 2nd byte: 72 */ 0x72af,
-  /* 2nd byte: 73 */ 0x73ed,
-  /* 2nd byte: 74 */ 0x7554,
-  /* 2nd byte: 75 */ 0x7e41,
-  /* 2nd byte: 76 */ 0x822c,
-  /* 2nd byte: 77 */ 0x85e9,
-  /* 2nd byte: 78 */ 0x8ca9,
-  /* 2nd byte: 79 */ 0x7bc4,
-  /* 2nd byte: 80 */ 0x91c6,
-  /* 2nd byte: 81 */ 0x7169,
-  /* 2nd byte: 82 */ 0x9812,
-  /* 2nd byte: 83 */ 0x98ef,
-  /* 2nd byte: 84 */ 0x633d,
-  /* 2nd byte: 85 */ 0x6669,
-  /* 2nd byte: 86 */ 0x756a,
-  /* 2nd byte: 87 */ 0x76e4,
-  /* 2nd byte: 88 */ 0x78d0,
-  /* 2nd byte: 89 */ 0x8543,
-  /* 2nd byte: 90 */ 0x86ee,
-  /* 2nd byte: 91 */ 0x532a,
-  /* 2nd byte: 92 */ 0x5351,
-  /* 2nd byte: 93 */ 0x5426,
-  /* 2nd byte: 94 */ 0x5983,
-  /* 2nd byte: 95 */ 0x5e87,
-  /* 2nd byte: 96 */ 0x5f7c,
-  /* 2nd byte: 97 */ 0x60b2,
-  /* 2nd byte: 98 */ 0x6249,
-  /* 2nd byte: 99 */ 0x6279,
-  /* 2nd byte: 100 */ 0x62ab,
-  /* 2nd byte: 101 */ 0x6590,
-  /* 2nd byte: 102 */ 0x6bd4,
-  /* 2nd byte: 103 */ 0x6ccc,
-  /* 2nd byte: 104 */ 0x75b2,
-  /* 2nd byte: 105 */ 0x76ae,
-  /* 2nd byte: 106 */ 0x7891,
-  /* 2nd byte: 107 */ 0x79d8,
-  /* 2nd byte: 108 */ 0x7dcb,
-  /* 2nd byte: 109 */ 0x7f77,
-  /* 2nd byte: 110 */ 0x80a5,
-  /* 2nd byte: 111 */ 0x88ab,
-  /* 2nd byte: 112 */ 0x8ab9,
-  /* 2nd byte: 113 */ 0x8cbb,
-  /* 2nd byte: 114 */ 0x907f,
-  /* 2nd byte: 115 */ 0x975e,
-  /* 2nd byte: 116 */ 0x98db,
-  /* 2nd byte: 117 */ 0x6a0b,
-  /* 2nd byte: 118 */ 0x7c38,
-  /* 2nd byte: 119 */ 0x5099,
-  /* 2nd byte: 120 */ 0x5c3e,
-  /* 2nd byte: 121 */ 0x5fae,
-  /* 2nd byte: 122 */ 0x6787,
-  /* 2nd byte: 123 */ 0x6bd8,
-  /* 2nd byte: 124 */ 0x7435,
-  /* 2nd byte: 125 */ 0x7709,
-  /* 2nd byte: 126 */ 0x7f8e},
-/* 1st byte: 73 */ { 
-  /* 2nd byte: 33 */ 0x9f3b,
-  /* 2nd byte: 34 */ 0x67ca,
-  /* 2nd byte: 35 */ 0x7a17,
-  /* 2nd byte: 36 */ 0x5339,
-  /* 2nd byte: 37 */ 0x758b,
-  /* 2nd byte: 38 */ 0x9aed,
-  /* 2nd byte: 39 */ 0x5f66,
-  /* 2nd byte: 40 */ 0x819d,
-  /* 2nd byte: 41 */ 0x83f1,
-  /* 2nd byte: 42 */ 0x8098,
-  /* 2nd byte: 43 */ 0x5f3c,
-  /* 2nd byte: 44 */ 0x5fc5,
-  /* 2nd byte: 45 */ 0x7562,
-  /* 2nd byte: 46 */ 0x7b46,
-  /* 2nd byte: 47 */ 0x903c,
-  /* 2nd byte: 48 */ 0x6867,
-  /* 2nd byte: 49 */ 0x59eb,
-  /* 2nd byte: 50 */ 0x5a9b,
-  /* 2nd byte: 51 */ 0x7d10,
-  /* 2nd byte: 52 */ 0x767e,
-  /* 2nd byte: 53 */ 0x8b2c,
-  /* 2nd byte: 54 */ 0x4ff5,
-  /* 2nd byte: 55 */ 0x5f6a,
-  /* 2nd byte: 56 */ 0x6a19,
-  /* 2nd byte: 57 */ 0x6c37,
-  /* 2nd byte: 58 */ 0x6f02,
-  /* 2nd byte: 59 */ 0x74e2,
-  /* 2nd byte: 60 */ 0x7968,
-  /* 2nd byte: 61 */ 0x8868,
-  /* 2nd byte: 62 */ 0x8a55,
-  /* 2nd byte: 63 */ 0x8c79,
-  /* 2nd byte: 64 */ 0x5edf,
-  /* 2nd byte: 65 */ 0x63cf,
-  /* 2nd byte: 66 */ 0x75c5,
-  /* 2nd byte: 67 */ 0x79d2,
-  /* 2nd byte: 68 */ 0x82d7,
-  /* 2nd byte: 69 */ 0x9328,
-  /* 2nd byte: 70 */ 0x92f2,
-  /* 2nd byte: 71 */ 0x849c,
-  /* 2nd byte: 72 */ 0x86ed,
-  /* 2nd byte: 73 */ 0x9c2d,
-  /* 2nd byte: 74 */ 0x54c1,
-  /* 2nd byte: 75 */ 0x5f6c,
-  /* 2nd byte: 76 */ 0x658c,
-  /* 2nd byte: 77 */ 0x6d5c,
-  /* 2nd byte: 78 */ 0x7015,
-  /* 2nd byte: 79 */ 0x8ca7,
-  /* 2nd byte: 80 */ 0x8cd3,
-  /* 2nd byte: 81 */ 0x983b,
-  /* 2nd byte: 82 */ 0x654f,
-  /* 2nd byte: 83 */ 0x74f6,
-  /* 2nd byte: 84 */ 0x4e0d,
-  /* 2nd byte: 85 */ 0x4ed8,
-  /* 2nd byte: 86 */ 0x57e0,
-  /* 2nd byte: 87 */ 0x592b,
-  /* 2nd byte: 88 */ 0x5a66,
-  /* 2nd byte: 89 */ 0x5bcc,
-  /* 2nd byte: 90 */ 0x51a8,
-  /* 2nd byte: 91 */ 0x5e03,
-  /* 2nd byte: 92 */ 0x5e9c,
-  /* 2nd byte: 93 */ 0x6016,
-  /* 2nd byte: 94 */ 0x6276,
-  /* 2nd byte: 95 */ 0x6577,
-  /* 2nd byte: 96 */ 0x65a7,
-  /* 2nd byte: 97 */ 0x666e,
-  /* 2nd byte: 98 */ 0x6d6e,
-  /* 2nd byte: 99 */ 0x7236,
-  /* 2nd byte: 100 */ 0x7b26,
-  /* 2nd byte: 101 */ 0x8150,
-  /* 2nd byte: 102 */ 0x819a,
-  /* 2nd byte: 103 */ 0x8299,
-  /* 2nd byte: 104 */ 0x8b5c,
-  /* 2nd byte: 105 */ 0x8ca0,
-  /* 2nd byte: 106 */ 0x8ce6,
-  /* 2nd byte: 107 */ 0x8d74,
-  /* 2nd byte: 108 */ 0x961c,
-  /* 2nd byte: 109 */ 0x9644,
-  /* 2nd byte: 110 */ 0x4fae,
-  /* 2nd byte: 111 */ 0x64ab,
-  /* 2nd byte: 112 */ 0x6b66,
-  /* 2nd byte: 113 */ 0x821e,
-  /* 2nd byte: 114 */ 0x8461,
-  /* 2nd byte: 115 */ 0x856a,
-  /* 2nd byte: 116 */ 0x90e8,
-  /* 2nd byte: 117 */ 0x5c01,
-  /* 2nd byte: 118 */ 0x6953,
-  /* 2nd byte: 119 */ 0x98a8,
-  /* 2nd byte: 120 */ 0x847a,
-  /* 2nd byte: 121 */ 0x8557,
-  /* 2nd byte: 122 */ 0x4f0f,
-  /* 2nd byte: 123 */ 0x526f,
-  /* 2nd byte: 124 */ 0x5fa9,
-  /* 2nd byte: 125 */ 0x5e45,
-  /* 2nd byte: 126 */ 0x670d},
-/* 1st byte: 74 */ { 
-  /* 2nd byte: 33 */ 0x798f,
-  /* 2nd byte: 34 */ 0x8179,
-  /* 2nd byte: 35 */ 0x8907,
-  /* 2nd byte: 36 */ 0x8986,
-  /* 2nd byte: 37 */ 0x6df5,
-  /* 2nd byte: 38 */ 0x5f17,
-  /* 2nd byte: 39 */ 0x6255,
-  /* 2nd byte: 40 */ 0x6cb8,
-  /* 2nd byte: 41 */ 0x4ecf,
-  /* 2nd byte: 42 */ 0x7269,
-  /* 2nd byte: 43 */ 0x9b92,
-  /* 2nd byte: 44 */ 0x5206,
-  /* 2nd byte: 45 */ 0x543b,
-  /* 2nd byte: 46 */ 0x5674,
-  /* 2nd byte: 47 */ 0x58b3,
-  /* 2nd byte: 48 */ 0x61a4,
-  /* 2nd byte: 49 */ 0x626e,
-  /* 2nd byte: 50 */ 0x711a,
-  /* 2nd byte: 51 */ 0x596e,
-  /* 2nd byte: 52 */ 0x7c89,
-  /* 2nd byte: 53 */ 0x7cde,
-  /* 2nd byte: 54 */ 0x7d1b,
-  /* 2nd byte: 55 */ 0x96f0,
-  /* 2nd byte: 56 */ 0x6587,
-  /* 2nd byte: 57 */ 0x805e,
-  /* 2nd byte: 58 */ 0x4e19,
-  /* 2nd byte: 59 */ 0x4f75,
-  /* 2nd byte: 60 */ 0x5175,
-  /* 2nd byte: 61 */ 0x5840,
-  /* 2nd byte: 62 */ 0x5e63,
-  /* 2nd byte: 63 */ 0x5e73,
-  /* 2nd byte: 64 */ 0x5f0a,
-  /* 2nd byte: 65 */ 0x67c4,
-  /* 2nd byte: 66 */ 0x4e26,
-  /* 2nd byte: 67 */ 0x853d,
-  /* 2nd byte: 68 */ 0x9589,
-  /* 2nd byte: 69 */ 0x965b,
-  /* 2nd byte: 70 */ 0x7c73,
-  /* 2nd byte: 71 */ 0x9801,
-  /* 2nd byte: 72 */ 0x50fb,
-  /* 2nd byte: 73 */ 0x58c1,
-  /* 2nd byte: 74 */ 0x7656,
-  /* 2nd byte: 75 */ 0x78a7,
-  /* 2nd byte: 76 */ 0x5225,
-  /* 2nd byte: 77 */ 0x77a5,
-  /* 2nd byte: 78 */ 0x8511,
-  /* 2nd byte: 79 */ 0x7b86,
-  /* 2nd byte: 80 */ 0x504f,
-  /* 2nd byte: 81 */ 0x5909,
-  /* 2nd byte: 82 */ 0x7247,
-  /* 2nd byte: 83 */ 0x7bc7,
-  /* 2nd byte: 84 */ 0x7de8,
-  /* 2nd byte: 85 */ 0x8fba,
-  /* 2nd byte: 86 */ 0x8fd4,
-  /* 2nd byte: 87 */ 0x904d,
-  /* 2nd byte: 88 */ 0x4fbf,
-  /* 2nd byte: 89 */ 0x52c9,
-  /* 2nd byte: 90 */ 0x5a29,
-  /* 2nd byte: 91 */ 0x5f01,
-  /* 2nd byte: 92 */ 0x97ad,
-  /* 2nd byte: 93 */ 0x4fdd,
-  /* 2nd byte: 94 */ 0x8217,
-  /* 2nd byte: 95 */ 0x92ea,
-  /* 2nd byte: 96 */ 0x5703,
-  /* 2nd byte: 97 */ 0x6355,
-  /* 2nd byte: 98 */ 0x6b69,
-  /* 2nd byte: 99 */ 0x752b,
-  /* 2nd byte: 100 */ 0x88dc,
-  /* 2nd byte: 101 */ 0x8f14,
-  /* 2nd byte: 102 */ 0x7a42,
-  /* 2nd byte: 103 */ 0x52df,
-  /* 2nd byte: 104 */ 0x5893,
-  /* 2nd byte: 105 */ 0x6155,
-  /* 2nd byte: 106 */ 0x620a,
-  /* 2nd byte: 107 */ 0x66ae,
-  /* 2nd byte: 108 */ 0x6bcd,
-  /* 2nd byte: 109 */ 0x7c3f,
-  /* 2nd byte: 110 */ 0x83e9,
-  /* 2nd byte: 111 */ 0x5023,
-  /* 2nd byte: 112 */ 0x4ff8,
-  /* 2nd byte: 113 */ 0x5305,
-  /* 2nd byte: 114 */ 0x5446,
-  /* 2nd byte: 115 */ 0x5831,
-  /* 2nd byte: 116 */ 0x5949,
-  /* 2nd byte: 117 */ 0x5b9d,
-  /* 2nd byte: 118 */ 0x5cf0,
-  /* 2nd byte: 119 */ 0x5cef,
-  /* 2nd byte: 120 */ 0x5d29,
-  /* 2nd byte: 121 */ 0x5e96,
-  /* 2nd byte: 122 */ 0x62b1,
-  /* 2nd byte: 123 */ 0x6367,
-  /* 2nd byte: 124 */ 0x653e,
-  /* 2nd byte: 125 */ 0x65b9,
-  /* 2nd byte: 126 */ 0x670b},
-/* 1st byte: 75 */ { 
-  /* 2nd byte: 33 */ 0x6cd5,
-  /* 2nd byte: 34 */ 0x6ce1,
-  /* 2nd byte: 35 */ 0x70f9,
-  /* 2nd byte: 36 */ 0x7832,
-  /* 2nd byte: 37 */ 0x7e2b,
-  /* 2nd byte: 38 */ 0x80de,
-  /* 2nd byte: 39 */ 0x82b3,
-  /* 2nd byte: 40 */ 0x840c,
-  /* 2nd byte: 41 */ 0x84ec,
-  /* 2nd byte: 42 */ 0x8702,
-  /* 2nd byte: 43 */ 0x8912,
-  /* 2nd byte: 44 */ 0x8a2a,
-  /* 2nd byte: 45 */ 0x8c4a,
-  /* 2nd byte: 46 */ 0x90a6,
-  /* 2nd byte: 47 */ 0x92d2,
-  /* 2nd byte: 48 */ 0x98fd,
-  /* 2nd byte: 49 */ 0x9cf3,
-  /* 2nd byte: 50 */ 0x9d6c,
-  /* 2nd byte: 51 */ 0x4e4f,
-  /* 2nd byte: 52 */ 0x4ea1,
-  /* 2nd byte: 53 */ 0x508d,
-  /* 2nd byte: 54 */ 0x5256,
-  /* 2nd byte: 55 */ 0x574a,
-  /* 2nd byte: 56 */ 0x59a8,
-  /* 2nd byte: 57 */ 0x5e3d,
-  /* 2nd byte: 58 */ 0x5fd8,
-  /* 2nd byte: 59 */ 0x5fd9,
-  /* 2nd byte: 60 */ 0x623f,
-  /* 2nd byte: 61 */ 0x66b4,
-  /* 2nd byte: 62 */ 0x671b,
-  /* 2nd byte: 63 */ 0x67d0,
-  /* 2nd byte: 64 */ 0x68d2,
-  /* 2nd byte: 65 */ 0x5192,
-  /* 2nd byte: 66 */ 0x7d21,
-  /* 2nd byte: 67 */ 0x80aa,
-  /* 2nd byte: 68 */ 0x81a8,
-  /* 2nd byte: 69 */ 0x8b00,
-  /* 2nd byte: 70 */ 0x8c8c,
-  /* 2nd byte: 71 */ 0x8cbf,
-  /* 2nd byte: 72 */ 0x927e,
-  /* 2nd byte: 73 */ 0x9632,
-  /* 2nd byte: 74 */ 0x5420,
-  /* 2nd byte: 75 */ 0x982c,
-  /* 2nd byte: 76 */ 0x5317,
-  /* 2nd byte: 77 */ 0x50d5,
-  /* 2nd byte: 78 */ 0x535c,
-  /* 2nd byte: 79 */ 0x58a8,
-  /* 2nd byte: 80 */ 0x64b2,
-  /* 2nd byte: 81 */ 0x6734,
-  /* 2nd byte: 82 */ 0x7267,
-  /* 2nd byte: 83 */ 0x7766,
-  /* 2nd byte: 84 */ 0x7a46,
-  /* 2nd byte: 85 */ 0x91e6,
-  /* 2nd byte: 86 */ 0x52c3,
-  /* 2nd byte: 87 */ 0x6ca1,
-  /* 2nd byte: 88 */ 0x6b86,
-  /* 2nd byte: 89 */ 0x5800,
-  /* 2nd byte: 90 */ 0x5e4c,
-  /* 2nd byte: 91 */ 0x5954,
-  /* 2nd byte: 92 */ 0x672c,
-  /* 2nd byte: 93 */ 0x7ffb,
-  /* 2nd byte: 94 */ 0x51e1,
-  /* 2nd byte: 95 */ 0x76c6,
-  /* 2nd byte: 96 */ 0x6469,
-  /* 2nd byte: 97 */ 0x78e8,
-  /* 2nd byte: 98 */ 0x9b54,
-  /* 2nd byte: 99 */ 0x9ebb,
-  /* 2nd byte: 100 */ 0x57cb,
-  /* 2nd byte: 101 */ 0x59b9,
-  /* 2nd byte: 102 */ 0x6627,
-  /* 2nd byte: 103 */ 0x679a,
-  /* 2nd byte: 104 */ 0x6bce,
-  /* 2nd byte: 105 */ 0x54e9,
-  /* 2nd byte: 106 */ 0x69d9,
-  /* 2nd byte: 107 */ 0x5e55,
-  /* 2nd byte: 108 */ 0x819c,
-  /* 2nd byte: 109 */ 0x6795,
-  /* 2nd byte: 110 */ 0x9baa,
-  /* 2nd byte: 111 */ 0x67fe,
-  /* 2nd byte: 112 */ 0x9c52,
-  /* 2nd byte: 113 */ 0x685d,
-  /* 2nd byte: 114 */ 0x4ea6,
-  /* 2nd byte: 115 */ 0x4fe3,
-  /* 2nd byte: 116 */ 0x53c8,
-  /* 2nd byte: 117 */ 0x62b9,
-  /* 2nd byte: 118 */ 0x672b,
-  /* 2nd byte: 119 */ 0x6cab,
-  /* 2nd byte: 120 */ 0x8fc4,
-  /* 2nd byte: 121 */ 0x4fad,
-  /* 2nd byte: 122 */ 0x7e6d,
-  /* 2nd byte: 123 */ 0x9ebf,
-  /* 2nd byte: 124 */ 0x4e07,
-  /* 2nd byte: 125 */ 0x6162,
-  /* 2nd byte: 126 */ 0x6e80},
-/* 1st byte: 76 */ { 
-  /* 2nd byte: 33 */ 0x6f2b,
-  /* 2nd byte: 34 */ 0x8513,
-  /* 2nd byte: 35 */ 0x5473,
-  /* 2nd byte: 36 */ 0x672a,
-  /* 2nd byte: 37 */ 0x9b45,
-  /* 2nd byte: 38 */ 0x5df3,
-  /* 2nd byte: 39 */ 0x7b95,
-  /* 2nd byte: 40 */ 0x5cac,
-  /* 2nd byte: 41 */ 0x5bc6,
-  /* 2nd byte: 42 */ 0x871c,
-  /* 2nd byte: 43 */ 0x6e4a,
-  /* 2nd byte: 44 */ 0x84d1,
-  /* 2nd byte: 45 */ 0x7a14,
-  /* 2nd byte: 46 */ 0x8108,
-  /* 2nd byte: 47 */ 0x5999,
-  /* 2nd byte: 48 */ 0x7c8d,
-  /* 2nd byte: 49 */ 0x6c11,
-  /* 2nd byte: 50 */ 0x7720,
-  /* 2nd byte: 51 */ 0x52d9,
-  /* 2nd byte: 52 */ 0x5922,
-  /* 2nd byte: 53 */ 0x7121,
-  /* 2nd byte: 54 */ 0x725f,
-  /* 2nd byte: 55 */ 0x77db,
-  /* 2nd byte: 56 */ 0x9727,
-  /* 2nd byte: 57 */ 0x9d61,
-  /* 2nd byte: 58 */ 0x690b,
-  /* 2nd byte: 59 */ 0x5a7f,
-  /* 2nd byte: 60 */ 0x5a18,
-  /* 2nd byte: 61 */ 0x51a5,
-  /* 2nd byte: 62 */ 0x540d,
-  /* 2nd byte: 63 */ 0x547d,
-  /* 2nd byte: 64 */ 0x660e,
-  /* 2nd byte: 65 */ 0x76df,
-  /* 2nd byte: 66 */ 0x8ff7,
-  /* 2nd byte: 67 */ 0x9298,
-  /* 2nd byte: 68 */ 0x9cf4,
-  /* 2nd byte: 69 */ 0x59ea,
-  /* 2nd byte: 70 */ 0x725d,
-  /* 2nd byte: 71 */ 0x6ec5,
-  /* 2nd byte: 72 */ 0x514d,
-  /* 2nd byte: 73 */ 0x68c9,
-  /* 2nd byte: 74 */ 0x7dbf,
-  /* 2nd byte: 75 */ 0x7dec,
-  /* 2nd byte: 76 */ 0x9762,
-  /* 2nd byte: 77 */ 0x9eba,
-  /* 2nd byte: 78 */ 0x6478,
-  /* 2nd byte: 79 */ 0x6a21,
-  /* 2nd byte: 80 */ 0x8302,
-  /* 2nd byte: 81 */ 0x5984,
-  /* 2nd byte: 82 */ 0x5b5f,
-  /* 2nd byte: 83 */ 0x6bdb,
-  /* 2nd byte: 84 */ 0x731b,
-  /* 2nd byte: 85 */ 0x76f2,
-  /* 2nd byte: 86 */ 0x7db2,
-  /* 2nd byte: 87 */ 0x8017,
-  /* 2nd byte: 88 */ 0x8499,
-  /* 2nd byte: 89 */ 0x5132,
-  /* 2nd byte: 90 */ 0x6728,
-  /* 2nd byte: 91 */ 0x9ed9,
-  /* 2nd byte: 92 */ 0x76ee,
-  /* 2nd byte: 93 */ 0x6762,
-  /* 2nd byte: 94 */ 0x52ff,
-  /* 2nd byte: 95 */ 0x9905,
-  /* 2nd byte: 96 */ 0x5c24,
-  /* 2nd byte: 97 */ 0x623b,
-  /* 2nd byte: 98 */ 0x7c7e,
-  /* 2nd byte: 99 */ 0x8cb0,
-  /* 2nd byte: 100 */ 0x554f,
-  /* 2nd byte: 101 */ 0x60b6,
-  /* 2nd byte: 102 */ 0x7d0b,
-  /* 2nd byte: 103 */ 0x9580,
-  /* 2nd byte: 104 */ 0x5301,
-  /* 2nd byte: 105 */ 0x4e5f,
-  /* 2nd byte: 106 */ 0x51b6,
-  /* 2nd byte: 107 */ 0x591c,
-  /* 2nd byte: 108 */ 0x723a,
-  /* 2nd byte: 109 */ 0x8036,
-  /* 2nd byte: 110 */ 0x91ce,
-  /* 2nd byte: 111 */ 0x5f25,
-  /* 2nd byte: 112 */ 0x77e2,
-  /* 2nd byte: 113 */ 0x5384,
-  /* 2nd byte: 114 */ 0x5f79,
-  /* 2nd byte: 115 */ 0x7d04,
-  /* 2nd byte: 116 */ 0x85ac,
-  /* 2nd byte: 117 */ 0x8a33,
-  /* 2nd byte: 118 */ 0x8e8d,
-  /* 2nd byte: 119 */ 0x9756,
-  /* 2nd byte: 120 */ 0x67f3,
-  /* 2nd byte: 121 */ 0x85ae,
-  /* 2nd byte: 122 */ 0x9453,
-  /* 2nd byte: 123 */ 0x6109,
-  /* 2nd byte: 124 */ 0x6108,
-  /* 2nd byte: 125 */ 0x6cb9,
-  /* 2nd byte: 126 */ 0x7652},
-/* 1st byte: 77 */ { 
-  /* 2nd byte: 33 */ 0x8aed,
-  /* 2nd byte: 34 */ 0x8f38,
-  /* 2nd byte: 35 */ 0x552f,
-  /* 2nd byte: 36 */ 0x4f51,
-  /* 2nd byte: 37 */ 0x512a,
-  /* 2nd byte: 38 */ 0x52c7,
-  /* 2nd byte: 39 */ 0x53cb,
-  /* 2nd byte: 40 */ 0x5ba5,
-  /* 2nd byte: 41 */ 0x5e7d,
-  /* 2nd byte: 42 */ 0x60a0,
-  /* 2nd byte: 43 */ 0x6182,
-  /* 2nd byte: 44 */ 0x63d6,
-  /* 2nd byte: 45 */ 0x6709,
-  /* 2nd byte: 46 */ 0x67da,
-  /* 2nd byte: 47 */ 0x6e67,
-  /* 2nd byte: 48 */ 0x6d8c,
-  /* 2nd byte: 49 */ 0x7336,
-  /* 2nd byte: 50 */ 0x7337,
-  /* 2nd byte: 51 */ 0x7531,
-  /* 2nd byte: 52 */ 0x7950,
-  /* 2nd byte: 53 */ 0x88d5,
-  /* 2nd byte: 54 */ 0x8a98,
-  /* 2nd byte: 55 */ 0x904a,
-  /* 2nd byte: 56 */ 0x9091,
-  /* 2nd byte: 57 */ 0x90f5,
-  /* 2nd byte: 58 */ 0x96c4,
-  /* 2nd byte: 59 */ 0x878d,
-  /* 2nd byte: 60 */ 0x5915,
-  /* 2nd byte: 61 */ 0x4e88,
-  /* 2nd byte: 62 */ 0x4f59,
-  /* 2nd byte: 63 */ 0x4e0e,
-  /* 2nd byte: 64 */ 0x8a89,
-  /* 2nd byte: 65 */ 0x8f3f,
-  /* 2nd byte: 66 */ 0x9810,
-  /* 2nd byte: 67 */ 0x50ad,
-  /* 2nd byte: 68 */ 0x5e7c,
-  /* 2nd byte: 69 */ 0x5996,
-  /* 2nd byte: 70 */ 0x5bb9,
-  /* 2nd byte: 71 */ 0x5eb8,
-  /* 2nd byte: 72 */ 0x63da,
-  /* 2nd byte: 73 */ 0x63fa,
-  /* 2nd byte: 74 */ 0x64c1,
-  /* 2nd byte: 75 */ 0x66dc,
-  /* 2nd byte: 76 */ 0x694a,
-  /* 2nd byte: 77 */ 0x69d8,
-  /* 2nd byte: 78 */ 0x6d0b,
-  /* 2nd byte: 79 */ 0x6eb6,
-  /* 2nd byte: 80 */ 0x7194,
-  /* 2nd byte: 81 */ 0x7528,
-  /* 2nd byte: 82 */ 0x7aaf,
-  /* 2nd byte: 83 */ 0x7f8a,
-  /* 2nd byte: 84 */ 0x8000,
-  /* 2nd byte: 85 */ 0x8449,
-  /* 2nd byte: 86 */ 0x84c9,
-  /* 2nd byte: 87 */ 0x8981,
-  /* 2nd byte: 88 */ 0x8b21,
-  /* 2nd byte: 89 */ 0x8e0a,
-  /* 2nd byte: 90 */ 0x9065,
-  /* 2nd byte: 91 */ 0x967d,
-  /* 2nd byte: 92 */ 0x990a,
-  /* 2nd byte: 93 */ 0x617e,
-  /* 2nd byte: 94 */ 0x6291,
-  /* 2nd byte: 95 */ 0x6b32,
-  /* 2nd byte: 96 */ 0x6c83,
-  /* 2nd byte: 97 */ 0x6d74,
-  /* 2nd byte: 98 */ 0x7fcc,
-  /* 2nd byte: 99 */ 0x7ffc,
-  /* 2nd byte: 100 */ 0x6dc0,
-  /* 2nd byte: 101 */ 0x7f85,
-  /* 2nd byte: 102 */ 0x87ba,
-  /* 2nd byte: 103 */ 0x88f8,
-  /* 2nd byte: 104 */ 0x6765,
-  /* 2nd byte: 105 */ 0x83b1,
-  /* 2nd byte: 106 */ 0x983c,
-  /* 2nd byte: 107 */ 0x96f7,
-  /* 2nd byte: 108 */ 0x6d1b,
-  /* 2nd byte: 109 */ 0x7d61,
-  /* 2nd byte: 110 */ 0x843d,
-  /* 2nd byte: 111 */ 0x916a,
-  /* 2nd byte: 112 */ 0x4e71,
-  /* 2nd byte: 113 */ 0x5375,
-  /* 2nd byte: 114 */ 0x5d50,
-  /* 2nd byte: 115 */ 0x6b04,
-  /* 2nd byte: 116 */ 0x6feb,
-  /* 2nd byte: 117 */ 0x85cd,
-  /* 2nd byte: 118 */ 0x862d,
-  /* 2nd byte: 119 */ 0x89a7,
-  /* 2nd byte: 120 */ 0x5229,
-  /* 2nd byte: 121 */ 0x540f,
-  /* 2nd byte: 122 */ 0x5c65,
-  /* 2nd byte: 123 */ 0x674e,
-  /* 2nd byte: 124 */ 0x68a8,
-  /* 2nd byte: 125 */ 0x7406,
-  /* 2nd byte: 126 */ 0x7483},
-/* 1st byte: 78 */ { 
-  /* 2nd byte: 33 */ 0x75e2,
-  /* 2nd byte: 34 */ 0x88cf,
-  /* 2nd byte: 35 */ 0x88e1,
-  /* 2nd byte: 36 */ 0x91cc,
-  /* 2nd byte: 37 */ 0x96e2,
-  /* 2nd byte: 38 */ 0x9678,
-  /* 2nd byte: 39 */ 0x5f8b,
-  /* 2nd byte: 40 */ 0x7387,
-  /* 2nd byte: 41 */ 0x7acb,
-  /* 2nd byte: 42 */ 0x844e,
-  /* 2nd byte: 43 */ 0x63a0,
-  /* 2nd byte: 44 */ 0x7565,
-  /* 2nd byte: 45 */ 0x5289,
-  /* 2nd byte: 46 */ 0x6d41,
-  /* 2nd byte: 47 */ 0x6e9c,
-  /* 2nd byte: 48 */ 0x7409,
-  /* 2nd byte: 49 */ 0x7559,
-  /* 2nd byte: 50 */ 0x786b,
-  /* 2nd byte: 51 */ 0x7c92,
-  /* 2nd byte: 52 */ 0x9686,
-  /* 2nd byte: 53 */ 0x7adc,
-  /* 2nd byte: 54 */ 0x9f8d,
-  /* 2nd byte: 55 */ 0x4fb6,
-  /* 2nd byte: 56 */ 0x616e,
-  /* 2nd byte: 57 */ 0x65c5,
-  /* 2nd byte: 58 */ 0x865c,
-  /* 2nd byte: 59 */ 0x4e86,
-  /* 2nd byte: 60 */ 0x4eae,
-  /* 2nd byte: 61 */ 0x50da,
-  /* 2nd byte: 62 */ 0x4e21,
-  /* 2nd byte: 63 */ 0x51cc,
-  /* 2nd byte: 64 */ 0x5bee,
-  /* 2nd byte: 65 */ 0x6599,
-  /* 2nd byte: 66 */ 0x6881,
-  /* 2nd byte: 67 */ 0x6dbc,
-  /* 2nd byte: 68 */ 0x731f,
-  /* 2nd byte: 69 */ 0x7642,
-  /* 2nd byte: 70 */ 0x77ad,
-  /* 2nd byte: 71 */ 0x7a1c,
-  /* 2nd byte: 72 */ 0x7ce7,
-  /* 2nd byte: 73 */ 0x826f,
-  /* 2nd byte: 74 */ 0x8ad2,
-  /* 2nd byte: 75 */ 0x907c,
-  /* 2nd byte: 76 */ 0x91cf,
-  /* 2nd byte: 77 */ 0x9675,
-  /* 2nd byte: 78 */ 0x9818,
-  /* 2nd byte: 79 */ 0x529b,
-  /* 2nd byte: 80 */ 0x7dd1,
-  /* 2nd byte: 81 */ 0x502b,
-  /* 2nd byte: 82 */ 0x5398,
-  /* 2nd byte: 83 */ 0x6797,
-  /* 2nd byte: 84 */ 0x6dcb,
-  /* 2nd byte: 85 */ 0x71d0,
-  /* 2nd byte: 86 */ 0x7433,
-  /* 2nd byte: 87 */ 0x81e8,
-  /* 2nd byte: 88 */ 0x8f2a,
-  /* 2nd byte: 89 */ 0x96a3,
-  /* 2nd byte: 90 */ 0x9c57,
-  /* 2nd byte: 91 */ 0x9e9f,
-  /* 2nd byte: 92 */ 0x7460,
-  /* 2nd byte: 93 */ 0x5841,
-  /* 2nd byte: 94 */ 0x6d99,
-  /* 2nd byte: 95 */ 0x7d2f,
-  /* 2nd byte: 96 */ 0x985e,
-  /* 2nd byte: 97 */ 0x4ee4,
-  /* 2nd byte: 98 */ 0x4f36,
-  /* 2nd byte: 99 */ 0x4f8b,
-  /* 2nd byte: 100 */ 0x51b7,
-  /* 2nd byte: 101 */ 0x52b1,
-  /* 2nd byte: 102 */ 0x5dba,
-  /* 2nd byte: 103 */ 0x601c,
-  /* 2nd byte: 104 */ 0x73b2,
-  /* 2nd byte: 105 */ 0x793c,
-  /* 2nd byte: 106 */ 0x82d3,
-  /* 2nd byte: 107 */ 0x9234,
-  /* 2nd byte: 108 */ 0x96b7,
-  /* 2nd byte: 109 */ 0x96f6,
-  /* 2nd byte: 110 */ 0x970a,
-  /* 2nd byte: 111 */ 0x9e97,
-  /* 2nd byte: 112 */ 0x9f62,
-  /* 2nd byte: 113 */ 0x66a6,
-  /* 2nd byte: 114 */ 0x6b74,
-  /* 2nd byte: 115 */ 0x5217,
-  /* 2nd byte: 116 */ 0x52a3,
-  /* 2nd byte: 117 */ 0x70c8,
-  /* 2nd byte: 118 */ 0x88c2,
-  /* 2nd byte: 119 */ 0x5ec9,
-  /* 2nd byte: 120 */ 0x604b,
-  /* 2nd byte: 121 */ 0x6190,
-  /* 2nd byte: 122 */ 0x6f23,
-  /* 2nd byte: 123 */ 0x7149,
-  /* 2nd byte: 124 */ 0x7c3e,
-  /* 2nd byte: 125 */ 0x7df4,
-  /* 2nd byte: 126 */ 0x806f},
-/* 1st byte: 79 */ { 
-  /* 2nd byte: 33 */ 0x84ee,
-  /* 2nd byte: 34 */ 0x9023,
-  /* 2nd byte: 35 */ 0x932c,
-  /* 2nd byte: 36 */ 0x5442,
-  /* 2nd byte: 37 */ 0x9b6f,
-  /* 2nd byte: 38 */ 0x6ad3,
-  /* 2nd byte: 39 */ 0x7089,
-  /* 2nd byte: 40 */ 0x8cc2,
-  /* 2nd byte: 41 */ 0x8def,
-  /* 2nd byte: 42 */ 0x9732,
-  /* 2nd byte: 43 */ 0x52b4,
-  /* 2nd byte: 44 */ 0x5a41,
-  /* 2nd byte: 45 */ 0x5eca,
-  /* 2nd byte: 46 */ 0x5f04,
-  /* 2nd byte: 47 */ 0x6717,
-  /* 2nd byte: 48 */ 0x697c,
-  /* 2nd byte: 49 */ 0x6994,
-  /* 2nd byte: 50 */ 0x6d6a,
-  /* 2nd byte: 51 */ 0x6f0f,
-  /* 2nd byte: 52 */ 0x7262,
-  /* 2nd byte: 53 */ 0x72fc,
-  /* 2nd byte: 54 */ 0x7bed,
-  /* 2nd byte: 55 */ 0x8001,
-  /* 2nd byte: 56 */ 0x807e,
-  /* 2nd byte: 57 */ 0x874b,
-  /* 2nd byte: 58 */ 0x90ce,
-  /* 2nd byte: 59 */ 0x516d,
-  /* 2nd byte: 60 */ 0x9e93,
-  /* 2nd byte: 61 */ 0x7984,
-  /* 2nd byte: 62 */ 0x808b,
-  /* 2nd byte: 63 */ 0x9332,
-  /* 2nd byte: 64 */ 0x8ad6,
-  /* 2nd byte: 65 */ 0x502d,
-  /* 2nd byte: 66 */ 0x548c,
-  /* 2nd byte: 67 */ 0x8a71,
-  /* 2nd byte: 68 */ 0x6b6a,
-  /* 2nd byte: 69 */ 0x8cc4,
-  /* 2nd byte: 70 */ 0x8107,
-  /* 2nd byte: 71 */ 0x60d1,
-  /* 2nd byte: 72 */ 0x67a0,
-  /* 2nd byte: 73 */ 0x9df2,
-  /* 2nd byte: 74 */ 0x4e99,
-  /* 2nd byte: 75 */ 0x4e98,
-  /* 2nd byte: 76 */ 0x9c10,
-  /* 2nd byte: 77 */ 0x8a6b,
-  /* 2nd byte: 78 */ 0x85c1,
-  /* 2nd byte: 79 */ 0x8568,
-  /* 2nd byte: 80 */ 0x6900,
-  /* 2nd byte: 81 */ 0x6e7e,
-  /* 2nd byte: 82 */ 0x7897,
-  /* 2nd byte: 83 */ 0x8155,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 80 */ { 
-  /* 2nd byte: 33 */ 0x5f0c,
-  /* 2nd byte: 34 */ 0x4e10,
-  /* 2nd byte: 35 */ 0x4e15,
-  /* 2nd byte: 36 */ 0x4e2a,
-  /* 2nd byte: 37 */ 0x4e31,
-  /* 2nd byte: 38 */ 0x4e36,
-  /* 2nd byte: 39 */ 0x4e3c,
-  /* 2nd byte: 40 */ 0x4e3f,
-  /* 2nd byte: 41 */ 0x4e42,
-  /* 2nd byte: 42 */ 0x4e56,
-  /* 2nd byte: 43 */ 0x4e58,
-  /* 2nd byte: 44 */ 0x4e82,
-  /* 2nd byte: 45 */ 0x4e85,
-  /* 2nd byte: 46 */ 0x8c6b,
-  /* 2nd byte: 47 */ 0x4e8a,
-  /* 2nd byte: 48 */ 0x8212,
-  /* 2nd byte: 49 */ 0x5f0d,
-  /* 2nd byte: 50 */ 0x4e8e,
-  /* 2nd byte: 51 */ 0x4e9e,
-  /* 2nd byte: 52 */ 0x4e9f,
-  /* 2nd byte: 53 */ 0x4ea0,
-  /* 2nd byte: 54 */ 0x4ea2,
-  /* 2nd byte: 55 */ 0x4eb0,
-  /* 2nd byte: 56 */ 0x4eb3,
-  /* 2nd byte: 57 */ 0x4eb6,
-  /* 2nd byte: 58 */ 0x4ece,
-  /* 2nd byte: 59 */ 0x4ecd,
-  /* 2nd byte: 60 */ 0x4ec4,
-  /* 2nd byte: 61 */ 0x4ec6,
-  /* 2nd byte: 62 */ 0x4ec2,
-  /* 2nd byte: 63 */ 0x4ed7,
-  /* 2nd byte: 64 */ 0x4ede,
-  /* 2nd byte: 65 */ 0x4eed,
-  /* 2nd byte: 66 */ 0x4edf,
-  /* 2nd byte: 67 */ 0x4ef7,
-  /* 2nd byte: 68 */ 0x4f09,
-  /* 2nd byte: 69 */ 0x4f5a,
-  /* 2nd byte: 70 */ 0x4f30,
-  /* 2nd byte: 71 */ 0x4f5b,
-  /* 2nd byte: 72 */ 0x4f5d,
-  /* 2nd byte: 73 */ 0x4f57,
-  /* 2nd byte: 74 */ 0x4f47,
-  /* 2nd byte: 75 */ 0x4f76,
-  /* 2nd byte: 76 */ 0x4f88,
-  /* 2nd byte: 77 */ 0x4f8f,
-  /* 2nd byte: 78 */ 0x4f98,
-  /* 2nd byte: 79 */ 0x4f7b,
-  /* 2nd byte: 80 */ 0x4f69,
-  /* 2nd byte: 81 */ 0x4f70,
-  /* 2nd byte: 82 */ 0x4f91,
-  /* 2nd byte: 83 */ 0x4f6f,
-  /* 2nd byte: 84 */ 0x4f86,
-  /* 2nd byte: 85 */ 0x4f96,
-  /* 2nd byte: 86 */ 0x5118,
-  /* 2nd byte: 87 */ 0x4fd4,
-  /* 2nd byte: 88 */ 0x4fdf,
-  /* 2nd byte: 89 */ 0x4fce,
-  /* 2nd byte: 90 */ 0x4fd8,
-  /* 2nd byte: 91 */ 0x4fdb,
-  /* 2nd byte: 92 */ 0x4fd1,
-  /* 2nd byte: 93 */ 0x4fda,
-  /* 2nd byte: 94 */ 0x4fd0,
-  /* 2nd byte: 95 */ 0x4fe4,
-  /* 2nd byte: 96 */ 0x4fe5,
-  /* 2nd byte: 97 */ 0x501a,
-  /* 2nd byte: 98 */ 0x5028,
-  /* 2nd byte: 99 */ 0x5014,
-  /* 2nd byte: 100 */ 0x502a,
-  /* 2nd byte: 101 */ 0x5025,
-  /* 2nd byte: 102 */ 0x5005,
-  /* 2nd byte: 103 */ 0x4f1c,
-  /* 2nd byte: 104 */ 0x4ff6,
-  /* 2nd byte: 105 */ 0x5021,
-  /* 2nd byte: 106 */ 0x5029,
-  /* 2nd byte: 107 */ 0x502c,
-  /* 2nd byte: 108 */ 0x4ffe,
-  /* 2nd byte: 109 */ 0x4fef,
-  /* 2nd byte: 110 */ 0x5011,
-  /* 2nd byte: 111 */ 0x5006,
-  /* 2nd byte: 112 */ 0x5043,
-  /* 2nd byte: 113 */ 0x5047,
-  /* 2nd byte: 114 */ 0x6703,
-  /* 2nd byte: 115 */ 0x5055,
-  /* 2nd byte: 116 */ 0x5050,
-  /* 2nd byte: 117 */ 0x5048,
-  /* 2nd byte: 118 */ 0x505a,
-  /* 2nd byte: 119 */ 0x5056,
-  /* 2nd byte: 120 */ 0x506c,
-  /* 2nd byte: 121 */ 0x5078,
-  /* 2nd byte: 122 */ 0x5080,
-  /* 2nd byte: 123 */ 0x509a,
-  /* 2nd byte: 124 */ 0x5085,
-  /* 2nd byte: 125 */ 0x50b4,
-  /* 2nd byte: 126 */ 0x50b2},
-/* 1st byte: 81 */ { 
-  /* 2nd byte: 33 */ 0x50c9,
-  /* 2nd byte: 34 */ 0x50ca,
-  /* 2nd byte: 35 */ 0x50b3,
-  /* 2nd byte: 36 */ 0x50c2,
-  /* 2nd byte: 37 */ 0x50d6,
-  /* 2nd byte: 38 */ 0x50de,
-  /* 2nd byte: 39 */ 0x50e5,
-  /* 2nd byte: 40 */ 0x50ed,
-  /* 2nd byte: 41 */ 0x50e3,
-  /* 2nd byte: 42 */ 0x50ee,
-  /* 2nd byte: 43 */ 0x50f9,
-  /* 2nd byte: 44 */ 0x50f5,
-  /* 2nd byte: 45 */ 0x5109,
-  /* 2nd byte: 46 */ 0x5101,
-  /* 2nd byte: 47 */ 0x5102,
-  /* 2nd byte: 48 */ 0x5116,
-  /* 2nd byte: 49 */ 0x5115,
-  /* 2nd byte: 50 */ 0x5114,
-  /* 2nd byte: 51 */ 0x511a,
-  /* 2nd byte: 52 */ 0x5121,
-  /* 2nd byte: 53 */ 0x513a,
-  /* 2nd byte: 54 */ 0x5137,
-  /* 2nd byte: 55 */ 0x513c,
-  /* 2nd byte: 56 */ 0x513b,
-  /* 2nd byte: 57 */ 0x513f,
-  /* 2nd byte: 58 */ 0x5140,
-  /* 2nd byte: 59 */ 0x5152,
-  /* 2nd byte: 60 */ 0x514c,
-  /* 2nd byte: 61 */ 0x5154,
-  /* 2nd byte: 62 */ 0x5162,
-  /* 2nd byte: 63 */ 0x7af8,
-  /* 2nd byte: 64 */ 0x5169,
-  /* 2nd byte: 65 */ 0x516a,
-  /* 2nd byte: 66 */ 0x516e,
-  /* 2nd byte: 67 */ 0x5180,
-  /* 2nd byte: 68 */ 0x5182,
-  /* 2nd byte: 69 */ 0x56d8,
-  /* 2nd byte: 70 */ 0x518c,
-  /* 2nd byte: 71 */ 0x5189,
-  /* 2nd byte: 72 */ 0x518f,
-  /* 2nd byte: 73 */ 0x5191,
-  /* 2nd byte: 74 */ 0x5193,
-  /* 2nd byte: 75 */ 0x5195,
-  /* 2nd byte: 76 */ 0x5196,
-  /* 2nd byte: 77 */ 0x51a4,
-  /* 2nd byte: 78 */ 0x51a6,
-  /* 2nd byte: 79 */ 0x51a2,
-  /* 2nd byte: 80 */ 0x51a9,
-  /* 2nd byte: 81 */ 0x51aa,
-  /* 2nd byte: 82 */ 0x51ab,
-  /* 2nd byte: 83 */ 0x51b3,
-  /* 2nd byte: 84 */ 0x51b1,
-  /* 2nd byte: 85 */ 0x51b2,
-  /* 2nd byte: 86 */ 0x51b0,
-  /* 2nd byte: 87 */ 0x51b5,
-  /* 2nd byte: 88 */ 0x51bd,
-  /* 2nd byte: 89 */ 0x51c5,
-  /* 2nd byte: 90 */ 0x51c9,
-  /* 2nd byte: 91 */ 0x51db,
-  /* 2nd byte: 92 */ 0x51e0,
-  /* 2nd byte: 93 */ 0x8655,
-  /* 2nd byte: 94 */ 0x51e9,
-  /* 2nd byte: 95 */ 0x51ed,
-  /* 2nd byte: 96 */ 0x51f0,
-  /* 2nd byte: 97 */ 0x51f5,
-  /* 2nd byte: 98 */ 0x51fe,
-  /* 2nd byte: 99 */ 0x5204,
-  /* 2nd byte: 100 */ 0x520b,
-  /* 2nd byte: 101 */ 0x5214,
-  /* 2nd byte: 102 */ 0x520e,
-  /* 2nd byte: 103 */ 0x5227,
-  /* 2nd byte: 104 */ 0x522a,
-  /* 2nd byte: 105 */ 0x522e,
-  /* 2nd byte: 106 */ 0x5233,
-  /* 2nd byte: 107 */ 0x5239,
-  /* 2nd byte: 108 */ 0x524f,
-  /* 2nd byte: 109 */ 0x5244,
-  /* 2nd byte: 110 */ 0x524b,
-  /* 2nd byte: 111 */ 0x524c,
-  /* 2nd byte: 112 */ 0x525e,
-  /* 2nd byte: 113 */ 0x5254,
-  /* 2nd byte: 114 */ 0x526a,
-  /* 2nd byte: 115 */ 0x5274,
-  /* 2nd byte: 116 */ 0x5269,
-  /* 2nd byte: 117 */ 0x5273,
-  /* 2nd byte: 118 */ 0x527f,
-  /* 2nd byte: 119 */ 0x527d,
-  /* 2nd byte: 120 */ 0x528d,
-  /* 2nd byte: 121 */ 0x5294,
-  /* 2nd byte: 122 */ 0x5292,
-  /* 2nd byte: 123 */ 0x5271,
-  /* 2nd byte: 124 */ 0x5288,
-  /* 2nd byte: 125 */ 0x5291,
-  /* 2nd byte: 126 */ 0x8fa8},
-/* 1st byte: 82 */ { 
-  /* 2nd byte: 33 */ 0x8fa7,
-  /* 2nd byte: 34 */ 0x52ac,
-  /* 2nd byte: 35 */ 0x52ad,
-  /* 2nd byte: 36 */ 0x52bc,
-  /* 2nd byte: 37 */ 0x52b5,
-  /* 2nd byte: 38 */ 0x52c1,
-  /* 2nd byte: 39 */ 0x52cd,
-  /* 2nd byte: 40 */ 0x52d7,
-  /* 2nd byte: 41 */ 0x52de,
-  /* 2nd byte: 42 */ 0x52e3,
-  /* 2nd byte: 43 */ 0x52e6,
-  /* 2nd byte: 44 */ 0x98ed,
-  /* 2nd byte: 45 */ 0x52e0,
-  /* 2nd byte: 46 */ 0x52f3,
-  /* 2nd byte: 47 */ 0x52f5,
-  /* 2nd byte: 48 */ 0x52f8,
-  /* 2nd byte: 49 */ 0x52f9,
-  /* 2nd byte: 50 */ 0x5306,
-  /* 2nd byte: 51 */ 0x5308,
-  /* 2nd byte: 52 */ 0x7538,
-  /* 2nd byte: 53 */ 0x530d,
-  /* 2nd byte: 54 */ 0x5310,
-  /* 2nd byte: 55 */ 0x530f,
-  /* 2nd byte: 56 */ 0x5315,
-  /* 2nd byte: 57 */ 0x531a,
-  /* 2nd byte: 58 */ 0x5323,
-  /* 2nd byte: 59 */ 0x532f,
-  /* 2nd byte: 60 */ 0x5331,
-  /* 2nd byte: 61 */ 0x5333,
-  /* 2nd byte: 62 */ 0x5338,
-  /* 2nd byte: 63 */ 0x5340,
-  /* 2nd byte: 64 */ 0x5346,
-  /* 2nd byte: 65 */ 0x5345,
-  /* 2nd byte: 66 */ 0x4e17,
-  /* 2nd byte: 67 */ 0x5349,
-  /* 2nd byte: 68 */ 0x534d,
-  /* 2nd byte: 69 */ 0x51d6,
-  /* 2nd byte: 70 */ 0x535e,
-  /* 2nd byte: 71 */ 0x5369,
-  /* 2nd byte: 72 */ 0x536e,
-  /* 2nd byte: 73 */ 0x5918,
-  /* 2nd byte: 74 */ 0x537b,
-  /* 2nd byte: 75 */ 0x5377,
-  /* 2nd byte: 76 */ 0x5382,
-  /* 2nd byte: 77 */ 0x5396,
-  /* 2nd byte: 78 */ 0x53a0,
-  /* 2nd byte: 79 */ 0x53a6,
-  /* 2nd byte: 80 */ 0x53a5,
-  /* 2nd byte: 81 */ 0x53ae,
-  /* 2nd byte: 82 */ 0x53b0,
-  /* 2nd byte: 83 */ 0x53b6,
-  /* 2nd byte: 84 */ 0x53c3,
-  /* 2nd byte: 85 */ 0x7c12,
-  /* 2nd byte: 86 */ 0x96d9,
-  /* 2nd byte: 87 */ 0x53df,
-  /* 2nd byte: 88 */ 0x66fc,
-  /* 2nd byte: 89 */ 0x71ee,
-  /* 2nd byte: 90 */ 0x53ee,
-  /* 2nd byte: 91 */ 0x53e8,
-  /* 2nd byte: 92 */ 0x53ed,
-  /* 2nd byte: 93 */ 0x53fa,
-  /* 2nd byte: 94 */ 0x5401,
-  /* 2nd byte: 95 */ 0x543d,
-  /* 2nd byte: 96 */ 0x5440,
-  /* 2nd byte: 97 */ 0x542c,
-  /* 2nd byte: 98 */ 0x542d,
-  /* 2nd byte: 99 */ 0x543c,
-  /* 2nd byte: 100 */ 0x542e,
-  /* 2nd byte: 101 */ 0x5436,
-  /* 2nd byte: 102 */ 0x5429,
-  /* 2nd byte: 103 */ 0x541d,
-  /* 2nd byte: 104 */ 0x544e,
-  /* 2nd byte: 105 */ 0x548f,
-  /* 2nd byte: 106 */ 0x5475,
-  /* 2nd byte: 107 */ 0x548e,
-  /* 2nd byte: 108 */ 0x545f,
-  /* 2nd byte: 109 */ 0x5471,
-  /* 2nd byte: 110 */ 0x5477,
-  /* 2nd byte: 111 */ 0x5470,
-  /* 2nd byte: 112 */ 0x5492,
-  /* 2nd byte: 113 */ 0x547b,
-  /* 2nd byte: 114 */ 0x5480,
-  /* 2nd byte: 115 */ 0x5476,
-  /* 2nd byte: 116 */ 0x5484,
-  /* 2nd byte: 117 */ 0x5490,
-  /* 2nd byte: 118 */ 0x5486,
-  /* 2nd byte: 119 */ 0x54c7,
-  /* 2nd byte: 120 */ 0x54a2,
-  /* 2nd byte: 121 */ 0x54b8,
-  /* 2nd byte: 122 */ 0x54a5,
-  /* 2nd byte: 123 */ 0x54ac,
-  /* 2nd byte: 124 */ 0x54c4,
-  /* 2nd byte: 125 */ 0x54c8,
-  /* 2nd byte: 126 */ 0x54a8},
-/* 1st byte: 83 */ { 
-  /* 2nd byte: 33 */ 0x54ab,
-  /* 2nd byte: 34 */ 0x54c2,
-  /* 2nd byte: 35 */ 0x54a4,
-  /* 2nd byte: 36 */ 0x54be,
-  /* 2nd byte: 37 */ 0x54bc,
-  /* 2nd byte: 38 */ 0x54d8,
-  /* 2nd byte: 39 */ 0x54e5,
-  /* 2nd byte: 40 */ 0x54e6,
-  /* 2nd byte: 41 */ 0x550f,
-  /* 2nd byte: 42 */ 0x5514,
-  /* 2nd byte: 43 */ 0x54fd,
-  /* 2nd byte: 44 */ 0x54ee,
-  /* 2nd byte: 45 */ 0x54ed,
-  /* 2nd byte: 46 */ 0x54fa,
-  /* 2nd byte: 47 */ 0x54e2,
-  /* 2nd byte: 48 */ 0x5539,
-  /* 2nd byte: 49 */ 0x5540,
-  /* 2nd byte: 50 */ 0x5563,
-  /* 2nd byte: 51 */ 0x554c,
-  /* 2nd byte: 52 */ 0x552e,
-  /* 2nd byte: 53 */ 0x555c,
-  /* 2nd byte: 54 */ 0x5545,
-  /* 2nd byte: 55 */ 0x5556,
-  /* 2nd byte: 56 */ 0x5557,
-  /* 2nd byte: 57 */ 0x5538,
-  /* 2nd byte: 58 */ 0x5533,
-  /* 2nd byte: 59 */ 0x555d,
-  /* 2nd byte: 60 */ 0x5599,
-  /* 2nd byte: 61 */ 0x5580,
-  /* 2nd byte: 62 */ 0x54af,
-  /* 2nd byte: 63 */ 0x558a,
-  /* 2nd byte: 64 */ 0x559f,
-  /* 2nd byte: 65 */ 0x557b,
-  /* 2nd byte: 66 */ 0x557e,
-  /* 2nd byte: 67 */ 0x5598,
-  /* 2nd byte: 68 */ 0x559e,
-  /* 2nd byte: 69 */ 0x55ae,
-  /* 2nd byte: 70 */ 0x557c,
-  /* 2nd byte: 71 */ 0x5583,
-  /* 2nd byte: 72 */ 0x55a9,
-  /* 2nd byte: 73 */ 0x5587,
-  /* 2nd byte: 74 */ 0x55a8,
-  /* 2nd byte: 75 */ 0x55da,
-  /* 2nd byte: 76 */ 0x55c5,
-  /* 2nd byte: 77 */ 0x55df,
-  /* 2nd byte: 78 */ 0x55c4,
-  /* 2nd byte: 79 */ 0x55dc,
-  /* 2nd byte: 80 */ 0x55e4,
-  /* 2nd byte: 81 */ 0x55d4,
-  /* 2nd byte: 82 */ 0x5614,
-  /* 2nd byte: 83 */ 0x55f7,
-  /* 2nd byte: 84 */ 0x5616,
-  /* 2nd byte: 85 */ 0x55fe,
-  /* 2nd byte: 86 */ 0x55fd,
-  /* 2nd byte: 87 */ 0x561b,
-  /* 2nd byte: 88 */ 0x55f9,
-  /* 2nd byte: 89 */ 0x564e,
-  /* 2nd byte: 90 */ 0x5650,
-  /* 2nd byte: 91 */ 0x71df,
-  /* 2nd byte: 92 */ 0x5634,
-  /* 2nd byte: 93 */ 0x5636,
-  /* 2nd byte: 94 */ 0x5632,
-  /* 2nd byte: 95 */ 0x5638,
-  /* 2nd byte: 96 */ 0x566b,
-  /* 2nd byte: 97 */ 0x5664,
-  /* 2nd byte: 98 */ 0x562f,
-  /* 2nd byte: 99 */ 0x566c,
-  /* 2nd byte: 100 */ 0x566a,
-  /* 2nd byte: 101 */ 0x5686,
-  /* 2nd byte: 102 */ 0x5680,
-  /* 2nd byte: 103 */ 0x568a,
-  /* 2nd byte: 104 */ 0x56a0,
-  /* 2nd byte: 105 */ 0x5694,
-  /* 2nd byte: 106 */ 0x568f,
-  /* 2nd byte: 107 */ 0x56a5,
-  /* 2nd byte: 108 */ 0x56ae,
-  /* 2nd byte: 109 */ 0x56b6,
-  /* 2nd byte: 110 */ 0x56b4,
-  /* 2nd byte: 111 */ 0x56c2,
-  /* 2nd byte: 112 */ 0x56bc,
-  /* 2nd byte: 113 */ 0x56c1,
-  /* 2nd byte: 114 */ 0x56c3,
-  /* 2nd byte: 115 */ 0x56c0,
-  /* 2nd byte: 116 */ 0x56c8,
-  /* 2nd byte: 117 */ 0x56ce,
-  /* 2nd byte: 118 */ 0x56d1,
-  /* 2nd byte: 119 */ 0x56d3,
-  /* 2nd byte: 120 */ 0x56d7,
-  /* 2nd byte: 121 */ 0x56ee,
-  /* 2nd byte: 122 */ 0x56f9,
-  /* 2nd byte: 123 */ 0x5700,
-  /* 2nd byte: 124 */ 0x56ff,
-  /* 2nd byte: 125 */ 0x5704,
-  /* 2nd byte: 126 */ 0x5709},
-/* 1st byte: 84 */ { 
-  /* 2nd byte: 33 */ 0x5708,
-  /* 2nd byte: 34 */ 0x570b,
-  /* 2nd byte: 35 */ 0x570d,
-  /* 2nd byte: 36 */ 0x5713,
-  /* 2nd byte: 37 */ 0x5718,
-  /* 2nd byte: 38 */ 0x5716,
-  /* 2nd byte: 39 */ 0x55c7,
-  /* 2nd byte: 40 */ 0x571c,
-  /* 2nd byte: 41 */ 0x5726,
-  /* 2nd byte: 42 */ 0x5737,
-  /* 2nd byte: 43 */ 0x5738,
-  /* 2nd byte: 44 */ 0x574e,
-  /* 2nd byte: 45 */ 0x573b,
-  /* 2nd byte: 46 */ 0x5740,
-  /* 2nd byte: 47 */ 0x574f,
-  /* 2nd byte: 48 */ 0x5769,
-  /* 2nd byte: 49 */ 0x57c0,
-  /* 2nd byte: 50 */ 0x5788,
-  /* 2nd byte: 51 */ 0x5761,
-  /* 2nd byte: 52 */ 0x577f,
-  /* 2nd byte: 53 */ 0x5789,
-  /* 2nd byte: 54 */ 0x5793,
-  /* 2nd byte: 55 */ 0x57a0,
-  /* 2nd byte: 56 */ 0x57b3,
-  /* 2nd byte: 57 */ 0x57a4,
-  /* 2nd byte: 58 */ 0x57aa,
-  /* 2nd byte: 59 */ 0x57b0,
-  /* 2nd byte: 60 */ 0x57c3,
-  /* 2nd byte: 61 */ 0x57c6,
-  /* 2nd byte: 62 */ 0x57d4,
-  /* 2nd byte: 63 */ 0x57d2,
-  /* 2nd byte: 64 */ 0x57d3,
-  /* 2nd byte: 65 */ 0x580a,
-  /* 2nd byte: 66 */ 0x57d6,
-  /* 2nd byte: 67 */ 0x57e3,
-  /* 2nd byte: 68 */ 0x580b,
-  /* 2nd byte: 69 */ 0x5819,
-  /* 2nd byte: 70 */ 0x581d,
-  /* 2nd byte: 71 */ 0x5872,
-  /* 2nd byte: 72 */ 0x5821,
-  /* 2nd byte: 73 */ 0x5862,
-  /* 2nd byte: 74 */ 0x584b,
-  /* 2nd byte: 75 */ 0x5870,
-  /* 2nd byte: 76 */ 0x6bc0,
-  /* 2nd byte: 77 */ 0x5852,
-  /* 2nd byte: 78 */ 0x583d,
-  /* 2nd byte: 79 */ 0x5879,
-  /* 2nd byte: 80 */ 0x5885,
-  /* 2nd byte: 81 */ 0x58b9,
-  /* 2nd byte: 82 */ 0x589f,
-  /* 2nd byte: 83 */ 0x58ab,
-  /* 2nd byte: 84 */ 0x58ba,
-  /* 2nd byte: 85 */ 0x58de,
-  /* 2nd byte: 86 */ 0x58bb,
-  /* 2nd byte: 87 */ 0x58b8,
-  /* 2nd byte: 88 */ 0x58ae,
-  /* 2nd byte: 89 */ 0x58c5,
-  /* 2nd byte: 90 */ 0x58d3,
-  /* 2nd byte: 91 */ 0x58d1,
-  /* 2nd byte: 92 */ 0x58d7,
-  /* 2nd byte: 93 */ 0x58d9,
-  /* 2nd byte: 94 */ 0x58d8,
-  /* 2nd byte: 95 */ 0x58e5,
-  /* 2nd byte: 96 */ 0x58dc,
-  /* 2nd byte: 97 */ 0x58e4,
-  /* 2nd byte: 98 */ 0x58df,
-  /* 2nd byte: 99 */ 0x58ef,
-  /* 2nd byte: 100 */ 0x58fa,
-  /* 2nd byte: 101 */ 0x58f9,
-  /* 2nd byte: 102 */ 0x58fb,
-  /* 2nd byte: 103 */ 0x58fc,
-  /* 2nd byte: 104 */ 0x58fd,
-  /* 2nd byte: 105 */ 0x5902,
-  /* 2nd byte: 106 */ 0x590a,
-  /* 2nd byte: 107 */ 0x5910,
-  /* 2nd byte: 108 */ 0x591b,
-  /* 2nd byte: 109 */ 0x68a6,
-  /* 2nd byte: 110 */ 0x5925,
-  /* 2nd byte: 111 */ 0x592c,
-  /* 2nd byte: 112 */ 0x592d,
-  /* 2nd byte: 113 */ 0x5932,
-  /* 2nd byte: 114 */ 0x5938,
-  /* 2nd byte: 115 */ 0x593e,
-  /* 2nd byte: 116 */ 0x7ad2,
-  /* 2nd byte: 117 */ 0x5955,
-  /* 2nd byte: 118 */ 0x5950,
-  /* 2nd byte: 119 */ 0x594e,
-  /* 2nd byte: 120 */ 0x595a,
-  /* 2nd byte: 121 */ 0x5958,
-  /* 2nd byte: 122 */ 0x5962,
-  /* 2nd byte: 123 */ 0x5960,
-  /* 2nd byte: 124 */ 0x5967,
-  /* 2nd byte: 125 */ 0x596c,
-  /* 2nd byte: 126 */ 0x5969},
-/* 1st byte: 85 */ { 
-  /* 2nd byte: 33 */ 0x5978,
-  /* 2nd byte: 34 */ 0x5981,
-  /* 2nd byte: 35 */ 0x599d,
-  /* 2nd byte: 36 */ 0x4f5e,
-  /* 2nd byte: 37 */ 0x4fab,
-  /* 2nd byte: 38 */ 0x59a3,
-  /* 2nd byte: 39 */ 0x59b2,
-  /* 2nd byte: 40 */ 0x59c6,
-  /* 2nd byte: 41 */ 0x59e8,
-  /* 2nd byte: 42 */ 0x59dc,
-  /* 2nd byte: 43 */ 0x598d,
-  /* 2nd byte: 44 */ 0x59d9,
-  /* 2nd byte: 45 */ 0x59da,
-  /* 2nd byte: 46 */ 0x5a25,
-  /* 2nd byte: 47 */ 0x5a1f,
-  /* 2nd byte: 48 */ 0x5a11,
-  /* 2nd byte: 49 */ 0x5a1c,
-  /* 2nd byte: 50 */ 0x5a09,
-  /* 2nd byte: 51 */ 0x5a1a,
-  /* 2nd byte: 52 */ 0x5a40,
-  /* 2nd byte: 53 */ 0x5a6c,
-  /* 2nd byte: 54 */ 0x5a49,
-  /* 2nd byte: 55 */ 0x5a35,
-  /* 2nd byte: 56 */ 0x5a36,
-  /* 2nd byte: 57 */ 0x5a62,
-  /* 2nd byte: 58 */ 0x5a6a,
-  /* 2nd byte: 59 */ 0x5a9a,
-  /* 2nd byte: 60 */ 0x5abc,
-  /* 2nd byte: 61 */ 0x5abe,
-  /* 2nd byte: 62 */ 0x5acb,
-  /* 2nd byte: 63 */ 0x5ac2,
-  /* 2nd byte: 64 */ 0x5abd,
-  /* 2nd byte: 65 */ 0x5ae3,
-  /* 2nd byte: 66 */ 0x5ad7,
-  /* 2nd byte: 67 */ 0x5ae6,
-  /* 2nd byte: 68 */ 0x5ae9,
-  /* 2nd byte: 69 */ 0x5ad6,
-  /* 2nd byte: 70 */ 0x5afa,
-  /* 2nd byte: 71 */ 0x5afb,
-  /* 2nd byte: 72 */ 0x5b0c,
-  /* 2nd byte: 73 */ 0x5b0b,
-  /* 2nd byte: 74 */ 0x5b16,
-  /* 2nd byte: 75 */ 0x5b32,
-  /* 2nd byte: 76 */ 0x5ad0,
-  /* 2nd byte: 77 */ 0x5b2a,
-  /* 2nd byte: 78 */ 0x5b36,
-  /* 2nd byte: 79 */ 0x5b3e,
-  /* 2nd byte: 80 */ 0x5b43,
-  /* 2nd byte: 81 */ 0x5b45,
-  /* 2nd byte: 82 */ 0x5b40,
-  /* 2nd byte: 83 */ 0x5b51,
-  /* 2nd byte: 84 */ 0x5b55,
-  /* 2nd byte: 85 */ 0x5b5a,
-  /* 2nd byte: 86 */ 0x5b5b,
-  /* 2nd byte: 87 */ 0x5b65,
-  /* 2nd byte: 88 */ 0x5b69,
-  /* 2nd byte: 89 */ 0x5b70,
-  /* 2nd byte: 90 */ 0x5b73,
-  /* 2nd byte: 91 */ 0x5b75,
-  /* 2nd byte: 92 */ 0x5b78,
-  /* 2nd byte: 93 */ 0x6588,
-  /* 2nd byte: 94 */ 0x5b7a,
-  /* 2nd byte: 95 */ 0x5b80,
-  /* 2nd byte: 96 */ 0x5b83,
-  /* 2nd byte: 97 */ 0x5ba6,
-  /* 2nd byte: 98 */ 0x5bb8,
-  /* 2nd byte: 99 */ 0x5bc3,
-  /* 2nd byte: 100 */ 0x5bc7,
-  /* 2nd byte: 101 */ 0x5bc9,
-  /* 2nd byte: 102 */ 0x5bd4,
-  /* 2nd byte: 103 */ 0x5bd0,
-  /* 2nd byte: 104 */ 0x5be4,
-  /* 2nd byte: 105 */ 0x5be6,
-  /* 2nd byte: 106 */ 0x5be2,
-  /* 2nd byte: 107 */ 0x5bde,
-  /* 2nd byte: 108 */ 0x5be5,
-  /* 2nd byte: 109 */ 0x5beb,
-  /* 2nd byte: 110 */ 0x5bf0,
-  /* 2nd byte: 111 */ 0x5bf6,
-  /* 2nd byte: 112 */ 0x5bf3,
-  /* 2nd byte: 113 */ 0x5c05,
-  /* 2nd byte: 114 */ 0x5c07,
-  /* 2nd byte: 115 */ 0x5c08,
-  /* 2nd byte: 116 */ 0x5c0d,
-  /* 2nd byte: 117 */ 0x5c13,
-  /* 2nd byte: 118 */ 0x5c20,
-  /* 2nd byte: 119 */ 0x5c22,
-  /* 2nd byte: 120 */ 0x5c28,
-  /* 2nd byte: 121 */ 0x5c38,
-  /* 2nd byte: 122 */ 0x5c39,
-  /* 2nd byte: 123 */ 0x5c41,
-  /* 2nd byte: 124 */ 0x5c46,
-  /* 2nd byte: 125 */ 0x5c4e,
-  /* 2nd byte: 126 */ 0x5c53},
-/* 1st byte: 86 */ { 
-  /* 2nd byte: 33 */ 0x5c50,
-  /* 2nd byte: 34 */ 0x5c4f,
-  /* 2nd byte: 35 */ 0x5b71,
-  /* 2nd byte: 36 */ 0x5c6c,
-  /* 2nd byte: 37 */ 0x5c6e,
-  /* 2nd byte: 38 */ 0x4e62,
-  /* 2nd byte: 39 */ 0x5c76,
-  /* 2nd byte: 40 */ 0x5c79,
-  /* 2nd byte: 41 */ 0x5c8c,
-  /* 2nd byte: 42 */ 0x5c91,
-  /* 2nd byte: 43 */ 0x5c94,
-  /* 2nd byte: 44 */ 0x599b,
-  /* 2nd byte: 45 */ 0x5cab,
-  /* 2nd byte: 46 */ 0x5cbb,
-  /* 2nd byte: 47 */ 0x5cb6,
-  /* 2nd byte: 48 */ 0x5cbc,
-  /* 2nd byte: 49 */ 0x5cb7,
-  /* 2nd byte: 50 */ 0x5cc5,
-  /* 2nd byte: 51 */ 0x5cbe,
-  /* 2nd byte: 52 */ 0x5cc7,
-  /* 2nd byte: 53 */ 0x5cd9,
-  /* 2nd byte: 54 */ 0x5ce9,
-  /* 2nd byte: 55 */ 0x5cfd,
-  /* 2nd byte: 56 */ 0x5cfa,
-  /* 2nd byte: 57 */ 0x5ced,
-  /* 2nd byte: 58 */ 0x5d8c,
-  /* 2nd byte: 59 */ 0x5cea,
-  /* 2nd byte: 60 */ 0x5d0b,
-  /* 2nd byte: 61 */ 0x5d15,
-  /* 2nd byte: 62 */ 0x5d17,
-  /* 2nd byte: 63 */ 0x5d5c,
-  /* 2nd byte: 64 */ 0x5d1f,
-  /* 2nd byte: 65 */ 0x5d1b,
-  /* 2nd byte: 66 */ 0x5d11,
-  /* 2nd byte: 67 */ 0x5d14,
-  /* 2nd byte: 68 */ 0x5d22,
-  /* 2nd byte: 69 */ 0x5d1a,
-  /* 2nd byte: 70 */ 0x5d19,
-  /* 2nd byte: 71 */ 0x5d18,
-  /* 2nd byte: 72 */ 0x5d4c,
-  /* 2nd byte: 73 */ 0x5d52,
-  /* 2nd byte: 74 */ 0x5d4e,
-  /* 2nd byte: 75 */ 0x5d4b,
-  /* 2nd byte: 76 */ 0x5d6c,
-  /* 2nd byte: 77 */ 0x5d73,
-  /* 2nd byte: 78 */ 0x5d76,
-  /* 2nd byte: 79 */ 0x5d87,
-  /* 2nd byte: 80 */ 0x5d84,
-  /* 2nd byte: 81 */ 0x5d82,
-  /* 2nd byte: 82 */ 0x5da2,
-  /* 2nd byte: 83 */ 0x5d9d,
-  /* 2nd byte: 84 */ 0x5dac,
-  /* 2nd byte: 85 */ 0x5dae,
-  /* 2nd byte: 86 */ 0x5dbd,
-  /* 2nd byte: 87 */ 0x5d90,
-  /* 2nd byte: 88 */ 0x5db7,
-  /* 2nd byte: 89 */ 0x5dbc,
-  /* 2nd byte: 90 */ 0x5dc9,
-  /* 2nd byte: 91 */ 0x5dcd,
-  /* 2nd byte: 92 */ 0x5dd3,
-  /* 2nd byte: 93 */ 0x5dd2,
-  /* 2nd byte: 94 */ 0x5dd6,
-  /* 2nd byte: 95 */ 0x5ddb,
-  /* 2nd byte: 96 */ 0x5deb,
-  /* 2nd byte: 97 */ 0x5df2,
-  /* 2nd byte: 98 */ 0x5df5,
-  /* 2nd byte: 99 */ 0x5e0b,
-  /* 2nd byte: 100 */ 0x5e1a,
-  /* 2nd byte: 101 */ 0x5e19,
-  /* 2nd byte: 102 */ 0x5e11,
-  /* 2nd byte: 103 */ 0x5e1b,
-  /* 2nd byte: 104 */ 0x5e36,
-  /* 2nd byte: 105 */ 0x5e37,
-  /* 2nd byte: 106 */ 0x5e44,
-  /* 2nd byte: 107 */ 0x5e43,
-  /* 2nd byte: 108 */ 0x5e40,
-  /* 2nd byte: 109 */ 0x5e4e,
-  /* 2nd byte: 110 */ 0x5e57,
-  /* 2nd byte: 111 */ 0x5e54,
-  /* 2nd byte: 112 */ 0x5e5f,
-  /* 2nd byte: 113 */ 0x5e62,
-  /* 2nd byte: 114 */ 0x5e64,
-  /* 2nd byte: 115 */ 0x5e47,
-  /* 2nd byte: 116 */ 0x5e75,
-  /* 2nd byte: 117 */ 0x5e76,
-  /* 2nd byte: 118 */ 0x5e7a,
-  /* 2nd byte: 119 */ 0x9ebc,
-  /* 2nd byte: 120 */ 0x5e7f,
-  /* 2nd byte: 121 */ 0x5ea0,
-  /* 2nd byte: 122 */ 0x5ec1,
-  /* 2nd byte: 123 */ 0x5ec2,
-  /* 2nd byte: 124 */ 0x5ec8,
-  /* 2nd byte: 125 */ 0x5ed0,
-  /* 2nd byte: 126 */ 0x5ecf},
-/* 1st byte: 87 */ { 
-  /* 2nd byte: 33 */ 0x5ed6,
-  /* 2nd byte: 34 */ 0x5ee3,
-  /* 2nd byte: 35 */ 0x5edd,
-  /* 2nd byte: 36 */ 0x5eda,
-  /* 2nd byte: 37 */ 0x5edb,
-  /* 2nd byte: 38 */ 0x5ee2,
-  /* 2nd byte: 39 */ 0x5ee1,
-  /* 2nd byte: 40 */ 0x5ee8,
-  /* 2nd byte: 41 */ 0x5ee9,
-  /* 2nd byte: 42 */ 0x5eec,
-  /* 2nd byte: 43 */ 0x5ef1,
-  /* 2nd byte: 44 */ 0x5ef3,
-  /* 2nd byte: 45 */ 0x5ef0,
-  /* 2nd byte: 46 */ 0x5ef4,
-  /* 2nd byte: 47 */ 0x5ef8,
-  /* 2nd byte: 48 */ 0x5efe,
-  /* 2nd byte: 49 */ 0x5f03,
-  /* 2nd byte: 50 */ 0x5f09,
-  /* 2nd byte: 51 */ 0x5f5d,
-  /* 2nd byte: 52 */ 0x5f5c,
-  /* 2nd byte: 53 */ 0x5f0b,
-  /* 2nd byte: 54 */ 0x5f11,
-  /* 2nd byte: 55 */ 0x5f16,
-  /* 2nd byte: 56 */ 0x5f29,
-  /* 2nd byte: 57 */ 0x5f2d,
-  /* 2nd byte: 58 */ 0x5f38,
-  /* 2nd byte: 59 */ 0x5f41,
-  /* 2nd byte: 60 */ 0x5f48,
-  /* 2nd byte: 61 */ 0x5f4c,
-  /* 2nd byte: 62 */ 0x5f4e,
-  /* 2nd byte: 63 */ 0x5f2f,
-  /* 2nd byte: 64 */ 0x5f51,
-  /* 2nd byte: 65 */ 0x5f56,
-  /* 2nd byte: 66 */ 0x5f57,
-  /* 2nd byte: 67 */ 0x5f59,
-  /* 2nd byte: 68 */ 0x5f61,
-  /* 2nd byte: 69 */ 0x5f6d,
-  /* 2nd byte: 70 */ 0x5f73,
-  /* 2nd byte: 71 */ 0x5f77,
-  /* 2nd byte: 72 */ 0x5f83,
-  /* 2nd byte: 73 */ 0x5f82,
-  /* 2nd byte: 74 */ 0x5f7f,
-  /* 2nd byte: 75 */ 0x5f8a,
-  /* 2nd byte: 76 */ 0x5f88,
-  /* 2nd byte: 77 */ 0x5f91,
-  /* 2nd byte: 78 */ 0x5f87,
-  /* 2nd byte: 79 */ 0x5f9e,
-  /* 2nd byte: 80 */ 0x5f99,
-  /* 2nd byte: 81 */ 0x5f98,
-  /* 2nd byte: 82 */ 0x5fa0,
-  /* 2nd byte: 83 */ 0x5fa8,
-  /* 2nd byte: 84 */ 0x5fad,
-  /* 2nd byte: 85 */ 0x5fbc,
-  /* 2nd byte: 86 */ 0x5fd6,
-  /* 2nd byte: 87 */ 0x5ffb,
-  /* 2nd byte: 88 */ 0x5fe4,
-  /* 2nd byte: 89 */ 0x5ff8,
-  /* 2nd byte: 90 */ 0x5ff1,
-  /* 2nd byte: 91 */ 0x5fdd,
-  /* 2nd byte: 92 */ 0x60b3,
-  /* 2nd byte: 93 */ 0x5fff,
-  /* 2nd byte: 94 */ 0x6021,
-  /* 2nd byte: 95 */ 0x6060,
-  /* 2nd byte: 96 */ 0x6019,
-  /* 2nd byte: 97 */ 0x6010,
-  /* 2nd byte: 98 */ 0x6029,
-  /* 2nd byte: 99 */ 0x600e,
-  /* 2nd byte: 100 */ 0x6031,
-  /* 2nd byte: 101 */ 0x601b,
-  /* 2nd byte: 102 */ 0x6015,
-  /* 2nd byte: 103 */ 0x602b,
-  /* 2nd byte: 104 */ 0x6026,
-  /* 2nd byte: 105 */ 0x600f,
-  /* 2nd byte: 106 */ 0x603a,
-  /* 2nd byte: 107 */ 0x605a,
-  /* 2nd byte: 108 */ 0x6041,
-  /* 2nd byte: 109 */ 0x606a,
-  /* 2nd byte: 110 */ 0x6077,
-  /* 2nd byte: 111 */ 0x605f,
-  /* 2nd byte: 112 */ 0x604a,
-  /* 2nd byte: 113 */ 0x6046,
-  /* 2nd byte: 114 */ 0x604d,
-  /* 2nd byte: 115 */ 0x6063,
-  /* 2nd byte: 116 */ 0x6043,
-  /* 2nd byte: 117 */ 0x6064,
-  /* 2nd byte: 118 */ 0x6042,
-  /* 2nd byte: 119 */ 0x606c,
-  /* 2nd byte: 120 */ 0x606b,
-  /* 2nd byte: 121 */ 0x6059,
-  /* 2nd byte: 122 */ 0x6081,
-  /* 2nd byte: 123 */ 0x608d,
-  /* 2nd byte: 124 */ 0x60e7,
-  /* 2nd byte: 125 */ 0x6083,
-  /* 2nd byte: 126 */ 0x609a},
-/* 1st byte: 88 */ { 
-  /* 2nd byte: 33 */ 0x6084,
-  /* 2nd byte: 34 */ 0x609b,
-  /* 2nd byte: 35 */ 0x6096,
-  /* 2nd byte: 36 */ 0x6097,
-  /* 2nd byte: 37 */ 0x6092,
-  /* 2nd byte: 38 */ 0x60a7,
-  /* 2nd byte: 39 */ 0x608b,
-  /* 2nd byte: 40 */ 0x60e1,
-  /* 2nd byte: 41 */ 0x60b8,
-  /* 2nd byte: 42 */ 0x60e0,
-  /* 2nd byte: 43 */ 0x60d3,
-  /* 2nd byte: 44 */ 0x60b4,
-  /* 2nd byte: 45 */ 0x5ff0,
-  /* 2nd byte: 46 */ 0x60bd,
-  /* 2nd byte: 47 */ 0x60c6,
-  /* 2nd byte: 48 */ 0x60b5,
-  /* 2nd byte: 49 */ 0x60d8,
-  /* 2nd byte: 50 */ 0x614d,
-  /* 2nd byte: 51 */ 0x6115,
-  /* 2nd byte: 52 */ 0x6106,
-  /* 2nd byte: 53 */ 0x60f6,
-  /* 2nd byte: 54 */ 0x60f7,
-  /* 2nd byte: 55 */ 0x6100,
-  /* 2nd byte: 56 */ 0x60f4,
-  /* 2nd byte: 57 */ 0x60fa,
-  /* 2nd byte: 58 */ 0x6103,
-  /* 2nd byte: 59 */ 0x6121,
-  /* 2nd byte: 60 */ 0x60fb,
-  /* 2nd byte: 61 */ 0x60f1,
-  /* 2nd byte: 62 */ 0x610d,
-  /* 2nd byte: 63 */ 0x610e,
-  /* 2nd byte: 64 */ 0x6147,
-  /* 2nd byte: 65 */ 0x613e,
-  /* 2nd byte: 66 */ 0x6128,
-  /* 2nd byte: 67 */ 0x6127,
-  /* 2nd byte: 68 */ 0x614a,
-  /* 2nd byte: 69 */ 0x613f,
-  /* 2nd byte: 70 */ 0x613c,
-  /* 2nd byte: 71 */ 0x612c,
-  /* 2nd byte: 72 */ 0x6134,
-  /* 2nd byte: 73 */ 0x613d,
-  /* 2nd byte: 74 */ 0x6142,
-  /* 2nd byte: 75 */ 0x6144,
-  /* 2nd byte: 76 */ 0x6173,
-  /* 2nd byte: 77 */ 0x6177,
-  /* 2nd byte: 78 */ 0x6158,
-  /* 2nd byte: 79 */ 0x6159,
-  /* 2nd byte: 80 */ 0x615a,
-  /* 2nd byte: 81 */ 0x616b,
-  /* 2nd byte: 82 */ 0x6174,
-  /* 2nd byte: 83 */ 0x616f,
-  /* 2nd byte: 84 */ 0x6165,
-  /* 2nd byte: 85 */ 0x6171,
-  /* 2nd byte: 86 */ 0x615f,
-  /* 2nd byte: 87 */ 0x615d,
-  /* 2nd byte: 88 */ 0x6153,
-  /* 2nd byte: 89 */ 0x6175,
-  /* 2nd byte: 90 */ 0x6199,
-  /* 2nd byte: 91 */ 0x6196,
-  /* 2nd byte: 92 */ 0x6187,
-  /* 2nd byte: 93 */ 0x61ac,
-  /* 2nd byte: 94 */ 0x6194,
-  /* 2nd byte: 95 */ 0x619a,
-  /* 2nd byte: 96 */ 0x618a,
-  /* 2nd byte: 97 */ 0x6191,
-  /* 2nd byte: 98 */ 0x61ab,
-  /* 2nd byte: 99 */ 0x61ae,
-  /* 2nd byte: 100 */ 0x61cc,
-  /* 2nd byte: 101 */ 0x61ca,
-  /* 2nd byte: 102 */ 0x61c9,
-  /* 2nd byte: 103 */ 0x61f7,
-  /* 2nd byte: 104 */ 0x61c8,
-  /* 2nd byte: 105 */ 0x61c3,
-  /* 2nd byte: 106 */ 0x61c6,
-  /* 2nd byte: 107 */ 0x61ba,
-  /* 2nd byte: 108 */ 0x61cb,
-  /* 2nd byte: 109 */ 0x7f79,
-  /* 2nd byte: 110 */ 0x61cd,
-  /* 2nd byte: 111 */ 0x61e6,
-  /* 2nd byte: 112 */ 0x61e3,
-  /* 2nd byte: 113 */ 0x61f6,
-  /* 2nd byte: 114 */ 0x61fa,
-  /* 2nd byte: 115 */ 0x61f4,
-  /* 2nd byte: 116 */ 0x61ff,
-  /* 2nd byte: 117 */ 0x61fd,
-  /* 2nd byte: 118 */ 0x61fc,
-  /* 2nd byte: 119 */ 0x61fe,
-  /* 2nd byte: 120 */ 0x6200,
-  /* 2nd byte: 121 */ 0x6208,
-  /* 2nd byte: 122 */ 0x6209,
-  /* 2nd byte: 123 */ 0x620d,
-  /* 2nd byte: 124 */ 0x620c,
-  /* 2nd byte: 125 */ 0x6214,
-  /* 2nd byte: 126 */ 0x621b},
-/* 1st byte: 89 */ { 
-  /* 2nd byte: 33 */ 0x621e,
-  /* 2nd byte: 34 */ 0x6221,
-  /* 2nd byte: 35 */ 0x622a,
-  /* 2nd byte: 36 */ 0x622e,
-  /* 2nd byte: 37 */ 0x6230,
-  /* 2nd byte: 38 */ 0x6232,
-  /* 2nd byte: 39 */ 0x6233,
-  /* 2nd byte: 40 */ 0x6241,
-  /* 2nd byte: 41 */ 0x624e,
-  /* 2nd byte: 42 */ 0x625e,
-  /* 2nd byte: 43 */ 0x6263,
-  /* 2nd byte: 44 */ 0x625b,
-  /* 2nd byte: 45 */ 0x6260,
-  /* 2nd byte: 46 */ 0x6268,
-  /* 2nd byte: 47 */ 0x627c,
-  /* 2nd byte: 48 */ 0x6282,
-  /* 2nd byte: 49 */ 0x6289,
-  /* 2nd byte: 50 */ 0x627e,
-  /* 2nd byte: 51 */ 0x6292,
-  /* 2nd byte: 52 */ 0x6293,
-  /* 2nd byte: 53 */ 0x6296,
-  /* 2nd byte: 54 */ 0x62d4,
-  /* 2nd byte: 55 */ 0x6283,
-  /* 2nd byte: 56 */ 0x6294,
-  /* 2nd byte: 57 */ 0x62d7,
-  /* 2nd byte: 58 */ 0x62d1,
-  /* 2nd byte: 59 */ 0x62bb,
-  /* 2nd byte: 60 */ 0x62cf,
-  /* 2nd byte: 61 */ 0x62ff,
-  /* 2nd byte: 62 */ 0x62c6,
-  /* 2nd byte: 63 */ 0x64d4,
-  /* 2nd byte: 64 */ 0x62c8,
-  /* 2nd byte: 65 */ 0x62dc,
-  /* 2nd byte: 66 */ 0x62cc,
-  /* 2nd byte: 67 */ 0x62ca,
-  /* 2nd byte: 68 */ 0x62c2,
-  /* 2nd byte: 69 */ 0x62c7,
-  /* 2nd byte: 70 */ 0x629b,
-  /* 2nd byte: 71 */ 0x62c9,
-  /* 2nd byte: 72 */ 0x630c,
-  /* 2nd byte: 73 */ 0x62ee,
-  /* 2nd byte: 74 */ 0x62f1,
-  /* 2nd byte: 75 */ 0x6327,
-  /* 2nd byte: 76 */ 0x6302,
-  /* 2nd byte: 77 */ 0x6308,
-  /* 2nd byte: 78 */ 0x62ef,
-  /* 2nd byte: 79 */ 0x62f5,
-  /* 2nd byte: 80 */ 0x6350,
-  /* 2nd byte: 81 */ 0x633e,
-  /* 2nd byte: 82 */ 0x634d,
-  /* 2nd byte: 83 */ 0x641c,
-  /* 2nd byte: 84 */ 0x634f,
-  /* 2nd byte: 85 */ 0x6396,
-  /* 2nd byte: 86 */ 0x638e,
-  /* 2nd byte: 87 */ 0x6380,
-  /* 2nd byte: 88 */ 0x63ab,
-  /* 2nd byte: 89 */ 0x6376,
-  /* 2nd byte: 90 */ 0x63a3,
-  /* 2nd byte: 91 */ 0x638f,
-  /* 2nd byte: 92 */ 0x6389,
-  /* 2nd byte: 93 */ 0x639f,
-  /* 2nd byte: 94 */ 0x63b5,
-  /* 2nd byte: 95 */ 0x636b,
-  /* 2nd byte: 96 */ 0x6369,
-  /* 2nd byte: 97 */ 0x63be,
-  /* 2nd byte: 98 */ 0x63e9,
-  /* 2nd byte: 99 */ 0x63c0,
-  /* 2nd byte: 100 */ 0x63c6,
-  /* 2nd byte: 101 */ 0x63e3,
-  /* 2nd byte: 102 */ 0x63c9,
-  /* 2nd byte: 103 */ 0x63d2,
-  /* 2nd byte: 104 */ 0x63f6,
-  /* 2nd byte: 105 */ 0x63c4,
-  /* 2nd byte: 106 */ 0x6416,
-  /* 2nd byte: 107 */ 0x6434,
-  /* 2nd byte: 108 */ 0x6406,
-  /* 2nd byte: 109 */ 0x6413,
-  /* 2nd byte: 110 */ 0x6426,
-  /* 2nd byte: 111 */ 0x6436,
-  /* 2nd byte: 112 */ 0x651d,
-  /* 2nd byte: 113 */ 0x6417,
-  /* 2nd byte: 114 */ 0x6428,
-  /* 2nd byte: 115 */ 0x640f,
-  /* 2nd byte: 116 */ 0x6467,
-  /* 2nd byte: 117 */ 0x646f,
-  /* 2nd byte: 118 */ 0x6476,
-  /* 2nd byte: 119 */ 0x644e,
-  /* 2nd byte: 120 */ 0x652a,
-  /* 2nd byte: 121 */ 0x6495,
-  /* 2nd byte: 122 */ 0x6493,
-  /* 2nd byte: 123 */ 0x64a5,
-  /* 2nd byte: 124 */ 0x64a9,
-  /* 2nd byte: 125 */ 0x6488,
-  /* 2nd byte: 126 */ 0x64bc},
-/* 1st byte: 90 */ { 
-  /* 2nd byte: 33 */ 0x64da,
-  /* 2nd byte: 34 */ 0x64d2,
-  /* 2nd byte: 35 */ 0x64c5,
-  /* 2nd byte: 36 */ 0x64c7,
-  /* 2nd byte: 37 */ 0x64bb,
-  /* 2nd byte: 38 */ 0x64d8,
-  /* 2nd byte: 39 */ 0x64c2,
-  /* 2nd byte: 40 */ 0x64f1,
-  /* 2nd byte: 41 */ 0x64e7,
-  /* 2nd byte: 42 */ 0x8209,
-  /* 2nd byte: 43 */ 0x64e0,
-  /* 2nd byte: 44 */ 0x64e1,
-  /* 2nd byte: 45 */ 0x62ac,
-  /* 2nd byte: 46 */ 0x64e3,
-  /* 2nd byte: 47 */ 0x64ef,
-  /* 2nd byte: 48 */ 0x652c,
-  /* 2nd byte: 49 */ 0x64f6,
-  /* 2nd byte: 50 */ 0x64f4,
-  /* 2nd byte: 51 */ 0x64f2,
-  /* 2nd byte: 52 */ 0x64fa,
-  /* 2nd byte: 53 */ 0x6500,
-  /* 2nd byte: 54 */ 0x64fd,
-  /* 2nd byte: 55 */ 0x6518,
-  /* 2nd byte: 56 */ 0x651c,
-  /* 2nd byte: 57 */ 0x6505,
-  /* 2nd byte: 58 */ 0x6524,
-  /* 2nd byte: 59 */ 0x6523,
-  /* 2nd byte: 60 */ 0x652b,
-  /* 2nd byte: 61 */ 0x6534,
-  /* 2nd byte: 62 */ 0x6535,
-  /* 2nd byte: 63 */ 0x6537,
-  /* 2nd byte: 64 */ 0x6536,
-  /* 2nd byte: 65 */ 0x6538,
-  /* 2nd byte: 66 */ 0x754b,
-  /* 2nd byte: 67 */ 0x6548,
-  /* 2nd byte: 68 */ 0x6556,
-  /* 2nd byte: 69 */ 0x6555,
-  /* 2nd byte: 70 */ 0x654d,
-  /* 2nd byte: 71 */ 0x6558,
-  /* 2nd byte: 72 */ 0x655e,
-  /* 2nd byte: 73 */ 0x655d,
-  /* 2nd byte: 74 */ 0x6572,
-  /* 2nd byte: 75 */ 0x6578,
-  /* 2nd byte: 76 */ 0x6582,
-  /* 2nd byte: 77 */ 0x6583,
-  /* 2nd byte: 78 */ 0x8b8a,
-  /* 2nd byte: 79 */ 0x659b,
-  /* 2nd byte: 80 */ 0x659f,
-  /* 2nd byte: 81 */ 0x65ab,
-  /* 2nd byte: 82 */ 0x65b7,
-  /* 2nd byte: 83 */ 0x65c3,
-  /* 2nd byte: 84 */ 0x65c6,
-  /* 2nd byte: 85 */ 0x65c1,
-  /* 2nd byte: 86 */ 0x65c4,
-  /* 2nd byte: 87 */ 0x65cc,
-  /* 2nd byte: 88 */ 0x65d2,
-  /* 2nd byte: 89 */ 0x65db,
-  /* 2nd byte: 90 */ 0x65d9,
-  /* 2nd byte: 91 */ 0x65e0,
-  /* 2nd byte: 92 */ 0x65e1,
-  /* 2nd byte: 93 */ 0x65f1,
-  /* 2nd byte: 94 */ 0x6772,
-  /* 2nd byte: 95 */ 0x660a,
-  /* 2nd byte: 96 */ 0x6603,
-  /* 2nd byte: 97 */ 0x65fb,
-  /* 2nd byte: 98 */ 0x6773,
-  /* 2nd byte: 99 */ 0x6635,
-  /* 2nd byte: 100 */ 0x6636,
-  /* 2nd byte: 101 */ 0x6634,
-  /* 2nd byte: 102 */ 0x661c,
-  /* 2nd byte: 103 */ 0x664f,
-  /* 2nd byte: 104 */ 0x6644,
-  /* 2nd byte: 105 */ 0x6649,
-  /* 2nd byte: 106 */ 0x6641,
-  /* 2nd byte: 107 */ 0x665e,
-  /* 2nd byte: 108 */ 0x665d,
-  /* 2nd byte: 109 */ 0x6664,
-  /* 2nd byte: 110 */ 0x6667,
-  /* 2nd byte: 111 */ 0x6668,
-  /* 2nd byte: 112 */ 0x665f,
-  /* 2nd byte: 113 */ 0x6662,
-  /* 2nd byte: 114 */ 0x6670,
-  /* 2nd byte: 115 */ 0x6683,
-  /* 2nd byte: 116 */ 0x6688,
-  /* 2nd byte: 117 */ 0x668e,
-  /* 2nd byte: 118 */ 0x6689,
-  /* 2nd byte: 119 */ 0x6684,
-  /* 2nd byte: 120 */ 0x6698,
-  /* 2nd byte: 121 */ 0x669d,
-  /* 2nd byte: 122 */ 0x66c1,
-  /* 2nd byte: 123 */ 0x66b9,
-  /* 2nd byte: 124 */ 0x66c9,
-  /* 2nd byte: 125 */ 0x66be,
-  /* 2nd byte: 126 */ 0x66bc},
-/* 1st byte: 91 */ { 
-  /* 2nd byte: 33 */ 0x66c4,
-  /* 2nd byte: 34 */ 0x66b8,
-  /* 2nd byte: 35 */ 0x66d6,
-  /* 2nd byte: 36 */ 0x66da,
-  /* 2nd byte: 37 */ 0x66e0,
-  /* 2nd byte: 38 */ 0x663f,
-  /* 2nd byte: 39 */ 0x66e6,
-  /* 2nd byte: 40 */ 0x66e9,
-  /* 2nd byte: 41 */ 0x66f0,
-  /* 2nd byte: 42 */ 0x66f5,
-  /* 2nd byte: 43 */ 0x66f7,
-  /* 2nd byte: 44 */ 0x670f,
-  /* 2nd byte: 45 */ 0x6716,
-  /* 2nd byte: 46 */ 0x671e,
-  /* 2nd byte: 47 */ 0x6726,
-  /* 2nd byte: 48 */ 0x6727,
-  /* 2nd byte: 49 */ 0x9738,
-  /* 2nd byte: 50 */ 0x672e,
-  /* 2nd byte: 51 */ 0x673f,
-  /* 2nd byte: 52 */ 0x6736,
-  /* 2nd byte: 53 */ 0x6741,
-  /* 2nd byte: 54 */ 0x6738,
-  /* 2nd byte: 55 */ 0x6737,
-  /* 2nd byte: 56 */ 0x6746,
-  /* 2nd byte: 57 */ 0x675e,
-  /* 2nd byte: 58 */ 0x6760,
-  /* 2nd byte: 59 */ 0x6759,
-  /* 2nd byte: 60 */ 0x6763,
-  /* 2nd byte: 61 */ 0x6764,
-  /* 2nd byte: 62 */ 0x6789,
-  /* 2nd byte: 63 */ 0x6770,
-  /* 2nd byte: 64 */ 0x67a9,
-  /* 2nd byte: 65 */ 0x677c,
-  /* 2nd byte: 66 */ 0x676a,
-  /* 2nd byte: 67 */ 0x678c,
-  /* 2nd byte: 68 */ 0x678b,
-  /* 2nd byte: 69 */ 0x67a6,
-  /* 2nd byte: 70 */ 0x67a1,
-  /* 2nd byte: 71 */ 0x6785,
-  /* 2nd byte: 72 */ 0x67b7,
-  /* 2nd byte: 73 */ 0x67ef,
-  /* 2nd byte: 74 */ 0x67b4,
-  /* 2nd byte: 75 */ 0x67ec,
-  /* 2nd byte: 76 */ 0x67b3,
-  /* 2nd byte: 77 */ 0x67e9,
-  /* 2nd byte: 78 */ 0x67b8,
-  /* 2nd byte: 79 */ 0x67e4,
-  /* 2nd byte: 80 */ 0x67de,
-  /* 2nd byte: 81 */ 0x67dd,
-  /* 2nd byte: 82 */ 0x67e2,
-  /* 2nd byte: 83 */ 0x67ee,
-  /* 2nd byte: 84 */ 0x67b9,
-  /* 2nd byte: 85 */ 0x67ce,
-  /* 2nd byte: 86 */ 0x67c6,
-  /* 2nd byte: 87 */ 0x67e7,
-  /* 2nd byte: 88 */ 0x6a9c,
-  /* 2nd byte: 89 */ 0x681e,
-  /* 2nd byte: 90 */ 0x6846,
-  /* 2nd byte: 91 */ 0x6829,
-  /* 2nd byte: 92 */ 0x6840,
-  /* 2nd byte: 93 */ 0x684d,
-  /* 2nd byte: 94 */ 0x6832,
-  /* 2nd byte: 95 */ 0x684e,
-  /* 2nd byte: 96 */ 0x68b3,
-  /* 2nd byte: 97 */ 0x682b,
-  /* 2nd byte: 98 */ 0x6859,
-  /* 2nd byte: 99 */ 0x6863,
-  /* 2nd byte: 100 */ 0x6877,
-  /* 2nd byte: 101 */ 0x687f,
-  /* 2nd byte: 102 */ 0x689f,
-  /* 2nd byte: 103 */ 0x688f,
-  /* 2nd byte: 104 */ 0x68ad,
-  /* 2nd byte: 105 */ 0x6894,
-  /* 2nd byte: 106 */ 0x689d,
-  /* 2nd byte: 107 */ 0x689b,
-  /* 2nd byte: 108 */ 0x6883,
-  /* 2nd byte: 109 */ 0x6aae,
-  /* 2nd byte: 110 */ 0x68b9,
-  /* 2nd byte: 111 */ 0x6874,
-  /* 2nd byte: 112 */ 0x68b5,
-  /* 2nd byte: 113 */ 0x68a0,
-  /* 2nd byte: 114 */ 0x68ba,
-  /* 2nd byte: 115 */ 0x690f,
-  /* 2nd byte: 116 */ 0x688d,
-  /* 2nd byte: 117 */ 0x687e,
-  /* 2nd byte: 118 */ 0x6901,
-  /* 2nd byte: 119 */ 0x68ca,
-  /* 2nd byte: 120 */ 0x6908,
-  /* 2nd byte: 121 */ 0x68d8,
-  /* 2nd byte: 122 */ 0x6922,
-  /* 2nd byte: 123 */ 0x6926,
-  /* 2nd byte: 124 */ 0x68e1,
-  /* 2nd byte: 125 */ 0x690c,
-  /* 2nd byte: 126 */ 0x68cd},
-/* 1st byte: 92 */ { 
-  /* 2nd byte: 33 */ 0x68d4,
-  /* 2nd byte: 34 */ 0x68e7,
-  /* 2nd byte: 35 */ 0x68d5,
-  /* 2nd byte: 36 */ 0x6936,
-  /* 2nd byte: 37 */ 0x6912,
-  /* 2nd byte: 38 */ 0x6904,
-  /* 2nd byte: 39 */ 0x68d7,
-  /* 2nd byte: 40 */ 0x68e3,
-  /* 2nd byte: 41 */ 0x6925,
-  /* 2nd byte: 42 */ 0x68f9,
-  /* 2nd byte: 43 */ 0x68e0,
-  /* 2nd byte: 44 */ 0x68ef,
-  /* 2nd byte: 45 */ 0x6928,
-  /* 2nd byte: 46 */ 0x692a,
-  /* 2nd byte: 47 */ 0x691a,
-  /* 2nd byte: 48 */ 0x6923,
-  /* 2nd byte: 49 */ 0x6921,
-  /* 2nd byte: 50 */ 0x68c6,
-  /* 2nd byte: 51 */ 0x6979,
-  /* 2nd byte: 52 */ 0x6977,
-  /* 2nd byte: 53 */ 0x695c,
-  /* 2nd byte: 54 */ 0x6978,
-  /* 2nd byte: 55 */ 0x696b,
-  /* 2nd byte: 56 */ 0x6954,
-  /* 2nd byte: 57 */ 0x697e,
-  /* 2nd byte: 58 */ 0x696e,
-  /* 2nd byte: 59 */ 0x6939,
-  /* 2nd byte: 60 */ 0x6974,
-  /* 2nd byte: 61 */ 0x693d,
-  /* 2nd byte: 62 */ 0x6959,
-  /* 2nd byte: 63 */ 0x6930,
-  /* 2nd byte: 64 */ 0x6961,
-  /* 2nd byte: 65 */ 0x695e,
-  /* 2nd byte: 66 */ 0x695d,
-  /* 2nd byte: 67 */ 0x6981,
-  /* 2nd byte: 68 */ 0x696a,
-  /* 2nd byte: 69 */ 0x69b2,
-  /* 2nd byte: 70 */ 0x69ae,
-  /* 2nd byte: 71 */ 0x69d0,
-  /* 2nd byte: 72 */ 0x69bf,
-  /* 2nd byte: 73 */ 0x69c1,
-  /* 2nd byte: 74 */ 0x69d3,
-  /* 2nd byte: 75 */ 0x69be,
-  /* 2nd byte: 76 */ 0x69ce,
-  /* 2nd byte: 77 */ 0x5be8,
-  /* 2nd byte: 78 */ 0x69ca,
-  /* 2nd byte: 79 */ 0x69dd,
-  /* 2nd byte: 80 */ 0x69bb,
-  /* 2nd byte: 81 */ 0x69c3,
-  /* 2nd byte: 82 */ 0x69a7,
-  /* 2nd byte: 83 */ 0x6a2e,
-  /* 2nd byte: 84 */ 0x6991,
-  /* 2nd byte: 85 */ 0x69a0,
-  /* 2nd byte: 86 */ 0x699c,
-  /* 2nd byte: 87 */ 0x6995,
-  /* 2nd byte: 88 */ 0x69b4,
-  /* 2nd byte: 89 */ 0x69de,
-  /* 2nd byte: 90 */ 0x69e8,
-  /* 2nd byte: 91 */ 0x6a02,
-  /* 2nd byte: 92 */ 0x6a1b,
-  /* 2nd byte: 93 */ 0x69ff,
-  /* 2nd byte: 94 */ 0x6b0a,
-  /* 2nd byte: 95 */ 0x69f9,
-  /* 2nd byte: 96 */ 0x69f2,
-  /* 2nd byte: 97 */ 0x69e7,
-  /* 2nd byte: 98 */ 0x6a05,
-  /* 2nd byte: 99 */ 0x69b1,
-  /* 2nd byte: 100 */ 0x6a1e,
-  /* 2nd byte: 101 */ 0x69ed,
-  /* 2nd byte: 102 */ 0x6a14,
-  /* 2nd byte: 103 */ 0x69eb,
-  /* 2nd byte: 104 */ 0x6a0a,
-  /* 2nd byte: 105 */ 0x6a12,
-  /* 2nd byte: 106 */ 0x6ac1,
-  /* 2nd byte: 107 */ 0x6a23,
-  /* 2nd byte: 108 */ 0x6a13,
-  /* 2nd byte: 109 */ 0x6a44,
-  /* 2nd byte: 110 */ 0x6a0c,
-  /* 2nd byte: 111 */ 0x6a72,
-  /* 2nd byte: 112 */ 0x6a36,
-  /* 2nd byte: 113 */ 0x6a78,
-  /* 2nd byte: 114 */ 0x6a47,
-  /* 2nd byte: 115 */ 0x6a62,
-  /* 2nd byte: 116 */ 0x6a59,
-  /* 2nd byte: 117 */ 0x6a66,
-  /* 2nd byte: 118 */ 0x6a48,
-  /* 2nd byte: 119 */ 0x6a38,
-  /* 2nd byte: 120 */ 0x6a22,
-  /* 2nd byte: 121 */ 0x6a90,
-  /* 2nd byte: 122 */ 0x6a8d,
-  /* 2nd byte: 123 */ 0x6aa0,
-  /* 2nd byte: 124 */ 0x6a84,
-  /* 2nd byte: 125 */ 0x6aa2,
-  /* 2nd byte: 126 */ 0x6aa3},
-/* 1st byte: 93 */ { 
-  /* 2nd byte: 33 */ 0x6a97,
-  /* 2nd byte: 34 */ 0x8617,
-  /* 2nd byte: 35 */ 0x6abb,
-  /* 2nd byte: 36 */ 0x6ac3,
-  /* 2nd byte: 37 */ 0x6ac2,
-  /* 2nd byte: 38 */ 0x6ab8,
-  /* 2nd byte: 39 */ 0x6ab3,
-  /* 2nd byte: 40 */ 0x6aac,
-  /* 2nd byte: 41 */ 0x6ade,
-  /* 2nd byte: 42 */ 0x6ad1,
-  /* 2nd byte: 43 */ 0x6adf,
-  /* 2nd byte: 44 */ 0x6aaa,
-  /* 2nd byte: 45 */ 0x6ada,
-  /* 2nd byte: 46 */ 0x6aea,
-  /* 2nd byte: 47 */ 0x6afb,
-  /* 2nd byte: 48 */ 0x6b05,
-  /* 2nd byte: 49 */ 0x8616,
-  /* 2nd byte: 50 */ 0x6afa,
-  /* 2nd byte: 51 */ 0x6b12,
-  /* 2nd byte: 52 */ 0x6b16,
-  /* 2nd byte: 53 */ 0x9b31,
-  /* 2nd byte: 54 */ 0x6b1f,
-  /* 2nd byte: 55 */ 0x6b38,
-  /* 2nd byte: 56 */ 0x6b37,
-  /* 2nd byte: 57 */ 0x76dc,
-  /* 2nd byte: 58 */ 0x6b39,
-  /* 2nd byte: 59 */ 0x98ee,
-  /* 2nd byte: 60 */ 0x6b47,
-  /* 2nd byte: 61 */ 0x6b43,
-  /* 2nd byte: 62 */ 0x6b49,
-  /* 2nd byte: 63 */ 0x6b50,
-  /* 2nd byte: 64 */ 0x6b59,
-  /* 2nd byte: 65 */ 0x6b54,
-  /* 2nd byte: 66 */ 0x6b5b,
-  /* 2nd byte: 67 */ 0x6b5f,
-  /* 2nd byte: 68 */ 0x6b61,
-  /* 2nd byte: 69 */ 0x6b78,
-  /* 2nd byte: 70 */ 0x6b79,
-  /* 2nd byte: 71 */ 0x6b7f,
-  /* 2nd byte: 72 */ 0x6b80,
-  /* 2nd byte: 73 */ 0x6b84,
-  /* 2nd byte: 74 */ 0x6b83,
-  /* 2nd byte: 75 */ 0x6b8d,
-  /* 2nd byte: 76 */ 0x6b98,
-  /* 2nd byte: 77 */ 0x6b95,
-  /* 2nd byte: 78 */ 0x6b9e,
-  /* 2nd byte: 79 */ 0x6ba4,
-  /* 2nd byte: 80 */ 0x6baa,
-  /* 2nd byte: 81 */ 0x6bab,
-  /* 2nd byte: 82 */ 0x6baf,
-  /* 2nd byte: 83 */ 0x6bb2,
-  /* 2nd byte: 84 */ 0x6bb1,
-  /* 2nd byte: 85 */ 0x6bb3,
-  /* 2nd byte: 86 */ 0x6bb7,
-  /* 2nd byte: 87 */ 0x6bbc,
-  /* 2nd byte: 88 */ 0x6bc6,
-  /* 2nd byte: 89 */ 0x6bcb,
-  /* 2nd byte: 90 */ 0x6bd3,
-  /* 2nd byte: 91 */ 0x6bdf,
-  /* 2nd byte: 92 */ 0x6bec,
-  /* 2nd byte: 93 */ 0x6beb,
-  /* 2nd byte: 94 */ 0x6bf3,
-  /* 2nd byte: 95 */ 0x6bef,
-  /* 2nd byte: 96 */ 0x9ebe,
-  /* 2nd byte: 97 */ 0x6c08,
-  /* 2nd byte: 98 */ 0x6c13,
-  /* 2nd byte: 99 */ 0x6c14,
-  /* 2nd byte: 100 */ 0x6c1b,
-  /* 2nd byte: 101 */ 0x6c24,
-  /* 2nd byte: 102 */ 0x6c23,
-  /* 2nd byte: 103 */ 0x6c5e,
-  /* 2nd byte: 104 */ 0x6c55,
-  /* 2nd byte: 105 */ 0x6c62,
-  /* 2nd byte: 106 */ 0x6c6a,
-  /* 2nd byte: 107 */ 0x6c82,
-  /* 2nd byte: 108 */ 0x6c8d,
-  /* 2nd byte: 109 */ 0x6c9a,
-  /* 2nd byte: 110 */ 0x6c81,
-  /* 2nd byte: 111 */ 0x6c9b,
-  /* 2nd byte: 112 */ 0x6c7e,
-  /* 2nd byte: 113 */ 0x6c68,
-  /* 2nd byte: 114 */ 0x6c73,
-  /* 2nd byte: 115 */ 0x6c92,
-  /* 2nd byte: 116 */ 0x6c90,
-  /* 2nd byte: 117 */ 0x6cc4,
-  /* 2nd byte: 118 */ 0x6cf1,
-  /* 2nd byte: 119 */ 0x6cd3,
-  /* 2nd byte: 120 */ 0x6cbd,
-  /* 2nd byte: 121 */ 0x6cd7,
-  /* 2nd byte: 122 */ 0x6cc5,
-  /* 2nd byte: 123 */ 0x6cdd,
-  /* 2nd byte: 124 */ 0x6cae,
-  /* 2nd byte: 125 */ 0x6cb1,
-  /* 2nd byte: 126 */ 0x6cbe},
-/* 1st byte: 94 */ { 
-  /* 2nd byte: 33 */ 0x6cba,
-  /* 2nd byte: 34 */ 0x6cdb,
-  /* 2nd byte: 35 */ 0x6cef,
-  /* 2nd byte: 36 */ 0x6cd9,
-  /* 2nd byte: 37 */ 0x6cea,
-  /* 2nd byte: 38 */ 0x6d1f,
-  /* 2nd byte: 39 */ 0x884d,
-  /* 2nd byte: 40 */ 0x6d36,
-  /* 2nd byte: 41 */ 0x6d2b,
-  /* 2nd byte: 42 */ 0x6d3d,
-  /* 2nd byte: 43 */ 0x6d38,
-  /* 2nd byte: 44 */ 0x6d19,
-  /* 2nd byte: 45 */ 0x6d35,
-  /* 2nd byte: 46 */ 0x6d33,
-  /* 2nd byte: 47 */ 0x6d12,
-  /* 2nd byte: 48 */ 0x6d0c,
-  /* 2nd byte: 49 */ 0x6d63,
-  /* 2nd byte: 50 */ 0x6d93,
-  /* 2nd byte: 51 */ 0x6d64,
-  /* 2nd byte: 52 */ 0x6d5a,
-  /* 2nd byte: 53 */ 0x6d79,
-  /* 2nd byte: 54 */ 0x6d59,
-  /* 2nd byte: 55 */ 0x6d8e,
-  /* 2nd byte: 56 */ 0x6d95,
-  /* 2nd byte: 57 */ 0x6fe4,
-  /* 2nd byte: 58 */ 0x6d85,
-  /* 2nd byte: 59 */ 0x6df9,
-  /* 2nd byte: 60 */ 0x6e15,
-  /* 2nd byte: 61 */ 0x6e0a,
-  /* 2nd byte: 62 */ 0x6db5,
-  /* 2nd byte: 63 */ 0x6dc7,
-  /* 2nd byte: 64 */ 0x6de6,
-  /* 2nd byte: 65 */ 0x6db8,
-  /* 2nd byte: 66 */ 0x6dc6,
-  /* 2nd byte: 67 */ 0x6dec,
-  /* 2nd byte: 68 */ 0x6dde,
-  /* 2nd byte: 69 */ 0x6dcc,
-  /* 2nd byte: 70 */ 0x6de8,
-  /* 2nd byte: 71 */ 0x6dd2,
-  /* 2nd byte: 72 */ 0x6dc5,
-  /* 2nd byte: 73 */ 0x6dfa,
-  /* 2nd byte: 74 */ 0x6dd9,
-  /* 2nd byte: 75 */ 0x6de4,
-  /* 2nd byte: 76 */ 0x6dd5,
-  /* 2nd byte: 77 */ 0x6dea,
-  /* 2nd byte: 78 */ 0x6dee,
-  /* 2nd byte: 79 */ 0x6e2d,
-  /* 2nd byte: 80 */ 0x6e6e,
-  /* 2nd byte: 81 */ 0x6e2e,
-  /* 2nd byte: 82 */ 0x6e19,
-  /* 2nd byte: 83 */ 0x6e72,
-  /* 2nd byte: 84 */ 0x6e5f,
-  /* 2nd byte: 85 */ 0x6e3e,
-  /* 2nd byte: 86 */ 0x6e23,
-  /* 2nd byte: 87 */ 0x6e6b,
-  /* 2nd byte: 88 */ 0x6e2b,
-  /* 2nd byte: 89 */ 0x6e76,
-  /* 2nd byte: 90 */ 0x6e4d,
-  /* 2nd byte: 91 */ 0x6e1f,
-  /* 2nd byte: 92 */ 0x6e43,
-  /* 2nd byte: 93 */ 0x6e3a,
-  /* 2nd byte: 94 */ 0x6e4e,
-  /* 2nd byte: 95 */ 0x6e24,
-  /* 2nd byte: 96 */ 0x6eff,
-  /* 2nd byte: 97 */ 0x6e1d,
-  /* 2nd byte: 98 */ 0x6e38,
-  /* 2nd byte: 99 */ 0x6e82,
-  /* 2nd byte: 100 */ 0x6eaa,
-  /* 2nd byte: 101 */ 0x6e98,
-  /* 2nd byte: 102 */ 0x6ec9,
-  /* 2nd byte: 103 */ 0x6eb7,
-  /* 2nd byte: 104 */ 0x6ed3,
-  /* 2nd byte: 105 */ 0x6ebd,
-  /* 2nd byte: 106 */ 0x6eaf,
-  /* 2nd byte: 107 */ 0x6ec4,
-  /* 2nd byte: 108 */ 0x6eb2,
-  /* 2nd byte: 109 */ 0x6ed4,
-  /* 2nd byte: 110 */ 0x6ed5,
-  /* 2nd byte: 111 */ 0x6e8f,
-  /* 2nd byte: 112 */ 0x6ea5,
-  /* 2nd byte: 113 */ 0x6ec2,
-  /* 2nd byte: 114 */ 0x6e9f,
-  /* 2nd byte: 115 */ 0x6f41,
-  /* 2nd byte: 116 */ 0x6f11,
-  /* 2nd byte: 117 */ 0x704c,
-  /* 2nd byte: 118 */ 0x6eec,
-  /* 2nd byte: 119 */ 0x6ef8,
-  /* 2nd byte: 120 */ 0x6efe,
-  /* 2nd byte: 121 */ 0x6f3f,
-  /* 2nd byte: 122 */ 0x6ef2,
-  /* 2nd byte: 123 */ 0x6f31,
-  /* 2nd byte: 124 */ 0x6eef,
-  /* 2nd byte: 125 */ 0x6f32,
-  /* 2nd byte: 126 */ 0x6ecc},
-/* 1st byte: 95 */ { 
-  /* 2nd byte: 33 */ 0x6f3e,
-  /* 2nd byte: 34 */ 0x6f13,
-  /* 2nd byte: 35 */ 0x6ef7,
-  /* 2nd byte: 36 */ 0x6f86,
-  /* 2nd byte: 37 */ 0x6f7a,
-  /* 2nd byte: 38 */ 0x6f78,
-  /* 2nd byte: 39 */ 0x6f81,
-  /* 2nd byte: 40 */ 0x6f80,
-  /* 2nd byte: 41 */ 0x6f6f,
-  /* 2nd byte: 42 */ 0x6f5b,
-  /* 2nd byte: 43 */ 0x6ff3,
-  /* 2nd byte: 44 */ 0x6f6d,
-  /* 2nd byte: 45 */ 0x6f82,
-  /* 2nd byte: 46 */ 0x6f7c,
-  /* 2nd byte: 47 */ 0x6f58,
-  /* 2nd byte: 48 */ 0x6f8e,
-  /* 2nd byte: 49 */ 0x6f91,
-  /* 2nd byte: 50 */ 0x6fc2,
-  /* 2nd byte: 51 */ 0x6f66,
-  /* 2nd byte: 52 */ 0x6fb3,
-  /* 2nd byte: 53 */ 0x6fa3,
-  /* 2nd byte: 54 */ 0x6fa1,
-  /* 2nd byte: 55 */ 0x6fa4,
-  /* 2nd byte: 56 */ 0x6fb9,
-  /* 2nd byte: 57 */ 0x6fc6,
-  /* 2nd byte: 58 */ 0x6faa,
-  /* 2nd byte: 59 */ 0x6fdf,
-  /* 2nd byte: 60 */ 0x6fd5,
-  /* 2nd byte: 61 */ 0x6fec,
-  /* 2nd byte: 62 */ 0x6fd4,
-  /* 2nd byte: 63 */ 0x6fd8,
-  /* 2nd byte: 64 */ 0x6ff1,
-  /* 2nd byte: 65 */ 0x6fee,
-  /* 2nd byte: 66 */ 0x6fdb,
-  /* 2nd byte: 67 */ 0x7009,
-  /* 2nd byte: 68 */ 0x700b,
-  /* 2nd byte: 69 */ 0x6ffa,
-  /* 2nd byte: 70 */ 0x7011,
-  /* 2nd byte: 71 */ 0x7001,
-  /* 2nd byte: 72 */ 0x700f,
-  /* 2nd byte: 73 */ 0x6ffe,
-  /* 2nd byte: 74 */ 0x701b,
-  /* 2nd byte: 75 */ 0x701a,
-  /* 2nd byte: 76 */ 0x6f74,
-  /* 2nd byte: 77 */ 0x701d,
-  /* 2nd byte: 78 */ 0x7018,
-  /* 2nd byte: 79 */ 0x701f,
-  /* 2nd byte: 80 */ 0x7030,
-  /* 2nd byte: 81 */ 0x703e,
-  /* 2nd byte: 82 */ 0x7032,
-  /* 2nd byte: 83 */ 0x7051,
-  /* 2nd byte: 84 */ 0x7063,
-  /* 2nd byte: 85 */ 0x7099,
-  /* 2nd byte: 86 */ 0x7092,
-  /* 2nd byte: 87 */ 0x70af,
-  /* 2nd byte: 88 */ 0x70f1,
-  /* 2nd byte: 89 */ 0x70ac,
-  /* 2nd byte: 90 */ 0x70b8,
-  /* 2nd byte: 91 */ 0x70b3,
-  /* 2nd byte: 92 */ 0x70ae,
-  /* 2nd byte: 93 */ 0x70df,
-  /* 2nd byte: 94 */ 0x70cb,
-  /* 2nd byte: 95 */ 0x70dd,
-  /* 2nd byte: 96 */ 0x70d9,
-  /* 2nd byte: 97 */ 0x7109,
-  /* 2nd byte: 98 */ 0x70fd,
-  /* 2nd byte: 99 */ 0x711c,
-  /* 2nd byte: 100 */ 0x7119,
-  /* 2nd byte: 101 */ 0x7165,
-  /* 2nd byte: 102 */ 0x7155,
-  /* 2nd byte: 103 */ 0x7188,
-  /* 2nd byte: 104 */ 0x7166,
-  /* 2nd byte: 105 */ 0x7162,
-  /* 2nd byte: 106 */ 0x714c,
-  /* 2nd byte: 107 */ 0x7156,
-  /* 2nd byte: 108 */ 0x716c,
-  /* 2nd byte: 109 */ 0x718f,
-  /* 2nd byte: 110 */ 0x71fb,
-  /* 2nd byte: 111 */ 0x7184,
-  /* 2nd byte: 112 */ 0x7195,
-  /* 2nd byte: 113 */ 0x71a8,
-  /* 2nd byte: 114 */ 0x71ac,
-  /* 2nd byte: 115 */ 0x71d7,
-  /* 2nd byte: 116 */ 0x71b9,
-  /* 2nd byte: 117 */ 0x71be,
-  /* 2nd byte: 118 */ 0x71d2,
-  /* 2nd byte: 119 */ 0x71c9,
-  /* 2nd byte: 120 */ 0x71d4,
-  /* 2nd byte: 121 */ 0x71ce,
-  /* 2nd byte: 122 */ 0x71e0,
-  /* 2nd byte: 123 */ 0x71ec,
-  /* 2nd byte: 124 */ 0x71e7,
-  /* 2nd byte: 125 */ 0x71f5,
-  /* 2nd byte: 126 */ 0x71fc},
-/* 1st byte: 96 */ { 
-  /* 2nd byte: 33 */ 0x71f9,
-  /* 2nd byte: 34 */ 0x71ff,
-  /* 2nd byte: 35 */ 0x720d,
-  /* 2nd byte: 36 */ 0x7210,
-  /* 2nd byte: 37 */ 0x721b,
-  /* 2nd byte: 38 */ 0x7228,
-  /* 2nd byte: 39 */ 0x722d,
-  /* 2nd byte: 40 */ 0x722c,
-  /* 2nd byte: 41 */ 0x7230,
-  /* 2nd byte: 42 */ 0x7232,
-  /* 2nd byte: 43 */ 0x723b,
-  /* 2nd byte: 44 */ 0x723c,
-  /* 2nd byte: 45 */ 0x723f,
-  /* 2nd byte: 46 */ 0x7240,
-  /* 2nd byte: 47 */ 0x7246,
-  /* 2nd byte: 48 */ 0x724b,
-  /* 2nd byte: 49 */ 0x7258,
-  /* 2nd byte: 50 */ 0x7274,
-  /* 2nd byte: 51 */ 0x727e,
-  /* 2nd byte: 52 */ 0x7282,
-  /* 2nd byte: 53 */ 0x7281,
-  /* 2nd byte: 54 */ 0x7287,
-  /* 2nd byte: 55 */ 0x7292,
-  /* 2nd byte: 56 */ 0x7296,
-  /* 2nd byte: 57 */ 0x72a2,
-  /* 2nd byte: 58 */ 0x72a7,
-  /* 2nd byte: 59 */ 0x72b9,
-  /* 2nd byte: 60 */ 0x72b2,
-  /* 2nd byte: 61 */ 0x72c3,
-  /* 2nd byte: 62 */ 0x72c6,
-  /* 2nd byte: 63 */ 0x72c4,
-  /* 2nd byte: 64 */ 0x72ce,
-  /* 2nd byte: 65 */ 0x72d2,
-  /* 2nd byte: 66 */ 0x72e2,
-  /* 2nd byte: 67 */ 0x72e0,
-  /* 2nd byte: 68 */ 0x72e1,
-  /* 2nd byte: 69 */ 0x72f9,
-  /* 2nd byte: 70 */ 0x72f7,
-  /* 2nd byte: 71 */ 0x500f,
-  /* 2nd byte: 72 */ 0x7317,
-  /* 2nd byte: 73 */ 0x730a,
-  /* 2nd byte: 74 */ 0x731c,
-  /* 2nd byte: 75 */ 0x7316,
-  /* 2nd byte: 76 */ 0x731d,
-  /* 2nd byte: 77 */ 0x7334,
-  /* 2nd byte: 78 */ 0x732f,
-  /* 2nd byte: 79 */ 0x7329,
-  /* 2nd byte: 80 */ 0x7325,
-  /* 2nd byte: 81 */ 0x733e,
-  /* 2nd byte: 82 */ 0x734e,
-  /* 2nd byte: 83 */ 0x734f,
-  /* 2nd byte: 84 */ 0x9ed8,
-  /* 2nd byte: 85 */ 0x7357,
-  /* 2nd byte: 86 */ 0x736a,
-  /* 2nd byte: 87 */ 0x7368,
-  /* 2nd byte: 88 */ 0x7370,
-  /* 2nd byte: 89 */ 0x7378,
-  /* 2nd byte: 90 */ 0x7375,
-  /* 2nd byte: 91 */ 0x737b,
-  /* 2nd byte: 92 */ 0x737a,
-  /* 2nd byte: 93 */ 0x73c8,
-  /* 2nd byte: 94 */ 0x73b3,
-  /* 2nd byte: 95 */ 0x73ce,
-  /* 2nd byte: 96 */ 0x73bb,
-  /* 2nd byte: 97 */ 0x73c0,
-  /* 2nd byte: 98 */ 0x73e5,
-  /* 2nd byte: 99 */ 0x73ee,
-  /* 2nd byte: 100 */ 0x73de,
-  /* 2nd byte: 101 */ 0x74a2,
-  /* 2nd byte: 102 */ 0x7405,
-  /* 2nd byte: 103 */ 0x746f,
-  /* 2nd byte: 104 */ 0x7425,
-  /* 2nd byte: 105 */ 0x73f8,
-  /* 2nd byte: 106 */ 0x7432,
-  /* 2nd byte: 107 */ 0x743a,
-  /* 2nd byte: 108 */ 0x7455,
-  /* 2nd byte: 109 */ 0x743f,
-  /* 2nd byte: 110 */ 0x745f,
-  /* 2nd byte: 111 */ 0x7459,
-  /* 2nd byte: 112 */ 0x7441,
-  /* 2nd byte: 113 */ 0x745c,
-  /* 2nd byte: 114 */ 0x7469,
-  /* 2nd byte: 115 */ 0x7470,
-  /* 2nd byte: 116 */ 0x7463,
-  /* 2nd byte: 117 */ 0x746a,
-  /* 2nd byte: 118 */ 0x7476,
-  /* 2nd byte: 119 */ 0x747e,
-  /* 2nd byte: 120 */ 0x748b,
-  /* 2nd byte: 121 */ 0x749e,
-  /* 2nd byte: 122 */ 0x74a7,
-  /* 2nd byte: 123 */ 0x74ca,
-  /* 2nd byte: 124 */ 0x74cf,
-  /* 2nd byte: 125 */ 0x74d4,
-  /* 2nd byte: 126 */ 0x73f1},
-/* 1st byte: 97 */ { 
-  /* 2nd byte: 33 */ 0x74e0,
-  /* 2nd byte: 34 */ 0x74e3,
-  /* 2nd byte: 35 */ 0x74e7,
-  /* 2nd byte: 36 */ 0x74e9,
-  /* 2nd byte: 37 */ 0x74ee,
-  /* 2nd byte: 38 */ 0x74f2,
-  /* 2nd byte: 39 */ 0x74f0,
-  /* 2nd byte: 40 */ 0x74f1,
-  /* 2nd byte: 41 */ 0x74f8,
-  /* 2nd byte: 42 */ 0x74f7,
-  /* 2nd byte: 43 */ 0x7504,
-  /* 2nd byte: 44 */ 0x7503,
-  /* 2nd byte: 45 */ 0x7505,
-  /* 2nd byte: 46 */ 0x750c,
-  /* 2nd byte: 47 */ 0x750e,
-  /* 2nd byte: 48 */ 0x750d,
-  /* 2nd byte: 49 */ 0x7515,
-  /* 2nd byte: 50 */ 0x7513,
-  /* 2nd byte: 51 */ 0x751e,
-  /* 2nd byte: 52 */ 0x7526,
-  /* 2nd byte: 53 */ 0x752c,
-  /* 2nd byte: 54 */ 0x753c,
-  /* 2nd byte: 55 */ 0x7544,
-  /* 2nd byte: 56 */ 0x754d,
-  /* 2nd byte: 57 */ 0x754a,
-  /* 2nd byte: 58 */ 0x7549,
-  /* 2nd byte: 59 */ 0x755b,
-  /* 2nd byte: 60 */ 0x7546,
-  /* 2nd byte: 61 */ 0x755a,
-  /* 2nd byte: 62 */ 0x7569,
-  /* 2nd byte: 63 */ 0x7564,
-  /* 2nd byte: 64 */ 0x7567,
-  /* 2nd byte: 65 */ 0x756b,
-  /* 2nd byte: 66 */ 0x756d,
-  /* 2nd byte: 67 */ 0x7578,
-  /* 2nd byte: 68 */ 0x7576,
-  /* 2nd byte: 69 */ 0x7586,
-  /* 2nd byte: 70 */ 0x7587,
-  /* 2nd byte: 71 */ 0x7574,
-  /* 2nd byte: 72 */ 0x758a,
-  /* 2nd byte: 73 */ 0x7589,
-  /* 2nd byte: 74 */ 0x7582,
-  /* 2nd byte: 75 */ 0x7594,
-  /* 2nd byte: 76 */ 0x759a,
-  /* 2nd byte: 77 */ 0x759d,
-  /* 2nd byte: 78 */ 0x75a5,
-  /* 2nd byte: 79 */ 0x75a3,
-  /* 2nd byte: 80 */ 0x75c2,
-  /* 2nd byte: 81 */ 0x75b3,
-  /* 2nd byte: 82 */ 0x75c3,
-  /* 2nd byte: 83 */ 0x75b5,
-  /* 2nd byte: 84 */ 0x75bd,
-  /* 2nd byte: 85 */ 0x75b8,
-  /* 2nd byte: 86 */ 0x75bc,
-  /* 2nd byte: 87 */ 0x75b1,
-  /* 2nd byte: 88 */ 0x75cd,
-  /* 2nd byte: 89 */ 0x75ca,
-  /* 2nd byte: 90 */ 0x75d2,
-  /* 2nd byte: 91 */ 0x75d9,
-  /* 2nd byte: 92 */ 0x75e3,
-  /* 2nd byte: 93 */ 0x75de,
-  /* 2nd byte: 94 */ 0x75fe,
-  /* 2nd byte: 95 */ 0x75ff,
-  /* 2nd byte: 96 */ 0x75fc,
-  /* 2nd byte: 97 */ 0x7601,
-  /* 2nd byte: 98 */ 0x75f0,
-  /* 2nd byte: 99 */ 0x75fa,
-  /* 2nd byte: 100 */ 0x75f2,
-  /* 2nd byte: 101 */ 0x75f3,
-  /* 2nd byte: 102 */ 0x760b,
-  /* 2nd byte: 103 */ 0x760d,
-  /* 2nd byte: 104 */ 0x7609,
-  /* 2nd byte: 105 */ 0x761f,
-  /* 2nd byte: 106 */ 0x7627,
-  /* 2nd byte: 107 */ 0x7620,
-  /* 2nd byte: 108 */ 0x7621,
-  /* 2nd byte: 109 */ 0x7622,
-  /* 2nd byte: 110 */ 0x7624,
-  /* 2nd byte: 111 */ 0x7634,
-  /* 2nd byte: 112 */ 0x7630,
-  /* 2nd byte: 113 */ 0x763b,
-  /* 2nd byte: 114 */ 0x7647,
-  /* 2nd byte: 115 */ 0x7648,
-  /* 2nd byte: 116 */ 0x7646,
-  /* 2nd byte: 117 */ 0x765c,
-  /* 2nd byte: 118 */ 0x7658,
-  /* 2nd byte: 119 */ 0x7661,
-  /* 2nd byte: 120 */ 0x7662,
-  /* 2nd byte: 121 */ 0x7668,
-  /* 2nd byte: 122 */ 0x7669,
-  /* 2nd byte: 123 */ 0x766a,
-  /* 2nd byte: 124 */ 0x7667,
-  /* 2nd byte: 125 */ 0x766c,
-  /* 2nd byte: 126 */ 0x7670},
-/* 1st byte: 98 */ { 
-  /* 2nd byte: 33 */ 0x7672,
-  /* 2nd byte: 34 */ 0x7676,
-  /* 2nd byte: 35 */ 0x7678,
-  /* 2nd byte: 36 */ 0x767c,
-  /* 2nd byte: 37 */ 0x7680,
-  /* 2nd byte: 38 */ 0x7683,
-  /* 2nd byte: 39 */ 0x7688,
-  /* 2nd byte: 40 */ 0x768b,
-  /* 2nd byte: 41 */ 0x768e,
-  /* 2nd byte: 42 */ 0x7696,
-  /* 2nd byte: 43 */ 0x7693,
-  /* 2nd byte: 44 */ 0x7699,
-  /* 2nd byte: 45 */ 0x769a,
-  /* 2nd byte: 46 */ 0x76b0,
-  /* 2nd byte: 47 */ 0x76b4,
-  /* 2nd byte: 48 */ 0x76b8,
-  /* 2nd byte: 49 */ 0x76b9,
-  /* 2nd byte: 50 */ 0x76ba,
-  /* 2nd byte: 51 */ 0x76c2,
-  /* 2nd byte: 52 */ 0x76cd,
-  /* 2nd byte: 53 */ 0x76d6,
-  /* 2nd byte: 54 */ 0x76d2,
-  /* 2nd byte: 55 */ 0x76de,
-  /* 2nd byte: 56 */ 0x76e1,
-  /* 2nd byte: 57 */ 0x76e5,
-  /* 2nd byte: 58 */ 0x76e7,
-  /* 2nd byte: 59 */ 0x76ea,
-  /* 2nd byte: 60 */ 0x862f,
-  /* 2nd byte: 61 */ 0x76fb,
-  /* 2nd byte: 62 */ 0x7708,
-  /* 2nd byte: 63 */ 0x7707,
-  /* 2nd byte: 64 */ 0x7704,
-  /* 2nd byte: 65 */ 0x7729,
-  /* 2nd byte: 66 */ 0x7724,
-  /* 2nd byte: 67 */ 0x771e,
-  /* 2nd byte: 68 */ 0x7725,
-  /* 2nd byte: 69 */ 0x7726,
-  /* 2nd byte: 70 */ 0x771b,
-  /* 2nd byte: 71 */ 0x7737,
-  /* 2nd byte: 72 */ 0x7738,
-  /* 2nd byte: 73 */ 0x7747,
-  /* 2nd byte: 74 */ 0x775a,
-  /* 2nd byte: 75 */ 0x7768,
-  /* 2nd byte: 76 */ 0x776b,
-  /* 2nd byte: 77 */ 0x775b,
-  /* 2nd byte: 78 */ 0x7765,
-  /* 2nd byte: 79 */ 0x777f,
-  /* 2nd byte: 80 */ 0x777e,
-  /* 2nd byte: 81 */ 0x7779,
-  /* 2nd byte: 82 */ 0x778e,
-  /* 2nd byte: 83 */ 0x778b,
-  /* 2nd byte: 84 */ 0x7791,
-  /* 2nd byte: 85 */ 0x77a0,
-  /* 2nd byte: 86 */ 0x779e,
-  /* 2nd byte: 87 */ 0x77b0,
-  /* 2nd byte: 88 */ 0x77b6,
-  /* 2nd byte: 89 */ 0x77b9,
-  /* 2nd byte: 90 */ 0x77bf,
-  /* 2nd byte: 91 */ 0x77bc,
-  /* 2nd byte: 92 */ 0x77bd,
-  /* 2nd byte: 93 */ 0x77bb,
-  /* 2nd byte: 94 */ 0x77c7,
-  /* 2nd byte: 95 */ 0x77cd,
-  /* 2nd byte: 96 */ 0x77d7,
-  /* 2nd byte: 97 */ 0x77da,
-  /* 2nd byte: 98 */ 0x77dc,
-  /* 2nd byte: 99 */ 0x77e3,
-  /* 2nd byte: 100 */ 0x77ee,
-  /* 2nd byte: 101 */ 0x77fc,
-  /* 2nd byte: 102 */ 0x780c,
-  /* 2nd byte: 103 */ 0x7812,
-  /* 2nd byte: 104 */ 0x7926,
-  /* 2nd byte: 105 */ 0x7820,
-  /* 2nd byte: 106 */ 0x792a,
-  /* 2nd byte: 107 */ 0x7845,
-  /* 2nd byte: 108 */ 0x788e,
-  /* 2nd byte: 109 */ 0x7874,
-  /* 2nd byte: 110 */ 0x7886,
-  /* 2nd byte: 111 */ 0x787c,
-  /* 2nd byte: 112 */ 0x789a,
-  /* 2nd byte: 113 */ 0x788c,
-  /* 2nd byte: 114 */ 0x78a3,
-  /* 2nd byte: 115 */ 0x78b5,
-  /* 2nd byte: 116 */ 0x78aa,
-  /* 2nd byte: 117 */ 0x78af,
-  /* 2nd byte: 118 */ 0x78d1,
-  /* 2nd byte: 119 */ 0x78c6,
-  /* 2nd byte: 120 */ 0x78cb,
-  /* 2nd byte: 121 */ 0x78d4,
-  /* 2nd byte: 122 */ 0x78be,
-  /* 2nd byte: 123 */ 0x78bc,
-  /* 2nd byte: 124 */ 0x78c5,
-  /* 2nd byte: 125 */ 0x78ca,
-  /* 2nd byte: 126 */ 0x78ec},
-/* 1st byte: 99 */ { 
-  /* 2nd byte: 33 */ 0x78e7,
-  /* 2nd byte: 34 */ 0x78da,
-  /* 2nd byte: 35 */ 0x78fd,
-  /* 2nd byte: 36 */ 0x78f4,
-  /* 2nd byte: 37 */ 0x7907,
-  /* 2nd byte: 38 */ 0x7912,
-  /* 2nd byte: 39 */ 0x7911,
-  /* 2nd byte: 40 */ 0x7919,
-  /* 2nd byte: 41 */ 0x792c,
-  /* 2nd byte: 42 */ 0x792b,
-  /* 2nd byte: 43 */ 0x7940,
-  /* 2nd byte: 44 */ 0x7960,
-  /* 2nd byte: 45 */ 0x7957,
-  /* 2nd byte: 46 */ 0x795f,
-  /* 2nd byte: 47 */ 0x795a,
-  /* 2nd byte: 48 */ 0x7955,
-  /* 2nd byte: 49 */ 0x7953,
-  /* 2nd byte: 50 */ 0x797a,
-  /* 2nd byte: 51 */ 0x797f,
-  /* 2nd byte: 52 */ 0x798a,
-  /* 2nd byte: 53 */ 0x799d,
-  /* 2nd byte: 54 */ 0x79a7,
-  /* 2nd byte: 55 */ 0x9f4b,
-  /* 2nd byte: 56 */ 0x79aa,
-  /* 2nd byte: 57 */ 0x79ae,
-  /* 2nd byte: 58 */ 0x79b3,
-  /* 2nd byte: 59 */ 0x79b9,
-  /* 2nd byte: 60 */ 0x79ba,
-  /* 2nd byte: 61 */ 0x79c9,
-  /* 2nd byte: 62 */ 0x79d5,
-  /* 2nd byte: 63 */ 0x79e7,
-  /* 2nd byte: 64 */ 0x79ec,
-  /* 2nd byte: 65 */ 0x79e1,
-  /* 2nd byte: 66 */ 0x79e3,
-  /* 2nd byte: 67 */ 0x7a08,
-  /* 2nd byte: 68 */ 0x7a0d,
-  /* 2nd byte: 69 */ 0x7a18,
-  /* 2nd byte: 70 */ 0x7a19,
-  /* 2nd byte: 71 */ 0x7a20,
-  /* 2nd byte: 72 */ 0x7a1f,
-  /* 2nd byte: 73 */ 0x7980,
-  /* 2nd byte: 74 */ 0x7a31,
-  /* 2nd byte: 75 */ 0x7a3b,
-  /* 2nd byte: 76 */ 0x7a3e,
-  /* 2nd byte: 77 */ 0x7a37,
-  /* 2nd byte: 78 */ 0x7a43,
-  /* 2nd byte: 79 */ 0x7a57,
-  /* 2nd byte: 80 */ 0x7a49,
-  /* 2nd byte: 81 */ 0x7a61,
-  /* 2nd byte: 82 */ 0x7a62,
-  /* 2nd byte: 83 */ 0x7a69,
-  /* 2nd byte: 84 */ 0x9f9d,
-  /* 2nd byte: 85 */ 0x7a70,
-  /* 2nd byte: 86 */ 0x7a79,
-  /* 2nd byte: 87 */ 0x7a7d,
-  /* 2nd byte: 88 */ 0x7a88,
-  /* 2nd byte: 89 */ 0x7a97,
-  /* 2nd byte: 90 */ 0x7a95,
-  /* 2nd byte: 91 */ 0x7a98,
-  /* 2nd byte: 92 */ 0x7a96,
-  /* 2nd byte: 93 */ 0x7aa9,
-  /* 2nd byte: 94 */ 0x7ac8,
-  /* 2nd byte: 95 */ 0x7ab0,
-  /* 2nd byte: 96 */ 0x7ab6,
-  /* 2nd byte: 97 */ 0x7ac5,
-  /* 2nd byte: 98 */ 0x7ac4,
-  /* 2nd byte: 99 */ 0x7abf,
-  /* 2nd byte: 100 */ 0x9083,
-  /* 2nd byte: 101 */ 0x7ac7,
-  /* 2nd byte: 102 */ 0x7aca,
-  /* 2nd byte: 103 */ 0x7acd,
-  /* 2nd byte: 104 */ 0x7acf,
-  /* 2nd byte: 105 */ 0x7ad5,
-  /* 2nd byte: 106 */ 0x7ad3,
-  /* 2nd byte: 107 */ 0x7ad9,
-  /* 2nd byte: 108 */ 0x7ada,
-  /* 2nd byte: 109 */ 0x7add,
-  /* 2nd byte: 110 */ 0x7ae1,
-  /* 2nd byte: 111 */ 0x7ae2,
-  /* 2nd byte: 112 */ 0x7ae6,
-  /* 2nd byte: 113 */ 0x7aed,
-  /* 2nd byte: 114 */ 0x7af0,
-  /* 2nd byte: 115 */ 0x7b02,
-  /* 2nd byte: 116 */ 0x7b0f,
-  /* 2nd byte: 117 */ 0x7b0a,
-  /* 2nd byte: 118 */ 0x7b06,
-  /* 2nd byte: 119 */ 0x7b33,
-  /* 2nd byte: 120 */ 0x7b18,
-  /* 2nd byte: 121 */ 0x7b19,
-  /* 2nd byte: 122 */ 0x7b1e,
-  /* 2nd byte: 123 */ 0x7b35,
-  /* 2nd byte: 124 */ 0x7b28,
-  /* 2nd byte: 125 */ 0x7b36,
-  /* 2nd byte: 126 */ 0x7b50},
-/* 1st byte: 100 */ { 
-  /* 2nd byte: 33 */ 0x7b7a,
-  /* 2nd byte: 34 */ 0x7b04,
-  /* 2nd byte: 35 */ 0x7b4d,
-  /* 2nd byte: 36 */ 0x7b0b,
-  /* 2nd byte: 37 */ 0x7b4c,
-  /* 2nd byte: 38 */ 0x7b45,
-  /* 2nd byte: 39 */ 0x7b75,
-  /* 2nd byte: 40 */ 0x7b65,
-  /* 2nd byte: 41 */ 0x7b74,
-  /* 2nd byte: 42 */ 0x7b67,
-  /* 2nd byte: 43 */ 0x7b70,
-  /* 2nd byte: 44 */ 0x7b71,
-  /* 2nd byte: 45 */ 0x7b6c,
-  /* 2nd byte: 46 */ 0x7b6e,
-  /* 2nd byte: 47 */ 0x7b9d,
-  /* 2nd byte: 48 */ 0x7b98,
-  /* 2nd byte: 49 */ 0x7b9f,
-  /* 2nd byte: 50 */ 0x7b8d,
-  /* 2nd byte: 51 */ 0x7b9c,
-  /* 2nd byte: 52 */ 0x7b9a,
-  /* 2nd byte: 53 */ 0x7b8b,
-  /* 2nd byte: 54 */ 0x7b92,
-  /* 2nd byte: 55 */ 0x7b8f,
-  /* 2nd byte: 56 */ 0x7b5d,
-  /* 2nd byte: 57 */ 0x7b99,
-  /* 2nd byte: 58 */ 0x7bcb,
-  /* 2nd byte: 59 */ 0x7bc1,
-  /* 2nd byte: 60 */ 0x7bcc,
-  /* 2nd byte: 61 */ 0x7bcf,
-  /* 2nd byte: 62 */ 0x7bb4,
-  /* 2nd byte: 63 */ 0x7bc6,
-  /* 2nd byte: 64 */ 0x7bdd,
-  /* 2nd byte: 65 */ 0x7be9,
-  /* 2nd byte: 66 */ 0x7c11,
-  /* 2nd byte: 67 */ 0x7c14,
-  /* 2nd byte: 68 */ 0x7be6,
-  /* 2nd byte: 69 */ 0x7be5,
-  /* 2nd byte: 70 */ 0x7c60,
-  /* 2nd byte: 71 */ 0x7c00,
-  /* 2nd byte: 72 */ 0x7c07,
-  /* 2nd byte: 73 */ 0x7c13,
-  /* 2nd byte: 74 */ 0x7bf3,
-  /* 2nd byte: 75 */ 0x7bf7,
-  /* 2nd byte: 76 */ 0x7c17,
-  /* 2nd byte: 77 */ 0x7c0d,
-  /* 2nd byte: 78 */ 0x7bf6,
-  /* 2nd byte: 79 */ 0x7c23,
-  /* 2nd byte: 80 */ 0x7c27,
-  /* 2nd byte: 81 */ 0x7c2a,
-  /* 2nd byte: 82 */ 0x7c1f,
-  /* 2nd byte: 83 */ 0x7c37,
-  /* 2nd byte: 84 */ 0x7c2b,
-  /* 2nd byte: 85 */ 0x7c3d,
-  /* 2nd byte: 86 */ 0x7c4c,
-  /* 2nd byte: 87 */ 0x7c43,
-  /* 2nd byte: 88 */ 0x7c54,
-  /* 2nd byte: 89 */ 0x7c4f,
-  /* 2nd byte: 90 */ 0x7c40,
-  /* 2nd byte: 91 */ 0x7c50,
-  /* 2nd byte: 92 */ 0x7c58,
-  /* 2nd byte: 93 */ 0x7c5f,
-  /* 2nd byte: 94 */ 0x7c64,
-  /* 2nd byte: 95 */ 0x7c56,
-  /* 2nd byte: 96 */ 0x7c65,
-  /* 2nd byte: 97 */ 0x7c6c,
-  /* 2nd byte: 98 */ 0x7c75,
-  /* 2nd byte: 99 */ 0x7c83,
-  /* 2nd byte: 100 */ 0x7c90,
-  /* 2nd byte: 101 */ 0x7ca4,
-  /* 2nd byte: 102 */ 0x7cad,
-  /* 2nd byte: 103 */ 0x7ca2,
-  /* 2nd byte: 104 */ 0x7cab,
-  /* 2nd byte: 105 */ 0x7ca1,
-  /* 2nd byte: 106 */ 0x7ca8,
-  /* 2nd byte: 107 */ 0x7cb3,
-  /* 2nd byte: 108 */ 0x7cb2,
-  /* 2nd byte: 109 */ 0x7cb1,
-  /* 2nd byte: 110 */ 0x7cae,
-  /* 2nd byte: 111 */ 0x7cb9,
-  /* 2nd byte: 112 */ 0x7cbd,
-  /* 2nd byte: 113 */ 0x7cc0,
-  /* 2nd byte: 114 */ 0x7cc5,
-  /* 2nd byte: 115 */ 0x7cc2,
-  /* 2nd byte: 116 */ 0x7cd8,
-  /* 2nd byte: 117 */ 0x7cd2,
-  /* 2nd byte: 118 */ 0x7cdc,
-  /* 2nd byte: 119 */ 0x7ce2,
-  /* 2nd byte: 120 */ 0x9b3b,
-  /* 2nd byte: 121 */ 0x7cef,
-  /* 2nd byte: 122 */ 0x7cf2,
-  /* 2nd byte: 123 */ 0x7cf4,
-  /* 2nd byte: 124 */ 0x7cf6,
-  /* 2nd byte: 125 */ 0x7cfa,
-  /* 2nd byte: 126 */ 0x7d06},
-/* 1st byte: 101 */ { 
-  /* 2nd byte: 33 */ 0x7d02,
-  /* 2nd byte: 34 */ 0x7d1c,
-  /* 2nd byte: 35 */ 0x7d15,
-  /* 2nd byte: 36 */ 0x7d0a,
-  /* 2nd byte: 37 */ 0x7d45,
-  /* 2nd byte: 38 */ 0x7d4b,
-  /* 2nd byte: 39 */ 0x7d2e,
-  /* 2nd byte: 40 */ 0x7d32,
-  /* 2nd byte: 41 */ 0x7d3f,
-  /* 2nd byte: 42 */ 0x7d35,
-  /* 2nd byte: 43 */ 0x7d46,
-  /* 2nd byte: 44 */ 0x7d73,
-  /* 2nd byte: 45 */ 0x7d56,
-  /* 2nd byte: 46 */ 0x7d4e,
-  /* 2nd byte: 47 */ 0x7d72,
-  /* 2nd byte: 48 */ 0x7d68,
-  /* 2nd byte: 49 */ 0x7d6e,
-  /* 2nd byte: 50 */ 0x7d4f,
-  /* 2nd byte: 51 */ 0x7d63,
-  /* 2nd byte: 52 */ 0x7d93,
-  /* 2nd byte: 53 */ 0x7d89,
-  /* 2nd byte: 54 */ 0x7d5b,
-  /* 2nd byte: 55 */ 0x7d8f,
-  /* 2nd byte: 56 */ 0x7d7d,
-  /* 2nd byte: 57 */ 0x7d9b,
-  /* 2nd byte: 58 */ 0x7dba,
-  /* 2nd byte: 59 */ 0x7dae,
-  /* 2nd byte: 60 */ 0x7da3,
-  /* 2nd byte: 61 */ 0x7db5,
-  /* 2nd byte: 62 */ 0x7dc7,
-  /* 2nd byte: 63 */ 0x7dbd,
-  /* 2nd byte: 64 */ 0x7dab,
-  /* 2nd byte: 65 */ 0x7e3d,
-  /* 2nd byte: 66 */ 0x7da2,
-  /* 2nd byte: 67 */ 0x7daf,
-  /* 2nd byte: 68 */ 0x7ddc,
-  /* 2nd byte: 69 */ 0x7db8,
-  /* 2nd byte: 70 */ 0x7d9f,
-  /* 2nd byte: 71 */ 0x7db0,
-  /* 2nd byte: 72 */ 0x7dd8,
-  /* 2nd byte: 73 */ 0x7ddd,
-  /* 2nd byte: 74 */ 0x7de4,
-  /* 2nd byte: 75 */ 0x7dde,
-  /* 2nd byte: 76 */ 0x7dfb,
-  /* 2nd byte: 77 */ 0x7df2,
-  /* 2nd byte: 78 */ 0x7de1,
-  /* 2nd byte: 79 */ 0x7e05,
-  /* 2nd byte: 80 */ 0x7e0a,
-  /* 2nd byte: 81 */ 0x7e23,
-  /* 2nd byte: 82 */ 0x7e21,
-  /* 2nd byte: 83 */ 0x7e12,
-  /* 2nd byte: 84 */ 0x7e31,
-  /* 2nd byte: 85 */ 0x7e1f,
-  /* 2nd byte: 86 */ 0x7e09,
-  /* 2nd byte: 87 */ 0x7e0b,
-  /* 2nd byte: 88 */ 0x7e22,
-  /* 2nd byte: 89 */ 0x7e46,
-  /* 2nd byte: 90 */ 0x7e66,
-  /* 2nd byte: 91 */ 0x7e3b,
-  /* 2nd byte: 92 */ 0x7e35,
-  /* 2nd byte: 93 */ 0x7e39,
-  /* 2nd byte: 94 */ 0x7e43,
-  /* 2nd byte: 95 */ 0x7e37,
-  /* 2nd byte: 96 */ 0x7e32,
-  /* 2nd byte: 97 */ 0x7e3a,
-  /* 2nd byte: 98 */ 0x7e67,
-  /* 2nd byte: 99 */ 0x7e5d,
-  /* 2nd byte: 100 */ 0x7e56,
-  /* 2nd byte: 101 */ 0x7e5e,
-  /* 2nd byte: 102 */ 0x7e59,
-  /* 2nd byte: 103 */ 0x7e5a,
-  /* 2nd byte: 104 */ 0x7e79,
-  /* 2nd byte: 105 */ 0x7e6a,
-  /* 2nd byte: 106 */ 0x7e69,
-  /* 2nd byte: 107 */ 0x7e7c,
-  /* 2nd byte: 108 */ 0x7e7b,
-  /* 2nd byte: 109 */ 0x7e83,
-  /* 2nd byte: 110 */ 0x7dd5,
-  /* 2nd byte: 111 */ 0x7e7d,
-  /* 2nd byte: 112 */ 0x8fae,
-  /* 2nd byte: 113 */ 0x7e7f,
-  /* 2nd byte: 114 */ 0x7e88,
-  /* 2nd byte: 115 */ 0x7e89,
-  /* 2nd byte: 116 */ 0x7e8c,
-  /* 2nd byte: 117 */ 0x7e92,
-  /* 2nd byte: 118 */ 0x7e90,
-  /* 2nd byte: 119 */ 0x7e93,
-  /* 2nd byte: 120 */ 0x7e94,
-  /* 2nd byte: 121 */ 0x7e96,
-  /* 2nd byte: 122 */ 0x7e8e,
-  /* 2nd byte: 123 */ 0x7e9b,
-  /* 2nd byte: 124 */ 0x7e9c,
-  /* 2nd byte: 125 */ 0x7f38,
-  /* 2nd byte: 126 */ 0x7f3a},
-/* 1st byte: 102 */ { 
-  /* 2nd byte: 33 */ 0x7f45,
-  /* 2nd byte: 34 */ 0x7f4c,
-  /* 2nd byte: 35 */ 0x7f4d,
-  /* 2nd byte: 36 */ 0x7f4e,
-  /* 2nd byte: 37 */ 0x7f50,
-  /* 2nd byte: 38 */ 0x7f51,
-  /* 2nd byte: 39 */ 0x7f55,
-  /* 2nd byte: 40 */ 0x7f54,
-  /* 2nd byte: 41 */ 0x7f58,
-  /* 2nd byte: 42 */ 0x7f5f,
-  /* 2nd byte: 43 */ 0x7f60,
-  /* 2nd byte: 44 */ 0x7f68,
-  /* 2nd byte: 45 */ 0x7f69,
-  /* 2nd byte: 46 */ 0x7f67,
-  /* 2nd byte: 47 */ 0x7f78,
-  /* 2nd byte: 48 */ 0x7f82,
-  /* 2nd byte: 49 */ 0x7f86,
-  /* 2nd byte: 50 */ 0x7f83,
-  /* 2nd byte: 51 */ 0x7f88,
-  /* 2nd byte: 52 */ 0x7f87,
-  /* 2nd byte: 53 */ 0x7f8c,
-  /* 2nd byte: 54 */ 0x7f94,
-  /* 2nd byte: 55 */ 0x7f9e,
-  /* 2nd byte: 56 */ 0x7f9d,
-  /* 2nd byte: 57 */ 0x7f9a,
-  /* 2nd byte: 58 */ 0x7fa3,
-  /* 2nd byte: 59 */ 0x7faf,
-  /* 2nd byte: 60 */ 0x7fb2,
-  /* 2nd byte: 61 */ 0x7fb9,
-  /* 2nd byte: 62 */ 0x7fae,
-  /* 2nd byte: 63 */ 0x7fb6,
-  /* 2nd byte: 64 */ 0x7fb8,
-  /* 2nd byte: 65 */ 0x8b71,
-  /* 2nd byte: 66 */ 0x7fc5,
-  /* 2nd byte: 67 */ 0x7fc6,
-  /* 2nd byte: 68 */ 0x7fca,
-  /* 2nd byte: 69 */ 0x7fd5,
-  /* 2nd byte: 70 */ 0x7fd4,
-  /* 2nd byte: 71 */ 0x7fe1,
-  /* 2nd byte: 72 */ 0x7fe6,
-  /* 2nd byte: 73 */ 0x7fe9,
-  /* 2nd byte: 74 */ 0x7ff3,
-  /* 2nd byte: 75 */ 0x7ff9,
-  /* 2nd byte: 76 */ 0x98dc,
-  /* 2nd byte: 77 */ 0x8006,
-  /* 2nd byte: 78 */ 0x8004,
-  /* 2nd byte: 79 */ 0x800b,
-  /* 2nd byte: 80 */ 0x8012,
-  /* 2nd byte: 81 */ 0x8018,
-  /* 2nd byte: 82 */ 0x8019,
-  /* 2nd byte: 83 */ 0x801c,
-  /* 2nd byte: 84 */ 0x8021,
-  /* 2nd byte: 85 */ 0x8028,
-  /* 2nd byte: 86 */ 0x803f,
-  /* 2nd byte: 87 */ 0x803b,
-  /* 2nd byte: 88 */ 0x804a,
-  /* 2nd byte: 89 */ 0x8046,
-  /* 2nd byte: 90 */ 0x8052,
-  /* 2nd byte: 91 */ 0x8058,
-  /* 2nd byte: 92 */ 0x805a,
-  /* 2nd byte: 93 */ 0x805f,
-  /* 2nd byte: 94 */ 0x8062,
-  /* 2nd byte: 95 */ 0x8068,
-  /* 2nd byte: 96 */ 0x8073,
-  /* 2nd byte: 97 */ 0x8072,
-  /* 2nd byte: 98 */ 0x8070,
-  /* 2nd byte: 99 */ 0x8076,
-  /* 2nd byte: 100 */ 0x8079,
-  /* 2nd byte: 101 */ 0x807d,
-  /* 2nd byte: 102 */ 0x807f,
-  /* 2nd byte: 103 */ 0x8084,
-  /* 2nd byte: 104 */ 0x8086,
-  /* 2nd byte: 105 */ 0x8085,
-  /* 2nd byte: 106 */ 0x809b,
-  /* 2nd byte: 107 */ 0x8093,
-  /* 2nd byte: 108 */ 0x809a,
-  /* 2nd byte: 109 */ 0x80ad,
-  /* 2nd byte: 110 */ 0x5190,
-  /* 2nd byte: 111 */ 0x80ac,
-  /* 2nd byte: 112 */ 0x80db,
-  /* 2nd byte: 113 */ 0x80e5,
-  /* 2nd byte: 114 */ 0x80d9,
-  /* 2nd byte: 115 */ 0x80dd,
-  /* 2nd byte: 116 */ 0x80c4,
-  /* 2nd byte: 117 */ 0x80da,
-  /* 2nd byte: 118 */ 0x80d6,
-  /* 2nd byte: 119 */ 0x8109,
-  /* 2nd byte: 120 */ 0x80ef,
-  /* 2nd byte: 121 */ 0x80f1,
-  /* 2nd byte: 122 */ 0x811b,
-  /* 2nd byte: 123 */ 0x8129,
-  /* 2nd byte: 124 */ 0x8123,
-  /* 2nd byte: 125 */ 0x812f,
-  /* 2nd byte: 126 */ 0x814b},
-/* 1st byte: 103 */ { 
-  /* 2nd byte: 33 */ 0x968b,
-  /* 2nd byte: 34 */ 0x8146,
-  /* 2nd byte: 35 */ 0x813e,
-  /* 2nd byte: 36 */ 0x8153,
-  /* 2nd byte: 37 */ 0x8151,
-  /* 2nd byte: 38 */ 0x80fc,
-  /* 2nd byte: 39 */ 0x8171,
-  /* 2nd byte: 40 */ 0x816e,
-  /* 2nd byte: 41 */ 0x8165,
-  /* 2nd byte: 42 */ 0x8166,
-  /* 2nd byte: 43 */ 0x8174,
-  /* 2nd byte: 44 */ 0x8183,
-  /* 2nd byte: 45 */ 0x8188,
-  /* 2nd byte: 46 */ 0x818a,
-  /* 2nd byte: 47 */ 0x8180,
-  /* 2nd byte: 48 */ 0x8182,
-  /* 2nd byte: 49 */ 0x81a0,
-  /* 2nd byte: 50 */ 0x8195,
-  /* 2nd byte: 51 */ 0x81a4,
-  /* 2nd byte: 52 */ 0x81a3,
-  /* 2nd byte: 53 */ 0x815f,
-  /* 2nd byte: 54 */ 0x8193,
-  /* 2nd byte: 55 */ 0x81a9,
-  /* 2nd byte: 56 */ 0x81b0,
-  /* 2nd byte: 57 */ 0x81b5,
-  /* 2nd byte: 58 */ 0x81be,
-  /* 2nd byte: 59 */ 0x81b8,
-  /* 2nd byte: 60 */ 0x81bd,
-  /* 2nd byte: 61 */ 0x81c0,
-  /* 2nd byte: 62 */ 0x81c2,
-  /* 2nd byte: 63 */ 0x81ba,
-  /* 2nd byte: 64 */ 0x81c9,
-  /* 2nd byte: 65 */ 0x81cd,
-  /* 2nd byte: 66 */ 0x81d1,
-  /* 2nd byte: 67 */ 0x81d9,
-  /* 2nd byte: 68 */ 0x81d8,
-  /* 2nd byte: 69 */ 0x81c8,
-  /* 2nd byte: 70 */ 0x81da,
-  /* 2nd byte: 71 */ 0x81df,
-  /* 2nd byte: 72 */ 0x81e0,
-  /* 2nd byte: 73 */ 0x81e7,
-  /* 2nd byte: 74 */ 0x81fa,
-  /* 2nd byte: 75 */ 0x81fb,
-  /* 2nd byte: 76 */ 0x81fe,
-  /* 2nd byte: 77 */ 0x8201,
-  /* 2nd byte: 78 */ 0x8202,
-  /* 2nd byte: 79 */ 0x8205,
-  /* 2nd byte: 80 */ 0x8207,
-  /* 2nd byte: 81 */ 0x820a,
-  /* 2nd byte: 82 */ 0x820d,
-  /* 2nd byte: 83 */ 0x8210,
-  /* 2nd byte: 84 */ 0x8216,
-  /* 2nd byte: 85 */ 0x8229,
-  /* 2nd byte: 86 */ 0x822b,
-  /* 2nd byte: 87 */ 0x8238,
-  /* 2nd byte: 88 */ 0x8233,
-  /* 2nd byte: 89 */ 0x8240,
-  /* 2nd byte: 90 */ 0x8259,
-  /* 2nd byte: 91 */ 0x8258,
-  /* 2nd byte: 92 */ 0x825d,
-  /* 2nd byte: 93 */ 0x825a,
-  /* 2nd byte: 94 */ 0x825f,
-  /* 2nd byte: 95 */ 0x8264,
-  /* 2nd byte: 96 */ 0x8262,
-  /* 2nd byte: 97 */ 0x8268,
-  /* 2nd byte: 98 */ 0x826a,
-  /* 2nd byte: 99 */ 0x826b,
-  /* 2nd byte: 100 */ 0x822e,
-  /* 2nd byte: 101 */ 0x8271,
-  /* 2nd byte: 102 */ 0x8277,
-  /* 2nd byte: 103 */ 0x8278,
-  /* 2nd byte: 104 */ 0x827e,
-  /* 2nd byte: 105 */ 0x828d,
-  /* 2nd byte: 106 */ 0x8292,
-  /* 2nd byte: 107 */ 0x82ab,
-  /* 2nd byte: 108 */ 0x829f,
-  /* 2nd byte: 109 */ 0x82bb,
-  /* 2nd byte: 110 */ 0x82ac,
-  /* 2nd byte: 111 */ 0x82e1,
-  /* 2nd byte: 112 */ 0x82e3,
-  /* 2nd byte: 113 */ 0x82df,
-  /* 2nd byte: 114 */ 0x82d2,
-  /* 2nd byte: 115 */ 0x82f4,
-  /* 2nd byte: 116 */ 0x82f3,
-  /* 2nd byte: 117 */ 0x82fa,
-  /* 2nd byte: 118 */ 0x8393,
-  /* 2nd byte: 119 */ 0x8303,
-  /* 2nd byte: 120 */ 0x82fb,
-  /* 2nd byte: 121 */ 0x82f9,
-  /* 2nd byte: 122 */ 0x82de,
-  /* 2nd byte: 123 */ 0x8306,
-  /* 2nd byte: 124 */ 0x82dc,
-  /* 2nd byte: 125 */ 0x8309,
-  /* 2nd byte: 126 */ 0x82d9},
-/* 1st byte: 104 */ { 
-  /* 2nd byte: 33 */ 0x8335,
-  /* 2nd byte: 34 */ 0x8334,
-  /* 2nd byte: 35 */ 0x8316,
-  /* 2nd byte: 36 */ 0x8332,
-  /* 2nd byte: 37 */ 0x8331,
-  /* 2nd byte: 38 */ 0x8340,
-  /* 2nd byte: 39 */ 0x8339,
-  /* 2nd byte: 40 */ 0x8350,
-  /* 2nd byte: 41 */ 0x8345,
-  /* 2nd byte: 42 */ 0x832f,
-  /* 2nd byte: 43 */ 0x832b,
-  /* 2nd byte: 44 */ 0x8317,
-  /* 2nd byte: 45 */ 0x8318,
-  /* 2nd byte: 46 */ 0x8385,
-  /* 2nd byte: 47 */ 0x839a,
-  /* 2nd byte: 48 */ 0x83aa,
-  /* 2nd byte: 49 */ 0x839f,
-  /* 2nd byte: 50 */ 0x83a2,
-  /* 2nd byte: 51 */ 0x8396,
-  /* 2nd byte: 52 */ 0x8323,
-  /* 2nd byte: 53 */ 0x838e,
-  /* 2nd byte: 54 */ 0x8387,
-  /* 2nd byte: 55 */ 0x838a,
-  /* 2nd byte: 56 */ 0x837c,
-  /* 2nd byte: 57 */ 0x83b5,
-  /* 2nd byte: 58 */ 0x8373,
-  /* 2nd byte: 59 */ 0x8375,
-  /* 2nd byte: 60 */ 0x83a0,
-  /* 2nd byte: 61 */ 0x8389,
-  /* 2nd byte: 62 */ 0x83a8,
-  /* 2nd byte: 63 */ 0x83f4,
-  /* 2nd byte: 64 */ 0x8413,
-  /* 2nd byte: 65 */ 0x83eb,
-  /* 2nd byte: 66 */ 0x83ce,
-  /* 2nd byte: 67 */ 0x83fd,
-  /* 2nd byte: 68 */ 0x8403,
-  /* 2nd byte: 69 */ 0x83d8,
-  /* 2nd byte: 70 */ 0x840b,
-  /* 2nd byte: 71 */ 0x83c1,
-  /* 2nd byte: 72 */ 0x83f7,
-  /* 2nd byte: 73 */ 0x8407,
-  /* 2nd byte: 74 */ 0x83e0,
-  /* 2nd byte: 75 */ 0x83f2,
-  /* 2nd byte: 76 */ 0x840d,
-  /* 2nd byte: 77 */ 0x8422,
-  /* 2nd byte: 78 */ 0x8420,
-  /* 2nd byte: 79 */ 0x83bd,
-  /* 2nd byte: 80 */ 0x8438,
-  /* 2nd byte: 81 */ 0x8506,
-  /* 2nd byte: 82 */ 0x83fb,
-  /* 2nd byte: 83 */ 0x846d,
-  /* 2nd byte: 84 */ 0x842a,
-  /* 2nd byte: 85 */ 0x843c,
-  /* 2nd byte: 86 */ 0x855a,
-  /* 2nd byte: 87 */ 0x8484,
-  /* 2nd byte: 88 */ 0x8477,
-  /* 2nd byte: 89 */ 0x846b,
-  /* 2nd byte: 90 */ 0x84ad,
-  /* 2nd byte: 91 */ 0x846e,
-  /* 2nd byte: 92 */ 0x8482,
-  /* 2nd byte: 93 */ 0x8469,
-  /* 2nd byte: 94 */ 0x8446,
-  /* 2nd byte: 95 */ 0x842c,
-  /* 2nd byte: 96 */ 0x846f,
-  /* 2nd byte: 97 */ 0x8479,
-  /* 2nd byte: 98 */ 0x8435,
-  /* 2nd byte: 99 */ 0x84ca,
-  /* 2nd byte: 100 */ 0x8462,
-  /* 2nd byte: 101 */ 0x84b9,
-  /* 2nd byte: 102 */ 0x84bf,
-  /* 2nd byte: 103 */ 0x849f,
-  /* 2nd byte: 104 */ 0x84d9,
-  /* 2nd byte: 105 */ 0x84cd,
-  /* 2nd byte: 106 */ 0x84bb,
-  /* 2nd byte: 107 */ 0x84da,
-  /* 2nd byte: 108 */ 0x84d0,
-  /* 2nd byte: 109 */ 0x84c1,
-  /* 2nd byte: 110 */ 0x84c6,
-  /* 2nd byte: 111 */ 0x84d6,
-  /* 2nd byte: 112 */ 0x84a1,
-  /* 2nd byte: 113 */ 0x8521,
-  /* 2nd byte: 114 */ 0x84ff,
-  /* 2nd byte: 115 */ 0x84f4,
-  /* 2nd byte: 116 */ 0x8517,
-  /* 2nd byte: 117 */ 0x8518,
-  /* 2nd byte: 118 */ 0x852c,
-  /* 2nd byte: 119 */ 0x851f,
-  /* 2nd byte: 120 */ 0x8515,
-  /* 2nd byte: 121 */ 0x8514,
-  /* 2nd byte: 122 */ 0x84fc,
-  /* 2nd byte: 123 */ 0x8540,
-  /* 2nd byte: 124 */ 0x8563,
-  /* 2nd byte: 125 */ 0x8558,
-  /* 2nd byte: 126 */ 0x8548},
-/* 1st byte: 105 */ { 
-  /* 2nd byte: 33 */ 0x8541,
-  /* 2nd byte: 34 */ 0x8602,
-  /* 2nd byte: 35 */ 0x854b,
-  /* 2nd byte: 36 */ 0x8555,
-  /* 2nd byte: 37 */ 0x8580,
-  /* 2nd byte: 38 */ 0x85a4,
-  /* 2nd byte: 39 */ 0x8588,
-  /* 2nd byte: 40 */ 0x8591,
-  /* 2nd byte: 41 */ 0x858a,
-  /* 2nd byte: 42 */ 0x85a8,
-  /* 2nd byte: 43 */ 0x856d,
-  /* 2nd byte: 44 */ 0x8594,
-  /* 2nd byte: 45 */ 0x859b,
-  /* 2nd byte: 46 */ 0x85ea,
-  /* 2nd byte: 47 */ 0x8587,
-  /* 2nd byte: 48 */ 0x859c,
-  /* 2nd byte: 49 */ 0x8577,
-  /* 2nd byte: 50 */ 0x857e,
-  /* 2nd byte: 51 */ 0x8590,
-  /* 2nd byte: 52 */ 0x85c9,
-  /* 2nd byte: 53 */ 0x85ba,
-  /* 2nd byte: 54 */ 0x85cf,
-  /* 2nd byte: 55 */ 0x85b9,
-  /* 2nd byte: 56 */ 0x85d0,
-  /* 2nd byte: 57 */ 0x85d5,
-  /* 2nd byte: 58 */ 0x85dd,
-  /* 2nd byte: 59 */ 0x85e5,
-  /* 2nd byte: 60 */ 0x85dc,
-  /* 2nd byte: 61 */ 0x85f9,
-  /* 2nd byte: 62 */ 0x860a,
-  /* 2nd byte: 63 */ 0x8613,
-  /* 2nd byte: 64 */ 0x860b,
-  /* 2nd byte: 65 */ 0x85fe,
-  /* 2nd byte: 66 */ 0x85fa,
-  /* 2nd byte: 67 */ 0x8606,
-  /* 2nd byte: 68 */ 0x8622,
-  /* 2nd byte: 69 */ 0x861a,
-  /* 2nd byte: 70 */ 0x8630,
-  /* 2nd byte: 71 */ 0x863f,
-  /* 2nd byte: 72 */ 0x864d,
-  /* 2nd byte: 73 */ 0x4e55,
-  /* 2nd byte: 74 */ 0x8654,
-  /* 2nd byte: 75 */ 0x865f,
-  /* 2nd byte: 76 */ 0x8667,
-  /* 2nd byte: 77 */ 0x8671,
-  /* 2nd byte: 78 */ 0x8693,
-  /* 2nd byte: 79 */ 0x86a3,
-  /* 2nd byte: 80 */ 0x86a9,
-  /* 2nd byte: 81 */ 0x86aa,
-  /* 2nd byte: 82 */ 0x868b,
-  /* 2nd byte: 83 */ 0x868c,
-  /* 2nd byte: 84 */ 0x86b6,
-  /* 2nd byte: 85 */ 0x86af,
-  /* 2nd byte: 86 */ 0x86c4,
-  /* 2nd byte: 87 */ 0x86c6,
-  /* 2nd byte: 88 */ 0x86b0,
-  /* 2nd byte: 89 */ 0x86c9,
-  /* 2nd byte: 90 */ 0x8823,
-  /* 2nd byte: 91 */ 0x86ab,
-  /* 2nd byte: 92 */ 0x86d4,
-  /* 2nd byte: 93 */ 0x86de,
-  /* 2nd byte: 94 */ 0x86e9,
-  /* 2nd byte: 95 */ 0x86ec,
-  /* 2nd byte: 96 */ 0x86df,
-  /* 2nd byte: 97 */ 0x86db,
-  /* 2nd byte: 98 */ 0x86ef,
-  /* 2nd byte: 99 */ 0x8712,
-  /* 2nd byte: 100 */ 0x8706,
-  /* 2nd byte: 101 */ 0x8708,
-  /* 2nd byte: 102 */ 0x8700,
-  /* 2nd byte: 103 */ 0x8703,
-  /* 2nd byte: 104 */ 0x86fb,
-  /* 2nd byte: 105 */ 0x8711,
-  /* 2nd byte: 106 */ 0x8709,
-  /* 2nd byte: 107 */ 0x870d,
-  /* 2nd byte: 108 */ 0x86f9,
-  /* 2nd byte: 109 */ 0x870a,
-  /* 2nd byte: 110 */ 0x8734,
-  /* 2nd byte: 111 */ 0x873f,
-  /* 2nd byte: 112 */ 0x8737,
-  /* 2nd byte: 113 */ 0x873b,
-  /* 2nd byte: 114 */ 0x8725,
-  /* 2nd byte: 115 */ 0x8729,
-  /* 2nd byte: 116 */ 0x871a,
-  /* 2nd byte: 117 */ 0x8760,
-  /* 2nd byte: 118 */ 0x875f,
-  /* 2nd byte: 119 */ 0x8778,
-  /* 2nd byte: 120 */ 0x874c,
-  /* 2nd byte: 121 */ 0x874e,
-  /* 2nd byte: 122 */ 0x8774,
-  /* 2nd byte: 123 */ 0x8757,
-  /* 2nd byte: 124 */ 0x8768,
-  /* 2nd byte: 125 */ 0x876e,
-  /* 2nd byte: 126 */ 0x8759},
-/* 1st byte: 106 */ { 
-  /* 2nd byte: 33 */ 0x8753,
-  /* 2nd byte: 34 */ 0x8763,
-  /* 2nd byte: 35 */ 0x876a,
-  /* 2nd byte: 36 */ 0x8805,
-  /* 2nd byte: 37 */ 0x87a2,
-  /* 2nd byte: 38 */ 0x879f,
-  /* 2nd byte: 39 */ 0x8782,
-  /* 2nd byte: 40 */ 0x87af,
-  /* 2nd byte: 41 */ 0x87cb,
-  /* 2nd byte: 42 */ 0x87bd,
-  /* 2nd byte: 43 */ 0x87c0,
-  /* 2nd byte: 44 */ 0x87d0,
-  /* 2nd byte: 45 */ 0x96d6,
-  /* 2nd byte: 46 */ 0x87ab,
-  /* 2nd byte: 47 */ 0x87c4,
-  /* 2nd byte: 48 */ 0x87b3,
-  /* 2nd byte: 49 */ 0x87c7,
-  /* 2nd byte: 50 */ 0x87c6,
-  /* 2nd byte: 51 */ 0x87bb,
-  /* 2nd byte: 52 */ 0x87ef,
-  /* 2nd byte: 53 */ 0x87f2,
-  /* 2nd byte: 54 */ 0x87e0,
-  /* 2nd byte: 55 */ 0x880f,
-  /* 2nd byte: 56 */ 0x880d,
-  /* 2nd byte: 57 */ 0x87fe,
-  /* 2nd byte: 58 */ 0x87f6,
-  /* 2nd byte: 59 */ 0x87f7,
-  /* 2nd byte: 60 */ 0x880e,
-  /* 2nd byte: 61 */ 0x87d2,
-  /* 2nd byte: 62 */ 0x8811,
-  /* 2nd byte: 63 */ 0x8816,
-  /* 2nd byte: 64 */ 0x8815,
-  /* 2nd byte: 65 */ 0x8822,
-  /* 2nd byte: 66 */ 0x8821,
-  /* 2nd byte: 67 */ 0x8831,
-  /* 2nd byte: 68 */ 0x8836,
-  /* 2nd byte: 69 */ 0x8839,
-  /* 2nd byte: 70 */ 0x8827,
-  /* 2nd byte: 71 */ 0x883b,
-  /* 2nd byte: 72 */ 0x8844,
-  /* 2nd byte: 73 */ 0x8842,
-  /* 2nd byte: 74 */ 0x8852,
-  /* 2nd byte: 75 */ 0x8859,
-  /* 2nd byte: 76 */ 0x885e,
-  /* 2nd byte: 77 */ 0x8862,
-  /* 2nd byte: 78 */ 0x886b,
-  /* 2nd byte: 79 */ 0x8881,
-  /* 2nd byte: 80 */ 0x887e,
-  /* 2nd byte: 81 */ 0x889e,
-  /* 2nd byte: 82 */ 0x8875,
-  /* 2nd byte: 83 */ 0x887d,
-  /* 2nd byte: 84 */ 0x88b5,
-  /* 2nd byte: 85 */ 0x8872,
-  /* 2nd byte: 86 */ 0x8882,
-  /* 2nd byte: 87 */ 0x8897,
-  /* 2nd byte: 88 */ 0x8892,
-  /* 2nd byte: 89 */ 0x88ae,
-  /* 2nd byte: 90 */ 0x8899,
-  /* 2nd byte: 91 */ 0x88a2,
-  /* 2nd byte: 92 */ 0x888d,
-  /* 2nd byte: 93 */ 0x88a4,
-  /* 2nd byte: 94 */ 0x88b0,
-  /* 2nd byte: 95 */ 0x88bf,
-  /* 2nd byte: 96 */ 0x88b1,
-  /* 2nd byte: 97 */ 0x88c3,
-  /* 2nd byte: 98 */ 0x88c4,
-  /* 2nd byte: 99 */ 0x88d4,
-  /* 2nd byte: 100 */ 0x88d8,
-  /* 2nd byte: 101 */ 0x88d9,
-  /* 2nd byte: 102 */ 0x88dd,
-  /* 2nd byte: 103 */ 0x88f9,
-  /* 2nd byte: 104 */ 0x8902,
-  /* 2nd byte: 105 */ 0x88fc,
-  /* 2nd byte: 106 */ 0x88f4,
-  /* 2nd byte: 107 */ 0x88e8,
-  /* 2nd byte: 108 */ 0x88f2,
-  /* 2nd byte: 109 */ 0x8904,
-  /* 2nd byte: 110 */ 0x890c,
-  /* 2nd byte: 111 */ 0x890a,
-  /* 2nd byte: 112 */ 0x8913,
-  /* 2nd byte: 113 */ 0x8943,
-  /* 2nd byte: 114 */ 0x891e,
-  /* 2nd byte: 115 */ 0x8925,
-  /* 2nd byte: 116 */ 0x892a,
-  /* 2nd byte: 117 */ 0x892b,
-  /* 2nd byte: 118 */ 0x8941,
-  /* 2nd byte: 119 */ 0x8944,
-  /* 2nd byte: 120 */ 0x893b,
-  /* 2nd byte: 121 */ 0x8936,
-  /* 2nd byte: 122 */ 0x8938,
-  /* 2nd byte: 123 */ 0x894c,
-  /* 2nd byte: 124 */ 0x891d,
-  /* 2nd byte: 125 */ 0x8960,
-  /* 2nd byte: 126 */ 0x895e},
-/* 1st byte: 107 */ { 
-  /* 2nd byte: 33 */ 0x8966,
-  /* 2nd byte: 34 */ 0x8964,
-  /* 2nd byte: 35 */ 0x896d,
-  /* 2nd byte: 36 */ 0x896a,
-  /* 2nd byte: 37 */ 0x896f,
-  /* 2nd byte: 38 */ 0x8974,
-  /* 2nd byte: 39 */ 0x8977,
-  /* 2nd byte: 40 */ 0x897e,
-  /* 2nd byte: 41 */ 0x8983,
-  /* 2nd byte: 42 */ 0x8988,
-  /* 2nd byte: 43 */ 0x898a,
-  /* 2nd byte: 44 */ 0x8993,
-  /* 2nd byte: 45 */ 0x8998,
-  /* 2nd byte: 46 */ 0x89a1,
-  /* 2nd byte: 47 */ 0x89a9,
-  /* 2nd byte: 48 */ 0x89a6,
-  /* 2nd byte: 49 */ 0x89ac,
-  /* 2nd byte: 50 */ 0x89af,
-  /* 2nd byte: 51 */ 0x89b2,
-  /* 2nd byte: 52 */ 0x89ba,
-  /* 2nd byte: 53 */ 0x89bd,
-  /* 2nd byte: 54 */ 0x89bf,
-  /* 2nd byte: 55 */ 0x89c0,
-  /* 2nd byte: 56 */ 0x89da,
-  /* 2nd byte: 57 */ 0x89dc,
-  /* 2nd byte: 58 */ 0x89dd,
-  /* 2nd byte: 59 */ 0x89e7,
-  /* 2nd byte: 60 */ 0x89f4,
-  /* 2nd byte: 61 */ 0x89f8,
-  /* 2nd byte: 62 */ 0x8a03,
-  /* 2nd byte: 63 */ 0x8a16,
-  /* 2nd byte: 64 */ 0x8a10,
-  /* 2nd byte: 65 */ 0x8a0c,
-  /* 2nd byte: 66 */ 0x8a1b,
-  /* 2nd byte: 67 */ 0x8a1d,
-  /* 2nd byte: 68 */ 0x8a25,
-  /* 2nd byte: 69 */ 0x8a36,
-  /* 2nd byte: 70 */ 0x8a41,
-  /* 2nd byte: 71 */ 0x8a5b,
-  /* 2nd byte: 72 */ 0x8a52,
-  /* 2nd byte: 73 */ 0x8a46,
-  /* 2nd byte: 74 */ 0x8a48,
-  /* 2nd byte: 75 */ 0x8a7c,
-  /* 2nd byte: 76 */ 0x8a6d,
-  /* 2nd byte: 77 */ 0x8a6c,
-  /* 2nd byte: 78 */ 0x8a62,
-  /* 2nd byte: 79 */ 0x8a85,
-  /* 2nd byte: 80 */ 0x8a82,
-  /* 2nd byte: 81 */ 0x8a84,
-  /* 2nd byte: 82 */ 0x8aa8,
-  /* 2nd byte: 83 */ 0x8aa1,
-  /* 2nd byte: 84 */ 0x8a91,
-  /* 2nd byte: 85 */ 0x8aa5,
-  /* 2nd byte: 86 */ 0x8aa6,
-  /* 2nd byte: 87 */ 0x8a9a,
-  /* 2nd byte: 88 */ 0x8aa3,
-  /* 2nd byte: 89 */ 0x8ac4,
-  /* 2nd byte: 90 */ 0x8acd,
-  /* 2nd byte: 91 */ 0x8ac2,
-  /* 2nd byte: 92 */ 0x8ada,
-  /* 2nd byte: 93 */ 0x8aeb,
-  /* 2nd byte: 94 */ 0x8af3,
-  /* 2nd byte: 95 */ 0x8ae7,
-  /* 2nd byte: 96 */ 0x8ae4,
-  /* 2nd byte: 97 */ 0x8af1,
-  /* 2nd byte: 98 */ 0x8b14,
-  /* 2nd byte: 99 */ 0x8ae0,
-  /* 2nd byte: 100 */ 0x8ae2,
-  /* 2nd byte: 101 */ 0x8af7,
-  /* 2nd byte: 102 */ 0x8ade,
-  /* 2nd byte: 103 */ 0x8adb,
-  /* 2nd byte: 104 */ 0x8b0c,
-  /* 2nd byte: 105 */ 0x8b07,
-  /* 2nd byte: 106 */ 0x8b1a,
-  /* 2nd byte: 107 */ 0x8ae1,
-  /* 2nd byte: 108 */ 0x8b16,
-  /* 2nd byte: 109 */ 0x8b10,
-  /* 2nd byte: 110 */ 0x8b17,
-  /* 2nd byte: 111 */ 0x8b20,
-  /* 2nd byte: 112 */ 0x8b33,
-  /* 2nd byte: 113 */ 0x97ab,
-  /* 2nd byte: 114 */ 0x8b26,
-  /* 2nd byte: 115 */ 0x8b2b,
-  /* 2nd byte: 116 */ 0x8b3e,
-  /* 2nd byte: 117 */ 0x8b28,
-  /* 2nd byte: 118 */ 0x8b41,
-  /* 2nd byte: 119 */ 0x8b4c,
-  /* 2nd byte: 120 */ 0x8b4f,
-  /* 2nd byte: 121 */ 0x8b4e,
-  /* 2nd byte: 122 */ 0x8b49,
-  /* 2nd byte: 123 */ 0x8b56,
-  /* 2nd byte: 124 */ 0x8b5b,
-  /* 2nd byte: 125 */ 0x8b5a,
-  /* 2nd byte: 126 */ 0x8b6b},
-/* 1st byte: 108 */ { 
-  /* 2nd byte: 33 */ 0x8b5f,
-  /* 2nd byte: 34 */ 0x8b6c,
-  /* 2nd byte: 35 */ 0x8b6f,
-  /* 2nd byte: 36 */ 0x8b74,
-  /* 2nd byte: 37 */ 0x8b7d,
-  /* 2nd byte: 38 */ 0x8b80,
-  /* 2nd byte: 39 */ 0x8b8c,
-  /* 2nd byte: 40 */ 0x8b8e,
-  /* 2nd byte: 41 */ 0x8b92,
-  /* 2nd byte: 42 */ 0x8b93,
-  /* 2nd byte: 43 */ 0x8b96,
-  /* 2nd byte: 44 */ 0x8b99,
-  /* 2nd byte: 45 */ 0x8b9a,
-  /* 2nd byte: 46 */ 0x8c3a,
-  /* 2nd byte: 47 */ 0x8c41,
-  /* 2nd byte: 48 */ 0x8c3f,
-  /* 2nd byte: 49 */ 0x8c48,
-  /* 2nd byte: 50 */ 0x8c4c,
-  /* 2nd byte: 51 */ 0x8c4e,
-  /* 2nd byte: 52 */ 0x8c50,
-  /* 2nd byte: 53 */ 0x8c55,
-  /* 2nd byte: 54 */ 0x8c62,
-  /* 2nd byte: 55 */ 0x8c6c,
-  /* 2nd byte: 56 */ 0x8c78,
-  /* 2nd byte: 57 */ 0x8c7a,
-  /* 2nd byte: 58 */ 0x8c82,
-  /* 2nd byte: 59 */ 0x8c89,
-  /* 2nd byte: 60 */ 0x8c85,
-  /* 2nd byte: 61 */ 0x8c8a,
-  /* 2nd byte: 62 */ 0x8c8d,
-  /* 2nd byte: 63 */ 0x8c8e,
-  /* 2nd byte: 64 */ 0x8c94,
-  /* 2nd byte: 65 */ 0x8c7c,
-  /* 2nd byte: 66 */ 0x8c98,
-  /* 2nd byte: 67 */ 0x621d,
-  /* 2nd byte: 68 */ 0x8cad,
-  /* 2nd byte: 69 */ 0x8caa,
-  /* 2nd byte: 70 */ 0x8cbd,
-  /* 2nd byte: 71 */ 0x8cb2,
-  /* 2nd byte: 72 */ 0x8cb3,
-  /* 2nd byte: 73 */ 0x8cae,
-  /* 2nd byte: 74 */ 0x8cb6,
-  /* 2nd byte: 75 */ 0x8cc8,
-  /* 2nd byte: 76 */ 0x8cc1,
-  /* 2nd byte: 77 */ 0x8ce4,
-  /* 2nd byte: 78 */ 0x8ce3,
-  /* 2nd byte: 79 */ 0x8cda,
-  /* 2nd byte: 80 */ 0x8cfd,
-  /* 2nd byte: 81 */ 0x8cfa,
-  /* 2nd byte: 82 */ 0x8cfb,
-  /* 2nd byte: 83 */ 0x8d04,
-  /* 2nd byte: 84 */ 0x8d05,
-  /* 2nd byte: 85 */ 0x8d0a,
-  /* 2nd byte: 86 */ 0x8d07,
-  /* 2nd byte: 87 */ 0x8d0f,
-  /* 2nd byte: 88 */ 0x8d0d,
-  /* 2nd byte: 89 */ 0x8d10,
-  /* 2nd byte: 90 */ 0x9f4e,
-  /* 2nd byte: 91 */ 0x8d13,
-  /* 2nd byte: 92 */ 0x8ccd,
-  /* 2nd byte: 93 */ 0x8d14,
-  /* 2nd byte: 94 */ 0x8d16,
-  /* 2nd byte: 95 */ 0x8d67,
-  /* 2nd byte: 96 */ 0x8d6d,
-  /* 2nd byte: 97 */ 0x8d71,
-  /* 2nd byte: 98 */ 0x8d73,
-  /* 2nd byte: 99 */ 0x8d81,
-  /* 2nd byte: 100 */ 0x8d99,
-  /* 2nd byte: 101 */ 0x8dc2,
-  /* 2nd byte: 102 */ 0x8dbe,
-  /* 2nd byte: 103 */ 0x8dba,
-  /* 2nd byte: 104 */ 0x8dcf,
-  /* 2nd byte: 105 */ 0x8dda,
-  /* 2nd byte: 106 */ 0x8dd6,
-  /* 2nd byte: 107 */ 0x8dcc,
-  /* 2nd byte: 108 */ 0x8ddb,
-  /* 2nd byte: 109 */ 0x8dcb,
-  /* 2nd byte: 110 */ 0x8dea,
-  /* 2nd byte: 111 */ 0x8deb,
-  /* 2nd byte: 112 */ 0x8ddf,
-  /* 2nd byte: 113 */ 0x8de3,
-  /* 2nd byte: 114 */ 0x8dfc,
-  /* 2nd byte: 115 */ 0x8e08,
-  /* 2nd byte: 116 */ 0x8e09,
-  /* 2nd byte: 117 */ 0x8dff,
-  /* 2nd byte: 118 */ 0x8e1d,
-  /* 2nd byte: 119 */ 0x8e1e,
-  /* 2nd byte: 120 */ 0x8e10,
-  /* 2nd byte: 121 */ 0x8e1f,
-  /* 2nd byte: 122 */ 0x8e42,
-  /* 2nd byte: 123 */ 0x8e35,
-  /* 2nd byte: 124 */ 0x8e30,
-  /* 2nd byte: 125 */ 0x8e34,
-  /* 2nd byte: 126 */ 0x8e4a},
-/* 1st byte: 109 */ { 
-  /* 2nd byte: 33 */ 0x8e47,
-  /* 2nd byte: 34 */ 0x8e49,
-  /* 2nd byte: 35 */ 0x8e4c,
-  /* 2nd byte: 36 */ 0x8e50,
-  /* 2nd byte: 37 */ 0x8e48,
-  /* 2nd byte: 38 */ 0x8e59,
-  /* 2nd byte: 39 */ 0x8e64,
-  /* 2nd byte: 40 */ 0x8e60,
-  /* 2nd byte: 41 */ 0x8e2a,
-  /* 2nd byte: 42 */ 0x8e63,
-  /* 2nd byte: 43 */ 0x8e55,
-  /* 2nd byte: 44 */ 0x8e76,
-  /* 2nd byte: 45 */ 0x8e72,
-  /* 2nd byte: 46 */ 0x8e7c,
-  /* 2nd byte: 47 */ 0x8e81,
-  /* 2nd byte: 48 */ 0x8e87,
-  /* 2nd byte: 49 */ 0x8e85,
-  /* 2nd byte: 50 */ 0x8e84,
-  /* 2nd byte: 51 */ 0x8e8b,
-  /* 2nd byte: 52 */ 0x8e8a,
-  /* 2nd byte: 53 */ 0x8e93,
-  /* 2nd byte: 54 */ 0x8e91,
-  /* 2nd byte: 55 */ 0x8e94,
-  /* 2nd byte: 56 */ 0x8e99,
-  /* 2nd byte: 57 */ 0x8eaa,
-  /* 2nd byte: 58 */ 0x8ea1,
-  /* 2nd byte: 59 */ 0x8eac,
-  /* 2nd byte: 60 */ 0x8eb0,
-  /* 2nd byte: 61 */ 0x8ec6,
-  /* 2nd byte: 62 */ 0x8eb1,
-  /* 2nd byte: 63 */ 0x8ebe,
-  /* 2nd byte: 64 */ 0x8ec5,
-  /* 2nd byte: 65 */ 0x8ec8,
-  /* 2nd byte: 66 */ 0x8ecb,
-  /* 2nd byte: 67 */ 0x8edb,
-  /* 2nd byte: 68 */ 0x8ee3,
-  /* 2nd byte: 69 */ 0x8efc,
-  /* 2nd byte: 70 */ 0x8efb,
-  /* 2nd byte: 71 */ 0x8eeb,
-  /* 2nd byte: 72 */ 0x8efe,
-  /* 2nd byte: 73 */ 0x8f0a,
-  /* 2nd byte: 74 */ 0x8f05,
-  /* 2nd byte: 75 */ 0x8f15,
-  /* 2nd byte: 76 */ 0x8f12,
-  /* 2nd byte: 77 */ 0x8f19,
-  /* 2nd byte: 78 */ 0x8f13,
-  /* 2nd byte: 79 */ 0x8f1c,
-  /* 2nd byte: 80 */ 0x8f1f,
-  /* 2nd byte: 81 */ 0x8f1b,
-  /* 2nd byte: 82 */ 0x8f0c,
-  /* 2nd byte: 83 */ 0x8f26,
-  /* 2nd byte: 84 */ 0x8f33,
-  /* 2nd byte: 85 */ 0x8f3b,
-  /* 2nd byte: 86 */ 0x8f39,
-  /* 2nd byte: 87 */ 0x8f45,
-  /* 2nd byte: 88 */ 0x8f42,
-  /* 2nd byte: 89 */ 0x8f3e,
-  /* 2nd byte: 90 */ 0x8f4c,
-  /* 2nd byte: 91 */ 0x8f49,
-  /* 2nd byte: 92 */ 0x8f46,
-  /* 2nd byte: 93 */ 0x8f4e,
-  /* 2nd byte: 94 */ 0x8f57,
-  /* 2nd byte: 95 */ 0x8f5c,
-  /* 2nd byte: 96 */ 0x8f62,
-  /* 2nd byte: 97 */ 0x8f63,
-  /* 2nd byte: 98 */ 0x8f64,
-  /* 2nd byte: 99 */ 0x8f9c,
-  /* 2nd byte: 100 */ 0x8f9f,
-  /* 2nd byte: 101 */ 0x8fa3,
-  /* 2nd byte: 102 */ 0x8fad,
-  /* 2nd byte: 103 */ 0x8faf,
-  /* 2nd byte: 104 */ 0x8fb7,
-  /* 2nd byte: 105 */ 0x8fda,
-  /* 2nd byte: 106 */ 0x8fe5,
-  /* 2nd byte: 107 */ 0x8fe2,
-  /* 2nd byte: 108 */ 0x8fea,
-  /* 2nd byte: 109 */ 0x8fef,
-  /* 2nd byte: 110 */ 0x9087,
-  /* 2nd byte: 111 */ 0x8ff4,
-  /* 2nd byte: 112 */ 0x9005,
-  /* 2nd byte: 113 */ 0x8ff9,
-  /* 2nd byte: 114 */ 0x8ffa,
-  /* 2nd byte: 115 */ 0x9011,
-  /* 2nd byte: 116 */ 0x9015,
-  /* 2nd byte: 117 */ 0x9021,
-  /* 2nd byte: 118 */ 0x900d,
-  /* 2nd byte: 119 */ 0x901e,
-  /* 2nd byte: 120 */ 0x9016,
-  /* 2nd byte: 121 */ 0x900b,
-  /* 2nd byte: 122 */ 0x9027,
-  /* 2nd byte: 123 */ 0x9036,
-  /* 2nd byte: 124 */ 0x9035,
-  /* 2nd byte: 125 */ 0x9039,
-  /* 2nd byte: 126 */ 0x8ff8},
-/* 1st byte: 110 */ { 
-  /* 2nd byte: 33 */ 0x904f,
-  /* 2nd byte: 34 */ 0x9050,
-  /* 2nd byte: 35 */ 0x9051,
-  /* 2nd byte: 36 */ 0x9052,
-  /* 2nd byte: 37 */ 0x900e,
-  /* 2nd byte: 38 */ 0x9049,
-  /* 2nd byte: 39 */ 0x903e,
-  /* 2nd byte: 40 */ 0x9056,
-  /* 2nd byte: 41 */ 0x9058,
-  /* 2nd byte: 42 */ 0x905e,
-  /* 2nd byte: 43 */ 0x9068,
-  /* 2nd byte: 44 */ 0x906f,
-  /* 2nd byte: 45 */ 0x9076,
-  /* 2nd byte: 46 */ 0x96a8,
-  /* 2nd byte: 47 */ 0x9072,
-  /* 2nd byte: 48 */ 0x9082,
-  /* 2nd byte: 49 */ 0x907d,
-  /* 2nd byte: 50 */ 0x9081,
-  /* 2nd byte: 51 */ 0x9080,
-  /* 2nd byte: 52 */ 0x908a,
-  /* 2nd byte: 53 */ 0x9089,
-  /* 2nd byte: 54 */ 0x908f,
-  /* 2nd byte: 55 */ 0x90a8,
-  /* 2nd byte: 56 */ 0x90af,
-  /* 2nd byte: 57 */ 0x90b1,
-  /* 2nd byte: 58 */ 0x90b5,
-  /* 2nd byte: 59 */ 0x90e2,
-  /* 2nd byte: 60 */ 0x90e4,
-  /* 2nd byte: 61 */ 0x6248,
-  /* 2nd byte: 62 */ 0x90db,
-  /* 2nd byte: 63 */ 0x9102,
-  /* 2nd byte: 64 */ 0x9112,
-  /* 2nd byte: 65 */ 0x9119,
-  /* 2nd byte: 66 */ 0x9132,
-  /* 2nd byte: 67 */ 0x9130,
-  /* 2nd byte: 68 */ 0x914a,
-  /* 2nd byte: 69 */ 0x9156,
-  /* 2nd byte: 70 */ 0x9158,
-  /* 2nd byte: 71 */ 0x9163,
-  /* 2nd byte: 72 */ 0x9165,
-  /* 2nd byte: 73 */ 0x9169,
-  /* 2nd byte: 74 */ 0x9173,
-  /* 2nd byte: 75 */ 0x9172,
-  /* 2nd byte: 76 */ 0x918b,
-  /* 2nd byte: 77 */ 0x9189,
-  /* 2nd byte: 78 */ 0x9182,
-  /* 2nd byte: 79 */ 0x91a2,
-  /* 2nd byte: 80 */ 0x91ab,
-  /* 2nd byte: 81 */ 0x91af,
-  /* 2nd byte: 82 */ 0x91aa,
-  /* 2nd byte: 83 */ 0x91b5,
-  /* 2nd byte: 84 */ 0x91b4,
-  /* 2nd byte: 85 */ 0x91ba,
-  /* 2nd byte: 86 */ 0x91c0,
-  /* 2nd byte: 87 */ 0x91c1,
-  /* 2nd byte: 88 */ 0x91c9,
-  /* 2nd byte: 89 */ 0x91cb,
-  /* 2nd byte: 90 */ 0x91d0,
-  /* 2nd byte: 91 */ 0x91d6,
-  /* 2nd byte: 92 */ 0x91df,
-  /* 2nd byte: 93 */ 0x91e1,
-  /* 2nd byte: 94 */ 0x91db,
-  /* 2nd byte: 95 */ 0x91fc,
-  /* 2nd byte: 96 */ 0x91f5,
-  /* 2nd byte: 97 */ 0x91f6,
-  /* 2nd byte: 98 */ 0x921e,
-  /* 2nd byte: 99 */ 0x91ff,
-  /* 2nd byte: 100 */ 0x9214,
-  /* 2nd byte: 101 */ 0x922c,
-  /* 2nd byte: 102 */ 0x9215,
-  /* 2nd byte: 103 */ 0x9211,
-  /* 2nd byte: 104 */ 0x925e,
-  /* 2nd byte: 105 */ 0x9257,
-  /* 2nd byte: 106 */ 0x9245,
-  /* 2nd byte: 107 */ 0x9249,
-  /* 2nd byte: 108 */ 0x9264,
-  /* 2nd byte: 109 */ 0x9248,
-  /* 2nd byte: 110 */ 0x9295,
-  /* 2nd byte: 111 */ 0x923f,
-  /* 2nd byte: 112 */ 0x924b,
-  /* 2nd byte: 113 */ 0x9250,
-  /* 2nd byte: 114 */ 0x929c,
-  /* 2nd byte: 115 */ 0x9296,
-  /* 2nd byte: 116 */ 0x9293,
-  /* 2nd byte: 117 */ 0x929b,
-  /* 2nd byte: 118 */ 0x925a,
-  /* 2nd byte: 119 */ 0x92cf,
-  /* 2nd byte: 120 */ 0x92b9,
-  /* 2nd byte: 121 */ 0x92b7,
-  /* 2nd byte: 122 */ 0x92e9,
-  /* 2nd byte: 123 */ 0x930f,
-  /* 2nd byte: 124 */ 0x92fa,
-  /* 2nd byte: 125 */ 0x9344,
-  /* 2nd byte: 126 */ 0x932e},
-/* 1st byte: 111 */ { 
-  /* 2nd byte: 33 */ 0x9319,
-  /* 2nd byte: 34 */ 0x9322,
-  /* 2nd byte: 35 */ 0x931a,
-  /* 2nd byte: 36 */ 0x9323,
-  /* 2nd byte: 37 */ 0x933a,
-  /* 2nd byte: 38 */ 0x9335,
-  /* 2nd byte: 39 */ 0x933b,
-  /* 2nd byte: 40 */ 0x935c,
-  /* 2nd byte: 41 */ 0x9360,
-  /* 2nd byte: 42 */ 0x937c,
-  /* 2nd byte: 43 */ 0x936e,
-  /* 2nd byte: 44 */ 0x9356,
-  /* 2nd byte: 45 */ 0x93b0,
-  /* 2nd byte: 46 */ 0x93ac,
-  /* 2nd byte: 47 */ 0x93ad,
-  /* 2nd byte: 48 */ 0x9394,
-  /* 2nd byte: 49 */ 0x93b9,
-  /* 2nd byte: 50 */ 0x93d6,
-  /* 2nd byte: 51 */ 0x93d7,
-  /* 2nd byte: 52 */ 0x93e8,
-  /* 2nd byte: 53 */ 0x93e5,
-  /* 2nd byte: 54 */ 0x93d8,
-  /* 2nd byte: 55 */ 0x93c3,
-  /* 2nd byte: 56 */ 0x93dd,
-  /* 2nd byte: 57 */ 0x93d0,
-  /* 2nd byte: 58 */ 0x93c8,
-  /* 2nd byte: 59 */ 0x93e4,
-  /* 2nd byte: 60 */ 0x941a,
-  /* 2nd byte: 61 */ 0x9414,
-  /* 2nd byte: 62 */ 0x9413,
-  /* 2nd byte: 63 */ 0x9403,
-  /* 2nd byte: 64 */ 0x9407,
-  /* 2nd byte: 65 */ 0x9410,
-  /* 2nd byte: 66 */ 0x9436,
-  /* 2nd byte: 67 */ 0x942b,
-  /* 2nd byte: 68 */ 0x9435,
-  /* 2nd byte: 69 */ 0x9421,
-  /* 2nd byte: 70 */ 0x943a,
-  /* 2nd byte: 71 */ 0x9441,
-  /* 2nd byte: 72 */ 0x9452,
-  /* 2nd byte: 73 */ 0x9444,
-  /* 2nd byte: 74 */ 0x945b,
-  /* 2nd byte: 75 */ 0x9460,
-  /* 2nd byte: 76 */ 0x9462,
-  /* 2nd byte: 77 */ 0x945e,
-  /* 2nd byte: 78 */ 0x946a,
-  /* 2nd byte: 79 */ 0x9229,
-  /* 2nd byte: 80 */ 0x9470,
-  /* 2nd byte: 81 */ 0x9475,
-  /* 2nd byte: 82 */ 0x9477,
-  /* 2nd byte: 83 */ 0x947d,
-  /* 2nd byte: 84 */ 0x945a,
-  /* 2nd byte: 85 */ 0x947c,
-  /* 2nd byte: 86 */ 0x947e,
-  /* 2nd byte: 87 */ 0x9481,
-  /* 2nd byte: 88 */ 0x947f,
-  /* 2nd byte: 89 */ 0x9582,
-  /* 2nd byte: 90 */ 0x9587,
-  /* 2nd byte: 91 */ 0x958a,
-  /* 2nd byte: 92 */ 0x9594,
-  /* 2nd byte: 93 */ 0x9596,
-  /* 2nd byte: 94 */ 0x9598,
-  /* 2nd byte: 95 */ 0x9599,
-  /* 2nd byte: 96 */ 0x95a0,
-  /* 2nd byte: 97 */ 0x95a8,
-  /* 2nd byte: 98 */ 0x95a7,
-  /* 2nd byte: 99 */ 0x95ad,
-  /* 2nd byte: 100 */ 0x95bc,
-  /* 2nd byte: 101 */ 0x95bb,
-  /* 2nd byte: 102 */ 0x95b9,
-  /* 2nd byte: 103 */ 0x95be,
-  /* 2nd byte: 104 */ 0x95ca,
-  /* 2nd byte: 105 */ 0x6ff6,
-  /* 2nd byte: 106 */ 0x95c3,
-  /* 2nd byte: 107 */ 0x95cd,
-  /* 2nd byte: 108 */ 0x95cc,
-  /* 2nd byte: 109 */ 0x95d5,
-  /* 2nd byte: 110 */ 0x95d4,
-  /* 2nd byte: 111 */ 0x95d6,
-  /* 2nd byte: 112 */ 0x95dc,
-  /* 2nd byte: 113 */ 0x95e1,
-  /* 2nd byte: 114 */ 0x95e5,
-  /* 2nd byte: 115 */ 0x95e2,
-  /* 2nd byte: 116 */ 0x9621,
-  /* 2nd byte: 117 */ 0x9628,
-  /* 2nd byte: 118 */ 0x962e,
-  /* 2nd byte: 119 */ 0x962f,
-  /* 2nd byte: 120 */ 0x9642,
-  /* 2nd byte: 121 */ 0x964c,
-  /* 2nd byte: 122 */ 0x964f,
-  /* 2nd byte: 123 */ 0x964b,
-  /* 2nd byte: 124 */ 0x9677,
-  /* 2nd byte: 125 */ 0x965c,
-  /* 2nd byte: 126 */ 0x965e},
-/* 1st byte: 112 */ { 
-  /* 2nd byte: 33 */ 0x965d,
-  /* 2nd byte: 34 */ 0x965f,
-  /* 2nd byte: 35 */ 0x9666,
-  /* 2nd byte: 36 */ 0x9672,
-  /* 2nd byte: 37 */ 0x966c,
-  /* 2nd byte: 38 */ 0x968d,
-  /* 2nd byte: 39 */ 0x9698,
-  /* 2nd byte: 40 */ 0x9695,
-  /* 2nd byte: 41 */ 0x9697,
-  /* 2nd byte: 42 */ 0x96aa,
-  /* 2nd byte: 43 */ 0x96a7,
-  /* 2nd byte: 44 */ 0x96b1,
-  /* 2nd byte: 45 */ 0x96b2,
-  /* 2nd byte: 46 */ 0x96b0,
-  /* 2nd byte: 47 */ 0x96b4,
-  /* 2nd byte: 48 */ 0x96b6,
-  /* 2nd byte: 49 */ 0x96b8,
-  /* 2nd byte: 50 */ 0x96b9,
-  /* 2nd byte: 51 */ 0x96ce,
-  /* 2nd byte: 52 */ 0x96cb,
-  /* 2nd byte: 53 */ 0x96c9,
-  /* 2nd byte: 54 */ 0x96cd,
-  /* 2nd byte: 55 */ 0x894d,
-  /* 2nd byte: 56 */ 0x96dc,
-  /* 2nd byte: 57 */ 0x970d,
-  /* 2nd byte: 58 */ 0x96d5,
-  /* 2nd byte: 59 */ 0x96f9,
-  /* 2nd byte: 60 */ 0x9704,
-  /* 2nd byte: 61 */ 0x9706,
-  /* 2nd byte: 62 */ 0x9708,
-  /* 2nd byte: 63 */ 0x9713,
-  /* 2nd byte: 64 */ 0x970e,
-  /* 2nd byte: 65 */ 0x9711,
-  /* 2nd byte: 66 */ 0x970f,
-  /* 2nd byte: 67 */ 0x9716,
-  /* 2nd byte: 68 */ 0x9719,
-  /* 2nd byte: 69 */ 0x9724,
-  /* 2nd byte: 70 */ 0x972a,
-  /* 2nd byte: 71 */ 0x9730,
-  /* 2nd byte: 72 */ 0x9739,
-  /* 2nd byte: 73 */ 0x973d,
-  /* 2nd byte: 74 */ 0x973e,
-  /* 2nd byte: 75 */ 0x9744,
-  /* 2nd byte: 76 */ 0x9746,
-  /* 2nd byte: 77 */ 0x9748,
-  /* 2nd byte: 78 */ 0x9742,
-  /* 2nd byte: 79 */ 0x9749,
-  /* 2nd byte: 80 */ 0x975c,
-  /* 2nd byte: 81 */ 0x9760,
-  /* 2nd byte: 82 */ 0x9764,
-  /* 2nd byte: 83 */ 0x9766,
-  /* 2nd byte: 84 */ 0x9768,
-  /* 2nd byte: 85 */ 0x52d2,
-  /* 2nd byte: 86 */ 0x976b,
-  /* 2nd byte: 87 */ 0x9771,
-  /* 2nd byte: 88 */ 0x9779,
-  /* 2nd byte: 89 */ 0x9785,
-  /* 2nd byte: 90 */ 0x977c,
-  /* 2nd byte: 91 */ 0x9781,
-  /* 2nd byte: 92 */ 0x977a,
-  /* 2nd byte: 93 */ 0x9786,
-  /* 2nd byte: 94 */ 0x978b,
-  /* 2nd byte: 95 */ 0x978f,
-  /* 2nd byte: 96 */ 0x9790,
-  /* 2nd byte: 97 */ 0x979c,
-  /* 2nd byte: 98 */ 0x97a8,
-  /* 2nd byte: 99 */ 0x97a6,
-  /* 2nd byte: 100 */ 0x97a3,
-  /* 2nd byte: 101 */ 0x97b3,
-  /* 2nd byte: 102 */ 0x97b4,
-  /* 2nd byte: 103 */ 0x97c3,
-  /* 2nd byte: 104 */ 0x97c6,
-  /* 2nd byte: 105 */ 0x97c8,
-  /* 2nd byte: 106 */ 0x97cb,
-  /* 2nd byte: 107 */ 0x97dc,
-  /* 2nd byte: 108 */ 0x97ed,
-  /* 2nd byte: 109 */ 0x9f4f,
-  /* 2nd byte: 110 */ 0x97f2,
-  /* 2nd byte: 111 */ 0x7adf,
-  /* 2nd byte: 112 */ 0x97f6,
-  /* 2nd byte: 113 */ 0x97f5,
-  /* 2nd byte: 114 */ 0x980f,
-  /* 2nd byte: 115 */ 0x980c,
-  /* 2nd byte: 116 */ 0x9838,
-  /* 2nd byte: 117 */ 0x9824,
-  /* 2nd byte: 118 */ 0x9821,
-  /* 2nd byte: 119 */ 0x9837,
-  /* 2nd byte: 120 */ 0x983d,
-  /* 2nd byte: 121 */ 0x9846,
-  /* 2nd byte: 122 */ 0x984f,
-  /* 2nd byte: 123 */ 0x984b,
-  /* 2nd byte: 124 */ 0x986b,
-  /* 2nd byte: 125 */ 0x986f,
-  /* 2nd byte: 126 */ 0x9870},
-/* 1st byte: 113 */ { 
-  /* 2nd byte: 33 */ 0x9871,
-  /* 2nd byte: 34 */ 0x9874,
-  /* 2nd byte: 35 */ 0x9873,
-  /* 2nd byte: 36 */ 0x98aa,
-  /* 2nd byte: 37 */ 0x98af,
-  /* 2nd byte: 38 */ 0x98b1,
-  /* 2nd byte: 39 */ 0x98b6,
-  /* 2nd byte: 40 */ 0x98c4,
-  /* 2nd byte: 41 */ 0x98c3,
-  /* 2nd byte: 42 */ 0x98c6,
-  /* 2nd byte: 43 */ 0x98e9,
-  /* 2nd byte: 44 */ 0x98eb,
-  /* 2nd byte: 45 */ 0x9903,
-  /* 2nd byte: 46 */ 0x9909,
-  /* 2nd byte: 47 */ 0x9912,
-  /* 2nd byte: 48 */ 0x9914,
-  /* 2nd byte: 49 */ 0x9918,
-  /* 2nd byte: 50 */ 0x9921,
-  /* 2nd byte: 51 */ 0x991d,
-  /* 2nd byte: 52 */ 0x991e,
-  /* 2nd byte: 53 */ 0x9924,
-  /* 2nd byte: 54 */ 0x9920,
-  /* 2nd byte: 55 */ 0x992c,
-  /* 2nd byte: 56 */ 0x992e,
-  /* 2nd byte: 57 */ 0x993d,
-  /* 2nd byte: 58 */ 0x993e,
-  /* 2nd byte: 59 */ 0x9942,
-  /* 2nd byte: 60 */ 0x9949,
-  /* 2nd byte: 61 */ 0x9945,
-  /* 2nd byte: 62 */ 0x9950,
-  /* 2nd byte: 63 */ 0x994b,
-  /* 2nd byte: 64 */ 0x9951,
-  /* 2nd byte: 65 */ 0x9952,
-  /* 2nd byte: 66 */ 0x994c,
-  /* 2nd byte: 67 */ 0x9955,
-  /* 2nd byte: 68 */ 0x9997,
-  /* 2nd byte: 69 */ 0x9998,
-  /* 2nd byte: 70 */ 0x99a5,
-  /* 2nd byte: 71 */ 0x99ad,
-  /* 2nd byte: 72 */ 0x99ae,
-  /* 2nd byte: 73 */ 0x99bc,
-  /* 2nd byte: 74 */ 0x99df,
-  /* 2nd byte: 75 */ 0x99db,
-  /* 2nd byte: 76 */ 0x99dd,
-  /* 2nd byte: 77 */ 0x99d8,
-  /* 2nd byte: 78 */ 0x99d1,
-  /* 2nd byte: 79 */ 0x99ed,
-  /* 2nd byte: 80 */ 0x99ee,
-  /* 2nd byte: 81 */ 0x99f1,
-  /* 2nd byte: 82 */ 0x99f2,
-  /* 2nd byte: 83 */ 0x99fb,
-  /* 2nd byte: 84 */ 0x99f8,
-  /* 2nd byte: 85 */ 0x9a01,
-  /* 2nd byte: 86 */ 0x9a0f,
-  /* 2nd byte: 87 */ 0x9a05,
-  /* 2nd byte: 88 */ 0x99e2,
-  /* 2nd byte: 89 */ 0x9a19,
-  /* 2nd byte: 90 */ 0x9a2b,
-  /* 2nd byte: 91 */ 0x9a37,
-  /* 2nd byte: 92 */ 0x9a45,
-  /* 2nd byte: 93 */ 0x9a42,
-  /* 2nd byte: 94 */ 0x9a40,
-  /* 2nd byte: 95 */ 0x9a43,
-  /* 2nd byte: 96 */ 0x9a3e,
-  /* 2nd byte: 97 */ 0x9a55,
-  /* 2nd byte: 98 */ 0x9a4d,
-  /* 2nd byte: 99 */ 0x9a5b,
-  /* 2nd byte: 100 */ 0x9a57,
-  /* 2nd byte: 101 */ 0x9a5f,
-  /* 2nd byte: 102 */ 0x9a62,
-  /* 2nd byte: 103 */ 0x9a65,
-  /* 2nd byte: 104 */ 0x9a64,
-  /* 2nd byte: 105 */ 0x9a69,
-  /* 2nd byte: 106 */ 0x9a6b,
-  /* 2nd byte: 107 */ 0x9a6a,
-  /* 2nd byte: 108 */ 0x9aad,
-  /* 2nd byte: 109 */ 0x9ab0,
-  /* 2nd byte: 110 */ 0x9abc,
-  /* 2nd byte: 111 */ 0x9ac0,
-  /* 2nd byte: 112 */ 0x9acf,
-  /* 2nd byte: 113 */ 0x9ad1,
-  /* 2nd byte: 114 */ 0x9ad3,
-  /* 2nd byte: 115 */ 0x9ad4,
-  /* 2nd byte: 116 */ 0x9ade,
-  /* 2nd byte: 117 */ 0x9adf,
-  /* 2nd byte: 118 */ 0x9ae2,
-  /* 2nd byte: 119 */ 0x9ae3,
-  /* 2nd byte: 120 */ 0x9ae6,
-  /* 2nd byte: 121 */ 0x9aef,
-  /* 2nd byte: 122 */ 0x9aeb,
-  /* 2nd byte: 123 */ 0x9aee,
-  /* 2nd byte: 124 */ 0x9af4,
-  /* 2nd byte: 125 */ 0x9af1,
-  /* 2nd byte: 126 */ 0x9af7},
-/* 1st byte: 114 */ { 
-  /* 2nd byte: 33 */ 0x9afb,
-  /* 2nd byte: 34 */ 0x9b06,
-  /* 2nd byte: 35 */ 0x9b18,
-  /* 2nd byte: 36 */ 0x9b1a,
-  /* 2nd byte: 37 */ 0x9b1f,
-  /* 2nd byte: 38 */ 0x9b22,
-  /* 2nd byte: 39 */ 0x9b23,
-  /* 2nd byte: 40 */ 0x9b25,
-  /* 2nd byte: 41 */ 0x9b27,
-  /* 2nd byte: 42 */ 0x9b28,
-  /* 2nd byte: 43 */ 0x9b29,
-  /* 2nd byte: 44 */ 0x9b2a,
-  /* 2nd byte: 45 */ 0x9b2e,
-  /* 2nd byte: 46 */ 0x9b2f,
-  /* 2nd byte: 47 */ 0x9b32,
-  /* 2nd byte: 48 */ 0x9b44,
-  /* 2nd byte: 49 */ 0x9b43,
-  /* 2nd byte: 50 */ 0x9b4f,
-  /* 2nd byte: 51 */ 0x9b4d,
-  /* 2nd byte: 52 */ 0x9b4e,
-  /* 2nd byte: 53 */ 0x9b51,
-  /* 2nd byte: 54 */ 0x9b58,
-  /* 2nd byte: 55 */ 0x9b74,
-  /* 2nd byte: 56 */ 0x9b93,
-  /* 2nd byte: 57 */ 0x9b83,
-  /* 2nd byte: 58 */ 0x9b91,
-  /* 2nd byte: 59 */ 0x9b96,
-  /* 2nd byte: 60 */ 0x9b97,
-  /* 2nd byte: 61 */ 0x9b9f,
-  /* 2nd byte: 62 */ 0x9ba0,
-  /* 2nd byte: 63 */ 0x9ba8,
-  /* 2nd byte: 64 */ 0x9bb4,
-  /* 2nd byte: 65 */ 0x9bc0,
-  /* 2nd byte: 66 */ 0x9bca,
-  /* 2nd byte: 67 */ 0x9bb9,
-  /* 2nd byte: 68 */ 0x9bc6,
-  /* 2nd byte: 69 */ 0x9bcf,
-  /* 2nd byte: 70 */ 0x9bd1,
-  /* 2nd byte: 71 */ 0x9bd2,
-  /* 2nd byte: 72 */ 0x9be3,
-  /* 2nd byte: 73 */ 0x9be2,
-  /* 2nd byte: 74 */ 0x9be4,
-  /* 2nd byte: 75 */ 0x9bd4,
-  /* 2nd byte: 76 */ 0x9be1,
-  /* 2nd byte: 77 */ 0x9c3a,
-  /* 2nd byte: 78 */ 0x9bf2,
-  /* 2nd byte: 79 */ 0x9bf1,
-  /* 2nd byte: 80 */ 0x9bf0,
-  /* 2nd byte: 81 */ 0x9c15,
-  /* 2nd byte: 82 */ 0x9c14,
-  /* 2nd byte: 83 */ 0x9c09,
-  /* 2nd byte: 84 */ 0x9c13,
-  /* 2nd byte: 85 */ 0x9c0c,
-  /* 2nd byte: 86 */ 0x9c06,
-  /* 2nd byte: 87 */ 0x9c08,
-  /* 2nd byte: 88 */ 0x9c12,
-  /* 2nd byte: 89 */ 0x9c0a,
-  /* 2nd byte: 90 */ 0x9c04,
-  /* 2nd byte: 91 */ 0x9c2e,
-  /* 2nd byte: 92 */ 0x9c1b,
-  /* 2nd byte: 93 */ 0x9c25,
-  /* 2nd byte: 94 */ 0x9c24,
-  /* 2nd byte: 95 */ 0x9c21,
-  /* 2nd byte: 96 */ 0x9c30,
-  /* 2nd byte: 97 */ 0x9c47,
-  /* 2nd byte: 98 */ 0x9c32,
-  /* 2nd byte: 99 */ 0x9c46,
-  /* 2nd byte: 100 */ 0x9c3e,
-  /* 2nd byte: 101 */ 0x9c5a,
-  /* 2nd byte: 102 */ 0x9c60,
-  /* 2nd byte: 103 */ 0x9c67,
-  /* 2nd byte: 104 */ 0x9c76,
-  /* 2nd byte: 105 */ 0x9c78,
-  /* 2nd byte: 106 */ 0x9ce7,
-  /* 2nd byte: 107 */ 0x9cec,
-  /* 2nd byte: 108 */ 0x9cf0,
-  /* 2nd byte: 109 */ 0x9d09,
-  /* 2nd byte: 110 */ 0x9d08,
-  /* 2nd byte: 111 */ 0x9ceb,
-  /* 2nd byte: 112 */ 0x9d03,
-  /* 2nd byte: 113 */ 0x9d06,
-  /* 2nd byte: 114 */ 0x9d2a,
-  /* 2nd byte: 115 */ 0x9d26,
-  /* 2nd byte: 116 */ 0x9daf,
-  /* 2nd byte: 117 */ 0x9d23,
-  /* 2nd byte: 118 */ 0x9d1f,
-  /* 2nd byte: 119 */ 0x9d44,
-  /* 2nd byte: 120 */ 0x9d15,
-  /* 2nd byte: 121 */ 0x9d12,
-  /* 2nd byte: 122 */ 0x9d41,
-  /* 2nd byte: 123 */ 0x9d3f,
-  /* 2nd byte: 124 */ 0x9d3e,
-  /* 2nd byte: 125 */ 0x9d46,
-  /* 2nd byte: 126 */ 0x9d48},
-/* 1st byte: 115 */ { 
-  /* 2nd byte: 33 */ 0x9d5d,
-  /* 2nd byte: 34 */ 0x9d5e,
-  /* 2nd byte: 35 */ 0x9d64,
-  /* 2nd byte: 36 */ 0x9d51,
-  /* 2nd byte: 37 */ 0x9d50,
-  /* 2nd byte: 38 */ 0x9d59,
-  /* 2nd byte: 39 */ 0x9d72,
-  /* 2nd byte: 40 */ 0x9d89,
-  /* 2nd byte: 41 */ 0x9d87,
-  /* 2nd byte: 42 */ 0x9dab,
-  /* 2nd byte: 43 */ 0x9d6f,
-  /* 2nd byte: 44 */ 0x9d7a,
-  /* 2nd byte: 45 */ 0x9d9a,
-  /* 2nd byte: 46 */ 0x9da4,
-  /* 2nd byte: 47 */ 0x9da9,
-  /* 2nd byte: 48 */ 0x9db2,
-  /* 2nd byte: 49 */ 0x9dc4,
-  /* 2nd byte: 50 */ 0x9dc1,
-  /* 2nd byte: 51 */ 0x9dbb,
-  /* 2nd byte: 52 */ 0x9db8,
-  /* 2nd byte: 53 */ 0x9dba,
-  /* 2nd byte: 54 */ 0x9dc6,
-  /* 2nd byte: 55 */ 0x9dcf,
-  /* 2nd byte: 56 */ 0x9dc2,
-  /* 2nd byte: 57 */ 0x9dd9,
-  /* 2nd byte: 58 */ 0x9dd3,
-  /* 2nd byte: 59 */ 0x9df8,
-  /* 2nd byte: 60 */ 0x9de6,
-  /* 2nd byte: 61 */ 0x9ded,
-  /* 2nd byte: 62 */ 0x9def,
-  /* 2nd byte: 63 */ 0x9dfd,
-  /* 2nd byte: 64 */ 0x9e1a,
-  /* 2nd byte: 65 */ 0x9e1b,
-  /* 2nd byte: 66 */ 0x9e1e,
-  /* 2nd byte: 67 */ 0x9e75,
-  /* 2nd byte: 68 */ 0x9e79,
-  /* 2nd byte: 69 */ 0x9e7d,
-  /* 2nd byte: 70 */ 0x9e81,
-  /* 2nd byte: 71 */ 0x9e88,
-  /* 2nd byte: 72 */ 0x9e8b,
-  /* 2nd byte: 73 */ 0x9e8c,
-  /* 2nd byte: 74 */ 0x9e92,
-  /* 2nd byte: 75 */ 0x9e95,
-  /* 2nd byte: 76 */ 0x9e91,
-  /* 2nd byte: 77 */ 0x9e9d,
-  /* 2nd byte: 78 */ 0x9ea5,
-  /* 2nd byte: 79 */ 0x9ea9,
-  /* 2nd byte: 80 */ 0x9eb8,
-  /* 2nd byte: 81 */ 0x9eaa,
-  /* 2nd byte: 82 */ 0x9ead,
-  /* 2nd byte: 83 */ 0x9761,
-  /* 2nd byte: 84 */ 0x9ecc,
-  /* 2nd byte: 85 */ 0x9ece,
-  /* 2nd byte: 86 */ 0x9ecf,
-  /* 2nd byte: 87 */ 0x9ed0,
-  /* 2nd byte: 88 */ 0x9ed4,
-  /* 2nd byte: 89 */ 0x9edc,
-  /* 2nd byte: 90 */ 0x9ede,
-  /* 2nd byte: 91 */ 0x9edd,
-  /* 2nd byte: 92 */ 0x9ee0,
-  /* 2nd byte: 93 */ 0x9ee5,
-  /* 2nd byte: 94 */ 0x9ee8,
-  /* 2nd byte: 95 */ 0x9eef,
-  /* 2nd byte: 96 */ 0x9ef4,
-  /* 2nd byte: 97 */ 0x9ef6,
-  /* 2nd byte: 98 */ 0x9ef7,
-  /* 2nd byte: 99 */ 0x9ef9,
-  /* 2nd byte: 100 */ 0x9efb,
-  /* 2nd byte: 101 */ 0x9efc,
-  /* 2nd byte: 102 */ 0x9efd,
-  /* 2nd byte: 103 */ 0x9f07,
-  /* 2nd byte: 104 */ 0x9f08,
-  /* 2nd byte: 105 */ 0x76b7,
-  /* 2nd byte: 106 */ 0x9f15,
-  /* 2nd byte: 107 */ 0x9f21,
-  /* 2nd byte: 108 */ 0x9f2c,
-  /* 2nd byte: 109 */ 0x9f3e,
-  /* 2nd byte: 110 */ 0x9f4a,
-  /* 2nd byte: 111 */ 0x9f52,
-  /* 2nd byte: 112 */ 0x9f54,
-  /* 2nd byte: 113 */ 0x9f63,
-  /* 2nd byte: 114 */ 0x9f5f,
-  /* 2nd byte: 115 */ 0x9f60,
-  /* 2nd byte: 116 */ 0x9f61,
-  /* 2nd byte: 117 */ 0x9f66,
-  /* 2nd byte: 118 */ 0x9f67,
-  /* 2nd byte: 119 */ 0x9f6c,
-  /* 2nd byte: 120 */ 0x9f6a,
-  /* 2nd byte: 121 */ 0x9f77,
-  /* 2nd byte: 122 */ 0x9f72,
-  /* 2nd byte: 123 */ 0x9f76,
-  /* 2nd byte: 124 */ 0x9f95,
-  /* 2nd byte: 125 */ 0x9f9c,
-  /* 2nd byte: 126 */ 0x9fa0},
-/* 1st byte: 116 */ { 
-  /* 2nd byte: 33 */ 0x582f,
-  /* 2nd byte: 34 */ 0x69c7,
-  /* 2nd byte: 35 */ 0x9059,
-  /* 2nd byte: 36 */ 0x7464,
-  /* 2nd byte: 37 */ 0x51dc,
-  /* 2nd byte: 38 */ 0x7199,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0}
-};
diff --git a/libjava/gnu/gcj/convert/JIS0212.h b/libjava/gnu/gcj/convert/JIS0212.h
deleted file mode 100644
index 2155670..0000000
--- a/libjava/gnu/gcj/convert/JIS0212.h
+++ /dev/null
@@ -1,6068 +0,0 @@
-/* This file is automatically generated from Unicode tables */
-MAP(0x22, 0x2F, 0x02D8)  /* BREVE */
-MAP(0x22, 0x30, 0x02C7)  /* CARON (Mandarin Chinese third tone) */
-MAP(0x22, 0x31, 0x00B8)  /* CEDILLA */
-MAP(0x22, 0x32, 0x02D9)  /* DOT ABOVE (Mandarin Chinese light tone) */
-MAP(0x22, 0x33, 0x02DD)  /* DOUBLE ACUTE ACCENT */
-MAP(0x22, 0x34, 0x00AF)  /* MACRON */
-MAP(0x22, 0x35, 0x02DB)  /* OGONEK */
-MAP(0x22, 0x36, 0x02DA)  /* RING ABOVE */
-MAP(0x22, 0x37, 0x007E)  /* TILDE */
-MAP(0x22, 0x38, 0x0384)  /* GREEK TONOS */
-MAP(0x22, 0x39, 0x0385)  /* GREEK DIALYTIKA TONOS */
-MAP(0x22, 0x42, 0x00A1)  /* INVERTED EXCLAMATION MARK */
-MAP(0x22, 0x43, 0x00A6)  /* BROKEN BAR */
-MAP(0x22, 0x44, 0x00BF)  /* INVERTED QUESTION MARK */
-MAP(0x22, 0x6B, 0x00BA)  /* MASCULINE ORDINAL INDICATOR */
-MAP(0x22, 0x6C, 0x00AA)  /* FEMININE ORDINAL INDICATOR */
-MAP(0x22, 0x6D, 0x00A9)  /* COPYRIGHT SIGN */
-MAP(0x22, 0x6E, 0x00AE)  /* REGISTERED SIGN */
-MAP(0x22, 0x6F, 0x2122)  /* TRADE MARK SIGN */
-MAP(0x22, 0x70, 0x00A4)  /* CURRENCY SIGN */
-MAP(0x22, 0x71, 0x2116)  /* NUMERO SIGN */
-MAP(0x26, 0x61, 0x0386)  /* GREEK CAPITAL LETTER ALPHA WITH TONOS */
-MAP(0x26, 0x62, 0x0388)  /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
-MAP(0x26, 0x63, 0x0389)  /* GREEK CAPITAL LETTER ETA WITH TONOS */
-MAP(0x26, 0x64, 0x038A)  /* GREEK CAPITAL LETTER IOTA WITH TONOS */
-MAP(0x26, 0x65, 0x03AA)  /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-MAP(0x26, 0x67, 0x038C)  /* GREEK CAPITAL LETTER OMICRON WITH TONOS */
-MAP(0x26, 0x69, 0x038E)  /* GREEK CAPITAL LETTER UPSILON WITH TONOS */
-MAP(0x26, 0x6A, 0x03AB)  /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-MAP(0x26, 0x6C, 0x038F)  /* GREEK CAPITAL LETTER OMEGA WITH TONOS */
-MAP(0x26, 0x71, 0x03AC)  /* GREEK SMALL LETTER ALPHA WITH TONOS */
-MAP(0x26, 0x72, 0x03AD)  /* GREEK SMALL LETTER EPSILON WITH TONOS */
-MAP(0x26, 0x73, 0x03AE)  /* GREEK SMALL LETTER ETA WITH TONOS */
-MAP(0x26, 0x74, 0x03AF)  /* GREEK SMALL LETTER IOTA WITH TONOS */
-MAP(0x26, 0x75, 0x03CA)  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-MAP(0x26, 0x76, 0x0390)  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-MAP(0x26, 0x77, 0x03CC)  /* GREEK SMALL LETTER OMICRON WITH TONOS */
-MAP(0x26, 0x78, 0x03C2)  /* GREEK SMALL LETTER FINAL SIGMA */
-MAP(0x26, 0x79, 0x03CD)  /* GREEK SMALL LETTER UPSILON WITH TONOS */
-MAP(0x26, 0x7A, 0x03CB)  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-MAP(0x26, 0x7B, 0x03B0)  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-MAP(0x26, 0x7C, 0x03CE)  /* GREEK SMALL LETTER OMEGA WITH TONOS */
-MAP(0x27, 0x42, 0x0402)  /* CYRILLIC CAPITAL LETTER DJE */
-MAP(0x27, 0x43, 0x0403)  /* CYRILLIC CAPITAL LETTER GJE */
-MAP(0x27, 0x44, 0x0404)  /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-MAP(0x27, 0x45, 0x0405)  /* CYRILLIC CAPITAL LETTER DZE */
-MAP(0x27, 0x46, 0x0406)  /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-MAP(0x27, 0x47, 0x0407)  /* CYRILLIC CAPITAL LETTER YI */
-MAP(0x27, 0x48, 0x0408)  /* CYRILLIC CAPITAL LETTER JE */
-MAP(0x27, 0x49, 0x0409)  /* CYRILLIC CAPITAL LETTER LJE */
-MAP(0x27, 0x4A, 0x040A)  /* CYRILLIC CAPITAL LETTER NJE */
-MAP(0x27, 0x4B, 0x040B)  /* CYRILLIC CAPITAL LETTER TSHE */
-MAP(0x27, 0x4C, 0x040C)  /* CYRILLIC CAPITAL LETTER KJE */
-MAP(0x27, 0x4D, 0x040E)  /* CYRILLIC CAPITAL LETTER SHORT U */
-MAP(0x27, 0x4E, 0x040F)  /* CYRILLIC CAPITAL LETTER DZHE */
-MAP(0x27, 0x72, 0x0452)  /* CYRILLIC SMALL LETTER DJE */
-MAP(0x27, 0x73, 0x0453)  /* CYRILLIC SMALL LETTER GJE */
-MAP(0x27, 0x74, 0x0454)  /* CYRILLIC SMALL LETTER UKRAINIAN IE */
-MAP(0x27, 0x75, 0x0455)  /* CYRILLIC SMALL LETTER DZE */
-MAP(0x27, 0x76, 0x0456)  /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-MAP(0x27, 0x77, 0x0457)  /* CYRILLIC SMALL LETTER YI */
-MAP(0x27, 0x78, 0x0458)  /* CYRILLIC SMALL LETTER JE */
-MAP(0x27, 0x79, 0x0459)  /* CYRILLIC SMALL LETTER LJE */
-MAP(0x27, 0x7A, 0x045A)  /* CYRILLIC SMALL LETTER NJE */
-MAP(0x27, 0x7B, 0x045B)  /* CYRILLIC SMALL LETTER TSHE */
-MAP(0x27, 0x7C, 0x045C)  /* CYRILLIC SMALL LETTER KJE */
-MAP(0x27, 0x7D, 0x045E)  /* CYRILLIC SMALL LETTER SHORT U */
-MAP(0x27, 0x7E, 0x045F)  /* CYRILLIC SMALL LETTER DZHE */
-MAP(0x29, 0x21, 0x00C6)  /* LATIN CAPITAL LIGATURE AE */
-MAP(0x29, 0x22, 0x0110)  /* LATIN CAPITAL LETTER D WITH STROKE */
-MAP(0x29, 0x24, 0x0126)  /* LATIN CAPITAL LETTER H WITH STROKE */
-MAP(0x29, 0x26, 0x0132)  /* LATIN CAPITAL LIGATURE IJ */
-MAP(0x29, 0x28, 0x0141)  /* LATIN CAPITAL LETTER L WITH STROKE */
-MAP(0x29, 0x29, 0x013F)  /* LATIN CAPITAL LETTER L WITH MIDDLE DOT */
-MAP(0x29, 0x2B, 0x014A)  /* LATIN CAPITAL LETTER ENG */
-MAP(0x29, 0x2C, 0x00D8)  /* LATIN CAPITAL LETTER O WITH STROKE */
-MAP(0x29, 0x2D, 0x0152)  /* LATIN CAPITAL LIGATURE OE */
-MAP(0x29, 0x2F, 0x0166)  /* LATIN CAPITAL LETTER T WITH STROKE */
-MAP(0x29, 0x30, 0x00DE)  /* LATIN CAPITAL LETTER THORN */
-MAP(0x29, 0x41, 0x00E6)  /* LATIN SMALL LIGATURE AE */
-MAP(0x29, 0x42, 0x0111)  /* LATIN SMALL LETTER D WITH STROKE */
-MAP(0x29, 0x43, 0x00F0)  /* LATIN SMALL LETTER ETH */
-MAP(0x29, 0x44, 0x0127)  /* LATIN SMALL LETTER H WITH STROKE */
-MAP(0x29, 0x45, 0x0131)  /* LATIN SMALL LETTER DOTLESS I */
-MAP(0x29, 0x46, 0x0133)  /* LATIN SMALL LIGATURE IJ */
-MAP(0x29, 0x47, 0x0138)  /* LATIN SMALL LETTER KRA */
-MAP(0x29, 0x48, 0x0142)  /* LATIN SMALL LETTER L WITH STROKE */
-MAP(0x29, 0x49, 0x0140)  /* LATIN SMALL LETTER L WITH MIDDLE DOT */
-MAP(0x29, 0x4A, 0x0149)  /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
-MAP(0x29, 0x4B, 0x014B)  /* LATIN SMALL LETTER ENG */
-MAP(0x29, 0x4C, 0x00F8)  /* LATIN SMALL LETTER O WITH STROKE */
-MAP(0x29, 0x4D, 0x0153)  /* LATIN SMALL LIGATURE OE */
-MAP(0x29, 0x4E, 0x00DF)  /* LATIN SMALL LETTER SHARP S */
-MAP(0x29, 0x4F, 0x0167)  /* LATIN SMALL LETTER T WITH STROKE */
-MAP(0x29, 0x50, 0x00FE)  /* LATIN SMALL LETTER THORN */
-MAP(0x2A, 0x21, 0x00C1)  /* LATIN CAPITAL LETTER A WITH ACUTE */
-MAP(0x2A, 0x22, 0x00C0)  /* LATIN CAPITAL LETTER A WITH GRAVE */
-MAP(0x2A, 0x23, 0x00C4)  /* LATIN CAPITAL LETTER A WITH DIAERESIS */
-MAP(0x2A, 0x24, 0x00C2)  /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-MAP(0x2A, 0x25, 0x0102)  /* LATIN CAPITAL LETTER A WITH BREVE */
-MAP(0x2A, 0x26, 0x01CD)  /* LATIN CAPITAL LETTER A WITH CARON */
-MAP(0x2A, 0x27, 0x0100)  /* LATIN CAPITAL LETTER A WITH MACRON */
-MAP(0x2A, 0x28, 0x0104)  /* LATIN CAPITAL LETTER A WITH OGONEK */
-MAP(0x2A, 0x29, 0x00C5)  /* LATIN CAPITAL LETTER A WITH RING ABOVE */
-MAP(0x2A, 0x2A, 0x00C3)  /* LATIN CAPITAL LETTER A WITH TILDE */
-MAP(0x2A, 0x2B, 0x0106)  /* LATIN CAPITAL LETTER C WITH ACUTE */
-MAP(0x2A, 0x2C, 0x0108)  /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-MAP(0x2A, 0x2D, 0x010C)  /* LATIN CAPITAL LETTER C WITH CARON */
-MAP(0x2A, 0x2E, 0x00C7)  /* LATIN CAPITAL LETTER C WITH CEDILLA */
-MAP(0x2A, 0x2F, 0x010A)  /* LATIN CAPITAL LETTER C WITH DOT ABOVE */
-MAP(0x2A, 0x30, 0x010E)  /* LATIN CAPITAL LETTER D WITH CARON */
-MAP(0x2A, 0x31, 0x00C9)  /* LATIN CAPITAL LETTER E WITH ACUTE */
-MAP(0x2A, 0x32, 0x00C8)  /* LATIN CAPITAL LETTER E WITH GRAVE */
-MAP(0x2A, 0x33, 0x00CB)  /* LATIN CAPITAL LETTER E WITH DIAERESIS */
-MAP(0x2A, 0x34, 0x00CA)  /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
-MAP(0x2A, 0x35, 0x011A)  /* LATIN CAPITAL LETTER E WITH CARON */
-MAP(0x2A, 0x36, 0x0116)  /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
-MAP(0x2A, 0x37, 0x0112)  /* LATIN CAPITAL LETTER E WITH MACRON */
-MAP(0x2A, 0x38, 0x0118)  /* LATIN CAPITAL LETTER E WITH OGONEK */
-MAP(0x2A, 0x3A, 0x011C)  /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-MAP(0x2A, 0x3B, 0x011E)  /* LATIN CAPITAL LETTER G WITH BREVE */
-MAP(0x2A, 0x3C, 0x0122)  /* LATIN CAPITAL LETTER G WITH CEDILLA */
-MAP(0x2A, 0x3D, 0x0120)  /* LATIN CAPITAL LETTER G WITH DOT ABOVE */
-MAP(0x2A, 0x3E, 0x0124)  /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-MAP(0x2A, 0x3F, 0x00CD)  /* LATIN CAPITAL LETTER I WITH ACUTE */
-MAP(0x2A, 0x40, 0x00CC)  /* LATIN CAPITAL LETTER I WITH GRAVE */
-MAP(0x2A, 0x41, 0x00CF)  /* LATIN CAPITAL LETTER I WITH DIAERESIS */
-MAP(0x2A, 0x42, 0x00CE)  /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-MAP(0x2A, 0x43, 0x01CF)  /* LATIN CAPITAL LETTER I WITH CARON */
-MAP(0x2A, 0x44, 0x0130)  /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
-MAP(0x2A, 0x45, 0x012A)  /* LATIN CAPITAL LETTER I WITH MACRON */
-MAP(0x2A, 0x46, 0x012E)  /* LATIN CAPITAL LETTER I WITH OGONEK */
-MAP(0x2A, 0x47, 0x0128)  /* LATIN CAPITAL LETTER I WITH TILDE */
-MAP(0x2A, 0x48, 0x0134)  /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-MAP(0x2A, 0x49, 0x0136)  /* LATIN CAPITAL LETTER K WITH CEDILLA */
-MAP(0x2A, 0x4A, 0x0139)  /* LATIN CAPITAL LETTER L WITH ACUTE */
-MAP(0x2A, 0x4B, 0x013D)  /* LATIN CAPITAL LETTER L WITH CARON */
-MAP(0x2A, 0x4C, 0x013B)  /* LATIN CAPITAL LETTER L WITH CEDILLA */
-MAP(0x2A, 0x4D, 0x0143)  /* LATIN CAPITAL LETTER N WITH ACUTE */
-MAP(0x2A, 0x4E, 0x0147)  /* LATIN CAPITAL LETTER N WITH CARON */
-MAP(0x2A, 0x4F, 0x0145)  /* LATIN CAPITAL LETTER N WITH CEDILLA */
-MAP(0x2A, 0x50, 0x00D1)  /* LATIN CAPITAL LETTER N WITH TILDE */
-MAP(0x2A, 0x51, 0x00D3)  /* LATIN CAPITAL LETTER O WITH ACUTE */
-MAP(0x2A, 0x52, 0x00D2)  /* LATIN CAPITAL LETTER O WITH GRAVE */
-MAP(0x2A, 0x53, 0x00D6)  /* LATIN CAPITAL LETTER O WITH DIAERESIS */
-MAP(0x2A, 0x54, 0x00D4)  /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-MAP(0x2A, 0x55, 0x01D1)  /* LATIN CAPITAL LETTER O WITH CARON */
-MAP(0x2A, 0x56, 0x0150)  /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-MAP(0x2A, 0x57, 0x014C)  /* LATIN CAPITAL LETTER O WITH MACRON */
-MAP(0x2A, 0x58, 0x00D5)  /* LATIN CAPITAL LETTER O WITH TILDE */
-MAP(0x2A, 0x59, 0x0154)  /* LATIN CAPITAL LETTER R WITH ACUTE */
-MAP(0x2A, 0x5A, 0x0158)  /* LATIN CAPITAL LETTER R WITH CARON */
-MAP(0x2A, 0x5B, 0x0156)  /* LATIN CAPITAL LETTER R WITH CEDILLA */
-MAP(0x2A, 0x5C, 0x015A)  /* LATIN CAPITAL LETTER S WITH ACUTE */
-MAP(0x2A, 0x5D, 0x015C)  /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-MAP(0x2A, 0x5E, 0x0160)  /* LATIN CAPITAL LETTER S WITH CARON */
-MAP(0x2A, 0x5F, 0x015E)  /* LATIN CAPITAL LETTER S WITH CEDILLA */
-MAP(0x2A, 0x60, 0x0164)  /* LATIN CAPITAL LETTER T WITH CARON */
-MAP(0x2A, 0x61, 0x0162)  /* LATIN CAPITAL LETTER T WITH CEDILLA */
-MAP(0x2A, 0x62, 0x00DA)  /* LATIN CAPITAL LETTER U WITH ACUTE */
-MAP(0x2A, 0x63, 0x00D9)  /* LATIN CAPITAL LETTER U WITH GRAVE */
-MAP(0x2A, 0x64, 0x00DC)  /* LATIN CAPITAL LETTER U WITH DIAERESIS */
-MAP(0x2A, 0x65, 0x00DB)  /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
-MAP(0x2A, 0x66, 0x016C)  /* LATIN CAPITAL LETTER U WITH BREVE */
-MAP(0x2A, 0x67, 0x01D3)  /* LATIN CAPITAL LETTER U WITH CARON */
-MAP(0x2A, 0x68, 0x0170)  /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-MAP(0x2A, 0x69, 0x016A)  /* LATIN CAPITAL LETTER U WITH MACRON */
-MAP(0x2A, 0x6A, 0x0172)  /* LATIN CAPITAL LETTER U WITH OGONEK */
-MAP(0x2A, 0x6B, 0x016E)  /* LATIN CAPITAL LETTER U WITH RING ABOVE */
-MAP(0x2A, 0x6C, 0x0168)  /* LATIN CAPITAL LETTER U WITH TILDE */
-MAP(0x2A, 0x6D, 0x01D7)  /* LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE */
-MAP(0x2A, 0x6E, 0x01DB)  /* LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE */
-MAP(0x2A, 0x6F, 0x01D9)  /* LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON */
-MAP(0x2A, 0x70, 0x01D5)  /* LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON */
-MAP(0x2A, 0x71, 0x0174)  /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
-MAP(0x2A, 0x72, 0x00DD)  /* LATIN CAPITAL LETTER Y WITH ACUTE */
-MAP(0x2A, 0x73, 0x0178)  /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
-MAP(0x2A, 0x74, 0x0176)  /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
-MAP(0x2A, 0x75, 0x0179)  /* LATIN CAPITAL LETTER Z WITH ACUTE */
-MAP(0x2A, 0x76, 0x017D)  /* LATIN CAPITAL LETTER Z WITH CARON */
-MAP(0x2A, 0x77, 0x017B)  /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-MAP(0x2B, 0x21, 0x00E1)  /* LATIN SMALL LETTER A WITH ACUTE */
-MAP(0x2B, 0x22, 0x00E0)  /* LATIN SMALL LETTER A WITH GRAVE */
-MAP(0x2B, 0x23, 0x00E4)  /* LATIN SMALL LETTER A WITH DIAERESIS */
-MAP(0x2B, 0x24, 0x00E2)  /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
-MAP(0x2B, 0x25, 0x0103)  /* LATIN SMALL LETTER A WITH BREVE */
-MAP(0x2B, 0x26, 0x01CE)  /* LATIN SMALL LETTER A WITH CARON */
-MAP(0x2B, 0x27, 0x0101)  /* LATIN SMALL LETTER A WITH MACRON */
-MAP(0x2B, 0x28, 0x0105)  /* LATIN SMALL LETTER A WITH OGONEK */
-MAP(0x2B, 0x29, 0x00E5)  /* LATIN SMALL LETTER A WITH RING ABOVE */
-MAP(0x2B, 0x2A, 0x00E3)  /* LATIN SMALL LETTER A WITH TILDE */
-MAP(0x2B, 0x2B, 0x0107)  /* LATIN SMALL LETTER C WITH ACUTE */
-MAP(0x2B, 0x2C, 0x0109)  /* LATIN SMALL LETTER C WITH CIRCUMFLEX */
-MAP(0x2B, 0x2D, 0x010D)  /* LATIN SMALL LETTER C WITH CARON */
-MAP(0x2B, 0x2E, 0x00E7)  /* LATIN SMALL LETTER C WITH CEDILLA */
-MAP(0x2B, 0x2F, 0x010B)  /* LATIN SMALL LETTER C WITH DOT ABOVE */
-MAP(0x2B, 0x30, 0x010F)  /* LATIN SMALL LETTER D WITH CARON */
-MAP(0x2B, 0x31, 0x00E9)  /* LATIN SMALL LETTER E WITH ACUTE */
-MAP(0x2B, 0x32, 0x00E8)  /* LATIN SMALL LETTER E WITH GRAVE */
-MAP(0x2B, 0x33, 0x00EB)  /* LATIN SMALL LETTER E WITH DIAERESIS */
-MAP(0x2B, 0x34, 0x00EA)  /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
-MAP(0x2B, 0x35, 0x011B)  /* LATIN SMALL LETTER E WITH CARON */
-MAP(0x2B, 0x36, 0x0117)  /* LATIN SMALL LETTER E WITH DOT ABOVE */
-MAP(0x2B, 0x37, 0x0113)  /* LATIN SMALL LETTER E WITH MACRON */
-MAP(0x2B, 0x38, 0x0119)  /* LATIN SMALL LETTER E WITH OGONEK */
-MAP(0x2B, 0x39, 0x01F5)  /* LATIN SMALL LETTER G WITH ACUTE */
-MAP(0x2B, 0x3A, 0x011D)  /* LATIN SMALL LETTER G WITH CIRCUMFLEX */
-MAP(0x2B, 0x3B, 0x011F)  /* LATIN SMALL LETTER G WITH BREVE */
-MAP(0x2B, 0x3D, 0x0121)  /* LATIN SMALL LETTER G WITH DOT ABOVE */
-MAP(0x2B, 0x3E, 0x0125)  /* LATIN SMALL LETTER H WITH CIRCUMFLEX */
-MAP(0x2B, 0x3F, 0x00ED)  /* LATIN SMALL LETTER I WITH ACUTE */
-MAP(0x2B, 0x40, 0x00EC)  /* LATIN SMALL LETTER I WITH GRAVE */
-MAP(0x2B, 0x41, 0x00EF)  /* LATIN SMALL LETTER I WITH DIAERESIS */
-MAP(0x2B, 0x42, 0x00EE)  /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
-MAP(0x2B, 0x43, 0x01D0)  /* LATIN SMALL LETTER I WITH CARON */
-MAP(0x2B, 0x45, 0x012B)  /* LATIN SMALL LETTER I WITH MACRON */
-MAP(0x2B, 0x46, 0x012F)  /* LATIN SMALL LETTER I WITH OGONEK */
-MAP(0x2B, 0x47, 0x0129)  /* LATIN SMALL LETTER I WITH TILDE */
-MAP(0x2B, 0x48, 0x0135)  /* LATIN SMALL LETTER J WITH CIRCUMFLEX */
-MAP(0x2B, 0x49, 0x0137)  /* LATIN SMALL LETTER K WITH CEDILLA */
-MAP(0x2B, 0x4A, 0x013A)  /* LATIN SMALL LETTER L WITH ACUTE */
-MAP(0x2B, 0x4B, 0x013E)  /* LATIN SMALL LETTER L WITH CARON */
-MAP(0x2B, 0x4C, 0x013C)  /* LATIN SMALL LETTER L WITH CEDILLA */
-MAP(0x2B, 0x4D, 0x0144)  /* LATIN SMALL LETTER N WITH ACUTE */
-MAP(0x2B, 0x4E, 0x0148)  /* LATIN SMALL LETTER N WITH CARON */
-MAP(0x2B, 0x4F, 0x0146)  /* LATIN SMALL LETTER N WITH CEDILLA */
-MAP(0x2B, 0x50, 0x00F1)  /* LATIN SMALL LETTER N WITH TILDE */
-MAP(0x2B, 0x51, 0x00F3)  /* LATIN SMALL LETTER O WITH ACUTE */
-MAP(0x2B, 0x52, 0x00F2)  /* LATIN SMALL LETTER O WITH GRAVE */
-MAP(0x2B, 0x53, 0x00F6)  /* LATIN SMALL LETTER O WITH DIAERESIS */
-MAP(0x2B, 0x54, 0x00F4)  /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
-MAP(0x2B, 0x55, 0x01D2)  /* LATIN SMALL LETTER O WITH CARON */
-MAP(0x2B, 0x56, 0x0151)  /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-MAP(0x2B, 0x57, 0x014D)  /* LATIN SMALL LETTER O WITH MACRON */
-MAP(0x2B, 0x58, 0x00F5)  /* LATIN SMALL LETTER O WITH TILDE */
-MAP(0x2B, 0x59, 0x0155)  /* LATIN SMALL LETTER R WITH ACUTE */
-MAP(0x2B, 0x5A, 0x0159)  /* LATIN SMALL LETTER R WITH CARON */
-MAP(0x2B, 0x5B, 0x0157)  /* LATIN SMALL LETTER R WITH CEDILLA */
-MAP(0x2B, 0x5C, 0x015B)  /* LATIN SMALL LETTER S WITH ACUTE */
-MAP(0x2B, 0x5D, 0x015D)  /* LATIN SMALL LETTER S WITH CIRCUMFLEX */
-MAP(0x2B, 0x5E, 0x0161)  /* LATIN SMALL LETTER S WITH CARON */
-MAP(0x2B, 0x5F, 0x015F)  /* LATIN SMALL LETTER S WITH CEDILLA */
-MAP(0x2B, 0x60, 0x0165)  /* LATIN SMALL LETTER T WITH CARON */
-MAP(0x2B, 0x61, 0x0163)  /* LATIN SMALL LETTER T WITH CEDILLA */
-MAP(0x2B, 0x62, 0x00FA)  /* LATIN SMALL LETTER U WITH ACUTE */
-MAP(0x2B, 0x63, 0x00F9)  /* LATIN SMALL LETTER U WITH GRAVE */
-MAP(0x2B, 0x64, 0x00FC)  /* LATIN SMALL LETTER U WITH DIAERESIS */
-MAP(0x2B, 0x65, 0x00FB)  /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
-MAP(0x2B, 0x66, 0x016D)  /* LATIN SMALL LETTER U WITH BREVE */
-MAP(0x2B, 0x67, 0x01D4)  /* LATIN SMALL LETTER U WITH CARON */
-MAP(0x2B, 0x68, 0x0171)  /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-MAP(0x2B, 0x69, 0x016B)  /* LATIN SMALL LETTER U WITH MACRON */
-MAP(0x2B, 0x6A, 0x0173)  /* LATIN SMALL LETTER U WITH OGONEK */
-MAP(0x2B, 0x6B, 0x016F)  /* LATIN SMALL LETTER U WITH RING ABOVE */
-MAP(0x2B, 0x6C, 0x0169)  /* LATIN SMALL LETTER U WITH TILDE */
-MAP(0x2B, 0x6D, 0x01D8)  /* LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE */
-MAP(0x2B, 0x6E, 0x01DC)  /* LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE */
-MAP(0x2B, 0x6F, 0x01DA)  /* LATIN SMALL LETTER U WITH DIAERESIS AND CARON */
-MAP(0x2B, 0x70, 0x01D6)  /* LATIN SMALL LETTER U WITH DIAERESIS AND MACRON */
-MAP(0x2B, 0x71, 0x0175)  /* LATIN SMALL LETTER W WITH CIRCUMFLEX */
-MAP(0x2B, 0x72, 0x00FD)  /* LATIN SMALL LETTER Y WITH ACUTE */
-MAP(0x2B, 0x73, 0x00FF)  /* LATIN SMALL LETTER Y WITH DIAERESIS */
-MAP(0x2B, 0x74, 0x0177)  /* LATIN SMALL LETTER Y WITH CIRCUMFLEX */
-MAP(0x2B, 0x75, 0x017A)  /* LATIN SMALL LETTER Z WITH ACUTE */
-MAP(0x2B, 0x76, 0x017E)  /* LATIN SMALL LETTER Z WITH CARON */
-MAP(0x2B, 0x77, 0x017C)  /* LATIN SMALL LETTER Z WITH DOT ABOVE */
-MAP(0x30, 0x21, 0x4E02)  /* <CJK> */
-MAP(0x30, 0x22, 0x4E04)  /* <CJK> */
-MAP(0x30, 0x23, 0x4E05)  /* <CJK> */
-MAP(0x30, 0x24, 0x4E0C)  /* <CJK> */
-MAP(0x30, 0x25, 0x4E12)  /* <CJK> */
-MAP(0x30, 0x26, 0x4E1F)  /* <CJK> */
-MAP(0x30, 0x27, 0x4E23)  /* <CJK> */
-MAP(0x30, 0x28, 0x4E24)  /* <CJK> */
-MAP(0x30, 0x29, 0x4E28)  /* <CJK> */
-MAP(0x30, 0x2A, 0x4E2B)  /* <CJK> */
-MAP(0x30, 0x2B, 0x4E2E)  /* <CJK> */
-MAP(0x30, 0x2C, 0x4E2F)  /* <CJK> */
-MAP(0x30, 0x2D, 0x4E30)  /* <CJK> */
-MAP(0x30, 0x2E, 0x4E35)  /* <CJK> */
-MAP(0x30, 0x2F, 0x4E40)  /* <CJK> */
-MAP(0x30, 0x30, 0x4E41)  /* <CJK> */
-MAP(0x30, 0x31, 0x4E44)  /* <CJK> */
-MAP(0x30, 0x32, 0x4E47)  /* <CJK> */
-MAP(0x30, 0x33, 0x4E51)  /* <CJK> */
-MAP(0x30, 0x34, 0x4E5A)  /* <CJK> */
-MAP(0x30, 0x35, 0x4E5C)  /* <CJK> */
-MAP(0x30, 0x36, 0x4E63)  /* <CJK> */
-MAP(0x30, 0x37, 0x4E68)  /* <CJK> */
-MAP(0x30, 0x38, 0x4E69)  /* <CJK> */
-MAP(0x30, 0x39, 0x4E74)  /* <CJK> */
-MAP(0x30, 0x3A, 0x4E75)  /* <CJK> */
-MAP(0x30, 0x3B, 0x4E79)  /* <CJK> */
-MAP(0x30, 0x3C, 0x4E7F)  /* <CJK> */
-MAP(0x30, 0x3D, 0x4E8D)  /* <CJK> */
-MAP(0x30, 0x3E, 0x4E96)  /* <CJK> */
-MAP(0x30, 0x3F, 0x4E97)  /* <CJK> */
-MAP(0x30, 0x40, 0x4E9D)  /* <CJK> */
-MAP(0x30, 0x41, 0x4EAF)  /* <CJK> */
-MAP(0x30, 0x42, 0x4EB9)  /* <CJK> */
-MAP(0x30, 0x43, 0x4EC3)  /* <CJK> */
-MAP(0x30, 0x44, 0x4ED0)  /* <CJK> */
-MAP(0x30, 0x45, 0x4EDA)  /* <CJK> */
-MAP(0x30, 0x46, 0x4EDB)  /* <CJK> */
-MAP(0x30, 0x47, 0x4EE0)  /* <CJK> */
-MAP(0x30, 0x48, 0x4EE1)  /* <CJK> */
-MAP(0x30, 0x49, 0x4EE2)  /* <CJK> */
-MAP(0x30, 0x4A, 0x4EE8)  /* <CJK> */
-MAP(0x30, 0x4B, 0x4EEF)  /* <CJK> */
-MAP(0x30, 0x4C, 0x4EF1)  /* <CJK> */
-MAP(0x30, 0x4D, 0x4EF3)  /* <CJK> */
-MAP(0x30, 0x4E, 0x4EF5)  /* <CJK> */
-MAP(0x30, 0x4F, 0x4EFD)  /* <CJK> */
-MAP(0x30, 0x50, 0x4EFE)  /* <CJK> */
-MAP(0x30, 0x51, 0x4EFF)  /* <CJK> */
-MAP(0x30, 0x52, 0x4F00)  /* <CJK> */
-MAP(0x30, 0x53, 0x4F02)  /* <CJK> */
-MAP(0x30, 0x54, 0x4F03)  /* <CJK> */
-MAP(0x30, 0x55, 0x4F08)  /* <CJK> */
-MAP(0x30, 0x56, 0x4F0B)  /* <CJK> */
-MAP(0x30, 0x57, 0x4F0C)  /* <CJK> */
-MAP(0x30, 0x58, 0x4F12)  /* <CJK> */
-MAP(0x30, 0x59, 0x4F15)  /* <CJK> */
-MAP(0x30, 0x5A, 0x4F16)  /* <CJK> */
-MAP(0x30, 0x5B, 0x4F17)  /* <CJK> */
-MAP(0x30, 0x5C, 0x4F19)  /* <CJK> */
-MAP(0x30, 0x5D, 0x4F2E)  /* <CJK> */
-MAP(0x30, 0x5E, 0x4F31)  /* <CJK> */
-MAP(0x30, 0x5F, 0x4F60)  /* <CJK> */
-MAP(0x30, 0x60, 0x4F33)  /* <CJK> */
-MAP(0x30, 0x61, 0x4F35)  /* <CJK> */
-MAP(0x30, 0x62, 0x4F37)  /* <CJK> */
-MAP(0x30, 0x63, 0x4F39)  /* <CJK> */
-MAP(0x30, 0x64, 0x4F3B)  /* <CJK> */
-MAP(0x30, 0x65, 0x4F3E)  /* <CJK> */
-MAP(0x30, 0x66, 0x4F40)  /* <CJK> */
-MAP(0x30, 0x67, 0x4F42)  /* <CJK> */
-MAP(0x30, 0x68, 0x4F48)  /* <CJK> */
-MAP(0x30, 0x69, 0x4F49)  /* <CJK> */
-MAP(0x30, 0x6A, 0x4F4B)  /* <CJK> */
-MAP(0x30, 0x6B, 0x4F4C)  /* <CJK> */
-MAP(0x30, 0x6C, 0x4F52)  /* <CJK> */
-MAP(0x30, 0x6D, 0x4F54)  /* <CJK> */
-MAP(0x30, 0x6E, 0x4F56)  /* <CJK> */
-MAP(0x30, 0x6F, 0x4F58)  /* <CJK> */
-MAP(0x30, 0x70, 0x4F5F)  /* <CJK> */
-MAP(0x30, 0x71, 0x4F63)  /* <CJK> */
-MAP(0x30, 0x72, 0x4F6A)  /* <CJK> */
-MAP(0x30, 0x73, 0x4F6C)  /* <CJK> */
-MAP(0x30, 0x74, 0x4F6E)  /* <CJK> */
-MAP(0x30, 0x75, 0x4F71)  /* <CJK> */
-MAP(0x30, 0x76, 0x4F77)  /* <CJK> */
-MAP(0x30, 0x77, 0x4F78)  /* <CJK> */
-MAP(0x30, 0x78, 0x4F79)  /* <CJK> */
-MAP(0x30, 0x79, 0x4F7A)  /* <CJK> */
-MAP(0x30, 0x7A, 0x4F7D)  /* <CJK> */
-MAP(0x30, 0x7B, 0x4F7E)  /* <CJK> */
-MAP(0x30, 0x7C, 0x4F81)  /* <CJK> */
-MAP(0x30, 0x7D, 0x4F82)  /* <CJK> */
-MAP(0x30, 0x7E, 0x4F84)  /* <CJK> */
-MAP(0x31, 0x21, 0x4F85)  /* <CJK> */
-MAP(0x31, 0x22, 0x4F89)  /* <CJK> */
-MAP(0x31, 0x23, 0x4F8A)  /* <CJK> */
-MAP(0x31, 0x24, 0x4F8C)  /* <CJK> */
-MAP(0x31, 0x25, 0x4F8E)  /* <CJK> */
-MAP(0x31, 0x26, 0x4F90)  /* <CJK> */
-MAP(0x31, 0x27, 0x4F92)  /* <CJK> */
-MAP(0x31, 0x28, 0x4F93)  /* <CJK> */
-MAP(0x31, 0x29, 0x4F94)  /* <CJK> */
-MAP(0x31, 0x2A, 0x4F97)  /* <CJK> */
-MAP(0x31, 0x2B, 0x4F99)  /* <CJK> */
-MAP(0x31, 0x2C, 0x4F9A)  /* <CJK> */
-MAP(0x31, 0x2D, 0x4F9E)  /* <CJK> */
-MAP(0x31, 0x2E, 0x4F9F)  /* <CJK> */
-MAP(0x31, 0x2F, 0x4FB2)  /* <CJK> */
-MAP(0x31, 0x30, 0x4FB7)  /* <CJK> */
-MAP(0x31, 0x31, 0x4FB9)  /* <CJK> */
-MAP(0x31, 0x32, 0x4FBB)  /* <CJK> */
-MAP(0x31, 0x33, 0x4FBC)  /* <CJK> */
-MAP(0x31, 0x34, 0x4FBD)  /* <CJK> */
-MAP(0x31, 0x35, 0x4FBE)  /* <CJK> */
-MAP(0x31, 0x36, 0x4FC0)  /* <CJK> */
-MAP(0x31, 0x37, 0x4FC1)  /* <CJK> */
-MAP(0x31, 0x38, 0x4FC5)  /* <CJK> */
-MAP(0x31, 0x39, 0x4FC6)  /* <CJK> */
-MAP(0x31, 0x3A, 0x4FC8)  /* <CJK> */
-MAP(0x31, 0x3B, 0x4FC9)  /* <CJK> */
-MAP(0x31, 0x3C, 0x4FCB)  /* <CJK> */
-MAP(0x31, 0x3D, 0x4FCC)  /* <CJK> */
-MAP(0x31, 0x3E, 0x4FCD)  /* <CJK> */
-MAP(0x31, 0x3F, 0x4FCF)  /* <CJK> */
-MAP(0x31, 0x40, 0x4FD2)  /* <CJK> */
-MAP(0x31, 0x41, 0x4FDC)  /* <CJK> */
-MAP(0x31, 0x42, 0x4FE0)  /* <CJK> */
-MAP(0x31, 0x43, 0x4FE2)  /* <CJK> */
-MAP(0x31, 0x44, 0x4FF0)  /* <CJK> */
-MAP(0x31, 0x45, 0x4FF2)  /* <CJK> */
-MAP(0x31, 0x46, 0x4FFC)  /* <CJK> */
-MAP(0x31, 0x47, 0x4FFD)  /* <CJK> */
-MAP(0x31, 0x48, 0x4FFF)  /* <CJK> */
-MAP(0x31, 0x49, 0x5000)  /* <CJK> */
-MAP(0x31, 0x4A, 0x5001)  /* <CJK> */
-MAP(0x31, 0x4B, 0x5004)  /* <CJK> */
-MAP(0x31, 0x4C, 0x5007)  /* <CJK> */
-MAP(0x31, 0x4D, 0x500A)  /* <CJK> */
-MAP(0x31, 0x4E, 0x500C)  /* <CJK> */
-MAP(0x31, 0x4F, 0x500E)  /* <CJK> */
-MAP(0x31, 0x50, 0x5010)  /* <CJK> */
-MAP(0x31, 0x51, 0x5013)  /* <CJK> */
-MAP(0x31, 0x52, 0x5017)  /* <CJK> */
-MAP(0x31, 0x53, 0x5018)  /* <CJK> */
-MAP(0x31, 0x54, 0x501B)  /* <CJK> */
-MAP(0x31, 0x55, 0x501C)  /* <CJK> */
-MAP(0x31, 0x56, 0x501D)  /* <CJK> */
-MAP(0x31, 0x57, 0x501E)  /* <CJK> */
-MAP(0x31, 0x58, 0x5022)  /* <CJK> */
-MAP(0x31, 0x59, 0x5027)  /* <CJK> */
-MAP(0x31, 0x5A, 0x502E)  /* <CJK> */
-MAP(0x31, 0x5B, 0x5030)  /* <CJK> */
-MAP(0x31, 0x5C, 0x5032)  /* <CJK> */
-MAP(0x31, 0x5D, 0x5033)  /* <CJK> */
-MAP(0x31, 0x5E, 0x5035)  /* <CJK> */
-MAP(0x31, 0x5F, 0x5040)  /* <CJK> */
-MAP(0x31, 0x60, 0x5041)  /* <CJK> */
-MAP(0x31, 0x61, 0x5042)  /* <CJK> */
-MAP(0x31, 0x62, 0x5045)  /* <CJK> */
-MAP(0x31, 0x63, 0x5046)  /* <CJK> */
-MAP(0x31, 0x64, 0x504A)  /* <CJK> */
-MAP(0x31, 0x65, 0x504C)  /* <CJK> */
-MAP(0x31, 0x66, 0x504E)  /* <CJK> */
-MAP(0x31, 0x67, 0x5051)  /* <CJK> */
-MAP(0x31, 0x68, 0x5052)  /* <CJK> */
-MAP(0x31, 0x69, 0x5053)  /* <CJK> */
-MAP(0x31, 0x6A, 0x5057)  /* <CJK> */
-MAP(0x31, 0x6B, 0x5059)  /* <CJK> */
-MAP(0x31, 0x6C, 0x505F)  /* <CJK> */
-MAP(0x31, 0x6D, 0x5060)  /* <CJK> */
-MAP(0x31, 0x6E, 0x5062)  /* <CJK> */
-MAP(0x31, 0x6F, 0x5063)  /* <CJK> */
-MAP(0x31, 0x70, 0x5066)  /* <CJK> */
-MAP(0x31, 0x71, 0x5067)  /* <CJK> */
-MAP(0x31, 0x72, 0x506A)  /* <CJK> */
-MAP(0x31, 0x73, 0x506D)  /* <CJK> */
-MAP(0x31, 0x74, 0x5070)  /* <CJK> */
-MAP(0x31, 0x75, 0x5071)  /* <CJK> */
-MAP(0x31, 0x76, 0x503B)  /* <CJK> */
-MAP(0x31, 0x77, 0x5081)  /* <CJK> */
-MAP(0x31, 0x78, 0x5083)  /* <CJK> */
-MAP(0x31, 0x79, 0x5084)  /* <CJK> */
-MAP(0x31, 0x7A, 0x5086)  /* <CJK> */
-MAP(0x31, 0x7B, 0x508A)  /* <CJK> */
-MAP(0x31, 0x7C, 0x508E)  /* <CJK> */
-MAP(0x31, 0x7D, 0x508F)  /* <CJK> */
-MAP(0x31, 0x7E, 0x5090)  /* <CJK> */
-MAP(0x32, 0x21, 0x5092)  /* <CJK> */
-MAP(0x32, 0x22, 0x5093)  /* <CJK> */
-MAP(0x32, 0x23, 0x5094)  /* <CJK> */
-MAP(0x32, 0x24, 0x5096)  /* <CJK> */
-MAP(0x32, 0x25, 0x509B)  /* <CJK> */
-MAP(0x32, 0x26, 0x509C)  /* <CJK> */
-MAP(0x32, 0x27, 0x509E)  /* <CJK> */
-MAP(0x32, 0x28, 0x509F)  /* <CJK> */
-MAP(0x32, 0x29, 0x50A0)  /* <CJK> */
-MAP(0x32, 0x2A, 0x50A1)  /* <CJK> */
-MAP(0x32, 0x2B, 0x50A2)  /* <CJK> */
-MAP(0x32, 0x2C, 0x50AA)  /* <CJK> */
-MAP(0x32, 0x2D, 0x50AF)  /* <CJK> */
-MAP(0x32, 0x2E, 0x50B0)  /* <CJK> */
-MAP(0x32, 0x2F, 0x50B9)  /* <CJK> */
-MAP(0x32, 0x30, 0x50BA)  /* <CJK> */
-MAP(0x32, 0x31, 0x50BD)  /* <CJK> */
-MAP(0x32, 0x32, 0x50C0)  /* <CJK> */
-MAP(0x32, 0x33, 0x50C3)  /* <CJK> */
-MAP(0x32, 0x34, 0x50C4)  /* <CJK> */
-MAP(0x32, 0x35, 0x50C7)  /* <CJK> */
-MAP(0x32, 0x36, 0x50CC)  /* <CJK> */
-MAP(0x32, 0x37, 0x50CE)  /* <CJK> */
-MAP(0x32, 0x38, 0x50D0)  /* <CJK> */
-MAP(0x32, 0x39, 0x50D3)  /* <CJK> */
-MAP(0x32, 0x3A, 0x50D4)  /* <CJK> */
-MAP(0x32, 0x3B, 0x50D8)  /* <CJK> */
-MAP(0x32, 0x3C, 0x50DC)  /* <CJK> */
-MAP(0x32, 0x3D, 0x50DD)  /* <CJK> */
-MAP(0x32, 0x3E, 0x50DF)  /* <CJK> */
-MAP(0x32, 0x3F, 0x50E2)  /* <CJK> */
-MAP(0x32, 0x40, 0x50E4)  /* <CJK> */
-MAP(0x32, 0x41, 0x50E6)  /* <CJK> */
-MAP(0x32, 0x42, 0x50E8)  /* <CJK> */
-MAP(0x32, 0x43, 0x50E9)  /* <CJK> */
-MAP(0x32, 0x44, 0x50EF)  /* <CJK> */
-MAP(0x32, 0x45, 0x50F1)  /* <CJK> */
-MAP(0x32, 0x46, 0x50F6)  /* <CJK> */
-MAP(0x32, 0x47, 0x50FA)  /* <CJK> */
-MAP(0x32, 0x48, 0x50FE)  /* <CJK> */
-MAP(0x32, 0x49, 0x5103)  /* <CJK> */
-MAP(0x32, 0x4A, 0x5106)  /* <CJK> */
-MAP(0x32, 0x4B, 0x5107)  /* <CJK> */
-MAP(0x32, 0x4C, 0x5108)  /* <CJK> */
-MAP(0x32, 0x4D, 0x510B)  /* <CJK> */
-MAP(0x32, 0x4E, 0x510C)  /* <CJK> */
-MAP(0x32, 0x4F, 0x510D)  /* <CJK> */
-MAP(0x32, 0x50, 0x510E)  /* <CJK> */
-MAP(0x32, 0x51, 0x50F2)  /* <CJK> */
-MAP(0x32, 0x52, 0x5110)  /* <CJK> */
-MAP(0x32, 0x53, 0x5117)  /* <CJK> */
-MAP(0x32, 0x54, 0x5119)  /* <CJK> */
-MAP(0x32, 0x55, 0x511B)  /* <CJK> */
-MAP(0x32, 0x56, 0x511C)  /* <CJK> */
-MAP(0x32, 0x57, 0x511D)  /* <CJK> */
-MAP(0x32, 0x58, 0x511E)  /* <CJK> */
-MAP(0x32, 0x59, 0x5123)  /* <CJK> */
-MAP(0x32, 0x5A, 0x5127)  /* <CJK> */
-MAP(0x32, 0x5B, 0x5128)  /* <CJK> */
-MAP(0x32, 0x5C, 0x512C)  /* <CJK> */
-MAP(0x32, 0x5D, 0x512D)  /* <CJK> */
-MAP(0x32, 0x5E, 0x512F)  /* <CJK> */
-MAP(0x32, 0x5F, 0x5131)  /* <CJK> */
-MAP(0x32, 0x60, 0x5133)  /* <CJK> */
-MAP(0x32, 0x61, 0x5134)  /* <CJK> */
-MAP(0x32, 0x62, 0x5135)  /* <CJK> */
-MAP(0x32, 0x63, 0x5138)  /* <CJK> */
-MAP(0x32, 0x64, 0x5139)  /* <CJK> */
-MAP(0x32, 0x65, 0x5142)  /* <CJK> */
-MAP(0x32, 0x66, 0x514A)  /* <CJK> */
-MAP(0x32, 0x67, 0x514F)  /* <CJK> */
-MAP(0x32, 0x68, 0x5153)  /* <CJK> */
-MAP(0x32, 0x69, 0x5155)  /* <CJK> */
-MAP(0x32, 0x6A, 0x5157)  /* <CJK> */
-MAP(0x32, 0x6B, 0x5158)  /* <CJK> */
-MAP(0x32, 0x6C, 0x515F)  /* <CJK> */
-MAP(0x32, 0x6D, 0x5164)  /* <CJK> */
-MAP(0x32, 0x6E, 0x5166)  /* <CJK> */
-MAP(0x32, 0x6F, 0x517E)  /* <CJK> */
-MAP(0x32, 0x70, 0x5183)  /* <CJK> */
-MAP(0x32, 0x71, 0x5184)  /* <CJK> */
-MAP(0x32, 0x72, 0x518B)  /* <CJK> */
-MAP(0x32, 0x73, 0x518E)  /* <CJK> */
-MAP(0x32, 0x74, 0x5198)  /* <CJK> */
-MAP(0x32, 0x75, 0x519D)  /* <CJK> */
-MAP(0x32, 0x76, 0x51A1)  /* <CJK> */
-MAP(0x32, 0x77, 0x51A3)  /* <CJK> */
-MAP(0x32, 0x78, 0x51AD)  /* <CJK> */
-MAP(0x32, 0x79, 0x51B8)  /* <CJK> */
-MAP(0x32, 0x7A, 0x51BA)  /* <CJK> */
-MAP(0x32, 0x7B, 0x51BC)  /* <CJK> */
-MAP(0x32, 0x7C, 0x51BE)  /* <CJK> */
-MAP(0x32, 0x7D, 0x51BF)  /* <CJK> */
-MAP(0x32, 0x7E, 0x51C2)  /* <CJK> */
-MAP(0x33, 0x21, 0x51C8)  /* <CJK> */
-MAP(0x33, 0x22, 0x51CF)  /* <CJK> */
-MAP(0x33, 0x23, 0x51D1)  /* <CJK> */
-MAP(0x33, 0x24, 0x51D2)  /* <CJK> */
-MAP(0x33, 0x25, 0x51D3)  /* <CJK> */
-MAP(0x33, 0x26, 0x51D5)  /* <CJK> */
-MAP(0x33, 0x27, 0x51D8)  /* <CJK> */
-MAP(0x33, 0x28, 0x51DE)  /* <CJK> */
-MAP(0x33, 0x29, 0x51E2)  /* <CJK> */
-MAP(0x33, 0x2A, 0x51E5)  /* <CJK> */
-MAP(0x33, 0x2B, 0x51EE)  /* <CJK> */
-MAP(0x33, 0x2C, 0x51F2)  /* <CJK> */
-MAP(0x33, 0x2D, 0x51F3)  /* <CJK> */
-MAP(0x33, 0x2E, 0x51F4)  /* <CJK> */
-MAP(0x33, 0x2F, 0x51F7)  /* <CJK> */
-MAP(0x33, 0x30, 0x5201)  /* <CJK> */
-MAP(0x33, 0x31, 0x5202)  /* <CJK> */
-MAP(0x33, 0x32, 0x5205)  /* <CJK> */
-MAP(0x33, 0x33, 0x5212)  /* <CJK> */
-MAP(0x33, 0x34, 0x5213)  /* <CJK> */
-MAP(0x33, 0x35, 0x5215)  /* <CJK> */
-MAP(0x33, 0x36, 0x5216)  /* <CJK> */
-MAP(0x33, 0x37, 0x5218)  /* <CJK> */
-MAP(0x33, 0x38, 0x5222)  /* <CJK> */
-MAP(0x33, 0x39, 0x5228)  /* <CJK> */
-MAP(0x33, 0x3A, 0x5231)  /* <CJK> */
-MAP(0x33, 0x3B, 0x5232)  /* <CJK> */
-MAP(0x33, 0x3C, 0x5235)  /* <CJK> */
-MAP(0x33, 0x3D, 0x523C)  /* <CJK> */
-MAP(0x33, 0x3E, 0x5245)  /* <CJK> */
-MAP(0x33, 0x3F, 0x5249)  /* <CJK> */
-MAP(0x33, 0x40, 0x5255)  /* <CJK> */
-MAP(0x33, 0x41, 0x5257)  /* <CJK> */
-MAP(0x33, 0x42, 0x5258)  /* <CJK> */
-MAP(0x33, 0x43, 0x525A)  /* <CJK> */
-MAP(0x33, 0x44, 0x525C)  /* <CJK> */
-MAP(0x33, 0x45, 0x525F)  /* <CJK> */
-MAP(0x33, 0x46, 0x5260)  /* <CJK> */
-MAP(0x33, 0x47, 0x5261)  /* <CJK> */
-MAP(0x33, 0x48, 0x5266)  /* <CJK> */
-MAP(0x33, 0x49, 0x526E)  /* <CJK> */
-MAP(0x33, 0x4A, 0x5277)  /* <CJK> */
-MAP(0x33, 0x4B, 0x5278)  /* <CJK> */
-MAP(0x33, 0x4C, 0x5279)  /* <CJK> */
-MAP(0x33, 0x4D, 0x5280)  /* <CJK> */
-MAP(0x33, 0x4E, 0x5282)  /* <CJK> */
-MAP(0x33, 0x4F, 0x5285)  /* <CJK> */
-MAP(0x33, 0x50, 0x528A)  /* <CJK> */
-MAP(0x33, 0x51, 0x528C)  /* <CJK> */
-MAP(0x33, 0x52, 0x5293)  /* <CJK> */
-MAP(0x33, 0x53, 0x5295)  /* <CJK> */
-MAP(0x33, 0x54, 0x5296)  /* <CJK> */
-MAP(0x33, 0x55, 0x5297)  /* <CJK> */
-MAP(0x33, 0x56, 0x5298)  /* <CJK> */
-MAP(0x33, 0x57, 0x529A)  /* <CJK> */
-MAP(0x33, 0x58, 0x529C)  /* <CJK> */
-MAP(0x33, 0x59, 0x52A4)  /* <CJK> */
-MAP(0x33, 0x5A, 0x52A5)  /* <CJK> */
-MAP(0x33, 0x5B, 0x52A6)  /* <CJK> */
-MAP(0x33, 0x5C, 0x52A7)  /* <CJK> */
-MAP(0x33, 0x5D, 0x52AF)  /* <CJK> */
-MAP(0x33, 0x5E, 0x52B0)  /* <CJK> */
-MAP(0x33, 0x5F, 0x52B6)  /* <CJK> */
-MAP(0x33, 0x60, 0x52B7)  /* <CJK> */
-MAP(0x33, 0x61, 0x52B8)  /* <CJK> */
-MAP(0x33, 0x62, 0x52BA)  /* <CJK> */
-MAP(0x33, 0x63, 0x52BB)  /* <CJK> */
-MAP(0x33, 0x64, 0x52BD)  /* <CJK> */
-MAP(0x33, 0x65, 0x52C0)  /* <CJK> */
-MAP(0x33, 0x66, 0x52C4)  /* <CJK> */
-MAP(0x33, 0x67, 0x52C6)  /* <CJK> */
-MAP(0x33, 0x68, 0x52C8)  /* <CJK> */
-MAP(0x33, 0x69, 0x52CC)  /* <CJK> */
-MAP(0x33, 0x6A, 0x52CF)  /* <CJK> */
-MAP(0x33, 0x6B, 0x52D1)  /* <CJK> */
-MAP(0x33, 0x6C, 0x52D4)  /* <CJK> */
-MAP(0x33, 0x6D, 0x52D6)  /* <CJK> */
-MAP(0x33, 0x6E, 0x52DB)  /* <CJK> */
-MAP(0x33, 0x6F, 0x52DC)  /* <CJK> */
-MAP(0x33, 0x70, 0x52E1)  /* <CJK> */
-MAP(0x33, 0x71, 0x52E5)  /* <CJK> */
-MAP(0x33, 0x72, 0x52E8)  /* <CJK> */
-MAP(0x33, 0x73, 0x52E9)  /* <CJK> */
-MAP(0x33, 0x74, 0x52EA)  /* <CJK> */
-MAP(0x33, 0x75, 0x52EC)  /* <CJK> */
-MAP(0x33, 0x76, 0x52F0)  /* <CJK> */
-MAP(0x33, 0x77, 0x52F1)  /* <CJK> */
-MAP(0x33, 0x78, 0x52F4)  /* <CJK> */
-MAP(0x33, 0x79, 0x52F6)  /* <CJK> */
-MAP(0x33, 0x7A, 0x52F7)  /* <CJK> */
-MAP(0x33, 0x7B, 0x5300)  /* <CJK> */
-MAP(0x33, 0x7C, 0x5303)  /* <CJK> */
-MAP(0x33, 0x7D, 0x530A)  /* <CJK> */
-MAP(0x33, 0x7E, 0x530B)  /* <CJK> */
-MAP(0x34, 0x21, 0x530C)  /* <CJK> */
-MAP(0x34, 0x22, 0x5311)  /* <CJK> */
-MAP(0x34, 0x23, 0x5313)  /* <CJK> */
-MAP(0x34, 0x24, 0x5318)  /* <CJK> */
-MAP(0x34, 0x25, 0x531B)  /* <CJK> */
-MAP(0x34, 0x26, 0x531C)  /* <CJK> */
-MAP(0x34, 0x27, 0x531E)  /* <CJK> */
-MAP(0x34, 0x28, 0x531F)  /* <CJK> */
-MAP(0x34, 0x29, 0x5325)  /* <CJK> */
-MAP(0x34, 0x2A, 0x5327)  /* <CJK> */
-MAP(0x34, 0x2B, 0x5328)  /* <CJK> */
-MAP(0x34, 0x2C, 0x5329)  /* <CJK> */
-MAP(0x34, 0x2D, 0x532B)  /* <CJK> */
-MAP(0x34, 0x2E, 0x532C)  /* <CJK> */
-MAP(0x34, 0x2F, 0x532D)  /* <CJK> */
-MAP(0x34, 0x30, 0x5330)  /* <CJK> */
-MAP(0x34, 0x31, 0x5332)  /* <CJK> */
-MAP(0x34, 0x32, 0x5335)  /* <CJK> */
-MAP(0x34, 0x33, 0x533C)  /* <CJK> */
-MAP(0x34, 0x34, 0x533D)  /* <CJK> */
-MAP(0x34, 0x35, 0x533E)  /* <CJK> */
-MAP(0x34, 0x36, 0x5342)  /* <CJK> */
-MAP(0x34, 0x37, 0x534C)  /* <CJK> */
-MAP(0x34, 0x38, 0x534B)  /* <CJK> */
-MAP(0x34, 0x39, 0x5359)  /* <CJK> */
-MAP(0x34, 0x3A, 0x535B)  /* <CJK> */
-MAP(0x34, 0x3B, 0x5361)  /* <CJK> */
-MAP(0x34, 0x3C, 0x5363)  /* <CJK> */
-MAP(0x34, 0x3D, 0x5365)  /* <CJK> */
-MAP(0x34, 0x3E, 0x536C)  /* <CJK> */
-MAP(0x34, 0x3F, 0x536D)  /* <CJK> */
-MAP(0x34, 0x40, 0x5372)  /* <CJK> */
-MAP(0x34, 0x41, 0x5379)  /* <CJK> */
-MAP(0x34, 0x42, 0x537E)  /* <CJK> */
-MAP(0x34, 0x43, 0x5383)  /* <CJK> */
-MAP(0x34, 0x44, 0x5387)  /* <CJK> */
-MAP(0x34, 0x45, 0x5388)  /* <CJK> */
-MAP(0x34, 0x46, 0x538E)  /* <CJK> */
-MAP(0x34, 0x47, 0x5393)  /* <CJK> */
-MAP(0x34, 0x48, 0x5394)  /* <CJK> */
-MAP(0x34, 0x49, 0x5399)  /* <CJK> */
-MAP(0x34, 0x4A, 0x539D)  /* <CJK> */
-MAP(0x34, 0x4B, 0x53A1)  /* <CJK> */
-MAP(0x34, 0x4C, 0x53A4)  /* <CJK> */
-MAP(0x34, 0x4D, 0x53AA)  /* <CJK> */
-MAP(0x34, 0x4E, 0x53AB)  /* <CJK> */
-MAP(0x34, 0x4F, 0x53AF)  /* <CJK> */
-MAP(0x34, 0x50, 0x53B2)  /* <CJK> */
-MAP(0x34, 0x51, 0x53B4)  /* <CJK> */
-MAP(0x34, 0x52, 0x53B5)  /* <CJK> */
-MAP(0x34, 0x53, 0x53B7)  /* <CJK> */
-MAP(0x34, 0x54, 0x53B8)  /* <CJK> */
-MAP(0x34, 0x55, 0x53BA)  /* <CJK> */
-MAP(0x34, 0x56, 0x53BD)  /* <CJK> */
-MAP(0x34, 0x57, 0x53C0)  /* <CJK> */
-MAP(0x34, 0x58, 0x53C5)  /* <CJK> */
-MAP(0x34, 0x59, 0x53CF)  /* <CJK> */
-MAP(0x34, 0x5A, 0x53D2)  /* <CJK> */
-MAP(0x34, 0x5B, 0x53D3)  /* <CJK> */
-MAP(0x34, 0x5C, 0x53D5)  /* <CJK> */
-MAP(0x34, 0x5D, 0x53DA)  /* <CJK> */
-MAP(0x34, 0x5E, 0x53DD)  /* <CJK> */
-MAP(0x34, 0x5F, 0x53DE)  /* <CJK> */
-MAP(0x34, 0x60, 0x53E0)  /* <CJK> */
-MAP(0x34, 0x61, 0x53E6)  /* <CJK> */
-MAP(0x34, 0x62, 0x53E7)  /* <CJK> */
-MAP(0x34, 0x63, 0x53F5)  /* <CJK> */
-MAP(0x34, 0x64, 0x5402)  /* <CJK> */
-MAP(0x34, 0x65, 0x5413)  /* <CJK> */
-MAP(0x34, 0x66, 0x541A)  /* <CJK> */
-MAP(0x34, 0x67, 0x5421)  /* <CJK> */
-MAP(0x34, 0x68, 0x5427)  /* <CJK> */
-MAP(0x34, 0x69, 0x5428)  /* <CJK> */
-MAP(0x34, 0x6A, 0x542A)  /* <CJK> */
-MAP(0x34, 0x6B, 0x542F)  /* <CJK> */
-MAP(0x34, 0x6C, 0x5431)  /* <CJK> */
-MAP(0x34, 0x6D, 0x5434)  /* <CJK> */
-MAP(0x34, 0x6E, 0x5435)  /* <CJK> */
-MAP(0x34, 0x6F, 0x5443)  /* <CJK> */
-MAP(0x34, 0x70, 0x5444)  /* <CJK> */
-MAP(0x34, 0x71, 0x5447)  /* <CJK> */
-MAP(0x34, 0x72, 0x544D)  /* <CJK> */
-MAP(0x34, 0x73, 0x544F)  /* <CJK> */
-MAP(0x34, 0x74, 0x545E)  /* <CJK> */
-MAP(0x34, 0x75, 0x5462)  /* <CJK> */
-MAP(0x34, 0x76, 0x5464)  /* <CJK> */
-MAP(0x34, 0x77, 0x5466)  /* <CJK> */
-MAP(0x34, 0x78, 0x5467)  /* <CJK> */
-MAP(0x34, 0x79, 0x5469)  /* <CJK> */
-MAP(0x34, 0x7A, 0x546B)  /* <CJK> */
-MAP(0x34, 0x7B, 0x546D)  /* <CJK> */
-MAP(0x34, 0x7C, 0x546E)  /* <CJK> */
-MAP(0x34, 0x7D, 0x5474)  /* <CJK> */
-MAP(0x34, 0x7E, 0x547F)  /* <CJK> */
-MAP(0x35, 0x21, 0x5481)  /* <CJK> */
-MAP(0x35, 0x22, 0x5483)  /* <CJK> */
-MAP(0x35, 0x23, 0x5485)  /* <CJK> */
-MAP(0x35, 0x24, 0x5488)  /* <CJK> */
-MAP(0x35, 0x25, 0x5489)  /* <CJK> */
-MAP(0x35, 0x26, 0x548D)  /* <CJK> */
-MAP(0x35, 0x27, 0x5491)  /* <CJK> */
-MAP(0x35, 0x28, 0x5495)  /* <CJK> */
-MAP(0x35, 0x29, 0x5496)  /* <CJK> */
-MAP(0x35, 0x2A, 0x549C)  /* <CJK> */
-MAP(0x35, 0x2B, 0x549F)  /* <CJK> */
-MAP(0x35, 0x2C, 0x54A1)  /* <CJK> */
-MAP(0x35, 0x2D, 0x54A6)  /* <CJK> */
-MAP(0x35, 0x2E, 0x54A7)  /* <CJK> */
-MAP(0x35, 0x2F, 0x54A9)  /* <CJK> */
-MAP(0x35, 0x30, 0x54AA)  /* <CJK> */
-MAP(0x35, 0x31, 0x54AD)  /* <CJK> */
-MAP(0x35, 0x32, 0x54AE)  /* <CJK> */
-MAP(0x35, 0x33, 0x54B1)  /* <CJK> */
-MAP(0x35, 0x34, 0x54B7)  /* <CJK> */
-MAP(0x35, 0x35, 0x54B9)  /* <CJK> */
-MAP(0x35, 0x36, 0x54BA)  /* <CJK> */
-MAP(0x35, 0x37, 0x54BB)  /* <CJK> */
-MAP(0x35, 0x38, 0x54BF)  /* <CJK> */
-MAP(0x35, 0x39, 0x54C6)  /* <CJK> */
-MAP(0x35, 0x3A, 0x54CA)  /* <CJK> */
-MAP(0x35, 0x3B, 0x54CD)  /* <CJK> */
-MAP(0x35, 0x3C, 0x54CE)  /* <CJK> */
-MAP(0x35, 0x3D, 0x54E0)  /* <CJK> */
-MAP(0x35, 0x3E, 0x54EA)  /* <CJK> */
-MAP(0x35, 0x3F, 0x54EC)  /* <CJK> */
-MAP(0x35, 0x40, 0x54EF)  /* <CJK> */
-MAP(0x35, 0x41, 0x54F6)  /* <CJK> */
-MAP(0x35, 0x42, 0x54FC)  /* <CJK> */
-MAP(0x35, 0x43, 0x54FE)  /* <CJK> */
-MAP(0x35, 0x44, 0x54FF)  /* <CJK> */
-MAP(0x35, 0x45, 0x5500)  /* <CJK> */
-MAP(0x35, 0x46, 0x5501)  /* <CJK> */
-MAP(0x35, 0x47, 0x5505)  /* <CJK> */
-MAP(0x35, 0x48, 0x5508)  /* <CJK> */
-MAP(0x35, 0x49, 0x5509)  /* <CJK> */
-MAP(0x35, 0x4A, 0x550C)  /* <CJK> */
-MAP(0x35, 0x4B, 0x550D)  /* <CJK> */
-MAP(0x35, 0x4C, 0x550E)  /* <CJK> */
-MAP(0x35, 0x4D, 0x5515)  /* <CJK> */
-MAP(0x35, 0x4E, 0x552A)  /* <CJK> */
-MAP(0x35, 0x4F, 0x552B)  /* <CJK> */
-MAP(0x35, 0x50, 0x5532)  /* <CJK> */
-MAP(0x35, 0x51, 0x5535)  /* <CJK> */
-MAP(0x35, 0x52, 0x5536)  /* <CJK> */
-MAP(0x35, 0x53, 0x553B)  /* <CJK> */
-MAP(0x35, 0x54, 0x553C)  /* <CJK> */
-MAP(0x35, 0x55, 0x553D)  /* <CJK> */
-MAP(0x35, 0x56, 0x5541)  /* <CJK> */
-MAP(0x35, 0x57, 0x5547)  /* <CJK> */
-MAP(0x35, 0x58, 0x5549)  /* <CJK> */
-MAP(0x35, 0x59, 0x554A)  /* <CJK> */
-MAP(0x35, 0x5A, 0x554D)  /* <CJK> */
-MAP(0x35, 0x5B, 0x5550)  /* <CJK> */
-MAP(0x35, 0x5C, 0x5551)  /* <CJK> */
-MAP(0x35, 0x5D, 0x5558)  /* <CJK> */
-MAP(0x35, 0x5E, 0x555A)  /* <CJK> */
-MAP(0x35, 0x5F, 0x555B)  /* <CJK> */
-MAP(0x35, 0x60, 0x555E)  /* <CJK> */
-MAP(0x35, 0x61, 0x5560)  /* <CJK> */
-MAP(0x35, 0x62, 0x5561)  /* <CJK> */
-MAP(0x35, 0x63, 0x5564)  /* <CJK> */
-MAP(0x35, 0x64, 0x5566)  /* <CJK> */
-MAP(0x35, 0x65, 0x557F)  /* <CJK> */
-MAP(0x35, 0x66, 0x5581)  /* <CJK> */
-MAP(0x35, 0x67, 0x5582)  /* <CJK> */
-MAP(0x35, 0x68, 0x5586)  /* <CJK> */
-MAP(0x35, 0x69, 0x5588)  /* <CJK> */
-MAP(0x35, 0x6A, 0x558E)  /* <CJK> */
-MAP(0x35, 0x6B, 0x558F)  /* <CJK> */
-MAP(0x35, 0x6C, 0x5591)  /* <CJK> */
-MAP(0x35, 0x6D, 0x5592)  /* <CJK> */
-MAP(0x35, 0x6E, 0x5593)  /* <CJK> */
-MAP(0x35, 0x6F, 0x5594)  /* <CJK> */
-MAP(0x35, 0x70, 0x5597)  /* <CJK> */
-MAP(0x35, 0x71, 0x55A3)  /* <CJK> */
-MAP(0x35, 0x72, 0x55A4)  /* <CJK> */
-MAP(0x35, 0x73, 0x55AD)  /* <CJK> */
-MAP(0x35, 0x74, 0x55B2)  /* <CJK> */
-MAP(0x35, 0x75, 0x55BF)  /* <CJK> */
-MAP(0x35, 0x76, 0x55C1)  /* <CJK> */
-MAP(0x35, 0x77, 0x55C3)  /* <CJK> */
-MAP(0x35, 0x78, 0x55C6)  /* <CJK> */
-MAP(0x35, 0x79, 0x55C9)  /* <CJK> */
-MAP(0x35, 0x7A, 0x55CB)  /* <CJK> */
-MAP(0x35, 0x7B, 0x55CC)  /* <CJK> */
-MAP(0x35, 0x7C, 0x55CE)  /* <CJK> */
-MAP(0x35, 0x7D, 0x55D1)  /* <CJK> */
-MAP(0x35, 0x7E, 0x55D2)  /* <CJK> */
-MAP(0x36, 0x21, 0x55D3)  /* <CJK> */
-MAP(0x36, 0x22, 0x55D7)  /* <CJK> */
-MAP(0x36, 0x23, 0x55D8)  /* <CJK> */
-MAP(0x36, 0x24, 0x55DB)  /* <CJK> */
-MAP(0x36, 0x25, 0x55DE)  /* <CJK> */
-MAP(0x36, 0x26, 0x55E2)  /* <CJK> */
-MAP(0x36, 0x27, 0x55E9)  /* <CJK> */
-MAP(0x36, 0x28, 0x55F6)  /* <CJK> */
-MAP(0x36, 0x29, 0x55FF)  /* <CJK> */
-MAP(0x36, 0x2A, 0x5605)  /* <CJK> */
-MAP(0x36, 0x2B, 0x5608)  /* <CJK> */
-MAP(0x36, 0x2C, 0x560A)  /* <CJK> */
-MAP(0x36, 0x2D, 0x560D)  /* <CJK> */
-MAP(0x36, 0x2E, 0x560E)  /* <CJK> */
-MAP(0x36, 0x2F, 0x560F)  /* <CJK> */
-MAP(0x36, 0x30, 0x5610)  /* <CJK> */
-MAP(0x36, 0x31, 0x5611)  /* <CJK> */
-MAP(0x36, 0x32, 0x5612)  /* <CJK> */
-MAP(0x36, 0x33, 0x5619)  /* <CJK> */
-MAP(0x36, 0x34, 0x562C)  /* <CJK> */
-MAP(0x36, 0x35, 0x5630)  /* <CJK> */
-MAP(0x36, 0x36, 0x5633)  /* <CJK> */
-MAP(0x36, 0x37, 0x5635)  /* <CJK> */
-MAP(0x36, 0x38, 0x5637)  /* <CJK> */
-MAP(0x36, 0x39, 0x5639)  /* <CJK> */
-MAP(0x36, 0x3A, 0x563B)  /* <CJK> */
-MAP(0x36, 0x3B, 0x563C)  /* <CJK> */
-MAP(0x36, 0x3C, 0x563D)  /* <CJK> */
-MAP(0x36, 0x3D, 0x563F)  /* <CJK> */
-MAP(0x36, 0x3E, 0x5640)  /* <CJK> */
-MAP(0x36, 0x3F, 0x5641)  /* <CJK> */
-MAP(0x36, 0x40, 0x5643)  /* <CJK> */
-MAP(0x36, 0x41, 0x5644)  /* <CJK> */
-MAP(0x36, 0x42, 0x5646)  /* <CJK> */
-MAP(0x36, 0x43, 0x5649)  /* <CJK> */
-MAP(0x36, 0x44, 0x564B)  /* <CJK> */
-MAP(0x36, 0x45, 0x564D)  /* <CJK> */
-MAP(0x36, 0x46, 0x564F)  /* <CJK> */
-MAP(0x36, 0x47, 0x5654)  /* <CJK> */
-MAP(0x36, 0x48, 0x565E)  /* <CJK> */
-MAP(0x36, 0x49, 0x5660)  /* <CJK> */
-MAP(0x36, 0x4A, 0x5661)  /* <CJK> */
-MAP(0x36, 0x4B, 0x5662)  /* <CJK> */
-MAP(0x36, 0x4C, 0x5663)  /* <CJK> */
-MAP(0x36, 0x4D, 0x5666)  /* <CJK> */
-MAP(0x36, 0x4E, 0x5669)  /* <CJK> */
-MAP(0x36, 0x4F, 0x566D)  /* <CJK> */
-MAP(0x36, 0x50, 0x566F)  /* <CJK> */
-MAP(0x36, 0x51, 0x5671)  /* <CJK> */
-MAP(0x36, 0x52, 0x5672)  /* <CJK> */
-MAP(0x36, 0x53, 0x5675)  /* <CJK> */
-MAP(0x36, 0x54, 0x5684)  /* <CJK> */
-MAP(0x36, 0x55, 0x5685)  /* <CJK> */
-MAP(0x36, 0x56, 0x5688)  /* <CJK> */
-MAP(0x36, 0x57, 0x568B)  /* <CJK> */
-MAP(0x36, 0x58, 0x568C)  /* <CJK> */
-MAP(0x36, 0x59, 0x5695)  /* <CJK> */
-MAP(0x36, 0x5A, 0x5699)  /* <CJK> */
-MAP(0x36, 0x5B, 0x569A)  /* <CJK> */
-MAP(0x36, 0x5C, 0x569D)  /* <CJK> */
-MAP(0x36, 0x5D, 0x569E)  /* <CJK> */
-MAP(0x36, 0x5E, 0x569F)  /* <CJK> */
-MAP(0x36, 0x5F, 0x56A6)  /* <CJK> */
-MAP(0x36, 0x60, 0x56A7)  /* <CJK> */
-MAP(0x36, 0x61, 0x56A8)  /* <CJK> */
-MAP(0x36, 0x62, 0x56A9)  /* <CJK> */
-MAP(0x36, 0x63, 0x56AB)  /* <CJK> */
-MAP(0x36, 0x64, 0x56AC)  /* <CJK> */
-MAP(0x36, 0x65, 0x56AD)  /* <CJK> */
-MAP(0x36, 0x66, 0x56B1)  /* <CJK> */
-MAP(0x36, 0x67, 0x56B3)  /* <CJK> */
-MAP(0x36, 0x68, 0x56B7)  /* <CJK> */
-MAP(0x36, 0x69, 0x56BE)  /* <CJK> */
-MAP(0x36, 0x6A, 0x56C5)  /* <CJK> */
-MAP(0x36, 0x6B, 0x56C9)  /* <CJK> */
-MAP(0x36, 0x6C, 0x56CA)  /* <CJK> */
-MAP(0x36, 0x6D, 0x56CB)  /* <CJK> */
-MAP(0x36, 0x6E, 0x56CF)  /* <CJK> */
-MAP(0x36, 0x6F, 0x56D0)  /* <CJK> */
-MAP(0x36, 0x70, 0x56CC)  /* <CJK> */
-MAP(0x36, 0x71, 0x56CD)  /* <CJK> */
-MAP(0x36, 0x72, 0x56D9)  /* <CJK> */
-MAP(0x36, 0x73, 0x56DC)  /* <CJK> */
-MAP(0x36, 0x74, 0x56DD)  /* <CJK> */
-MAP(0x36, 0x75, 0x56DF)  /* <CJK> */
-MAP(0x36, 0x76, 0x56E1)  /* <CJK> */
-MAP(0x36, 0x77, 0x56E4)  /* <CJK> */
-MAP(0x36, 0x78, 0x56E5)  /* <CJK> */
-MAP(0x36, 0x79, 0x56E6)  /* <CJK> */
-MAP(0x36, 0x7A, 0x56E7)  /* <CJK> */
-MAP(0x36, 0x7B, 0x56E8)  /* <CJK> */
-MAP(0x36, 0x7C, 0x56F1)  /* <CJK> */
-MAP(0x36, 0x7D, 0x56EB)  /* <CJK> */
-MAP(0x36, 0x7E, 0x56ED)  /* <CJK> */
-MAP(0x37, 0x21, 0x56F6)  /* <CJK> */
-MAP(0x37, 0x22, 0x56F7)  /* <CJK> */
-MAP(0x37, 0x23, 0x5701)  /* <CJK> */
-MAP(0x37, 0x24, 0x5702)  /* <CJK> */
-MAP(0x37, 0x25, 0x5707)  /* <CJK> */
-MAP(0x37, 0x26, 0x570A)  /* <CJK> */
-MAP(0x37, 0x27, 0x570C)  /* <CJK> */
-MAP(0x37, 0x28, 0x5711)  /* <CJK> */
-MAP(0x37, 0x29, 0x5715)  /* <CJK> */
-MAP(0x37, 0x2A, 0x571A)  /* <CJK> */
-MAP(0x37, 0x2B, 0x571B)  /* <CJK> */
-MAP(0x37, 0x2C, 0x571D)  /* <CJK> */
-MAP(0x37, 0x2D, 0x5720)  /* <CJK> */
-MAP(0x37, 0x2E, 0x5722)  /* <CJK> */
-MAP(0x37, 0x2F, 0x5723)  /* <CJK> */
-MAP(0x37, 0x30, 0x5724)  /* <CJK> */
-MAP(0x37, 0x31, 0x5725)  /* <CJK> */
-MAP(0x37, 0x32, 0x5729)  /* <CJK> */
-MAP(0x37, 0x33, 0x572A)  /* <CJK> */
-MAP(0x37, 0x34, 0x572C)  /* <CJK> */
-MAP(0x37, 0x35, 0x572E)  /* <CJK> */
-MAP(0x37, 0x36, 0x572F)  /* <CJK> */
-MAP(0x37, 0x37, 0x5733)  /* <CJK> */
-MAP(0x37, 0x38, 0x5734)  /* <CJK> */
-MAP(0x37, 0x39, 0x573D)  /* <CJK> */
-MAP(0x37, 0x3A, 0x573E)  /* <CJK> */
-MAP(0x37, 0x3B, 0x573F)  /* <CJK> */
-MAP(0x37, 0x3C, 0x5745)  /* <CJK> */
-MAP(0x37, 0x3D, 0x5746)  /* <CJK> */
-MAP(0x37, 0x3E, 0x574C)  /* <CJK> */
-MAP(0x37, 0x3F, 0x574D)  /* <CJK> */
-MAP(0x37, 0x40, 0x5752)  /* <CJK> */
-MAP(0x37, 0x41, 0x5762)  /* <CJK> */
-MAP(0x37, 0x42, 0x5765)  /* <CJK> */
-MAP(0x37, 0x43, 0x5767)  /* <CJK> */
-MAP(0x37, 0x44, 0x5768)  /* <CJK> */
-MAP(0x37, 0x45, 0x576B)  /* <CJK> */
-MAP(0x37, 0x46, 0x576D)  /* <CJK> */
-MAP(0x37, 0x47, 0x576E)  /* <CJK> */
-MAP(0x37, 0x48, 0x576F)  /* <CJK> */
-MAP(0x37, 0x49, 0x5770)  /* <CJK> */
-MAP(0x37, 0x4A, 0x5771)  /* <CJK> */
-MAP(0x37, 0x4B, 0x5773)  /* <CJK> */
-MAP(0x37, 0x4C, 0x5774)  /* <CJK> */
-MAP(0x37, 0x4D, 0x5775)  /* <CJK> */
-MAP(0x37, 0x4E, 0x5777)  /* <CJK> */
-MAP(0x37, 0x4F, 0x5779)  /* <CJK> */
-MAP(0x37, 0x50, 0x577A)  /* <CJK> */
-MAP(0x37, 0x51, 0x577B)  /* <CJK> */
-MAP(0x37, 0x52, 0x577C)  /* <CJK> */
-MAP(0x37, 0x53, 0x577E)  /* <CJK> */
-MAP(0x37, 0x54, 0x5781)  /* <CJK> */
-MAP(0x37, 0x55, 0x5783)  /* <CJK> */
-MAP(0x37, 0x56, 0x578C)  /* <CJK> */
-MAP(0x37, 0x57, 0x5794)  /* <CJK> */
-MAP(0x37, 0x58, 0x5797)  /* <CJK> */
-MAP(0x37, 0x59, 0x5799)  /* <CJK> */
-MAP(0x37, 0x5A, 0x579A)  /* <CJK> */
-MAP(0x37, 0x5B, 0x579C)  /* <CJK> */
-MAP(0x37, 0x5C, 0x579D)  /* <CJK> */
-MAP(0x37, 0x5D, 0x579E)  /* <CJK> */
-MAP(0x37, 0x5E, 0x579F)  /* <CJK> */
-MAP(0x37, 0x5F, 0x57A1)  /* <CJK> */
-MAP(0x37, 0x60, 0x5795)  /* <CJK> */
-MAP(0x37, 0x61, 0x57A7)  /* <CJK> */
-MAP(0x37, 0x62, 0x57A8)  /* <CJK> */
-MAP(0x37, 0x63, 0x57A9)  /* <CJK> */
-MAP(0x37, 0x64, 0x57AC)  /* <CJK> */
-MAP(0x37, 0x65, 0x57B8)  /* <CJK> */
-MAP(0x37, 0x66, 0x57BD)  /* <CJK> */
-MAP(0x37, 0x67, 0x57C7)  /* <CJK> */
-MAP(0x37, 0x68, 0x57C8)  /* <CJK> */
-MAP(0x37, 0x69, 0x57CC)  /* <CJK> */
-MAP(0x37, 0x6A, 0x57CF)  /* <CJK> */
-MAP(0x37, 0x6B, 0x57D5)  /* <CJK> */
-MAP(0x37, 0x6C, 0x57DD)  /* <CJK> */
-MAP(0x37, 0x6D, 0x57DE)  /* <CJK> */
-MAP(0x37, 0x6E, 0x57E4)  /* <CJK> */
-MAP(0x37, 0x6F, 0x57E6)  /* <CJK> */
-MAP(0x37, 0x70, 0x57E7)  /* <CJK> */
-MAP(0x37, 0x71, 0x57E9)  /* <CJK> */
-MAP(0x37, 0x72, 0x57ED)  /* <CJK> */
-MAP(0x37, 0x73, 0x57F0)  /* <CJK> */
-MAP(0x37, 0x74, 0x57F5)  /* <CJK> */
-MAP(0x37, 0x75, 0x57F6)  /* <CJK> */
-MAP(0x37, 0x76, 0x57F8)  /* <CJK> */
-MAP(0x37, 0x77, 0x57FD)  /* <CJK> */
-MAP(0x37, 0x78, 0x57FE)  /* <CJK> */
-MAP(0x37, 0x79, 0x57FF)  /* <CJK> */
-MAP(0x37, 0x7A, 0x5803)  /* <CJK> */
-MAP(0x37, 0x7B, 0x5804)  /* <CJK> */
-MAP(0x37, 0x7C, 0x5808)  /* <CJK> */
-MAP(0x37, 0x7D, 0x5809)  /* <CJK> */
-MAP(0x37, 0x7E, 0x57E1)  /* <CJK> */
-MAP(0x38, 0x21, 0x580C)  /* <CJK> */
-MAP(0x38, 0x22, 0x580D)  /* <CJK> */
-MAP(0x38, 0x23, 0x581B)  /* <CJK> */
-MAP(0x38, 0x24, 0x581E)  /* <CJK> */
-MAP(0x38, 0x25, 0x581F)  /* <CJK> */
-MAP(0x38, 0x26, 0x5820)  /* <CJK> */
-MAP(0x38, 0x27, 0x5826)  /* <CJK> */
-MAP(0x38, 0x28, 0x5827)  /* <CJK> */
-MAP(0x38, 0x29, 0x582D)  /* <CJK> */
-MAP(0x38, 0x2A, 0x5832)  /* <CJK> */
-MAP(0x38, 0x2B, 0x5839)  /* <CJK> */
-MAP(0x38, 0x2C, 0x583F)  /* <CJK> */
-MAP(0x38, 0x2D, 0x5849)  /* <CJK> */
-MAP(0x38, 0x2E, 0x584C)  /* <CJK> */
-MAP(0x38, 0x2F, 0x584D)  /* <CJK> */
-MAP(0x38, 0x30, 0x584F)  /* <CJK> */
-MAP(0x38, 0x31, 0x5850)  /* <CJK> */
-MAP(0x38, 0x32, 0x5855)  /* <CJK> */
-MAP(0x38, 0x33, 0x585F)  /* <CJK> */
-MAP(0x38, 0x34, 0x5861)  /* <CJK> */
-MAP(0x38, 0x35, 0x5864)  /* <CJK> */
-MAP(0x38, 0x36, 0x5867)  /* <CJK> */
-MAP(0x38, 0x37, 0x5868)  /* <CJK> */
-MAP(0x38, 0x38, 0x5878)  /* <CJK> */
-MAP(0x38, 0x39, 0x587C)  /* <CJK> */
-MAP(0x38, 0x3A, 0x587F)  /* <CJK> */
-MAP(0x38, 0x3B, 0x5880)  /* <CJK> */
-MAP(0x38, 0x3C, 0x5881)  /* <CJK> */
-MAP(0x38, 0x3D, 0x5887)  /* <CJK> */
-MAP(0x38, 0x3E, 0x5888)  /* <CJK> */
-MAP(0x38, 0x3F, 0x5889)  /* <CJK> */
-MAP(0x38, 0x40, 0x588A)  /* <CJK> */
-MAP(0x38, 0x41, 0x588C)  /* <CJK> */
-MAP(0x38, 0x42, 0x588D)  /* <CJK> */
-MAP(0x38, 0x43, 0x588F)  /* <CJK> */
-MAP(0x38, 0x44, 0x5890)  /* <CJK> */
-MAP(0x38, 0x45, 0x5894)  /* <CJK> */
-MAP(0x38, 0x46, 0x5896)  /* <CJK> */
-MAP(0x38, 0x47, 0x589D)  /* <CJK> */
-MAP(0x38, 0x48, 0x58A0)  /* <CJK> */
-MAP(0x38, 0x49, 0x58A1)  /* <CJK> */
-MAP(0x38, 0x4A, 0x58A2)  /* <CJK> */
-MAP(0x38, 0x4B, 0x58A6)  /* <CJK> */
-MAP(0x38, 0x4C, 0x58A9)  /* <CJK> */
-MAP(0x38, 0x4D, 0x58B1)  /* <CJK> */
-MAP(0x38, 0x4E, 0x58B2)  /* <CJK> */
-MAP(0x38, 0x4F, 0x58C4)  /* <CJK> */
-MAP(0x38, 0x50, 0x58BC)  /* <CJK> */
-MAP(0x38, 0x51, 0x58C2)  /* <CJK> */
-MAP(0x38, 0x52, 0x58C8)  /* <CJK> */
-MAP(0x38, 0x53, 0x58CD)  /* <CJK> */
-MAP(0x38, 0x54, 0x58CE)  /* <CJK> */
-MAP(0x38, 0x55, 0x58D0)  /* <CJK> */
-MAP(0x38, 0x56, 0x58D2)  /* <CJK> */
-MAP(0x38, 0x57, 0x58D4)  /* <CJK> */
-MAP(0x38, 0x58, 0x58D6)  /* <CJK> */
-MAP(0x38, 0x59, 0x58DA)  /* <CJK> */
-MAP(0x38, 0x5A, 0x58DD)  /* <CJK> */
-MAP(0x38, 0x5B, 0x58E1)  /* <CJK> */
-MAP(0x38, 0x5C, 0x58E2)  /* <CJK> */
-MAP(0x38, 0x5D, 0x58E9)  /* <CJK> */
-MAP(0x38, 0x5E, 0x58F3)  /* <CJK> */
-MAP(0x38, 0x5F, 0x5905)  /* <CJK> */
-MAP(0x38, 0x60, 0x5906)  /* <CJK> */
-MAP(0x38, 0x61, 0x590B)  /* <CJK> */
-MAP(0x38, 0x62, 0x590C)  /* <CJK> */
-MAP(0x38, 0x63, 0x5912)  /* <CJK> */
-MAP(0x38, 0x64, 0x5913)  /* <CJK> */
-MAP(0x38, 0x65, 0x5914)  /* <CJK> */
-MAP(0x38, 0x66, 0x8641)  /* <CJK> */
-MAP(0x38, 0x67, 0x591D)  /* <CJK> */
-MAP(0x38, 0x68, 0x5921)  /* <CJK> */
-MAP(0x38, 0x69, 0x5923)  /* <CJK> */
-MAP(0x38, 0x6A, 0x5924)  /* <CJK> */
-MAP(0x38, 0x6B, 0x5928)  /* <CJK> */
-MAP(0x38, 0x6C, 0x592F)  /* <CJK> */
-MAP(0x38, 0x6D, 0x5930)  /* <CJK> */
-MAP(0x38, 0x6E, 0x5933)  /* <CJK> */
-MAP(0x38, 0x6F, 0x5935)  /* <CJK> */
-MAP(0x38, 0x70, 0x5936)  /* <CJK> */
-MAP(0x38, 0x71, 0x593F)  /* <CJK> */
-MAP(0x38, 0x72, 0x5943)  /* <CJK> */
-MAP(0x38, 0x73, 0x5946)  /* <CJK> */
-MAP(0x38, 0x74, 0x5952)  /* <CJK> */
-MAP(0x38, 0x75, 0x5953)  /* <CJK> */
-MAP(0x38, 0x76, 0x5959)  /* <CJK> */
-MAP(0x38, 0x77, 0x595B)  /* <CJK> */
-MAP(0x38, 0x78, 0x595D)  /* <CJK> */
-MAP(0x38, 0x79, 0x595E)  /* <CJK> */
-MAP(0x38, 0x7A, 0x595F)  /* <CJK> */
-MAP(0x38, 0x7B, 0x5961)  /* <CJK> */
-MAP(0x38, 0x7C, 0x5963)  /* <CJK> */
-MAP(0x38, 0x7D, 0x596B)  /* <CJK> */
-MAP(0x38, 0x7E, 0x596D)  /* <CJK> */
-MAP(0x39, 0x21, 0x596F)  /* <CJK> */
-MAP(0x39, 0x22, 0x5972)  /* <CJK> */
-MAP(0x39, 0x23, 0x5975)  /* <CJK> */
-MAP(0x39, 0x24, 0x5976)  /* <CJK> */
-MAP(0x39, 0x25, 0x5979)  /* <CJK> */
-MAP(0x39, 0x26, 0x597B)  /* <CJK> */
-MAP(0x39, 0x27, 0x597C)  /* <CJK> */
-MAP(0x39, 0x28, 0x598B)  /* <CJK> */
-MAP(0x39, 0x29, 0x598C)  /* <CJK> */
-MAP(0x39, 0x2A, 0x598E)  /* <CJK> */
-MAP(0x39, 0x2B, 0x5992)  /* <CJK> */
-MAP(0x39, 0x2C, 0x5995)  /* <CJK> */
-MAP(0x39, 0x2D, 0x5997)  /* <CJK> */
-MAP(0x39, 0x2E, 0x599F)  /* <CJK> */
-MAP(0x39, 0x2F, 0x59A4)  /* <CJK> */
-MAP(0x39, 0x30, 0x59A7)  /* <CJK> */
-MAP(0x39, 0x31, 0x59AD)  /* <CJK> */
-MAP(0x39, 0x32, 0x59AE)  /* <CJK> */
-MAP(0x39, 0x33, 0x59AF)  /* <CJK> */
-MAP(0x39, 0x34, 0x59B0)  /* <CJK> */
-MAP(0x39, 0x35, 0x59B3)  /* <CJK> */
-MAP(0x39, 0x36, 0x59B7)  /* <CJK> */
-MAP(0x39, 0x37, 0x59BA)  /* <CJK> */
-MAP(0x39, 0x38, 0x59BC)  /* <CJK> */
-MAP(0x39, 0x39, 0x59C1)  /* <CJK> */
-MAP(0x39, 0x3A, 0x59C3)  /* <CJK> */
-MAP(0x39, 0x3B, 0x59C4)  /* <CJK> */
-MAP(0x39, 0x3C, 0x59C8)  /* <CJK> */
-MAP(0x39, 0x3D, 0x59CA)  /* <CJK> */
-MAP(0x39, 0x3E, 0x59CD)  /* <CJK> */
-MAP(0x39, 0x3F, 0x59D2)  /* <CJK> */
-MAP(0x39, 0x40, 0x59DD)  /* <CJK> */
-MAP(0x39, 0x41, 0x59DE)  /* <CJK> */
-MAP(0x39, 0x42, 0x59DF)  /* <CJK> */
-MAP(0x39, 0x43, 0x59E3)  /* <CJK> */
-MAP(0x39, 0x44, 0x59E4)  /* <CJK> */
-MAP(0x39, 0x45, 0x59E7)  /* <CJK> */
-MAP(0x39, 0x46, 0x59EE)  /* <CJK> */
-MAP(0x39, 0x47, 0x59EF)  /* <CJK> */
-MAP(0x39, 0x48, 0x59F1)  /* <CJK> */
-MAP(0x39, 0x49, 0x59F2)  /* <CJK> */
-MAP(0x39, 0x4A, 0x59F4)  /* <CJK> */
-MAP(0x39, 0x4B, 0x59F7)  /* <CJK> */
-MAP(0x39, 0x4C, 0x5A00)  /* <CJK> */
-MAP(0x39, 0x4D, 0x5A04)  /* <CJK> */
-MAP(0x39, 0x4E, 0x5A0C)  /* <CJK> */
-MAP(0x39, 0x4F, 0x5A0D)  /* <CJK> */
-MAP(0x39, 0x50, 0x5A0E)  /* <CJK> */
-MAP(0x39, 0x51, 0x5A12)  /* <CJK> */
-MAP(0x39, 0x52, 0x5A13)  /* <CJK> */
-MAP(0x39, 0x53, 0x5A1E)  /* <CJK> */
-MAP(0x39, 0x54, 0x5A23)  /* <CJK> */
-MAP(0x39, 0x55, 0x5A24)  /* <CJK> */
-MAP(0x39, 0x56, 0x5A27)  /* <CJK> */
-MAP(0x39, 0x57, 0x5A28)  /* <CJK> */
-MAP(0x39, 0x58, 0x5A2A)  /* <CJK> */
-MAP(0x39, 0x59, 0x5A2D)  /* <CJK> */
-MAP(0x39, 0x5A, 0x5A30)  /* <CJK> */
-MAP(0x39, 0x5B, 0x5A44)  /* <CJK> */
-MAP(0x39, 0x5C, 0x5A45)  /* <CJK> */
-MAP(0x39, 0x5D, 0x5A47)  /* <CJK> */
-MAP(0x39, 0x5E, 0x5A48)  /* <CJK> */
-MAP(0x39, 0x5F, 0x5A4C)  /* <CJK> */
-MAP(0x39, 0x60, 0x5A50)  /* <CJK> */
-MAP(0x39, 0x61, 0x5A55)  /* <CJK> */
-MAP(0x39, 0x62, 0x5A5E)  /* <CJK> */
-MAP(0x39, 0x63, 0x5A63)  /* <CJK> */
-MAP(0x39, 0x64, 0x5A65)  /* <CJK> */
-MAP(0x39, 0x65, 0x5A67)  /* <CJK> */
-MAP(0x39, 0x66, 0x5A6D)  /* <CJK> */
-MAP(0x39, 0x67, 0x5A77)  /* <CJK> */
-MAP(0x39, 0x68, 0x5A7A)  /* <CJK> */
-MAP(0x39, 0x69, 0x5A7B)  /* <CJK> */
-MAP(0x39, 0x6A, 0x5A7E)  /* <CJK> */
-MAP(0x39, 0x6B, 0x5A8B)  /* <CJK> */
-MAP(0x39, 0x6C, 0x5A90)  /* <CJK> */
-MAP(0x39, 0x6D, 0x5A93)  /* <CJK> */
-MAP(0x39, 0x6E, 0x5A96)  /* <CJK> */
-MAP(0x39, 0x6F, 0x5A99)  /* <CJK> */
-MAP(0x39, 0x70, 0x5A9C)  /* <CJK> */
-MAP(0x39, 0x71, 0x5A9E)  /* <CJK> */
-MAP(0x39, 0x72, 0x5A9F)  /* <CJK> */
-MAP(0x39, 0x73, 0x5AA0)  /* <CJK> */
-MAP(0x39, 0x74, 0x5AA2)  /* <CJK> */
-MAP(0x39, 0x75, 0x5AA7)  /* <CJK> */
-MAP(0x39, 0x76, 0x5AAC)  /* <CJK> */
-MAP(0x39, 0x77, 0x5AB1)  /* <CJK> */
-MAP(0x39, 0x78, 0x5AB2)  /* <CJK> */
-MAP(0x39, 0x79, 0x5AB3)  /* <CJK> */
-MAP(0x39, 0x7A, 0x5AB5)  /* <CJK> */
-MAP(0x39, 0x7B, 0x5AB8)  /* <CJK> */
-MAP(0x39, 0x7C, 0x5ABA)  /* <CJK> */
-MAP(0x39, 0x7D, 0x5ABB)  /* <CJK> */
-MAP(0x39, 0x7E, 0x5ABF)  /* <CJK> */
-MAP(0x3A, 0x21, 0x5AC4)  /* <CJK> */
-MAP(0x3A, 0x22, 0x5AC6)  /* <CJK> */
-MAP(0x3A, 0x23, 0x5AC8)  /* <CJK> */
-MAP(0x3A, 0x24, 0x5ACF)  /* <CJK> */
-MAP(0x3A, 0x25, 0x5ADA)  /* <CJK> */
-MAP(0x3A, 0x26, 0x5ADC)  /* <CJK> */
-MAP(0x3A, 0x27, 0x5AE0)  /* <CJK> */
-MAP(0x3A, 0x28, 0x5AE5)  /* <CJK> */
-MAP(0x3A, 0x29, 0x5AEA)  /* <CJK> */
-MAP(0x3A, 0x2A, 0x5AEE)  /* <CJK> */
-MAP(0x3A, 0x2B, 0x5AF5)  /* <CJK> */
-MAP(0x3A, 0x2C, 0x5AF6)  /* <CJK> */
-MAP(0x3A, 0x2D, 0x5AFD)  /* <CJK> */
-MAP(0x3A, 0x2E, 0x5B00)  /* <CJK> */
-MAP(0x3A, 0x2F, 0x5B01)  /* <CJK> */
-MAP(0x3A, 0x30, 0x5B08)  /* <CJK> */
-MAP(0x3A, 0x31, 0x5B17)  /* <CJK> */
-MAP(0x3A, 0x32, 0x5B34)  /* <CJK> */
-MAP(0x3A, 0x33, 0x5B19)  /* <CJK> */
-MAP(0x3A, 0x34, 0x5B1B)  /* <CJK> */
-MAP(0x3A, 0x35, 0x5B1D)  /* <CJK> */
-MAP(0x3A, 0x36, 0x5B21)  /* <CJK> */
-MAP(0x3A, 0x37, 0x5B25)  /* <CJK> */
-MAP(0x3A, 0x38, 0x5B2D)  /* <CJK> */
-MAP(0x3A, 0x39, 0x5B38)  /* <CJK> */
-MAP(0x3A, 0x3A, 0x5B41)  /* <CJK> */
-MAP(0x3A, 0x3B, 0x5B4B)  /* <CJK> */
-MAP(0x3A, 0x3C, 0x5B4C)  /* <CJK> */
-MAP(0x3A, 0x3D, 0x5B52)  /* <CJK> */
-MAP(0x3A, 0x3E, 0x5B56)  /* <CJK> */
-MAP(0x3A, 0x3F, 0x5B5E)  /* <CJK> */
-MAP(0x3A, 0x40, 0x5B68)  /* <CJK> */
-MAP(0x3A, 0x41, 0x5B6E)  /* <CJK> */
-MAP(0x3A, 0x42, 0x5B6F)  /* <CJK> */
-MAP(0x3A, 0x43, 0x5B7C)  /* <CJK> */
-MAP(0x3A, 0x44, 0x5B7D)  /* <CJK> */
-MAP(0x3A, 0x45, 0x5B7E)  /* <CJK> */
-MAP(0x3A, 0x46, 0x5B7F)  /* <CJK> */
-MAP(0x3A, 0x47, 0x5B81)  /* <CJK> */
-MAP(0x3A, 0x48, 0x5B84)  /* <CJK> */
-MAP(0x3A, 0x49, 0x5B86)  /* <CJK> */
-MAP(0x3A, 0x4A, 0x5B8A)  /* <CJK> */
-MAP(0x3A, 0x4B, 0x5B8E)  /* <CJK> */
-MAP(0x3A, 0x4C, 0x5B90)  /* <CJK> */
-MAP(0x3A, 0x4D, 0x5B91)  /* <CJK> */
-MAP(0x3A, 0x4E, 0x5B93)  /* <CJK> */
-MAP(0x3A, 0x4F, 0x5B94)  /* <CJK> */
-MAP(0x3A, 0x50, 0x5B96)  /* <CJK> */
-MAP(0x3A, 0x51, 0x5BA8)  /* <CJK> */
-MAP(0x3A, 0x52, 0x5BA9)  /* <CJK> */
-MAP(0x3A, 0x53, 0x5BAC)  /* <CJK> */
-MAP(0x3A, 0x54, 0x5BAD)  /* <CJK> */
-MAP(0x3A, 0x55, 0x5BAF)  /* <CJK> */
-MAP(0x3A, 0x56, 0x5BB1)  /* <CJK> */
-MAP(0x3A, 0x57, 0x5BB2)  /* <CJK> */
-MAP(0x3A, 0x58, 0x5BB7)  /* <CJK> */
-MAP(0x3A, 0x59, 0x5BBA)  /* <CJK> */
-MAP(0x3A, 0x5A, 0x5BBC)  /* <CJK> */
-MAP(0x3A, 0x5B, 0x5BC0)  /* <CJK> */
-MAP(0x3A, 0x5C, 0x5BC1)  /* <CJK> */
-MAP(0x3A, 0x5D, 0x5BCD)  /* <CJK> */
-MAP(0x3A, 0x5E, 0x5BCF)  /* <CJK> */
-MAP(0x3A, 0x5F, 0x5BD6)  /* <CJK> */
-MAP(0x3A, 0x60, 0x5BD7)  /* <CJK> */
-MAP(0x3A, 0x61, 0x5BD8)  /* <CJK> */
-MAP(0x3A, 0x62, 0x5BD9)  /* <CJK> */
-MAP(0x3A, 0x63, 0x5BDA)  /* <CJK> */
-MAP(0x3A, 0x64, 0x5BE0)  /* <CJK> */
-MAP(0x3A, 0x65, 0x5BEF)  /* <CJK> */
-MAP(0x3A, 0x66, 0x5BF1)  /* <CJK> */
-MAP(0x3A, 0x67, 0x5BF4)  /* <CJK> */
-MAP(0x3A, 0x68, 0x5BFD)  /* <CJK> */
-MAP(0x3A, 0x69, 0x5C0C)  /* <CJK> */
-MAP(0x3A, 0x6A, 0x5C17)  /* <CJK> */
-MAP(0x3A, 0x6B, 0x5C1E)  /* <CJK> */
-MAP(0x3A, 0x6C, 0x5C1F)  /* <CJK> */
-MAP(0x3A, 0x6D, 0x5C23)  /* <CJK> */
-MAP(0x3A, 0x6E, 0x5C26)  /* <CJK> */
-MAP(0x3A, 0x6F, 0x5C29)  /* <CJK> */
-MAP(0x3A, 0x70, 0x5C2B)  /* <CJK> */
-MAP(0x3A, 0x71, 0x5C2C)  /* <CJK> */
-MAP(0x3A, 0x72, 0x5C2E)  /* <CJK> */
-MAP(0x3A, 0x73, 0x5C30)  /* <CJK> */
-MAP(0x3A, 0x74, 0x5C32)  /* <CJK> */
-MAP(0x3A, 0x75, 0x5C35)  /* <CJK> */
-MAP(0x3A, 0x76, 0x5C36)  /* <CJK> */
-MAP(0x3A, 0x77, 0x5C59)  /* <CJK> */
-MAP(0x3A, 0x78, 0x5C5A)  /* <CJK> */
-MAP(0x3A, 0x79, 0x5C5C)  /* <CJK> */
-MAP(0x3A, 0x7A, 0x5C62)  /* <CJK> */
-MAP(0x3A, 0x7B, 0x5C63)  /* <CJK> */
-MAP(0x3A, 0x7C, 0x5C67)  /* <CJK> */
-MAP(0x3A, 0x7D, 0x5C68)  /* <CJK> */
-MAP(0x3A, 0x7E, 0x5C69)  /* <CJK> */
-MAP(0x3B, 0x21, 0x5C6D)  /* <CJK> */
-MAP(0x3B, 0x22, 0x5C70)  /* <CJK> */
-MAP(0x3B, 0x23, 0x5C74)  /* <CJK> */
-MAP(0x3B, 0x24, 0x5C75)  /* <CJK> */
-MAP(0x3B, 0x25, 0x5C7A)  /* <CJK> */
-MAP(0x3B, 0x26, 0x5C7B)  /* <CJK> */
-MAP(0x3B, 0x27, 0x5C7C)  /* <CJK> */
-MAP(0x3B, 0x28, 0x5C7D)  /* <CJK> */
-MAP(0x3B, 0x29, 0x5C87)  /* <CJK> */
-MAP(0x3B, 0x2A, 0x5C88)  /* <CJK> */
-MAP(0x3B, 0x2B, 0x5C8A)  /* <CJK> */
-MAP(0x3B, 0x2C, 0x5C8F)  /* <CJK> */
-MAP(0x3B, 0x2D, 0x5C92)  /* <CJK> */
-MAP(0x3B, 0x2E, 0x5C9D)  /* <CJK> */
-MAP(0x3B, 0x2F, 0x5C9F)  /* <CJK> */
-MAP(0x3B, 0x30, 0x5CA0)  /* <CJK> */
-MAP(0x3B, 0x31, 0x5CA2)  /* <CJK> */
-MAP(0x3B, 0x32, 0x5CA3)  /* <CJK> */
-MAP(0x3B, 0x33, 0x5CA6)  /* <CJK> */
-MAP(0x3B, 0x34, 0x5CAA)  /* <CJK> */
-MAP(0x3B, 0x35, 0x5CB2)  /* <CJK> */
-MAP(0x3B, 0x36, 0x5CB4)  /* <CJK> */
-MAP(0x3B, 0x37, 0x5CB5)  /* <CJK> */
-MAP(0x3B, 0x38, 0x5CBA)  /* <CJK> */
-MAP(0x3B, 0x39, 0x5CC9)  /* <CJK> */
-MAP(0x3B, 0x3A, 0x5CCB)  /* <CJK> */
-MAP(0x3B, 0x3B, 0x5CD2)  /* <CJK> */
-MAP(0x3B, 0x3C, 0x5CDD)  /* <CJK> */
-MAP(0x3B, 0x3D, 0x5CD7)  /* <CJK> */
-MAP(0x3B, 0x3E, 0x5CEE)  /* <CJK> */
-MAP(0x3B, 0x3F, 0x5CF1)  /* <CJK> */
-MAP(0x3B, 0x40, 0x5CF2)  /* <CJK> */
-MAP(0x3B, 0x41, 0x5CF4)  /* <CJK> */
-MAP(0x3B, 0x42, 0x5D01)  /* <CJK> */
-MAP(0x3B, 0x43, 0x5D06)  /* <CJK> */
-MAP(0x3B, 0x44, 0x5D0D)  /* <CJK> */
-MAP(0x3B, 0x45, 0x5D12)  /* <CJK> */
-MAP(0x3B, 0x46, 0x5D2B)  /* <CJK> */
-MAP(0x3B, 0x47, 0x5D23)  /* <CJK> */
-MAP(0x3B, 0x48, 0x5D24)  /* <CJK> */
-MAP(0x3B, 0x49, 0x5D26)  /* <CJK> */
-MAP(0x3B, 0x4A, 0x5D27)  /* <CJK> */
-MAP(0x3B, 0x4B, 0x5D31)  /* <CJK> */
-MAP(0x3B, 0x4C, 0x5D34)  /* <CJK> */
-MAP(0x3B, 0x4D, 0x5D39)  /* <CJK> */
-MAP(0x3B, 0x4E, 0x5D3D)  /* <CJK> */
-MAP(0x3B, 0x4F, 0x5D3F)  /* <CJK> */
-MAP(0x3B, 0x50, 0x5D42)  /* <CJK> */
-MAP(0x3B, 0x51, 0x5D43)  /* <CJK> */
-MAP(0x3B, 0x52, 0x5D46)  /* <CJK> */
-MAP(0x3B, 0x53, 0x5D48)  /* <CJK> */
-MAP(0x3B, 0x54, 0x5D55)  /* <CJK> */
-MAP(0x3B, 0x55, 0x5D51)  /* <CJK> */
-MAP(0x3B, 0x56, 0x5D59)  /* <CJK> */
-MAP(0x3B, 0x57, 0x5D4A)  /* <CJK> */
-MAP(0x3B, 0x58, 0x5D5F)  /* <CJK> */
-MAP(0x3B, 0x59, 0x5D60)  /* <CJK> */
-MAP(0x3B, 0x5A, 0x5D61)  /* <CJK> */
-MAP(0x3B, 0x5B, 0x5D62)  /* <CJK> */
-MAP(0x3B, 0x5C, 0x5D64)  /* <CJK> */
-MAP(0x3B, 0x5D, 0x5D6A)  /* <CJK> */
-MAP(0x3B, 0x5E, 0x5D6D)  /* <CJK> */
-MAP(0x3B, 0x5F, 0x5D70)  /* <CJK> */
-MAP(0x3B, 0x60, 0x5D79)  /* <CJK> */
-MAP(0x3B, 0x61, 0x5D7A)  /* <CJK> */
-MAP(0x3B, 0x62, 0x5D7E)  /* <CJK> */
-MAP(0x3B, 0x63, 0x5D7F)  /* <CJK> */
-MAP(0x3B, 0x64, 0x5D81)  /* <CJK> */
-MAP(0x3B, 0x65, 0x5D83)  /* <CJK> */
-MAP(0x3B, 0x66, 0x5D88)  /* <CJK> */
-MAP(0x3B, 0x67, 0x5D8A)  /* <CJK> */
-MAP(0x3B, 0x68, 0x5D92)  /* <CJK> */
-MAP(0x3B, 0x69, 0x5D93)  /* <CJK> */
-MAP(0x3B, 0x6A, 0x5D94)  /* <CJK> */
-MAP(0x3B, 0x6B, 0x5D95)  /* <CJK> */
-MAP(0x3B, 0x6C, 0x5D99)  /* <CJK> */
-MAP(0x3B, 0x6D, 0x5D9B)  /* <CJK> */
-MAP(0x3B, 0x6E, 0x5D9F)  /* <CJK> */
-MAP(0x3B, 0x6F, 0x5DA0)  /* <CJK> */
-MAP(0x3B, 0x70, 0x5DA7)  /* <CJK> */
-MAP(0x3B, 0x71, 0x5DAB)  /* <CJK> */
-MAP(0x3B, 0x72, 0x5DB0)  /* <CJK> */
-MAP(0x3B, 0x73, 0x5DB4)  /* <CJK> */
-MAP(0x3B, 0x74, 0x5DB8)  /* <CJK> */
-MAP(0x3B, 0x75, 0x5DB9)  /* <CJK> */
-MAP(0x3B, 0x76, 0x5DC3)  /* <CJK> */
-MAP(0x3B, 0x77, 0x5DC7)  /* <CJK> */
-MAP(0x3B, 0x78, 0x5DCB)  /* <CJK> */
-MAP(0x3B, 0x79, 0x5DD0)  /* <CJK> */
-MAP(0x3B, 0x7A, 0x5DCE)  /* <CJK> */
-MAP(0x3B, 0x7B, 0x5DD8)  /* <CJK> */
-MAP(0x3B, 0x7C, 0x5DD9)  /* <CJK> */
-MAP(0x3B, 0x7D, 0x5DE0)  /* <CJK> */
-MAP(0x3B, 0x7E, 0x5DE4)  /* <CJK> */
-MAP(0x3C, 0x21, 0x5DE9)  /* <CJK> */
-MAP(0x3C, 0x22, 0x5DF8)  /* <CJK> */
-MAP(0x3C, 0x23, 0x5DF9)  /* <CJK> */
-MAP(0x3C, 0x24, 0x5E00)  /* <CJK> */
-MAP(0x3C, 0x25, 0x5E07)  /* <CJK> */
-MAP(0x3C, 0x26, 0x5E0D)  /* <CJK> */
-MAP(0x3C, 0x27, 0x5E12)  /* <CJK> */
-MAP(0x3C, 0x28, 0x5E14)  /* <CJK> */
-MAP(0x3C, 0x29, 0x5E15)  /* <CJK> */
-MAP(0x3C, 0x2A, 0x5E18)  /* <CJK> */
-MAP(0x3C, 0x2B, 0x5E1F)  /* <CJK> */
-MAP(0x3C, 0x2C, 0x5E20)  /* <CJK> */
-MAP(0x3C, 0x2D, 0x5E2E)  /* <CJK> */
-MAP(0x3C, 0x2E, 0x5E28)  /* <CJK> */
-MAP(0x3C, 0x2F, 0x5E32)  /* <CJK> */
-MAP(0x3C, 0x30, 0x5E35)  /* <CJK> */
-MAP(0x3C, 0x31, 0x5E3E)  /* <CJK> */
-MAP(0x3C, 0x32, 0x5E4B)  /* <CJK> */
-MAP(0x3C, 0x33, 0x5E50)  /* <CJK> */
-MAP(0x3C, 0x34, 0x5E49)  /* <CJK> */
-MAP(0x3C, 0x35, 0x5E51)  /* <CJK> */
-MAP(0x3C, 0x36, 0x5E56)  /* <CJK> */
-MAP(0x3C, 0x37, 0x5E58)  /* <CJK> */
-MAP(0x3C, 0x38, 0x5E5B)  /* <CJK> */
-MAP(0x3C, 0x39, 0x5E5C)  /* <CJK> */
-MAP(0x3C, 0x3A, 0x5E5E)  /* <CJK> */
-MAP(0x3C, 0x3B, 0x5E68)  /* <CJK> */
-MAP(0x3C, 0x3C, 0x5E6A)  /* <CJK> */
-MAP(0x3C, 0x3D, 0x5E6B)  /* <CJK> */
-MAP(0x3C, 0x3E, 0x5E6C)  /* <CJK> */
-MAP(0x3C, 0x3F, 0x5E6D)  /* <CJK> */
-MAP(0x3C, 0x40, 0x5E6E)  /* <CJK> */
-MAP(0x3C, 0x41, 0x5E70)  /* <CJK> */
-MAP(0x3C, 0x42, 0x5E80)  /* <CJK> */
-MAP(0x3C, 0x43, 0x5E8B)  /* <CJK> */
-MAP(0x3C, 0x44, 0x5E8E)  /* <CJK> */
-MAP(0x3C, 0x45, 0x5EA2)  /* <CJK> */
-MAP(0x3C, 0x46, 0x5EA4)  /* <CJK> */
-MAP(0x3C, 0x47, 0x5EA5)  /* <CJK> */
-MAP(0x3C, 0x48, 0x5EA8)  /* <CJK> */
-MAP(0x3C, 0x49, 0x5EAA)  /* <CJK> */
-MAP(0x3C, 0x4A, 0x5EAC)  /* <CJK> */
-MAP(0x3C, 0x4B, 0x5EB1)  /* <CJK> */
-MAP(0x3C, 0x4C, 0x5EB3)  /* <CJK> */
-MAP(0x3C, 0x4D, 0x5EBD)  /* <CJK> */
-MAP(0x3C, 0x4E, 0x5EBE)  /* <CJK> */
-MAP(0x3C, 0x4F, 0x5EBF)  /* <CJK> */
-MAP(0x3C, 0x50, 0x5EC6)  /* <CJK> */
-MAP(0x3C, 0x51, 0x5ECC)  /* <CJK> */
-MAP(0x3C, 0x52, 0x5ECB)  /* <CJK> */
-MAP(0x3C, 0x53, 0x5ECE)  /* <CJK> */
-MAP(0x3C, 0x54, 0x5ED1)  /* <CJK> */
-MAP(0x3C, 0x55, 0x5ED2)  /* <CJK> */
-MAP(0x3C, 0x56, 0x5ED4)  /* <CJK> */
-MAP(0x3C, 0x57, 0x5ED5)  /* <CJK> */
-MAP(0x3C, 0x58, 0x5EDC)  /* <CJK> */
-MAP(0x3C, 0x59, 0x5EDE)  /* <CJK> */
-MAP(0x3C, 0x5A, 0x5EE5)  /* <CJK> */
-MAP(0x3C, 0x5B, 0x5EEB)  /* <CJK> */
-MAP(0x3C, 0x5C, 0x5F02)  /* <CJK> */
-MAP(0x3C, 0x5D, 0x5F06)  /* <CJK> */
-MAP(0x3C, 0x5E, 0x5F07)  /* <CJK> */
-MAP(0x3C, 0x5F, 0x5F08)  /* <CJK> */
-MAP(0x3C, 0x60, 0x5F0E)  /* <CJK> */
-MAP(0x3C, 0x61, 0x5F19)  /* <CJK> */
-MAP(0x3C, 0x62, 0x5F1C)  /* <CJK> */
-MAP(0x3C, 0x63, 0x5F1D)  /* <CJK> */
-MAP(0x3C, 0x64, 0x5F21)  /* <CJK> */
-MAP(0x3C, 0x65, 0x5F22)  /* <CJK> */
-MAP(0x3C, 0x66, 0x5F23)  /* <CJK> */
-MAP(0x3C, 0x67, 0x5F24)  /* <CJK> */
-MAP(0x3C, 0x68, 0x5F28)  /* <CJK> */
-MAP(0x3C, 0x69, 0x5F2B)  /* <CJK> */
-MAP(0x3C, 0x6A, 0x5F2C)  /* <CJK> */
-MAP(0x3C, 0x6B, 0x5F2E)  /* <CJK> */
-MAP(0x3C, 0x6C, 0x5F30)  /* <CJK> */
-MAP(0x3C, 0x6D, 0x5F34)  /* <CJK> */
-MAP(0x3C, 0x6E, 0x5F36)  /* <CJK> */
-MAP(0x3C, 0x6F, 0x5F3B)  /* <CJK> */
-MAP(0x3C, 0x70, 0x5F3D)  /* <CJK> */
-MAP(0x3C, 0x71, 0x5F3F)  /* <CJK> */
-MAP(0x3C, 0x72, 0x5F40)  /* <CJK> */
-MAP(0x3C, 0x73, 0x5F44)  /* <CJK> */
-MAP(0x3C, 0x74, 0x5F45)  /* <CJK> */
-MAP(0x3C, 0x75, 0x5F47)  /* <CJK> */
-MAP(0x3C, 0x76, 0x5F4D)  /* <CJK> */
-MAP(0x3C, 0x77, 0x5F50)  /* <CJK> */
-MAP(0x3C, 0x78, 0x5F54)  /* <CJK> */
-MAP(0x3C, 0x79, 0x5F58)  /* <CJK> */
-MAP(0x3C, 0x7A, 0x5F5B)  /* <CJK> */
-MAP(0x3C, 0x7B, 0x5F60)  /* <CJK> */
-MAP(0x3C, 0x7C, 0x5F63)  /* <CJK> */
-MAP(0x3C, 0x7D, 0x5F64)  /* <CJK> */
-MAP(0x3C, 0x7E, 0x5F67)  /* <CJK> */
-MAP(0x3D, 0x21, 0x5F6F)  /* <CJK> */
-MAP(0x3D, 0x22, 0x5F72)  /* <CJK> */
-MAP(0x3D, 0x23, 0x5F74)  /* <CJK> */
-MAP(0x3D, 0x24, 0x5F75)  /* <CJK> */
-MAP(0x3D, 0x25, 0x5F78)  /* <CJK> */
-MAP(0x3D, 0x26, 0x5F7A)  /* <CJK> */
-MAP(0x3D, 0x27, 0x5F7D)  /* <CJK> */
-MAP(0x3D, 0x28, 0x5F7E)  /* <CJK> */
-MAP(0x3D, 0x29, 0x5F89)  /* <CJK> */
-MAP(0x3D, 0x2A, 0x5F8D)  /* <CJK> */
-MAP(0x3D, 0x2B, 0x5F8F)  /* <CJK> */
-MAP(0x3D, 0x2C, 0x5F96)  /* <CJK> */
-MAP(0x3D, 0x2D, 0x5F9C)  /* <CJK> */
-MAP(0x3D, 0x2E, 0x5F9D)  /* <CJK> */
-MAP(0x3D, 0x2F, 0x5FA2)  /* <CJK> */
-MAP(0x3D, 0x30, 0x5FA7)  /* <CJK> */
-MAP(0x3D, 0x31, 0x5FAB)  /* <CJK> */
-MAP(0x3D, 0x32, 0x5FA4)  /* <CJK> */
-MAP(0x3D, 0x33, 0x5FAC)  /* <CJK> */
-MAP(0x3D, 0x34, 0x5FAF)  /* <CJK> */
-MAP(0x3D, 0x35, 0x5FB0)  /* <CJK> */
-MAP(0x3D, 0x36, 0x5FB1)  /* <CJK> */
-MAP(0x3D, 0x37, 0x5FB8)  /* <CJK> */
-MAP(0x3D, 0x38, 0x5FC4)  /* <CJK> */
-MAP(0x3D, 0x39, 0x5FC7)  /* <CJK> */
-MAP(0x3D, 0x3A, 0x5FC8)  /* <CJK> */
-MAP(0x3D, 0x3B, 0x5FC9)  /* <CJK> */
-MAP(0x3D, 0x3C, 0x5FCB)  /* <CJK> */
-MAP(0x3D, 0x3D, 0x5FD0)  /* <CJK> */
-MAP(0x3D, 0x3E, 0x5FD1)  /* <CJK> */
-MAP(0x3D, 0x3F, 0x5FD2)  /* <CJK> */
-MAP(0x3D, 0x40, 0x5FD3)  /* <CJK> */
-MAP(0x3D, 0x41, 0x5FD4)  /* <CJK> */
-MAP(0x3D, 0x42, 0x5FDE)  /* <CJK> */
-MAP(0x3D, 0x43, 0x5FE1)  /* <CJK> */
-MAP(0x3D, 0x44, 0x5FE2)  /* <CJK> */
-MAP(0x3D, 0x45, 0x5FE8)  /* <CJK> */
-MAP(0x3D, 0x46, 0x5FE9)  /* <CJK> */
-MAP(0x3D, 0x47, 0x5FEA)  /* <CJK> */
-MAP(0x3D, 0x48, 0x5FEC)  /* <CJK> */
-MAP(0x3D, 0x49, 0x5FED)  /* <CJK> */
-MAP(0x3D, 0x4A, 0x5FEE)  /* <CJK> */
-MAP(0x3D, 0x4B, 0x5FEF)  /* <CJK> */
-MAP(0x3D, 0x4C, 0x5FF2)  /* <CJK> */
-MAP(0x3D, 0x4D, 0x5FF3)  /* <CJK> */
-MAP(0x3D, 0x4E, 0x5FF6)  /* <CJK> */
-MAP(0x3D, 0x4F, 0x5FFA)  /* <CJK> */
-MAP(0x3D, 0x50, 0x5FFC)  /* <CJK> */
-MAP(0x3D, 0x51, 0x6007)  /* <CJK> */
-MAP(0x3D, 0x52, 0x600A)  /* <CJK> */
-MAP(0x3D, 0x53, 0x600D)  /* <CJK> */
-MAP(0x3D, 0x54, 0x6013)  /* <CJK> */
-MAP(0x3D, 0x55, 0x6014)  /* <CJK> */
-MAP(0x3D, 0x56, 0x6017)  /* <CJK> */
-MAP(0x3D, 0x57, 0x6018)  /* <CJK> */
-MAP(0x3D, 0x58, 0x601A)  /* <CJK> */
-MAP(0x3D, 0x59, 0x601F)  /* <CJK> */
-MAP(0x3D, 0x5A, 0x6024)  /* <CJK> */
-MAP(0x3D, 0x5B, 0x602D)  /* <CJK> */
-MAP(0x3D, 0x5C, 0x6033)  /* <CJK> */
-MAP(0x3D, 0x5D, 0x6035)  /* <CJK> */
-MAP(0x3D, 0x5E, 0x6040)  /* <CJK> */
-MAP(0x3D, 0x5F, 0x6047)  /* <CJK> */
-MAP(0x3D, 0x60, 0x6048)  /* <CJK> */
-MAP(0x3D, 0x61, 0x6049)  /* <CJK> */
-MAP(0x3D, 0x62, 0x604C)  /* <CJK> */
-MAP(0x3D, 0x63, 0x6051)  /* <CJK> */
-MAP(0x3D, 0x64, 0x6054)  /* <CJK> */
-MAP(0x3D, 0x65, 0x6056)  /* <CJK> */
-MAP(0x3D, 0x66, 0x6057)  /* <CJK> */
-MAP(0x3D, 0x67, 0x605D)  /* <CJK> */
-MAP(0x3D, 0x68, 0x6061)  /* <CJK> */
-MAP(0x3D, 0x69, 0x6067)  /* <CJK> */
-MAP(0x3D, 0x6A, 0x6071)  /* <CJK> */
-MAP(0x3D, 0x6B, 0x607E)  /* <CJK> */
-MAP(0x3D, 0x6C, 0x607F)  /* <CJK> */
-MAP(0x3D, 0x6D, 0x6082)  /* <CJK> */
-MAP(0x3D, 0x6E, 0x6086)  /* <CJK> */
-MAP(0x3D, 0x6F, 0x6088)  /* <CJK> */
-MAP(0x3D, 0x70, 0x608A)  /* <CJK> */
-MAP(0x3D, 0x71, 0x608E)  /* <CJK> */
-MAP(0x3D, 0x72, 0x6091)  /* <CJK> */
-MAP(0x3D, 0x73, 0x6093)  /* <CJK> */
-MAP(0x3D, 0x74, 0x6095)  /* <CJK> */
-MAP(0x3D, 0x75, 0x6098)  /* <CJK> */
-MAP(0x3D, 0x76, 0x609D)  /* <CJK> */
-MAP(0x3D, 0x77, 0x609E)  /* <CJK> */
-MAP(0x3D, 0x78, 0x60A2)  /* <CJK> */
-MAP(0x3D, 0x79, 0x60A4)  /* <CJK> */
-MAP(0x3D, 0x7A, 0x60A5)  /* <CJK> */
-MAP(0x3D, 0x7B, 0x60A8)  /* <CJK> */
-MAP(0x3D, 0x7C, 0x60B0)  /* <CJK> */
-MAP(0x3D, 0x7D, 0x60B1)  /* <CJK> */
-MAP(0x3D, 0x7E, 0x60B7)  /* <CJK> */
-MAP(0x3E, 0x21, 0x60BB)  /* <CJK> */
-MAP(0x3E, 0x22, 0x60BE)  /* <CJK> */
-MAP(0x3E, 0x23, 0x60C2)  /* <CJK> */
-MAP(0x3E, 0x24, 0x60C4)  /* <CJK> */
-MAP(0x3E, 0x25, 0x60C8)  /* <CJK> */
-MAP(0x3E, 0x26, 0x60C9)  /* <CJK> */
-MAP(0x3E, 0x27, 0x60CA)  /* <CJK> */
-MAP(0x3E, 0x28, 0x60CB)  /* <CJK> */
-MAP(0x3E, 0x29, 0x60CE)  /* <CJK> */
-MAP(0x3E, 0x2A, 0x60CF)  /* <CJK> */
-MAP(0x3E, 0x2B, 0x60D4)  /* <CJK> */
-MAP(0x3E, 0x2C, 0x60D5)  /* <CJK> */
-MAP(0x3E, 0x2D, 0x60D9)  /* <CJK> */
-MAP(0x3E, 0x2E, 0x60DB)  /* <CJK> */
-MAP(0x3E, 0x2F, 0x60DD)  /* <CJK> */
-MAP(0x3E, 0x30, 0x60DE)  /* <CJK> */
-MAP(0x3E, 0x31, 0x60E2)  /* <CJK> */
-MAP(0x3E, 0x32, 0x60E5)  /* <CJK> */
-MAP(0x3E, 0x33, 0x60F2)  /* <CJK> */
-MAP(0x3E, 0x34, 0x60F5)  /* <CJK> */
-MAP(0x3E, 0x35, 0x60F8)  /* <CJK> */
-MAP(0x3E, 0x36, 0x60FC)  /* <CJK> */
-MAP(0x3E, 0x37, 0x60FD)  /* <CJK> */
-MAP(0x3E, 0x38, 0x6102)  /* <CJK> */
-MAP(0x3E, 0x39, 0x6107)  /* <CJK> */
-MAP(0x3E, 0x3A, 0x610A)  /* <CJK> */
-MAP(0x3E, 0x3B, 0x610C)  /* <CJK> */
-MAP(0x3E, 0x3C, 0x6110)  /* <CJK> */
-MAP(0x3E, 0x3D, 0x6111)  /* <CJK> */
-MAP(0x3E, 0x3E, 0x6112)  /* <CJK> */
-MAP(0x3E, 0x3F, 0x6113)  /* <CJK> */
-MAP(0x3E, 0x40, 0x6114)  /* <CJK> */
-MAP(0x3E, 0x41, 0x6116)  /* <CJK> */
-MAP(0x3E, 0x42, 0x6117)  /* <CJK> */
-MAP(0x3E, 0x43, 0x6119)  /* <CJK> */
-MAP(0x3E, 0x44, 0x611C)  /* <CJK> */
-MAP(0x3E, 0x45, 0x611E)  /* <CJK> */
-MAP(0x3E, 0x46, 0x6122)  /* <CJK> */
-MAP(0x3E, 0x47, 0x612A)  /* <CJK> */
-MAP(0x3E, 0x48, 0x612B)  /* <CJK> */
-MAP(0x3E, 0x49, 0x6130)  /* <CJK> */
-MAP(0x3E, 0x4A, 0x6131)  /* <CJK> */
-MAP(0x3E, 0x4B, 0x6135)  /* <CJK> */
-MAP(0x3E, 0x4C, 0x6136)  /* <CJK> */
-MAP(0x3E, 0x4D, 0x6137)  /* <CJK> */
-MAP(0x3E, 0x4E, 0x6139)  /* <CJK> */
-MAP(0x3E, 0x4F, 0x6141)  /* <CJK> */
-MAP(0x3E, 0x50, 0x6145)  /* <CJK> */
-MAP(0x3E, 0x51, 0x6146)  /* <CJK> */
-MAP(0x3E, 0x52, 0x6149)  /* <CJK> */
-MAP(0x3E, 0x53, 0x615E)  /* <CJK> */
-MAP(0x3E, 0x54, 0x6160)  /* <CJK> */
-MAP(0x3E, 0x55, 0x616C)  /* <CJK> */
-MAP(0x3E, 0x56, 0x6172)  /* <CJK> */
-MAP(0x3E, 0x57, 0x6178)  /* <CJK> */
-MAP(0x3E, 0x58, 0x617B)  /* <CJK> */
-MAP(0x3E, 0x59, 0x617C)  /* <CJK> */
-MAP(0x3E, 0x5A, 0x617F)  /* <CJK> */
-MAP(0x3E, 0x5B, 0x6180)  /* <CJK> */
-MAP(0x3E, 0x5C, 0x6181)  /* <CJK> */
-MAP(0x3E, 0x5D, 0x6183)  /* <CJK> */
-MAP(0x3E, 0x5E, 0x6184)  /* <CJK> */
-MAP(0x3E, 0x5F, 0x618B)  /* <CJK> */
-MAP(0x3E, 0x60, 0x618D)  /* <CJK> */
-MAP(0x3E, 0x61, 0x6192)  /* <CJK> */
-MAP(0x3E, 0x62, 0x6193)  /* <CJK> */
-MAP(0x3E, 0x63, 0x6197)  /* <CJK> */
-MAP(0x3E, 0x64, 0x6198)  /* <CJK> */
-MAP(0x3E, 0x65, 0x619C)  /* <CJK> */
-MAP(0x3E, 0x66, 0x619D)  /* <CJK> */
-MAP(0x3E, 0x67, 0x619F)  /* <CJK> */
-MAP(0x3E, 0x68, 0x61A0)  /* <CJK> */
-MAP(0x3E, 0x69, 0x61A5)  /* <CJK> */
-MAP(0x3E, 0x6A, 0x61A8)  /* <CJK> */
-MAP(0x3E, 0x6B, 0x61AA)  /* <CJK> */
-MAP(0x3E, 0x6C, 0x61AD)  /* <CJK> */
-MAP(0x3E, 0x6D, 0x61B8)  /* <CJK> */
-MAP(0x3E, 0x6E, 0x61B9)  /* <CJK> */
-MAP(0x3E, 0x6F, 0x61BC)  /* <CJK> */
-MAP(0x3E, 0x70, 0x61C0)  /* <CJK> */
-MAP(0x3E, 0x71, 0x61C1)  /* <CJK> */
-MAP(0x3E, 0x72, 0x61C2)  /* <CJK> */
-MAP(0x3E, 0x73, 0x61CE)  /* <CJK> */
-MAP(0x3E, 0x74, 0x61CF)  /* <CJK> */
-MAP(0x3E, 0x75, 0x61D5)  /* <CJK> */
-MAP(0x3E, 0x76, 0x61DC)  /* <CJK> */
-MAP(0x3E, 0x77, 0x61DD)  /* <CJK> */
-MAP(0x3E, 0x78, 0x61DE)  /* <CJK> */
-MAP(0x3E, 0x79, 0x61DF)  /* <CJK> */
-MAP(0x3E, 0x7A, 0x61E1)  /* <CJK> */
-MAP(0x3E, 0x7B, 0x61E2)  /* <CJK> */
-MAP(0x3E, 0x7C, 0x61E7)  /* <CJK> */
-MAP(0x3E, 0x7D, 0x61E9)  /* <CJK> */
-MAP(0x3E, 0x7E, 0x61E5)  /* <CJK> */
-MAP(0x3F, 0x21, 0x61EC)  /* <CJK> */
-MAP(0x3F, 0x22, 0x61ED)  /* <CJK> */
-MAP(0x3F, 0x23, 0x61EF)  /* <CJK> */
-MAP(0x3F, 0x24, 0x6201)  /* <CJK> */
-MAP(0x3F, 0x25, 0x6203)  /* <CJK> */
-MAP(0x3F, 0x26, 0x6204)  /* <CJK> */
-MAP(0x3F, 0x27, 0x6207)  /* <CJK> */
-MAP(0x3F, 0x28, 0x6213)  /* <CJK> */
-MAP(0x3F, 0x29, 0x6215)  /* <CJK> */
-MAP(0x3F, 0x2A, 0x621C)  /* <CJK> */
-MAP(0x3F, 0x2B, 0x6220)  /* <CJK> */
-MAP(0x3F, 0x2C, 0x6222)  /* <CJK> */
-MAP(0x3F, 0x2D, 0x6223)  /* <CJK> */
-MAP(0x3F, 0x2E, 0x6227)  /* <CJK> */
-MAP(0x3F, 0x2F, 0x6229)  /* <CJK> */
-MAP(0x3F, 0x30, 0x622B)  /* <CJK> */
-MAP(0x3F, 0x31, 0x6239)  /* <CJK> */
-MAP(0x3F, 0x32, 0x623D)  /* <CJK> */
-MAP(0x3F, 0x33, 0x6242)  /* <CJK> */
-MAP(0x3F, 0x34, 0x6243)  /* <CJK> */
-MAP(0x3F, 0x35, 0x6244)  /* <CJK> */
-MAP(0x3F, 0x36, 0x6246)  /* <CJK> */
-MAP(0x3F, 0x37, 0x624C)  /* <CJK> */
-MAP(0x3F, 0x38, 0x6250)  /* <CJK> */
-MAP(0x3F, 0x39, 0x6251)  /* <CJK> */
-MAP(0x3F, 0x3A, 0x6252)  /* <CJK> */
-MAP(0x3F, 0x3B, 0x6254)  /* <CJK> */
-MAP(0x3F, 0x3C, 0x6256)  /* <CJK> */
-MAP(0x3F, 0x3D, 0x625A)  /* <CJK> */
-MAP(0x3F, 0x3E, 0x625C)  /* <CJK> */
-MAP(0x3F, 0x3F, 0x6264)  /* <CJK> */
-MAP(0x3F, 0x40, 0x626D)  /* <CJK> */
-MAP(0x3F, 0x41, 0x626F)  /* <CJK> */
-MAP(0x3F, 0x42, 0x6273)  /* <CJK> */
-MAP(0x3F, 0x43, 0x627A)  /* <CJK> */
-MAP(0x3F, 0x44, 0x627D)  /* <CJK> */
-MAP(0x3F, 0x45, 0x628D)  /* <CJK> */
-MAP(0x3F, 0x46, 0x628E)  /* <CJK> */
-MAP(0x3F, 0x47, 0x628F)  /* <CJK> */
-MAP(0x3F, 0x48, 0x6290)  /* <CJK> */
-MAP(0x3F, 0x49, 0x62A6)  /* <CJK> */
-MAP(0x3F, 0x4A, 0x62A8)  /* <CJK> */
-MAP(0x3F, 0x4B, 0x62B3)  /* <CJK> */
-MAP(0x3F, 0x4C, 0x62B6)  /* <CJK> */
-MAP(0x3F, 0x4D, 0x62B7)  /* <CJK> */
-MAP(0x3F, 0x4E, 0x62BA)  /* <CJK> */
-MAP(0x3F, 0x4F, 0x62BE)  /* <CJK> */
-MAP(0x3F, 0x50, 0x62BF)  /* <CJK> */
-MAP(0x3F, 0x51, 0x62C4)  /* <CJK> */
-MAP(0x3F, 0x52, 0x62CE)  /* <CJK> */
-MAP(0x3F, 0x53, 0x62D5)  /* <CJK> */
-MAP(0x3F, 0x54, 0x62D6)  /* <CJK> */
-MAP(0x3F, 0x55, 0x62DA)  /* <CJK> */
-MAP(0x3F, 0x56, 0x62EA)  /* <CJK> */
-MAP(0x3F, 0x57, 0x62F2)  /* <CJK> */
-MAP(0x3F, 0x58, 0x62F4)  /* <CJK> */
-MAP(0x3F, 0x59, 0x62FC)  /* <CJK> */
-MAP(0x3F, 0x5A, 0x62FD)  /* <CJK> */
-MAP(0x3F, 0x5B, 0x6303)  /* <CJK> */
-MAP(0x3F, 0x5C, 0x6304)  /* <CJK> */
-MAP(0x3F, 0x5D, 0x630A)  /* <CJK> */
-MAP(0x3F, 0x5E, 0x630B)  /* <CJK> */
-MAP(0x3F, 0x5F, 0x630D)  /* <CJK> */
-MAP(0x3F, 0x60, 0x6310)  /* <CJK> */
-MAP(0x3F, 0x61, 0x6313)  /* <CJK> */
-MAP(0x3F, 0x62, 0x6316)  /* <CJK> */
-MAP(0x3F, 0x63, 0x6318)  /* <CJK> */
-MAP(0x3F, 0x64, 0x6329)  /* <CJK> */
-MAP(0x3F, 0x65, 0x632A)  /* <CJK> */
-MAP(0x3F, 0x66, 0x632D)  /* <CJK> */
-MAP(0x3F, 0x67, 0x6335)  /* <CJK> */
-MAP(0x3F, 0x68, 0x6336)  /* <CJK> */
-MAP(0x3F, 0x69, 0x6339)  /* <CJK> */
-MAP(0x3F, 0x6A, 0x633C)  /* <CJK> */
-MAP(0x3F, 0x6B, 0x6341)  /* <CJK> */
-MAP(0x3F, 0x6C, 0x6342)  /* <CJK> */
-MAP(0x3F, 0x6D, 0x6343)  /* <CJK> */
-MAP(0x3F, 0x6E, 0x6344)  /* <CJK> */
-MAP(0x3F, 0x6F, 0x6346)  /* <CJK> */
-MAP(0x3F, 0x70, 0x634A)  /* <CJK> */
-MAP(0x3F, 0x71, 0x634B)  /* <CJK> */
-MAP(0x3F, 0x72, 0x634E)  /* <CJK> */
-MAP(0x3F, 0x73, 0x6352)  /* <CJK> */
-MAP(0x3F, 0x74, 0x6353)  /* <CJK> */
-MAP(0x3F, 0x75, 0x6354)  /* <CJK> */
-MAP(0x3F, 0x76, 0x6358)  /* <CJK> */
-MAP(0x3F, 0x77, 0x635B)  /* <CJK> */
-MAP(0x3F, 0x78, 0x6365)  /* <CJK> */
-MAP(0x3F, 0x79, 0x6366)  /* <CJK> */
-MAP(0x3F, 0x7A, 0x636C)  /* <CJK> */
-MAP(0x3F, 0x7B, 0x636D)  /* <CJK> */
-MAP(0x3F, 0x7C, 0x6371)  /* <CJK> */
-MAP(0x3F, 0x7D, 0x6374)  /* <CJK> */
-MAP(0x3F, 0x7E, 0x6375)  /* <CJK> */
-MAP(0x40, 0x21, 0x6378)  /* <CJK> */
-MAP(0x40, 0x22, 0x637C)  /* <CJK> */
-MAP(0x40, 0x23, 0x637D)  /* <CJK> */
-MAP(0x40, 0x24, 0x637F)  /* <CJK> */
-MAP(0x40, 0x25, 0x6382)  /* <CJK> */
-MAP(0x40, 0x26, 0x6384)  /* <CJK> */
-MAP(0x40, 0x27, 0x6387)  /* <CJK> */
-MAP(0x40, 0x28, 0x638A)  /* <CJK> */
-MAP(0x40, 0x29, 0x6390)  /* <CJK> */
-MAP(0x40, 0x2A, 0x6394)  /* <CJK> */
-MAP(0x40, 0x2B, 0x6395)  /* <CJK> */
-MAP(0x40, 0x2C, 0x6399)  /* <CJK> */
-MAP(0x40, 0x2D, 0x639A)  /* <CJK> */
-MAP(0x40, 0x2E, 0x639E)  /* <CJK> */
-MAP(0x40, 0x2F, 0x63A4)  /* <CJK> */
-MAP(0x40, 0x30, 0x63A6)  /* <CJK> */
-MAP(0x40, 0x31, 0x63AD)  /* <CJK> */
-MAP(0x40, 0x32, 0x63AE)  /* <CJK> */
-MAP(0x40, 0x33, 0x63AF)  /* <CJK> */
-MAP(0x40, 0x34, 0x63BD)  /* <CJK> */
-MAP(0x40, 0x35, 0x63C1)  /* <CJK> */
-MAP(0x40, 0x36, 0x63C5)  /* <CJK> */
-MAP(0x40, 0x37, 0x63C8)  /* <CJK> */
-MAP(0x40, 0x38, 0x63CE)  /* <CJK> */
-MAP(0x40, 0x39, 0x63D1)  /* <CJK> */
-MAP(0x40, 0x3A, 0x63D3)  /* <CJK> */
-MAP(0x40, 0x3B, 0x63D4)  /* <CJK> */
-MAP(0x40, 0x3C, 0x63D5)  /* <CJK> */
-MAP(0x40, 0x3D, 0x63DC)  /* <CJK> */
-MAP(0x40, 0x3E, 0x63E0)  /* <CJK> */
-MAP(0x40, 0x3F, 0x63E5)  /* <CJK> */
-MAP(0x40, 0x40, 0x63EA)  /* <CJK> */
-MAP(0x40, 0x41, 0x63EC)  /* <CJK> */
-MAP(0x40, 0x42, 0x63F2)  /* <CJK> */
-MAP(0x40, 0x43, 0x63F3)  /* <CJK> */
-MAP(0x40, 0x44, 0x63F5)  /* <CJK> */
-MAP(0x40, 0x45, 0x63F8)  /* <CJK> */
-MAP(0x40, 0x46, 0x63F9)  /* <CJK> */
-MAP(0x40, 0x47, 0x6409)  /* <CJK> */
-MAP(0x40, 0x48, 0x640A)  /* <CJK> */
-MAP(0x40, 0x49, 0x6410)  /* <CJK> */
-MAP(0x40, 0x4A, 0x6412)  /* <CJK> */
-MAP(0x40, 0x4B, 0x6414)  /* <CJK> */
-MAP(0x40, 0x4C, 0x6418)  /* <CJK> */
-MAP(0x40, 0x4D, 0x641E)  /* <CJK> */
-MAP(0x40, 0x4E, 0x6420)  /* <CJK> */
-MAP(0x40, 0x4F, 0x6422)  /* <CJK> */
-MAP(0x40, 0x50, 0x6424)  /* <CJK> */
-MAP(0x40, 0x51, 0x6425)  /* <CJK> */
-MAP(0x40, 0x52, 0x6429)  /* <CJK> */
-MAP(0x40, 0x53, 0x642A)  /* <CJK> */
-MAP(0x40, 0x54, 0x642F)  /* <CJK> */
-MAP(0x40, 0x55, 0x6430)  /* <CJK> */
-MAP(0x40, 0x56, 0x6435)  /* <CJK> */
-MAP(0x40, 0x57, 0x643D)  /* <CJK> */
-MAP(0x40, 0x58, 0x643F)  /* <CJK> */
-MAP(0x40, 0x59, 0x644B)  /* <CJK> */
-MAP(0x40, 0x5A, 0x644F)  /* <CJK> */
-MAP(0x40, 0x5B, 0x6451)  /* <CJK> */
-MAP(0x40, 0x5C, 0x6452)  /* <CJK> */
-MAP(0x40, 0x5D, 0x6453)  /* <CJK> */
-MAP(0x40, 0x5E, 0x6454)  /* <CJK> */
-MAP(0x40, 0x5F, 0x645A)  /* <CJK> */
-MAP(0x40, 0x60, 0x645B)  /* <CJK> */
-MAP(0x40, 0x61, 0x645C)  /* <CJK> */
-MAP(0x40, 0x62, 0x645D)  /* <CJK> */
-MAP(0x40, 0x63, 0x645F)  /* <CJK> */
-MAP(0x40, 0x64, 0x6460)  /* <CJK> */
-MAP(0x40, 0x65, 0x6461)  /* <CJK> */
-MAP(0x40, 0x66, 0x6463)  /* <CJK> */
-MAP(0x40, 0x67, 0x646D)  /* <CJK> */
-MAP(0x40, 0x68, 0x6473)  /* <CJK> */
-MAP(0x40, 0x69, 0x6474)  /* <CJK> */
-MAP(0x40, 0x6A, 0x647B)  /* <CJK> */
-MAP(0x40, 0x6B, 0x647D)  /* <CJK> */
-MAP(0x40, 0x6C, 0x6485)  /* <CJK> */
-MAP(0x40, 0x6D, 0x6487)  /* <CJK> */
-MAP(0x40, 0x6E, 0x648F)  /* <CJK> */
-MAP(0x40, 0x6F, 0x6490)  /* <CJK> */
-MAP(0x40, 0x70, 0x6491)  /* <CJK> */
-MAP(0x40, 0x71, 0x6498)  /* <CJK> */
-MAP(0x40, 0x72, 0x6499)  /* <CJK> */
-MAP(0x40, 0x73, 0x649B)  /* <CJK> */
-MAP(0x40, 0x74, 0x649D)  /* <CJK> */
-MAP(0x40, 0x75, 0x649F)  /* <CJK> */
-MAP(0x40, 0x76, 0x64A1)  /* <CJK> */
-MAP(0x40, 0x77, 0x64A3)  /* <CJK> */
-MAP(0x40, 0x78, 0x64A6)  /* <CJK> */
-MAP(0x40, 0x79, 0x64A8)  /* <CJK> */
-MAP(0x40, 0x7A, 0x64AC)  /* <CJK> */
-MAP(0x40, 0x7B, 0x64B3)  /* <CJK> */
-MAP(0x40, 0x7C, 0x64BD)  /* <CJK> */
-MAP(0x40, 0x7D, 0x64BE)  /* <CJK> */
-MAP(0x40, 0x7E, 0x64BF)  /* <CJK> */
-MAP(0x41, 0x21, 0x64C4)  /* <CJK> */
-MAP(0x41, 0x22, 0x64C9)  /* <CJK> */
-MAP(0x41, 0x23, 0x64CA)  /* <CJK> */
-MAP(0x41, 0x24, 0x64CB)  /* <CJK> */
-MAP(0x41, 0x25, 0x64CC)  /* <CJK> */
-MAP(0x41, 0x26, 0x64CE)  /* <CJK> */
-MAP(0x41, 0x27, 0x64D0)  /* <CJK> */
-MAP(0x41, 0x28, 0x64D1)  /* <CJK> */
-MAP(0x41, 0x29, 0x64D5)  /* <CJK> */
-MAP(0x41, 0x2A, 0x64D7)  /* <CJK> */
-MAP(0x41, 0x2B, 0x64E4)  /* <CJK> */
-MAP(0x41, 0x2C, 0x64E5)  /* <CJK> */
-MAP(0x41, 0x2D, 0x64E9)  /* <CJK> */
-MAP(0x41, 0x2E, 0x64EA)  /* <CJK> */
-MAP(0x41, 0x2F, 0x64ED)  /* <CJK> */
-MAP(0x41, 0x30, 0x64F0)  /* <CJK> */
-MAP(0x41, 0x31, 0x64F5)  /* <CJK> */
-MAP(0x41, 0x32, 0x64F7)  /* <CJK> */
-MAP(0x41, 0x33, 0x64FB)  /* <CJK> */
-MAP(0x41, 0x34, 0x64FF)  /* <CJK> */
-MAP(0x41, 0x35, 0x6501)  /* <CJK> */
-MAP(0x41, 0x36, 0x6504)  /* <CJK> */
-MAP(0x41, 0x37, 0x6508)  /* <CJK> */
-MAP(0x41, 0x38, 0x6509)  /* <CJK> */
-MAP(0x41, 0x39, 0x650A)  /* <CJK> */
-MAP(0x41, 0x3A, 0x650F)  /* <CJK> */
-MAP(0x41, 0x3B, 0x6513)  /* <CJK> */
-MAP(0x41, 0x3C, 0x6514)  /* <CJK> */
-MAP(0x41, 0x3D, 0x6516)  /* <CJK> */
-MAP(0x41, 0x3E, 0x6519)  /* <CJK> */
-MAP(0x41, 0x3F, 0x651B)  /* <CJK> */
-MAP(0x41, 0x40, 0x651E)  /* <CJK> */
-MAP(0x41, 0x41, 0x651F)  /* <CJK> */
-MAP(0x41, 0x42, 0x6522)  /* <CJK> */
-MAP(0x41, 0x43, 0x6526)  /* <CJK> */
-MAP(0x41, 0x44, 0x6529)  /* <CJK> */
-MAP(0x41, 0x45, 0x652E)  /* <CJK> */
-MAP(0x41, 0x46, 0x6531)  /* <CJK> */
-MAP(0x41, 0x47, 0x653A)  /* <CJK> */
-MAP(0x41, 0x48, 0x653C)  /* <CJK> */
-MAP(0x41, 0x49, 0x653D)  /* <CJK> */
-MAP(0x41, 0x4A, 0x6543)  /* <CJK> */
-MAP(0x41, 0x4B, 0x6547)  /* <CJK> */
-MAP(0x41, 0x4C, 0x6549)  /* <CJK> */
-MAP(0x41, 0x4D, 0x6550)  /* <CJK> */
-MAP(0x41, 0x4E, 0x6552)  /* <CJK> */
-MAP(0x41, 0x4F, 0x6554)  /* <CJK> */
-MAP(0x41, 0x50, 0x655F)  /* <CJK> */
-MAP(0x41, 0x51, 0x6560)  /* <CJK> */
-MAP(0x41, 0x52, 0x6567)  /* <CJK> */
-MAP(0x41, 0x53, 0x656B)  /* <CJK> */
-MAP(0x41, 0x54, 0x657A)  /* <CJK> */
-MAP(0x41, 0x55, 0x657D)  /* <CJK> */
-MAP(0x41, 0x56, 0x6581)  /* <CJK> */
-MAP(0x41, 0x57, 0x6585)  /* <CJK> */
-MAP(0x41, 0x58, 0x658A)  /* <CJK> */
-MAP(0x41, 0x59, 0x6592)  /* <CJK> */
-MAP(0x41, 0x5A, 0x6595)  /* <CJK> */
-MAP(0x41, 0x5B, 0x6598)  /* <CJK> */
-MAP(0x41, 0x5C, 0x659D)  /* <CJK> */
-MAP(0x41, 0x5D, 0x65A0)  /* <CJK> */
-MAP(0x41, 0x5E, 0x65A3)  /* <CJK> */
-MAP(0x41, 0x5F, 0x65A6)  /* <CJK> */
-MAP(0x41, 0x60, 0x65AE)  /* <CJK> */
-MAP(0x41, 0x61, 0x65B2)  /* <CJK> */
-MAP(0x41, 0x62, 0x65B3)  /* <CJK> */
-MAP(0x41, 0x63, 0x65B4)  /* <CJK> */
-MAP(0x41, 0x64, 0x65BF)  /* <CJK> */
-MAP(0x41, 0x65, 0x65C2)  /* <CJK> */
-MAP(0x41, 0x66, 0x65C8)  /* <CJK> */
-MAP(0x41, 0x67, 0x65C9)  /* <CJK> */
-MAP(0x41, 0x68, 0x65CE)  /* <CJK> */
-MAP(0x41, 0x69, 0x65D0)  /* <CJK> */
-MAP(0x41, 0x6A, 0x65D4)  /* <CJK> */
-MAP(0x41, 0x6B, 0x65D6)  /* <CJK> */
-MAP(0x41, 0x6C, 0x65D8)  /* <CJK> */
-MAP(0x41, 0x6D, 0x65DF)  /* <CJK> */
-MAP(0x41, 0x6E, 0x65F0)  /* <CJK> */
-MAP(0x41, 0x6F, 0x65F2)  /* <CJK> */
-MAP(0x41, 0x70, 0x65F4)  /* <CJK> */
-MAP(0x41, 0x71, 0x65F5)  /* <CJK> */
-MAP(0x41, 0x72, 0x65F9)  /* <CJK> */
-MAP(0x41, 0x73, 0x65FE)  /* <CJK> */
-MAP(0x41, 0x74, 0x65FF)  /* <CJK> */
-MAP(0x41, 0x75, 0x6600)  /* <CJK> */
-MAP(0x41, 0x76, 0x6604)  /* <CJK> */
-MAP(0x41, 0x77, 0x6608)  /* <CJK> */
-MAP(0x41, 0x78, 0x6609)  /* <CJK> */
-MAP(0x41, 0x79, 0x660D)  /* <CJK> */
-MAP(0x41, 0x7A, 0x6611)  /* <CJK> */
-MAP(0x41, 0x7B, 0x6612)  /* <CJK> */
-MAP(0x41, 0x7C, 0x6615)  /* <CJK> */
-MAP(0x41, 0x7D, 0x6616)  /* <CJK> */
-MAP(0x41, 0x7E, 0x661D)  /* <CJK> */
-MAP(0x42, 0x21, 0x661E)  /* <CJK> */
-MAP(0x42, 0x22, 0x6621)  /* <CJK> */
-MAP(0x42, 0x23, 0x6622)  /* <CJK> */
-MAP(0x42, 0x24, 0x6623)  /* <CJK> */
-MAP(0x42, 0x25, 0x6624)  /* <CJK> */
-MAP(0x42, 0x26, 0x6626)  /* <CJK> */
-MAP(0x42, 0x27, 0x6629)  /* <CJK> */
-MAP(0x42, 0x28, 0x662A)  /* <CJK> */
-MAP(0x42, 0x29, 0x662B)  /* <CJK> */
-MAP(0x42, 0x2A, 0x662C)  /* <CJK> */
-MAP(0x42, 0x2B, 0x662E)  /* <CJK> */
-MAP(0x42, 0x2C, 0x6630)  /* <CJK> */
-MAP(0x42, 0x2D, 0x6631)  /* <CJK> */
-MAP(0x42, 0x2E, 0x6633)  /* <CJK> */
-MAP(0x42, 0x2F, 0x6639)  /* <CJK> */
-MAP(0x42, 0x30, 0x6637)  /* <CJK> */
-MAP(0x42, 0x31, 0x6640)  /* <CJK> */
-MAP(0x42, 0x32, 0x6645)  /* <CJK> */
-MAP(0x42, 0x33, 0x6646)  /* <CJK> */
-MAP(0x42, 0x34, 0x664A)  /* <CJK> */
-MAP(0x42, 0x35, 0x664C)  /* <CJK> */
-MAP(0x42, 0x36, 0x6651)  /* <CJK> */
-MAP(0x42, 0x37, 0x664E)  /* <CJK> */
-MAP(0x42, 0x38, 0x6657)  /* <CJK> */
-MAP(0x42, 0x39, 0x6658)  /* <CJK> */
-MAP(0x42, 0x3A, 0x6659)  /* <CJK> */
-MAP(0x42, 0x3B, 0x665B)  /* <CJK> */
-MAP(0x42, 0x3C, 0x665C)  /* <CJK> */
-MAP(0x42, 0x3D, 0x6660)  /* <CJK> */
-MAP(0x42, 0x3E, 0x6661)  /* <CJK> */
-MAP(0x42, 0x3F, 0x66FB)  /* <CJK> */
-MAP(0x42, 0x40, 0x666A)  /* <CJK> */
-MAP(0x42, 0x41, 0x666B)  /* <CJK> */
-MAP(0x42, 0x42, 0x666C)  /* <CJK> */
-MAP(0x42, 0x43, 0x667E)  /* <CJK> */
-MAP(0x42, 0x44, 0x6673)  /* <CJK> */
-MAP(0x42, 0x45, 0x6675)  /* <CJK> */
-MAP(0x42, 0x46, 0x667F)  /* <CJK> */
-MAP(0x42, 0x47, 0x6677)  /* <CJK> */
-MAP(0x42, 0x48, 0x6678)  /* <CJK> */
-MAP(0x42, 0x49, 0x6679)  /* <CJK> */
-MAP(0x42, 0x4A, 0x667B)  /* <CJK> */
-MAP(0x42, 0x4B, 0x6680)  /* <CJK> */
-MAP(0x42, 0x4C, 0x667C)  /* <CJK> */
-MAP(0x42, 0x4D, 0x668B)  /* <CJK> */
-MAP(0x42, 0x4E, 0x668C)  /* <CJK> */
-MAP(0x42, 0x4F, 0x668D)  /* <CJK> */
-MAP(0x42, 0x50, 0x6690)  /* <CJK> */
-MAP(0x42, 0x51, 0x6692)  /* <CJK> */
-MAP(0x42, 0x52, 0x6699)  /* <CJK> */
-MAP(0x42, 0x53, 0x669A)  /* <CJK> */
-MAP(0x42, 0x54, 0x669B)  /* <CJK> */
-MAP(0x42, 0x55, 0x669C)  /* <CJK> */
-MAP(0x42, 0x56, 0x669F)  /* <CJK> */
-MAP(0x42, 0x57, 0x66A0)  /* <CJK> */
-MAP(0x42, 0x58, 0x66A4)  /* <CJK> */
-MAP(0x42, 0x59, 0x66AD)  /* <CJK> */
-MAP(0x42, 0x5A, 0x66B1)  /* <CJK> */
-MAP(0x42, 0x5B, 0x66B2)  /* <CJK> */
-MAP(0x42, 0x5C, 0x66B5)  /* <CJK> */
-MAP(0x42, 0x5D, 0x66BB)  /* <CJK> */
-MAP(0x42, 0x5E, 0x66BF)  /* <CJK> */
-MAP(0x42, 0x5F, 0x66C0)  /* <CJK> */
-MAP(0x42, 0x60, 0x66C2)  /* <CJK> */
-MAP(0x42, 0x61, 0x66C3)  /* <CJK> */
-MAP(0x42, 0x62, 0x66C8)  /* <CJK> */
-MAP(0x42, 0x63, 0x66CC)  /* <CJK> */
-MAP(0x42, 0x64, 0x66CE)  /* <CJK> */
-MAP(0x42, 0x65, 0x66CF)  /* <CJK> */
-MAP(0x42, 0x66, 0x66D4)  /* <CJK> */
-MAP(0x42, 0x67, 0x66DB)  /* <CJK> */
-MAP(0x42, 0x68, 0x66DF)  /* <CJK> */
-MAP(0x42, 0x69, 0x66E8)  /* <CJK> */
-MAP(0x42, 0x6A, 0x66EB)  /* <CJK> */
-MAP(0x42, 0x6B, 0x66EC)  /* <CJK> */
-MAP(0x42, 0x6C, 0x66EE)  /* <CJK> */
-MAP(0x42, 0x6D, 0x66FA)  /* <CJK> */
-MAP(0x42, 0x6E, 0x6705)  /* <CJK> */
-MAP(0x42, 0x6F, 0x6707)  /* <CJK> */
-MAP(0x42, 0x70, 0x670E)  /* <CJK> */
-MAP(0x42, 0x71, 0x6713)  /* <CJK> */
-MAP(0x42, 0x72, 0x6719)  /* <CJK> */
-MAP(0x42, 0x73, 0x671C)  /* <CJK> */
-MAP(0x42, 0x74, 0x6720)  /* <CJK> */
-MAP(0x42, 0x75, 0x6722)  /* <CJK> */
-MAP(0x42, 0x76, 0x6733)  /* <CJK> */
-MAP(0x42, 0x77, 0x673E)  /* <CJK> */
-MAP(0x42, 0x78, 0x6745)  /* <CJK> */
-MAP(0x42, 0x79, 0x6747)  /* <CJK> */
-MAP(0x42, 0x7A, 0x6748)  /* <CJK> */
-MAP(0x42, 0x7B, 0x674C)  /* <CJK> */
-MAP(0x42, 0x7C, 0x6754)  /* <CJK> */
-MAP(0x42, 0x7D, 0x6755)  /* <CJK> */
-MAP(0x42, 0x7E, 0x675D)  /* <CJK> */
-MAP(0x43, 0x21, 0x6766)  /* <CJK> */
-MAP(0x43, 0x22, 0x676C)  /* <CJK> */
-MAP(0x43, 0x23, 0x676E)  /* <CJK> */
-MAP(0x43, 0x24, 0x6774)  /* <CJK> */
-MAP(0x43, 0x25, 0x6776)  /* <CJK> */
-MAP(0x43, 0x26, 0x677B)  /* <CJK> */
-MAP(0x43, 0x27, 0x6781)  /* <CJK> */
-MAP(0x43, 0x28, 0x6784)  /* <CJK> */
-MAP(0x43, 0x29, 0x678E)  /* <CJK> */
-MAP(0x43, 0x2A, 0x678F)  /* <CJK> */
-MAP(0x43, 0x2B, 0x6791)  /* <CJK> */
-MAP(0x43, 0x2C, 0x6793)  /* <CJK> */
-MAP(0x43, 0x2D, 0x6796)  /* <CJK> */
-MAP(0x43, 0x2E, 0x6798)  /* <CJK> */
-MAP(0x43, 0x2F, 0x6799)  /* <CJK> */
-MAP(0x43, 0x30, 0x679B)  /* <CJK> */
-MAP(0x43, 0x31, 0x67B0)  /* <CJK> */
-MAP(0x43, 0x32, 0x67B1)  /* <CJK> */
-MAP(0x43, 0x33, 0x67B2)  /* <CJK> */
-MAP(0x43, 0x34, 0x67B5)  /* <CJK> */
-MAP(0x43, 0x35, 0x67BB)  /* <CJK> */
-MAP(0x43, 0x36, 0x67BC)  /* <CJK> */
-MAP(0x43, 0x37, 0x67BD)  /* <CJK> */
-MAP(0x43, 0x38, 0x67F9)  /* <CJK> */
-MAP(0x43, 0x39, 0x67C0)  /* <CJK> */
-MAP(0x43, 0x3A, 0x67C2)  /* <CJK> */
-MAP(0x43, 0x3B, 0x67C3)  /* <CJK> */
-MAP(0x43, 0x3C, 0x67C5)  /* <CJK> */
-MAP(0x43, 0x3D, 0x67C8)  /* <CJK> */
-MAP(0x43, 0x3E, 0x67C9)  /* <CJK> */
-MAP(0x43, 0x3F, 0x67D2)  /* <CJK> */
-MAP(0x43, 0x40, 0x67D7)  /* <CJK> */
-MAP(0x43, 0x41, 0x67D9)  /* <CJK> */
-MAP(0x43, 0x42, 0x67DC)  /* <CJK> */
-MAP(0x43, 0x43, 0x67E1)  /* <CJK> */
-MAP(0x43, 0x44, 0x67E6)  /* <CJK> */
-MAP(0x43, 0x45, 0x67F0)  /* <CJK> */
-MAP(0x43, 0x46, 0x67F2)  /* <CJK> */
-MAP(0x43, 0x47, 0x67F6)  /* <CJK> */
-MAP(0x43, 0x48, 0x67F7)  /* <CJK> */
-MAP(0x43, 0x49, 0x6852)  /* <CJK> */
-MAP(0x43, 0x4A, 0x6814)  /* <CJK> */
-MAP(0x43, 0x4B, 0x6819)  /* <CJK> */
-MAP(0x43, 0x4C, 0x681D)  /* <CJK> */
-MAP(0x43, 0x4D, 0x681F)  /* <CJK> */
-MAP(0x43, 0x4E, 0x6828)  /* <CJK> */
-MAP(0x43, 0x4F, 0x6827)  /* <CJK> */
-MAP(0x43, 0x50, 0x682C)  /* <CJK> */
-MAP(0x43, 0x51, 0x682D)  /* <CJK> */
-MAP(0x43, 0x52, 0x682F)  /* <CJK> */
-MAP(0x43, 0x53, 0x6830)  /* <CJK> */
-MAP(0x43, 0x54, 0x6831)  /* <CJK> */
-MAP(0x43, 0x55, 0x6833)  /* <CJK> */
-MAP(0x43, 0x56, 0x683B)  /* <CJK> */
-MAP(0x43, 0x57, 0x683F)  /* <CJK> */
-MAP(0x43, 0x58, 0x6844)  /* <CJK> */
-MAP(0x43, 0x59, 0x6845)  /* <CJK> */
-MAP(0x43, 0x5A, 0x684A)  /* <CJK> */
-MAP(0x43, 0x5B, 0x684C)  /* <CJK> */
-MAP(0x43, 0x5C, 0x6855)  /* <CJK> */
-MAP(0x43, 0x5D, 0x6857)  /* <CJK> */
-MAP(0x43, 0x5E, 0x6858)  /* <CJK> */
-MAP(0x43, 0x5F, 0x685B)  /* <CJK> */
-MAP(0x43, 0x60, 0x686B)  /* <CJK> */
-MAP(0x43, 0x61, 0x686E)  /* <CJK> */
-MAP(0x43, 0x62, 0x686F)  /* <CJK> */
-MAP(0x43, 0x63, 0x6870)  /* <CJK> */
-MAP(0x43, 0x64, 0x6871)  /* <CJK> */
-MAP(0x43, 0x65, 0x6872)  /* <CJK> */
-MAP(0x43, 0x66, 0x6875)  /* <CJK> */
-MAP(0x43, 0x67, 0x6879)  /* <CJK> */
-MAP(0x43, 0x68, 0x687A)  /* <CJK> */
-MAP(0x43, 0x69, 0x687B)  /* <CJK> */
-MAP(0x43, 0x6A, 0x687C)  /* <CJK> */
-MAP(0x43, 0x6B, 0x6882)  /* <CJK> */
-MAP(0x43, 0x6C, 0x6884)  /* <CJK> */
-MAP(0x43, 0x6D, 0x6886)  /* <CJK> */
-MAP(0x43, 0x6E, 0x6888)  /* <CJK> */
-MAP(0x43, 0x6F, 0x6896)  /* <CJK> */
-MAP(0x43, 0x70, 0x6898)  /* <CJK> */
-MAP(0x43, 0x71, 0x689A)  /* <CJK> */
-MAP(0x43, 0x72, 0x689C)  /* <CJK> */
-MAP(0x43, 0x73, 0x68A1)  /* <CJK> */
-MAP(0x43, 0x74, 0x68A3)  /* <CJK> */
-MAP(0x43, 0x75, 0x68A5)  /* <CJK> */
-MAP(0x43, 0x76, 0x68A9)  /* <CJK> */
-MAP(0x43, 0x77, 0x68AA)  /* <CJK> */
-MAP(0x43, 0x78, 0x68AE)  /* <CJK> */
-MAP(0x43, 0x79, 0x68B2)  /* <CJK> */
-MAP(0x43, 0x7A, 0x68BB)  /* <CJK> */
-MAP(0x43, 0x7B, 0x68C5)  /* <CJK> */
-MAP(0x43, 0x7C, 0x68C8)  /* <CJK> */
-MAP(0x43, 0x7D, 0x68CC)  /* <CJK> */
-MAP(0x43, 0x7E, 0x68CF)  /* <CJK> */
-MAP(0x44, 0x21, 0x68D0)  /* <CJK> */
-MAP(0x44, 0x22, 0x68D1)  /* <CJK> */
-MAP(0x44, 0x23, 0x68D3)  /* <CJK> */
-MAP(0x44, 0x24, 0x68D6)  /* <CJK> */
-MAP(0x44, 0x25, 0x68D9)  /* <CJK> */
-MAP(0x44, 0x26, 0x68DC)  /* <CJK> */
-MAP(0x44, 0x27, 0x68DD)  /* <CJK> */
-MAP(0x44, 0x28, 0x68E5)  /* <CJK> */
-MAP(0x44, 0x29, 0x68E8)  /* <CJK> */
-MAP(0x44, 0x2A, 0x68EA)  /* <CJK> */
-MAP(0x44, 0x2B, 0x68EB)  /* <CJK> */
-MAP(0x44, 0x2C, 0x68EC)  /* <CJK> */
-MAP(0x44, 0x2D, 0x68ED)  /* <CJK> */
-MAP(0x44, 0x2E, 0x68F0)  /* <CJK> */
-MAP(0x44, 0x2F, 0x68F1)  /* <CJK> */
-MAP(0x44, 0x30, 0x68F5)  /* <CJK> */
-MAP(0x44, 0x31, 0x68F6)  /* <CJK> */
-MAP(0x44, 0x32, 0x68FB)  /* <CJK> */
-MAP(0x44, 0x33, 0x68FC)  /* <CJK> */
-MAP(0x44, 0x34, 0x68FD)  /* <CJK> */
-MAP(0x44, 0x35, 0x6906)  /* <CJK> */
-MAP(0x44, 0x36, 0x6909)  /* <CJK> */
-MAP(0x44, 0x37, 0x690A)  /* <CJK> */
-MAP(0x44, 0x38, 0x6910)  /* <CJK> */
-MAP(0x44, 0x39, 0x6911)  /* <CJK> */
-MAP(0x44, 0x3A, 0x6913)  /* <CJK> */
-MAP(0x44, 0x3B, 0x6916)  /* <CJK> */
-MAP(0x44, 0x3C, 0x6917)  /* <CJK> */
-MAP(0x44, 0x3D, 0x6931)  /* <CJK> */
-MAP(0x44, 0x3E, 0x6933)  /* <CJK> */
-MAP(0x44, 0x3F, 0x6935)  /* <CJK> */
-MAP(0x44, 0x40, 0x6938)  /* <CJK> */
-MAP(0x44, 0x41, 0x693B)  /* <CJK> */
-MAP(0x44, 0x42, 0x6942)  /* <CJK> */
-MAP(0x44, 0x43, 0x6945)  /* <CJK> */
-MAP(0x44, 0x44, 0x6949)  /* <CJK> */
-MAP(0x44, 0x45, 0x694E)  /* <CJK> */
-MAP(0x44, 0x46, 0x6957)  /* <CJK> */
-MAP(0x44, 0x47, 0x695B)  /* <CJK> */
-MAP(0x44, 0x48, 0x6963)  /* <CJK> */
-MAP(0x44, 0x49, 0x6964)  /* <CJK> */
-MAP(0x44, 0x4A, 0x6965)  /* <CJK> */
-MAP(0x44, 0x4B, 0x6966)  /* <CJK> */
-MAP(0x44, 0x4C, 0x6968)  /* <CJK> */
-MAP(0x44, 0x4D, 0x6969)  /* <CJK> */
-MAP(0x44, 0x4E, 0x696C)  /* <CJK> */
-MAP(0x44, 0x4F, 0x6970)  /* <CJK> */
-MAP(0x44, 0x50, 0x6971)  /* <CJK> */
-MAP(0x44, 0x51, 0x6972)  /* <CJK> */
-MAP(0x44, 0x52, 0x697A)  /* <CJK> */
-MAP(0x44, 0x53, 0x697B)  /* <CJK> */
-MAP(0x44, 0x54, 0x697F)  /* <CJK> */
-MAP(0x44, 0x55, 0x6980)  /* <CJK> */
-MAP(0x44, 0x56, 0x698D)  /* <CJK> */
-MAP(0x44, 0x57, 0x6992)  /* <CJK> */
-MAP(0x44, 0x58, 0x6996)  /* <CJK> */
-MAP(0x44, 0x59, 0x6998)  /* <CJK> */
-MAP(0x44, 0x5A, 0x69A1)  /* <CJK> */
-MAP(0x44, 0x5B, 0x69A5)  /* <CJK> */
-MAP(0x44, 0x5C, 0x69A6)  /* <CJK> */
-MAP(0x44, 0x5D, 0x69A8)  /* <CJK> */
-MAP(0x44, 0x5E, 0x69AB)  /* <CJK> */
-MAP(0x44, 0x5F, 0x69AD)  /* <CJK> */
-MAP(0x44, 0x60, 0x69AF)  /* <CJK> */
-MAP(0x44, 0x61, 0x69B7)  /* <CJK> */
-MAP(0x44, 0x62, 0x69B8)  /* <CJK> */
-MAP(0x44, 0x63, 0x69BA)  /* <CJK> */
-MAP(0x44, 0x64, 0x69BC)  /* <CJK> */
-MAP(0x44, 0x65, 0x69C5)  /* <CJK> */
-MAP(0x44, 0x66, 0x69C8)  /* <CJK> */
-MAP(0x44, 0x67, 0x69D1)  /* <CJK> */
-MAP(0x44, 0x68, 0x69D6)  /* <CJK> */
-MAP(0x44, 0x69, 0x69D7)  /* <CJK> */
-MAP(0x44, 0x6A, 0x69E2)  /* <CJK> */
-MAP(0x44, 0x6B, 0x69E5)  /* <CJK> */
-MAP(0x44, 0x6C, 0x69EE)  /* <CJK> */
-MAP(0x44, 0x6D, 0x69EF)  /* <CJK> */
-MAP(0x44, 0x6E, 0x69F1)  /* <CJK> */
-MAP(0x44, 0x6F, 0x69F3)  /* <CJK> */
-MAP(0x44, 0x70, 0x69F5)  /* <CJK> */
-MAP(0x44, 0x71, 0x69FE)  /* <CJK> */
-MAP(0x44, 0x72, 0x6A00)  /* <CJK> */
-MAP(0x44, 0x73, 0x6A01)  /* <CJK> */
-MAP(0x44, 0x74, 0x6A03)  /* <CJK> */
-MAP(0x44, 0x75, 0x6A0F)  /* <CJK> */
-MAP(0x44, 0x76, 0x6A11)  /* <CJK> */
-MAP(0x44, 0x77, 0x6A15)  /* <CJK> */
-MAP(0x44, 0x78, 0x6A1A)  /* <CJK> */
-MAP(0x44, 0x79, 0x6A1D)  /* <CJK> */
-MAP(0x44, 0x7A, 0x6A20)  /* <CJK> */
-MAP(0x44, 0x7B, 0x6A24)  /* <CJK> */
-MAP(0x44, 0x7C, 0x6A28)  /* <CJK> */
-MAP(0x44, 0x7D, 0x6A30)  /* <CJK> */
-MAP(0x44, 0x7E, 0x6A32)  /* <CJK> */
-MAP(0x45, 0x21, 0x6A34)  /* <CJK> */
-MAP(0x45, 0x22, 0x6A37)  /* <CJK> */
-MAP(0x45, 0x23, 0x6A3B)  /* <CJK> */
-MAP(0x45, 0x24, 0x6A3E)  /* <CJK> */
-MAP(0x45, 0x25, 0x6A3F)  /* <CJK> */
-MAP(0x45, 0x26, 0x6A45)  /* <CJK> */
-MAP(0x45, 0x27, 0x6A46)  /* <CJK> */
-MAP(0x45, 0x28, 0x6A49)  /* <CJK> */
-MAP(0x45, 0x29, 0x6A4A)  /* <CJK> */
-MAP(0x45, 0x2A, 0x6A4E)  /* <CJK> */
-MAP(0x45, 0x2B, 0x6A50)  /* <CJK> */
-MAP(0x45, 0x2C, 0x6A51)  /* <CJK> */
-MAP(0x45, 0x2D, 0x6A52)  /* <CJK> */
-MAP(0x45, 0x2E, 0x6A55)  /* <CJK> */
-MAP(0x45, 0x2F, 0x6A56)  /* <CJK> */
-MAP(0x45, 0x30, 0x6A5B)  /* <CJK> */
-MAP(0x45, 0x31, 0x6A64)  /* <CJK> */
-MAP(0x45, 0x32, 0x6A67)  /* <CJK> */
-MAP(0x45, 0x33, 0x6A6A)  /* <CJK> */
-MAP(0x45, 0x34, 0x6A71)  /* <CJK> */
-MAP(0x45, 0x35, 0x6A73)  /* <CJK> */
-MAP(0x45, 0x36, 0x6A7E)  /* <CJK> */
-MAP(0x45, 0x37, 0x6A81)  /* <CJK> */
-MAP(0x45, 0x38, 0x6A83)  /* <CJK> */
-MAP(0x45, 0x39, 0x6A86)  /* <CJK> */
-MAP(0x45, 0x3A, 0x6A87)  /* <CJK> */
-MAP(0x45, 0x3B, 0x6A89)  /* <CJK> */
-MAP(0x45, 0x3C, 0x6A8B)  /* <CJK> */
-MAP(0x45, 0x3D, 0x6A91)  /* <CJK> */
-MAP(0x45, 0x3E, 0x6A9B)  /* <CJK> */
-MAP(0x45, 0x3F, 0x6A9D)  /* <CJK> */
-MAP(0x45, 0x40, 0x6A9E)  /* <CJK> */
-MAP(0x45, 0x41, 0x6A9F)  /* <CJK> */
-MAP(0x45, 0x42, 0x6AA5)  /* <CJK> */
-MAP(0x45, 0x43, 0x6AAB)  /* <CJK> */
-MAP(0x45, 0x44, 0x6AAF)  /* <CJK> */
-MAP(0x45, 0x45, 0x6AB0)  /* <CJK> */
-MAP(0x45, 0x46, 0x6AB1)  /* <CJK> */
-MAP(0x45, 0x47, 0x6AB4)  /* <CJK> */
-MAP(0x45, 0x48, 0x6ABD)  /* <CJK> */
-MAP(0x45, 0x49, 0x6ABE)  /* <CJK> */
-MAP(0x45, 0x4A, 0x6ABF)  /* <CJK> */
-MAP(0x45, 0x4B, 0x6AC6)  /* <CJK> */
-MAP(0x45, 0x4C, 0x6AC9)  /* <CJK> */
-MAP(0x45, 0x4D, 0x6AC8)  /* <CJK> */
-MAP(0x45, 0x4E, 0x6ACC)  /* <CJK> */
-MAP(0x45, 0x4F, 0x6AD0)  /* <CJK> */
-MAP(0x45, 0x50, 0x6AD4)  /* <CJK> */
-MAP(0x45, 0x51, 0x6AD5)  /* <CJK> */
-MAP(0x45, 0x52, 0x6AD6)  /* <CJK> */
-MAP(0x45, 0x53, 0x6ADC)  /* <CJK> */
-MAP(0x45, 0x54, 0x6ADD)  /* <CJK> */
-MAP(0x45, 0x55, 0x6AE4)  /* <CJK> */
-MAP(0x45, 0x56, 0x6AE7)  /* <CJK> */
-MAP(0x45, 0x57, 0x6AEC)  /* <CJK> */
-MAP(0x45, 0x58, 0x6AF0)  /* <CJK> */
-MAP(0x45, 0x59, 0x6AF1)  /* <CJK> */
-MAP(0x45, 0x5A, 0x6AF2)  /* <CJK> */
-MAP(0x45, 0x5B, 0x6AFC)  /* <CJK> */
-MAP(0x45, 0x5C, 0x6AFD)  /* <CJK> */
-MAP(0x45, 0x5D, 0x6B02)  /* <CJK> */
-MAP(0x45, 0x5E, 0x6B03)  /* <CJK> */
-MAP(0x45, 0x5F, 0x6B06)  /* <CJK> */
-MAP(0x45, 0x60, 0x6B07)  /* <CJK> */
-MAP(0x45, 0x61, 0x6B09)  /* <CJK> */
-MAP(0x45, 0x62, 0x6B0F)  /* <CJK> */
-MAP(0x45, 0x63, 0x6B10)  /* <CJK> */
-MAP(0x45, 0x64, 0x6B11)  /* <CJK> */
-MAP(0x45, 0x65, 0x6B17)  /* <CJK> */
-MAP(0x45, 0x66, 0x6B1B)  /* <CJK> */
-MAP(0x45, 0x67, 0x6B1E)  /* <CJK> */
-MAP(0x45, 0x68, 0x6B24)  /* <CJK> */
-MAP(0x45, 0x69, 0x6B28)  /* <CJK> */
-MAP(0x45, 0x6A, 0x6B2B)  /* <CJK> */
-MAP(0x45, 0x6B, 0x6B2C)  /* <CJK> */
-MAP(0x45, 0x6C, 0x6B2F)  /* <CJK> */
-MAP(0x45, 0x6D, 0x6B35)  /* <CJK> */
-MAP(0x45, 0x6E, 0x6B36)  /* <CJK> */
-MAP(0x45, 0x6F, 0x6B3B)  /* <CJK> */
-MAP(0x45, 0x70, 0x6B3F)  /* <CJK> */
-MAP(0x45, 0x71, 0x6B46)  /* <CJK> */
-MAP(0x45, 0x72, 0x6B4A)  /* <CJK> */
-MAP(0x45, 0x73, 0x6B4D)  /* <CJK> */
-MAP(0x45, 0x74, 0x6B52)  /* <CJK> */
-MAP(0x45, 0x75, 0x6B56)  /* <CJK> */
-MAP(0x45, 0x76, 0x6B58)  /* <CJK> */
-MAP(0x45, 0x77, 0x6B5D)  /* <CJK> */
-MAP(0x45, 0x78, 0x6B60)  /* <CJK> */
-MAP(0x45, 0x79, 0x6B67)  /* <CJK> */
-MAP(0x45, 0x7A, 0x6B6B)  /* <CJK> */
-MAP(0x45, 0x7B, 0x6B6E)  /* <CJK> */
-MAP(0x45, 0x7C, 0x6B70)  /* <CJK> */
-MAP(0x45, 0x7D, 0x6B75)  /* <CJK> */
-MAP(0x45, 0x7E, 0x6B7D)  /* <CJK> */
-MAP(0x46, 0x21, 0x6B7E)  /* <CJK> */
-MAP(0x46, 0x22, 0x6B82)  /* <CJK> */
-MAP(0x46, 0x23, 0x6B85)  /* <CJK> */
-MAP(0x46, 0x24, 0x6B97)  /* <CJK> */
-MAP(0x46, 0x25, 0x6B9B)  /* <CJK> */
-MAP(0x46, 0x26, 0x6B9F)  /* <CJK> */
-MAP(0x46, 0x27, 0x6BA0)  /* <CJK> */
-MAP(0x46, 0x28, 0x6BA2)  /* <CJK> */
-MAP(0x46, 0x29, 0x6BA3)  /* <CJK> */
-MAP(0x46, 0x2A, 0x6BA8)  /* <CJK> */
-MAP(0x46, 0x2B, 0x6BA9)  /* <CJK> */
-MAP(0x46, 0x2C, 0x6BAC)  /* <CJK> */
-MAP(0x46, 0x2D, 0x6BAD)  /* <CJK> */
-MAP(0x46, 0x2E, 0x6BAE)  /* <CJK> */
-MAP(0x46, 0x2F, 0x6BB0)  /* <CJK> */
-MAP(0x46, 0x30, 0x6BB8)  /* <CJK> */
-MAP(0x46, 0x31, 0x6BB9)  /* <CJK> */
-MAP(0x46, 0x32, 0x6BBD)  /* <CJK> */
-MAP(0x46, 0x33, 0x6BBE)  /* <CJK> */
-MAP(0x46, 0x34, 0x6BC3)  /* <CJK> */
-MAP(0x46, 0x35, 0x6BC4)  /* <CJK> */
-MAP(0x46, 0x36, 0x6BC9)  /* <CJK> */
-MAP(0x46, 0x37, 0x6BCC)  /* <CJK> */
-MAP(0x46, 0x38, 0x6BD6)  /* <CJK> */
-MAP(0x46, 0x39, 0x6BDA)  /* <CJK> */
-MAP(0x46, 0x3A, 0x6BE1)  /* <CJK> */
-MAP(0x46, 0x3B, 0x6BE3)  /* <CJK> */
-MAP(0x46, 0x3C, 0x6BE6)  /* <CJK> */
-MAP(0x46, 0x3D, 0x6BE7)  /* <CJK> */
-MAP(0x46, 0x3E, 0x6BEE)  /* <CJK> */
-MAP(0x46, 0x3F, 0x6BF1)  /* <CJK> */
-MAP(0x46, 0x40, 0x6BF7)  /* <CJK> */
-MAP(0x46, 0x41, 0x6BF9)  /* <CJK> */
-MAP(0x46, 0x42, 0x6BFF)  /* <CJK> */
-MAP(0x46, 0x43, 0x6C02)  /* <CJK> */
-MAP(0x46, 0x44, 0x6C04)  /* <CJK> */
-MAP(0x46, 0x45, 0x6C05)  /* <CJK> */
-MAP(0x46, 0x46, 0x6C09)  /* <CJK> */
-MAP(0x46, 0x47, 0x6C0D)  /* <CJK> */
-MAP(0x46, 0x48, 0x6C0E)  /* <CJK> */
-MAP(0x46, 0x49, 0x6C10)  /* <CJK> */
-MAP(0x46, 0x4A, 0x6C12)  /* <CJK> */
-MAP(0x46, 0x4B, 0x6C19)  /* <CJK> */
-MAP(0x46, 0x4C, 0x6C1F)  /* <CJK> */
-MAP(0x46, 0x4D, 0x6C26)  /* <CJK> */
-MAP(0x46, 0x4E, 0x6C27)  /* <CJK> */
-MAP(0x46, 0x4F, 0x6C28)  /* <CJK> */
-MAP(0x46, 0x50, 0x6C2C)  /* <CJK> */
-MAP(0x46, 0x51, 0x6C2E)  /* <CJK> */
-MAP(0x46, 0x52, 0x6C33)  /* <CJK> */
-MAP(0x46, 0x53, 0x6C35)  /* <CJK> */
-MAP(0x46, 0x54, 0x6C36)  /* <CJK> */
-MAP(0x46, 0x55, 0x6C3A)  /* <CJK> */
-MAP(0x46, 0x56, 0x6C3B)  /* <CJK> */
-MAP(0x46, 0x57, 0x6C3F)  /* <CJK> */
-MAP(0x46, 0x58, 0x6C4A)  /* <CJK> */
-MAP(0x46, 0x59, 0x6C4B)  /* <CJK> */
-MAP(0x46, 0x5A, 0x6C4D)  /* <CJK> */
-MAP(0x46, 0x5B, 0x6C4F)  /* <CJK> */
-MAP(0x46, 0x5C, 0x6C52)  /* <CJK> */
-MAP(0x46, 0x5D, 0x6C54)  /* <CJK> */
-MAP(0x46, 0x5E, 0x6C59)  /* <CJK> */
-MAP(0x46, 0x5F, 0x6C5B)  /* <CJK> */
-MAP(0x46, 0x60, 0x6C5C)  /* <CJK> */
-MAP(0x46, 0x61, 0x6C6B)  /* <CJK> */
-MAP(0x46, 0x62, 0x6C6D)  /* <CJK> */
-MAP(0x46, 0x63, 0x6C6F)  /* <CJK> */
-MAP(0x46, 0x64, 0x6C74)  /* <CJK> */
-MAP(0x46, 0x65, 0x6C76)  /* <CJK> */
-MAP(0x46, 0x66, 0x6C78)  /* <CJK> */
-MAP(0x46, 0x67, 0x6C79)  /* <CJK> */
-MAP(0x46, 0x68, 0x6C7B)  /* <CJK> */
-MAP(0x46, 0x69, 0x6C85)  /* <CJK> */
-MAP(0x46, 0x6A, 0x6C86)  /* <CJK> */
-MAP(0x46, 0x6B, 0x6C87)  /* <CJK> */
-MAP(0x46, 0x6C, 0x6C89)  /* <CJK> */
-MAP(0x46, 0x6D, 0x6C94)  /* <CJK> */
-MAP(0x46, 0x6E, 0x6C95)  /* <CJK> */
-MAP(0x46, 0x6F, 0x6C97)  /* <CJK> */
-MAP(0x46, 0x70, 0x6C98)  /* <CJK> */
-MAP(0x46, 0x71, 0x6C9C)  /* <CJK> */
-MAP(0x46, 0x72, 0x6C9F)  /* <CJK> */
-MAP(0x46, 0x73, 0x6CB0)  /* <CJK> */
-MAP(0x46, 0x74, 0x6CB2)  /* <CJK> */
-MAP(0x46, 0x75, 0x6CB4)  /* <CJK> */
-MAP(0x46, 0x76, 0x6CC2)  /* <CJK> */
-MAP(0x46, 0x77, 0x6CC6)  /* <CJK> */
-MAP(0x46, 0x78, 0x6CCD)  /* <CJK> */
-MAP(0x46, 0x79, 0x6CCF)  /* <CJK> */
-MAP(0x46, 0x7A, 0x6CD0)  /* <CJK> */
-MAP(0x46, 0x7B, 0x6CD1)  /* <CJK> */
-MAP(0x46, 0x7C, 0x6CD2)  /* <CJK> */
-MAP(0x46, 0x7D, 0x6CD4)  /* <CJK> */
-MAP(0x46, 0x7E, 0x6CD6)  /* <CJK> */
-MAP(0x47, 0x21, 0x6CDA)  /* <CJK> */
-MAP(0x47, 0x22, 0x6CDC)  /* <CJK> */
-MAP(0x47, 0x23, 0x6CE0)  /* <CJK> */
-MAP(0x47, 0x24, 0x6CE7)  /* <CJK> */
-MAP(0x47, 0x25, 0x6CE9)  /* <CJK> */
-MAP(0x47, 0x26, 0x6CEB)  /* <CJK> */
-MAP(0x47, 0x27, 0x6CEC)  /* <CJK> */
-MAP(0x47, 0x28, 0x6CEE)  /* <CJK> */
-MAP(0x47, 0x29, 0x6CF2)  /* <CJK> */
-MAP(0x47, 0x2A, 0x6CF4)  /* <CJK> */
-MAP(0x47, 0x2B, 0x6D04)  /* <CJK> */
-MAP(0x47, 0x2C, 0x6D07)  /* <CJK> */
-MAP(0x47, 0x2D, 0x6D0A)  /* <CJK> */
-MAP(0x47, 0x2E, 0x6D0E)  /* <CJK> */
-MAP(0x47, 0x2F, 0x6D0F)  /* <CJK> */
-MAP(0x47, 0x30, 0x6D11)  /* <CJK> */
-MAP(0x47, 0x31, 0x6D13)  /* <CJK> */
-MAP(0x47, 0x32, 0x6D1A)  /* <CJK> */
-MAP(0x47, 0x33, 0x6D26)  /* <CJK> */
-MAP(0x47, 0x34, 0x6D27)  /* <CJK> */
-MAP(0x47, 0x35, 0x6D28)  /* <CJK> */
-MAP(0x47, 0x36, 0x6C67)  /* <CJK> */
-MAP(0x47, 0x37, 0x6D2E)  /* <CJK> */
-MAP(0x47, 0x38, 0x6D2F)  /* <CJK> */
-MAP(0x47, 0x39, 0x6D31)  /* <CJK> */
-MAP(0x47, 0x3A, 0x6D39)  /* <CJK> */
-MAP(0x47, 0x3B, 0x6D3C)  /* <CJK> */
-MAP(0x47, 0x3C, 0x6D3F)  /* <CJK> */
-MAP(0x47, 0x3D, 0x6D57)  /* <CJK> */
-MAP(0x47, 0x3E, 0x6D5E)  /* <CJK> */
-MAP(0x47, 0x3F, 0x6D5F)  /* <CJK> */
-MAP(0x47, 0x40, 0x6D61)  /* <CJK> */
-MAP(0x47, 0x41, 0x6D65)  /* <CJK> */
-MAP(0x47, 0x42, 0x6D67)  /* <CJK> */
-MAP(0x47, 0x43, 0x6D6F)  /* <CJK> */
-MAP(0x47, 0x44, 0x6D70)  /* <CJK> */
-MAP(0x47, 0x45, 0x6D7C)  /* <CJK> */
-MAP(0x47, 0x46, 0x6D82)  /* <CJK> */
-MAP(0x47, 0x47, 0x6D87)  /* <CJK> */
-MAP(0x47, 0x48, 0x6D91)  /* <CJK> */
-MAP(0x47, 0x49, 0x6D92)  /* <CJK> */
-MAP(0x47, 0x4A, 0x6D94)  /* <CJK> */
-MAP(0x47, 0x4B, 0x6D96)  /* <CJK> */
-MAP(0x47, 0x4C, 0x6D97)  /* <CJK> */
-MAP(0x47, 0x4D, 0x6D98)  /* <CJK> */
-MAP(0x47, 0x4E, 0x6DAA)  /* <CJK> */
-MAP(0x47, 0x4F, 0x6DAC)  /* <CJK> */
-MAP(0x47, 0x50, 0x6DB4)  /* <CJK> */
-MAP(0x47, 0x51, 0x6DB7)  /* <CJK> */
-MAP(0x47, 0x52, 0x6DB9)  /* <CJK> */
-MAP(0x47, 0x53, 0x6DBD)  /* <CJK> */
-MAP(0x47, 0x54, 0x6DBF)  /* <CJK> */
-MAP(0x47, 0x55, 0x6DC4)  /* <CJK> */
-MAP(0x47, 0x56, 0x6DC8)  /* <CJK> */
-MAP(0x47, 0x57, 0x6DCA)  /* <CJK> */
-MAP(0x47, 0x58, 0x6DCE)  /* <CJK> */
-MAP(0x47, 0x59, 0x6DCF)  /* <CJK> */
-MAP(0x47, 0x5A, 0x6DD6)  /* <CJK> */
-MAP(0x47, 0x5B, 0x6DDB)  /* <CJK> */
-MAP(0x47, 0x5C, 0x6DDD)  /* <CJK> */
-MAP(0x47, 0x5D, 0x6DDF)  /* <CJK> */
-MAP(0x47, 0x5E, 0x6DE0)  /* <CJK> */
-MAP(0x47, 0x5F, 0x6DE2)  /* <CJK> */
-MAP(0x47, 0x60, 0x6DE5)  /* <CJK> */
-MAP(0x47, 0x61, 0x6DE9)  /* <CJK> */
-MAP(0x47, 0x62, 0x6DEF)  /* <CJK> */
-MAP(0x47, 0x63, 0x6DF0)  /* <CJK> */
-MAP(0x47, 0x64, 0x6DF4)  /* <CJK> */
-MAP(0x47, 0x65, 0x6DF6)  /* <CJK> */
-MAP(0x47, 0x66, 0x6DFC)  /* <CJK> */
-MAP(0x47, 0x67, 0x6E00)  /* <CJK> */
-MAP(0x47, 0x68, 0x6E04)  /* <CJK> */
-MAP(0x47, 0x69, 0x6E1E)  /* <CJK> */
-MAP(0x47, 0x6A, 0x6E22)  /* <CJK> */
-MAP(0x47, 0x6B, 0x6E27)  /* <CJK> */
-MAP(0x47, 0x6C, 0x6E32)  /* <CJK> */
-MAP(0x47, 0x6D, 0x6E36)  /* <CJK> */
-MAP(0x47, 0x6E, 0x6E39)  /* <CJK> */
-MAP(0x47, 0x6F, 0x6E3B)  /* <CJK> */
-MAP(0x47, 0x70, 0x6E3C)  /* <CJK> */
-MAP(0x47, 0x71, 0x6E44)  /* <CJK> */
-MAP(0x47, 0x72, 0x6E45)  /* <CJK> */
-MAP(0x47, 0x73, 0x6E48)  /* <CJK> */
-MAP(0x47, 0x74, 0x6E49)  /* <CJK> */
-MAP(0x47, 0x75, 0x6E4B)  /* <CJK> */
-MAP(0x47, 0x76, 0x6E4F)  /* <CJK> */
-MAP(0x47, 0x77, 0x6E51)  /* <CJK> */
-MAP(0x47, 0x78, 0x6E52)  /* <CJK> */
-MAP(0x47, 0x79, 0x6E53)  /* <CJK> */
-MAP(0x47, 0x7A, 0x6E54)  /* <CJK> */
-MAP(0x47, 0x7B, 0x6E57)  /* <CJK> */
-MAP(0x47, 0x7C, 0x6E5C)  /* <CJK> */
-MAP(0x47, 0x7D, 0x6E5D)  /* <CJK> */
-MAP(0x47, 0x7E, 0x6E5E)  /* <CJK> */
-MAP(0x48, 0x21, 0x6E62)  /* <CJK> */
-MAP(0x48, 0x22, 0x6E63)  /* <CJK> */
-MAP(0x48, 0x23, 0x6E68)  /* <CJK> */
-MAP(0x48, 0x24, 0x6E73)  /* <CJK> */
-MAP(0x48, 0x25, 0x6E7B)  /* <CJK> */
-MAP(0x48, 0x26, 0x6E7D)  /* <CJK> */
-MAP(0x48, 0x27, 0x6E8D)  /* <CJK> */
-MAP(0x48, 0x28, 0x6E93)  /* <CJK> */
-MAP(0x48, 0x29, 0x6E99)  /* <CJK> */
-MAP(0x48, 0x2A, 0x6EA0)  /* <CJK> */
-MAP(0x48, 0x2B, 0x6EA7)  /* <CJK> */
-MAP(0x48, 0x2C, 0x6EAD)  /* <CJK> */
-MAP(0x48, 0x2D, 0x6EAE)  /* <CJK> */
-MAP(0x48, 0x2E, 0x6EB1)  /* <CJK> */
-MAP(0x48, 0x2F, 0x6EB3)  /* <CJK> */
-MAP(0x48, 0x30, 0x6EBB)  /* <CJK> */
-MAP(0x48, 0x31, 0x6EBF)  /* <CJK> */
-MAP(0x48, 0x32, 0x6EC0)  /* <CJK> */
-MAP(0x48, 0x33, 0x6EC1)  /* <CJK> */
-MAP(0x48, 0x34, 0x6EC3)  /* <CJK> */
-MAP(0x48, 0x35, 0x6EC7)  /* <CJK> */
-MAP(0x48, 0x36, 0x6EC8)  /* <CJK> */
-MAP(0x48, 0x37, 0x6ECA)  /* <CJK> */
-MAP(0x48, 0x38, 0x6ECD)  /* <CJK> */
-MAP(0x48, 0x39, 0x6ECE)  /* <CJK> */
-MAP(0x48, 0x3A, 0x6ECF)  /* <CJK> */
-MAP(0x48, 0x3B, 0x6EEB)  /* <CJK> */
-MAP(0x48, 0x3C, 0x6EED)  /* <CJK> */
-MAP(0x48, 0x3D, 0x6EEE)  /* <CJK> */
-MAP(0x48, 0x3E, 0x6EF9)  /* <CJK> */
-MAP(0x48, 0x3F, 0x6EFB)  /* <CJK> */
-MAP(0x48, 0x40, 0x6EFD)  /* <CJK> */
-MAP(0x48, 0x41, 0x6F04)  /* <CJK> */
-MAP(0x48, 0x42, 0x6F08)  /* <CJK> */
-MAP(0x48, 0x43, 0x6F0A)  /* <CJK> */
-MAP(0x48, 0x44, 0x6F0C)  /* <CJK> */
-MAP(0x48, 0x45, 0x6F0D)  /* <CJK> */
-MAP(0x48, 0x46, 0x6F16)  /* <CJK> */
-MAP(0x48, 0x47, 0x6F18)  /* <CJK> */
-MAP(0x48, 0x48, 0x6F1A)  /* <CJK> */
-MAP(0x48, 0x49, 0x6F1B)  /* <CJK> */
-MAP(0x48, 0x4A, 0x6F26)  /* <CJK> */
-MAP(0x48, 0x4B, 0x6F29)  /* <CJK> */
-MAP(0x48, 0x4C, 0x6F2A)  /* <CJK> */
-MAP(0x48, 0x4D, 0x6F2F)  /* <CJK> */
-MAP(0x48, 0x4E, 0x6F30)  /* <CJK> */
-MAP(0x48, 0x4F, 0x6F33)  /* <CJK> */
-MAP(0x48, 0x50, 0x6F36)  /* <CJK> */
-MAP(0x48, 0x51, 0x6F3B)  /* <CJK> */
-MAP(0x48, 0x52, 0x6F3C)  /* <CJK> */
-MAP(0x48, 0x53, 0x6F2D)  /* <CJK> */
-MAP(0x48, 0x54, 0x6F4F)  /* <CJK> */
-MAP(0x48, 0x55, 0x6F51)  /* <CJK> */
-MAP(0x48, 0x56, 0x6F52)  /* <CJK> */
-MAP(0x48, 0x57, 0x6F53)  /* <CJK> */
-MAP(0x48, 0x58, 0x6F57)  /* <CJK> */
-MAP(0x48, 0x59, 0x6F59)  /* <CJK> */
-MAP(0x48, 0x5A, 0x6F5A)  /* <CJK> */
-MAP(0x48, 0x5B, 0x6F5D)  /* <CJK> */
-MAP(0x48, 0x5C, 0x6F5E)  /* <CJK> */
-MAP(0x48, 0x5D, 0x6F61)  /* <CJK> */
-MAP(0x48, 0x5E, 0x6F62)  /* <CJK> */
-MAP(0x48, 0x5F, 0x6F68)  /* <CJK> */
-MAP(0x48, 0x60, 0x6F6C)  /* <CJK> */
-MAP(0x48, 0x61, 0x6F7D)  /* <CJK> */
-MAP(0x48, 0x62, 0x6F7E)  /* <CJK> */
-MAP(0x48, 0x63, 0x6F83)  /* <CJK> */
-MAP(0x48, 0x64, 0x6F87)  /* <CJK> */
-MAP(0x48, 0x65, 0x6F88)  /* <CJK> */
-MAP(0x48, 0x66, 0x6F8B)  /* <CJK> */
-MAP(0x48, 0x67, 0x6F8C)  /* <CJK> */
-MAP(0x48, 0x68, 0x6F8D)  /* <CJK> */
-MAP(0x48, 0x69, 0x6F90)  /* <CJK> */
-MAP(0x48, 0x6A, 0x6F92)  /* <CJK> */
-MAP(0x48, 0x6B, 0x6F93)  /* <CJK> */
-MAP(0x48, 0x6C, 0x6F94)  /* <CJK> */
-MAP(0x48, 0x6D, 0x6F96)  /* <CJK> */
-MAP(0x48, 0x6E, 0x6F9A)  /* <CJK> */
-MAP(0x48, 0x6F, 0x6F9F)  /* <CJK> */
-MAP(0x48, 0x70, 0x6FA0)  /* <CJK> */
-MAP(0x48, 0x71, 0x6FA5)  /* <CJK> */
-MAP(0x48, 0x72, 0x6FA6)  /* <CJK> */
-MAP(0x48, 0x73, 0x6FA7)  /* <CJK> */
-MAP(0x48, 0x74, 0x6FA8)  /* <CJK> */
-MAP(0x48, 0x75, 0x6FAE)  /* <CJK> */
-MAP(0x48, 0x76, 0x6FAF)  /* <CJK> */
-MAP(0x48, 0x77, 0x6FB0)  /* <CJK> */
-MAP(0x48, 0x78, 0x6FB5)  /* <CJK> */
-MAP(0x48, 0x79, 0x6FB6)  /* <CJK> */
-MAP(0x48, 0x7A, 0x6FBC)  /* <CJK> */
-MAP(0x48, 0x7B, 0x6FC5)  /* <CJK> */
-MAP(0x48, 0x7C, 0x6FC7)  /* <CJK> */
-MAP(0x48, 0x7D, 0x6FC8)  /* <CJK> */
-MAP(0x48, 0x7E, 0x6FCA)  /* <CJK> */
-MAP(0x49, 0x21, 0x6FDA)  /* <CJK> */
-MAP(0x49, 0x22, 0x6FDE)  /* <CJK> */
-MAP(0x49, 0x23, 0x6FE8)  /* <CJK> */
-MAP(0x49, 0x24, 0x6FE9)  /* <CJK> */
-MAP(0x49, 0x25, 0x6FF0)  /* <CJK> */
-MAP(0x49, 0x26, 0x6FF5)  /* <CJK> */
-MAP(0x49, 0x27, 0x6FF9)  /* <CJK> */
-MAP(0x49, 0x28, 0x6FFC)  /* <CJK> */
-MAP(0x49, 0x29, 0x6FFD)  /* <CJK> */
-MAP(0x49, 0x2A, 0x7000)  /* <CJK> */
-MAP(0x49, 0x2B, 0x7005)  /* <CJK> */
-MAP(0x49, 0x2C, 0x7006)  /* <CJK> */
-MAP(0x49, 0x2D, 0x7007)  /* <CJK> */
-MAP(0x49, 0x2E, 0x700D)  /* <CJK> */
-MAP(0x49, 0x2F, 0x7017)  /* <CJK> */
-MAP(0x49, 0x30, 0x7020)  /* <CJK> */
-MAP(0x49, 0x31, 0x7023)  /* <CJK> */
-MAP(0x49, 0x32, 0x702F)  /* <CJK> */
-MAP(0x49, 0x33, 0x7034)  /* <CJK> */
-MAP(0x49, 0x34, 0x7037)  /* <CJK> */
-MAP(0x49, 0x35, 0x7039)  /* <CJK> */
-MAP(0x49, 0x36, 0x703C)  /* <CJK> */
-MAP(0x49, 0x37, 0x7043)  /* <CJK> */
-MAP(0x49, 0x38, 0x7044)  /* <CJK> */
-MAP(0x49, 0x39, 0x7048)  /* <CJK> */
-MAP(0x49, 0x3A, 0x7049)  /* <CJK> */
-MAP(0x49, 0x3B, 0x704A)  /* <CJK> */
-MAP(0x49, 0x3C, 0x704B)  /* <CJK> */
-MAP(0x49, 0x3D, 0x7054)  /* <CJK> */
-MAP(0x49, 0x3E, 0x7055)  /* <CJK> */
-MAP(0x49, 0x3F, 0x705D)  /* <CJK> */
-MAP(0x49, 0x40, 0x705E)  /* <CJK> */
-MAP(0x49, 0x41, 0x704E)  /* <CJK> */
-MAP(0x49, 0x42, 0x7064)  /* <CJK> */
-MAP(0x49, 0x43, 0x7065)  /* <CJK> */
-MAP(0x49, 0x44, 0x706C)  /* <CJK> */
-MAP(0x49, 0x45, 0x706E)  /* <CJK> */
-MAP(0x49, 0x46, 0x7075)  /* <CJK> */
-MAP(0x49, 0x47, 0x7076)  /* <CJK> */
-MAP(0x49, 0x48, 0x707E)  /* <CJK> */
-MAP(0x49, 0x49, 0x7081)  /* <CJK> */
-MAP(0x49, 0x4A, 0x7085)  /* <CJK> */
-MAP(0x49, 0x4B, 0x7086)  /* <CJK> */
-MAP(0x49, 0x4C, 0x7094)  /* <CJK> */
-MAP(0x49, 0x4D, 0x7095)  /* <CJK> */
-MAP(0x49, 0x4E, 0x7096)  /* <CJK> */
-MAP(0x49, 0x4F, 0x7097)  /* <CJK> */
-MAP(0x49, 0x50, 0x7098)  /* <CJK> */
-MAP(0x49, 0x51, 0x709B)  /* <CJK> */
-MAP(0x49, 0x52, 0x70A4)  /* <CJK> */
-MAP(0x49, 0x53, 0x70AB)  /* <CJK> */
-MAP(0x49, 0x54, 0x70B0)  /* <CJK> */
-MAP(0x49, 0x55, 0x70B1)  /* <CJK> */
-MAP(0x49, 0x56, 0x70B4)  /* <CJK> */
-MAP(0x49, 0x57, 0x70B7)  /* <CJK> */
-MAP(0x49, 0x58, 0x70CA)  /* <CJK> */
-MAP(0x49, 0x59, 0x70D1)  /* <CJK> */
-MAP(0x49, 0x5A, 0x70D3)  /* <CJK> */
-MAP(0x49, 0x5B, 0x70D4)  /* <CJK> */
-MAP(0x49, 0x5C, 0x70D5)  /* <CJK> */
-MAP(0x49, 0x5D, 0x70D6)  /* <CJK> */
-MAP(0x49, 0x5E, 0x70D8)  /* <CJK> */
-MAP(0x49, 0x5F, 0x70DC)  /* <CJK> */
-MAP(0x49, 0x60, 0x70E4)  /* <CJK> */
-MAP(0x49, 0x61, 0x70FA)  /* <CJK> */
-MAP(0x49, 0x62, 0x7103)  /* <CJK> */
-MAP(0x49, 0x63, 0x7104)  /* <CJK> */
-MAP(0x49, 0x64, 0x7105)  /* <CJK> */
-MAP(0x49, 0x65, 0x7106)  /* <CJK> */
-MAP(0x49, 0x66, 0x7107)  /* <CJK> */
-MAP(0x49, 0x67, 0x710B)  /* <CJK> */
-MAP(0x49, 0x68, 0x710C)  /* <CJK> */
-MAP(0x49, 0x69, 0x710F)  /* <CJK> */
-MAP(0x49, 0x6A, 0x711E)  /* <CJK> */
-MAP(0x49, 0x6B, 0x7120)  /* <CJK> */
-MAP(0x49, 0x6C, 0x712B)  /* <CJK> */
-MAP(0x49, 0x6D, 0x712D)  /* <CJK> */
-MAP(0x49, 0x6E, 0x712F)  /* <CJK> */
-MAP(0x49, 0x6F, 0x7130)  /* <CJK> */
-MAP(0x49, 0x70, 0x7131)  /* <CJK> */
-MAP(0x49, 0x71, 0x7138)  /* <CJK> */
-MAP(0x49, 0x72, 0x7141)  /* <CJK> */
-MAP(0x49, 0x73, 0x7145)  /* <CJK> */
-MAP(0x49, 0x74, 0x7146)  /* <CJK> */
-MAP(0x49, 0x75, 0x7147)  /* <CJK> */
-MAP(0x49, 0x76, 0x714A)  /* <CJK> */
-MAP(0x49, 0x77, 0x714B)  /* <CJK> */
-MAP(0x49, 0x78, 0x7150)  /* <CJK> */
-MAP(0x49, 0x79, 0x7152)  /* <CJK> */
-MAP(0x49, 0x7A, 0x7157)  /* <CJK> */
-MAP(0x49, 0x7B, 0x715A)  /* <CJK> */
-MAP(0x49, 0x7C, 0x715C)  /* <CJK> */
-MAP(0x49, 0x7D, 0x715E)  /* <CJK> */
-MAP(0x49, 0x7E, 0x7160)  /* <CJK> */
-MAP(0x4A, 0x21, 0x7168)  /* <CJK> */
-MAP(0x4A, 0x22, 0x7179)  /* <CJK> */
-MAP(0x4A, 0x23, 0x7180)  /* <CJK> */
-MAP(0x4A, 0x24, 0x7185)  /* <CJK> */
-MAP(0x4A, 0x25, 0x7187)  /* <CJK> */
-MAP(0x4A, 0x26, 0x718C)  /* <CJK> */
-MAP(0x4A, 0x27, 0x7192)  /* <CJK> */
-MAP(0x4A, 0x28, 0x719A)  /* <CJK> */
-MAP(0x4A, 0x29, 0x719B)  /* <CJK> */
-MAP(0x4A, 0x2A, 0x71A0)  /* <CJK> */
-MAP(0x4A, 0x2B, 0x71A2)  /* <CJK> */
-MAP(0x4A, 0x2C, 0x71AF)  /* <CJK> */
-MAP(0x4A, 0x2D, 0x71B0)  /* <CJK> */
-MAP(0x4A, 0x2E, 0x71B2)  /* <CJK> */
-MAP(0x4A, 0x2F, 0x71B3)  /* <CJK> */
-MAP(0x4A, 0x30, 0x71BA)  /* <CJK> */
-MAP(0x4A, 0x31, 0x71BF)  /* <CJK> */
-MAP(0x4A, 0x32, 0x71C0)  /* <CJK> */
-MAP(0x4A, 0x33, 0x71C1)  /* <CJK> */
-MAP(0x4A, 0x34, 0x71C4)  /* <CJK> */
-MAP(0x4A, 0x35, 0x71CB)  /* <CJK> */
-MAP(0x4A, 0x36, 0x71CC)  /* <CJK> */
-MAP(0x4A, 0x37, 0x71D3)  /* <CJK> */
-MAP(0x4A, 0x38, 0x71D6)  /* <CJK> */
-MAP(0x4A, 0x39, 0x71D9)  /* <CJK> */
-MAP(0x4A, 0x3A, 0x71DA)  /* <CJK> */
-MAP(0x4A, 0x3B, 0x71DC)  /* <CJK> */
-MAP(0x4A, 0x3C, 0x71F8)  /* <CJK> */
-MAP(0x4A, 0x3D, 0x71FE)  /* <CJK> */
-MAP(0x4A, 0x3E, 0x7200)  /* <CJK> */
-MAP(0x4A, 0x3F, 0x7207)  /* <CJK> */
-MAP(0x4A, 0x40, 0x7208)  /* <CJK> */
-MAP(0x4A, 0x41, 0x7209)  /* <CJK> */
-MAP(0x4A, 0x42, 0x7213)  /* <CJK> */
-MAP(0x4A, 0x43, 0x7217)  /* <CJK> */
-MAP(0x4A, 0x44, 0x721A)  /* <CJK> */
-MAP(0x4A, 0x45, 0x721D)  /* <CJK> */
-MAP(0x4A, 0x46, 0x721F)  /* <CJK> */
-MAP(0x4A, 0x47, 0x7224)  /* <CJK> */
-MAP(0x4A, 0x48, 0x722B)  /* <CJK> */
-MAP(0x4A, 0x49, 0x722F)  /* <CJK> */
-MAP(0x4A, 0x4A, 0x7234)  /* <CJK> */
-MAP(0x4A, 0x4B, 0x7238)  /* <CJK> */
-MAP(0x4A, 0x4C, 0x7239)  /* <CJK> */
-MAP(0x4A, 0x4D, 0x7241)  /* <CJK> */
-MAP(0x4A, 0x4E, 0x7242)  /* <CJK> */
-MAP(0x4A, 0x4F, 0x7243)  /* <CJK> */
-MAP(0x4A, 0x50, 0x7245)  /* <CJK> */
-MAP(0x4A, 0x51, 0x724E)  /* <CJK> */
-MAP(0x4A, 0x52, 0x724F)  /* <CJK> */
-MAP(0x4A, 0x53, 0x7250)  /* <CJK> */
-MAP(0x4A, 0x54, 0x7253)  /* <CJK> */
-MAP(0x4A, 0x55, 0x7255)  /* <CJK> */
-MAP(0x4A, 0x56, 0x7256)  /* <CJK> */
-MAP(0x4A, 0x57, 0x725A)  /* <CJK> */
-MAP(0x4A, 0x58, 0x725C)  /* <CJK> */
-MAP(0x4A, 0x59, 0x725E)  /* <CJK> */
-MAP(0x4A, 0x5A, 0x7260)  /* <CJK> */
-MAP(0x4A, 0x5B, 0x7263)  /* <CJK> */
-MAP(0x4A, 0x5C, 0x7268)  /* <CJK> */
-MAP(0x4A, 0x5D, 0x726B)  /* <CJK> */
-MAP(0x4A, 0x5E, 0x726E)  /* <CJK> */
-MAP(0x4A, 0x5F, 0x726F)  /* <CJK> */
-MAP(0x4A, 0x60, 0x7271)  /* <CJK> */
-MAP(0x4A, 0x61, 0x7277)  /* <CJK> */
-MAP(0x4A, 0x62, 0x7278)  /* <CJK> */
-MAP(0x4A, 0x63, 0x727B)  /* <CJK> */
-MAP(0x4A, 0x64, 0x727C)  /* <CJK> */
-MAP(0x4A, 0x65, 0x727F)  /* <CJK> */
-MAP(0x4A, 0x66, 0x7284)  /* <CJK> */
-MAP(0x4A, 0x67, 0x7289)  /* <CJK> */
-MAP(0x4A, 0x68, 0x728D)  /* <CJK> */
-MAP(0x4A, 0x69, 0x728E)  /* <CJK> */
-MAP(0x4A, 0x6A, 0x7293)  /* <CJK> */
-MAP(0x4A, 0x6B, 0x729B)  /* <CJK> */
-MAP(0x4A, 0x6C, 0x72A8)  /* <CJK> */
-MAP(0x4A, 0x6D, 0x72AD)  /* <CJK> */
-MAP(0x4A, 0x6E, 0x72AE)  /* <CJK> */
-MAP(0x4A, 0x6F, 0x72B1)  /* <CJK> */
-MAP(0x4A, 0x70, 0x72B4)  /* <CJK> */
-MAP(0x4A, 0x71, 0x72BE)  /* <CJK> */
-MAP(0x4A, 0x72, 0x72C1)  /* <CJK> */
-MAP(0x4A, 0x73, 0x72C7)  /* <CJK> */
-MAP(0x4A, 0x74, 0x72C9)  /* <CJK> */
-MAP(0x4A, 0x75, 0x72CC)  /* <CJK> */
-MAP(0x4A, 0x76, 0x72D5)  /* <CJK> */
-MAP(0x4A, 0x77, 0x72D6)  /* <CJK> */
-MAP(0x4A, 0x78, 0x72D8)  /* <CJK> */
-MAP(0x4A, 0x79, 0x72DF)  /* <CJK> */
-MAP(0x4A, 0x7A, 0x72E5)  /* <CJK> */
-MAP(0x4A, 0x7B, 0x72F3)  /* <CJK> */
-MAP(0x4A, 0x7C, 0x72F4)  /* <CJK> */
-MAP(0x4A, 0x7D, 0x72FA)  /* <CJK> */
-MAP(0x4A, 0x7E, 0x72FB)  /* <CJK> */
-MAP(0x4B, 0x21, 0x72FE)  /* <CJK> */
-MAP(0x4B, 0x22, 0x7302)  /* <CJK> */
-MAP(0x4B, 0x23, 0x7304)  /* <CJK> */
-MAP(0x4B, 0x24, 0x7305)  /* <CJK> */
-MAP(0x4B, 0x25, 0x7307)  /* <CJK> */
-MAP(0x4B, 0x26, 0x730B)  /* <CJK> */
-MAP(0x4B, 0x27, 0x730D)  /* <CJK> */
-MAP(0x4B, 0x28, 0x7312)  /* <CJK> */
-MAP(0x4B, 0x29, 0x7313)  /* <CJK> */
-MAP(0x4B, 0x2A, 0x7318)  /* <CJK> */
-MAP(0x4B, 0x2B, 0x7319)  /* <CJK> */
-MAP(0x4B, 0x2C, 0x731E)  /* <CJK> */
-MAP(0x4B, 0x2D, 0x7322)  /* <CJK> */
-MAP(0x4B, 0x2E, 0x7324)  /* <CJK> */
-MAP(0x4B, 0x2F, 0x7327)  /* <CJK> */
-MAP(0x4B, 0x30, 0x7328)  /* <CJK> */
-MAP(0x4B, 0x31, 0x732C)  /* <CJK> */
-MAP(0x4B, 0x32, 0x7331)  /* <CJK> */
-MAP(0x4B, 0x33, 0x7332)  /* <CJK> */
-MAP(0x4B, 0x34, 0x7335)  /* <CJK> */
-MAP(0x4B, 0x35, 0x733A)  /* <CJK> */
-MAP(0x4B, 0x36, 0x733B)  /* <CJK> */
-MAP(0x4B, 0x37, 0x733D)  /* <CJK> */
-MAP(0x4B, 0x38, 0x7343)  /* <CJK> */
-MAP(0x4B, 0x39, 0x734D)  /* <CJK> */
-MAP(0x4B, 0x3A, 0x7350)  /* <CJK> */
-MAP(0x4B, 0x3B, 0x7352)  /* <CJK> */
-MAP(0x4B, 0x3C, 0x7356)  /* <CJK> */
-MAP(0x4B, 0x3D, 0x7358)  /* <CJK> */
-MAP(0x4B, 0x3E, 0x735D)  /* <CJK> */
-MAP(0x4B, 0x3F, 0x735E)  /* <CJK> */
-MAP(0x4B, 0x40, 0x735F)  /* <CJK> */
-MAP(0x4B, 0x41, 0x7360)  /* <CJK> */
-MAP(0x4B, 0x42, 0x7366)  /* <CJK> */
-MAP(0x4B, 0x43, 0x7367)  /* <CJK> */
-MAP(0x4B, 0x44, 0x7369)  /* <CJK> */
-MAP(0x4B, 0x45, 0x736B)  /* <CJK> */
-MAP(0x4B, 0x46, 0x736C)  /* <CJK> */
-MAP(0x4B, 0x47, 0x736E)  /* <CJK> */
-MAP(0x4B, 0x48, 0x736F)  /* <CJK> */
-MAP(0x4B, 0x49, 0x7371)  /* <CJK> */
-MAP(0x4B, 0x4A, 0x7377)  /* <CJK> */
-MAP(0x4B, 0x4B, 0x7379)  /* <CJK> */
-MAP(0x4B, 0x4C, 0x737C)  /* <CJK> */
-MAP(0x4B, 0x4D, 0x7380)  /* <CJK> */
-MAP(0x4B, 0x4E, 0x7381)  /* <CJK> */
-MAP(0x4B, 0x4F, 0x7383)  /* <CJK> */
-MAP(0x4B, 0x50, 0x7385)  /* <CJK> */
-MAP(0x4B, 0x51, 0x7386)  /* <CJK> */
-MAP(0x4B, 0x52, 0x738E)  /* <CJK> */
-MAP(0x4B, 0x53, 0x7390)  /* <CJK> */
-MAP(0x4B, 0x54, 0x7393)  /* <CJK> */
-MAP(0x4B, 0x55, 0x7395)  /* <CJK> */
-MAP(0x4B, 0x56, 0x7397)  /* <CJK> */
-MAP(0x4B, 0x57, 0x7398)  /* <CJK> */
-MAP(0x4B, 0x58, 0x739C)  /* <CJK> */
-MAP(0x4B, 0x59, 0x739E)  /* <CJK> */
-MAP(0x4B, 0x5A, 0x739F)  /* <CJK> */
-MAP(0x4B, 0x5B, 0x73A0)  /* <CJK> */
-MAP(0x4B, 0x5C, 0x73A2)  /* <CJK> */
-MAP(0x4B, 0x5D, 0x73A5)  /* <CJK> */
-MAP(0x4B, 0x5E, 0x73A6)  /* <CJK> */
-MAP(0x4B, 0x5F, 0x73AA)  /* <CJK> */
-MAP(0x4B, 0x60, 0x73AB)  /* <CJK> */
-MAP(0x4B, 0x61, 0x73AD)  /* <CJK> */
-MAP(0x4B, 0x62, 0x73B5)  /* <CJK> */
-MAP(0x4B, 0x63, 0x73B7)  /* <CJK> */
-MAP(0x4B, 0x64, 0x73B9)  /* <CJK> */
-MAP(0x4B, 0x65, 0x73BC)  /* <CJK> */
-MAP(0x4B, 0x66, 0x73BD)  /* <CJK> */
-MAP(0x4B, 0x67, 0x73BF)  /* <CJK> */
-MAP(0x4B, 0x68, 0x73C5)  /* <CJK> */
-MAP(0x4B, 0x69, 0x73C6)  /* <CJK> */
-MAP(0x4B, 0x6A, 0x73C9)  /* <CJK> */
-MAP(0x4B, 0x6B, 0x73CB)  /* <CJK> */
-MAP(0x4B, 0x6C, 0x73CC)  /* <CJK> */
-MAP(0x4B, 0x6D, 0x73CF)  /* <CJK> */
-MAP(0x4B, 0x6E, 0x73D2)  /* <CJK> */
-MAP(0x4B, 0x6F, 0x73D3)  /* <CJK> */
-MAP(0x4B, 0x70, 0x73D6)  /* <CJK> */
-MAP(0x4B, 0x71, 0x73D9)  /* <CJK> */
-MAP(0x4B, 0x72, 0x73DD)  /* <CJK> */
-MAP(0x4B, 0x73, 0x73E1)  /* <CJK> */
-MAP(0x4B, 0x74, 0x73E3)  /* <CJK> */
-MAP(0x4B, 0x75, 0x73E6)  /* <CJK> */
-MAP(0x4B, 0x76, 0x73E7)  /* <CJK> */
-MAP(0x4B, 0x77, 0x73E9)  /* <CJK> */
-MAP(0x4B, 0x78, 0x73F4)  /* <CJK> */
-MAP(0x4B, 0x79, 0x73F5)  /* <CJK> */
-MAP(0x4B, 0x7A, 0x73F7)  /* <CJK> */
-MAP(0x4B, 0x7B, 0x73F9)  /* <CJK> */
-MAP(0x4B, 0x7C, 0x73FA)  /* <CJK> */
-MAP(0x4B, 0x7D, 0x73FB)  /* <CJK> */
-MAP(0x4B, 0x7E, 0x73FD)  /* <CJK> */
-MAP(0x4C, 0x21, 0x73FF)  /* <CJK> */
-MAP(0x4C, 0x22, 0x7400)  /* <CJK> */
-MAP(0x4C, 0x23, 0x7401)  /* <CJK> */
-MAP(0x4C, 0x24, 0x7404)  /* <CJK> */
-MAP(0x4C, 0x25, 0x7407)  /* <CJK> */
-MAP(0x4C, 0x26, 0x740A)  /* <CJK> */
-MAP(0x4C, 0x27, 0x7411)  /* <CJK> */
-MAP(0x4C, 0x28, 0x741A)  /* <CJK> */
-MAP(0x4C, 0x29, 0x741B)  /* <CJK> */
-MAP(0x4C, 0x2A, 0x7424)  /* <CJK> */
-MAP(0x4C, 0x2B, 0x7426)  /* <CJK> */
-MAP(0x4C, 0x2C, 0x7428)  /* <CJK> */
-MAP(0x4C, 0x2D, 0x7429)  /* <CJK> */
-MAP(0x4C, 0x2E, 0x742A)  /* <CJK> */
-MAP(0x4C, 0x2F, 0x742B)  /* <CJK> */
-MAP(0x4C, 0x30, 0x742C)  /* <CJK> */
-MAP(0x4C, 0x31, 0x742D)  /* <CJK> */
-MAP(0x4C, 0x32, 0x742E)  /* <CJK> */
-MAP(0x4C, 0x33, 0x742F)  /* <CJK> */
-MAP(0x4C, 0x34, 0x7430)  /* <CJK> */
-MAP(0x4C, 0x35, 0x7431)  /* <CJK> */
-MAP(0x4C, 0x36, 0x7439)  /* <CJK> */
-MAP(0x4C, 0x37, 0x7440)  /* <CJK> */
-MAP(0x4C, 0x38, 0x7443)  /* <CJK> */
-MAP(0x4C, 0x39, 0x7444)  /* <CJK> */
-MAP(0x4C, 0x3A, 0x7446)  /* <CJK> */
-MAP(0x4C, 0x3B, 0x7447)  /* <CJK> */
-MAP(0x4C, 0x3C, 0x744B)  /* <CJK> */
-MAP(0x4C, 0x3D, 0x744D)  /* <CJK> */
-MAP(0x4C, 0x3E, 0x7451)  /* <CJK> */
-MAP(0x4C, 0x3F, 0x7452)  /* <CJK> */
-MAP(0x4C, 0x40, 0x7457)  /* <CJK> */
-MAP(0x4C, 0x41, 0x745D)  /* <CJK> */
-MAP(0x4C, 0x42, 0x7462)  /* <CJK> */
-MAP(0x4C, 0x43, 0x7466)  /* <CJK> */
-MAP(0x4C, 0x44, 0x7467)  /* <CJK> */
-MAP(0x4C, 0x45, 0x7468)  /* <CJK> */
-MAP(0x4C, 0x46, 0x746B)  /* <CJK> */
-MAP(0x4C, 0x47, 0x746D)  /* <CJK> */
-MAP(0x4C, 0x48, 0x746E)  /* <CJK> */
-MAP(0x4C, 0x49, 0x7471)  /* <CJK> */
-MAP(0x4C, 0x4A, 0x7472)  /* <CJK> */
-MAP(0x4C, 0x4B, 0x7480)  /* <CJK> */
-MAP(0x4C, 0x4C, 0x7481)  /* <CJK> */
-MAP(0x4C, 0x4D, 0x7485)  /* <CJK> */
-MAP(0x4C, 0x4E, 0x7486)  /* <CJK> */
-MAP(0x4C, 0x4F, 0x7487)  /* <CJK> */
-MAP(0x4C, 0x50, 0x7489)  /* <CJK> */
-MAP(0x4C, 0x51, 0x748F)  /* <CJK> */
-MAP(0x4C, 0x52, 0x7490)  /* <CJK> */
-MAP(0x4C, 0x53, 0x7491)  /* <CJK> */
-MAP(0x4C, 0x54, 0x7492)  /* <CJK> */
-MAP(0x4C, 0x55, 0x7498)  /* <CJK> */
-MAP(0x4C, 0x56, 0x7499)  /* <CJK> */
-MAP(0x4C, 0x57, 0x749A)  /* <CJK> */
-MAP(0x4C, 0x58, 0x749C)  /* <CJK> */
-MAP(0x4C, 0x59, 0x749F)  /* <CJK> */
-MAP(0x4C, 0x5A, 0x74A0)  /* <CJK> */
-MAP(0x4C, 0x5B, 0x74A1)  /* <CJK> */
-MAP(0x4C, 0x5C, 0x74A3)  /* <CJK> */
-MAP(0x4C, 0x5D, 0x74A6)  /* <CJK> */
-MAP(0x4C, 0x5E, 0x74A8)  /* <CJK> */
-MAP(0x4C, 0x5F, 0x74A9)  /* <CJK> */
-MAP(0x4C, 0x60, 0x74AA)  /* <CJK> */
-MAP(0x4C, 0x61, 0x74AB)  /* <CJK> */
-MAP(0x4C, 0x62, 0x74AE)  /* <CJK> */
-MAP(0x4C, 0x63, 0x74AF)  /* <CJK> */
-MAP(0x4C, 0x64, 0x74B1)  /* <CJK> */
-MAP(0x4C, 0x65, 0x74B2)  /* <CJK> */
-MAP(0x4C, 0x66, 0x74B5)  /* <CJK> */
-MAP(0x4C, 0x67, 0x74B9)  /* <CJK> */
-MAP(0x4C, 0x68, 0x74BB)  /* <CJK> */
-MAP(0x4C, 0x69, 0x74BF)  /* <CJK> */
-MAP(0x4C, 0x6A, 0x74C8)  /* <CJK> */
-MAP(0x4C, 0x6B, 0x74C9)  /* <CJK> */
-MAP(0x4C, 0x6C, 0x74CC)  /* <CJK> */
-MAP(0x4C, 0x6D, 0x74D0)  /* <CJK> */
-MAP(0x4C, 0x6E, 0x74D3)  /* <CJK> */
-MAP(0x4C, 0x6F, 0x74D8)  /* <CJK> */
-MAP(0x4C, 0x70, 0x74DA)  /* <CJK> */
-MAP(0x4C, 0x71, 0x74DB)  /* <CJK> */
-MAP(0x4C, 0x72, 0x74DE)  /* <CJK> */
-MAP(0x4C, 0x73, 0x74DF)  /* <CJK> */
-MAP(0x4C, 0x74, 0x74E4)  /* <CJK> */
-MAP(0x4C, 0x75, 0x74E8)  /* <CJK> */
-MAP(0x4C, 0x76, 0x74EA)  /* <CJK> */
-MAP(0x4C, 0x77, 0x74EB)  /* <CJK> */
-MAP(0x4C, 0x78, 0x74EF)  /* <CJK> */
-MAP(0x4C, 0x79, 0x74F4)  /* <CJK> */
-MAP(0x4C, 0x7A, 0x74FA)  /* <CJK> */
-MAP(0x4C, 0x7B, 0x74FB)  /* <CJK> */
-MAP(0x4C, 0x7C, 0x74FC)  /* <CJK> */
-MAP(0x4C, 0x7D, 0x74FF)  /* <CJK> */
-MAP(0x4C, 0x7E, 0x7506)  /* <CJK> */
-MAP(0x4D, 0x21, 0x7512)  /* <CJK> */
-MAP(0x4D, 0x22, 0x7516)  /* <CJK> */
-MAP(0x4D, 0x23, 0x7517)  /* <CJK> */
-MAP(0x4D, 0x24, 0x7520)  /* <CJK> */
-MAP(0x4D, 0x25, 0x7521)  /* <CJK> */
-MAP(0x4D, 0x26, 0x7524)  /* <CJK> */
-MAP(0x4D, 0x27, 0x7527)  /* <CJK> */
-MAP(0x4D, 0x28, 0x7529)  /* <CJK> */
-MAP(0x4D, 0x29, 0x752A)  /* <CJK> */
-MAP(0x4D, 0x2A, 0x752F)  /* <CJK> */
-MAP(0x4D, 0x2B, 0x7536)  /* <CJK> */
-MAP(0x4D, 0x2C, 0x7539)  /* <CJK> */
-MAP(0x4D, 0x2D, 0x753D)  /* <CJK> */
-MAP(0x4D, 0x2E, 0x753E)  /* <CJK> */
-MAP(0x4D, 0x2F, 0x753F)  /* <CJK> */
-MAP(0x4D, 0x30, 0x7540)  /* <CJK> */
-MAP(0x4D, 0x31, 0x7543)  /* <CJK> */
-MAP(0x4D, 0x32, 0x7547)  /* <CJK> */
-MAP(0x4D, 0x33, 0x7548)  /* <CJK> */
-MAP(0x4D, 0x34, 0x754E)  /* <CJK> */
-MAP(0x4D, 0x35, 0x7550)  /* <CJK> */
-MAP(0x4D, 0x36, 0x7552)  /* <CJK> */
-MAP(0x4D, 0x37, 0x7557)  /* <CJK> */
-MAP(0x4D, 0x38, 0x755E)  /* <CJK> */
-MAP(0x4D, 0x39, 0x755F)  /* <CJK> */
-MAP(0x4D, 0x3A, 0x7561)  /* <CJK> */
-MAP(0x4D, 0x3B, 0x756F)  /* <CJK> */
-MAP(0x4D, 0x3C, 0x7571)  /* <CJK> */
-MAP(0x4D, 0x3D, 0x7579)  /* <CJK> */
-MAP(0x4D, 0x3E, 0x757A)  /* <CJK> */
-MAP(0x4D, 0x3F, 0x757B)  /* <CJK> */
-MAP(0x4D, 0x40, 0x757C)  /* <CJK> */
-MAP(0x4D, 0x41, 0x757D)  /* <CJK> */
-MAP(0x4D, 0x42, 0x757E)  /* <CJK> */
-MAP(0x4D, 0x43, 0x7581)  /* <CJK> */
-MAP(0x4D, 0x44, 0x7585)  /* <CJK> */
-MAP(0x4D, 0x45, 0x7590)  /* <CJK> */
-MAP(0x4D, 0x46, 0x7592)  /* <CJK> */
-MAP(0x4D, 0x47, 0x7593)  /* <CJK> */
-MAP(0x4D, 0x48, 0x7595)  /* <CJK> */
-MAP(0x4D, 0x49, 0x7599)  /* <CJK> */
-MAP(0x4D, 0x4A, 0x759C)  /* <CJK> */
-MAP(0x4D, 0x4B, 0x75A2)  /* <CJK> */
-MAP(0x4D, 0x4C, 0x75A4)  /* <CJK> */
-MAP(0x4D, 0x4D, 0x75B4)  /* <CJK> */
-MAP(0x4D, 0x4E, 0x75BA)  /* <CJK> */
-MAP(0x4D, 0x4F, 0x75BF)  /* <CJK> */
-MAP(0x4D, 0x50, 0x75C0)  /* <CJK> */
-MAP(0x4D, 0x51, 0x75C1)  /* <CJK> */
-MAP(0x4D, 0x52, 0x75C4)  /* <CJK> */
-MAP(0x4D, 0x53, 0x75C6)  /* <CJK> */
-MAP(0x4D, 0x54, 0x75CC)  /* <CJK> */
-MAP(0x4D, 0x55, 0x75CE)  /* <CJK> */
-MAP(0x4D, 0x56, 0x75CF)  /* <CJK> */
-MAP(0x4D, 0x57, 0x75D7)  /* <CJK> */
-MAP(0x4D, 0x58, 0x75DC)  /* <CJK> */
-MAP(0x4D, 0x59, 0x75DF)  /* <CJK> */
-MAP(0x4D, 0x5A, 0x75E0)  /* <CJK> */
-MAP(0x4D, 0x5B, 0x75E1)  /* <CJK> */
-MAP(0x4D, 0x5C, 0x75E4)  /* <CJK> */
-MAP(0x4D, 0x5D, 0x75E7)  /* <CJK> */
-MAP(0x4D, 0x5E, 0x75EC)  /* <CJK> */
-MAP(0x4D, 0x5F, 0x75EE)  /* <CJK> */
-MAP(0x4D, 0x60, 0x75EF)  /* <CJK> */
-MAP(0x4D, 0x61, 0x75F1)  /* <CJK> */
-MAP(0x4D, 0x62, 0x75F9)  /* <CJK> */
-MAP(0x4D, 0x63, 0x7600)  /* <CJK> */
-MAP(0x4D, 0x64, 0x7602)  /* <CJK> */
-MAP(0x4D, 0x65, 0x7603)  /* <CJK> */
-MAP(0x4D, 0x66, 0x7604)  /* <CJK> */
-MAP(0x4D, 0x67, 0x7607)  /* <CJK> */
-MAP(0x4D, 0x68, 0x7608)  /* <CJK> */
-MAP(0x4D, 0x69, 0x760A)  /* <CJK> */
-MAP(0x4D, 0x6A, 0x760C)  /* <CJK> */
-MAP(0x4D, 0x6B, 0x760F)  /* <CJK> */
-MAP(0x4D, 0x6C, 0x7612)  /* <CJK> */
-MAP(0x4D, 0x6D, 0x7613)  /* <CJK> */
-MAP(0x4D, 0x6E, 0x7615)  /* <CJK> */
-MAP(0x4D, 0x6F, 0x7616)  /* <CJK> */
-MAP(0x4D, 0x70, 0x7619)  /* <CJK> */
-MAP(0x4D, 0x71, 0x761B)  /* <CJK> */
-MAP(0x4D, 0x72, 0x761C)  /* <CJK> */
-MAP(0x4D, 0x73, 0x761D)  /* <CJK> */
-MAP(0x4D, 0x74, 0x761E)  /* <CJK> */
-MAP(0x4D, 0x75, 0x7623)  /* <CJK> */
-MAP(0x4D, 0x76, 0x7625)  /* <CJK> */
-MAP(0x4D, 0x77, 0x7626)  /* <CJK> */
-MAP(0x4D, 0x78, 0x7629)  /* <CJK> */
-MAP(0x4D, 0x79, 0x762D)  /* <CJK> */
-MAP(0x4D, 0x7A, 0x7632)  /* <CJK> */
-MAP(0x4D, 0x7B, 0x7633)  /* <CJK> */
-MAP(0x4D, 0x7C, 0x7635)  /* <CJK> */
-MAP(0x4D, 0x7D, 0x7638)  /* <CJK> */
-MAP(0x4D, 0x7E, 0x7639)  /* <CJK> */
-MAP(0x4E, 0x21, 0x763A)  /* <CJK> */
-MAP(0x4E, 0x22, 0x763C)  /* <CJK> */
-MAP(0x4E, 0x23, 0x764A)  /* <CJK> */
-MAP(0x4E, 0x24, 0x7640)  /* <CJK> */
-MAP(0x4E, 0x25, 0x7641)  /* <CJK> */
-MAP(0x4E, 0x26, 0x7643)  /* <CJK> */
-MAP(0x4E, 0x27, 0x7644)  /* <CJK> */
-MAP(0x4E, 0x28, 0x7645)  /* <CJK> */
-MAP(0x4E, 0x29, 0x7649)  /* <CJK> */
-MAP(0x4E, 0x2A, 0x764B)  /* <CJK> */
-MAP(0x4E, 0x2B, 0x7655)  /* <CJK> */
-MAP(0x4E, 0x2C, 0x7659)  /* <CJK> */
-MAP(0x4E, 0x2D, 0x765F)  /* <CJK> */
-MAP(0x4E, 0x2E, 0x7664)  /* <CJK> */
-MAP(0x4E, 0x2F, 0x7665)  /* <CJK> */
-MAP(0x4E, 0x30, 0x766D)  /* <CJK> */
-MAP(0x4E, 0x31, 0x766E)  /* <CJK> */
-MAP(0x4E, 0x32, 0x766F)  /* <CJK> */
-MAP(0x4E, 0x33, 0x7671)  /* <CJK> */
-MAP(0x4E, 0x34, 0x7674)  /* <CJK> */
-MAP(0x4E, 0x35, 0x7681)  /* <CJK> */
-MAP(0x4E, 0x36, 0x7685)  /* <CJK> */
-MAP(0x4E, 0x37, 0x768C)  /* <CJK> */
-MAP(0x4E, 0x38, 0x768D)  /* <CJK> */
-MAP(0x4E, 0x39, 0x7695)  /* <CJK> */
-MAP(0x4E, 0x3A, 0x769B)  /* <CJK> */
-MAP(0x4E, 0x3B, 0x769C)  /* <CJK> */
-MAP(0x4E, 0x3C, 0x769D)  /* <CJK> */
-MAP(0x4E, 0x3D, 0x769F)  /* <CJK> */
-MAP(0x4E, 0x3E, 0x76A0)  /* <CJK> */
-MAP(0x4E, 0x3F, 0x76A2)  /* <CJK> */
-MAP(0x4E, 0x40, 0x76A3)  /* <CJK> */
-MAP(0x4E, 0x41, 0x76A4)  /* <CJK> */
-MAP(0x4E, 0x42, 0x76A5)  /* <CJK> */
-MAP(0x4E, 0x43, 0x76A6)  /* <CJK> */
-MAP(0x4E, 0x44, 0x76A7)  /* <CJK> */
-MAP(0x4E, 0x45, 0x76A8)  /* <CJK> */
-MAP(0x4E, 0x46, 0x76AA)  /* <CJK> */
-MAP(0x4E, 0x47, 0x76AD)  /* <CJK> */
-MAP(0x4E, 0x48, 0x76BD)  /* <CJK> */
-MAP(0x4E, 0x49, 0x76C1)  /* <CJK> */
-MAP(0x4E, 0x4A, 0x76C5)  /* <CJK> */
-MAP(0x4E, 0x4B, 0x76C9)  /* <CJK> */
-MAP(0x4E, 0x4C, 0x76CB)  /* <CJK> */
-MAP(0x4E, 0x4D, 0x76CC)  /* <CJK> */
-MAP(0x4E, 0x4E, 0x76CE)  /* <CJK> */
-MAP(0x4E, 0x4F, 0x76D4)  /* <CJK> */
-MAP(0x4E, 0x50, 0x76D9)  /* <CJK> */
-MAP(0x4E, 0x51, 0x76E0)  /* <CJK> */
-MAP(0x4E, 0x52, 0x76E6)  /* <CJK> */
-MAP(0x4E, 0x53, 0x76E8)  /* <CJK> */
-MAP(0x4E, 0x54, 0x76EC)  /* <CJK> */
-MAP(0x4E, 0x55, 0x76F0)  /* <CJK> */
-MAP(0x4E, 0x56, 0x76F1)  /* <CJK> */
-MAP(0x4E, 0x57, 0x76F6)  /* <CJK> */
-MAP(0x4E, 0x58, 0x76F9)  /* <CJK> */
-MAP(0x4E, 0x59, 0x76FC)  /* <CJK> */
-MAP(0x4E, 0x5A, 0x7700)  /* <CJK> */
-MAP(0x4E, 0x5B, 0x7706)  /* <CJK> */
-MAP(0x4E, 0x5C, 0x770A)  /* <CJK> */
-MAP(0x4E, 0x5D, 0x770E)  /* <CJK> */
-MAP(0x4E, 0x5E, 0x7712)  /* <CJK> */
-MAP(0x4E, 0x5F, 0x7714)  /* <CJK> */
-MAP(0x4E, 0x60, 0x7715)  /* <CJK> */
-MAP(0x4E, 0x61, 0x7717)  /* <CJK> */
-MAP(0x4E, 0x62, 0x7719)  /* <CJK> */
-MAP(0x4E, 0x63, 0x771A)  /* <CJK> */
-MAP(0x4E, 0x64, 0x771C)  /* <CJK> */
-MAP(0x4E, 0x65, 0x7722)  /* <CJK> */
-MAP(0x4E, 0x66, 0x7728)  /* <CJK> */
-MAP(0x4E, 0x67, 0x772D)  /* <CJK> */
-MAP(0x4E, 0x68, 0x772E)  /* <CJK> */
-MAP(0x4E, 0x69, 0x772F)  /* <CJK> */
-MAP(0x4E, 0x6A, 0x7734)  /* <CJK> */
-MAP(0x4E, 0x6B, 0x7735)  /* <CJK> */
-MAP(0x4E, 0x6C, 0x7736)  /* <CJK> */
-MAP(0x4E, 0x6D, 0x7739)  /* <CJK> */
-MAP(0x4E, 0x6E, 0x773D)  /* <CJK> */
-MAP(0x4E, 0x6F, 0x773E)  /* <CJK> */
-MAP(0x4E, 0x70, 0x7742)  /* <CJK> */
-MAP(0x4E, 0x71, 0x7745)  /* <CJK> */
-MAP(0x4E, 0x72, 0x7746)  /* <CJK> */
-MAP(0x4E, 0x73, 0x774A)  /* <CJK> */
-MAP(0x4E, 0x74, 0x774D)  /* <CJK> */
-MAP(0x4E, 0x75, 0x774E)  /* <CJK> */
-MAP(0x4E, 0x76, 0x774F)  /* <CJK> */
-MAP(0x4E, 0x77, 0x7752)  /* <CJK> */
-MAP(0x4E, 0x78, 0x7756)  /* <CJK> */
-MAP(0x4E, 0x79, 0x7757)  /* <CJK> */
-MAP(0x4E, 0x7A, 0x775C)  /* <CJK> */
-MAP(0x4E, 0x7B, 0x775E)  /* <CJK> */
-MAP(0x4E, 0x7C, 0x775F)  /* <CJK> */
-MAP(0x4E, 0x7D, 0x7760)  /* <CJK> */
-MAP(0x4E, 0x7E, 0x7762)  /* <CJK> */
-MAP(0x4F, 0x21, 0x7764)  /* <CJK> */
-MAP(0x4F, 0x22, 0x7767)  /* <CJK> */
-MAP(0x4F, 0x23, 0x776A)  /* <CJK> */
-MAP(0x4F, 0x24, 0x776C)  /* <CJK> */
-MAP(0x4F, 0x25, 0x7770)  /* <CJK> */
-MAP(0x4F, 0x26, 0x7772)  /* <CJK> */
-MAP(0x4F, 0x27, 0x7773)  /* <CJK> */
-MAP(0x4F, 0x28, 0x7774)  /* <CJK> */
-MAP(0x4F, 0x29, 0x777A)  /* <CJK> */
-MAP(0x4F, 0x2A, 0x777D)  /* <CJK> */
-MAP(0x4F, 0x2B, 0x7780)  /* <CJK> */
-MAP(0x4F, 0x2C, 0x7784)  /* <CJK> */
-MAP(0x4F, 0x2D, 0x778C)  /* <CJK> */
-MAP(0x4F, 0x2E, 0x778D)  /* <CJK> */
-MAP(0x4F, 0x2F, 0x7794)  /* <CJK> */
-MAP(0x4F, 0x30, 0x7795)  /* <CJK> */
-MAP(0x4F, 0x31, 0x7796)  /* <CJK> */
-MAP(0x4F, 0x32, 0x779A)  /* <CJK> */
-MAP(0x4F, 0x33, 0x779F)  /* <CJK> */
-MAP(0x4F, 0x34, 0x77A2)  /* <CJK> */
-MAP(0x4F, 0x35, 0x77A7)  /* <CJK> */
-MAP(0x4F, 0x36, 0x77AA)  /* <CJK> */
-MAP(0x4F, 0x37, 0x77AE)  /* <CJK> */
-MAP(0x4F, 0x38, 0x77AF)  /* <CJK> */
-MAP(0x4F, 0x39, 0x77B1)  /* <CJK> */
-MAP(0x4F, 0x3A, 0x77B5)  /* <CJK> */
-MAP(0x4F, 0x3B, 0x77BE)  /* <CJK> */
-MAP(0x4F, 0x3C, 0x77C3)  /* <CJK> */
-MAP(0x4F, 0x3D, 0x77C9)  /* <CJK> */
-MAP(0x4F, 0x3E, 0x77D1)  /* <CJK> */
-MAP(0x4F, 0x3F, 0x77D2)  /* <CJK> */
-MAP(0x4F, 0x40, 0x77D5)  /* <CJK> */
-MAP(0x4F, 0x41, 0x77D9)  /* <CJK> */
-MAP(0x4F, 0x42, 0x77DE)  /* <CJK> */
-MAP(0x4F, 0x43, 0x77DF)  /* <CJK> */
-MAP(0x4F, 0x44, 0x77E0)  /* <CJK> */
-MAP(0x4F, 0x45, 0x77E4)  /* <CJK> */
-MAP(0x4F, 0x46, 0x77E6)  /* <CJK> */
-MAP(0x4F, 0x47, 0x77EA)  /* <CJK> */
-MAP(0x4F, 0x48, 0x77EC)  /* <CJK> */
-MAP(0x4F, 0x49, 0x77F0)  /* <CJK> */
-MAP(0x4F, 0x4A, 0x77F1)  /* <CJK> */
-MAP(0x4F, 0x4B, 0x77F4)  /* <CJK> */
-MAP(0x4F, 0x4C, 0x77F8)  /* <CJK> */
-MAP(0x4F, 0x4D, 0x77FB)  /* <CJK> */
-MAP(0x4F, 0x4E, 0x7805)  /* <CJK> */
-MAP(0x4F, 0x4F, 0x7806)  /* <CJK> */
-MAP(0x4F, 0x50, 0x7809)  /* <CJK> */
-MAP(0x4F, 0x51, 0x780D)  /* <CJK> */
-MAP(0x4F, 0x52, 0x780E)  /* <CJK> */
-MAP(0x4F, 0x53, 0x7811)  /* <CJK> */
-MAP(0x4F, 0x54, 0x781D)  /* <CJK> */
-MAP(0x4F, 0x55, 0x7821)  /* <CJK> */
-MAP(0x4F, 0x56, 0x7822)  /* <CJK> */
-MAP(0x4F, 0x57, 0x7823)  /* <CJK> */
-MAP(0x4F, 0x58, 0x782D)  /* <CJK> */
-MAP(0x4F, 0x59, 0x782E)  /* <CJK> */
-MAP(0x4F, 0x5A, 0x7830)  /* <CJK> */
-MAP(0x4F, 0x5B, 0x7835)  /* <CJK> */
-MAP(0x4F, 0x5C, 0x7837)  /* <CJK> */
-MAP(0x4F, 0x5D, 0x7843)  /* <CJK> */
-MAP(0x4F, 0x5E, 0x7844)  /* <CJK> */
-MAP(0x4F, 0x5F, 0x7847)  /* <CJK> */
-MAP(0x4F, 0x60, 0x7848)  /* <CJK> */
-MAP(0x4F, 0x61, 0x784C)  /* <CJK> */
-MAP(0x4F, 0x62, 0x784E)  /* <CJK> */
-MAP(0x4F, 0x63, 0x7852)  /* <CJK> */
-MAP(0x4F, 0x64, 0x785C)  /* <CJK> */
-MAP(0x4F, 0x65, 0x785E)  /* <CJK> */
-MAP(0x4F, 0x66, 0x7860)  /* <CJK> */
-MAP(0x4F, 0x67, 0x7861)  /* <CJK> */
-MAP(0x4F, 0x68, 0x7863)  /* <CJK> */
-MAP(0x4F, 0x69, 0x7864)  /* <CJK> */
-MAP(0x4F, 0x6A, 0x7868)  /* <CJK> */
-MAP(0x4F, 0x6B, 0x786A)  /* <CJK> */
-MAP(0x4F, 0x6C, 0x786E)  /* <CJK> */
-MAP(0x4F, 0x6D, 0x787A)  /* <CJK> */
-MAP(0x4F, 0x6E, 0x787E)  /* <CJK> */
-MAP(0x4F, 0x6F, 0x788A)  /* <CJK> */
-MAP(0x4F, 0x70, 0x788F)  /* <CJK> */
-MAP(0x4F, 0x71, 0x7894)  /* <CJK> */
-MAP(0x4F, 0x72, 0x7898)  /* <CJK> */
-MAP(0x4F, 0x73, 0x78A1)  /* <CJK> */
-MAP(0x4F, 0x74, 0x789D)  /* <CJK> */
-MAP(0x4F, 0x75, 0x789E)  /* <CJK> */
-MAP(0x4F, 0x76, 0x789F)  /* <CJK> */
-MAP(0x4F, 0x77, 0x78A4)  /* <CJK> */
-MAP(0x4F, 0x78, 0x78A8)  /* <CJK> */
-MAP(0x4F, 0x79, 0x78AC)  /* <CJK> */
-MAP(0x4F, 0x7A, 0x78AD)  /* <CJK> */
-MAP(0x4F, 0x7B, 0x78B0)  /* <CJK> */
-MAP(0x4F, 0x7C, 0x78B1)  /* <CJK> */
-MAP(0x4F, 0x7D, 0x78B2)  /* <CJK> */
-MAP(0x4F, 0x7E, 0x78B3)  /* <CJK> */
-MAP(0x50, 0x21, 0x78BB)  /* <CJK> */
-MAP(0x50, 0x22, 0x78BD)  /* <CJK> */
-MAP(0x50, 0x23, 0x78BF)  /* <CJK> */
-MAP(0x50, 0x24, 0x78C7)  /* <CJK> */
-MAP(0x50, 0x25, 0x78C8)  /* <CJK> */
-MAP(0x50, 0x26, 0x78C9)  /* <CJK> */
-MAP(0x50, 0x27, 0x78CC)  /* <CJK> */
-MAP(0x50, 0x28, 0x78CE)  /* <CJK> */
-MAP(0x50, 0x29, 0x78D2)  /* <CJK> */
-MAP(0x50, 0x2A, 0x78D3)  /* <CJK> */
-MAP(0x50, 0x2B, 0x78D5)  /* <CJK> */
-MAP(0x50, 0x2C, 0x78D6)  /* <CJK> */
-MAP(0x50, 0x2D, 0x78E4)  /* <CJK> */
-MAP(0x50, 0x2E, 0x78DB)  /* <CJK> */
-MAP(0x50, 0x2F, 0x78DF)  /* <CJK> */
-MAP(0x50, 0x30, 0x78E0)  /* <CJK> */
-MAP(0x50, 0x31, 0x78E1)  /* <CJK> */
-MAP(0x50, 0x32, 0x78E6)  /* <CJK> */
-MAP(0x50, 0x33, 0x78EA)  /* <CJK> */
-MAP(0x50, 0x34, 0x78F2)  /* <CJK> */
-MAP(0x50, 0x35, 0x78F3)  /* <CJK> */
-MAP(0x50, 0x36, 0x7900)  /* <CJK> */
-MAP(0x50, 0x37, 0x78F6)  /* <CJK> */
-MAP(0x50, 0x38, 0x78F7)  /* <CJK> */
-MAP(0x50, 0x39, 0x78FA)  /* <CJK> */
-MAP(0x50, 0x3A, 0x78FB)  /* <CJK> */
-MAP(0x50, 0x3B, 0x78FF)  /* <CJK> */
-MAP(0x50, 0x3C, 0x7906)  /* <CJK> */
-MAP(0x50, 0x3D, 0x790C)  /* <CJK> */
-MAP(0x50, 0x3E, 0x7910)  /* <CJK> */
-MAP(0x50, 0x3F, 0x791A)  /* <CJK> */
-MAP(0x50, 0x40, 0x791C)  /* <CJK> */
-MAP(0x50, 0x41, 0x791E)  /* <CJK> */
-MAP(0x50, 0x42, 0x791F)  /* <CJK> */
-MAP(0x50, 0x43, 0x7920)  /* <CJK> */
-MAP(0x50, 0x44, 0x7925)  /* <CJK> */
-MAP(0x50, 0x45, 0x7927)  /* <CJK> */
-MAP(0x50, 0x46, 0x7929)  /* <CJK> */
-MAP(0x50, 0x47, 0x792D)  /* <CJK> */
-MAP(0x50, 0x48, 0x7931)  /* <CJK> */
-MAP(0x50, 0x49, 0x7934)  /* <CJK> */
-MAP(0x50, 0x4A, 0x7935)  /* <CJK> */
-MAP(0x50, 0x4B, 0x793B)  /* <CJK> */
-MAP(0x50, 0x4C, 0x793D)  /* <CJK> */
-MAP(0x50, 0x4D, 0x793F)  /* <CJK> */
-MAP(0x50, 0x4E, 0x7944)  /* <CJK> */
-MAP(0x50, 0x4F, 0x7945)  /* <CJK> */
-MAP(0x50, 0x50, 0x7946)  /* <CJK> */
-MAP(0x50, 0x51, 0x794A)  /* <CJK> */
-MAP(0x50, 0x52, 0x794B)  /* <CJK> */
-MAP(0x50, 0x53, 0x794F)  /* <CJK> */
-MAP(0x50, 0x54, 0x7951)  /* <CJK> */
-MAP(0x50, 0x55, 0x7954)  /* <CJK> */
-MAP(0x50, 0x56, 0x7958)  /* <CJK> */
-MAP(0x50, 0x57, 0x795B)  /* <CJK> */
-MAP(0x50, 0x58, 0x795C)  /* <CJK> */
-MAP(0x50, 0x59, 0x7967)  /* <CJK> */
-MAP(0x50, 0x5A, 0x7969)  /* <CJK> */
-MAP(0x50, 0x5B, 0x796B)  /* <CJK> */
-MAP(0x50, 0x5C, 0x7972)  /* <CJK> */
-MAP(0x50, 0x5D, 0x7979)  /* <CJK> */
-MAP(0x50, 0x5E, 0x797B)  /* <CJK> */
-MAP(0x50, 0x5F, 0x797C)  /* <CJK> */
-MAP(0x50, 0x60, 0x797E)  /* <CJK> */
-MAP(0x50, 0x61, 0x798B)  /* <CJK> */
-MAP(0x50, 0x62, 0x798C)  /* <CJK> */
-MAP(0x50, 0x63, 0x7991)  /* <CJK> */
-MAP(0x50, 0x64, 0x7993)  /* <CJK> */
-MAP(0x50, 0x65, 0x7994)  /* <CJK> */
-MAP(0x50, 0x66, 0x7995)  /* <CJK> */
-MAP(0x50, 0x67, 0x7996)  /* <CJK> */
-MAP(0x50, 0x68, 0x7998)  /* <CJK> */
-MAP(0x50, 0x69, 0x799B)  /* <CJK> */
-MAP(0x50, 0x6A, 0x799C)  /* <CJK> */
-MAP(0x50, 0x6B, 0x79A1)  /* <CJK> */
-MAP(0x50, 0x6C, 0x79A8)  /* <CJK> */
-MAP(0x50, 0x6D, 0x79A9)  /* <CJK> */
-MAP(0x50, 0x6E, 0x79AB)  /* <CJK> */
-MAP(0x50, 0x6F, 0x79AF)  /* <CJK> */
-MAP(0x50, 0x70, 0x79B1)  /* <CJK> */
-MAP(0x50, 0x71, 0x79B4)  /* <CJK> */
-MAP(0x50, 0x72, 0x79B8)  /* <CJK> */
-MAP(0x50, 0x73, 0x79BB)  /* <CJK> */
-MAP(0x50, 0x74, 0x79C2)  /* <CJK> */
-MAP(0x50, 0x75, 0x79C4)  /* <CJK> */
-MAP(0x50, 0x76, 0x79C7)  /* <CJK> */
-MAP(0x50, 0x77, 0x79C8)  /* <CJK> */
-MAP(0x50, 0x78, 0x79CA)  /* <CJK> */
-MAP(0x50, 0x79, 0x79CF)  /* <CJK> */
-MAP(0x50, 0x7A, 0x79D4)  /* <CJK> */
-MAP(0x50, 0x7B, 0x79D6)  /* <CJK> */
-MAP(0x50, 0x7C, 0x79DA)  /* <CJK> */
-MAP(0x50, 0x7D, 0x79DD)  /* <CJK> */
-MAP(0x50, 0x7E, 0x79DE)  /* <CJK> */
-MAP(0x51, 0x21, 0x79E0)  /* <CJK> */
-MAP(0x51, 0x22, 0x79E2)  /* <CJK> */
-MAP(0x51, 0x23, 0x79E5)  /* <CJK> */
-MAP(0x51, 0x24, 0x79EA)  /* <CJK> */
-MAP(0x51, 0x25, 0x79EB)  /* <CJK> */
-MAP(0x51, 0x26, 0x79ED)  /* <CJK> */
-MAP(0x51, 0x27, 0x79F1)  /* <CJK> */
-MAP(0x51, 0x28, 0x79F8)  /* <CJK> */
-MAP(0x51, 0x29, 0x79FC)  /* <CJK> */
-MAP(0x51, 0x2A, 0x7A02)  /* <CJK> */
-MAP(0x51, 0x2B, 0x7A03)  /* <CJK> */
-MAP(0x51, 0x2C, 0x7A07)  /* <CJK> */
-MAP(0x51, 0x2D, 0x7A09)  /* <CJK> */
-MAP(0x51, 0x2E, 0x7A0A)  /* <CJK> */
-MAP(0x51, 0x2F, 0x7A0C)  /* <CJK> */
-MAP(0x51, 0x30, 0x7A11)  /* <CJK> */
-MAP(0x51, 0x31, 0x7A15)  /* <CJK> */
-MAP(0x51, 0x32, 0x7A1B)  /* <CJK> */
-MAP(0x51, 0x33, 0x7A1E)  /* <CJK> */
-MAP(0x51, 0x34, 0x7A21)  /* <CJK> */
-MAP(0x51, 0x35, 0x7A27)  /* <CJK> */
-MAP(0x51, 0x36, 0x7A2B)  /* <CJK> */
-MAP(0x51, 0x37, 0x7A2D)  /* <CJK> */
-MAP(0x51, 0x38, 0x7A2F)  /* <CJK> */
-MAP(0x51, 0x39, 0x7A30)  /* <CJK> */
-MAP(0x51, 0x3A, 0x7A34)  /* <CJK> */
-MAP(0x51, 0x3B, 0x7A35)  /* <CJK> */
-MAP(0x51, 0x3C, 0x7A38)  /* <CJK> */
-MAP(0x51, 0x3D, 0x7A39)  /* <CJK> */
-MAP(0x51, 0x3E, 0x7A3A)  /* <CJK> */
-MAP(0x51, 0x3F, 0x7A44)  /* <CJK> */
-MAP(0x51, 0x40, 0x7A45)  /* <CJK> */
-MAP(0x51, 0x41, 0x7A47)  /* <CJK> */
-MAP(0x51, 0x42, 0x7A48)  /* <CJK> */
-MAP(0x51, 0x43, 0x7A4C)  /* <CJK> */
-MAP(0x51, 0x44, 0x7A55)  /* <CJK> */
-MAP(0x51, 0x45, 0x7A56)  /* <CJK> */
-MAP(0x51, 0x46, 0x7A59)  /* <CJK> */
-MAP(0x51, 0x47, 0x7A5C)  /* <CJK> */
-MAP(0x51, 0x48, 0x7A5D)  /* <CJK> */
-MAP(0x51, 0x49, 0x7A5F)  /* <CJK> */
-MAP(0x51, 0x4A, 0x7A60)  /* <CJK> */
-MAP(0x51, 0x4B, 0x7A65)  /* <CJK> */
-MAP(0x51, 0x4C, 0x7A67)  /* <CJK> */
-MAP(0x51, 0x4D, 0x7A6A)  /* <CJK> */
-MAP(0x51, 0x4E, 0x7A6D)  /* <CJK> */
-MAP(0x51, 0x4F, 0x7A75)  /* <CJK> */
-MAP(0x51, 0x50, 0x7A78)  /* <CJK> */
-MAP(0x51, 0x51, 0x7A7E)  /* <CJK> */
-MAP(0x51, 0x52, 0x7A80)  /* <CJK> */
-MAP(0x51, 0x53, 0x7A82)  /* <CJK> */
-MAP(0x51, 0x54, 0x7A85)  /* <CJK> */
-MAP(0x51, 0x55, 0x7A86)  /* <CJK> */
-MAP(0x51, 0x56, 0x7A8A)  /* <CJK> */
-MAP(0x51, 0x57, 0x7A8B)  /* <CJK> */
-MAP(0x51, 0x58, 0x7A90)  /* <CJK> */
-MAP(0x51, 0x59, 0x7A91)  /* <CJK> */
-MAP(0x51, 0x5A, 0x7A94)  /* <CJK> */
-MAP(0x51, 0x5B, 0x7A9E)  /* <CJK> */
-MAP(0x51, 0x5C, 0x7AA0)  /* <CJK> */
-MAP(0x51, 0x5D, 0x7AA3)  /* <CJK> */
-MAP(0x51, 0x5E, 0x7AAC)  /* <CJK> */
-MAP(0x51, 0x5F, 0x7AB3)  /* <CJK> */
-MAP(0x51, 0x60, 0x7AB5)  /* <CJK> */
-MAP(0x51, 0x61, 0x7AB9)  /* <CJK> */
-MAP(0x51, 0x62, 0x7ABB)  /* <CJK> */
-MAP(0x51, 0x63, 0x7ABC)  /* <CJK> */
-MAP(0x51, 0x64, 0x7AC6)  /* <CJK> */
-MAP(0x51, 0x65, 0x7AC9)  /* <CJK> */
-MAP(0x51, 0x66, 0x7ACC)  /* <CJK> */
-MAP(0x51, 0x67, 0x7ACE)  /* <CJK> */
-MAP(0x51, 0x68, 0x7AD1)  /* <CJK> */
-MAP(0x51, 0x69, 0x7ADB)  /* <CJK> */
-MAP(0x51, 0x6A, 0x7AE8)  /* <CJK> */
-MAP(0x51, 0x6B, 0x7AE9)  /* <CJK> */
-MAP(0x51, 0x6C, 0x7AEB)  /* <CJK> */
-MAP(0x51, 0x6D, 0x7AEC)  /* <CJK> */
-MAP(0x51, 0x6E, 0x7AF1)  /* <CJK> */
-MAP(0x51, 0x6F, 0x7AF4)  /* <CJK> */
-MAP(0x51, 0x70, 0x7AFB)  /* <CJK> */
-MAP(0x51, 0x71, 0x7AFD)  /* <CJK> */
-MAP(0x51, 0x72, 0x7AFE)  /* <CJK> */
-MAP(0x51, 0x73, 0x7B07)  /* <CJK> */
-MAP(0x51, 0x74, 0x7B14)  /* <CJK> */
-MAP(0x51, 0x75, 0x7B1F)  /* <CJK> */
-MAP(0x51, 0x76, 0x7B23)  /* <CJK> */
-MAP(0x51, 0x77, 0x7B27)  /* <CJK> */
-MAP(0x51, 0x78, 0x7B29)  /* <CJK> */
-MAP(0x51, 0x79, 0x7B2A)  /* <CJK> */
-MAP(0x51, 0x7A, 0x7B2B)  /* <CJK> */
-MAP(0x51, 0x7B, 0x7B2D)  /* <CJK> */
-MAP(0x51, 0x7C, 0x7B2E)  /* <CJK> */
-MAP(0x51, 0x7D, 0x7B2F)  /* <CJK> */
-MAP(0x51, 0x7E, 0x7B30)  /* <CJK> */
-MAP(0x52, 0x21, 0x7B31)  /* <CJK> */
-MAP(0x52, 0x22, 0x7B34)  /* <CJK> */
-MAP(0x52, 0x23, 0x7B3D)  /* <CJK> */
-MAP(0x52, 0x24, 0x7B3F)  /* <CJK> */
-MAP(0x52, 0x25, 0x7B40)  /* <CJK> */
-MAP(0x52, 0x26, 0x7B41)  /* <CJK> */
-MAP(0x52, 0x27, 0x7B47)  /* <CJK> */
-MAP(0x52, 0x28, 0x7B4E)  /* <CJK> */
-MAP(0x52, 0x29, 0x7B55)  /* <CJK> */
-MAP(0x52, 0x2A, 0x7B60)  /* <CJK> */
-MAP(0x52, 0x2B, 0x7B64)  /* <CJK> */
-MAP(0x52, 0x2C, 0x7B66)  /* <CJK> */
-MAP(0x52, 0x2D, 0x7B69)  /* <CJK> */
-MAP(0x52, 0x2E, 0x7B6A)  /* <CJK> */
-MAP(0x52, 0x2F, 0x7B6D)  /* <CJK> */
-MAP(0x52, 0x30, 0x7B6F)  /* <CJK> */
-MAP(0x52, 0x31, 0x7B72)  /* <CJK> */
-MAP(0x52, 0x32, 0x7B73)  /* <CJK> */
-MAP(0x52, 0x33, 0x7B77)  /* <CJK> */
-MAP(0x52, 0x34, 0x7B84)  /* <CJK> */
-MAP(0x52, 0x35, 0x7B89)  /* <CJK> */
-MAP(0x52, 0x36, 0x7B8E)  /* <CJK> */
-MAP(0x52, 0x37, 0x7B90)  /* <CJK> */
-MAP(0x52, 0x38, 0x7B91)  /* <CJK> */
-MAP(0x52, 0x39, 0x7B96)  /* <CJK> */
-MAP(0x52, 0x3A, 0x7B9B)  /* <CJK> */
-MAP(0x52, 0x3B, 0x7B9E)  /* <CJK> */
-MAP(0x52, 0x3C, 0x7BA0)  /* <CJK> */
-MAP(0x52, 0x3D, 0x7BA5)  /* <CJK> */
-MAP(0x52, 0x3E, 0x7BAC)  /* <CJK> */
-MAP(0x52, 0x3F, 0x7BAF)  /* <CJK> */
-MAP(0x52, 0x40, 0x7BB0)  /* <CJK> */
-MAP(0x52, 0x41, 0x7BB2)  /* <CJK> */
-MAP(0x52, 0x42, 0x7BB5)  /* <CJK> */
-MAP(0x52, 0x43, 0x7BB6)  /* <CJK> */
-MAP(0x52, 0x44, 0x7BBA)  /* <CJK> */
-MAP(0x52, 0x45, 0x7BBB)  /* <CJK> */
-MAP(0x52, 0x46, 0x7BBC)  /* <CJK> */
-MAP(0x52, 0x47, 0x7BBD)  /* <CJK> */
-MAP(0x52, 0x48, 0x7BC2)  /* <CJK> */
-MAP(0x52, 0x49, 0x7BC5)  /* <CJK> */
-MAP(0x52, 0x4A, 0x7BC8)  /* <CJK> */
-MAP(0x52, 0x4B, 0x7BCA)  /* <CJK> */
-MAP(0x52, 0x4C, 0x7BD4)  /* <CJK> */
-MAP(0x52, 0x4D, 0x7BD6)  /* <CJK> */
-MAP(0x52, 0x4E, 0x7BD7)  /* <CJK> */
-MAP(0x52, 0x4F, 0x7BD9)  /* <CJK> */
-MAP(0x52, 0x50, 0x7BDA)  /* <CJK> */
-MAP(0x52, 0x51, 0x7BDB)  /* <CJK> */
-MAP(0x52, 0x52, 0x7BE8)  /* <CJK> */
-MAP(0x52, 0x53, 0x7BEA)  /* <CJK> */
-MAP(0x52, 0x54, 0x7BF2)  /* <CJK> */
-MAP(0x52, 0x55, 0x7BF4)  /* <CJK> */
-MAP(0x52, 0x56, 0x7BF5)  /* <CJK> */
-MAP(0x52, 0x57, 0x7BF8)  /* <CJK> */
-MAP(0x52, 0x58, 0x7BF9)  /* <CJK> */
-MAP(0x52, 0x59, 0x7BFA)  /* <CJK> */
-MAP(0x52, 0x5A, 0x7BFC)  /* <CJK> */
-MAP(0x52, 0x5B, 0x7BFE)  /* <CJK> */
-MAP(0x52, 0x5C, 0x7C01)  /* <CJK> */
-MAP(0x52, 0x5D, 0x7C02)  /* <CJK> */
-MAP(0x52, 0x5E, 0x7C03)  /* <CJK> */
-MAP(0x52, 0x5F, 0x7C04)  /* <CJK> */
-MAP(0x52, 0x60, 0x7C06)  /* <CJK> */
-MAP(0x52, 0x61, 0x7C09)  /* <CJK> */
-MAP(0x52, 0x62, 0x7C0B)  /* <CJK> */
-MAP(0x52, 0x63, 0x7C0C)  /* <CJK> */
-MAP(0x52, 0x64, 0x7C0E)  /* <CJK> */
-MAP(0x52, 0x65, 0x7C0F)  /* <CJK> */
-MAP(0x52, 0x66, 0x7C19)  /* <CJK> */
-MAP(0x52, 0x67, 0x7C1B)  /* <CJK> */
-MAP(0x52, 0x68, 0x7C20)  /* <CJK> */
-MAP(0x52, 0x69, 0x7C25)  /* <CJK> */
-MAP(0x52, 0x6A, 0x7C26)  /* <CJK> */
-MAP(0x52, 0x6B, 0x7C28)  /* <CJK> */
-MAP(0x52, 0x6C, 0x7C2C)  /* <CJK> */
-MAP(0x52, 0x6D, 0x7C31)  /* <CJK> */
-MAP(0x52, 0x6E, 0x7C33)  /* <CJK> */
-MAP(0x52, 0x6F, 0x7C34)  /* <CJK> */
-MAP(0x52, 0x70, 0x7C36)  /* <CJK> */
-MAP(0x52, 0x71, 0x7C39)  /* <CJK> */
-MAP(0x52, 0x72, 0x7C3A)  /* <CJK> */
-MAP(0x52, 0x73, 0x7C46)  /* <CJK> */
-MAP(0x52, 0x74, 0x7C4A)  /* <CJK> */
-MAP(0x52, 0x75, 0x7C55)  /* <CJK> */
-MAP(0x52, 0x76, 0x7C51)  /* <CJK> */
-MAP(0x52, 0x77, 0x7C52)  /* <CJK> */
-MAP(0x52, 0x78, 0x7C53)  /* <CJK> */
-MAP(0x52, 0x79, 0x7C59)  /* <CJK> */
-MAP(0x52, 0x7A, 0x7C5A)  /* <CJK> */
-MAP(0x52, 0x7B, 0x7C5B)  /* <CJK> */
-MAP(0x52, 0x7C, 0x7C5C)  /* <CJK> */
-MAP(0x52, 0x7D, 0x7C5D)  /* <CJK> */
-MAP(0x52, 0x7E, 0x7C5E)  /* <CJK> */
-MAP(0x53, 0x21, 0x7C61)  /* <CJK> */
-MAP(0x53, 0x22, 0x7C63)  /* <CJK> */
-MAP(0x53, 0x23, 0x7C67)  /* <CJK> */
-MAP(0x53, 0x24, 0x7C69)  /* <CJK> */
-MAP(0x53, 0x25, 0x7C6D)  /* <CJK> */
-MAP(0x53, 0x26, 0x7C6E)  /* <CJK> */
-MAP(0x53, 0x27, 0x7C70)  /* <CJK> */
-MAP(0x53, 0x28, 0x7C72)  /* <CJK> */
-MAP(0x53, 0x29, 0x7C79)  /* <CJK> */
-MAP(0x53, 0x2A, 0x7C7C)  /* <CJK> */
-MAP(0x53, 0x2B, 0x7C7D)  /* <CJK> */
-MAP(0x53, 0x2C, 0x7C86)  /* <CJK> */
-MAP(0x53, 0x2D, 0x7C87)  /* <CJK> */
-MAP(0x53, 0x2E, 0x7C8F)  /* <CJK> */
-MAP(0x53, 0x2F, 0x7C94)  /* <CJK> */
-MAP(0x53, 0x30, 0x7C9E)  /* <CJK> */
-MAP(0x53, 0x31, 0x7CA0)  /* <CJK> */
-MAP(0x53, 0x32, 0x7CA6)  /* <CJK> */
-MAP(0x53, 0x33, 0x7CB0)  /* <CJK> */
-MAP(0x53, 0x34, 0x7CB6)  /* <CJK> */
-MAP(0x53, 0x35, 0x7CB7)  /* <CJK> */
-MAP(0x53, 0x36, 0x7CBA)  /* <CJK> */
-MAP(0x53, 0x37, 0x7CBB)  /* <CJK> */
-MAP(0x53, 0x38, 0x7CBC)  /* <CJK> */
-MAP(0x53, 0x39, 0x7CBF)  /* <CJK> */
-MAP(0x53, 0x3A, 0x7CC4)  /* <CJK> */
-MAP(0x53, 0x3B, 0x7CC7)  /* <CJK> */
-MAP(0x53, 0x3C, 0x7CC8)  /* <CJK> */
-MAP(0x53, 0x3D, 0x7CC9)  /* <CJK> */
-MAP(0x53, 0x3E, 0x7CCD)  /* <CJK> */
-MAP(0x53, 0x3F, 0x7CCF)  /* <CJK> */
-MAP(0x53, 0x40, 0x7CD3)  /* <CJK> */
-MAP(0x53, 0x41, 0x7CD4)  /* <CJK> */
-MAP(0x53, 0x42, 0x7CD5)  /* <CJK> */
-MAP(0x53, 0x43, 0x7CD7)  /* <CJK> */
-MAP(0x53, 0x44, 0x7CD9)  /* <CJK> */
-MAP(0x53, 0x45, 0x7CDA)  /* <CJK> */
-MAP(0x53, 0x46, 0x7CDD)  /* <CJK> */
-MAP(0x53, 0x47, 0x7CE6)  /* <CJK> */
-MAP(0x53, 0x48, 0x7CE9)  /* <CJK> */
-MAP(0x53, 0x49, 0x7CEB)  /* <CJK> */
-MAP(0x53, 0x4A, 0x7CF5)  /* <CJK> */
-MAP(0x53, 0x4B, 0x7D03)  /* <CJK> */
-MAP(0x53, 0x4C, 0x7D07)  /* <CJK> */
-MAP(0x53, 0x4D, 0x7D08)  /* <CJK> */
-MAP(0x53, 0x4E, 0x7D09)  /* <CJK> */
-MAP(0x53, 0x4F, 0x7D0F)  /* <CJK> */
-MAP(0x53, 0x50, 0x7D11)  /* <CJK> */
-MAP(0x53, 0x51, 0x7D12)  /* <CJK> */
-MAP(0x53, 0x52, 0x7D13)  /* <CJK> */
-MAP(0x53, 0x53, 0x7D16)  /* <CJK> */
-MAP(0x53, 0x54, 0x7D1D)  /* <CJK> */
-MAP(0x53, 0x55, 0x7D1E)  /* <CJK> */
-MAP(0x53, 0x56, 0x7D23)  /* <CJK> */
-MAP(0x53, 0x57, 0x7D26)  /* <CJK> */
-MAP(0x53, 0x58, 0x7D2A)  /* <CJK> */
-MAP(0x53, 0x59, 0x7D2D)  /* <CJK> */
-MAP(0x53, 0x5A, 0x7D31)  /* <CJK> */
-MAP(0x53, 0x5B, 0x7D3C)  /* <CJK> */
-MAP(0x53, 0x5C, 0x7D3D)  /* <CJK> */
-MAP(0x53, 0x5D, 0x7D3E)  /* <CJK> */
-MAP(0x53, 0x5E, 0x7D40)  /* <CJK> */
-MAP(0x53, 0x5F, 0x7D41)  /* <CJK> */
-MAP(0x53, 0x60, 0x7D47)  /* <CJK> */
-MAP(0x53, 0x61, 0x7D48)  /* <CJK> */
-MAP(0x53, 0x62, 0x7D4D)  /* <CJK> */
-MAP(0x53, 0x63, 0x7D51)  /* <CJK> */
-MAP(0x53, 0x64, 0x7D53)  /* <CJK> */
-MAP(0x53, 0x65, 0x7D57)  /* <CJK> */
-MAP(0x53, 0x66, 0x7D59)  /* <CJK> */
-MAP(0x53, 0x67, 0x7D5A)  /* <CJK> */
-MAP(0x53, 0x68, 0x7D5C)  /* <CJK> */
-MAP(0x53, 0x69, 0x7D5D)  /* <CJK> */
-MAP(0x53, 0x6A, 0x7D65)  /* <CJK> */
-MAP(0x53, 0x6B, 0x7D67)  /* <CJK> */
-MAP(0x53, 0x6C, 0x7D6A)  /* <CJK> */
-MAP(0x53, 0x6D, 0x7D70)  /* <CJK> */
-MAP(0x53, 0x6E, 0x7D78)  /* <CJK> */
-MAP(0x53, 0x6F, 0x7D7A)  /* <CJK> */
-MAP(0x53, 0x70, 0x7D7B)  /* <CJK> */
-MAP(0x53, 0x71, 0x7D7F)  /* <CJK> */
-MAP(0x53, 0x72, 0x7D81)  /* <CJK> */
-MAP(0x53, 0x73, 0x7D82)  /* <CJK> */
-MAP(0x53, 0x74, 0x7D83)  /* <CJK> */
-MAP(0x53, 0x75, 0x7D85)  /* <CJK> */
-MAP(0x53, 0x76, 0x7D86)  /* <CJK> */
-MAP(0x53, 0x77, 0x7D88)  /* <CJK> */
-MAP(0x53, 0x78, 0x7D8B)  /* <CJK> */
-MAP(0x53, 0x79, 0x7D8C)  /* <CJK> */
-MAP(0x53, 0x7A, 0x7D8D)  /* <CJK> */
-MAP(0x53, 0x7B, 0x7D91)  /* <CJK> */
-MAP(0x53, 0x7C, 0x7D96)  /* <CJK> */
-MAP(0x53, 0x7D, 0x7D97)  /* <CJK> */
-MAP(0x53, 0x7E, 0x7D9D)  /* <CJK> */
-MAP(0x54, 0x21, 0x7D9E)  /* <CJK> */
-MAP(0x54, 0x22, 0x7DA6)  /* <CJK> */
-MAP(0x54, 0x23, 0x7DA7)  /* <CJK> */
-MAP(0x54, 0x24, 0x7DAA)  /* <CJK> */
-MAP(0x54, 0x25, 0x7DB3)  /* <CJK> */
-MAP(0x54, 0x26, 0x7DB6)  /* <CJK> */
-MAP(0x54, 0x27, 0x7DB7)  /* <CJK> */
-MAP(0x54, 0x28, 0x7DB9)  /* <CJK> */
-MAP(0x54, 0x29, 0x7DC2)  /* <CJK> */
-MAP(0x54, 0x2A, 0x7DC3)  /* <CJK> */
-MAP(0x54, 0x2B, 0x7DC4)  /* <CJK> */
-MAP(0x54, 0x2C, 0x7DC5)  /* <CJK> */
-MAP(0x54, 0x2D, 0x7DC6)  /* <CJK> */
-MAP(0x54, 0x2E, 0x7DCC)  /* <CJK> */
-MAP(0x54, 0x2F, 0x7DCD)  /* <CJK> */
-MAP(0x54, 0x30, 0x7DCE)  /* <CJK> */
-MAP(0x54, 0x31, 0x7DD7)  /* <CJK> */
-MAP(0x54, 0x32, 0x7DD9)  /* <CJK> */
-MAP(0x54, 0x33, 0x7E00)  /* <CJK> */
-MAP(0x54, 0x34, 0x7DE2)  /* <CJK> */
-MAP(0x54, 0x35, 0x7DE5)  /* <CJK> */
-MAP(0x54, 0x36, 0x7DE6)  /* <CJK> */
-MAP(0x54, 0x37, 0x7DEA)  /* <CJK> */
-MAP(0x54, 0x38, 0x7DEB)  /* <CJK> */
-MAP(0x54, 0x39, 0x7DED)  /* <CJK> */
-MAP(0x54, 0x3A, 0x7DF1)  /* <CJK> */
-MAP(0x54, 0x3B, 0x7DF5)  /* <CJK> */
-MAP(0x54, 0x3C, 0x7DF6)  /* <CJK> */
-MAP(0x54, 0x3D, 0x7DF9)  /* <CJK> */
-MAP(0x54, 0x3E, 0x7DFA)  /* <CJK> */
-MAP(0x54, 0x3F, 0x7E08)  /* <CJK> */
-MAP(0x54, 0x40, 0x7E10)  /* <CJK> */
-MAP(0x54, 0x41, 0x7E11)  /* <CJK> */
-MAP(0x54, 0x42, 0x7E15)  /* <CJK> */
-MAP(0x54, 0x43, 0x7E17)  /* <CJK> */
-MAP(0x54, 0x44, 0x7E1C)  /* <CJK> */
-MAP(0x54, 0x45, 0x7E1D)  /* <CJK> */
-MAP(0x54, 0x46, 0x7E20)  /* <CJK> */
-MAP(0x54, 0x47, 0x7E27)  /* <CJK> */
-MAP(0x54, 0x48, 0x7E28)  /* <CJK> */
-MAP(0x54, 0x49, 0x7E2C)  /* <CJK> */
-MAP(0x54, 0x4A, 0x7E2D)  /* <CJK> */
-MAP(0x54, 0x4B, 0x7E2F)  /* <CJK> */
-MAP(0x54, 0x4C, 0x7E33)  /* <CJK> */
-MAP(0x54, 0x4D, 0x7E36)  /* <CJK> */
-MAP(0x54, 0x4E, 0x7E3F)  /* <CJK> */
-MAP(0x54, 0x4F, 0x7E44)  /* <CJK> */
-MAP(0x54, 0x50, 0x7E45)  /* <CJK> */
-MAP(0x54, 0x51, 0x7E47)  /* <CJK> */
-MAP(0x54, 0x52, 0x7E4E)  /* <CJK> */
-MAP(0x54, 0x53, 0x7E50)  /* <CJK> */
-MAP(0x54, 0x54, 0x7E52)  /* <CJK> */
-MAP(0x54, 0x55, 0x7E58)  /* <CJK> */
-MAP(0x54, 0x56, 0x7E5F)  /* <CJK> */
-MAP(0x54, 0x57, 0x7E61)  /* <CJK> */
-MAP(0x54, 0x58, 0x7E62)  /* <CJK> */
-MAP(0x54, 0x59, 0x7E65)  /* <CJK> */
-MAP(0x54, 0x5A, 0x7E6B)  /* <CJK> */
-MAP(0x54, 0x5B, 0x7E6E)  /* <CJK> */
-MAP(0x54, 0x5C, 0x7E6F)  /* <CJK> */
-MAP(0x54, 0x5D, 0x7E73)  /* <CJK> */
-MAP(0x54, 0x5E, 0x7E78)  /* <CJK> */
-MAP(0x54, 0x5F, 0x7E7E)  /* <CJK> */
-MAP(0x54, 0x60, 0x7E81)  /* <CJK> */
-MAP(0x54, 0x61, 0x7E86)  /* <CJK> */
-MAP(0x54, 0x62, 0x7E87)  /* <CJK> */
-MAP(0x54, 0x63, 0x7E8A)  /* <CJK> */
-MAP(0x54, 0x64, 0x7E8D)  /* <CJK> */
-MAP(0x54, 0x65, 0x7E91)  /* <CJK> */
-MAP(0x54, 0x66, 0x7E95)  /* <CJK> */
-MAP(0x54, 0x67, 0x7E98)  /* <CJK> */
-MAP(0x54, 0x68, 0x7E9A)  /* <CJK> */
-MAP(0x54, 0x69, 0x7E9D)  /* <CJK> */
-MAP(0x54, 0x6A, 0x7E9E)  /* <CJK> */
-MAP(0x54, 0x6B, 0x7F3C)  /* <CJK> */
-MAP(0x54, 0x6C, 0x7F3B)  /* <CJK> */
-MAP(0x54, 0x6D, 0x7F3D)  /* <CJK> */
-MAP(0x54, 0x6E, 0x7F3E)  /* <CJK> */
-MAP(0x54, 0x6F, 0x7F3F)  /* <CJK> */
-MAP(0x54, 0x70, 0x7F43)  /* <CJK> */
-MAP(0x54, 0x71, 0x7F44)  /* <CJK> */
-MAP(0x54, 0x72, 0x7F47)  /* <CJK> */
-MAP(0x54, 0x73, 0x7F4F)  /* <CJK> */
-MAP(0x54, 0x74, 0x7F52)  /* <CJK> */
-MAP(0x54, 0x75, 0x7F53)  /* <CJK> */
-MAP(0x54, 0x76, 0x7F5B)  /* <CJK> */
-MAP(0x54, 0x77, 0x7F5C)  /* <CJK> */
-MAP(0x54, 0x78, 0x7F5D)  /* <CJK> */
-MAP(0x54, 0x79, 0x7F61)  /* <CJK> */
-MAP(0x54, 0x7A, 0x7F63)  /* <CJK> */
-MAP(0x54, 0x7B, 0x7F64)  /* <CJK> */
-MAP(0x54, 0x7C, 0x7F65)  /* <CJK> */
-MAP(0x54, 0x7D, 0x7F66)  /* <CJK> */
-MAP(0x54, 0x7E, 0x7F6D)  /* <CJK> */
-MAP(0x55, 0x21, 0x7F71)  /* <CJK> */
-MAP(0x55, 0x22, 0x7F7D)  /* <CJK> */
-MAP(0x55, 0x23, 0x7F7E)  /* <CJK> */
-MAP(0x55, 0x24, 0x7F7F)  /* <CJK> */
-MAP(0x55, 0x25, 0x7F80)  /* <CJK> */
-MAP(0x55, 0x26, 0x7F8B)  /* <CJK> */
-MAP(0x55, 0x27, 0x7F8D)  /* <CJK> */
-MAP(0x55, 0x28, 0x7F8F)  /* <CJK> */
-MAP(0x55, 0x29, 0x7F90)  /* <CJK> */
-MAP(0x55, 0x2A, 0x7F91)  /* <CJK> */
-MAP(0x55, 0x2B, 0x7F96)  /* <CJK> */
-MAP(0x55, 0x2C, 0x7F97)  /* <CJK> */
-MAP(0x55, 0x2D, 0x7F9C)  /* <CJK> */
-MAP(0x55, 0x2E, 0x7FA1)  /* <CJK> */
-MAP(0x55, 0x2F, 0x7FA2)  /* <CJK> */
-MAP(0x55, 0x30, 0x7FA6)  /* <CJK> */
-MAP(0x55, 0x31, 0x7FAA)  /* <CJK> */
-MAP(0x55, 0x32, 0x7FAD)  /* <CJK> */
-MAP(0x55, 0x33, 0x7FB4)  /* <CJK> */
-MAP(0x55, 0x34, 0x7FBC)  /* <CJK> */
-MAP(0x55, 0x35, 0x7FBF)  /* <CJK> */
-MAP(0x55, 0x36, 0x7FC0)  /* <CJK> */
-MAP(0x55, 0x37, 0x7FC3)  /* <CJK> */
-MAP(0x55, 0x38, 0x7FC8)  /* <CJK> */
-MAP(0x55, 0x39, 0x7FCE)  /* <CJK> */
-MAP(0x55, 0x3A, 0x7FCF)  /* <CJK> */
-MAP(0x55, 0x3B, 0x7FDB)  /* <CJK> */
-MAP(0x55, 0x3C, 0x7FDF)  /* <CJK> */
-MAP(0x55, 0x3D, 0x7FE3)  /* <CJK> */
-MAP(0x55, 0x3E, 0x7FE5)  /* <CJK> */
-MAP(0x55, 0x3F, 0x7FE8)  /* <CJK> */
-MAP(0x55, 0x40, 0x7FEC)  /* <CJK> */
-MAP(0x55, 0x41, 0x7FEE)  /* <CJK> */
-MAP(0x55, 0x42, 0x7FEF)  /* <CJK> */
-MAP(0x55, 0x43, 0x7FF2)  /* <CJK> */
-MAP(0x55, 0x44, 0x7FFA)  /* <CJK> */
-MAP(0x55, 0x45, 0x7FFD)  /* <CJK> */
-MAP(0x55, 0x46, 0x7FFE)  /* <CJK> */
-MAP(0x55, 0x47, 0x7FFF)  /* <CJK> */
-MAP(0x55, 0x48, 0x8007)  /* <CJK> */
-MAP(0x55, 0x49, 0x8008)  /* <CJK> */
-MAP(0x55, 0x4A, 0x800A)  /* <CJK> */
-MAP(0x55, 0x4B, 0x800D)  /* <CJK> */
-MAP(0x55, 0x4C, 0x800E)  /* <CJK> */
-MAP(0x55, 0x4D, 0x800F)  /* <CJK> */
-MAP(0x55, 0x4E, 0x8011)  /* <CJK> */
-MAP(0x55, 0x4F, 0x8013)  /* <CJK> */
-MAP(0x55, 0x50, 0x8014)  /* <CJK> */
-MAP(0x55, 0x51, 0x8016)  /* <CJK> */
-MAP(0x55, 0x52, 0x801D)  /* <CJK> */
-MAP(0x55, 0x53, 0x801E)  /* <CJK> */
-MAP(0x55, 0x54, 0x801F)  /* <CJK> */
-MAP(0x55, 0x55, 0x8020)  /* <CJK> */
-MAP(0x55, 0x56, 0x8024)  /* <CJK> */
-MAP(0x55, 0x57, 0x8026)  /* <CJK> */
-MAP(0x55, 0x58, 0x802C)  /* <CJK> */
-MAP(0x55, 0x59, 0x802E)  /* <CJK> */
-MAP(0x55, 0x5A, 0x8030)  /* <CJK> */
-MAP(0x55, 0x5B, 0x8034)  /* <CJK> */
-MAP(0x55, 0x5C, 0x8035)  /* <CJK> */
-MAP(0x55, 0x5D, 0x8037)  /* <CJK> */
-MAP(0x55, 0x5E, 0x8039)  /* <CJK> */
-MAP(0x55, 0x5F, 0x803A)  /* <CJK> */
-MAP(0x55, 0x60, 0x803C)  /* <CJK> */
-MAP(0x55, 0x61, 0x803E)  /* <CJK> */
-MAP(0x55, 0x62, 0x8040)  /* <CJK> */
-MAP(0x55, 0x63, 0x8044)  /* <CJK> */
-MAP(0x55, 0x64, 0x8060)  /* <CJK> */
-MAP(0x55, 0x65, 0x8064)  /* <CJK> */
-MAP(0x55, 0x66, 0x8066)  /* <CJK> */
-MAP(0x55, 0x67, 0x806D)  /* <CJK> */
-MAP(0x55, 0x68, 0x8071)  /* <CJK> */
-MAP(0x55, 0x69, 0x8075)  /* <CJK> */
-MAP(0x55, 0x6A, 0x8081)  /* <CJK> */
-MAP(0x55, 0x6B, 0x8088)  /* <CJK> */
-MAP(0x55, 0x6C, 0x808E)  /* <CJK> */
-MAP(0x55, 0x6D, 0x809C)  /* <CJK> */
-MAP(0x55, 0x6E, 0x809E)  /* <CJK> */
-MAP(0x55, 0x6F, 0x80A6)  /* <CJK> */
-MAP(0x55, 0x70, 0x80A7)  /* <CJK> */
-MAP(0x55, 0x71, 0x80AB)  /* <CJK> */
-MAP(0x55, 0x72, 0x80B8)  /* <CJK> */
-MAP(0x55, 0x73, 0x80B9)  /* <CJK> */
-MAP(0x55, 0x74, 0x80C8)  /* <CJK> */
-MAP(0x55, 0x75, 0x80CD)  /* <CJK> */
-MAP(0x55, 0x76, 0x80CF)  /* <CJK> */
-MAP(0x55, 0x77, 0x80D2)  /* <CJK> */
-MAP(0x55, 0x78, 0x80D4)  /* <CJK> */
-MAP(0x55, 0x79, 0x80D5)  /* <CJK> */
-MAP(0x55, 0x7A, 0x80D7)  /* <CJK> */
-MAP(0x55, 0x7B, 0x80D8)  /* <CJK> */
-MAP(0x55, 0x7C, 0x80E0)  /* <CJK> */
-MAP(0x55, 0x7D, 0x80ED)  /* <CJK> */
-MAP(0x55, 0x7E, 0x80EE)  /* <CJK> */
-MAP(0x56, 0x21, 0x80F0)  /* <CJK> */
-MAP(0x56, 0x22, 0x80F2)  /* <CJK> */
-MAP(0x56, 0x23, 0x80F3)  /* <CJK> */
-MAP(0x56, 0x24, 0x80F6)  /* <CJK> */
-MAP(0x56, 0x25, 0x80F9)  /* <CJK> */
-MAP(0x56, 0x26, 0x80FA)  /* <CJK> */
-MAP(0x56, 0x27, 0x80FE)  /* <CJK> */
-MAP(0x56, 0x28, 0x8103)  /* <CJK> */
-MAP(0x56, 0x29, 0x810B)  /* <CJK> */
-MAP(0x56, 0x2A, 0x8116)  /* <CJK> */
-MAP(0x56, 0x2B, 0x8117)  /* <CJK> */
-MAP(0x56, 0x2C, 0x8118)  /* <CJK> */
-MAP(0x56, 0x2D, 0x811C)  /* <CJK> */
-MAP(0x56, 0x2E, 0x811E)  /* <CJK> */
-MAP(0x56, 0x2F, 0x8120)  /* <CJK> */
-MAP(0x56, 0x30, 0x8124)  /* <CJK> */
-MAP(0x56, 0x31, 0x8127)  /* <CJK> */
-MAP(0x56, 0x32, 0x812C)  /* <CJK> */
-MAP(0x56, 0x33, 0x8130)  /* <CJK> */
-MAP(0x56, 0x34, 0x8135)  /* <CJK> */
-MAP(0x56, 0x35, 0x813A)  /* <CJK> */
-MAP(0x56, 0x36, 0x813C)  /* <CJK> */
-MAP(0x56, 0x37, 0x8145)  /* <CJK> */
-MAP(0x56, 0x38, 0x8147)  /* <CJK> */
-MAP(0x56, 0x39, 0x814A)  /* <CJK> */
-MAP(0x56, 0x3A, 0x814C)  /* <CJK> */
-MAP(0x56, 0x3B, 0x8152)  /* <CJK> */
-MAP(0x56, 0x3C, 0x8157)  /* <CJK> */
-MAP(0x56, 0x3D, 0x8160)  /* <CJK> */
-MAP(0x56, 0x3E, 0x8161)  /* <CJK> */
-MAP(0x56, 0x3F, 0x8167)  /* <CJK> */
-MAP(0x56, 0x40, 0x8168)  /* <CJK> */
-MAP(0x56, 0x41, 0x8169)  /* <CJK> */
-MAP(0x56, 0x42, 0x816D)  /* <CJK> */
-MAP(0x56, 0x43, 0x816F)  /* <CJK> */
-MAP(0x56, 0x44, 0x8177)  /* <CJK> */
-MAP(0x56, 0x45, 0x8181)  /* <CJK> */
-MAP(0x56, 0x46, 0x8190)  /* <CJK> */
-MAP(0x56, 0x47, 0x8184)  /* <CJK> */
-MAP(0x56, 0x48, 0x8185)  /* <CJK> */
-MAP(0x56, 0x49, 0x8186)  /* <CJK> */
-MAP(0x56, 0x4A, 0x818B)  /* <CJK> */
-MAP(0x56, 0x4B, 0x818E)  /* <CJK> */
-MAP(0x56, 0x4C, 0x8196)  /* <CJK> */
-MAP(0x56, 0x4D, 0x8198)  /* <CJK> */
-MAP(0x56, 0x4E, 0x819B)  /* <CJK> */
-MAP(0x56, 0x4F, 0x819E)  /* <CJK> */
-MAP(0x56, 0x50, 0x81A2)  /* <CJK> */
-MAP(0x56, 0x51, 0x81AE)  /* <CJK> */
-MAP(0x56, 0x52, 0x81B2)  /* <CJK> */
-MAP(0x56, 0x53, 0x81B4)  /* <CJK> */
-MAP(0x56, 0x54, 0x81BB)  /* <CJK> */
-MAP(0x56, 0x55, 0x81CB)  /* <CJK> */
-MAP(0x56, 0x56, 0x81C3)  /* <CJK> */
-MAP(0x56, 0x57, 0x81C5)  /* <CJK> */
-MAP(0x56, 0x58, 0x81CA)  /* <CJK> */
-MAP(0x56, 0x59, 0x81CE)  /* <CJK> */
-MAP(0x56, 0x5A, 0x81CF)  /* <CJK> */
-MAP(0x56, 0x5B, 0x81D5)  /* <CJK> */
-MAP(0x56, 0x5C, 0x81D7)  /* <CJK> */
-MAP(0x56, 0x5D, 0x81DB)  /* <CJK> */
-MAP(0x56, 0x5E, 0x81DD)  /* <CJK> */
-MAP(0x56, 0x5F, 0x81DE)  /* <CJK> */
-MAP(0x56, 0x60, 0x81E1)  /* <CJK> */
-MAP(0x56, 0x61, 0x81E4)  /* <CJK> */
-MAP(0x56, 0x62, 0x81EB)  /* <CJK> */
-MAP(0x56, 0x63, 0x81EC)  /* <CJK> */
-MAP(0x56, 0x64, 0x81F0)  /* <CJK> */
-MAP(0x56, 0x65, 0x81F1)  /* <CJK> */
-MAP(0x56, 0x66, 0x81F2)  /* <CJK> */
-MAP(0x56, 0x67, 0x81F5)  /* <CJK> */
-MAP(0x56, 0x68, 0x81F6)  /* <CJK> */
-MAP(0x56, 0x69, 0x81F8)  /* <CJK> */
-MAP(0x56, 0x6A, 0x81F9)  /* <CJK> */
-MAP(0x56, 0x6B, 0x81FD)  /* <CJK> */
-MAP(0x56, 0x6C, 0x81FF)  /* <CJK> */
-MAP(0x56, 0x6D, 0x8200)  /* <CJK> */
-MAP(0x56, 0x6E, 0x8203)  /* <CJK> */
-MAP(0x56, 0x6F, 0x820F)  /* <CJK> */
-MAP(0x56, 0x70, 0x8213)  /* <CJK> */
-MAP(0x56, 0x71, 0x8214)  /* <CJK> */
-MAP(0x56, 0x72, 0x8219)  /* <CJK> */
-MAP(0x56, 0x73, 0x821A)  /* <CJK> */
-MAP(0x56, 0x74, 0x821D)  /* <CJK> */
-MAP(0x56, 0x75, 0x8221)  /* <CJK> */
-MAP(0x56, 0x76, 0x8222)  /* <CJK> */
-MAP(0x56, 0x77, 0x8228)  /* <CJK> */
-MAP(0x56, 0x78, 0x8232)  /* <CJK> */
-MAP(0x56, 0x79, 0x8234)  /* <CJK> */
-MAP(0x56, 0x7A, 0x823A)  /* <CJK> */
-MAP(0x56, 0x7B, 0x8243)  /* <CJK> */
-MAP(0x56, 0x7C, 0x8244)  /* <CJK> */
-MAP(0x56, 0x7D, 0x8245)  /* <CJK> */
-MAP(0x56, 0x7E, 0x8246)  /* <CJK> */
-MAP(0x57, 0x21, 0x824B)  /* <CJK> */
-MAP(0x57, 0x22, 0x824E)  /* <CJK> */
-MAP(0x57, 0x23, 0x824F)  /* <CJK> */
-MAP(0x57, 0x24, 0x8251)  /* <CJK> */
-MAP(0x57, 0x25, 0x8256)  /* <CJK> */
-MAP(0x57, 0x26, 0x825C)  /* <CJK> */
-MAP(0x57, 0x27, 0x8260)  /* <CJK> */
-MAP(0x57, 0x28, 0x8263)  /* <CJK> */
-MAP(0x57, 0x29, 0x8267)  /* <CJK> */
-MAP(0x57, 0x2A, 0x826D)  /* <CJK> */
-MAP(0x57, 0x2B, 0x8274)  /* <CJK> */
-MAP(0x57, 0x2C, 0x827B)  /* <CJK> */
-MAP(0x57, 0x2D, 0x827D)  /* <CJK> */
-MAP(0x57, 0x2E, 0x827F)  /* <CJK> */
-MAP(0x57, 0x2F, 0x8280)  /* <CJK> */
-MAP(0x57, 0x30, 0x8281)  /* <CJK> */
-MAP(0x57, 0x31, 0x8283)  /* <CJK> */
-MAP(0x57, 0x32, 0x8284)  /* <CJK> */
-MAP(0x57, 0x33, 0x8287)  /* <CJK> */
-MAP(0x57, 0x34, 0x8289)  /* <CJK> */
-MAP(0x57, 0x35, 0x828A)  /* <CJK> */
-MAP(0x57, 0x36, 0x828E)  /* <CJK> */
-MAP(0x57, 0x37, 0x8291)  /* <CJK> */
-MAP(0x57, 0x38, 0x8294)  /* <CJK> */
-MAP(0x57, 0x39, 0x8296)  /* <CJK> */
-MAP(0x57, 0x3A, 0x8298)  /* <CJK> */
-MAP(0x57, 0x3B, 0x829A)  /* <CJK> */
-MAP(0x57, 0x3C, 0x829B)  /* <CJK> */
-MAP(0x57, 0x3D, 0x82A0)  /* <CJK> */
-MAP(0x57, 0x3E, 0x82A1)  /* <CJK> */
-MAP(0x57, 0x3F, 0x82A3)  /* <CJK> */
-MAP(0x57, 0x40, 0x82A4)  /* <CJK> */
-MAP(0x57, 0x41, 0x82A7)  /* <CJK> */
-MAP(0x57, 0x42, 0x82A8)  /* <CJK> */
-MAP(0x57, 0x43, 0x82A9)  /* <CJK> */
-MAP(0x57, 0x44, 0x82AA)  /* <CJK> */
-MAP(0x57, 0x45, 0x82AE)  /* <CJK> */
-MAP(0x57, 0x46, 0x82B0)  /* <CJK> */
-MAP(0x57, 0x47, 0x82B2)  /* <CJK> */
-MAP(0x57, 0x48, 0x82B4)  /* <CJK> */
-MAP(0x57, 0x49, 0x82B7)  /* <CJK> */
-MAP(0x57, 0x4A, 0x82BA)  /* <CJK> */
-MAP(0x57, 0x4B, 0x82BC)  /* <CJK> */
-MAP(0x57, 0x4C, 0x82BE)  /* <CJK> */
-MAP(0x57, 0x4D, 0x82BF)  /* <CJK> */
-MAP(0x57, 0x4E, 0x82C6)  /* <CJK> */
-MAP(0x57, 0x4F, 0x82D0)  /* <CJK> */
-MAP(0x57, 0x50, 0x82D5)  /* <CJK> */
-MAP(0x57, 0x51, 0x82DA)  /* <CJK> */
-MAP(0x57, 0x52, 0x82E0)  /* <CJK> */
-MAP(0x57, 0x53, 0x82E2)  /* <CJK> */
-MAP(0x57, 0x54, 0x82E4)  /* <CJK> */
-MAP(0x57, 0x55, 0x82E8)  /* <CJK> */
-MAP(0x57, 0x56, 0x82EA)  /* <CJK> */
-MAP(0x57, 0x57, 0x82ED)  /* <CJK> */
-MAP(0x57, 0x58, 0x82EF)  /* <CJK> */
-MAP(0x57, 0x59, 0x82F6)  /* <CJK> */
-MAP(0x57, 0x5A, 0x82F7)  /* <CJK> */
-MAP(0x57, 0x5B, 0x82FD)  /* <CJK> */
-MAP(0x57, 0x5C, 0x82FE)  /* <CJK> */
-MAP(0x57, 0x5D, 0x8300)  /* <CJK> */
-MAP(0x57, 0x5E, 0x8301)  /* <CJK> */
-MAP(0x57, 0x5F, 0x8307)  /* <CJK> */
-MAP(0x57, 0x60, 0x8308)  /* <CJK> */
-MAP(0x57, 0x61, 0x830A)  /* <CJK> */
-MAP(0x57, 0x62, 0x830B)  /* <CJK> */
-MAP(0x57, 0x63, 0x8354)  /* <CJK> */
-MAP(0x57, 0x64, 0x831B)  /* <CJK> */
-MAP(0x57, 0x65, 0x831D)  /* <CJK> */
-MAP(0x57, 0x66, 0x831E)  /* <CJK> */
-MAP(0x57, 0x67, 0x831F)  /* <CJK> */
-MAP(0x57, 0x68, 0x8321)  /* <CJK> */
-MAP(0x57, 0x69, 0x8322)  /* <CJK> */
-MAP(0x57, 0x6A, 0x832C)  /* <CJK> */
-MAP(0x57, 0x6B, 0x832D)  /* <CJK> */
-MAP(0x57, 0x6C, 0x832E)  /* <CJK> */
-MAP(0x57, 0x6D, 0x8330)  /* <CJK> */
-MAP(0x57, 0x6E, 0x8333)  /* <CJK> */
-MAP(0x57, 0x6F, 0x8337)  /* <CJK> */
-MAP(0x57, 0x70, 0x833A)  /* <CJK> */
-MAP(0x57, 0x71, 0x833C)  /* <CJK> */
-MAP(0x57, 0x72, 0x833D)  /* <CJK> */
-MAP(0x57, 0x73, 0x8342)  /* <CJK> */
-MAP(0x57, 0x74, 0x8343)  /* <CJK> */
-MAP(0x57, 0x75, 0x8344)  /* <CJK> */
-MAP(0x57, 0x76, 0x8347)  /* <CJK> */
-MAP(0x57, 0x77, 0x834D)  /* <CJK> */
-MAP(0x57, 0x78, 0x834E)  /* <CJK> */
-MAP(0x57, 0x79, 0x8351)  /* <CJK> */
-MAP(0x57, 0x7A, 0x8355)  /* <CJK> */
-MAP(0x57, 0x7B, 0x8356)  /* <CJK> */
-MAP(0x57, 0x7C, 0x8357)  /* <CJK> */
-MAP(0x57, 0x7D, 0x8370)  /* <CJK> */
-MAP(0x57, 0x7E, 0x8378)  /* <CJK> */
-MAP(0x58, 0x21, 0x837D)  /* <CJK> */
-MAP(0x58, 0x22, 0x837F)  /* <CJK> */
-MAP(0x58, 0x23, 0x8380)  /* <CJK> */
-MAP(0x58, 0x24, 0x8382)  /* <CJK> */
-MAP(0x58, 0x25, 0x8384)  /* <CJK> */
-MAP(0x58, 0x26, 0x8386)  /* <CJK> */
-MAP(0x58, 0x27, 0x838D)  /* <CJK> */
-MAP(0x58, 0x28, 0x8392)  /* <CJK> */
-MAP(0x58, 0x29, 0x8394)  /* <CJK> */
-MAP(0x58, 0x2A, 0x8395)  /* <CJK> */
-MAP(0x58, 0x2B, 0x8398)  /* <CJK> */
-MAP(0x58, 0x2C, 0x8399)  /* <CJK> */
-MAP(0x58, 0x2D, 0x839B)  /* <CJK> */
-MAP(0x58, 0x2E, 0x839C)  /* <CJK> */
-MAP(0x58, 0x2F, 0x839D)  /* <CJK> */
-MAP(0x58, 0x30, 0x83A6)  /* <CJK> */
-MAP(0x58, 0x31, 0x83A7)  /* <CJK> */
-MAP(0x58, 0x32, 0x83A9)  /* <CJK> */
-MAP(0x58, 0x33, 0x83AC)  /* <CJK> */
-MAP(0x58, 0x34, 0x83BE)  /* <CJK> */
-MAP(0x58, 0x35, 0x83BF)  /* <CJK> */
-MAP(0x58, 0x36, 0x83C0)  /* <CJK> */
-MAP(0x58, 0x37, 0x83C7)  /* <CJK> */
-MAP(0x58, 0x38, 0x83C9)  /* <CJK> */
-MAP(0x58, 0x39, 0x83CF)  /* <CJK> */
-MAP(0x58, 0x3A, 0x83D0)  /* <CJK> */
-MAP(0x58, 0x3B, 0x83D1)  /* <CJK> */
-MAP(0x58, 0x3C, 0x83D4)  /* <CJK> */
-MAP(0x58, 0x3D, 0x83DD)  /* <CJK> */
-MAP(0x58, 0x3E, 0x8353)  /* <CJK> */
-MAP(0x58, 0x3F, 0x83E8)  /* <CJK> */
-MAP(0x58, 0x40, 0x83EA)  /* <CJK> */
-MAP(0x58, 0x41, 0x83F6)  /* <CJK> */
-MAP(0x58, 0x42, 0x83F8)  /* <CJK> */
-MAP(0x58, 0x43, 0x83F9)  /* <CJK> */
-MAP(0x58, 0x44, 0x83FC)  /* <CJK> */
-MAP(0x58, 0x45, 0x8401)  /* <CJK> */
-MAP(0x58, 0x46, 0x8406)  /* <CJK> */
-MAP(0x58, 0x47, 0x840A)  /* <CJK> */
-MAP(0x58, 0x48, 0x840F)  /* <CJK> */
-MAP(0x58, 0x49, 0x8411)  /* <CJK> */
-MAP(0x58, 0x4A, 0x8415)  /* <CJK> */
-MAP(0x58, 0x4B, 0x8419)  /* <CJK> */
-MAP(0x58, 0x4C, 0x83AD)  /* <CJK> */
-MAP(0x58, 0x4D, 0x842F)  /* <CJK> */
-MAP(0x58, 0x4E, 0x8439)  /* <CJK> */
-MAP(0x58, 0x4F, 0x8445)  /* <CJK> */
-MAP(0x58, 0x50, 0x8447)  /* <CJK> */
-MAP(0x58, 0x51, 0x8448)  /* <CJK> */
-MAP(0x58, 0x52, 0x844A)  /* <CJK> */
-MAP(0x58, 0x53, 0x844D)  /* <CJK> */
-MAP(0x58, 0x54, 0x844F)  /* <CJK> */
-MAP(0x58, 0x55, 0x8451)  /* <CJK> */
-MAP(0x58, 0x56, 0x8452)  /* <CJK> */
-MAP(0x58, 0x57, 0x8456)  /* <CJK> */
-MAP(0x58, 0x58, 0x8458)  /* <CJK> */
-MAP(0x58, 0x59, 0x8459)  /* <CJK> */
-MAP(0x58, 0x5A, 0x845A)  /* <CJK> */
-MAP(0x58, 0x5B, 0x845C)  /* <CJK> */
-MAP(0x58, 0x5C, 0x8460)  /* <CJK> */
-MAP(0x58, 0x5D, 0x8464)  /* <CJK> */
-MAP(0x58, 0x5E, 0x8465)  /* <CJK> */
-MAP(0x58, 0x5F, 0x8467)  /* <CJK> */
-MAP(0x58, 0x60, 0x846A)  /* <CJK> */
-MAP(0x58, 0x61, 0x8470)  /* <CJK> */
-MAP(0x58, 0x62, 0x8473)  /* <CJK> */
-MAP(0x58, 0x63, 0x8474)  /* <CJK> */
-MAP(0x58, 0x64, 0x8476)  /* <CJK> */
-MAP(0x58, 0x65, 0x8478)  /* <CJK> */
-MAP(0x58, 0x66, 0x847C)  /* <CJK> */
-MAP(0x58, 0x67, 0x847D)  /* <CJK> */
-MAP(0x58, 0x68, 0x8481)  /* <CJK> */
-MAP(0x58, 0x69, 0x8485)  /* <CJK> */
-MAP(0x58, 0x6A, 0x8492)  /* <CJK> */
-MAP(0x58, 0x6B, 0x8493)  /* <CJK> */
-MAP(0x58, 0x6C, 0x8495)  /* <CJK> */
-MAP(0x58, 0x6D, 0x849E)  /* <CJK> */
-MAP(0x58, 0x6E, 0x84A6)  /* <CJK> */
-MAP(0x58, 0x6F, 0x84A8)  /* <CJK> */
-MAP(0x58, 0x70, 0x84A9)  /* <CJK> */
-MAP(0x58, 0x71, 0x84AA)  /* <CJK> */
-MAP(0x58, 0x72, 0x84AF)  /* <CJK> */
-MAP(0x58, 0x73, 0x84B1)  /* <CJK> */
-MAP(0x58, 0x74, 0x84B4)  /* <CJK> */
-MAP(0x58, 0x75, 0x84BA)  /* <CJK> */
-MAP(0x58, 0x76, 0x84BD)  /* <CJK> */
-MAP(0x58, 0x77, 0x84BE)  /* <CJK> */
-MAP(0x58, 0x78, 0x84C0)  /* <CJK> */
-MAP(0x58, 0x79, 0x84C2)  /* <CJK> */
-MAP(0x58, 0x7A, 0x84C7)  /* <CJK> */
-MAP(0x58, 0x7B, 0x84C8)  /* <CJK> */
-MAP(0x58, 0x7C, 0x84CC)  /* <CJK> */
-MAP(0x58, 0x7D, 0x84CF)  /* <CJK> */
-MAP(0x58, 0x7E, 0x84D3)  /* <CJK> */
-MAP(0x59, 0x21, 0x84DC)  /* <CJK> */
-MAP(0x59, 0x22, 0x84E7)  /* <CJK> */
-MAP(0x59, 0x23, 0x84EA)  /* <CJK> */
-MAP(0x59, 0x24, 0x84EF)  /* <CJK> */
-MAP(0x59, 0x25, 0x84F0)  /* <CJK> */
-MAP(0x59, 0x26, 0x84F1)  /* <CJK> */
-MAP(0x59, 0x27, 0x84F2)  /* <CJK> */
-MAP(0x59, 0x28, 0x84F7)  /* <CJK> */
-MAP(0x59, 0x29, 0x8532)  /* <CJK> */
-MAP(0x59, 0x2A, 0x84FA)  /* <CJK> */
-MAP(0x59, 0x2B, 0x84FB)  /* <CJK> */
-MAP(0x59, 0x2C, 0x84FD)  /* <CJK> */
-MAP(0x59, 0x2D, 0x8502)  /* <CJK> */
-MAP(0x59, 0x2E, 0x8503)  /* <CJK> */
-MAP(0x59, 0x2F, 0x8507)  /* <CJK> */
-MAP(0x59, 0x30, 0x850C)  /* <CJK> */
-MAP(0x59, 0x31, 0x850E)  /* <CJK> */
-MAP(0x59, 0x32, 0x8510)  /* <CJK> */
-MAP(0x59, 0x33, 0x851C)  /* <CJK> */
-MAP(0x59, 0x34, 0x851E)  /* <CJK> */
-MAP(0x59, 0x35, 0x8522)  /* <CJK> */
-MAP(0x59, 0x36, 0x8523)  /* <CJK> */
-MAP(0x59, 0x37, 0x8524)  /* <CJK> */
-MAP(0x59, 0x38, 0x8525)  /* <CJK> */
-MAP(0x59, 0x39, 0x8527)  /* <CJK> */
-MAP(0x59, 0x3A, 0x852A)  /* <CJK> */
-MAP(0x59, 0x3B, 0x852B)  /* <CJK> */
-MAP(0x59, 0x3C, 0x852F)  /* <CJK> */
-MAP(0x59, 0x3D, 0x8533)  /* <CJK> */
-MAP(0x59, 0x3E, 0x8534)  /* <CJK> */
-MAP(0x59, 0x3F, 0x8536)  /* <CJK> */
-MAP(0x59, 0x40, 0x853F)  /* <CJK> */
-MAP(0x59, 0x41, 0x8546)  /* <CJK> */
-MAP(0x59, 0x42, 0x854F)  /* <CJK> */
-MAP(0x59, 0x43, 0x8550)  /* <CJK> */
-MAP(0x59, 0x44, 0x8551)  /* <CJK> */
-MAP(0x59, 0x45, 0x8552)  /* <CJK> */
-MAP(0x59, 0x46, 0x8553)  /* <CJK> */
-MAP(0x59, 0x47, 0x8556)  /* <CJK> */
-MAP(0x59, 0x48, 0x8559)  /* <CJK> */
-MAP(0x59, 0x49, 0x855C)  /* <CJK> */
-MAP(0x59, 0x4A, 0x855D)  /* <CJK> */
-MAP(0x59, 0x4B, 0x855E)  /* <CJK> */
-MAP(0x59, 0x4C, 0x855F)  /* <CJK> */
-MAP(0x59, 0x4D, 0x8560)  /* <CJK> */
-MAP(0x59, 0x4E, 0x8561)  /* <CJK> */
-MAP(0x59, 0x4F, 0x8562)  /* <CJK> */
-MAP(0x59, 0x50, 0x8564)  /* <CJK> */
-MAP(0x59, 0x51, 0x856B)  /* <CJK> */
-MAP(0x59, 0x52, 0x856F)  /* <CJK> */
-MAP(0x59, 0x53, 0x8579)  /* <CJK> */
-MAP(0x59, 0x54, 0x857A)  /* <CJK> */
-MAP(0x59, 0x55, 0x857B)  /* <CJK> */
-MAP(0x59, 0x56, 0x857D)  /* <CJK> */
-MAP(0x59, 0x57, 0x857F)  /* <CJK> */
-MAP(0x59, 0x58, 0x8581)  /* <CJK> */
-MAP(0x59, 0x59, 0x8585)  /* <CJK> */
-MAP(0x59, 0x5A, 0x8586)  /* <CJK> */
-MAP(0x59, 0x5B, 0x8589)  /* <CJK> */
-MAP(0x59, 0x5C, 0x858B)  /* <CJK> */
-MAP(0x59, 0x5D, 0x858C)  /* <CJK> */
-MAP(0x59, 0x5E, 0x858F)  /* <CJK> */
-MAP(0x59, 0x5F, 0x8593)  /* <CJK> */
-MAP(0x59, 0x60, 0x8598)  /* <CJK> */
-MAP(0x59, 0x61, 0x859D)  /* <CJK> */
-MAP(0x59, 0x62, 0x859F)  /* <CJK> */
-MAP(0x59, 0x63, 0x85A0)  /* <CJK> */
-MAP(0x59, 0x64, 0x85A2)  /* <CJK> */
-MAP(0x59, 0x65, 0x85A5)  /* <CJK> */
-MAP(0x59, 0x66, 0x85A7)  /* <CJK> */
-MAP(0x59, 0x67, 0x85B4)  /* <CJK> */
-MAP(0x59, 0x68, 0x85B6)  /* <CJK> */
-MAP(0x59, 0x69, 0x85B7)  /* <CJK> */
-MAP(0x59, 0x6A, 0x85B8)  /* <CJK> */
-MAP(0x59, 0x6B, 0x85BC)  /* <CJK> */
-MAP(0x59, 0x6C, 0x85BD)  /* <CJK> */
-MAP(0x59, 0x6D, 0x85BE)  /* <CJK> */
-MAP(0x59, 0x6E, 0x85BF)  /* <CJK> */
-MAP(0x59, 0x6F, 0x85C2)  /* <CJK> */
-MAP(0x59, 0x70, 0x85C7)  /* <CJK> */
-MAP(0x59, 0x71, 0x85CA)  /* <CJK> */
-MAP(0x59, 0x72, 0x85CB)  /* <CJK> */
-MAP(0x59, 0x73, 0x85CE)  /* <CJK> */
-MAP(0x59, 0x74, 0x85AD)  /* <CJK> */
-MAP(0x59, 0x75, 0x85D8)  /* <CJK> */
-MAP(0x59, 0x76, 0x85DA)  /* <CJK> */
-MAP(0x59, 0x77, 0x85DF)  /* <CJK> */
-MAP(0x59, 0x78, 0x85E0)  /* <CJK> */
-MAP(0x59, 0x79, 0x85E6)  /* <CJK> */
-MAP(0x59, 0x7A, 0x85E8)  /* <CJK> */
-MAP(0x59, 0x7B, 0x85ED)  /* <CJK> */
-MAP(0x59, 0x7C, 0x85F3)  /* <CJK> */
-MAP(0x59, 0x7D, 0x85F6)  /* <CJK> */
-MAP(0x59, 0x7E, 0x85FC)  /* <CJK> */
-MAP(0x5A, 0x21, 0x85FF)  /* <CJK> */
-MAP(0x5A, 0x22, 0x8600)  /* <CJK> */
-MAP(0x5A, 0x23, 0x8604)  /* <CJK> */
-MAP(0x5A, 0x24, 0x8605)  /* <CJK> */
-MAP(0x5A, 0x25, 0x860D)  /* <CJK> */
-MAP(0x5A, 0x26, 0x860E)  /* <CJK> */
-MAP(0x5A, 0x27, 0x8610)  /* <CJK> */
-MAP(0x5A, 0x28, 0x8611)  /* <CJK> */
-MAP(0x5A, 0x29, 0x8612)  /* <CJK> */
-MAP(0x5A, 0x2A, 0x8618)  /* <CJK> */
-MAP(0x5A, 0x2B, 0x8619)  /* <CJK> */
-MAP(0x5A, 0x2C, 0x861B)  /* <CJK> */
-MAP(0x5A, 0x2D, 0x861E)  /* <CJK> */
-MAP(0x5A, 0x2E, 0x8621)  /* <CJK> */
-MAP(0x5A, 0x2F, 0x8627)  /* <CJK> */
-MAP(0x5A, 0x30, 0x8629)  /* <CJK> */
-MAP(0x5A, 0x31, 0x8636)  /* <CJK> */
-MAP(0x5A, 0x32, 0x8638)  /* <CJK> */
-MAP(0x5A, 0x33, 0x863A)  /* <CJK> */
-MAP(0x5A, 0x34, 0x863C)  /* <CJK> */
-MAP(0x5A, 0x35, 0x863D)  /* <CJK> */
-MAP(0x5A, 0x36, 0x8640)  /* <CJK> */
-MAP(0x5A, 0x37, 0x8642)  /* <CJK> */
-MAP(0x5A, 0x38, 0x8646)  /* <CJK> */
-MAP(0x5A, 0x39, 0x8652)  /* <CJK> */
-MAP(0x5A, 0x3A, 0x8653)  /* <CJK> */
-MAP(0x5A, 0x3B, 0x8656)  /* <CJK> */
-MAP(0x5A, 0x3C, 0x8657)  /* <CJK> */
-MAP(0x5A, 0x3D, 0x8658)  /* <CJK> */
-MAP(0x5A, 0x3E, 0x8659)  /* <CJK> */
-MAP(0x5A, 0x3F, 0x865D)  /* <CJK> */
-MAP(0x5A, 0x40, 0x8660)  /* <CJK> */
-MAP(0x5A, 0x41, 0x8661)  /* <CJK> */
-MAP(0x5A, 0x42, 0x8662)  /* <CJK> */
-MAP(0x5A, 0x43, 0x8663)  /* <CJK> */
-MAP(0x5A, 0x44, 0x8664)  /* <CJK> */
-MAP(0x5A, 0x45, 0x8669)  /* <CJK> */
-MAP(0x5A, 0x46, 0x866C)  /* <CJK> */
-MAP(0x5A, 0x47, 0x866F)  /* <CJK> */
-MAP(0x5A, 0x48, 0x8675)  /* <CJK> */
-MAP(0x5A, 0x49, 0x8676)  /* <CJK> */
-MAP(0x5A, 0x4A, 0x8677)  /* <CJK> */
-MAP(0x5A, 0x4B, 0x867A)  /* <CJK> */
-MAP(0x5A, 0x4C, 0x868D)  /* <CJK> */
-MAP(0x5A, 0x4D, 0x8691)  /* <CJK> */
-MAP(0x5A, 0x4E, 0x8696)  /* <CJK> */
-MAP(0x5A, 0x4F, 0x8698)  /* <CJK> */
-MAP(0x5A, 0x50, 0x869A)  /* <CJK> */
-MAP(0x5A, 0x51, 0x869C)  /* <CJK> */
-MAP(0x5A, 0x52, 0x86A1)  /* <CJK> */
-MAP(0x5A, 0x53, 0x86A6)  /* <CJK> */
-MAP(0x5A, 0x54, 0x86A7)  /* <CJK> */
-MAP(0x5A, 0x55, 0x86A8)  /* <CJK> */
-MAP(0x5A, 0x56, 0x86AD)  /* <CJK> */
-MAP(0x5A, 0x57, 0x86B1)  /* <CJK> */
-MAP(0x5A, 0x58, 0x86B3)  /* <CJK> */
-MAP(0x5A, 0x59, 0x86B4)  /* <CJK> */
-MAP(0x5A, 0x5A, 0x86B5)  /* <CJK> */
-MAP(0x5A, 0x5B, 0x86B7)  /* <CJK> */
-MAP(0x5A, 0x5C, 0x86B8)  /* <CJK> */
-MAP(0x5A, 0x5D, 0x86B9)  /* <CJK> */
-MAP(0x5A, 0x5E, 0x86BF)  /* <CJK> */
-MAP(0x5A, 0x5F, 0x86C0)  /* <CJK> */
-MAP(0x5A, 0x60, 0x86C1)  /* <CJK> */
-MAP(0x5A, 0x61, 0x86C3)  /* <CJK> */
-MAP(0x5A, 0x62, 0x86C5)  /* <CJK> */
-MAP(0x5A, 0x63, 0x86D1)  /* <CJK> */
-MAP(0x5A, 0x64, 0x86D2)  /* <CJK> */
-MAP(0x5A, 0x65, 0x86D5)  /* <CJK> */
-MAP(0x5A, 0x66, 0x86D7)  /* <CJK> */
-MAP(0x5A, 0x67, 0x86DA)  /* <CJK> */
-MAP(0x5A, 0x68, 0x86DC)  /* <CJK> */
-MAP(0x5A, 0x69, 0x86E0)  /* <CJK> */
-MAP(0x5A, 0x6A, 0x86E3)  /* <CJK> */
-MAP(0x5A, 0x6B, 0x86E5)  /* <CJK> */
-MAP(0x5A, 0x6C, 0x86E7)  /* <CJK> */
-MAP(0x5A, 0x6D, 0x8688)  /* <CJK> */
-MAP(0x5A, 0x6E, 0x86FA)  /* <CJK> */
-MAP(0x5A, 0x6F, 0x86FC)  /* <CJK> */
-MAP(0x5A, 0x70, 0x86FD)  /* <CJK> */
-MAP(0x5A, 0x71, 0x8704)  /* <CJK> */
-MAP(0x5A, 0x72, 0x8705)  /* <CJK> */
-MAP(0x5A, 0x73, 0x8707)  /* <CJK> */
-MAP(0x5A, 0x74, 0x870B)  /* <CJK> */
-MAP(0x5A, 0x75, 0x870E)  /* <CJK> */
-MAP(0x5A, 0x76, 0x870F)  /* <CJK> */
-MAP(0x5A, 0x77, 0x8710)  /* <CJK> */
-MAP(0x5A, 0x78, 0x8713)  /* <CJK> */
-MAP(0x5A, 0x79, 0x8714)  /* <CJK> */
-MAP(0x5A, 0x7A, 0x8719)  /* <CJK> */
-MAP(0x5A, 0x7B, 0x871E)  /* <CJK> */
-MAP(0x5A, 0x7C, 0x871F)  /* <CJK> */
-MAP(0x5A, 0x7D, 0x8721)  /* <CJK> */
-MAP(0x5A, 0x7E, 0x8723)  /* <CJK> */
-MAP(0x5B, 0x21, 0x8728)  /* <CJK> */
-MAP(0x5B, 0x22, 0x872E)  /* <CJK> */
-MAP(0x5B, 0x23, 0x872F)  /* <CJK> */
-MAP(0x5B, 0x24, 0x8731)  /* <CJK> */
-MAP(0x5B, 0x25, 0x8732)  /* <CJK> */
-MAP(0x5B, 0x26, 0x8739)  /* <CJK> */
-MAP(0x5B, 0x27, 0x873A)  /* <CJK> */
-MAP(0x5B, 0x28, 0x873C)  /* <CJK> */
-MAP(0x5B, 0x29, 0x873D)  /* <CJK> */
-MAP(0x5B, 0x2A, 0x873E)  /* <CJK> */
-MAP(0x5B, 0x2B, 0x8740)  /* <CJK> */
-MAP(0x5B, 0x2C, 0x8743)  /* <CJK> */
-MAP(0x5B, 0x2D, 0x8745)  /* <CJK> */
-MAP(0x5B, 0x2E, 0x874D)  /* <CJK> */
-MAP(0x5B, 0x2F, 0x8758)  /* <CJK> */
-MAP(0x5B, 0x30, 0x875D)  /* <CJK> */
-MAP(0x5B, 0x31, 0x8761)  /* <CJK> */
-MAP(0x5B, 0x32, 0x8764)  /* <CJK> */
-MAP(0x5B, 0x33, 0x8765)  /* <CJK> */
-MAP(0x5B, 0x34, 0x876F)  /* <CJK> */
-MAP(0x5B, 0x35, 0x8771)  /* <CJK> */
-MAP(0x5B, 0x36, 0x8772)  /* <CJK> */
-MAP(0x5B, 0x37, 0x877B)  /* <CJK> */
-MAP(0x5B, 0x38, 0x8783)  /* <CJK> */
-MAP(0x5B, 0x39, 0x8784)  /* <CJK> */
-MAP(0x5B, 0x3A, 0x8785)  /* <CJK> */
-MAP(0x5B, 0x3B, 0x8786)  /* <CJK> */
-MAP(0x5B, 0x3C, 0x8787)  /* <CJK> */
-MAP(0x5B, 0x3D, 0x8788)  /* <CJK> */
-MAP(0x5B, 0x3E, 0x8789)  /* <CJK> */
-MAP(0x5B, 0x3F, 0x878B)  /* <CJK> */
-MAP(0x5B, 0x40, 0x878C)  /* <CJK> */
-MAP(0x5B, 0x41, 0x8790)  /* <CJK> */
-MAP(0x5B, 0x42, 0x8793)  /* <CJK> */
-MAP(0x5B, 0x43, 0x8795)  /* <CJK> */
-MAP(0x5B, 0x44, 0x8797)  /* <CJK> */
-MAP(0x5B, 0x45, 0x8798)  /* <CJK> */
-MAP(0x5B, 0x46, 0x8799)  /* <CJK> */
-MAP(0x5B, 0x47, 0x879E)  /* <CJK> */
-MAP(0x5B, 0x48, 0x87A0)  /* <CJK> */
-MAP(0x5B, 0x49, 0x87A3)  /* <CJK> */
-MAP(0x5B, 0x4A, 0x87A7)  /* <CJK> */
-MAP(0x5B, 0x4B, 0x87AC)  /* <CJK> */
-MAP(0x5B, 0x4C, 0x87AD)  /* <CJK> */
-MAP(0x5B, 0x4D, 0x87AE)  /* <CJK> */
-MAP(0x5B, 0x4E, 0x87B1)  /* <CJK> */
-MAP(0x5B, 0x4F, 0x87B5)  /* <CJK> */
-MAP(0x5B, 0x50, 0x87BE)  /* <CJK> */
-MAP(0x5B, 0x51, 0x87BF)  /* <CJK> */
-MAP(0x5B, 0x52, 0x87C1)  /* <CJK> */
-MAP(0x5B, 0x53, 0x87C8)  /* <CJK> */
-MAP(0x5B, 0x54, 0x87C9)  /* <CJK> */
-MAP(0x5B, 0x55, 0x87CA)  /* <CJK> */
-MAP(0x5B, 0x56, 0x87CE)  /* <CJK> */
-MAP(0x5B, 0x57, 0x87D5)  /* <CJK> */
-MAP(0x5B, 0x58, 0x87D6)  /* <CJK> */
-MAP(0x5B, 0x59, 0x87D9)  /* <CJK> */
-MAP(0x5B, 0x5A, 0x87DA)  /* <CJK> */
-MAP(0x5B, 0x5B, 0x87DC)  /* <CJK> */
-MAP(0x5B, 0x5C, 0x87DF)  /* <CJK> */
-MAP(0x5B, 0x5D, 0x87E2)  /* <CJK> */
-MAP(0x5B, 0x5E, 0x87E3)  /* <CJK> */
-MAP(0x5B, 0x5F, 0x87E4)  /* <CJK> */
-MAP(0x5B, 0x60, 0x87EA)  /* <CJK> */
-MAP(0x5B, 0x61, 0x87EB)  /* <CJK> */
-MAP(0x5B, 0x62, 0x87ED)  /* <CJK> */
-MAP(0x5B, 0x63, 0x87F1)  /* <CJK> */
-MAP(0x5B, 0x64, 0x87F3)  /* <CJK> */
-MAP(0x5B, 0x65, 0x87F8)  /* <CJK> */
-MAP(0x5B, 0x66, 0x87FA)  /* <CJK> */
-MAP(0x5B, 0x67, 0x87FF)  /* <CJK> */
-MAP(0x5B, 0x68, 0x8801)  /* <CJK> */
-MAP(0x5B, 0x69, 0x8803)  /* <CJK> */
-MAP(0x5B, 0x6A, 0x8806)  /* <CJK> */
-MAP(0x5B, 0x6B, 0x8809)  /* <CJK> */
-MAP(0x5B, 0x6C, 0x880A)  /* <CJK> */
-MAP(0x5B, 0x6D, 0x880B)  /* <CJK> */
-MAP(0x5B, 0x6E, 0x8810)  /* <CJK> */
-MAP(0x5B, 0x6F, 0x8819)  /* <CJK> */
-MAP(0x5B, 0x70, 0x8812)  /* <CJK> */
-MAP(0x5B, 0x71, 0x8813)  /* <CJK> */
-MAP(0x5B, 0x72, 0x8814)  /* <CJK> */
-MAP(0x5B, 0x73, 0x8818)  /* <CJK> */
-MAP(0x5B, 0x74, 0x881A)  /* <CJK> */
-MAP(0x5B, 0x75, 0x881B)  /* <CJK> */
-MAP(0x5B, 0x76, 0x881C)  /* <CJK> */
-MAP(0x5B, 0x77, 0x881E)  /* <CJK> */
-MAP(0x5B, 0x78, 0x881F)  /* <CJK> */
-MAP(0x5B, 0x79, 0x8828)  /* <CJK> */
-MAP(0x5B, 0x7A, 0x882D)  /* <CJK> */
-MAP(0x5B, 0x7B, 0x882E)  /* <CJK> */
-MAP(0x5B, 0x7C, 0x8830)  /* <CJK> */
-MAP(0x5B, 0x7D, 0x8832)  /* <CJK> */
-MAP(0x5B, 0x7E, 0x8835)  /* <CJK> */
-MAP(0x5C, 0x21, 0x883A)  /* <CJK> */
-MAP(0x5C, 0x22, 0x883C)  /* <CJK> */
-MAP(0x5C, 0x23, 0x8841)  /* <CJK> */
-MAP(0x5C, 0x24, 0x8843)  /* <CJK> */
-MAP(0x5C, 0x25, 0x8845)  /* <CJK> */
-MAP(0x5C, 0x26, 0x8848)  /* <CJK> */
-MAP(0x5C, 0x27, 0x8849)  /* <CJK> */
-MAP(0x5C, 0x28, 0x884A)  /* <CJK> */
-MAP(0x5C, 0x29, 0x884B)  /* <CJK> */
-MAP(0x5C, 0x2A, 0x884E)  /* <CJK> */
-MAP(0x5C, 0x2B, 0x8851)  /* <CJK> */
-MAP(0x5C, 0x2C, 0x8855)  /* <CJK> */
-MAP(0x5C, 0x2D, 0x8856)  /* <CJK> */
-MAP(0x5C, 0x2E, 0x8858)  /* <CJK> */
-MAP(0x5C, 0x2F, 0x885A)  /* <CJK> */
-MAP(0x5C, 0x30, 0x885C)  /* <CJK> */
-MAP(0x5C, 0x31, 0x885F)  /* <CJK> */
-MAP(0x5C, 0x32, 0x8860)  /* <CJK> */
-MAP(0x5C, 0x33, 0x8864)  /* <CJK> */
-MAP(0x5C, 0x34, 0x8869)  /* <CJK> */
-MAP(0x5C, 0x35, 0x8871)  /* <CJK> */
-MAP(0x5C, 0x36, 0x8879)  /* <CJK> */
-MAP(0x5C, 0x37, 0x887B)  /* <CJK> */
-MAP(0x5C, 0x38, 0x8880)  /* <CJK> */
-MAP(0x5C, 0x39, 0x8898)  /* <CJK> */
-MAP(0x5C, 0x3A, 0x889A)  /* <CJK> */
-MAP(0x5C, 0x3B, 0x889B)  /* <CJK> */
-MAP(0x5C, 0x3C, 0x889C)  /* <CJK> */
-MAP(0x5C, 0x3D, 0x889F)  /* <CJK> */
-MAP(0x5C, 0x3E, 0x88A0)  /* <CJK> */
-MAP(0x5C, 0x3F, 0x88A8)  /* <CJK> */
-MAP(0x5C, 0x40, 0x88AA)  /* <CJK> */
-MAP(0x5C, 0x41, 0x88BA)  /* <CJK> */
-MAP(0x5C, 0x42, 0x88BD)  /* <CJK> */
-MAP(0x5C, 0x43, 0x88BE)  /* <CJK> */
-MAP(0x5C, 0x44, 0x88C0)  /* <CJK> */
-MAP(0x5C, 0x45, 0x88CA)  /* <CJK> */
-MAP(0x5C, 0x46, 0x88CB)  /* <CJK> */
-MAP(0x5C, 0x47, 0x88CC)  /* <CJK> */
-MAP(0x5C, 0x48, 0x88CD)  /* <CJK> */
-MAP(0x5C, 0x49, 0x88CE)  /* <CJK> */
-MAP(0x5C, 0x4A, 0x88D1)  /* <CJK> */
-MAP(0x5C, 0x4B, 0x88D2)  /* <CJK> */
-MAP(0x5C, 0x4C, 0x88D3)  /* <CJK> */
-MAP(0x5C, 0x4D, 0x88DB)  /* <CJK> */
-MAP(0x5C, 0x4E, 0x88DE)  /* <CJK> */
-MAP(0x5C, 0x4F, 0x88E7)  /* <CJK> */
-MAP(0x5C, 0x50, 0x88EF)  /* <CJK> */
-MAP(0x5C, 0x51, 0x88F0)  /* <CJK> */
-MAP(0x5C, 0x52, 0x88F1)  /* <CJK> */
-MAP(0x5C, 0x53, 0x88F5)  /* <CJK> */
-MAP(0x5C, 0x54, 0x88F7)  /* <CJK> */
-MAP(0x5C, 0x55, 0x8901)  /* <CJK> */
-MAP(0x5C, 0x56, 0x8906)  /* <CJK> */
-MAP(0x5C, 0x57, 0x890D)  /* <CJK> */
-MAP(0x5C, 0x58, 0x890E)  /* <CJK> */
-MAP(0x5C, 0x59, 0x890F)  /* <CJK> */
-MAP(0x5C, 0x5A, 0x8915)  /* <CJK> */
-MAP(0x5C, 0x5B, 0x8916)  /* <CJK> */
-MAP(0x5C, 0x5C, 0x8918)  /* <CJK> */
-MAP(0x5C, 0x5D, 0x8919)  /* <CJK> */
-MAP(0x5C, 0x5E, 0x891A)  /* <CJK> */
-MAP(0x5C, 0x5F, 0x891C)  /* <CJK> */
-MAP(0x5C, 0x60, 0x8920)  /* <CJK> */
-MAP(0x5C, 0x61, 0x8926)  /* <CJK> */
-MAP(0x5C, 0x62, 0x8927)  /* <CJK> */
-MAP(0x5C, 0x63, 0x8928)  /* <CJK> */
-MAP(0x5C, 0x64, 0x8930)  /* <CJK> */
-MAP(0x5C, 0x65, 0x8931)  /* <CJK> */
-MAP(0x5C, 0x66, 0x8932)  /* <CJK> */
-MAP(0x5C, 0x67, 0x8935)  /* <CJK> */
-MAP(0x5C, 0x68, 0x8939)  /* <CJK> */
-MAP(0x5C, 0x69, 0x893A)  /* <CJK> */
-MAP(0x5C, 0x6A, 0x893E)  /* <CJK> */
-MAP(0x5C, 0x6B, 0x8940)  /* <CJK> */
-MAP(0x5C, 0x6C, 0x8942)  /* <CJK> */
-MAP(0x5C, 0x6D, 0x8945)  /* <CJK> */
-MAP(0x5C, 0x6E, 0x8946)  /* <CJK> */
-MAP(0x5C, 0x6F, 0x8949)  /* <CJK> */
-MAP(0x5C, 0x70, 0x894F)  /* <CJK> */
-MAP(0x5C, 0x71, 0x8952)  /* <CJK> */
-MAP(0x5C, 0x72, 0x8957)  /* <CJK> */
-MAP(0x5C, 0x73, 0x895A)  /* <CJK> */
-MAP(0x5C, 0x74, 0x895B)  /* <CJK> */
-MAP(0x5C, 0x75, 0x895C)  /* <CJK> */
-MAP(0x5C, 0x76, 0x8961)  /* <CJK> */
-MAP(0x5C, 0x77, 0x8962)  /* <CJK> */
-MAP(0x5C, 0x78, 0x8963)  /* <CJK> */
-MAP(0x5C, 0x79, 0x896B)  /* <CJK> */
-MAP(0x5C, 0x7A, 0x896E)  /* <CJK> */
-MAP(0x5C, 0x7B, 0x8970)  /* <CJK> */
-MAP(0x5C, 0x7C, 0x8973)  /* <CJK> */
-MAP(0x5C, 0x7D, 0x8975)  /* <CJK> */
-MAP(0x5C, 0x7E, 0x897A)  /* <CJK> */
-MAP(0x5D, 0x21, 0x897B)  /* <CJK> */
-MAP(0x5D, 0x22, 0x897C)  /* <CJK> */
-MAP(0x5D, 0x23, 0x897D)  /* <CJK> */
-MAP(0x5D, 0x24, 0x8989)  /* <CJK> */
-MAP(0x5D, 0x25, 0x898D)  /* <CJK> */
-MAP(0x5D, 0x26, 0x8990)  /* <CJK> */
-MAP(0x5D, 0x27, 0x8994)  /* <CJK> */
-MAP(0x5D, 0x28, 0x8995)  /* <CJK> */
-MAP(0x5D, 0x29, 0x899B)  /* <CJK> */
-MAP(0x5D, 0x2A, 0x899C)  /* <CJK> */
-MAP(0x5D, 0x2B, 0x899F)  /* <CJK> */
-MAP(0x5D, 0x2C, 0x89A0)  /* <CJK> */
-MAP(0x5D, 0x2D, 0x89A5)  /* <CJK> */
-MAP(0x5D, 0x2E, 0x89B0)  /* <CJK> */
-MAP(0x5D, 0x2F, 0x89B4)  /* <CJK> */
-MAP(0x5D, 0x30, 0x89B5)  /* <CJK> */
-MAP(0x5D, 0x31, 0x89B6)  /* <CJK> */
-MAP(0x5D, 0x32, 0x89B7)  /* <CJK> */
-MAP(0x5D, 0x33, 0x89BC)  /* <CJK> */
-MAP(0x5D, 0x34, 0x89D4)  /* <CJK> */
-MAP(0x5D, 0x35, 0x89D5)  /* <CJK> */
-MAP(0x5D, 0x36, 0x89D6)  /* <CJK> */
-MAP(0x5D, 0x37, 0x89D7)  /* <CJK> */
-MAP(0x5D, 0x38, 0x89D8)  /* <CJK> */
-MAP(0x5D, 0x39, 0x89E5)  /* <CJK> */
-MAP(0x5D, 0x3A, 0x89E9)  /* <CJK> */
-MAP(0x5D, 0x3B, 0x89EB)  /* <CJK> */
-MAP(0x5D, 0x3C, 0x89ED)  /* <CJK> */
-MAP(0x5D, 0x3D, 0x89F1)  /* <CJK> */
-MAP(0x5D, 0x3E, 0x89F3)  /* <CJK> */
-MAP(0x5D, 0x3F, 0x89F6)  /* <CJK> */
-MAP(0x5D, 0x40, 0x89F9)  /* <CJK> */
-MAP(0x5D, 0x41, 0x89FD)  /* <CJK> */
-MAP(0x5D, 0x42, 0x89FF)  /* <CJK> */
-MAP(0x5D, 0x43, 0x8A04)  /* <CJK> */
-MAP(0x5D, 0x44, 0x8A05)  /* <CJK> */
-MAP(0x5D, 0x45, 0x8A07)  /* <CJK> */
-MAP(0x5D, 0x46, 0x8A0F)  /* <CJK> */
-MAP(0x5D, 0x47, 0x8A11)  /* <CJK> */
-MAP(0x5D, 0x48, 0x8A12)  /* <CJK> */
-MAP(0x5D, 0x49, 0x8A14)  /* <CJK> */
-MAP(0x5D, 0x4A, 0x8A15)  /* <CJK> */
-MAP(0x5D, 0x4B, 0x8A1E)  /* <CJK> */
-MAP(0x5D, 0x4C, 0x8A20)  /* <CJK> */
-MAP(0x5D, 0x4D, 0x8A22)  /* <CJK> */
-MAP(0x5D, 0x4E, 0x8A24)  /* <CJK> */
-MAP(0x5D, 0x4F, 0x8A26)  /* <CJK> */
-MAP(0x5D, 0x50, 0x8A2B)  /* <CJK> */
-MAP(0x5D, 0x51, 0x8A2C)  /* <CJK> */
-MAP(0x5D, 0x52, 0x8A2F)  /* <CJK> */
-MAP(0x5D, 0x53, 0x8A35)  /* <CJK> */
-MAP(0x5D, 0x54, 0x8A37)  /* <CJK> */
-MAP(0x5D, 0x55, 0x8A3D)  /* <CJK> */
-MAP(0x5D, 0x56, 0x8A3E)  /* <CJK> */
-MAP(0x5D, 0x57, 0x8A40)  /* <CJK> */
-MAP(0x5D, 0x58, 0x8A43)  /* <CJK> */
-MAP(0x5D, 0x59, 0x8A45)  /* <CJK> */
-MAP(0x5D, 0x5A, 0x8A47)  /* <CJK> */
-MAP(0x5D, 0x5B, 0x8A49)  /* <CJK> */
-MAP(0x5D, 0x5C, 0x8A4D)  /* <CJK> */
-MAP(0x5D, 0x5D, 0x8A4E)  /* <CJK> */
-MAP(0x5D, 0x5E, 0x8A53)  /* <CJK> */
-MAP(0x5D, 0x5F, 0x8A56)  /* <CJK> */
-MAP(0x5D, 0x60, 0x8A57)  /* <CJK> */
-MAP(0x5D, 0x61, 0x8A58)  /* <CJK> */
-MAP(0x5D, 0x62, 0x8A5C)  /* <CJK> */
-MAP(0x5D, 0x63, 0x8A5D)  /* <CJK> */
-MAP(0x5D, 0x64, 0x8A61)  /* <CJK> */
-MAP(0x5D, 0x65, 0x8A65)  /* <CJK> */
-MAP(0x5D, 0x66, 0x8A67)  /* <CJK> */
-MAP(0x5D, 0x67, 0x8A75)  /* <CJK> */
-MAP(0x5D, 0x68, 0x8A76)  /* <CJK> */
-MAP(0x5D, 0x69, 0x8A77)  /* <CJK> */
-MAP(0x5D, 0x6A, 0x8A79)  /* <CJK> */
-MAP(0x5D, 0x6B, 0x8A7A)  /* <CJK> */
-MAP(0x5D, 0x6C, 0x8A7B)  /* <CJK> */
-MAP(0x5D, 0x6D, 0x8A7E)  /* <CJK> */
-MAP(0x5D, 0x6E, 0x8A7F)  /* <CJK> */
-MAP(0x5D, 0x6F, 0x8A80)  /* <CJK> */
-MAP(0x5D, 0x70, 0x8A83)  /* <CJK> */
-MAP(0x5D, 0x71, 0x8A86)  /* <CJK> */
-MAP(0x5D, 0x72, 0x8A8B)  /* <CJK> */
-MAP(0x5D, 0x73, 0x8A8F)  /* <CJK> */
-MAP(0x5D, 0x74, 0x8A90)  /* <CJK> */
-MAP(0x5D, 0x75, 0x8A92)  /* <CJK> */
-MAP(0x5D, 0x76, 0x8A96)  /* <CJK> */
-MAP(0x5D, 0x77, 0x8A97)  /* <CJK> */
-MAP(0x5D, 0x78, 0x8A99)  /* <CJK> */
-MAP(0x5D, 0x79, 0x8A9F)  /* <CJK> */
-MAP(0x5D, 0x7A, 0x8AA7)  /* <CJK> */
-MAP(0x5D, 0x7B, 0x8AA9)  /* <CJK> */
-MAP(0x5D, 0x7C, 0x8AAE)  /* <CJK> */
-MAP(0x5D, 0x7D, 0x8AAF)  /* <CJK> */
-MAP(0x5D, 0x7E, 0x8AB3)  /* <CJK> */
-MAP(0x5E, 0x21, 0x8AB6)  /* <CJK> */
-MAP(0x5E, 0x22, 0x8AB7)  /* <CJK> */
-MAP(0x5E, 0x23, 0x8ABB)  /* <CJK> */
-MAP(0x5E, 0x24, 0x8ABE)  /* <CJK> */
-MAP(0x5E, 0x25, 0x8AC3)  /* <CJK> */
-MAP(0x5E, 0x26, 0x8AC6)  /* <CJK> */
-MAP(0x5E, 0x27, 0x8AC8)  /* <CJK> */
-MAP(0x5E, 0x28, 0x8AC9)  /* <CJK> */
-MAP(0x5E, 0x29, 0x8ACA)  /* <CJK> */
-MAP(0x5E, 0x2A, 0x8AD1)  /* <CJK> */
-MAP(0x5E, 0x2B, 0x8AD3)  /* <CJK> */
-MAP(0x5E, 0x2C, 0x8AD4)  /* <CJK> */
-MAP(0x5E, 0x2D, 0x8AD5)  /* <CJK> */
-MAP(0x5E, 0x2E, 0x8AD7)  /* <CJK> */
-MAP(0x5E, 0x2F, 0x8ADD)  /* <CJK> */
-MAP(0x5E, 0x30, 0x8ADF)  /* <CJK> */
-MAP(0x5E, 0x31, 0x8AEC)  /* <CJK> */
-MAP(0x5E, 0x32, 0x8AF0)  /* <CJK> */
-MAP(0x5E, 0x33, 0x8AF4)  /* <CJK> */
-MAP(0x5E, 0x34, 0x8AF5)  /* <CJK> */
-MAP(0x5E, 0x35, 0x8AF6)  /* <CJK> */
-MAP(0x5E, 0x36, 0x8AFC)  /* <CJK> */
-MAP(0x5E, 0x37, 0x8AFF)  /* <CJK> */
-MAP(0x5E, 0x38, 0x8B05)  /* <CJK> */
-MAP(0x5E, 0x39, 0x8B06)  /* <CJK> */
-MAP(0x5E, 0x3A, 0x8B0B)  /* <CJK> */
-MAP(0x5E, 0x3B, 0x8B11)  /* <CJK> */
-MAP(0x5E, 0x3C, 0x8B1C)  /* <CJK> */
-MAP(0x5E, 0x3D, 0x8B1E)  /* <CJK> */
-MAP(0x5E, 0x3E, 0x8B1F)  /* <CJK> */
-MAP(0x5E, 0x3F, 0x8B0A)  /* <CJK> */
-MAP(0x5E, 0x40, 0x8B2D)  /* <CJK> */
-MAP(0x5E, 0x41, 0x8B30)  /* <CJK> */
-MAP(0x5E, 0x42, 0x8B37)  /* <CJK> */
-MAP(0x5E, 0x43, 0x8B3C)  /* <CJK> */
-MAP(0x5E, 0x44, 0x8B42)  /* <CJK> */
-MAP(0x5E, 0x45, 0x8B43)  /* <CJK> */
-MAP(0x5E, 0x46, 0x8B44)  /* <CJK> */
-MAP(0x5E, 0x47, 0x8B45)  /* <CJK> */
-MAP(0x5E, 0x48, 0x8B46)  /* <CJK> */
-MAP(0x5E, 0x49, 0x8B48)  /* <CJK> */
-MAP(0x5E, 0x4A, 0x8B52)  /* <CJK> */
-MAP(0x5E, 0x4B, 0x8B53)  /* <CJK> */
-MAP(0x5E, 0x4C, 0x8B54)  /* <CJK> */
-MAP(0x5E, 0x4D, 0x8B59)  /* <CJK> */
-MAP(0x5E, 0x4E, 0x8B4D)  /* <CJK> */
-MAP(0x5E, 0x4F, 0x8B5E)  /* <CJK> */
-MAP(0x5E, 0x50, 0x8B63)  /* <CJK> */
-MAP(0x5E, 0x51, 0x8B6D)  /* <CJK> */
-MAP(0x5E, 0x52, 0x8B76)  /* <CJK> */
-MAP(0x5E, 0x53, 0x8B78)  /* <CJK> */
-MAP(0x5E, 0x54, 0x8B79)  /* <CJK> */
-MAP(0x5E, 0x55, 0x8B7C)  /* <CJK> */
-MAP(0x5E, 0x56, 0x8B7E)  /* <CJK> */
-MAP(0x5E, 0x57, 0x8B81)  /* <CJK> */
-MAP(0x5E, 0x58, 0x8B84)  /* <CJK> */
-MAP(0x5E, 0x59, 0x8B85)  /* <CJK> */
-MAP(0x5E, 0x5A, 0x8B8B)  /* <CJK> */
-MAP(0x5E, 0x5B, 0x8B8D)  /* <CJK> */
-MAP(0x5E, 0x5C, 0x8B8F)  /* <CJK> */
-MAP(0x5E, 0x5D, 0x8B94)  /* <CJK> */
-MAP(0x5E, 0x5E, 0x8B95)  /* <CJK> */
-MAP(0x5E, 0x5F, 0x8B9C)  /* <CJK> */
-MAP(0x5E, 0x60, 0x8B9E)  /* <CJK> */
-MAP(0x5E, 0x61, 0x8B9F)  /* <CJK> */
-MAP(0x5E, 0x62, 0x8C38)  /* <CJK> */
-MAP(0x5E, 0x63, 0x8C39)  /* <CJK> */
-MAP(0x5E, 0x64, 0x8C3D)  /* <CJK> */
-MAP(0x5E, 0x65, 0x8C3E)  /* <CJK> */
-MAP(0x5E, 0x66, 0x8C45)  /* <CJK> */
-MAP(0x5E, 0x67, 0x8C47)  /* <CJK> */
-MAP(0x5E, 0x68, 0x8C49)  /* <CJK> */
-MAP(0x5E, 0x69, 0x8C4B)  /* <CJK> */
-MAP(0x5E, 0x6A, 0x8C4F)  /* <CJK> */
-MAP(0x5E, 0x6B, 0x8C51)  /* <CJK> */
-MAP(0x5E, 0x6C, 0x8C53)  /* <CJK> */
-MAP(0x5E, 0x6D, 0x8C54)  /* <CJK> */
-MAP(0x5E, 0x6E, 0x8C57)  /* <CJK> */
-MAP(0x5E, 0x6F, 0x8C58)  /* <CJK> */
-MAP(0x5E, 0x70, 0x8C5B)  /* <CJK> */
-MAP(0x5E, 0x71, 0x8C5D)  /* <CJK> */
-MAP(0x5E, 0x72, 0x8C59)  /* <CJK> */
-MAP(0x5E, 0x73, 0x8C63)  /* <CJK> */
-MAP(0x5E, 0x74, 0x8C64)  /* <CJK> */
-MAP(0x5E, 0x75, 0x8C66)  /* <CJK> */
-MAP(0x5E, 0x76, 0x8C68)  /* <CJK> */
-MAP(0x5E, 0x77, 0x8C69)  /* <CJK> */
-MAP(0x5E, 0x78, 0x8C6D)  /* <CJK> */
-MAP(0x5E, 0x79, 0x8C73)  /* <CJK> */
-MAP(0x5E, 0x7A, 0x8C75)  /* <CJK> */
-MAP(0x5E, 0x7B, 0x8C76)  /* <CJK> */
-MAP(0x5E, 0x7C, 0x8C7B)  /* <CJK> */
-MAP(0x5E, 0x7D, 0x8C7E)  /* <CJK> */
-MAP(0x5E, 0x7E, 0x8C86)  /* <CJK> */
-MAP(0x5F, 0x21, 0x8C87)  /* <CJK> */
-MAP(0x5F, 0x22, 0x8C8B)  /* <CJK> */
-MAP(0x5F, 0x23, 0x8C90)  /* <CJK> */
-MAP(0x5F, 0x24, 0x8C92)  /* <CJK> */
-MAP(0x5F, 0x25, 0x8C93)  /* <CJK> */
-MAP(0x5F, 0x26, 0x8C99)  /* <CJK> */
-MAP(0x5F, 0x27, 0x8C9B)  /* <CJK> */
-MAP(0x5F, 0x28, 0x8C9C)  /* <CJK> */
-MAP(0x5F, 0x29, 0x8CA4)  /* <CJK> */
-MAP(0x5F, 0x2A, 0x8CB9)  /* <CJK> */
-MAP(0x5F, 0x2B, 0x8CBA)  /* <CJK> */
-MAP(0x5F, 0x2C, 0x8CC5)  /* <CJK> */
-MAP(0x5F, 0x2D, 0x8CC6)  /* <CJK> */
-MAP(0x5F, 0x2E, 0x8CC9)  /* <CJK> */
-MAP(0x5F, 0x2F, 0x8CCB)  /* <CJK> */
-MAP(0x5F, 0x30, 0x8CCF)  /* <CJK> */
-MAP(0x5F, 0x31, 0x8CD6)  /* <CJK> */
-MAP(0x5F, 0x32, 0x8CD5)  /* <CJK> */
-MAP(0x5F, 0x33, 0x8CD9)  /* <CJK> */
-MAP(0x5F, 0x34, 0x8CDD)  /* <CJK> */
-MAP(0x5F, 0x35, 0x8CE1)  /* <CJK> */
-MAP(0x5F, 0x36, 0x8CE8)  /* <CJK> */
-MAP(0x5F, 0x37, 0x8CEC)  /* <CJK> */
-MAP(0x5F, 0x38, 0x8CEF)  /* <CJK> */
-MAP(0x5F, 0x39, 0x8CF0)  /* <CJK> */
-MAP(0x5F, 0x3A, 0x8CF2)  /* <CJK> */
-MAP(0x5F, 0x3B, 0x8CF5)  /* <CJK> */
-MAP(0x5F, 0x3C, 0x8CF7)  /* <CJK> */
-MAP(0x5F, 0x3D, 0x8CF8)  /* <CJK> */
-MAP(0x5F, 0x3E, 0x8CFE)  /* <CJK> */
-MAP(0x5F, 0x3F, 0x8CFF)  /* <CJK> */
-MAP(0x5F, 0x40, 0x8D01)  /* <CJK> */
-MAP(0x5F, 0x41, 0x8D03)  /* <CJK> */
-MAP(0x5F, 0x42, 0x8D09)  /* <CJK> */
-MAP(0x5F, 0x43, 0x8D12)  /* <CJK> */
-MAP(0x5F, 0x44, 0x8D17)  /* <CJK> */
-MAP(0x5F, 0x45, 0x8D1B)  /* <CJK> */
-MAP(0x5F, 0x46, 0x8D65)  /* <CJK> */
-MAP(0x5F, 0x47, 0x8D69)  /* <CJK> */
-MAP(0x5F, 0x48, 0x8D6C)  /* <CJK> */
-MAP(0x5F, 0x49, 0x8D6E)  /* <CJK> */
-MAP(0x5F, 0x4A, 0x8D7F)  /* <CJK> */
-MAP(0x5F, 0x4B, 0x8D82)  /* <CJK> */
-MAP(0x5F, 0x4C, 0x8D84)  /* <CJK> */
-MAP(0x5F, 0x4D, 0x8D88)  /* <CJK> */
-MAP(0x5F, 0x4E, 0x8D8D)  /* <CJK> */
-MAP(0x5F, 0x4F, 0x8D90)  /* <CJK> */
-MAP(0x5F, 0x50, 0x8D91)  /* <CJK> */
-MAP(0x5F, 0x51, 0x8D95)  /* <CJK> */
-MAP(0x5F, 0x52, 0x8D9E)  /* <CJK> */
-MAP(0x5F, 0x53, 0x8D9F)  /* <CJK> */
-MAP(0x5F, 0x54, 0x8DA0)  /* <CJK> */
-MAP(0x5F, 0x55, 0x8DA6)  /* <CJK> */
-MAP(0x5F, 0x56, 0x8DAB)  /* <CJK> */
-MAP(0x5F, 0x57, 0x8DAC)  /* <CJK> */
-MAP(0x5F, 0x58, 0x8DAF)  /* <CJK> */
-MAP(0x5F, 0x59, 0x8DB2)  /* <CJK> */
-MAP(0x5F, 0x5A, 0x8DB5)  /* <CJK> */
-MAP(0x5F, 0x5B, 0x8DB7)  /* <CJK> */
-MAP(0x5F, 0x5C, 0x8DB9)  /* <CJK> */
-MAP(0x5F, 0x5D, 0x8DBB)  /* <CJK> */
-MAP(0x5F, 0x5E, 0x8DC0)  /* <CJK> */
-MAP(0x5F, 0x5F, 0x8DC5)  /* <CJK> */
-MAP(0x5F, 0x60, 0x8DC6)  /* <CJK> */
-MAP(0x5F, 0x61, 0x8DC7)  /* <CJK> */
-MAP(0x5F, 0x62, 0x8DC8)  /* <CJK> */
-MAP(0x5F, 0x63, 0x8DCA)  /* <CJK> */
-MAP(0x5F, 0x64, 0x8DCE)  /* <CJK> */
-MAP(0x5F, 0x65, 0x8DD1)  /* <CJK> */
-MAP(0x5F, 0x66, 0x8DD4)  /* <CJK> */
-MAP(0x5F, 0x67, 0x8DD5)  /* <CJK> */
-MAP(0x5F, 0x68, 0x8DD7)  /* <CJK> */
-MAP(0x5F, 0x69, 0x8DD9)  /* <CJK> */
-MAP(0x5F, 0x6A, 0x8DE4)  /* <CJK> */
-MAP(0x5F, 0x6B, 0x8DE5)  /* <CJK> */
-MAP(0x5F, 0x6C, 0x8DE7)  /* <CJK> */
-MAP(0x5F, 0x6D, 0x8DEC)  /* <CJK> */
-MAP(0x5F, 0x6E, 0x8DF0)  /* <CJK> */
-MAP(0x5F, 0x6F, 0x8DBC)  /* <CJK> */
-MAP(0x5F, 0x70, 0x8DF1)  /* <CJK> */
-MAP(0x5F, 0x71, 0x8DF2)  /* <CJK> */
-MAP(0x5F, 0x72, 0x8DF4)  /* <CJK> */
-MAP(0x5F, 0x73, 0x8DFD)  /* <CJK> */
-MAP(0x5F, 0x74, 0x8E01)  /* <CJK> */
-MAP(0x5F, 0x75, 0x8E04)  /* <CJK> */
-MAP(0x5F, 0x76, 0x8E05)  /* <CJK> */
-MAP(0x5F, 0x77, 0x8E06)  /* <CJK> */
-MAP(0x5F, 0x78, 0x8E0B)  /* <CJK> */
-MAP(0x5F, 0x79, 0x8E11)  /* <CJK> */
-MAP(0x5F, 0x7A, 0x8E14)  /* <CJK> */
-MAP(0x5F, 0x7B, 0x8E16)  /* <CJK> */
-MAP(0x5F, 0x7C, 0x8E20)  /* <CJK> */
-MAP(0x5F, 0x7D, 0x8E21)  /* <CJK> */
-MAP(0x5F, 0x7E, 0x8E22)  /* <CJK> */
-MAP(0x60, 0x21, 0x8E23)  /* <CJK> */
-MAP(0x60, 0x22, 0x8E26)  /* <CJK> */
-MAP(0x60, 0x23, 0x8E27)  /* <CJK> */
-MAP(0x60, 0x24, 0x8E31)  /* <CJK> */
-MAP(0x60, 0x25, 0x8E33)  /* <CJK> */
-MAP(0x60, 0x26, 0x8E36)  /* <CJK> */
-MAP(0x60, 0x27, 0x8E37)  /* <CJK> */
-MAP(0x60, 0x28, 0x8E38)  /* <CJK> */
-MAP(0x60, 0x29, 0x8E39)  /* <CJK> */
-MAP(0x60, 0x2A, 0x8E3D)  /* <CJK> */
-MAP(0x60, 0x2B, 0x8E40)  /* <CJK> */
-MAP(0x60, 0x2C, 0x8E41)  /* <CJK> */
-MAP(0x60, 0x2D, 0x8E4B)  /* <CJK> */
-MAP(0x60, 0x2E, 0x8E4D)  /* <CJK> */
-MAP(0x60, 0x2F, 0x8E4E)  /* <CJK> */
-MAP(0x60, 0x30, 0x8E4F)  /* <CJK> */
-MAP(0x60, 0x31, 0x8E54)  /* <CJK> */
-MAP(0x60, 0x32, 0x8E5B)  /* <CJK> */
-MAP(0x60, 0x33, 0x8E5C)  /* <CJK> */
-MAP(0x60, 0x34, 0x8E5D)  /* <CJK> */
-MAP(0x60, 0x35, 0x8E5E)  /* <CJK> */
-MAP(0x60, 0x36, 0x8E61)  /* <CJK> */
-MAP(0x60, 0x37, 0x8E62)  /* <CJK> */
-MAP(0x60, 0x38, 0x8E69)  /* <CJK> */
-MAP(0x60, 0x39, 0x8E6C)  /* <CJK> */
-MAP(0x60, 0x3A, 0x8E6D)  /* <CJK> */
-MAP(0x60, 0x3B, 0x8E6F)  /* <CJK> */
-MAP(0x60, 0x3C, 0x8E70)  /* <CJK> */
-MAP(0x60, 0x3D, 0x8E71)  /* <CJK> */
-MAP(0x60, 0x3E, 0x8E79)  /* <CJK> */
-MAP(0x60, 0x3F, 0x8E7A)  /* <CJK> */
-MAP(0x60, 0x40, 0x8E7B)  /* <CJK> */
-MAP(0x60, 0x41, 0x8E82)  /* <CJK> */
-MAP(0x60, 0x42, 0x8E83)  /* <CJK> */
-MAP(0x60, 0x43, 0x8E89)  /* <CJK> */
-MAP(0x60, 0x44, 0x8E90)  /* <CJK> */
-MAP(0x60, 0x45, 0x8E92)  /* <CJK> */
-MAP(0x60, 0x46, 0x8E95)  /* <CJK> */
-MAP(0x60, 0x47, 0x8E9A)  /* <CJK> */
-MAP(0x60, 0x48, 0x8E9B)  /* <CJK> */
-MAP(0x60, 0x49, 0x8E9D)  /* <CJK> */
-MAP(0x60, 0x4A, 0x8E9E)  /* <CJK> */
-MAP(0x60, 0x4B, 0x8EA2)  /* <CJK> */
-MAP(0x60, 0x4C, 0x8EA7)  /* <CJK> */
-MAP(0x60, 0x4D, 0x8EA9)  /* <CJK> */
-MAP(0x60, 0x4E, 0x8EAD)  /* <CJK> */
-MAP(0x60, 0x4F, 0x8EAE)  /* <CJK> */
-MAP(0x60, 0x50, 0x8EB3)  /* <CJK> */
-MAP(0x60, 0x51, 0x8EB5)  /* <CJK> */
-MAP(0x60, 0x52, 0x8EBA)  /* <CJK> */
-MAP(0x60, 0x53, 0x8EBB)  /* <CJK> */
-MAP(0x60, 0x54, 0x8EC0)  /* <CJK> */
-MAP(0x60, 0x55, 0x8EC1)  /* <CJK> */
-MAP(0x60, 0x56, 0x8EC3)  /* <CJK> */
-MAP(0x60, 0x57, 0x8EC4)  /* <CJK> */
-MAP(0x60, 0x58, 0x8EC7)  /* <CJK> */
-MAP(0x60, 0x59, 0x8ECF)  /* <CJK> */
-MAP(0x60, 0x5A, 0x8ED1)  /* <CJK> */
-MAP(0x60, 0x5B, 0x8ED4)  /* <CJK> */
-MAP(0x60, 0x5C, 0x8EDC)  /* <CJK> */
-MAP(0x60, 0x5D, 0x8EE8)  /* <CJK> */
-MAP(0x60, 0x5E, 0x8EEE)  /* <CJK> */
-MAP(0x60, 0x5F, 0x8EF0)  /* <CJK> */
-MAP(0x60, 0x60, 0x8EF1)  /* <CJK> */
-MAP(0x60, 0x61, 0x8EF7)  /* <CJK> */
-MAP(0x60, 0x62, 0x8EF9)  /* <CJK> */
-MAP(0x60, 0x63, 0x8EFA)  /* <CJK> */
-MAP(0x60, 0x64, 0x8EED)  /* <CJK> */
-MAP(0x60, 0x65, 0x8F00)  /* <CJK> */
-MAP(0x60, 0x66, 0x8F02)  /* <CJK> */
-MAP(0x60, 0x67, 0x8F07)  /* <CJK> */
-MAP(0x60, 0x68, 0x8F08)  /* <CJK> */
-MAP(0x60, 0x69, 0x8F0F)  /* <CJK> */
-MAP(0x60, 0x6A, 0x8F10)  /* <CJK> */
-MAP(0x60, 0x6B, 0x8F16)  /* <CJK> */
-MAP(0x60, 0x6C, 0x8F17)  /* <CJK> */
-MAP(0x60, 0x6D, 0x8F18)  /* <CJK> */
-MAP(0x60, 0x6E, 0x8F1E)  /* <CJK> */
-MAP(0x60, 0x6F, 0x8F20)  /* <CJK> */
-MAP(0x60, 0x70, 0x8F21)  /* <CJK> */
-MAP(0x60, 0x71, 0x8F23)  /* <CJK> */
-MAP(0x60, 0x72, 0x8F25)  /* <CJK> */
-MAP(0x60, 0x73, 0x8F27)  /* <CJK> */
-MAP(0x60, 0x74, 0x8F28)  /* <CJK> */
-MAP(0x60, 0x75, 0x8F2C)  /* <CJK> */
-MAP(0x60, 0x76, 0x8F2D)  /* <CJK> */
-MAP(0x60, 0x77, 0x8F2E)  /* <CJK> */
-MAP(0x60, 0x78, 0x8F34)  /* <CJK> */
-MAP(0x60, 0x79, 0x8F35)  /* <CJK> */
-MAP(0x60, 0x7A, 0x8F36)  /* <CJK> */
-MAP(0x60, 0x7B, 0x8F37)  /* <CJK> */
-MAP(0x60, 0x7C, 0x8F3A)  /* <CJK> */
-MAP(0x60, 0x7D, 0x8F40)  /* <CJK> */
-MAP(0x60, 0x7E, 0x8F41)  /* <CJK> */
-MAP(0x61, 0x21, 0x8F43)  /* <CJK> */
-MAP(0x61, 0x22, 0x8F47)  /* <CJK> */
-MAP(0x61, 0x23, 0x8F4F)  /* <CJK> */
-MAP(0x61, 0x24, 0x8F51)  /* <CJK> */
-MAP(0x61, 0x25, 0x8F52)  /* <CJK> */
-MAP(0x61, 0x26, 0x8F53)  /* <CJK> */
-MAP(0x61, 0x27, 0x8F54)  /* <CJK> */
-MAP(0x61, 0x28, 0x8F55)  /* <CJK> */
-MAP(0x61, 0x29, 0x8F58)  /* <CJK> */
-MAP(0x61, 0x2A, 0x8F5D)  /* <CJK> */
-MAP(0x61, 0x2B, 0x8F5E)  /* <CJK> */
-MAP(0x61, 0x2C, 0x8F65)  /* <CJK> */
-MAP(0x61, 0x2D, 0x8F9D)  /* <CJK> */
-MAP(0x61, 0x2E, 0x8FA0)  /* <CJK> */
-MAP(0x61, 0x2F, 0x8FA1)  /* <CJK> */
-MAP(0x61, 0x30, 0x8FA4)  /* <CJK> */
-MAP(0x61, 0x31, 0x8FA5)  /* <CJK> */
-MAP(0x61, 0x32, 0x8FA6)  /* <CJK> */
-MAP(0x61, 0x33, 0x8FB5)  /* <CJK> */
-MAP(0x61, 0x34, 0x8FB6)  /* <CJK> */
-MAP(0x61, 0x35, 0x8FB8)  /* <CJK> */
-MAP(0x61, 0x36, 0x8FBE)  /* <CJK> */
-MAP(0x61, 0x37, 0x8FC0)  /* <CJK> */
-MAP(0x61, 0x38, 0x8FC1)  /* <CJK> */
-MAP(0x61, 0x39, 0x8FC6)  /* <CJK> */
-MAP(0x61, 0x3A, 0x8FCA)  /* <CJK> */
-MAP(0x61, 0x3B, 0x8FCB)  /* <CJK> */
-MAP(0x61, 0x3C, 0x8FCD)  /* <CJK> */
-MAP(0x61, 0x3D, 0x8FD0)  /* <CJK> */
-MAP(0x61, 0x3E, 0x8FD2)  /* <CJK> */
-MAP(0x61, 0x3F, 0x8FD3)  /* <CJK> */
-MAP(0x61, 0x40, 0x8FD5)  /* <CJK> */
-MAP(0x61, 0x41, 0x8FE0)  /* <CJK> */
-MAP(0x61, 0x42, 0x8FE3)  /* <CJK> */
-MAP(0x61, 0x43, 0x8FE4)  /* <CJK> */
-MAP(0x61, 0x44, 0x8FE8)  /* <CJK> */
-MAP(0x61, 0x45, 0x8FEE)  /* <CJK> */
-MAP(0x61, 0x46, 0x8FF1)  /* <CJK> */
-MAP(0x61, 0x47, 0x8FF5)  /* <CJK> */
-MAP(0x61, 0x48, 0x8FF6)  /* <CJK> */
-MAP(0x61, 0x49, 0x8FFB)  /* <CJK> */
-MAP(0x61, 0x4A, 0x8FFE)  /* <CJK> */
-MAP(0x61, 0x4B, 0x9002)  /* <CJK> */
-MAP(0x61, 0x4C, 0x9004)  /* <CJK> */
-MAP(0x61, 0x4D, 0x9008)  /* <CJK> */
-MAP(0x61, 0x4E, 0x900C)  /* <CJK> */
-MAP(0x61, 0x4F, 0x9018)  /* <CJK> */
-MAP(0x61, 0x50, 0x901B)  /* <CJK> */
-MAP(0x61, 0x51, 0x9028)  /* <CJK> */
-MAP(0x61, 0x52, 0x9029)  /* <CJK> */
-MAP(0x61, 0x53, 0x902F)  /* <CJK> */
-MAP(0x61, 0x54, 0x902A)  /* <CJK> */
-MAP(0x61, 0x55, 0x902C)  /* <CJK> */
-MAP(0x61, 0x56, 0x902D)  /* <CJK> */
-MAP(0x61, 0x57, 0x9033)  /* <CJK> */
-MAP(0x61, 0x58, 0x9034)  /* <CJK> */
-MAP(0x61, 0x59, 0x9037)  /* <CJK> */
-MAP(0x61, 0x5A, 0x903F)  /* <CJK> */
-MAP(0x61, 0x5B, 0x9043)  /* <CJK> */
-MAP(0x61, 0x5C, 0x9044)  /* <CJK> */
-MAP(0x61, 0x5D, 0x904C)  /* <CJK> */
-MAP(0x61, 0x5E, 0x905B)  /* <CJK> */
-MAP(0x61, 0x5F, 0x905D)  /* <CJK> */
-MAP(0x61, 0x60, 0x9062)  /* <CJK> */
-MAP(0x61, 0x61, 0x9066)  /* <CJK> */
-MAP(0x61, 0x62, 0x9067)  /* <CJK> */
-MAP(0x61, 0x63, 0x906C)  /* <CJK> */
-MAP(0x61, 0x64, 0x9070)  /* <CJK> */
-MAP(0x61, 0x65, 0x9074)  /* <CJK> */
-MAP(0x61, 0x66, 0x9079)  /* <CJK> */
-MAP(0x61, 0x67, 0x9085)  /* <CJK> */
-MAP(0x61, 0x68, 0x9088)  /* <CJK> */
-MAP(0x61, 0x69, 0x908B)  /* <CJK> */
-MAP(0x61, 0x6A, 0x908C)  /* <CJK> */
-MAP(0x61, 0x6B, 0x908E)  /* <CJK> */
-MAP(0x61, 0x6C, 0x9090)  /* <CJK> */
-MAP(0x61, 0x6D, 0x9095)  /* <CJK> */
-MAP(0x61, 0x6E, 0x9097)  /* <CJK> */
-MAP(0x61, 0x6F, 0x9098)  /* <CJK> */
-MAP(0x61, 0x70, 0x9099)  /* <CJK> */
-MAP(0x61, 0x71, 0x909B)  /* <CJK> */
-MAP(0x61, 0x72, 0x90A0)  /* <CJK> */
-MAP(0x61, 0x73, 0x90A1)  /* <CJK> */
-MAP(0x61, 0x74, 0x90A2)  /* <CJK> */
-MAP(0x61, 0x75, 0x90A5)  /* <CJK> */
-MAP(0x61, 0x76, 0x90B0)  /* <CJK> */
-MAP(0x61, 0x77, 0x90B2)  /* <CJK> */
-MAP(0x61, 0x78, 0x90B3)  /* <CJK> */
-MAP(0x61, 0x79, 0x90B4)  /* <CJK> */
-MAP(0x61, 0x7A, 0x90B6)  /* <CJK> */
-MAP(0x61, 0x7B, 0x90BD)  /* <CJK> */
-MAP(0x61, 0x7C, 0x90CC)  /* <CJK> */
-MAP(0x61, 0x7D, 0x90BE)  /* <CJK> */
-MAP(0x61, 0x7E, 0x90C3)  /* <CJK> */
-MAP(0x62, 0x21, 0x90C4)  /* <CJK> */
-MAP(0x62, 0x22, 0x90C5)  /* <CJK> */
-MAP(0x62, 0x23, 0x90C7)  /* <CJK> */
-MAP(0x62, 0x24, 0x90C8)  /* <CJK> */
-MAP(0x62, 0x25, 0x90D5)  /* <CJK> */
-MAP(0x62, 0x26, 0x90D7)  /* <CJK> */
-MAP(0x62, 0x27, 0x90D8)  /* <CJK> */
-MAP(0x62, 0x28, 0x90D9)  /* <CJK> */
-MAP(0x62, 0x29, 0x90DC)  /* <CJK> */
-MAP(0x62, 0x2A, 0x90DD)  /* <CJK> */
-MAP(0x62, 0x2B, 0x90DF)  /* <CJK> */
-MAP(0x62, 0x2C, 0x90E5)  /* <CJK> */
-MAP(0x62, 0x2D, 0x90D2)  /* <CJK> */
-MAP(0x62, 0x2E, 0x90F6)  /* <CJK> */
-MAP(0x62, 0x2F, 0x90EB)  /* <CJK> */
-MAP(0x62, 0x30, 0x90EF)  /* <CJK> */
-MAP(0x62, 0x31, 0x90F0)  /* <CJK> */
-MAP(0x62, 0x32, 0x90F4)  /* <CJK> */
-MAP(0x62, 0x33, 0x90FE)  /* <CJK> */
-MAP(0x62, 0x34, 0x90FF)  /* <CJK> */
-MAP(0x62, 0x35, 0x9100)  /* <CJK> */
-MAP(0x62, 0x36, 0x9104)  /* <CJK> */
-MAP(0x62, 0x37, 0x9105)  /* <CJK> */
-MAP(0x62, 0x38, 0x9106)  /* <CJK> */
-MAP(0x62, 0x39, 0x9108)  /* <CJK> */
-MAP(0x62, 0x3A, 0x910D)  /* <CJK> */
-MAP(0x62, 0x3B, 0x9110)  /* <CJK> */
-MAP(0x62, 0x3C, 0x9114)  /* <CJK> */
-MAP(0x62, 0x3D, 0x9116)  /* <CJK> */
-MAP(0x62, 0x3E, 0x9117)  /* <CJK> */
-MAP(0x62, 0x3F, 0x9118)  /* <CJK> */
-MAP(0x62, 0x40, 0x911A)  /* <CJK> */
-MAP(0x62, 0x41, 0x911C)  /* <CJK> */
-MAP(0x62, 0x42, 0x911E)  /* <CJK> */
-MAP(0x62, 0x43, 0x9120)  /* <CJK> */
-MAP(0x62, 0x44, 0x9125)  /* <CJK> */
-MAP(0x62, 0x45, 0x9122)  /* <CJK> */
-MAP(0x62, 0x46, 0x9123)  /* <CJK> */
-MAP(0x62, 0x47, 0x9127)  /* <CJK> */
-MAP(0x62, 0x48, 0x9129)  /* <CJK> */
-MAP(0x62, 0x49, 0x912E)  /* <CJK> */
-MAP(0x62, 0x4A, 0x912F)  /* <CJK> */
-MAP(0x62, 0x4B, 0x9131)  /* <CJK> */
-MAP(0x62, 0x4C, 0x9134)  /* <CJK> */
-MAP(0x62, 0x4D, 0x9136)  /* <CJK> */
-MAP(0x62, 0x4E, 0x9137)  /* <CJK> */
-MAP(0x62, 0x4F, 0x9139)  /* <CJK> */
-MAP(0x62, 0x50, 0x913A)  /* <CJK> */
-MAP(0x62, 0x51, 0x913C)  /* <CJK> */
-MAP(0x62, 0x52, 0x913D)  /* <CJK> */
-MAP(0x62, 0x53, 0x9143)  /* <CJK> */
-MAP(0x62, 0x54, 0x9147)  /* <CJK> */
-MAP(0x62, 0x55, 0x9148)  /* <CJK> */
-MAP(0x62, 0x56, 0x914F)  /* <CJK> */
-MAP(0x62, 0x57, 0x9153)  /* <CJK> */
-MAP(0x62, 0x58, 0x9157)  /* <CJK> */
-MAP(0x62, 0x59, 0x9159)  /* <CJK> */
-MAP(0x62, 0x5A, 0x915A)  /* <CJK> */
-MAP(0x62, 0x5B, 0x915B)  /* <CJK> */
-MAP(0x62, 0x5C, 0x9161)  /* <CJK> */
-MAP(0x62, 0x5D, 0x9164)  /* <CJK> */
-MAP(0x62, 0x5E, 0x9167)  /* <CJK> */
-MAP(0x62, 0x5F, 0x916D)  /* <CJK> */
-MAP(0x62, 0x60, 0x9174)  /* <CJK> */
-MAP(0x62, 0x61, 0x9179)  /* <CJK> */
-MAP(0x62, 0x62, 0x917A)  /* <CJK> */
-MAP(0x62, 0x63, 0x917B)  /* <CJK> */
-MAP(0x62, 0x64, 0x9181)  /* <CJK> */
-MAP(0x62, 0x65, 0x9183)  /* <CJK> */
-MAP(0x62, 0x66, 0x9185)  /* <CJK> */
-MAP(0x62, 0x67, 0x9186)  /* <CJK> */
-MAP(0x62, 0x68, 0x918A)  /* <CJK> */
-MAP(0x62, 0x69, 0x918E)  /* <CJK> */
-MAP(0x62, 0x6A, 0x9191)  /* <CJK> */
-MAP(0x62, 0x6B, 0x9193)  /* <CJK> */
-MAP(0x62, 0x6C, 0x9194)  /* <CJK> */
-MAP(0x62, 0x6D, 0x9195)  /* <CJK> */
-MAP(0x62, 0x6E, 0x9198)  /* <CJK> */
-MAP(0x62, 0x6F, 0x919E)  /* <CJK> */
-MAP(0x62, 0x70, 0x91A1)  /* <CJK> */
-MAP(0x62, 0x71, 0x91A6)  /* <CJK> */
-MAP(0x62, 0x72, 0x91A8)  /* <CJK> */
-MAP(0x62, 0x73, 0x91AC)  /* <CJK> */
-MAP(0x62, 0x74, 0x91AD)  /* <CJK> */
-MAP(0x62, 0x75, 0x91AE)  /* <CJK> */
-MAP(0x62, 0x76, 0x91B0)  /* <CJK> */
-MAP(0x62, 0x77, 0x91B1)  /* <CJK> */
-MAP(0x62, 0x78, 0x91B2)  /* <CJK> */
-MAP(0x62, 0x79, 0x91B3)  /* <CJK> */
-MAP(0x62, 0x7A, 0x91B6)  /* <CJK> */
-MAP(0x62, 0x7B, 0x91BB)  /* <CJK> */
-MAP(0x62, 0x7C, 0x91BC)  /* <CJK> */
-MAP(0x62, 0x7D, 0x91BD)  /* <CJK> */
-MAP(0x62, 0x7E, 0x91BF)  /* <CJK> */
-MAP(0x63, 0x21, 0x91C2)  /* <CJK> */
-MAP(0x63, 0x22, 0x91C3)  /* <CJK> */
-MAP(0x63, 0x23, 0x91C5)  /* <CJK> */
-MAP(0x63, 0x24, 0x91D3)  /* <CJK> */
-MAP(0x63, 0x25, 0x91D4)  /* <CJK> */
-MAP(0x63, 0x26, 0x91D7)  /* <CJK> */
-MAP(0x63, 0x27, 0x91D9)  /* <CJK> */
-MAP(0x63, 0x28, 0x91DA)  /* <CJK> */
-MAP(0x63, 0x29, 0x91DE)  /* <CJK> */
-MAP(0x63, 0x2A, 0x91E4)  /* <CJK> */
-MAP(0x63, 0x2B, 0x91E5)  /* <CJK> */
-MAP(0x63, 0x2C, 0x91E9)  /* <CJK> */
-MAP(0x63, 0x2D, 0x91EA)  /* <CJK> */
-MAP(0x63, 0x2E, 0x91EC)  /* <CJK> */
-MAP(0x63, 0x2F, 0x91ED)  /* <CJK> */
-MAP(0x63, 0x30, 0x91EE)  /* <CJK> */
-MAP(0x63, 0x31, 0x91EF)  /* <CJK> */
-MAP(0x63, 0x32, 0x91F0)  /* <CJK> */
-MAP(0x63, 0x33, 0x91F1)  /* <CJK> */
-MAP(0x63, 0x34, 0x91F7)  /* <CJK> */
-MAP(0x63, 0x35, 0x91F9)  /* <CJK> */
-MAP(0x63, 0x36, 0x91FB)  /* <CJK> */
-MAP(0x63, 0x37, 0x91FD)  /* <CJK> */
-MAP(0x63, 0x38, 0x9200)  /* <CJK> */
-MAP(0x63, 0x39, 0x9201)  /* <CJK> */
-MAP(0x63, 0x3A, 0x9204)  /* <CJK> */
-MAP(0x63, 0x3B, 0x9205)  /* <CJK> */
-MAP(0x63, 0x3C, 0x9206)  /* <CJK> */
-MAP(0x63, 0x3D, 0x9207)  /* <CJK> */
-MAP(0x63, 0x3E, 0x9209)  /* <CJK> */
-MAP(0x63, 0x3F, 0x920A)  /* <CJK> */
-MAP(0x63, 0x40, 0x920C)  /* <CJK> */
-MAP(0x63, 0x41, 0x9210)  /* <CJK> */
-MAP(0x63, 0x42, 0x9212)  /* <CJK> */
-MAP(0x63, 0x43, 0x9213)  /* <CJK> */
-MAP(0x63, 0x44, 0x9216)  /* <CJK> */
-MAP(0x63, 0x45, 0x9218)  /* <CJK> */
-MAP(0x63, 0x46, 0x921C)  /* <CJK> */
-MAP(0x63, 0x47, 0x921D)  /* <CJK> */
-MAP(0x63, 0x48, 0x9223)  /* <CJK> */
-MAP(0x63, 0x49, 0x9224)  /* <CJK> */
-MAP(0x63, 0x4A, 0x9225)  /* <CJK> */
-MAP(0x63, 0x4B, 0x9226)  /* <CJK> */
-MAP(0x63, 0x4C, 0x9228)  /* <CJK> */
-MAP(0x63, 0x4D, 0x922E)  /* <CJK> */
-MAP(0x63, 0x4E, 0x922F)  /* <CJK> */
-MAP(0x63, 0x4F, 0x9230)  /* <CJK> */
-MAP(0x63, 0x50, 0x9233)  /* <CJK> */
-MAP(0x63, 0x51, 0x9235)  /* <CJK> */
-MAP(0x63, 0x52, 0x9236)  /* <CJK> */
-MAP(0x63, 0x53, 0x9238)  /* <CJK> */
-MAP(0x63, 0x54, 0x9239)  /* <CJK> */
-MAP(0x63, 0x55, 0x923A)  /* <CJK> */
-MAP(0x63, 0x56, 0x923C)  /* <CJK> */
-MAP(0x63, 0x57, 0x923E)  /* <CJK> */
-MAP(0x63, 0x58, 0x9240)  /* <CJK> */
-MAP(0x63, 0x59, 0x9242)  /* <CJK> */
-MAP(0x63, 0x5A, 0x9243)  /* <CJK> */
-MAP(0x63, 0x5B, 0x9246)  /* <CJK> */
-MAP(0x63, 0x5C, 0x9247)  /* <CJK> */
-MAP(0x63, 0x5D, 0x924A)  /* <CJK> */
-MAP(0x63, 0x5E, 0x924D)  /* <CJK> */
-MAP(0x63, 0x5F, 0x924E)  /* <CJK> */
-MAP(0x63, 0x60, 0x924F)  /* <CJK> */
-MAP(0x63, 0x61, 0x9251)  /* <CJK> */
-MAP(0x63, 0x62, 0x9258)  /* <CJK> */
-MAP(0x63, 0x63, 0x9259)  /* <CJK> */
-MAP(0x63, 0x64, 0x925C)  /* <CJK> */
-MAP(0x63, 0x65, 0x925D)  /* <CJK> */
-MAP(0x63, 0x66, 0x9260)  /* <CJK> */
-MAP(0x63, 0x67, 0x9261)  /* <CJK> */
-MAP(0x63, 0x68, 0x9265)  /* <CJK> */
-MAP(0x63, 0x69, 0x9267)  /* <CJK> */
-MAP(0x63, 0x6A, 0x9268)  /* <CJK> */
-MAP(0x63, 0x6B, 0x9269)  /* <CJK> */
-MAP(0x63, 0x6C, 0x926E)  /* <CJK> */
-MAP(0x63, 0x6D, 0x926F)  /* <CJK> */
-MAP(0x63, 0x6E, 0x9270)  /* <CJK> */
-MAP(0x63, 0x6F, 0x9275)  /* <CJK> */
-MAP(0x63, 0x70, 0x9276)  /* <CJK> */
-MAP(0x63, 0x71, 0x9277)  /* <CJK> */
-MAP(0x63, 0x72, 0x9278)  /* <CJK> */
-MAP(0x63, 0x73, 0x9279)  /* <CJK> */
-MAP(0x63, 0x74, 0x927B)  /* <CJK> */
-MAP(0x63, 0x75, 0x927C)  /* <CJK> */
-MAP(0x63, 0x76, 0x927D)  /* <CJK> */
-MAP(0x63, 0x77, 0x927F)  /* <CJK> */
-MAP(0x63, 0x78, 0x9288)  /* <CJK> */
-MAP(0x63, 0x79, 0x9289)  /* <CJK> */
-MAP(0x63, 0x7A, 0x928A)  /* <CJK> */
-MAP(0x63, 0x7B, 0x928D)  /* <CJK> */
-MAP(0x63, 0x7C, 0x928E)  /* <CJK> */
-MAP(0x63, 0x7D, 0x9292)  /* <CJK> */
-MAP(0x63, 0x7E, 0x9297)  /* <CJK> */
-MAP(0x64, 0x21, 0x9299)  /* <CJK> */
-MAP(0x64, 0x22, 0x929F)  /* <CJK> */
-MAP(0x64, 0x23, 0x92A0)  /* <CJK> */
-MAP(0x64, 0x24, 0x92A4)  /* <CJK> */
-MAP(0x64, 0x25, 0x92A5)  /* <CJK> */
-MAP(0x64, 0x26, 0x92A7)  /* <CJK> */
-MAP(0x64, 0x27, 0x92A8)  /* <CJK> */
-MAP(0x64, 0x28, 0x92AB)  /* <CJK> */
-MAP(0x64, 0x29, 0x92AF)  /* <CJK> */
-MAP(0x64, 0x2A, 0x92B2)  /* <CJK> */
-MAP(0x64, 0x2B, 0x92B6)  /* <CJK> */
-MAP(0x64, 0x2C, 0x92B8)  /* <CJK> */
-MAP(0x64, 0x2D, 0x92BA)  /* <CJK> */
-MAP(0x64, 0x2E, 0x92BB)  /* <CJK> */
-MAP(0x64, 0x2F, 0x92BC)  /* <CJK> */
-MAP(0x64, 0x30, 0x92BD)  /* <CJK> */
-MAP(0x64, 0x31, 0x92BF)  /* <CJK> */
-MAP(0x64, 0x32, 0x92C0)  /* <CJK> */
-MAP(0x64, 0x33, 0x92C1)  /* <CJK> */
-MAP(0x64, 0x34, 0x92C2)  /* <CJK> */
-MAP(0x64, 0x35, 0x92C3)  /* <CJK> */
-MAP(0x64, 0x36, 0x92C5)  /* <CJK> */
-MAP(0x64, 0x37, 0x92C6)  /* <CJK> */
-MAP(0x64, 0x38, 0x92C7)  /* <CJK> */
-MAP(0x64, 0x39, 0x92C8)  /* <CJK> */
-MAP(0x64, 0x3A, 0x92CB)  /* <CJK> */
-MAP(0x64, 0x3B, 0x92CC)  /* <CJK> */
-MAP(0x64, 0x3C, 0x92CD)  /* <CJK> */
-MAP(0x64, 0x3D, 0x92CE)  /* <CJK> */
-MAP(0x64, 0x3E, 0x92D0)  /* <CJK> */
-MAP(0x64, 0x3F, 0x92D3)  /* <CJK> */
-MAP(0x64, 0x40, 0x92D5)  /* <CJK> */
-MAP(0x64, 0x41, 0x92D7)  /* <CJK> */
-MAP(0x64, 0x42, 0x92D8)  /* <CJK> */
-MAP(0x64, 0x43, 0x92D9)  /* <CJK> */
-MAP(0x64, 0x44, 0x92DC)  /* <CJK> */
-MAP(0x64, 0x45, 0x92DD)  /* <CJK> */
-MAP(0x64, 0x46, 0x92DF)  /* <CJK> */
-MAP(0x64, 0x47, 0x92E0)  /* <CJK> */
-MAP(0x64, 0x48, 0x92E1)  /* <CJK> */
-MAP(0x64, 0x49, 0x92E3)  /* <CJK> */
-MAP(0x64, 0x4A, 0x92E5)  /* <CJK> */
-MAP(0x64, 0x4B, 0x92E7)  /* <CJK> */
-MAP(0x64, 0x4C, 0x92E8)  /* <CJK> */
-MAP(0x64, 0x4D, 0x92EC)  /* <CJK> */
-MAP(0x64, 0x4E, 0x92EE)  /* <CJK> */
-MAP(0x64, 0x4F, 0x92F0)  /* <CJK> */
-MAP(0x64, 0x50, 0x92F9)  /* <CJK> */
-MAP(0x64, 0x51, 0x92FB)  /* <CJK> */
-MAP(0x64, 0x52, 0x92FF)  /* <CJK> */
-MAP(0x64, 0x53, 0x9300)  /* <CJK> */
-MAP(0x64, 0x54, 0x9302)  /* <CJK> */
-MAP(0x64, 0x55, 0x9308)  /* <CJK> */
-MAP(0x64, 0x56, 0x930D)  /* <CJK> */
-MAP(0x64, 0x57, 0x9311)  /* <CJK> */
-MAP(0x64, 0x58, 0x9314)  /* <CJK> */
-MAP(0x64, 0x59, 0x9315)  /* <CJK> */
-MAP(0x64, 0x5A, 0x931C)  /* <CJK> */
-MAP(0x64, 0x5B, 0x931D)  /* <CJK> */
-MAP(0x64, 0x5C, 0x931E)  /* <CJK> */
-MAP(0x64, 0x5D, 0x931F)  /* <CJK> */
-MAP(0x64, 0x5E, 0x9321)  /* <CJK> */
-MAP(0x64, 0x5F, 0x9324)  /* <CJK> */
-MAP(0x64, 0x60, 0x9325)  /* <CJK> */
-MAP(0x64, 0x61, 0x9327)  /* <CJK> */
-MAP(0x64, 0x62, 0x9329)  /* <CJK> */
-MAP(0x64, 0x63, 0x932A)  /* <CJK> */
-MAP(0x64, 0x64, 0x9333)  /* <CJK> */
-MAP(0x64, 0x65, 0x9334)  /* <CJK> */
-MAP(0x64, 0x66, 0x9336)  /* <CJK> */
-MAP(0x64, 0x67, 0x9337)  /* <CJK> */
-MAP(0x64, 0x68, 0x9347)  /* <CJK> */
-MAP(0x64, 0x69, 0x9348)  /* <CJK> */
-MAP(0x64, 0x6A, 0x9349)  /* <CJK> */
-MAP(0x64, 0x6B, 0x9350)  /* <CJK> */
-MAP(0x64, 0x6C, 0x9351)  /* <CJK> */
-MAP(0x64, 0x6D, 0x9352)  /* <CJK> */
-MAP(0x64, 0x6E, 0x9355)  /* <CJK> */
-MAP(0x64, 0x6F, 0x9357)  /* <CJK> */
-MAP(0x64, 0x70, 0x9358)  /* <CJK> */
-MAP(0x64, 0x71, 0x935A)  /* <CJK> */
-MAP(0x64, 0x72, 0x935E)  /* <CJK> */
-MAP(0x64, 0x73, 0x9364)  /* <CJK> */
-MAP(0x64, 0x74, 0x9365)  /* <CJK> */
-MAP(0x64, 0x75, 0x9367)  /* <CJK> */
-MAP(0x64, 0x76, 0x9369)  /* <CJK> */
-MAP(0x64, 0x77, 0x936A)  /* <CJK> */
-MAP(0x64, 0x78, 0x936D)  /* <CJK> */
-MAP(0x64, 0x79, 0x936F)  /* <CJK> */
-MAP(0x64, 0x7A, 0x9370)  /* <CJK> */
-MAP(0x64, 0x7B, 0x9371)  /* <CJK> */
-MAP(0x64, 0x7C, 0x9373)  /* <CJK> */
-MAP(0x64, 0x7D, 0x9374)  /* <CJK> */
-MAP(0x64, 0x7E, 0x9376)  /* <CJK> */
-MAP(0x65, 0x21, 0x937A)  /* <CJK> */
-MAP(0x65, 0x22, 0x937D)  /* <CJK> */
-MAP(0x65, 0x23, 0x937F)  /* <CJK> */
-MAP(0x65, 0x24, 0x9380)  /* <CJK> */
-MAP(0x65, 0x25, 0x9381)  /* <CJK> */
-MAP(0x65, 0x26, 0x9382)  /* <CJK> */
-MAP(0x65, 0x27, 0x9388)  /* <CJK> */
-MAP(0x65, 0x28, 0x938A)  /* <CJK> */
-MAP(0x65, 0x29, 0x938B)  /* <CJK> */
-MAP(0x65, 0x2A, 0x938D)  /* <CJK> */
-MAP(0x65, 0x2B, 0x938F)  /* <CJK> */
-MAP(0x65, 0x2C, 0x9392)  /* <CJK> */
-MAP(0x65, 0x2D, 0x9395)  /* <CJK> */
-MAP(0x65, 0x2E, 0x9398)  /* <CJK> */
-MAP(0x65, 0x2F, 0x939B)  /* <CJK> */
-MAP(0x65, 0x30, 0x939E)  /* <CJK> */
-MAP(0x65, 0x31, 0x93A1)  /* <CJK> */
-MAP(0x65, 0x32, 0x93A3)  /* <CJK> */
-MAP(0x65, 0x33, 0x93A4)  /* <CJK> */
-MAP(0x65, 0x34, 0x93A6)  /* <CJK> */
-MAP(0x65, 0x35, 0x93A8)  /* <CJK> */
-MAP(0x65, 0x36, 0x93AB)  /* <CJK> */
-MAP(0x65, 0x37, 0x93B4)  /* <CJK> */
-MAP(0x65, 0x38, 0x93B5)  /* <CJK> */
-MAP(0x65, 0x39, 0x93B6)  /* <CJK> */
-MAP(0x65, 0x3A, 0x93BA)  /* <CJK> */
-MAP(0x65, 0x3B, 0x93A9)  /* <CJK> */
-MAP(0x65, 0x3C, 0x93C1)  /* <CJK> */
-MAP(0x65, 0x3D, 0x93C4)  /* <CJK> */
-MAP(0x65, 0x3E, 0x93C5)  /* <CJK> */
-MAP(0x65, 0x3F, 0x93C6)  /* <CJK> */
-MAP(0x65, 0x40, 0x93C7)  /* <CJK> */
-MAP(0x65, 0x41, 0x93C9)  /* <CJK> */
-MAP(0x65, 0x42, 0x93CA)  /* <CJK> */
-MAP(0x65, 0x43, 0x93CB)  /* <CJK> */
-MAP(0x65, 0x44, 0x93CC)  /* <CJK> */
-MAP(0x65, 0x45, 0x93CD)  /* <CJK> */
-MAP(0x65, 0x46, 0x93D3)  /* <CJK> */
-MAP(0x65, 0x47, 0x93D9)  /* <CJK> */
-MAP(0x65, 0x48, 0x93DC)  /* <CJK> */
-MAP(0x65, 0x49, 0x93DE)  /* <CJK> */
-MAP(0x65, 0x4A, 0x93DF)  /* <CJK> */
-MAP(0x65, 0x4B, 0x93E2)  /* <CJK> */
-MAP(0x65, 0x4C, 0x93E6)  /* <CJK> */
-MAP(0x65, 0x4D, 0x93E7)  /* <CJK> */
-MAP(0x65, 0x4E, 0x93F9)  /* <CJK> */
-MAP(0x65, 0x4F, 0x93F7)  /* <CJK> */
-MAP(0x65, 0x50, 0x93F8)  /* <CJK> */
-MAP(0x65, 0x51, 0x93FA)  /* <CJK> */
-MAP(0x65, 0x52, 0x93FB)  /* <CJK> */
-MAP(0x65, 0x53, 0x93FD)  /* <CJK> */
-MAP(0x65, 0x54, 0x9401)  /* <CJK> */
-MAP(0x65, 0x55, 0x9402)  /* <CJK> */
-MAP(0x65, 0x56, 0x9404)  /* <CJK> */
-MAP(0x65, 0x57, 0x9408)  /* <CJK> */
-MAP(0x65, 0x58, 0x9409)  /* <CJK> */
-MAP(0x65, 0x59, 0x940D)  /* <CJK> */
-MAP(0x65, 0x5A, 0x940E)  /* <CJK> */
-MAP(0x65, 0x5B, 0x940F)  /* <CJK> */
-MAP(0x65, 0x5C, 0x9415)  /* <CJK> */
-MAP(0x65, 0x5D, 0x9416)  /* <CJK> */
-MAP(0x65, 0x5E, 0x9417)  /* <CJK> */
-MAP(0x65, 0x5F, 0x941F)  /* <CJK> */
-MAP(0x65, 0x60, 0x942E)  /* <CJK> */
-MAP(0x65, 0x61, 0x942F)  /* <CJK> */
-MAP(0x65, 0x62, 0x9431)  /* <CJK> */
-MAP(0x65, 0x63, 0x9432)  /* <CJK> */
-MAP(0x65, 0x64, 0x9433)  /* <CJK> */
-MAP(0x65, 0x65, 0x9434)  /* <CJK> */
-MAP(0x65, 0x66, 0x943B)  /* <CJK> */
-MAP(0x65, 0x67, 0x943F)  /* <CJK> */
-MAP(0x65, 0x68, 0x943D)  /* <CJK> */
-MAP(0x65, 0x69, 0x9443)  /* <CJK> */
-MAP(0x65, 0x6A, 0x9445)  /* <CJK> */
-MAP(0x65, 0x6B, 0x9448)  /* <CJK> */
-MAP(0x65, 0x6C, 0x944A)  /* <CJK> */
-MAP(0x65, 0x6D, 0x944C)  /* <CJK> */
-MAP(0x65, 0x6E, 0x9455)  /* <CJK> */
-MAP(0x65, 0x6F, 0x9459)  /* <CJK> */
-MAP(0x65, 0x70, 0x945C)  /* <CJK> */
-MAP(0x65, 0x71, 0x945F)  /* <CJK> */
-MAP(0x65, 0x72, 0x9461)  /* <CJK> */
-MAP(0x65, 0x73, 0x9463)  /* <CJK> */
-MAP(0x65, 0x74, 0x9468)  /* <CJK> */
-MAP(0x65, 0x75, 0x946B)  /* <CJK> */
-MAP(0x65, 0x76, 0x946D)  /* <CJK> */
-MAP(0x65, 0x77, 0x946E)  /* <CJK> */
-MAP(0x65, 0x78, 0x946F)  /* <CJK> */
-MAP(0x65, 0x79, 0x9471)  /* <CJK> */
-MAP(0x65, 0x7A, 0x9472)  /* <CJK> */
-MAP(0x65, 0x7B, 0x9484)  /* <CJK> */
-MAP(0x65, 0x7C, 0x9483)  /* <CJK> */
-MAP(0x65, 0x7D, 0x9578)  /* <CJK> */
-MAP(0x65, 0x7E, 0x9579)  /* <CJK> */
-MAP(0x66, 0x21, 0x957E)  /* <CJK> */
-MAP(0x66, 0x22, 0x9584)  /* <CJK> */
-MAP(0x66, 0x23, 0x9588)  /* <CJK> */
-MAP(0x66, 0x24, 0x958C)  /* <CJK> */
-MAP(0x66, 0x25, 0x958D)  /* <CJK> */
-MAP(0x66, 0x26, 0x958E)  /* <CJK> */
-MAP(0x66, 0x27, 0x959D)  /* <CJK> */
-MAP(0x66, 0x28, 0x959E)  /* <CJK> */
-MAP(0x66, 0x29, 0x959F)  /* <CJK> */
-MAP(0x66, 0x2A, 0x95A1)  /* <CJK> */
-MAP(0x66, 0x2B, 0x95A6)  /* <CJK> */
-MAP(0x66, 0x2C, 0x95A9)  /* <CJK> */
-MAP(0x66, 0x2D, 0x95AB)  /* <CJK> */
-MAP(0x66, 0x2E, 0x95AC)  /* <CJK> */
-MAP(0x66, 0x2F, 0x95B4)  /* <CJK> */
-MAP(0x66, 0x30, 0x95B6)  /* <CJK> */
-MAP(0x66, 0x31, 0x95BA)  /* <CJK> */
-MAP(0x66, 0x32, 0x95BD)  /* <CJK> */
-MAP(0x66, 0x33, 0x95BF)  /* <CJK> */
-MAP(0x66, 0x34, 0x95C6)  /* <CJK> */
-MAP(0x66, 0x35, 0x95C8)  /* <CJK> */
-MAP(0x66, 0x36, 0x95C9)  /* <CJK> */
-MAP(0x66, 0x37, 0x95CB)  /* <CJK> */
-MAP(0x66, 0x38, 0x95D0)  /* <CJK> */
-MAP(0x66, 0x39, 0x95D1)  /* <CJK> */
-MAP(0x66, 0x3A, 0x95D2)  /* <CJK> */
-MAP(0x66, 0x3B, 0x95D3)  /* <CJK> */
-MAP(0x66, 0x3C, 0x95D9)  /* <CJK> */
-MAP(0x66, 0x3D, 0x95DA)  /* <CJK> */
-MAP(0x66, 0x3E, 0x95DD)  /* <CJK> */
-MAP(0x66, 0x3F, 0x95DE)  /* <CJK> */
-MAP(0x66, 0x40, 0x95DF)  /* <CJK> */
-MAP(0x66, 0x41, 0x95E0)  /* <CJK> */
-MAP(0x66, 0x42, 0x95E4)  /* <CJK> */
-MAP(0x66, 0x43, 0x95E6)  /* <CJK> */
-MAP(0x66, 0x44, 0x961D)  /* <CJK> */
-MAP(0x66, 0x45, 0x961E)  /* <CJK> */
-MAP(0x66, 0x46, 0x9622)  /* <CJK> */
-MAP(0x66, 0x47, 0x9624)  /* <CJK> */
-MAP(0x66, 0x48, 0x9625)  /* <CJK> */
-MAP(0x66, 0x49, 0x9626)  /* <CJK> */
-MAP(0x66, 0x4A, 0x962C)  /* <CJK> */
-MAP(0x66, 0x4B, 0x9631)  /* <CJK> */
-MAP(0x66, 0x4C, 0x9633)  /* <CJK> */
-MAP(0x66, 0x4D, 0x9637)  /* <CJK> */
-MAP(0x66, 0x4E, 0x9638)  /* <CJK> */
-MAP(0x66, 0x4F, 0x9639)  /* <CJK> */
-MAP(0x66, 0x50, 0x963A)  /* <CJK> */
-MAP(0x66, 0x51, 0x963C)  /* <CJK> */
-MAP(0x66, 0x52, 0x963D)  /* <CJK> */
-MAP(0x66, 0x53, 0x9641)  /* <CJK> */
-MAP(0x66, 0x54, 0x9652)  /* <CJK> */
-MAP(0x66, 0x55, 0x9654)  /* <CJK> */
-MAP(0x66, 0x56, 0x9656)  /* <CJK> */
-MAP(0x66, 0x57, 0x9657)  /* <CJK> */
-MAP(0x66, 0x58, 0x9658)  /* <CJK> */
-MAP(0x66, 0x59, 0x9661)  /* <CJK> */
-MAP(0x66, 0x5A, 0x966E)  /* <CJK> */
-MAP(0x66, 0x5B, 0x9674)  /* <CJK> */
-MAP(0x66, 0x5C, 0x967B)  /* <CJK> */
-MAP(0x66, 0x5D, 0x967C)  /* <CJK> */
-MAP(0x66, 0x5E, 0x967E)  /* <CJK> */
-MAP(0x66, 0x5F, 0x967F)  /* <CJK> */
-MAP(0x66, 0x60, 0x9681)  /* <CJK> */
-MAP(0x66, 0x61, 0x9682)  /* <CJK> */
-MAP(0x66, 0x62, 0x9683)  /* <CJK> */
-MAP(0x66, 0x63, 0x9684)  /* <CJK> */
-MAP(0x66, 0x64, 0x9689)  /* <CJK> */
-MAP(0x66, 0x65, 0x9691)  /* <CJK> */
-MAP(0x66, 0x66, 0x9696)  /* <CJK> */
-MAP(0x66, 0x67, 0x969A)  /* <CJK> */
-MAP(0x66, 0x68, 0x969D)  /* <CJK> */
-MAP(0x66, 0x69, 0x969F)  /* <CJK> */
-MAP(0x66, 0x6A, 0x96A4)  /* <CJK> */
-MAP(0x66, 0x6B, 0x96A5)  /* <CJK> */
-MAP(0x66, 0x6C, 0x96A6)  /* <CJK> */
-MAP(0x66, 0x6D, 0x96A9)  /* <CJK> */
-MAP(0x66, 0x6E, 0x96AE)  /* <CJK> */
-MAP(0x66, 0x6F, 0x96AF)  /* <CJK> */
-MAP(0x66, 0x70, 0x96B3)  /* <CJK> */
-MAP(0x66, 0x71, 0x96BA)  /* <CJK> */
-MAP(0x66, 0x72, 0x96CA)  /* <CJK> */
-MAP(0x66, 0x73, 0x96D2)  /* <CJK> */
-MAP(0x66, 0x74, 0x5DB2)  /* <CJK> */
-MAP(0x66, 0x75, 0x96D8)  /* <CJK> */
-MAP(0x66, 0x76, 0x96DA)  /* <CJK> */
-MAP(0x66, 0x77, 0x96DD)  /* <CJK> */
-MAP(0x66, 0x78, 0x96DE)  /* <CJK> */
-MAP(0x66, 0x79, 0x96DF)  /* <CJK> */
-MAP(0x66, 0x7A, 0x96E9)  /* <CJK> */
-MAP(0x66, 0x7B, 0x96EF)  /* <CJK> */
-MAP(0x66, 0x7C, 0x96F1)  /* <CJK> */
-MAP(0x66, 0x7D, 0x96FA)  /* <CJK> */
-MAP(0x66, 0x7E, 0x9702)  /* <CJK> */
-MAP(0x67, 0x21, 0x9703)  /* <CJK> */
-MAP(0x67, 0x22, 0x9705)  /* <CJK> */
-MAP(0x67, 0x23, 0x9709)  /* <CJK> */
-MAP(0x67, 0x24, 0x971A)  /* <CJK> */
-MAP(0x67, 0x25, 0x971B)  /* <CJK> */
-MAP(0x67, 0x26, 0x971D)  /* <CJK> */
-MAP(0x67, 0x27, 0x9721)  /* <CJK> */
-MAP(0x67, 0x28, 0x9722)  /* <CJK> */
-MAP(0x67, 0x29, 0x9723)  /* <CJK> */
-MAP(0x67, 0x2A, 0x9728)  /* <CJK> */
-MAP(0x67, 0x2B, 0x9731)  /* <CJK> */
-MAP(0x67, 0x2C, 0x9733)  /* <CJK> */
-MAP(0x67, 0x2D, 0x9741)  /* <CJK> */
-MAP(0x67, 0x2E, 0x9743)  /* <CJK> */
-MAP(0x67, 0x2F, 0x974A)  /* <CJK> */
-MAP(0x67, 0x30, 0x974E)  /* <CJK> */
-MAP(0x67, 0x31, 0x974F)  /* <CJK> */
-MAP(0x67, 0x32, 0x9755)  /* <CJK> */
-MAP(0x67, 0x33, 0x9757)  /* <CJK> */
-MAP(0x67, 0x34, 0x9758)  /* <CJK> */
-MAP(0x67, 0x35, 0x975A)  /* <CJK> */
-MAP(0x67, 0x36, 0x975B)  /* <CJK> */
-MAP(0x67, 0x37, 0x9763)  /* <CJK> */
-MAP(0x67, 0x38, 0x9767)  /* <CJK> */
-MAP(0x67, 0x39, 0x976A)  /* <CJK> */
-MAP(0x67, 0x3A, 0x976E)  /* <CJK> */
-MAP(0x67, 0x3B, 0x9773)  /* <CJK> */
-MAP(0x67, 0x3C, 0x9776)  /* <CJK> */
-MAP(0x67, 0x3D, 0x9777)  /* <CJK> */
-MAP(0x67, 0x3E, 0x9778)  /* <CJK> */
-MAP(0x67, 0x3F, 0x977B)  /* <CJK> */
-MAP(0x67, 0x40, 0x977D)  /* <CJK> */
-MAP(0x67, 0x41, 0x977F)  /* <CJK> */
-MAP(0x67, 0x42, 0x9780)  /* <CJK> */
-MAP(0x67, 0x43, 0x9789)  /* <CJK> */
-MAP(0x67, 0x44, 0x9795)  /* <CJK> */
-MAP(0x67, 0x45, 0x9796)  /* <CJK> */
-MAP(0x67, 0x46, 0x9797)  /* <CJK> */
-MAP(0x67, 0x47, 0x9799)  /* <CJK> */
-MAP(0x67, 0x48, 0x979A)  /* <CJK> */
-MAP(0x67, 0x49, 0x979E)  /* <CJK> */
-MAP(0x67, 0x4A, 0x979F)  /* <CJK> */
-MAP(0x67, 0x4B, 0x97A2)  /* <CJK> */
-MAP(0x67, 0x4C, 0x97AC)  /* <CJK> */
-MAP(0x67, 0x4D, 0x97AE)  /* <CJK> */
-MAP(0x67, 0x4E, 0x97B1)  /* <CJK> */
-MAP(0x67, 0x4F, 0x97B2)  /* <CJK> */
-MAP(0x67, 0x50, 0x97B5)  /* <CJK> */
-MAP(0x67, 0x51, 0x97B6)  /* <CJK> */
-MAP(0x67, 0x52, 0x97B8)  /* <CJK> */
-MAP(0x67, 0x53, 0x97B9)  /* <CJK> */
-MAP(0x67, 0x54, 0x97BA)  /* <CJK> */
-MAP(0x67, 0x55, 0x97BC)  /* <CJK> */
-MAP(0x67, 0x56, 0x97BE)  /* <CJK> */
-MAP(0x67, 0x57, 0x97BF)  /* <CJK> */
-MAP(0x67, 0x58, 0x97C1)  /* <CJK> */
-MAP(0x67, 0x59, 0x97C4)  /* <CJK> */
-MAP(0x67, 0x5A, 0x97C5)  /* <CJK> */
-MAP(0x67, 0x5B, 0x97C7)  /* <CJK> */
-MAP(0x67, 0x5C, 0x97C9)  /* <CJK> */
-MAP(0x67, 0x5D, 0x97CA)  /* <CJK> */
-MAP(0x67, 0x5E, 0x97CC)  /* <CJK> */
-MAP(0x67, 0x5F, 0x97CD)  /* <CJK> */
-MAP(0x67, 0x60, 0x97CE)  /* <CJK> */
-MAP(0x67, 0x61, 0x97D0)  /* <CJK> */
-MAP(0x67, 0x62, 0x97D1)  /* <CJK> */
-MAP(0x67, 0x63, 0x97D4)  /* <CJK> */
-MAP(0x67, 0x64, 0x97D7)  /* <CJK> */
-MAP(0x67, 0x65, 0x97D8)  /* <CJK> */
-MAP(0x67, 0x66, 0x97D9)  /* <CJK> */
-MAP(0x67, 0x67, 0x97DD)  /* <CJK> */
-MAP(0x67, 0x68, 0x97DE)  /* <CJK> */
-MAP(0x67, 0x69, 0x97E0)  /* <CJK> */
-MAP(0x67, 0x6A, 0x97DB)  /* <CJK> */
-MAP(0x67, 0x6B, 0x97E1)  /* <CJK> */
-MAP(0x67, 0x6C, 0x97E4)  /* <CJK> */
-MAP(0x67, 0x6D, 0x97EF)  /* <CJK> */
-MAP(0x67, 0x6E, 0x97F1)  /* <CJK> */
-MAP(0x67, 0x6F, 0x97F4)  /* <CJK> */
-MAP(0x67, 0x70, 0x97F7)  /* <CJK> */
-MAP(0x67, 0x71, 0x97F8)  /* <CJK> */
-MAP(0x67, 0x72, 0x97FA)  /* <CJK> */
-MAP(0x67, 0x73, 0x9807)  /* <CJK> */
-MAP(0x67, 0x74, 0x980A)  /* <CJK> */
-MAP(0x67, 0x75, 0x9819)  /* <CJK> */
-MAP(0x67, 0x76, 0x980D)  /* <CJK> */
-MAP(0x67, 0x77, 0x980E)  /* <CJK> */
-MAP(0x67, 0x78, 0x9814)  /* <CJK> */
-MAP(0x67, 0x79, 0x9816)  /* <CJK> */
-MAP(0x67, 0x7A, 0x981C)  /* <CJK> */
-MAP(0x67, 0x7B, 0x981E)  /* <CJK> */
-MAP(0x67, 0x7C, 0x9820)  /* <CJK> */
-MAP(0x67, 0x7D, 0x9823)  /* <CJK> */
-MAP(0x67, 0x7E, 0x9826)  /* <CJK> */
-MAP(0x68, 0x21, 0x982B)  /* <CJK> */
-MAP(0x68, 0x22, 0x982E)  /* <CJK> */
-MAP(0x68, 0x23, 0x982F)  /* <CJK> */
-MAP(0x68, 0x24, 0x9830)  /* <CJK> */
-MAP(0x68, 0x25, 0x9832)  /* <CJK> */
-MAP(0x68, 0x26, 0x9833)  /* <CJK> */
-MAP(0x68, 0x27, 0x9835)  /* <CJK> */
-MAP(0x68, 0x28, 0x9825)  /* <CJK> */
-MAP(0x68, 0x29, 0x983E)  /* <CJK> */
-MAP(0x68, 0x2A, 0x9844)  /* <CJK> */
-MAP(0x68, 0x2B, 0x9847)  /* <CJK> */
-MAP(0x68, 0x2C, 0x984A)  /* <CJK> */
-MAP(0x68, 0x2D, 0x9851)  /* <CJK> */
-MAP(0x68, 0x2E, 0x9852)  /* <CJK> */
-MAP(0x68, 0x2F, 0x9853)  /* <CJK> */
-MAP(0x68, 0x30, 0x9856)  /* <CJK> */
-MAP(0x68, 0x31, 0x9857)  /* <CJK> */
-MAP(0x68, 0x32, 0x9859)  /* <CJK> */
-MAP(0x68, 0x33, 0x985A)  /* <CJK> */
-MAP(0x68, 0x34, 0x9862)  /* <CJK> */
-MAP(0x68, 0x35, 0x9863)  /* <CJK> */
-MAP(0x68, 0x36, 0x9865)  /* <CJK> */
-MAP(0x68, 0x37, 0x9866)  /* <CJK> */
-MAP(0x68, 0x38, 0x986A)  /* <CJK> */
-MAP(0x68, 0x39, 0x986C)  /* <CJK> */
-MAP(0x68, 0x3A, 0x98AB)  /* <CJK> */
-MAP(0x68, 0x3B, 0x98AD)  /* <CJK> */
-MAP(0x68, 0x3C, 0x98AE)  /* <CJK> */
-MAP(0x68, 0x3D, 0x98B0)  /* <CJK> */
-MAP(0x68, 0x3E, 0x98B4)  /* <CJK> */
-MAP(0x68, 0x3F, 0x98B7)  /* <CJK> */
-MAP(0x68, 0x40, 0x98B8)  /* <CJK> */
-MAP(0x68, 0x41, 0x98BA)  /* <CJK> */
-MAP(0x68, 0x42, 0x98BB)  /* <CJK> */
-MAP(0x68, 0x43, 0x98BF)  /* <CJK> */
-MAP(0x68, 0x44, 0x98C2)  /* <CJK> */
-MAP(0x68, 0x45, 0x98C5)  /* <CJK> */
-MAP(0x68, 0x46, 0x98C8)  /* <CJK> */
-MAP(0x68, 0x47, 0x98CC)  /* <CJK> */
-MAP(0x68, 0x48, 0x98E1)  /* <CJK> */
-MAP(0x68, 0x49, 0x98E3)  /* <CJK> */
-MAP(0x68, 0x4A, 0x98E5)  /* <CJK> */
-MAP(0x68, 0x4B, 0x98E6)  /* <CJK> */
-MAP(0x68, 0x4C, 0x98E7)  /* <CJK> */
-MAP(0x68, 0x4D, 0x98EA)  /* <CJK> */
-MAP(0x68, 0x4E, 0x98F3)  /* <CJK> */
-MAP(0x68, 0x4F, 0x98F6)  /* <CJK> */
-MAP(0x68, 0x50, 0x9902)  /* <CJK> */
-MAP(0x68, 0x51, 0x9907)  /* <CJK> */
-MAP(0x68, 0x52, 0x9908)  /* <CJK> */
-MAP(0x68, 0x53, 0x9911)  /* <CJK> */
-MAP(0x68, 0x54, 0x9915)  /* <CJK> */
-MAP(0x68, 0x55, 0x9916)  /* <CJK> */
-MAP(0x68, 0x56, 0x9917)  /* <CJK> */
-MAP(0x68, 0x57, 0x991A)  /* <CJK> */
-MAP(0x68, 0x58, 0x991B)  /* <CJK> */
-MAP(0x68, 0x59, 0x991C)  /* <CJK> */
-MAP(0x68, 0x5A, 0x991F)  /* <CJK> */
-MAP(0x68, 0x5B, 0x9922)  /* <CJK> */
-MAP(0x68, 0x5C, 0x9926)  /* <CJK> */
-MAP(0x68, 0x5D, 0x9927)  /* <CJK> */
-MAP(0x68, 0x5E, 0x992B)  /* <CJK> */
-MAP(0x68, 0x5F, 0x9931)  /* <CJK> */
-MAP(0x68, 0x60, 0x9932)  /* <CJK> */
-MAP(0x68, 0x61, 0x9933)  /* <CJK> */
-MAP(0x68, 0x62, 0x9934)  /* <CJK> */
-MAP(0x68, 0x63, 0x9935)  /* <CJK> */
-MAP(0x68, 0x64, 0x9939)  /* <CJK> */
-MAP(0x68, 0x65, 0x993A)  /* <CJK> */
-MAP(0x68, 0x66, 0x993B)  /* <CJK> */
-MAP(0x68, 0x67, 0x993C)  /* <CJK> */
-MAP(0x68, 0x68, 0x9940)  /* <CJK> */
-MAP(0x68, 0x69, 0x9941)  /* <CJK> */
-MAP(0x68, 0x6A, 0x9946)  /* <CJK> */
-MAP(0x68, 0x6B, 0x9947)  /* <CJK> */
-MAP(0x68, 0x6C, 0x9948)  /* <CJK> */
-MAP(0x68, 0x6D, 0x994D)  /* <CJK> */
-MAP(0x68, 0x6E, 0x994E)  /* <CJK> */
-MAP(0x68, 0x6F, 0x9954)  /* <CJK> */
-MAP(0x68, 0x70, 0x9958)  /* <CJK> */
-MAP(0x68, 0x71, 0x9959)  /* <CJK> */
-MAP(0x68, 0x72, 0x995B)  /* <CJK> */
-MAP(0x68, 0x73, 0x995C)  /* <CJK> */
-MAP(0x68, 0x74, 0x995E)  /* <CJK> */
-MAP(0x68, 0x75, 0x995F)  /* <CJK> */
-MAP(0x68, 0x76, 0x9960)  /* <CJK> */
-MAP(0x68, 0x77, 0x999B)  /* <CJK> */
-MAP(0x68, 0x78, 0x999D)  /* <CJK> */
-MAP(0x68, 0x79, 0x999F)  /* <CJK> */
-MAP(0x68, 0x7A, 0x99A6)  /* <CJK> */
-MAP(0x68, 0x7B, 0x99B0)  /* <CJK> */
-MAP(0x68, 0x7C, 0x99B1)  /* <CJK> */
-MAP(0x68, 0x7D, 0x99B2)  /* <CJK> */
-MAP(0x68, 0x7E, 0x99B5)  /* <CJK> */
-MAP(0x69, 0x21, 0x99B9)  /* <CJK> */
-MAP(0x69, 0x22, 0x99BA)  /* <CJK> */
-MAP(0x69, 0x23, 0x99BD)  /* <CJK> */
-MAP(0x69, 0x24, 0x99BF)  /* <CJK> */
-MAP(0x69, 0x25, 0x99C3)  /* <CJK> */
-MAP(0x69, 0x26, 0x99C9)  /* <CJK> */
-MAP(0x69, 0x27, 0x99D3)  /* <CJK> */
-MAP(0x69, 0x28, 0x99D4)  /* <CJK> */
-MAP(0x69, 0x29, 0x99D9)  /* <CJK> */
-MAP(0x69, 0x2A, 0x99DA)  /* <CJK> */
-MAP(0x69, 0x2B, 0x99DC)  /* <CJK> */
-MAP(0x69, 0x2C, 0x99DE)  /* <CJK> */
-MAP(0x69, 0x2D, 0x99E7)  /* <CJK> */
-MAP(0x69, 0x2E, 0x99EA)  /* <CJK> */
-MAP(0x69, 0x2F, 0x99EB)  /* <CJK> */
-MAP(0x69, 0x30, 0x99EC)  /* <CJK> */
-MAP(0x69, 0x31, 0x99F0)  /* <CJK> */
-MAP(0x69, 0x32, 0x99F4)  /* <CJK> */
-MAP(0x69, 0x33, 0x99F5)  /* <CJK> */
-MAP(0x69, 0x34, 0x99F9)  /* <CJK> */
-MAP(0x69, 0x35, 0x99FD)  /* <CJK> */
-MAP(0x69, 0x36, 0x99FE)  /* <CJK> */
-MAP(0x69, 0x37, 0x9A02)  /* <CJK> */
-MAP(0x69, 0x38, 0x9A03)  /* <CJK> */
-MAP(0x69, 0x39, 0x9A04)  /* <CJK> */
-MAP(0x69, 0x3A, 0x9A0B)  /* <CJK> */
-MAP(0x69, 0x3B, 0x9A0C)  /* <CJK> */
-MAP(0x69, 0x3C, 0x9A10)  /* <CJK> */
-MAP(0x69, 0x3D, 0x9A11)  /* <CJK> */
-MAP(0x69, 0x3E, 0x9A16)  /* <CJK> */
-MAP(0x69, 0x3F, 0x9A1E)  /* <CJK> */
-MAP(0x69, 0x40, 0x9A20)  /* <CJK> */
-MAP(0x69, 0x41, 0x9A22)  /* <CJK> */
-MAP(0x69, 0x42, 0x9A23)  /* <CJK> */
-MAP(0x69, 0x43, 0x9A24)  /* <CJK> */
-MAP(0x69, 0x44, 0x9A27)  /* <CJK> */
-MAP(0x69, 0x45, 0x9A2D)  /* <CJK> */
-MAP(0x69, 0x46, 0x9A2E)  /* <CJK> */
-MAP(0x69, 0x47, 0x9A33)  /* <CJK> */
-MAP(0x69, 0x48, 0x9A35)  /* <CJK> */
-MAP(0x69, 0x49, 0x9A36)  /* <CJK> */
-MAP(0x69, 0x4A, 0x9A38)  /* <CJK> */
-MAP(0x69, 0x4B, 0x9A47)  /* <CJK> */
-MAP(0x69, 0x4C, 0x9A41)  /* <CJK> */
-MAP(0x69, 0x4D, 0x9A44)  /* <CJK> */
-MAP(0x69, 0x4E, 0x9A4A)  /* <CJK> */
-MAP(0x69, 0x4F, 0x9A4B)  /* <CJK> */
-MAP(0x69, 0x50, 0x9A4C)  /* <CJK> */
-MAP(0x69, 0x51, 0x9A4E)  /* <CJK> */
-MAP(0x69, 0x52, 0x9A51)  /* <CJK> */
-MAP(0x69, 0x53, 0x9A54)  /* <CJK> */
-MAP(0x69, 0x54, 0x9A56)  /* <CJK> */
-MAP(0x69, 0x55, 0x9A5D)  /* <CJK> */
-MAP(0x69, 0x56, 0x9AAA)  /* <CJK> */
-MAP(0x69, 0x57, 0x9AAC)  /* <CJK> */
-MAP(0x69, 0x58, 0x9AAE)  /* <CJK> */
-MAP(0x69, 0x59, 0x9AAF)  /* <CJK> */
-MAP(0x69, 0x5A, 0x9AB2)  /* <CJK> */
-MAP(0x69, 0x5B, 0x9AB4)  /* <CJK> */
-MAP(0x69, 0x5C, 0x9AB5)  /* <CJK> */
-MAP(0x69, 0x5D, 0x9AB6)  /* <CJK> */
-MAP(0x69, 0x5E, 0x9AB9)  /* <CJK> */
-MAP(0x69, 0x5F, 0x9ABB)  /* <CJK> */
-MAP(0x69, 0x60, 0x9ABE)  /* <CJK> */
-MAP(0x69, 0x61, 0x9ABF)  /* <CJK> */
-MAP(0x69, 0x62, 0x9AC1)  /* <CJK> */
-MAP(0x69, 0x63, 0x9AC3)  /* <CJK> */
-MAP(0x69, 0x64, 0x9AC6)  /* <CJK> */
-MAP(0x69, 0x65, 0x9AC8)  /* <CJK> */
-MAP(0x69, 0x66, 0x9ACE)  /* <CJK> */
-MAP(0x69, 0x67, 0x9AD0)  /* <CJK> */
-MAP(0x69, 0x68, 0x9AD2)  /* <CJK> */
-MAP(0x69, 0x69, 0x9AD5)  /* <CJK> */
-MAP(0x69, 0x6A, 0x9AD6)  /* <CJK> */
-MAP(0x69, 0x6B, 0x9AD7)  /* <CJK> */
-MAP(0x69, 0x6C, 0x9ADB)  /* <CJK> */
-MAP(0x69, 0x6D, 0x9ADC)  /* <CJK> */
-MAP(0x69, 0x6E, 0x9AE0)  /* <CJK> */
-MAP(0x69, 0x6F, 0x9AE4)  /* <CJK> */
-MAP(0x69, 0x70, 0x9AE5)  /* <CJK> */
-MAP(0x69, 0x71, 0x9AE7)  /* <CJK> */
-MAP(0x69, 0x72, 0x9AE9)  /* <CJK> */
-MAP(0x69, 0x73, 0x9AEC)  /* <CJK> */
-MAP(0x69, 0x74, 0x9AF2)  /* <CJK> */
-MAP(0x69, 0x75, 0x9AF3)  /* <CJK> */
-MAP(0x69, 0x76, 0x9AF5)  /* <CJK> */
-MAP(0x69, 0x77, 0x9AF9)  /* <CJK> */
-MAP(0x69, 0x78, 0x9AFA)  /* <CJK> */
-MAP(0x69, 0x79, 0x9AFD)  /* <CJK> */
-MAP(0x69, 0x7A, 0x9AFF)  /* <CJK> */
-MAP(0x69, 0x7B, 0x9B00)  /* <CJK> */
-MAP(0x69, 0x7C, 0x9B01)  /* <CJK> */
-MAP(0x69, 0x7D, 0x9B02)  /* <CJK> */
-MAP(0x69, 0x7E, 0x9B03)  /* <CJK> */
-MAP(0x6A, 0x21, 0x9B04)  /* <CJK> */
-MAP(0x6A, 0x22, 0x9B05)  /* <CJK> */
-MAP(0x6A, 0x23, 0x9B08)  /* <CJK> */
-MAP(0x6A, 0x24, 0x9B09)  /* <CJK> */
-MAP(0x6A, 0x25, 0x9B0B)  /* <CJK> */
-MAP(0x6A, 0x26, 0x9B0C)  /* <CJK> */
-MAP(0x6A, 0x27, 0x9B0D)  /* <CJK> */
-MAP(0x6A, 0x28, 0x9B0E)  /* <CJK> */
-MAP(0x6A, 0x29, 0x9B10)  /* <CJK> */
-MAP(0x6A, 0x2A, 0x9B12)  /* <CJK> */
-MAP(0x6A, 0x2B, 0x9B16)  /* <CJK> */
-MAP(0x6A, 0x2C, 0x9B19)  /* <CJK> */
-MAP(0x6A, 0x2D, 0x9B1B)  /* <CJK> */
-MAP(0x6A, 0x2E, 0x9B1C)  /* <CJK> */
-MAP(0x6A, 0x2F, 0x9B20)  /* <CJK> */
-MAP(0x6A, 0x30, 0x9B26)  /* <CJK> */
-MAP(0x6A, 0x31, 0x9B2B)  /* <CJK> */
-MAP(0x6A, 0x32, 0x9B2D)  /* <CJK> */
-MAP(0x6A, 0x33, 0x9B33)  /* <CJK> */
-MAP(0x6A, 0x34, 0x9B34)  /* <CJK> */
-MAP(0x6A, 0x35, 0x9B35)  /* <CJK> */
-MAP(0x6A, 0x36, 0x9B37)  /* <CJK> */
-MAP(0x6A, 0x37, 0x9B39)  /* <CJK> */
-MAP(0x6A, 0x38, 0x9B3A)  /* <CJK> */
-MAP(0x6A, 0x39, 0x9B3D)  /* <CJK> */
-MAP(0x6A, 0x3A, 0x9B48)  /* <CJK> */
-MAP(0x6A, 0x3B, 0x9B4B)  /* <CJK> */
-MAP(0x6A, 0x3C, 0x9B4C)  /* <CJK> */
-MAP(0x6A, 0x3D, 0x9B55)  /* <CJK> */
-MAP(0x6A, 0x3E, 0x9B56)  /* <CJK> */
-MAP(0x6A, 0x3F, 0x9B57)  /* <CJK> */
-MAP(0x6A, 0x40, 0x9B5B)  /* <CJK> */
-MAP(0x6A, 0x41, 0x9B5E)  /* <CJK> */
-MAP(0x6A, 0x42, 0x9B61)  /* <CJK> */
-MAP(0x6A, 0x43, 0x9B63)  /* <CJK> */
-MAP(0x6A, 0x44, 0x9B65)  /* <CJK> */
-MAP(0x6A, 0x45, 0x9B66)  /* <CJK> */
-MAP(0x6A, 0x46, 0x9B68)  /* <CJK> */
-MAP(0x6A, 0x47, 0x9B6A)  /* <CJK> */
-MAP(0x6A, 0x48, 0x9B6B)  /* <CJK> */
-MAP(0x6A, 0x49, 0x9B6C)  /* <CJK> */
-MAP(0x6A, 0x4A, 0x9B6D)  /* <CJK> */
-MAP(0x6A, 0x4B, 0x9B6E)  /* <CJK> */
-MAP(0x6A, 0x4C, 0x9B73)  /* <CJK> */
-MAP(0x6A, 0x4D, 0x9B75)  /* <CJK> */
-MAP(0x6A, 0x4E, 0x9B77)  /* <CJK> */
-MAP(0x6A, 0x4F, 0x9B78)  /* <CJK> */
-MAP(0x6A, 0x50, 0x9B79)  /* <CJK> */
-MAP(0x6A, 0x51, 0x9B7F)  /* <CJK> */
-MAP(0x6A, 0x52, 0x9B80)  /* <CJK> */
-MAP(0x6A, 0x53, 0x9B84)  /* <CJK> */
-MAP(0x6A, 0x54, 0x9B85)  /* <CJK> */
-MAP(0x6A, 0x55, 0x9B86)  /* <CJK> */
-MAP(0x6A, 0x56, 0x9B87)  /* <CJK> */
-MAP(0x6A, 0x57, 0x9B89)  /* <CJK> */
-MAP(0x6A, 0x58, 0x9B8A)  /* <CJK> */
-MAP(0x6A, 0x59, 0x9B8B)  /* <CJK> */
-MAP(0x6A, 0x5A, 0x9B8D)  /* <CJK> */
-MAP(0x6A, 0x5B, 0x9B8F)  /* <CJK> */
-MAP(0x6A, 0x5C, 0x9B90)  /* <CJK> */
-MAP(0x6A, 0x5D, 0x9B94)  /* <CJK> */
-MAP(0x6A, 0x5E, 0x9B9A)  /* <CJK> */
-MAP(0x6A, 0x5F, 0x9B9D)  /* <CJK> */
-MAP(0x6A, 0x60, 0x9B9E)  /* <CJK> */
-MAP(0x6A, 0x61, 0x9BA6)  /* <CJK> */
-MAP(0x6A, 0x62, 0x9BA7)  /* <CJK> */
-MAP(0x6A, 0x63, 0x9BA9)  /* <CJK> */
-MAP(0x6A, 0x64, 0x9BAC)  /* <CJK> */
-MAP(0x6A, 0x65, 0x9BB0)  /* <CJK> */
-MAP(0x6A, 0x66, 0x9BB1)  /* <CJK> */
-MAP(0x6A, 0x67, 0x9BB2)  /* <CJK> */
-MAP(0x6A, 0x68, 0x9BB7)  /* <CJK> */
-MAP(0x6A, 0x69, 0x9BB8)  /* <CJK> */
-MAP(0x6A, 0x6A, 0x9BBB)  /* <CJK> */
-MAP(0x6A, 0x6B, 0x9BBC)  /* <CJK> */
-MAP(0x6A, 0x6C, 0x9BBE)  /* <CJK> */
-MAP(0x6A, 0x6D, 0x9BBF)  /* <CJK> */
-MAP(0x6A, 0x6E, 0x9BC1)  /* <CJK> */
-MAP(0x6A, 0x6F, 0x9BC7)  /* <CJK> */
-MAP(0x6A, 0x70, 0x9BC8)  /* <CJK> */
-MAP(0x6A, 0x71, 0x9BCE)  /* <CJK> */
-MAP(0x6A, 0x72, 0x9BD0)  /* <CJK> */
-MAP(0x6A, 0x73, 0x9BD7)  /* <CJK> */
-MAP(0x6A, 0x74, 0x9BD8)  /* <CJK> */
-MAP(0x6A, 0x75, 0x9BDD)  /* <CJK> */
-MAP(0x6A, 0x76, 0x9BDF)  /* <CJK> */
-MAP(0x6A, 0x77, 0x9BE5)  /* <CJK> */
-MAP(0x6A, 0x78, 0x9BE7)  /* <CJK> */
-MAP(0x6A, 0x79, 0x9BEA)  /* <CJK> */
-MAP(0x6A, 0x7A, 0x9BEB)  /* <CJK> */
-MAP(0x6A, 0x7B, 0x9BEF)  /* <CJK> */
-MAP(0x6A, 0x7C, 0x9BF3)  /* <CJK> */
-MAP(0x6A, 0x7D, 0x9BF7)  /* <CJK> */
-MAP(0x6A, 0x7E, 0x9BF8)  /* <CJK> */
-MAP(0x6B, 0x21, 0x9BF9)  /* <CJK> */
-MAP(0x6B, 0x22, 0x9BFA)  /* <CJK> */
-MAP(0x6B, 0x23, 0x9BFD)  /* <CJK> */
-MAP(0x6B, 0x24, 0x9BFF)  /* <CJK> */
-MAP(0x6B, 0x25, 0x9C00)  /* <CJK> */
-MAP(0x6B, 0x26, 0x9C02)  /* <CJK> */
-MAP(0x6B, 0x27, 0x9C0B)  /* <CJK> */
-MAP(0x6B, 0x28, 0x9C0F)  /* <CJK> */
-MAP(0x6B, 0x29, 0x9C11)  /* <CJK> */
-MAP(0x6B, 0x2A, 0x9C16)  /* <CJK> */
-MAP(0x6B, 0x2B, 0x9C18)  /* <CJK> */
-MAP(0x6B, 0x2C, 0x9C19)  /* <CJK> */
-MAP(0x6B, 0x2D, 0x9C1A)  /* <CJK> */
-MAP(0x6B, 0x2E, 0x9C1C)  /* <CJK> */
-MAP(0x6B, 0x2F, 0x9C1E)  /* <CJK> */
-MAP(0x6B, 0x30, 0x9C22)  /* <CJK> */
-MAP(0x6B, 0x31, 0x9C23)  /* <CJK> */
-MAP(0x6B, 0x32, 0x9C26)  /* <CJK> */
-MAP(0x6B, 0x33, 0x9C27)  /* <CJK> */
-MAP(0x6B, 0x34, 0x9C28)  /* <CJK> */
-MAP(0x6B, 0x35, 0x9C29)  /* <CJK> */
-MAP(0x6B, 0x36, 0x9C2A)  /* <CJK> */
-MAP(0x6B, 0x37, 0x9C31)  /* <CJK> */
-MAP(0x6B, 0x38, 0x9C35)  /* <CJK> */
-MAP(0x6B, 0x39, 0x9C36)  /* <CJK> */
-MAP(0x6B, 0x3A, 0x9C37)  /* <CJK> */
-MAP(0x6B, 0x3B, 0x9C3D)  /* <CJK> */
-MAP(0x6B, 0x3C, 0x9C41)  /* <CJK> */
-MAP(0x6B, 0x3D, 0x9C43)  /* <CJK> */
-MAP(0x6B, 0x3E, 0x9C44)  /* <CJK> */
-MAP(0x6B, 0x3F, 0x9C45)  /* <CJK> */
-MAP(0x6B, 0x40, 0x9C49)  /* <CJK> */
-MAP(0x6B, 0x41, 0x9C4A)  /* <CJK> */
-MAP(0x6B, 0x42, 0x9C4E)  /* <CJK> */
-MAP(0x6B, 0x43, 0x9C4F)  /* <CJK> */
-MAP(0x6B, 0x44, 0x9C50)  /* <CJK> */
-MAP(0x6B, 0x45, 0x9C53)  /* <CJK> */
-MAP(0x6B, 0x46, 0x9C54)  /* <CJK> */
-MAP(0x6B, 0x47, 0x9C56)  /* <CJK> */
-MAP(0x6B, 0x48, 0x9C58)  /* <CJK> */
-MAP(0x6B, 0x49, 0x9C5B)  /* <CJK> */
-MAP(0x6B, 0x4A, 0x9C5D)  /* <CJK> */
-MAP(0x6B, 0x4B, 0x9C5E)  /* <CJK> */
-MAP(0x6B, 0x4C, 0x9C5F)  /* <CJK> */
-MAP(0x6B, 0x4D, 0x9C63)  /* <CJK> */
-MAP(0x6B, 0x4E, 0x9C69)  /* <CJK> */
-MAP(0x6B, 0x4F, 0x9C6A)  /* <CJK> */
-MAP(0x6B, 0x50, 0x9C5C)  /* <CJK> */
-MAP(0x6B, 0x51, 0x9C6B)  /* <CJK> */
-MAP(0x6B, 0x52, 0x9C68)  /* <CJK> */
-MAP(0x6B, 0x53, 0x9C6E)  /* <CJK> */
-MAP(0x6B, 0x54, 0x9C70)  /* <CJK> */
-MAP(0x6B, 0x55, 0x9C72)  /* <CJK> */
-MAP(0x6B, 0x56, 0x9C75)  /* <CJK> */
-MAP(0x6B, 0x57, 0x9C77)  /* <CJK> */
-MAP(0x6B, 0x58, 0x9C7B)  /* <CJK> */
-MAP(0x6B, 0x59, 0x9CE6)  /* <CJK> */
-MAP(0x6B, 0x5A, 0x9CF2)  /* <CJK> */
-MAP(0x6B, 0x5B, 0x9CF7)  /* <CJK> */
-MAP(0x6B, 0x5C, 0x9CF9)  /* <CJK> */
-MAP(0x6B, 0x5D, 0x9D0B)  /* <CJK> */
-MAP(0x6B, 0x5E, 0x9D02)  /* <CJK> */
-MAP(0x6B, 0x5F, 0x9D11)  /* <CJK> */
-MAP(0x6B, 0x60, 0x9D17)  /* <CJK> */
-MAP(0x6B, 0x61, 0x9D18)  /* <CJK> */
-MAP(0x6B, 0x62, 0x9D1C)  /* <CJK> */
-MAP(0x6B, 0x63, 0x9D1D)  /* <CJK> */
-MAP(0x6B, 0x64, 0x9D1E)  /* <CJK> */
-MAP(0x6B, 0x65, 0x9D2F)  /* <CJK> */
-MAP(0x6B, 0x66, 0x9D30)  /* <CJK> */
-MAP(0x6B, 0x67, 0x9D32)  /* <CJK> */
-MAP(0x6B, 0x68, 0x9D33)  /* <CJK> */
-MAP(0x6B, 0x69, 0x9D34)  /* <CJK> */
-MAP(0x6B, 0x6A, 0x9D3A)  /* <CJK> */
-MAP(0x6B, 0x6B, 0x9D3C)  /* <CJK> */
-MAP(0x6B, 0x6C, 0x9D45)  /* <CJK> */
-MAP(0x6B, 0x6D, 0x9D3D)  /* <CJK> */
-MAP(0x6B, 0x6E, 0x9D42)  /* <CJK> */
-MAP(0x6B, 0x6F, 0x9D43)  /* <CJK> */
-MAP(0x6B, 0x70, 0x9D47)  /* <CJK> */
-MAP(0x6B, 0x71, 0x9D4A)  /* <CJK> */
-MAP(0x6B, 0x72, 0x9D53)  /* <CJK> */
-MAP(0x6B, 0x73, 0x9D54)  /* <CJK> */
-MAP(0x6B, 0x74, 0x9D5F)  /* <CJK> */
-MAP(0x6B, 0x75, 0x9D63)  /* <CJK> */
-MAP(0x6B, 0x76, 0x9D62)  /* <CJK> */
-MAP(0x6B, 0x77, 0x9D65)  /* <CJK> */
-MAP(0x6B, 0x78, 0x9D69)  /* <CJK> */
-MAP(0x6B, 0x79, 0x9D6A)  /* <CJK> */
-MAP(0x6B, 0x7A, 0x9D6B)  /* <CJK> */
-MAP(0x6B, 0x7B, 0x9D70)  /* <CJK> */
-MAP(0x6B, 0x7C, 0x9D76)  /* <CJK> */
-MAP(0x6B, 0x7D, 0x9D77)  /* <CJK> */
-MAP(0x6B, 0x7E, 0x9D7B)  /* <CJK> */
-MAP(0x6C, 0x21, 0x9D7C)  /* <CJK> */
-MAP(0x6C, 0x22, 0x9D7E)  /* <CJK> */
-MAP(0x6C, 0x23, 0x9D83)  /* <CJK> */
-MAP(0x6C, 0x24, 0x9D84)  /* <CJK> */
-MAP(0x6C, 0x25, 0x9D86)  /* <CJK> */
-MAP(0x6C, 0x26, 0x9D8A)  /* <CJK> */
-MAP(0x6C, 0x27, 0x9D8D)  /* <CJK> */
-MAP(0x6C, 0x28, 0x9D8E)  /* <CJK> */
-MAP(0x6C, 0x29, 0x9D92)  /* <CJK> */
-MAP(0x6C, 0x2A, 0x9D93)  /* <CJK> */
-MAP(0x6C, 0x2B, 0x9D95)  /* <CJK> */
-MAP(0x6C, 0x2C, 0x9D96)  /* <CJK> */
-MAP(0x6C, 0x2D, 0x9D97)  /* <CJK> */
-MAP(0x6C, 0x2E, 0x9D98)  /* <CJK> */
-MAP(0x6C, 0x2F, 0x9DA1)  /* <CJK> */
-MAP(0x6C, 0x30, 0x9DAA)  /* <CJK> */
-MAP(0x6C, 0x31, 0x9DAC)  /* <CJK> */
-MAP(0x6C, 0x32, 0x9DAE)  /* <CJK> */
-MAP(0x6C, 0x33, 0x9DB1)  /* <CJK> */
-MAP(0x6C, 0x34, 0x9DB5)  /* <CJK> */
-MAP(0x6C, 0x35, 0x9DB9)  /* <CJK> */
-MAP(0x6C, 0x36, 0x9DBC)  /* <CJK> */
-MAP(0x6C, 0x37, 0x9DBF)  /* <CJK> */
-MAP(0x6C, 0x38, 0x9DC3)  /* <CJK> */
-MAP(0x6C, 0x39, 0x9DC7)  /* <CJK> */
-MAP(0x6C, 0x3A, 0x9DC9)  /* <CJK> */
-MAP(0x6C, 0x3B, 0x9DCA)  /* <CJK> */
-MAP(0x6C, 0x3C, 0x9DD4)  /* <CJK> */
-MAP(0x6C, 0x3D, 0x9DD5)  /* <CJK> */
-MAP(0x6C, 0x3E, 0x9DD6)  /* <CJK> */
-MAP(0x6C, 0x3F, 0x9DD7)  /* <CJK> */
-MAP(0x6C, 0x40, 0x9DDA)  /* <CJK> */
-MAP(0x6C, 0x41, 0x9DDE)  /* <CJK> */
-MAP(0x6C, 0x42, 0x9DDF)  /* <CJK> */
-MAP(0x6C, 0x43, 0x9DE0)  /* <CJK> */
-MAP(0x6C, 0x44, 0x9DE5)  /* <CJK> */
-MAP(0x6C, 0x45, 0x9DE7)  /* <CJK> */
-MAP(0x6C, 0x46, 0x9DE9)  /* <CJK> */
-MAP(0x6C, 0x47, 0x9DEB)  /* <CJK> */
-MAP(0x6C, 0x48, 0x9DEE)  /* <CJK> */
-MAP(0x6C, 0x49, 0x9DF0)  /* <CJK> */
-MAP(0x6C, 0x4A, 0x9DF3)  /* <CJK> */
-MAP(0x6C, 0x4B, 0x9DF4)  /* <CJK> */
-MAP(0x6C, 0x4C, 0x9DFE)  /* <CJK> */
-MAP(0x6C, 0x4D, 0x9E0A)  /* <CJK> */
-MAP(0x6C, 0x4E, 0x9E02)  /* <CJK> */
-MAP(0x6C, 0x4F, 0x9E07)  /* <CJK> */
-MAP(0x6C, 0x50, 0x9E0E)  /* <CJK> */
-MAP(0x6C, 0x51, 0x9E10)  /* <CJK> */
-MAP(0x6C, 0x52, 0x9E11)  /* <CJK> */
-MAP(0x6C, 0x53, 0x9E12)  /* <CJK> */
-MAP(0x6C, 0x54, 0x9E15)  /* <CJK> */
-MAP(0x6C, 0x55, 0x9E16)  /* <CJK> */
-MAP(0x6C, 0x56, 0x9E19)  /* <CJK> */
-MAP(0x6C, 0x57, 0x9E1C)  /* <CJK> */
-MAP(0x6C, 0x58, 0x9E1D)  /* <CJK> */
-MAP(0x6C, 0x59, 0x9E7A)  /* <CJK> */
-MAP(0x6C, 0x5A, 0x9E7B)  /* <CJK> */
-MAP(0x6C, 0x5B, 0x9E7C)  /* <CJK> */
-MAP(0x6C, 0x5C, 0x9E80)  /* <CJK> */
-MAP(0x6C, 0x5D, 0x9E82)  /* <CJK> */
-MAP(0x6C, 0x5E, 0x9E83)  /* <CJK> */
-MAP(0x6C, 0x5F, 0x9E84)  /* <CJK> */
-MAP(0x6C, 0x60, 0x9E85)  /* <CJK> */
-MAP(0x6C, 0x61, 0x9E87)  /* <CJK> */
-MAP(0x6C, 0x62, 0x9E8E)  /* <CJK> */
-MAP(0x6C, 0x63, 0x9E8F)  /* <CJK> */
-MAP(0x6C, 0x64, 0x9E96)  /* <CJK> */
-MAP(0x6C, 0x65, 0x9E98)  /* <CJK> */
-MAP(0x6C, 0x66, 0x9E9B)  /* <CJK> */
-MAP(0x6C, 0x67, 0x9E9E)  /* <CJK> */
-MAP(0x6C, 0x68, 0x9EA4)  /* <CJK> */
-MAP(0x6C, 0x69, 0x9EA8)  /* <CJK> */
-MAP(0x6C, 0x6A, 0x9EAC)  /* <CJK> */
-MAP(0x6C, 0x6B, 0x9EAE)  /* <CJK> */
-MAP(0x6C, 0x6C, 0x9EAF)  /* <CJK> */
-MAP(0x6C, 0x6D, 0x9EB0)  /* <CJK> */
-MAP(0x6C, 0x6E, 0x9EB3)  /* <CJK> */
-MAP(0x6C, 0x6F, 0x9EB4)  /* <CJK> */
-MAP(0x6C, 0x70, 0x9EB5)  /* <CJK> */
-MAP(0x6C, 0x71, 0x9EC6)  /* <CJK> */
-MAP(0x6C, 0x72, 0x9EC8)  /* <CJK> */
-MAP(0x6C, 0x73, 0x9ECB)  /* <CJK> */
-MAP(0x6C, 0x74, 0x9ED5)  /* <CJK> */
-MAP(0x6C, 0x75, 0x9EDF)  /* <CJK> */
-MAP(0x6C, 0x76, 0x9EE4)  /* <CJK> */
-MAP(0x6C, 0x77, 0x9EE7)  /* <CJK> */
-MAP(0x6C, 0x78, 0x9EEC)  /* <CJK> */
-MAP(0x6C, 0x79, 0x9EED)  /* <CJK> */
-MAP(0x6C, 0x7A, 0x9EEE)  /* <CJK> */
-MAP(0x6C, 0x7B, 0x9EF0)  /* <CJK> */
-MAP(0x6C, 0x7C, 0x9EF1)  /* <CJK> */
-MAP(0x6C, 0x7D, 0x9EF2)  /* <CJK> */
-MAP(0x6C, 0x7E, 0x9EF5)  /* <CJK> */
-MAP(0x6D, 0x21, 0x9EF8)  /* <CJK> */
-MAP(0x6D, 0x22, 0x9EFF)  /* <CJK> */
-MAP(0x6D, 0x23, 0x9F02)  /* <CJK> */
-MAP(0x6D, 0x24, 0x9F03)  /* <CJK> */
-MAP(0x6D, 0x25, 0x9F09)  /* <CJK> */
-MAP(0x6D, 0x26, 0x9F0F)  /* <CJK> */
-MAP(0x6D, 0x27, 0x9F10)  /* <CJK> */
-MAP(0x6D, 0x28, 0x9F11)  /* <CJK> */
-MAP(0x6D, 0x29, 0x9F12)  /* <CJK> */
-MAP(0x6D, 0x2A, 0x9F14)  /* <CJK> */
-MAP(0x6D, 0x2B, 0x9F16)  /* <CJK> */
-MAP(0x6D, 0x2C, 0x9F17)  /* <CJK> */
-MAP(0x6D, 0x2D, 0x9F19)  /* <CJK> */
-MAP(0x6D, 0x2E, 0x9F1A)  /* <CJK> */
-MAP(0x6D, 0x2F, 0x9F1B)  /* <CJK> */
-MAP(0x6D, 0x30, 0x9F1F)  /* <CJK> */
-MAP(0x6D, 0x31, 0x9F22)  /* <CJK> */
-MAP(0x6D, 0x32, 0x9F26)  /* <CJK> */
-MAP(0x6D, 0x33, 0x9F2A)  /* <CJK> */
-MAP(0x6D, 0x34, 0x9F2B)  /* <CJK> */
-MAP(0x6D, 0x35, 0x9F2F)  /* <CJK> */
-MAP(0x6D, 0x36, 0x9F31)  /* <CJK> */
-MAP(0x6D, 0x37, 0x9F32)  /* <CJK> */
-MAP(0x6D, 0x38, 0x9F34)  /* <CJK> */
-MAP(0x6D, 0x39, 0x9F37)  /* <CJK> */
-MAP(0x6D, 0x3A, 0x9F39)  /* <CJK> */
-MAP(0x6D, 0x3B, 0x9F3A)  /* <CJK> */
-MAP(0x6D, 0x3C, 0x9F3C)  /* <CJK> */
-MAP(0x6D, 0x3D, 0x9F3D)  /* <CJK> */
-MAP(0x6D, 0x3E, 0x9F3F)  /* <CJK> */
-MAP(0x6D, 0x3F, 0x9F41)  /* <CJK> */
-MAP(0x6D, 0x40, 0x9F43)  /* <CJK> */
-MAP(0x6D, 0x41, 0x9F44)  /* <CJK> */
-MAP(0x6D, 0x42, 0x9F45)  /* <CJK> */
-MAP(0x6D, 0x43, 0x9F46)  /* <CJK> */
-MAP(0x6D, 0x44, 0x9F47)  /* <CJK> */
-MAP(0x6D, 0x45, 0x9F53)  /* <CJK> */
-MAP(0x6D, 0x46, 0x9F55)  /* <CJK> */
-MAP(0x6D, 0x47, 0x9F56)  /* <CJK> */
-MAP(0x6D, 0x48, 0x9F57)  /* <CJK> */
-MAP(0x6D, 0x49, 0x9F58)  /* <CJK> */
-MAP(0x6D, 0x4A, 0x9F5A)  /* <CJK> */
-MAP(0x6D, 0x4B, 0x9F5D)  /* <CJK> */
-MAP(0x6D, 0x4C, 0x9F5E)  /* <CJK> */
-MAP(0x6D, 0x4D, 0x9F68)  /* <CJK> */
-MAP(0x6D, 0x4E, 0x9F69)  /* <CJK> */
-MAP(0x6D, 0x4F, 0x9F6D)  /* <CJK> */
-MAP(0x6D, 0x50, 0x9F6E)  /* <CJK> */
-MAP(0x6D, 0x51, 0x9F6F)  /* <CJK> */
-MAP(0x6D, 0x52, 0x9F70)  /* <CJK> */
-MAP(0x6D, 0x53, 0x9F71)  /* <CJK> */
-MAP(0x6D, 0x54, 0x9F73)  /* <CJK> */
-MAP(0x6D, 0x55, 0x9F75)  /* <CJK> */
-MAP(0x6D, 0x56, 0x9F7A)  /* <CJK> */
-MAP(0x6D, 0x57, 0x9F7D)  /* <CJK> */
-MAP(0x6D, 0x58, 0x9F8F)  /* <CJK> */
-MAP(0x6D, 0x59, 0x9F90)  /* <CJK> */
-MAP(0x6D, 0x5A, 0x9F91)  /* <CJK> */
-MAP(0x6D, 0x5B, 0x9F92)  /* <CJK> */
-MAP(0x6D, 0x5C, 0x9F94)  /* <CJK> */
-MAP(0x6D, 0x5D, 0x9F96)  /* <CJK> */
-MAP(0x6D, 0x5E, 0x9F97)  /* <CJK> */
-MAP(0x6D, 0x5F, 0x9F9E)  /* <CJK> */
-MAP(0x6D, 0x60, 0x9FA1)  /* <CJK> */
-MAP(0x6D, 0x61, 0x9FA2)  /* <CJK> */
-MAP(0x6D, 0x62, 0x9FA3)  /* <CJK> */
-MAP(0x6D, 0x63, 0x9FA5)  /* <CJK> */
diff --git a/libjava/gnu/gcj/convert/JIS0212_to_Unicode.cc b/libjava/gnu/gcj/convert/JIS0212_to_Unicode.cc
deleted file mode 100644
index 66d5677..0000000
--- a/libjava/gnu/gcj/convert/JIS0212_to_Unicode.cc
+++ /dev/null
@@ -1,6472 +0,0 @@
-/* This file is automatically generated from JIS0212.TXT. */
-#pragma GCC java_exceptions
-unsigned short JIS0212_to_Unicode[76][94] = {
-/* 1st byte: 34 */ { 
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 47 */ 0x02d8,
-  /* 2nd byte: 48 */ 0x02c7,
-  /* 2nd byte: 49 */ 0x00b8,
-  /* 2nd byte: 50 */ 0x02d9,
-  /* 2nd byte: 51 */ 0x02dd,
-  /* 2nd byte: 52 */ 0x00af,
-  /* 2nd byte: 53 */ 0x02db,
-  /* 2nd byte: 54 */ 0x02da,
-  /* 2nd byte: 55 */ 0x007e,
-  /* 2nd byte: 56 */ 0x0384,
-  /* 2nd byte: 57 */ 0x0385,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 66 */ 0x00a1,
-  /* 2nd byte: 67 */ 0x00a6,
-  /* 2nd byte: 68 */ 0x00bf,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 107 */ 0x00ba,
-  /* 2nd byte: 108 */ 0x00aa,
-  /* 2nd byte: 109 */ 0x00a9,
-  /* 2nd byte: 110 */ 0x00ae,
-  /* 2nd byte: 111 */ 0x2122,
-  /* 2nd byte: 112 */ 0x00a4,
-  /* 2nd byte: 113 */ 0x2116,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 35 */ { 0 }, /* unused row */
-/* 1st byte: 36 */ { 0 }, /* unused row */
-/* 1st byte: 37 */ { 0 }, /* unused row */
-/* 1st byte: 38 */ { 
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 97 */ 0x0386,
-  /* 2nd byte: 98 */ 0x0388,
-  /* 2nd byte: 99 */ 0x0389,
-  /* 2nd byte: 100 */ 0x038a,
-  /* 2nd byte: 101 */ 0x03aa,
-  0,
-  /* 2nd byte: 103 */ 0x038c,
-  0,
-  /* 2nd byte: 105 */ 0x038e,
-  /* 2nd byte: 106 */ 0x03ab,
-  0,
-  /* 2nd byte: 108 */ 0x038f,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 113 */ 0x03ac,
-  /* 2nd byte: 114 */ 0x03ad,
-  /* 2nd byte: 115 */ 0x03ae,
-  /* 2nd byte: 116 */ 0x03af,
-  /* 2nd byte: 117 */ 0x03ca,
-  /* 2nd byte: 118 */ 0x0390,
-  /* 2nd byte: 119 */ 0x03cc,
-  /* 2nd byte: 120 */ 0x03c2,
-  /* 2nd byte: 121 */ 0x03cd,
-  /* 2nd byte: 122 */ 0x03cb,
-  /* 2nd byte: 123 */ 0x03b0,
-  /* 2nd byte: 124 */ 0x03ce,
-  0,
-  0},
-/* 1st byte: 39 */ { 
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 66 */ 0x0402,
-  /* 2nd byte: 67 */ 0x0403,
-  /* 2nd byte: 68 */ 0x0404,
-  /* 2nd byte: 69 */ 0x0405,
-  /* 2nd byte: 70 */ 0x0406,
-  /* 2nd byte: 71 */ 0x0407,
-  /* 2nd byte: 72 */ 0x0408,
-  /* 2nd byte: 73 */ 0x0409,
-  /* 2nd byte: 74 */ 0x040a,
-  /* 2nd byte: 75 */ 0x040b,
-  /* 2nd byte: 76 */ 0x040c,
-  /* 2nd byte: 77 */ 0x040e,
-  /* 2nd byte: 78 */ 0x040f,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 114 */ 0x0452,
-  /* 2nd byte: 115 */ 0x0453,
-  /* 2nd byte: 116 */ 0x0454,
-  /* 2nd byte: 117 */ 0x0455,
-  /* 2nd byte: 118 */ 0x0456,
-  /* 2nd byte: 119 */ 0x0457,
-  /* 2nd byte: 120 */ 0x0458,
-  /* 2nd byte: 121 */ 0x0459,
-  /* 2nd byte: 122 */ 0x045a,
-  /* 2nd byte: 123 */ 0x045b,
-  /* 2nd byte: 124 */ 0x045c,
-  /* 2nd byte: 125 */ 0x045e,
-  /* 2nd byte: 126 */ 0x045f},
-/* 1st byte: 40 */ { 0 }, /* unused row */
-/* 1st byte: 41 */ { 
-  /* 2nd byte: 33 */ 0x00c6,
-  /* 2nd byte: 34 */ 0x0110,
-  0,
-  /* 2nd byte: 36 */ 0x0126,
-  0,
-  /* 2nd byte: 38 */ 0x0132,
-  0,
-  /* 2nd byte: 40 */ 0x0141,
-  /* 2nd byte: 41 */ 0x013f,
-  0,
-  /* 2nd byte: 43 */ 0x014a,
-  /* 2nd byte: 44 */ 0x00d8,
-  /* 2nd byte: 45 */ 0x0152,
-  0,
-  /* 2nd byte: 47 */ 0x0166,
-  /* 2nd byte: 48 */ 0x00de,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  /* 2nd byte: 65 */ 0x00e6,
-  /* 2nd byte: 66 */ 0x0111,
-  /* 2nd byte: 67 */ 0x00f0,
-  /* 2nd byte: 68 */ 0x0127,
-  /* 2nd byte: 69 */ 0x0131,
-  /* 2nd byte: 70 */ 0x0133,
-  /* 2nd byte: 71 */ 0x0138,
-  /* 2nd byte: 72 */ 0x0142,
-  /* 2nd byte: 73 */ 0x0140,
-  /* 2nd byte: 74 */ 0x0149,
-  /* 2nd byte: 75 */ 0x014b,
-  /* 2nd byte: 76 */ 0x00f8,
-  /* 2nd byte: 77 */ 0x0153,
-  /* 2nd byte: 78 */ 0x00df,
-  /* 2nd byte: 79 */ 0x0167,
-  /* 2nd byte: 80 */ 0x00fe,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 42 */ { 
-  /* 2nd byte: 33 */ 0x00c1,
-  /* 2nd byte: 34 */ 0x00c0,
-  /* 2nd byte: 35 */ 0x00c4,
-  /* 2nd byte: 36 */ 0x00c2,
-  /* 2nd byte: 37 */ 0x0102,
-  /* 2nd byte: 38 */ 0x01cd,
-  /* 2nd byte: 39 */ 0x0100,
-  /* 2nd byte: 40 */ 0x0104,
-  /* 2nd byte: 41 */ 0x00c5,
-  /* 2nd byte: 42 */ 0x00c3,
-  /* 2nd byte: 43 */ 0x0106,
-  /* 2nd byte: 44 */ 0x0108,
-  /* 2nd byte: 45 */ 0x010c,
-  /* 2nd byte: 46 */ 0x00c7,
-  /* 2nd byte: 47 */ 0x010a,
-  /* 2nd byte: 48 */ 0x010e,
-  /* 2nd byte: 49 */ 0x00c9,
-  /* 2nd byte: 50 */ 0x00c8,
-  /* 2nd byte: 51 */ 0x00cb,
-  /* 2nd byte: 52 */ 0x00ca,
-  /* 2nd byte: 53 */ 0x011a,
-  /* 2nd byte: 54 */ 0x0116,
-  /* 2nd byte: 55 */ 0x0112,
-  /* 2nd byte: 56 */ 0x0118,
-  0,
-  /* 2nd byte: 58 */ 0x011c,
-  /* 2nd byte: 59 */ 0x011e,
-  /* 2nd byte: 60 */ 0x0122,
-  /* 2nd byte: 61 */ 0x0120,
-  /* 2nd byte: 62 */ 0x0124,
-  /* 2nd byte: 63 */ 0x00cd,
-  /* 2nd byte: 64 */ 0x00cc,
-  /* 2nd byte: 65 */ 0x00cf,
-  /* 2nd byte: 66 */ 0x00ce,
-  /* 2nd byte: 67 */ 0x01cf,
-  /* 2nd byte: 68 */ 0x0130,
-  /* 2nd byte: 69 */ 0x012a,
-  /* 2nd byte: 70 */ 0x012e,
-  /* 2nd byte: 71 */ 0x0128,
-  /* 2nd byte: 72 */ 0x0134,
-  /* 2nd byte: 73 */ 0x0136,
-  /* 2nd byte: 74 */ 0x0139,
-  /* 2nd byte: 75 */ 0x013d,
-  /* 2nd byte: 76 */ 0x013b,
-  /* 2nd byte: 77 */ 0x0143,
-  /* 2nd byte: 78 */ 0x0147,
-  /* 2nd byte: 79 */ 0x0145,
-  /* 2nd byte: 80 */ 0x00d1,
-  /* 2nd byte: 81 */ 0x00d3,
-  /* 2nd byte: 82 */ 0x00d2,
-  /* 2nd byte: 83 */ 0x00d6,
-  /* 2nd byte: 84 */ 0x00d4,
-  /* 2nd byte: 85 */ 0x01d1,
-  /* 2nd byte: 86 */ 0x0150,
-  /* 2nd byte: 87 */ 0x014c,
-  /* 2nd byte: 88 */ 0x00d5,
-  /* 2nd byte: 89 */ 0x0154,
-  /* 2nd byte: 90 */ 0x0158,
-  /* 2nd byte: 91 */ 0x0156,
-  /* 2nd byte: 92 */ 0x015a,
-  /* 2nd byte: 93 */ 0x015c,
-  /* 2nd byte: 94 */ 0x0160,
-  /* 2nd byte: 95 */ 0x015e,
-  /* 2nd byte: 96 */ 0x0164,
-  /* 2nd byte: 97 */ 0x0162,
-  /* 2nd byte: 98 */ 0x00da,
-  /* 2nd byte: 99 */ 0x00d9,
-  /* 2nd byte: 100 */ 0x00dc,
-  /* 2nd byte: 101 */ 0x00db,
-  /* 2nd byte: 102 */ 0x016c,
-  /* 2nd byte: 103 */ 0x01d3,
-  /* 2nd byte: 104 */ 0x0170,
-  /* 2nd byte: 105 */ 0x016a,
-  /* 2nd byte: 106 */ 0x0172,
-  /* 2nd byte: 107 */ 0x016e,
-  /* 2nd byte: 108 */ 0x0168,
-  /* 2nd byte: 109 */ 0x01d7,
-  /* 2nd byte: 110 */ 0x01db,
-  /* 2nd byte: 111 */ 0x01d9,
-  /* 2nd byte: 112 */ 0x01d5,
-  /* 2nd byte: 113 */ 0x0174,
-  /* 2nd byte: 114 */ 0x00dd,
-  /* 2nd byte: 115 */ 0x0178,
-  /* 2nd byte: 116 */ 0x0176,
-  /* 2nd byte: 117 */ 0x0179,
-  /* 2nd byte: 118 */ 0x017d,
-  /* 2nd byte: 119 */ 0x017b,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 43 */ { 
-  /* 2nd byte: 33 */ 0x00e1,
-  /* 2nd byte: 34 */ 0x00e0,
-  /* 2nd byte: 35 */ 0x00e4,
-  /* 2nd byte: 36 */ 0x00e2,
-  /* 2nd byte: 37 */ 0x0103,
-  /* 2nd byte: 38 */ 0x01ce,
-  /* 2nd byte: 39 */ 0x0101,
-  /* 2nd byte: 40 */ 0x0105,
-  /* 2nd byte: 41 */ 0x00e5,
-  /* 2nd byte: 42 */ 0x00e3,
-  /* 2nd byte: 43 */ 0x0107,
-  /* 2nd byte: 44 */ 0x0109,
-  /* 2nd byte: 45 */ 0x010d,
-  /* 2nd byte: 46 */ 0x00e7,
-  /* 2nd byte: 47 */ 0x010b,
-  /* 2nd byte: 48 */ 0x010f,
-  /* 2nd byte: 49 */ 0x00e9,
-  /* 2nd byte: 50 */ 0x00e8,
-  /* 2nd byte: 51 */ 0x00eb,
-  /* 2nd byte: 52 */ 0x00ea,
-  /* 2nd byte: 53 */ 0x011b,
-  /* 2nd byte: 54 */ 0x0117,
-  /* 2nd byte: 55 */ 0x0113,
-  /* 2nd byte: 56 */ 0x0119,
-  /* 2nd byte: 57 */ 0x01f5,
-  /* 2nd byte: 58 */ 0x011d,
-  /* 2nd byte: 59 */ 0x011f,
-  0,
-  /* 2nd byte: 61 */ 0x0121,
-  /* 2nd byte: 62 */ 0x0125,
-  /* 2nd byte: 63 */ 0x00ed,
-  /* 2nd byte: 64 */ 0x00ec,
-  /* 2nd byte: 65 */ 0x00ef,
-  /* 2nd byte: 66 */ 0x00ee,
-  /* 2nd byte: 67 */ 0x01d0,
-  0,
-  /* 2nd byte: 69 */ 0x012b,
-  /* 2nd byte: 70 */ 0x012f,
-  /* 2nd byte: 71 */ 0x0129,
-  /* 2nd byte: 72 */ 0x0135,
-  /* 2nd byte: 73 */ 0x0137,
-  /* 2nd byte: 74 */ 0x013a,
-  /* 2nd byte: 75 */ 0x013e,
-  /* 2nd byte: 76 */ 0x013c,
-  /* 2nd byte: 77 */ 0x0144,
-  /* 2nd byte: 78 */ 0x0148,
-  /* 2nd byte: 79 */ 0x0146,
-  /* 2nd byte: 80 */ 0x00f1,
-  /* 2nd byte: 81 */ 0x00f3,
-  /* 2nd byte: 82 */ 0x00f2,
-  /* 2nd byte: 83 */ 0x00f6,
-  /* 2nd byte: 84 */ 0x00f4,
-  /* 2nd byte: 85 */ 0x01d2,
-  /* 2nd byte: 86 */ 0x0151,
-  /* 2nd byte: 87 */ 0x014d,
-  /* 2nd byte: 88 */ 0x00f5,
-  /* 2nd byte: 89 */ 0x0155,
-  /* 2nd byte: 90 */ 0x0159,
-  /* 2nd byte: 91 */ 0x0157,
-  /* 2nd byte: 92 */ 0x015b,
-  /* 2nd byte: 93 */ 0x015d,
-  /* 2nd byte: 94 */ 0x0161,
-  /* 2nd byte: 95 */ 0x015f,
-  /* 2nd byte: 96 */ 0x0165,
-  /* 2nd byte: 97 */ 0x0163,
-  /* 2nd byte: 98 */ 0x00fa,
-  /* 2nd byte: 99 */ 0x00f9,
-  /* 2nd byte: 100 */ 0x00fc,
-  /* 2nd byte: 101 */ 0x00fb,
-  /* 2nd byte: 102 */ 0x016d,
-  /* 2nd byte: 103 */ 0x01d4,
-  /* 2nd byte: 104 */ 0x0171,
-  /* 2nd byte: 105 */ 0x016b,
-  /* 2nd byte: 106 */ 0x0173,
-  /* 2nd byte: 107 */ 0x016f,
-  /* 2nd byte: 108 */ 0x0169,
-  /* 2nd byte: 109 */ 0x01d8,
-  /* 2nd byte: 110 */ 0x01dc,
-  /* 2nd byte: 111 */ 0x01da,
-  /* 2nd byte: 112 */ 0x01d6,
-  /* 2nd byte: 113 */ 0x0175,
-  /* 2nd byte: 114 */ 0x00fd,
-  /* 2nd byte: 115 */ 0x00ff,
-  /* 2nd byte: 116 */ 0x0177,
-  /* 2nd byte: 117 */ 0x017a,
-  /* 2nd byte: 118 */ 0x017e,
-  /* 2nd byte: 119 */ 0x017c,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0},
-/* 1st byte: 44 */ { 0 }, /* unused row */
-/* 1st byte: 45 */ { 0 }, /* unused row */
-/* 1st byte: 46 */ { 0 }, /* unused row */
-/* 1st byte: 47 */ { 0 }, /* unused row */
-/* 1st byte: 48 */ { 
-  /* 2nd byte: 33 */ 0x4e02,
-  /* 2nd byte: 34 */ 0x4e04,
-  /* 2nd byte: 35 */ 0x4e05,
-  /* 2nd byte: 36 */ 0x4e0c,
-  /* 2nd byte: 37 */ 0x4e12,
-  /* 2nd byte: 38 */ 0x4e1f,
-  /* 2nd byte: 39 */ 0x4e23,
-  /* 2nd byte: 40 */ 0x4e24,
-  /* 2nd byte: 41 */ 0x4e28,
-  /* 2nd byte: 42 */ 0x4e2b,
-  /* 2nd byte: 43 */ 0x4e2e,
-  /* 2nd byte: 44 */ 0x4e2f,
-  /* 2nd byte: 45 */ 0x4e30,
-  /* 2nd byte: 46 */ 0x4e35,
-  /* 2nd byte: 47 */ 0x4e40,
-  /* 2nd byte: 48 */ 0x4e41,
-  /* 2nd byte: 49 */ 0x4e44,
-  /* 2nd byte: 50 */ 0x4e47,
-  /* 2nd byte: 51 */ 0x4e51,
-  /* 2nd byte: 52 */ 0x4e5a,
-  /* 2nd byte: 53 */ 0x4e5c,
-  /* 2nd byte: 54 */ 0x4e63,
-  /* 2nd byte: 55 */ 0x4e68,
-  /* 2nd byte: 56 */ 0x4e69,
-  /* 2nd byte: 57 */ 0x4e74,
-  /* 2nd byte: 58 */ 0x4e75,
-  /* 2nd byte: 59 */ 0x4e79,
-  /* 2nd byte: 60 */ 0x4e7f,
-  /* 2nd byte: 61 */ 0x4e8d,
-  /* 2nd byte: 62 */ 0x4e96,
-  /* 2nd byte: 63 */ 0x4e97,
-  /* 2nd byte: 64 */ 0x4e9d,
-  /* 2nd byte: 65 */ 0x4eaf,
-  /* 2nd byte: 66 */ 0x4eb9,
-  /* 2nd byte: 67 */ 0x4ec3,
-  /* 2nd byte: 68 */ 0x4ed0,
-  /* 2nd byte: 69 */ 0x4eda,
-  /* 2nd byte: 70 */ 0x4edb,
-  /* 2nd byte: 71 */ 0x4ee0,
-  /* 2nd byte: 72 */ 0x4ee1,
-  /* 2nd byte: 73 */ 0x4ee2,
-  /* 2nd byte: 74 */ 0x4ee8,
-  /* 2nd byte: 75 */ 0x4eef,
-  /* 2nd byte: 76 */ 0x4ef1,
-  /* 2nd byte: 77 */ 0x4ef3,
-  /* 2nd byte: 78 */ 0x4ef5,
-  /* 2nd byte: 79 */ 0x4efd,
-  /* 2nd byte: 80 */ 0x4efe,
-  /* 2nd byte: 81 */ 0x4eff,
-  /* 2nd byte: 82 */ 0x4f00,
-  /* 2nd byte: 83 */ 0x4f02,
-  /* 2nd byte: 84 */ 0x4f03,
-  /* 2nd byte: 85 */ 0x4f08,
-  /* 2nd byte: 86 */ 0x4f0b,
-  /* 2nd byte: 87 */ 0x4f0c,
-  /* 2nd byte: 88 */ 0x4f12,
-  /* 2nd byte: 89 */ 0x4f15,
-  /* 2nd byte: 90 */ 0x4f16,
-  /* 2nd byte: 91 */ 0x4f17,
-  /* 2nd byte: 92 */ 0x4f19,
-  /* 2nd byte: 93 */ 0x4f2e,
-  /* 2nd byte: 94 */ 0x4f31,
-  /* 2nd byte: 95 */ 0x4f60,
-  /* 2nd byte: 96 */ 0x4f33,
-  /* 2nd byte: 97 */ 0x4f35,
-  /* 2nd byte: 98 */ 0x4f37,
-  /* 2nd byte: 99 */ 0x4f39,
-  /* 2nd byte: 100 */ 0x4f3b,
-  /* 2nd byte: 101 */ 0x4f3e,
-  /* 2nd byte: 102 */ 0x4f40,
-  /* 2nd byte: 103 */ 0x4f42,
-  /* 2nd byte: 104 */ 0x4f48,
-  /* 2nd byte: 105 */ 0x4f49,
-  /* 2nd byte: 106 */ 0x4f4b,
-  /* 2nd byte: 107 */ 0x4f4c,
-  /* 2nd byte: 108 */ 0x4f52,
-  /* 2nd byte: 109 */ 0x4f54,
-  /* 2nd byte: 110 */ 0x4f56,
-  /* 2nd byte: 111 */ 0x4f58,
-  /* 2nd byte: 112 */ 0x4f5f,
-  /* 2nd byte: 113 */ 0x4f63,
-  /* 2nd byte: 114 */ 0x4f6a,
-  /* 2nd byte: 115 */ 0x4f6c,
-  /* 2nd byte: 116 */ 0x4f6e,
-  /* 2nd byte: 117 */ 0x4f71,
-  /* 2nd byte: 118 */ 0x4f77,
-  /* 2nd byte: 119 */ 0x4f78,
-  /* 2nd byte: 120 */ 0x4f79,
-  /* 2nd byte: 121 */ 0x4f7a,
-  /* 2nd byte: 122 */ 0x4f7d,
-  /* 2nd byte: 123 */ 0x4f7e,
-  /* 2nd byte: 124 */ 0x4f81,
-  /* 2nd byte: 125 */ 0x4f82,
-  /* 2nd byte: 126 */ 0x4f84},
-/* 1st byte: 49 */ { 
-  /* 2nd byte: 33 */ 0x4f85,
-  /* 2nd byte: 34 */ 0x4f89,
-  /* 2nd byte: 35 */ 0x4f8a,
-  /* 2nd byte: 36 */ 0x4f8c,
-  /* 2nd byte: 37 */ 0x4f8e,
-  /* 2nd byte: 38 */ 0x4f90,
-  /* 2nd byte: 39 */ 0x4f92,
-  /* 2nd byte: 40 */ 0x4f93,
-  /* 2nd byte: 41 */ 0x4f94,
-  /* 2nd byte: 42 */ 0x4f97,
-  /* 2nd byte: 43 */ 0x4f99,
-  /* 2nd byte: 44 */ 0x4f9a,
-  /* 2nd byte: 45 */ 0x4f9e,
-  /* 2nd byte: 46 */ 0x4f9f,
-  /* 2nd byte: 47 */ 0x4fb2,
-  /* 2nd byte: 48 */ 0x4fb7,
-  /* 2nd byte: 49 */ 0x4fb9,
-  /* 2nd byte: 50 */ 0x4fbb,
-  /* 2nd byte: 51 */ 0x4fbc,
-  /* 2nd byte: 52 */ 0x4fbd,
-  /* 2nd byte: 53 */ 0x4fbe,
-  /* 2nd byte: 54 */ 0x4fc0,
-  /* 2nd byte: 55 */ 0x4fc1,
-  /* 2nd byte: 56 */ 0x4fc5,
-  /* 2nd byte: 57 */ 0x4fc6,
-  /* 2nd byte: 58 */ 0x4fc8,
-  /* 2nd byte: 59 */ 0x4fc9,
-  /* 2nd byte: 60 */ 0x4fcb,
-  /* 2nd byte: 61 */ 0x4fcc,
-  /* 2nd byte: 62 */ 0x4fcd,
-  /* 2nd byte: 63 */ 0x4fcf,
-  /* 2nd byte: 64 */ 0x4fd2,
-  /* 2nd byte: 65 */ 0x4fdc,
-  /* 2nd byte: 66 */ 0x4fe0,
-  /* 2nd byte: 67 */ 0x4fe2,
-  /* 2nd byte: 68 */ 0x4ff0,
-  /* 2nd byte: 69 */ 0x4ff2,
-  /* 2nd byte: 70 */ 0x4ffc,
-  /* 2nd byte: 71 */ 0x4ffd,
-  /* 2nd byte: 72 */ 0x4fff,
-  /* 2nd byte: 73 */ 0x5000,
-  /* 2nd byte: 74 */ 0x5001,
-  /* 2nd byte: 75 */ 0x5004,
-  /* 2nd byte: 76 */ 0x5007,
-  /* 2nd byte: 77 */ 0x500a,
-  /* 2nd byte: 78 */ 0x500c,
-  /* 2nd byte: 79 */ 0x500e,
-  /* 2nd byte: 80 */ 0x5010,
-  /* 2nd byte: 81 */ 0x5013,
-  /* 2nd byte: 82 */ 0x5017,
-  /* 2nd byte: 83 */ 0x5018,
-  /* 2nd byte: 84 */ 0x501b,
-  /* 2nd byte: 85 */ 0x501c,
-  /* 2nd byte: 86 */ 0x501d,
-  /* 2nd byte: 87 */ 0x501e,
-  /* 2nd byte: 88 */ 0x5022,
-  /* 2nd byte: 89 */ 0x5027,
-  /* 2nd byte: 90 */ 0x502e,
-  /* 2nd byte: 91 */ 0x5030,
-  /* 2nd byte: 92 */ 0x5032,
-  /* 2nd byte: 93 */ 0x5033,
-  /* 2nd byte: 94 */ 0x5035,
-  /* 2nd byte: 95 */ 0x5040,
-  /* 2nd byte: 96 */ 0x5041,
-  /* 2nd byte: 97 */ 0x5042,
-  /* 2nd byte: 98 */ 0x5045,
-  /* 2nd byte: 99 */ 0x5046,
-  /* 2nd byte: 100 */ 0x504a,
-  /* 2nd byte: 101 */ 0x504c,
-  /* 2nd byte: 102 */ 0x504e,
-  /* 2nd byte: 103 */ 0x5051,
-  /* 2nd byte: 104 */ 0x5052,
-  /* 2nd byte: 105 */ 0x5053,
-  /* 2nd byte: 106 */ 0x5057,
-  /* 2nd byte: 107 */ 0x5059,
-  /* 2nd byte: 108 */ 0x505f,
-  /* 2nd byte: 109 */ 0x5060,
-  /* 2nd byte: 110 */ 0x5062,
-  /* 2nd byte: 111 */ 0x5063,
-  /* 2nd byte: 112 */ 0x5066,
-  /* 2nd byte: 113 */ 0x5067,
-  /* 2nd byte: 114 */ 0x506a,
-  /* 2nd byte: 115 */ 0x506d,
-  /* 2nd byte: 116 */ 0x5070,
-  /* 2nd byte: 117 */ 0x5071,
-  /* 2nd byte: 118 */ 0x503b,
-  /* 2nd byte: 119 */ 0x5081,
-  /* 2nd byte: 120 */ 0x5083,
-  /* 2nd byte: 121 */ 0x5084,
-  /* 2nd byte: 122 */ 0x5086,
-  /* 2nd byte: 123 */ 0x508a,
-  /* 2nd byte: 124 */ 0x508e,
-  /* 2nd byte: 125 */ 0x508f,
-  /* 2nd byte: 126 */ 0x5090},
-/* 1st byte: 50 */ { 
-  /* 2nd byte: 33 */ 0x5092,
-  /* 2nd byte: 34 */ 0x5093,
-  /* 2nd byte: 35 */ 0x5094,
-  /* 2nd byte: 36 */ 0x5096,
-  /* 2nd byte: 37 */ 0x509b,
-  /* 2nd byte: 38 */ 0x509c,
-  /* 2nd byte: 39 */ 0x509e,
-  /* 2nd byte: 40 */ 0x509f,
-  /* 2nd byte: 41 */ 0x50a0,
-  /* 2nd byte: 42 */ 0x50a1,
-  /* 2nd byte: 43 */ 0x50a2,
-  /* 2nd byte: 44 */ 0x50aa,
-  /* 2nd byte: 45 */ 0x50af,
-  /* 2nd byte: 46 */ 0x50b0,
-  /* 2nd byte: 47 */ 0x50b9,
-  /* 2nd byte: 48 */ 0x50ba,
-  /* 2nd byte: 49 */ 0x50bd,
-  /* 2nd byte: 50 */ 0x50c0,
-  /* 2nd byte: 51 */ 0x50c3,
-  /* 2nd byte: 52 */ 0x50c4,
-  /* 2nd byte: 53 */ 0x50c7,
-  /* 2nd byte: 54 */ 0x50cc,
-  /* 2nd byte: 55 */ 0x50ce,
-  /* 2nd byte: 56 */ 0x50d0,
-  /* 2nd byte: 57 */ 0x50d3,
-  /* 2nd byte: 58 */ 0x50d4,
-  /* 2nd byte: 59 */ 0x50d8,
-  /* 2nd byte: 60 */ 0x50dc,
-  /* 2nd byte: 61 */ 0x50dd,
-  /* 2nd byte: 62 */ 0x50df,
-  /* 2nd byte: 63 */ 0x50e2,
-  /* 2nd byte: 64 */ 0x50e4,
-  /* 2nd byte: 65 */ 0x50e6,
-  /* 2nd byte: 66 */ 0x50e8,
-  /* 2nd byte: 67 */ 0x50e9,
-  /* 2nd byte: 68 */ 0x50ef,
-  /* 2nd byte: 69 */ 0x50f1,
-  /* 2nd byte: 70 */ 0x50f6,
-  /* 2nd byte: 71 */ 0x50fa,
-  /* 2nd byte: 72 */ 0x50fe,
-  /* 2nd byte: 73 */ 0x5103,
-  /* 2nd byte: 74 */ 0x5106,
-  /* 2nd byte: 75 */ 0x5107,
-  /* 2nd byte: 76 */ 0x5108,
-  /* 2nd byte: 77 */ 0x510b,
-  /* 2nd byte: 78 */ 0x510c,
-  /* 2nd byte: 79 */ 0x510d,
-  /* 2nd byte: 80 */ 0x510e,
-  /* 2nd byte: 81 */ 0x50f2,
-  /* 2nd byte: 82 */ 0x5110,
-  /* 2nd byte: 83 */ 0x5117,
-  /* 2nd byte: 84 */ 0x5119,
-  /* 2nd byte: 85 */ 0x511b,
-  /* 2nd byte: 86 */ 0x511c,
-  /* 2nd byte: 87 */ 0x511d,
-  /* 2nd byte: 88 */ 0x511e,
-  /* 2nd byte: 89 */ 0x5123,
-  /* 2nd byte: 90 */ 0x5127,
-  /* 2nd byte: 91 */ 0x5128,
-  /* 2nd byte: 92 */ 0x512c,
-  /* 2nd byte: 93 */ 0x512d,
-  /* 2nd byte: 94 */ 0x512f,
-  /* 2nd byte: 95 */ 0x5131,
-  /* 2nd byte: 96 */ 0x5133,
-  /* 2nd byte: 97 */ 0x5134,
-  /* 2nd byte: 98 */ 0x5135,
-  /* 2nd byte: 99 */ 0x5138,
-  /* 2nd byte: 100 */ 0x5139,
-  /* 2nd byte: 101 */ 0x5142,
-  /* 2nd byte: 102 */ 0x514a,
-  /* 2nd byte: 103 */ 0x514f,
-  /* 2nd byte: 104 */ 0x5153,
-  /* 2nd byte: 105 */ 0x5155,
-  /* 2nd byte: 106 */ 0x5157,
-  /* 2nd byte: 107 */ 0x5158,
-  /* 2nd byte: 108 */ 0x515f,
-  /* 2nd byte: 109 */ 0x5164,
-  /* 2nd byte: 110 */ 0x5166,
-  /* 2nd byte: 111 */ 0x517e,
-  /* 2nd byte: 112 */ 0x5183,
-  /* 2nd byte: 113 */ 0x5184,
-  /* 2nd byte: 114 */ 0x518b,
-  /* 2nd byte: 115 */ 0x518e,
-  /* 2nd byte: 116 */ 0x5198,
-  /* 2nd byte: 117 */ 0x519d,
-  /* 2nd byte: 118 */ 0x51a1,
-  /* 2nd byte: 119 */ 0x51a3,
-  /* 2nd byte: 120 */ 0x51ad,
-  /* 2nd byte: 121 */ 0x51b8,
-  /* 2nd byte: 122 */ 0x51ba,
-  /* 2nd byte: 123 */ 0x51bc,
-  /* 2nd byte: 124 */ 0x51be,
-  /* 2nd byte: 125 */ 0x51bf,
-  /* 2nd byte: 126 */ 0x51c2},
-/* 1st byte: 51 */ { 
-  /* 2nd byte: 33 */ 0x51c8,
-  /* 2nd byte: 34 */ 0x51cf,
-  /* 2nd byte: 35 */ 0x51d1,
-  /* 2nd byte: 36 */ 0x51d2,
-  /* 2nd byte: 37 */ 0x51d3,
-  /* 2nd byte: 38 */ 0x51d5,
-  /* 2nd byte: 39 */ 0x51d8,
-  /* 2nd byte: 40 */ 0x51de,
-  /* 2nd byte: 41 */ 0x51e2,
-  /* 2nd byte: 42 */ 0x51e5,
-  /* 2nd byte: 43 */ 0x51ee,
-  /* 2nd byte: 44 */ 0x51f2,
-  /* 2nd byte: 45 */ 0x51f3,
-  /* 2nd byte: 46 */ 0x51f4,
-  /* 2nd byte: 47 */ 0x51f7,
-  /* 2nd byte: 48 */ 0x5201,
-  /* 2nd byte: 49 */ 0x5202,
-  /* 2nd byte: 50 */ 0x5205,
-  /* 2nd byte: 51 */ 0x5212,
-  /* 2nd byte: 52 */ 0x5213,
-  /* 2nd byte: 53 */ 0x5215,
-  /* 2nd byte: 54 */ 0x5216,
-  /* 2nd byte: 55 */ 0x5218,
-  /* 2nd byte: 56 */ 0x5222,
-  /* 2nd byte: 57 */ 0x5228,
-  /* 2nd byte: 58 */ 0x5231,
-  /* 2nd byte: 59 */ 0x5232,
-  /* 2nd byte: 60 */ 0x5235,
-  /* 2nd byte: 61 */ 0x523c,
-  /* 2nd byte: 62 */ 0x5245,
-  /* 2nd byte: 63 */ 0x5249,
-  /* 2nd byte: 64 */ 0x5255,
-  /* 2nd byte: 65 */ 0x5257,
-  /* 2nd byte: 66 */ 0x5258,
-  /* 2nd byte: 67 */ 0x525a,
-  /* 2nd byte: 68 */ 0x525c,
-  /* 2nd byte: 69 */ 0x525f,
-  /* 2nd byte: 70 */ 0x5260,
-  /* 2nd byte: 71 */ 0x5261,
-  /* 2nd byte: 72 */ 0x5266,
-  /* 2nd byte: 73 */ 0x526e,
-  /* 2nd byte: 74 */ 0x5277,
-  /* 2nd byte: 75 */ 0x5278,
-  /* 2nd byte: 76 */ 0x5279,
-  /* 2nd byte: 77 */ 0x5280,
-  /* 2nd byte: 78 */ 0x5282,
-  /* 2nd byte: 79 */ 0x5285,
-  /* 2nd byte: 80 */ 0x528a,
-  /* 2nd byte: 81 */ 0x528c,
-  /* 2nd byte: 82 */ 0x5293,
-  /* 2nd byte: 83 */ 0x5295,
-  /* 2nd byte: 84 */ 0x5296,
-  /* 2nd byte: 85 */ 0x5297,
-  /* 2nd byte: 86 */ 0x5298,
-  /* 2nd byte: 87 */ 0x529a,
-  /* 2nd byte: 88 */ 0x529c,
-  /* 2nd byte: 89 */ 0x52a4,
-  /* 2nd byte: 90 */ 0x52a5,
-  /* 2nd byte: 91 */ 0x52a6,
-  /* 2nd byte: 92 */ 0x52a7,
-  /* 2nd byte: 93 */ 0x52af,
-  /* 2nd byte: 94 */ 0x52b0,
-  /* 2nd byte: 95 */ 0x52b6,
-  /* 2nd byte: 96 */ 0x52b7,
-  /* 2nd byte: 97 */ 0x52b8,
-  /* 2nd byte: 98 */ 0x52ba,
-  /* 2nd byte: 99 */ 0x52bb,
-  /* 2nd byte: 100 */ 0x52bd,
-  /* 2nd byte: 101 */ 0x52c0,
-  /* 2nd byte: 102 */ 0x52c4,
-  /* 2nd byte: 103 */ 0x52c6,
-  /* 2nd byte: 104 */ 0x52c8,
-  /* 2nd byte: 105 */ 0x52cc,
-  /* 2nd byte: 106 */ 0x52cf,
-  /* 2nd byte: 107 */ 0x52d1,
-  /* 2nd byte: 108 */ 0x52d4,
-  /* 2nd byte: 109 */ 0x52d6,
-  /* 2nd byte: 110 */ 0x52db,
-  /* 2nd byte: 111 */ 0x52dc,
-  /* 2nd byte: 112 */ 0x52e1,
-  /* 2nd byte: 113 */ 0x52e5,
-  /* 2nd byte: 114 */ 0x52e8,
-  /* 2nd byte: 115 */ 0x52e9,
-  /* 2nd byte: 116 */ 0x52ea,
-  /* 2nd byte: 117 */ 0x52ec,
-  /* 2nd byte: 118 */ 0x52f0,
-  /* 2nd byte: 119 */ 0x52f1,
-  /* 2nd byte: 120 */ 0x52f4,
-  /* 2nd byte: 121 */ 0x52f6,
-  /* 2nd byte: 122 */ 0x52f7,
-  /* 2nd byte: 123 */ 0x5300,
-  /* 2nd byte: 124 */ 0x5303,
-  /* 2nd byte: 125 */ 0x530a,
-  /* 2nd byte: 126 */ 0x530b},
-/* 1st byte: 52 */ { 
-  /* 2nd byte: 33 */ 0x530c,
-  /* 2nd byte: 34 */ 0x5311,
-  /* 2nd byte: 35 */ 0x5313,
-  /* 2nd byte: 36 */ 0x5318,
-  /* 2nd byte: 37 */ 0x531b,
-  /* 2nd byte: 38 */ 0x531c,
-  /* 2nd byte: 39 */ 0x531e,
-  /* 2nd byte: 40 */ 0x531f,
-  /* 2nd byte: 41 */ 0x5325,
-  /* 2nd byte: 42 */ 0x5327,
-  /* 2nd byte: 43 */ 0x5328,
-  /* 2nd byte: 44 */ 0x5329,
-  /* 2nd byte: 45 */ 0x532b,
-  /* 2nd byte: 46 */ 0x532c,
-  /* 2nd byte: 47 */ 0x532d,
-  /* 2nd byte: 48 */ 0x5330,
-  /* 2nd byte: 49 */ 0x5332,
-  /* 2nd byte: 50 */ 0x5335,
-  /* 2nd byte: 51 */ 0x533c,
-  /* 2nd byte: 52 */ 0x533d,
-  /* 2nd byte: 53 */ 0x533e,
-  /* 2nd byte: 54 */ 0x5342,
-  /* 2nd byte: 55 */ 0x534c,
-  /* 2nd byte: 56 */ 0x534b,
-  /* 2nd byte: 57 */ 0x5359,
-  /* 2nd byte: 58 */ 0x535b,
-  /* 2nd byte: 59 */ 0x5361,
-  /* 2nd byte: 60 */ 0x5363,
-  /* 2nd byte: 61 */ 0x5365,
-  /* 2nd byte: 62 */ 0x536c,
-  /* 2nd byte: 63 */ 0x536d,
-  /* 2nd byte: 64 */ 0x5372,
-  /* 2nd byte: 65 */ 0x5379,
-  /* 2nd byte: 66 */ 0x537e,
-  /* 2nd byte: 67 */ 0x5383,
-  /* 2nd byte: 68 */ 0x5387,
-  /* 2nd byte: 69 */ 0x5388,
-  /* 2nd byte: 70 */ 0x538e,
-  /* 2nd byte: 71 */ 0x5393,
-  /* 2nd byte: 72 */ 0x5394,
-  /* 2nd byte: 73 */ 0x5399,
-  /* 2nd byte: 74 */ 0x539d,
-  /* 2nd byte: 75 */ 0x53a1,
-  /* 2nd byte: 76 */ 0x53a4,
-  /* 2nd byte: 77 */ 0x53aa,
-  /* 2nd byte: 78 */ 0x53ab,
-  /* 2nd byte: 79 */ 0x53af,
-  /* 2nd byte: 80 */ 0x53b2,
-  /* 2nd byte: 81 */ 0x53b4,
-  /* 2nd byte: 82 */ 0x53b5,
-  /* 2nd byte: 83 */ 0x53b7,
-  /* 2nd byte: 84 */ 0x53b8,
-  /* 2nd byte: 85 */ 0x53ba,
-  /* 2nd byte: 86 */ 0x53bd,
-  /* 2nd byte: 87 */ 0x53c0,
-  /* 2nd byte: 88 */ 0x53c5,
-  /* 2nd byte: 89 */ 0x53cf,
-  /* 2nd byte: 90 */ 0x53d2,
-  /* 2nd byte: 91 */ 0x53d3,
-  /* 2nd byte: 92 */ 0x53d5,
-  /* 2nd byte: 93 */ 0x53da,
-  /* 2nd byte: 94 */ 0x53dd,
-  /* 2nd byte: 95 */ 0x53de,
-  /* 2nd byte: 96 */ 0x53e0,
-  /* 2nd byte: 97 */ 0x53e6,
-  /* 2nd byte: 98 */ 0x53e7,
-  /* 2nd byte: 99 */ 0x53f5,
-  /* 2nd byte: 100 */ 0x5402,
-  /* 2nd byte: 101 */ 0x5413,
-  /* 2nd byte: 102 */ 0x541a,
-  /* 2nd byte: 103 */ 0x5421,
-  /* 2nd byte: 104 */ 0x5427,
-  /* 2nd byte: 105 */ 0x5428,
-  /* 2nd byte: 106 */ 0x542a,
-  /* 2nd byte: 107 */ 0x542f,
-  /* 2nd byte: 108 */ 0x5431,
-  /* 2nd byte: 109 */ 0x5434,
-  /* 2nd byte: 110 */ 0x5435,
-  /* 2nd byte: 111 */ 0x5443,
-  /* 2nd byte: 112 */ 0x5444,
-  /* 2nd byte: 113 */ 0x5447,
-  /* 2nd byte: 114 */ 0x544d,
-  /* 2nd byte: 115 */ 0x544f,
-  /* 2nd byte: 116 */ 0x545e,
-  /* 2nd byte: 117 */ 0x5462,
-  /* 2nd byte: 118 */ 0x5464,
-  /* 2nd byte: 119 */ 0x5466,
-  /* 2nd byte: 120 */ 0x5467,
-  /* 2nd byte: 121 */ 0x5469,
-  /* 2nd byte: 122 */ 0x546b,
-  /* 2nd byte: 123 */ 0x546d,
-  /* 2nd byte: 124 */ 0x546e,
-  /* 2nd byte: 125 */ 0x5474,
-  /* 2nd byte: 126 */ 0x547f},
-/* 1st byte: 53 */ { 
-  /* 2nd byte: 33 */ 0x5481,
-  /* 2nd byte: 34 */ 0x5483,
-  /* 2nd byte: 35 */ 0x5485,
-  /* 2nd byte: 36 */ 0x5488,
-  /* 2nd byte: 37 */ 0x5489,
-  /* 2nd byte: 38 */ 0x548d,
-  /* 2nd byte: 39 */ 0x5491,
-  /* 2nd byte: 40 */ 0x5495,
-  /* 2nd byte: 41 */ 0x5496,
-  /* 2nd byte: 42 */ 0x549c,
-  /* 2nd byte: 43 */ 0x549f,
-  /* 2nd byte: 44 */ 0x54a1,
-  /* 2nd byte: 45 */ 0x54a6,
-  /* 2nd byte: 46 */ 0x54a7,
-  /* 2nd byte: 47 */ 0x54a9,
-  /* 2nd byte: 48 */ 0x54aa,
-  /* 2nd byte: 49 */ 0x54ad,
-  /* 2nd byte: 50 */ 0x54ae,
-  /* 2nd byte: 51 */ 0x54b1,
-  /* 2nd byte: 52 */ 0x54b7,
-  /* 2nd byte: 53 */ 0x54b9,
-  /* 2nd byte: 54 */ 0x54ba,
-  /* 2nd byte: 55 */ 0x54bb,
-  /* 2nd byte: 56 */ 0x54bf,
-  /* 2nd byte: 57 */ 0x54c6,
-  /* 2nd byte: 58 */ 0x54ca,
-  /* 2nd byte: 59 */ 0x54cd,
-  /* 2nd byte: 60 */ 0x54ce,
-  /* 2nd byte: 61 */ 0x54e0,
-  /* 2nd byte: 62 */ 0x54ea,
-  /* 2nd byte: 63 */ 0x54ec,
-  /* 2nd byte: 64 */ 0x54ef,
-  /* 2nd byte: 65 */ 0x54f6,
-  /* 2nd byte: 66 */ 0x54fc,
-  /* 2nd byte: 67 */ 0x54fe,
-  /* 2nd byte: 68 */ 0x54ff,
-  /* 2nd byte: 69 */ 0x5500,
-  /* 2nd byte: 70 */ 0x5501,
-  /* 2nd byte: 71 */ 0x5505,
-  /* 2nd byte: 72 */ 0x5508,
-  /* 2nd byte: 73 */ 0x5509,
-  /* 2nd byte: 74 */ 0x550c,
-  /* 2nd byte: 75 */ 0x550d,
-  /* 2nd byte: 76 */ 0x550e,
-  /* 2nd byte: 77 */ 0x5515,
-  /* 2nd byte: 78 */ 0x552a,
-  /* 2nd byte: 79 */ 0x552b,
-  /* 2nd byte: 80 */ 0x5532,
-  /* 2nd byte: 81 */ 0x5535,
-  /* 2nd byte: 82 */ 0x5536,
-  /* 2nd byte: 83 */ 0x553b,
-  /* 2nd byte: 84 */ 0x553c,
-  /* 2nd byte: 85 */ 0x553d,
-  /* 2nd byte: 86 */ 0x5541,
-  /* 2nd byte: 87 */ 0x5547,
-  /* 2nd byte: 88 */ 0x5549,
-  /* 2nd byte: 89 */ 0x554a,
-  /* 2nd byte: 90 */ 0x554d,
-  /* 2nd byte: 91 */ 0x5550,
-  /* 2nd byte: 92 */ 0x5551,
-  /* 2nd byte: 93 */ 0x5558,
-  /* 2nd byte: 94 */ 0x555a,
-  /* 2nd byte: 95 */ 0x555b,
-  /* 2nd byte: 96 */ 0x555e,
-  /* 2nd byte: 97 */ 0x5560,
-  /* 2nd byte: 98 */ 0x5561,
-  /* 2nd byte: 99 */ 0x5564,
-  /* 2nd byte: 100 */ 0x5566,
-  /* 2nd byte: 101 */ 0x557f,
-  /* 2nd byte: 102 */ 0x5581,
-  /* 2nd byte: 103 */ 0x5582,
-  /* 2nd byte: 104 */ 0x5586,
-  /* 2nd byte: 105 */ 0x5588,
-  /* 2nd byte: 106 */ 0x558e,
-  /* 2nd byte: 107 */ 0x558f,
-  /* 2nd byte: 108 */ 0x5591,
-  /* 2nd byte: 109 */ 0x5592,
-  /* 2nd byte: 110 */ 0x5593,
-  /* 2nd byte: 111 */ 0x5594,
-  /* 2nd byte: 112 */ 0x5597,
-  /* 2nd byte: 113 */ 0x55a3,
-  /* 2nd byte: 114 */ 0x55a4,
-  /* 2nd byte: 115 */ 0x55ad,
-  /* 2nd byte: 116 */ 0x55b2,
-  /* 2nd byte: 117 */ 0x55bf,
-  /* 2nd byte: 118 */ 0x55c1,
-  /* 2nd byte: 119 */ 0x55c3,
-  /* 2nd byte: 120 */ 0x55c6,
-  /* 2nd byte: 121 */ 0x55c9,
-  /* 2nd byte: 122 */ 0x55cb,
-  /* 2nd byte: 123 */ 0x55cc,
-  /* 2nd byte: 124 */ 0x55ce,
-  /* 2nd byte: 125 */ 0x55d1,
-  /* 2nd byte: 126 */ 0x55d2},
-/* 1st byte: 54 */ { 
-  /* 2nd byte: 33 */ 0x55d3,
-  /* 2nd byte: 34 */ 0x55d7,
-  /* 2nd byte: 35 */ 0x55d8,
-  /* 2nd byte: 36 */ 0x55db,
-  /* 2nd byte: 37 */ 0x55de,
-  /* 2nd byte: 38 */ 0x55e2,
-  /* 2nd byte: 39 */ 0x55e9,
-  /* 2nd byte: 40 */ 0x55f6,
-  /* 2nd byte: 41 */ 0x55ff,
-  /* 2nd byte: 42 */ 0x5605,
-  /* 2nd byte: 43 */ 0x5608,
-  /* 2nd byte: 44 */ 0x560a,
-  /* 2nd byte: 45 */ 0x560d,
-  /* 2nd byte: 46 */ 0x560e,
-  /* 2nd byte: 47 */ 0x560f,
-  /* 2nd byte: 48 */ 0x5610,
-  /* 2nd byte: 49 */ 0x5611,
-  /* 2nd byte: 50 */ 0x5612,
-  /* 2nd byte: 51 */ 0x5619,
-  /* 2nd byte: 52 */ 0x562c,
-  /* 2nd byte: 53 */ 0x5630,
-  /* 2nd byte: 54 */ 0x5633,
-  /* 2nd byte: 55 */ 0x5635,
-  /* 2nd byte: 56 */ 0x5637,
-  /* 2nd byte: 57 */ 0x5639,
-  /* 2nd byte: 58 */ 0x563b,
-  /* 2nd byte: 59 */ 0x563c,
-  /* 2nd byte: 60 */ 0x563d,
-  /* 2nd byte: 61 */ 0x563f,
-  /* 2nd byte: 62 */ 0x5640,
-  /* 2nd byte: 63 */ 0x5641,
-  /* 2nd byte: 64 */ 0x5643,
-  /* 2nd byte: 65 */ 0x5644,
-  /* 2nd byte: 66 */ 0x5646,
-  /* 2nd byte: 67 */ 0x5649,
-  /* 2nd byte: 68 */ 0x564b,
-  /* 2nd byte: 69 */ 0x564d,
-  /* 2nd byte: 70 */ 0x564f,
-  /* 2nd byte: 71 */ 0x5654,
-  /* 2nd byte: 72 */ 0x565e,
-  /* 2nd byte: 73 */ 0x5660,
-  /* 2nd byte: 74 */ 0x5661,
-  /* 2nd byte: 75 */ 0x5662,
-  /* 2nd byte: 76 */ 0x5663,
-  /* 2nd byte: 77 */ 0x5666,
-  /* 2nd byte: 78 */ 0x5669,
-  /* 2nd byte: 79 */ 0x566d,
-  /* 2nd byte: 80 */ 0x566f,
-  /* 2nd byte: 81 */ 0x5671,
-  /* 2nd byte: 82 */ 0x5672,
-  /* 2nd byte: 83 */ 0x5675,
-  /* 2nd byte: 84 */ 0x5684,
-  /* 2nd byte: 85 */ 0x5685,
-  /* 2nd byte: 86 */ 0x5688,
-  /* 2nd byte: 87 */ 0x568b,
-  /* 2nd byte: 88 */ 0x568c,
-  /* 2nd byte: 89 */ 0x5695,
-  /* 2nd byte: 90 */ 0x5699,
-  /* 2nd byte: 91 */ 0x569a,
-  /* 2nd byte: 92 */ 0x569d,
-  /* 2nd byte: 93 */ 0x569e,
-  /* 2nd byte: 94 */ 0x569f,
-  /* 2nd byte: 95 */ 0x56a6,
-  /* 2nd byte: 96 */ 0x56a7,
-  /* 2nd byte: 97 */ 0x56a8,
-  /* 2nd byte: 98 */ 0x56a9,
-  /* 2nd byte: 99 */ 0x56ab,
-  /* 2nd byte: 100 */ 0x56ac,
-  /* 2nd byte: 101 */ 0x56ad,
-  /* 2nd byte: 102 */ 0x56b1,
-  /* 2nd byte: 103 */ 0x56b3,
-  /* 2nd byte: 104 */ 0x56b7,
-  /* 2nd byte: 105 */ 0x56be,
-  /* 2nd byte: 106 */ 0x56c5,
-  /* 2nd byte: 107 */ 0x56c9,
-  /* 2nd byte: 108 */ 0x56ca,
-  /* 2nd byte: 109 */ 0x56cb,
-  /* 2nd byte: 110 */ 0x56cf,
-  /* 2nd byte: 111 */ 0x56d0,
-  /* 2nd byte: 112 */ 0x56cc,
-  /* 2nd byte: 113 */ 0x56cd,
-  /* 2nd byte: 114 */ 0x56d9,
-  /* 2nd byte: 115 */ 0x56dc,
-  /* 2nd byte: 116 */ 0x56dd,
-  /* 2nd byte: 117 */ 0x56df,
-  /* 2nd byte: 118 */ 0x56e1,
-  /* 2nd byte: 119 */ 0x56e4,
-  /* 2nd byte: 120 */ 0x56e5,
-  /* 2nd byte: 121 */ 0x56e6,
-  /* 2nd byte: 122 */ 0x56e7,
-  /* 2nd byte: 123 */ 0x56e8,
-  /* 2nd byte: 124 */ 0x56f1,
-  /* 2nd byte: 125 */ 0x56eb,
-  /* 2nd byte: 126 */ 0x56ed},
-/* 1st byte: 55 */ { 
-  /* 2nd byte: 33 */ 0x56f6,
-  /* 2nd byte: 34 */ 0x56f7,
-  /* 2nd byte: 35 */ 0x5701,
-  /* 2nd byte: 36 */ 0x5702,
-  /* 2nd byte: 37 */ 0x5707,
-  /* 2nd byte: 38 */ 0x570a,
-  /* 2nd byte: 39 */ 0x570c,
-  /* 2nd byte: 40 */ 0x5711,
-  /* 2nd byte: 41 */ 0x5715,
-  /* 2nd byte: 42 */ 0x571a,
-  /* 2nd byte: 43 */ 0x571b,
-  /* 2nd byte: 44 */ 0x571d,
-  /* 2nd byte: 45 */ 0x5720,
-  /* 2nd byte: 46 */ 0x5722,
-  /* 2nd byte: 47 */ 0x5723,
-  /* 2nd byte: 48 */ 0x5724,
-  /* 2nd byte: 49 */ 0x5725,
-  /* 2nd byte: 50 */ 0x5729,
-  /* 2nd byte: 51 */ 0x572a,
-  /* 2nd byte: 52 */ 0x572c,
-  /* 2nd byte: 53 */ 0x572e,
-  /* 2nd byte: 54 */ 0x572f,
-  /* 2nd byte: 55 */ 0x5733,
-  /* 2nd byte: 56 */ 0x5734,
-  /* 2nd byte: 57 */ 0x573d,
-  /* 2nd byte: 58 */ 0x573e,
-  /* 2nd byte: 59 */ 0x573f,
-  /* 2nd byte: 60 */ 0x5745,
-  /* 2nd byte: 61 */ 0x5746,
-  /* 2nd byte: 62 */ 0x574c,
-  /* 2nd byte: 63 */ 0x574d,
-  /* 2nd byte: 64 */ 0x5752,
-  /* 2nd byte: 65 */ 0x5762,
-  /* 2nd byte: 66 */ 0x5765,
-  /* 2nd byte: 67 */ 0x5767,
-  /* 2nd byte: 68 */ 0x5768,
-  /* 2nd byte: 69 */ 0x576b,
-  /* 2nd byte: 70 */ 0x576d,
-  /* 2nd byte: 71 */ 0x576e,
-  /* 2nd byte: 72 */ 0x576f,
-  /* 2nd byte: 73 */ 0x5770,
-  /* 2nd byte: 74 */ 0x5771,
-  /* 2nd byte: 75 */ 0x5773,
-  /* 2nd byte: 76 */ 0x5774,
-  /* 2nd byte: 77 */ 0x5775,
-  /* 2nd byte: 78 */ 0x5777,
-  /* 2nd byte: 79 */ 0x5779,
-  /* 2nd byte: 80 */ 0x577a,
-  /* 2nd byte: 81 */ 0x577b,
-  /* 2nd byte: 82 */ 0x577c,
-  /* 2nd byte: 83 */ 0x577e,
-  /* 2nd byte: 84 */ 0x5781,
-  /* 2nd byte: 85 */ 0x5783,
-  /* 2nd byte: 86 */ 0x578c,
-  /* 2nd byte: 87 */ 0x5794,
-  /* 2nd byte: 88 */ 0x5797,
-  /* 2nd byte: 89 */ 0x5799,
-  /* 2nd byte: 90 */ 0x579a,
-  /* 2nd byte: 91 */ 0x579c,
-  /* 2nd byte: 92 */ 0x579d,
-  /* 2nd byte: 93 */ 0x579e,
-  /* 2nd byte: 94 */ 0x579f,
-  /* 2nd byte: 95 */ 0x57a1,
-  /* 2nd byte: 96 */ 0x5795,
-  /* 2nd byte: 97 */ 0x57a7,
-  /* 2nd byte: 98 */ 0x57a8,
-  /* 2nd byte: 99 */ 0x57a9,
-  /* 2nd byte: 100 */ 0x57ac,
-  /* 2nd byte: 101 */ 0x57b8,
-  /* 2nd byte: 102 */ 0x57bd,
-  /* 2nd byte: 103 */ 0x57c7,
-  /* 2nd byte: 104 */ 0x57c8,
-  /* 2nd byte: 105 */ 0x57cc,
-  /* 2nd byte: 106 */ 0x57cf,
-  /* 2nd byte: 107 */ 0x57d5,
-  /* 2nd byte: 108 */ 0x57dd,
-  /* 2nd byte: 109 */ 0x57de,
-  /* 2nd byte: 110 */ 0x57e4,
-  /* 2nd byte: 111 */ 0x57e6,
-  /* 2nd byte: 112 */ 0x57e7,
-  /* 2nd byte: 113 */ 0x57e9,
-  /* 2nd byte: 114 */ 0x57ed,
-  /* 2nd byte: 115 */ 0x57f0,
-  /* 2nd byte: 116 */ 0x57f5,
-  /* 2nd byte: 117 */ 0x57f6,
-  /* 2nd byte: 118 */ 0x57f8,
-  /* 2nd byte: 119 */ 0x57fd,
-  /* 2nd byte: 120 */ 0x57fe,
-  /* 2nd byte: 121 */ 0x57ff,
-  /* 2nd byte: 122 */ 0x5803,
-  /* 2nd byte: 123 */ 0x5804,
-  /* 2nd byte: 124 */ 0x5808,
-  /* 2nd byte: 125 */ 0x5809,
-  /* 2nd byte: 126 */ 0x57e1},
-/* 1st byte: 56 */ { 
-  /* 2nd byte: 33 */ 0x580c,
-  /* 2nd byte: 34 */ 0x580d,
-  /* 2nd byte: 35 */ 0x581b,
-  /* 2nd byte: 36 */ 0x581e,
-  /* 2nd byte: 37 */ 0x581f,
-  /* 2nd byte: 38 */ 0x5820,
-  /* 2nd byte: 39 */ 0x5826,
-  /* 2nd byte: 40 */ 0x5827,
-  /* 2nd byte: 41 */ 0x582d,
-  /* 2nd byte: 42 */ 0x5832,
-  /* 2nd byte: 43 */ 0x5839,
-  /* 2nd byte: 44 */ 0x583f,
-  /* 2nd byte: 45 */ 0x5849,
-  /* 2nd byte: 46 */ 0x584c,
-  /* 2nd byte: 47 */ 0x584d,
-  /* 2nd byte: 48 */ 0x584f,
-  /* 2nd byte: 49 */ 0x5850,
-  /* 2nd byte: 50 */ 0x5855,
-  /* 2nd byte: 51 */ 0x585f,
-  /* 2nd byte: 52 */ 0x5861,
-  /* 2nd byte: 53 */ 0x5864,
-  /* 2nd byte: 54 */ 0x5867,
-  /* 2nd byte: 55 */ 0x5868,
-  /* 2nd byte: 56 */ 0x5878,
-  /* 2nd byte: 57 */ 0x587c,
-  /* 2nd byte: 58 */ 0x587f,
-  /* 2nd byte: 59 */ 0x5880,
-  /* 2nd byte: 60 */ 0x5881,
-  /* 2nd byte: 61 */ 0x5887,
-  /* 2nd byte: 62 */ 0x5888,
-  /* 2nd byte: 63 */ 0x5889,
-  /* 2nd byte: 64 */ 0x588a,
-  /* 2nd byte: 65 */ 0x588c,
-  /* 2nd byte: 66 */ 0x588d,
-  /* 2nd byte: 67 */ 0x588f,
-  /* 2nd byte: 68 */ 0x5890,
-  /* 2nd byte: 69 */ 0x5894,
-  /* 2nd byte: 70 */ 0x5896,
-  /* 2nd byte: 71 */ 0x589d,
-  /* 2nd byte: 72 */ 0x58a0,
-  /* 2nd byte: 73 */ 0x58a1,
-  /* 2nd byte: 74 */ 0x58a2,
-  /* 2nd byte: 75 */ 0x58a6,
-  /* 2nd byte: 76 */ 0x58a9,
-  /* 2nd byte: 77 */ 0x58b1,
-  /* 2nd byte: 78 */ 0x58b2,
-  /* 2nd byte: 79 */ 0x58c4,
-  /* 2nd byte: 80 */ 0x58bc,
-  /* 2nd byte: 81 */ 0x58c2,
-  /* 2nd byte: 82 */ 0x58c8,
-  /* 2nd byte: 83 */ 0x58cd,
-  /* 2nd byte: 84 */ 0x58ce,
-  /* 2nd byte: 85 */ 0x58d0,
-  /* 2nd byte: 86 */ 0x58d2,
-  /* 2nd byte: 87 */ 0x58d4,
-  /* 2nd byte: 88 */ 0x58d6,
-  /* 2nd byte: 89 */ 0x58da,
-  /* 2nd byte: 90 */ 0x58dd,
-  /* 2nd byte: 91 */ 0x58e1,
-  /* 2nd byte: 92 */ 0x58e2,
-  /* 2nd byte: 93 */ 0x58e9,
-  /* 2nd byte: 94 */ 0x58f3,
-  /* 2nd byte: 95 */ 0x5905,
-  /* 2nd byte: 96 */ 0x5906,
-  /* 2nd byte: 97 */ 0x590b,
-  /* 2nd byte: 98 */ 0x590c,
-  /* 2nd byte: 99 */ 0x5912,
-  /* 2nd byte: 100 */ 0x5913,
-  /* 2nd byte: 101 */ 0x5914,
-  /* 2nd byte: 102 */ 0x8641,
-  /* 2nd byte: 103 */ 0x591d,
-  /* 2nd byte: 104 */ 0x5921,
-  /* 2nd byte: 105 */ 0x5923,
-  /* 2nd byte: 106 */ 0x5924,
-  /* 2nd byte: 107 */ 0x5928,
-  /* 2nd byte: 108 */ 0x592f,
-  /* 2nd byte: 109 */ 0x5930,
-  /* 2nd byte: 110 */ 0x5933,
-  /* 2nd byte: 111 */ 0x5935,
-  /* 2nd byte: 112 */ 0x5936,
-  /* 2nd byte: 113 */ 0x593f,
-  /* 2nd byte: 114 */ 0x5943,
-  /* 2nd byte: 115 */ 0x5946,
-  /* 2nd byte: 116 */ 0x5952,
-  /* 2nd byte: 117 */ 0x5953,
-  /* 2nd byte: 118 */ 0x5959,
-  /* 2nd byte: 119 */ 0x595b,
-  /* 2nd byte: 120 */ 0x595d,
-  /* 2nd byte: 121 */ 0x595e,
-  /* 2nd byte: 122 */ 0x595f,
-  /* 2nd byte: 123 */ 0x5961,
-  /* 2nd byte: 124 */ 0x5963,
-  /* 2nd byte: 125 */ 0x596b,
-  /* 2nd byte: 126 */ 0x596d},
-/* 1st byte: 57 */ { 
-  /* 2nd byte: 33 */ 0x596f,
-  /* 2nd byte: 34 */ 0x5972,
-  /* 2nd byte: 35 */ 0x5975,
-  /* 2nd byte: 36 */ 0x5976,
-  /* 2nd byte: 37 */ 0x5979,
-  /* 2nd byte: 38 */ 0x597b,
-  /* 2nd byte: 39 */ 0x597c,
-  /* 2nd byte: 40 */ 0x598b,
-  /* 2nd byte: 41 */ 0x598c,
-  /* 2nd byte: 42 */ 0x598e,
-  /* 2nd byte: 43 */ 0x5992,
-  /* 2nd byte: 44 */ 0x5995,
-  /* 2nd byte: 45 */ 0x5997,
-  /* 2nd byte: 46 */ 0x599f,
-  /* 2nd byte: 47 */ 0x59a4,
-  /* 2nd byte: 48 */ 0x59a7,
-  /* 2nd byte: 49 */ 0x59ad,
-  /* 2nd byte: 50 */ 0x59ae,
-  /* 2nd byte: 51 */ 0x59af,
-  /* 2nd byte: 52 */ 0x59b0,
-  /* 2nd byte: 53 */ 0x59b3,
-  /* 2nd byte: 54 */ 0x59b7,
-  /* 2nd byte: 55 */ 0x59ba,
-  /* 2nd byte: 56 */ 0x59bc,
-  /* 2nd byte: 57 */ 0x59c1,
-  /* 2nd byte: 58 */ 0x59c3,
-  /* 2nd byte: 59 */ 0x59c4,
-  /* 2nd byte: 60 */ 0x59c8,
-  /* 2nd byte: 61 */ 0x59ca,
-  /* 2nd byte: 62 */ 0x59cd,
-  /* 2nd byte: 63 */ 0x59d2,
-  /* 2nd byte: 64 */ 0x59dd,
-  /* 2nd byte: 65 */ 0x59de,
-  /* 2nd byte: 66 */ 0x59df,
-  /* 2nd byte: 67 */ 0x59e3,
-  /* 2nd byte: 68 */ 0x59e4,
-  /* 2nd byte: 69 */ 0x59e7,
-  /* 2nd byte: 70 */ 0x59ee,
-  /* 2nd byte: 71 */ 0x59ef,
-  /* 2nd byte: 72 */ 0x59f1,
-  /* 2nd byte: 73 */ 0x59f2,
-  /* 2nd byte: 74 */ 0x59f4,
-  /* 2nd byte: 75 */ 0x59f7,
-  /* 2nd byte: 76 */ 0x5a00,
-  /* 2nd byte: 77 */ 0x5a04,
-  /* 2nd byte: 78 */ 0x5a0c,
-  /* 2nd byte: 79 */ 0x5a0d,
-  /* 2nd byte: 80 */ 0x5a0e,
-  /* 2nd byte: 81 */ 0x5a12,
-  /* 2nd byte: 82 */ 0x5a13,
-  /* 2nd byte: 83 */ 0x5a1e,
-  /* 2nd byte: 84 */ 0x5a23,
-  /* 2nd byte: 85 */ 0x5a24,
-  /* 2nd byte: 86 */ 0x5a27,
-  /* 2nd byte: 87 */ 0x5a28,
-  /* 2nd byte: 88 */ 0x5a2a,
-  /* 2nd byte: 89 */ 0x5a2d,
-  /* 2nd byte: 90 */ 0x5a30,
-  /* 2nd byte: 91 */ 0x5a44,
-  /* 2nd byte: 92 */ 0x5a45,
-  /* 2nd byte: 93 */ 0x5a47,
-  /* 2nd byte: 94 */ 0x5a48,
-  /* 2nd byte: 95 */ 0x5a4c,
-  /* 2nd byte: 96 */ 0x5a50,
-  /* 2nd byte: 97 */ 0x5a55,
-  /* 2nd byte: 98 */ 0x5a5e,
-  /* 2nd byte: 99 */ 0x5a63,
-  /* 2nd byte: 100 */ 0x5a65,
-  /* 2nd byte: 101 */ 0x5a67,
-  /* 2nd byte: 102 */ 0x5a6d,
-  /* 2nd byte: 103 */ 0x5a77,
-  /* 2nd byte: 104 */ 0x5a7a,
-  /* 2nd byte: 105 */ 0x5a7b,
-  /* 2nd byte: 106 */ 0x5a7e,
-  /* 2nd byte: 107 */ 0x5a8b,
-  /* 2nd byte: 108 */ 0x5a90,
-  /* 2nd byte: 109 */ 0x5a93,
-  /* 2nd byte: 110 */ 0x5a96,
-  /* 2nd byte: 111 */ 0x5a99,
-  /* 2nd byte: 112 */ 0x5a9c,
-  /* 2nd byte: 113 */ 0x5a9e,
-  /* 2nd byte: 114 */ 0x5a9f,
-  /* 2nd byte: 115 */ 0x5aa0,
-  /* 2nd byte: 116 */ 0x5aa2,
-  /* 2nd byte: 117 */ 0x5aa7,
-  /* 2nd byte: 118 */ 0x5aac,
-  /* 2nd byte: 119 */ 0x5ab1,
-  /* 2nd byte: 120 */ 0x5ab2,
-  /* 2nd byte: 121 */ 0x5ab3,
-  /* 2nd byte: 122 */ 0x5ab5,
-  /* 2nd byte: 123 */ 0x5ab8,
-  /* 2nd byte: 124 */ 0x5aba,
-  /* 2nd byte: 125 */ 0x5abb,
-  /* 2nd byte: 126 */ 0x5abf},
-/* 1st byte: 58 */ { 
-  /* 2nd byte: 33 */ 0x5ac4,
-  /* 2nd byte: 34 */ 0x5ac6,
-  /* 2nd byte: 35 */ 0x5ac8,
-  /* 2nd byte: 36 */ 0x5acf,
-  /* 2nd byte: 37 */ 0x5ada,
-  /* 2nd byte: 38 */ 0x5adc,
-  /* 2nd byte: 39 */ 0x5ae0,
-  /* 2nd byte: 40 */ 0x5ae5,
-  /* 2nd byte: 41 */ 0x5aea,
-  /* 2nd byte: 42 */ 0x5aee,
-  /* 2nd byte: 43 */ 0x5af5,
-  /* 2nd byte: 44 */ 0x5af6,
-  /* 2nd byte: 45 */ 0x5afd,
-  /* 2nd byte: 46 */ 0x5b00,
-  /* 2nd byte: 47 */ 0x5b01,
-  /* 2nd byte: 48 */ 0x5b08,
-  /* 2nd byte: 49 */ 0x5b17,
-  /* 2nd byte: 50 */ 0x5b34,
-  /* 2nd byte: 51 */ 0x5b19,
-  /* 2nd byte: 52 */ 0x5b1b,
-  /* 2nd byte: 53 */ 0x5b1d,
-  /* 2nd byte: 54 */ 0x5b21,
-  /* 2nd byte: 55 */ 0x5b25,
-  /* 2nd byte: 56 */ 0x5b2d,
-  /* 2nd byte: 57 */ 0x5b38,
-  /* 2nd byte: 58 */ 0x5b41,
-  /* 2nd byte: 59 */ 0x5b4b,
-  /* 2nd byte: 60 */ 0x5b4c,
-  /* 2nd byte: 61 */ 0x5b52,
-  /* 2nd byte: 62 */ 0x5b56,
-  /* 2nd byte: 63 */ 0x5b5e,
-  /* 2nd byte: 64 */ 0x5b68,
-  /* 2nd byte: 65 */ 0x5b6e,
-  /* 2nd byte: 66 */ 0x5b6f,
-  /* 2nd byte: 67 */ 0x5b7c,
-  /* 2nd byte: 68 */ 0x5b7d,
-  /* 2nd byte: 69 */ 0x5b7e,
-  /* 2nd byte: 70 */ 0x5b7f,
-  /* 2nd byte: 71 */ 0x5b81,
-  /* 2nd byte: 72 */ 0x5b84,
-  /* 2nd byte: 73 */ 0x5b86,
-  /* 2nd byte: 74 */ 0x5b8a,
-  /* 2nd byte: 75 */ 0x5b8e,
-  /* 2nd byte: 76 */ 0x5b90,
-  /* 2nd byte: 77 */ 0x5b91,
-  /* 2nd byte: 78 */ 0x5b93,
-  /* 2nd byte: 79 */ 0x5b94,
-  /* 2nd byte: 80 */ 0x5b96,
-  /* 2nd byte: 81 */ 0x5ba8,
-  /* 2nd byte: 82 */ 0x5ba9,
-  /* 2nd byte: 83 */ 0x5bac,
-  /* 2nd byte: 84 */ 0x5bad,
-  /* 2nd byte: 85 */ 0x5baf,
-  /* 2nd byte: 86 */ 0x5bb1,
-  /* 2nd byte: 87 */ 0x5bb2,
-  /* 2nd byte: 88 */ 0x5bb7,
-  /* 2nd byte: 89 */ 0x5bba,
-  /* 2nd byte: 90 */ 0x5bbc,
-  /* 2nd byte: 91 */ 0x5bc0,
-  /* 2nd byte: 92 */ 0x5bc1,
-  /* 2nd byte: 93 */ 0x5bcd,
-  /* 2nd byte: 94 */ 0x5bcf,
-  /* 2nd byte: 95 */ 0x5bd6,
-  /* 2nd byte: 96 */ 0x5bd7,
-  /* 2nd byte: 97 */ 0x5bd8,
-  /* 2nd byte: 98 */ 0x5bd9,
-  /* 2nd byte: 99 */ 0x5bda,
-  /* 2nd byte: 100 */ 0x5be0,
-  /* 2nd byte: 101 */ 0x5bef,
-  /* 2nd byte: 102 */ 0x5bf1,
-  /* 2nd byte: 103 */ 0x5bf4,
-  /* 2nd byte: 104 */ 0x5bfd,
-  /* 2nd byte: 105 */ 0x5c0c,
-  /* 2nd byte: 106 */ 0x5c17,
-  /* 2nd byte: 107 */ 0x5c1e,
-  /* 2nd byte: 108 */ 0x5c1f,
-  /* 2nd byte: 109 */ 0x5c23,
-  /* 2nd byte: 110 */ 0x5c26,
-  /* 2nd byte: 111 */ 0x5c29,
-  /* 2nd byte: 112 */ 0x5c2b,
-  /* 2nd byte: 113 */ 0x5c2c,
-  /* 2nd byte: 114 */ 0x5c2e,
-  /* 2nd byte: 115 */ 0x5c30,
-  /* 2nd byte: 116 */ 0x5c32,
-  /* 2nd byte: 117 */ 0x5c35,
-  /* 2nd byte: 118 */ 0x5c36,
-  /* 2nd byte: 119 */ 0x5c59,
-  /* 2nd byte: 120 */ 0x5c5a,
-  /* 2nd byte: 121 */ 0x5c5c,
-  /* 2nd byte: 122 */ 0x5c62,
-  /* 2nd byte: 123 */ 0x5c63,
-  /* 2nd byte: 124 */ 0x5c67,
-  /* 2nd byte: 125 */ 0x5c68,
-  /* 2nd byte: 126 */ 0x5c69},
-/* 1st byte: 59 */ { 
-  /* 2nd byte: 33 */ 0x5c6d,
-  /* 2nd byte: 34 */ 0x5c70,
-  /* 2nd byte: 35 */ 0x5c74,
-  /* 2nd byte: 36 */ 0x5c75,
-  /* 2nd byte: 37 */ 0x5c7a,
-  /* 2nd byte: 38 */ 0x5c7b,
-  /* 2nd byte: 39 */ 0x5c7c,
-  /* 2nd byte: 40 */ 0x5c7d,
-  /* 2nd byte: 41 */ 0x5c87,
-  /* 2nd byte: 42 */ 0x5c88,
-  /* 2nd byte: 43 */ 0x5c8a,
-  /* 2nd byte: 44 */ 0x5c8f,
-  /* 2nd byte: 45 */ 0x5c92,
-  /* 2nd byte: 46 */ 0x5c9d,
-  /* 2nd byte: 47 */ 0x5c9f,
-  /* 2nd byte: 48 */ 0x5ca0,
-  /* 2nd byte: 49 */ 0x5ca2,
-  /* 2nd byte: 50 */ 0x5ca3,
-  /* 2nd byte: 51 */ 0x5ca6,
-  /* 2nd byte: 52 */ 0x5caa,
-  /* 2nd byte: 53 */ 0x5cb2,
-  /* 2nd byte: 54 */ 0x5cb4,
-  /* 2nd byte: 55 */ 0x5cb5,
-  /* 2nd byte: 56 */ 0x5cba,
-  /* 2nd byte: 57 */ 0x5cc9,
-  /* 2nd byte: 58 */ 0x5ccb,
-  /* 2nd byte: 59 */ 0x5cd2,
-  /* 2nd byte: 60 */ 0x5cdd,
-  /* 2nd byte: 61 */ 0x5cd7,
-  /* 2nd byte: 62 */ 0x5cee,
-  /* 2nd byte: 63 */ 0x5cf1,
-  /* 2nd byte: 64 */ 0x5cf2,
-  /* 2nd byte: 65 */ 0x5cf4,
-  /* 2nd byte: 66 */ 0x5d01,
-  /* 2nd byte: 67 */ 0x5d06,
-  /* 2nd byte: 68 */ 0x5d0d,
-  /* 2nd byte: 69 */ 0x5d12,
-  /* 2nd byte: 70 */ 0x5d2b,
-  /* 2nd byte: 71 */ 0x5d23,
-  /* 2nd byte: 72 */ 0x5d24,
-  /* 2nd byte: 73 */ 0x5d26,
-  /* 2nd byte: 74 */ 0x5d27,
-  /* 2nd byte: 75 */ 0x5d31,
-  /* 2nd byte: 76 */ 0x5d34,
-  /* 2nd byte: 77 */ 0x5d39,
-  /* 2nd byte: 78 */ 0x5d3d,
-  /* 2nd byte: 79 */ 0x5d3f,
-  /* 2nd byte: 80 */ 0x5d42,
-  /* 2nd byte: 81 */ 0x5d43,
-  /* 2nd byte: 82 */ 0x5d46,
-  /* 2nd byte: 83 */ 0x5d48,
-  /* 2nd byte: 84 */ 0x5d55,
-  /* 2nd byte: 85 */ 0x5d51,
-  /* 2nd byte: 86 */ 0x5d59,
-  /* 2nd byte: 87 */ 0x5d4a,
-  /* 2nd byte: 88 */ 0x5d5f,
-  /* 2nd byte: 89 */ 0x5d60,
-  /* 2nd byte: 90 */ 0x5d61,
-  /* 2nd byte: 91 */ 0x5d62,
-  /* 2nd byte: 92 */ 0x5d64,
-  /* 2nd byte: 93 */ 0x5d6a,
-  /* 2nd byte: 94 */ 0x5d6d,
-  /* 2nd byte: 95 */ 0x5d70,
-  /* 2nd byte: 96 */ 0x5d79,
-  /* 2nd byte: 97 */ 0x5d7a,
-  /* 2nd byte: 98 */ 0x5d7e,
-  /* 2nd byte: 99 */ 0x5d7f,
-  /* 2nd byte: 100 */ 0x5d81,
-  /* 2nd byte: 101 */ 0x5d83,
-  /* 2nd byte: 102 */ 0x5d88,
-  /* 2nd byte: 103 */ 0x5d8a,
-  /* 2nd byte: 104 */ 0x5d92,
-  /* 2nd byte: 105 */ 0x5d93,
-  /* 2nd byte: 106 */ 0x5d94,
-  /* 2nd byte: 107 */ 0x5d95,
-  /* 2nd byte: 108 */ 0x5d99,
-  /* 2nd byte: 109 */ 0x5d9b,
-  /* 2nd byte: 110 */ 0x5d9f,
-  /* 2nd byte: 111 */ 0x5da0,
-  /* 2nd byte: 112 */ 0x5da7,
-  /* 2nd byte: 113 */ 0x5dab,
-  /* 2nd byte: 114 */ 0x5db0,
-  /* 2nd byte: 115 */ 0x5db4,
-  /* 2nd byte: 116 */ 0x5db8,
-  /* 2nd byte: 117 */ 0x5db9,
-  /* 2nd byte: 118 */ 0x5dc3,
-  /* 2nd byte: 119 */ 0x5dc7,
-  /* 2nd byte: 120 */ 0x5dcb,
-  /* 2nd byte: 121 */ 0x5dd0,
-  /* 2nd byte: 122 */ 0x5dce,
-  /* 2nd byte: 123 */ 0x5dd8,
-  /* 2nd byte: 124 */ 0x5dd9,
-  /* 2nd byte: 125 */ 0x5de0,
-  /* 2nd byte: 126 */ 0x5de4},
-/* 1st byte: 60 */ { 
-  /* 2nd byte: 33 */ 0x5de9,
-  /* 2nd byte: 34 */ 0x5df8,
-  /* 2nd byte: 35 */ 0x5df9,
-  /* 2nd byte: 36 */ 0x5e00,
-  /* 2nd byte: 37 */ 0x5e07,
-  /* 2nd byte: 38 */ 0x5e0d,
-  /* 2nd byte: 39 */ 0x5e12,
-  /* 2nd byte: 40 */ 0x5e14,
-  /* 2nd byte: 41 */ 0x5e15,
-  /* 2nd byte: 42 */ 0x5e18,
-  /* 2nd byte: 43 */ 0x5e1f,
-  /* 2nd byte: 44 */ 0x5e20,
-  /* 2nd byte: 45 */ 0x5e2e,
-  /* 2nd byte: 46 */ 0x5e28,
-  /* 2nd byte: 47 */ 0x5e32,
-  /* 2nd byte: 48 */ 0x5e35,
-  /* 2nd byte: 49 */ 0x5e3e,
-  /* 2nd byte: 50 */ 0x5e4b,
-  /* 2nd byte: 51 */ 0x5e50,
-  /* 2nd byte: 52 */ 0x5e49,
-  /* 2nd byte: 53 */ 0x5e51,
-  /* 2nd byte: 54 */ 0x5e56,
-  /* 2nd byte: 55 */ 0x5e58,
-  /* 2nd byte: 56 */ 0x5e5b,
-  /* 2nd byte: 57 */ 0x5e5c,
-  /* 2nd byte: 58 */ 0x5e5e,
-  /* 2nd byte: 59 */ 0x5e68,
-  /* 2nd byte: 60 */ 0x5e6a,
-  /* 2nd byte: 61 */ 0x5e6b,
-  /* 2nd byte: 62 */ 0x5e6c,
-  /* 2nd byte: 63 */ 0x5e6d,
-  /* 2nd byte: 64 */ 0x5e6e,
-  /* 2nd byte: 65 */ 0x5e70,
-  /* 2nd byte: 66 */ 0x5e80,
-  /* 2nd byte: 67 */ 0x5e8b,
-  /* 2nd byte: 68 */ 0x5e8e,
-  /* 2nd byte: 69 */ 0x5ea2,
-  /* 2nd byte: 70 */ 0x5ea4,
-  /* 2nd byte: 71 */ 0x5ea5,
-  /* 2nd byte: 72 */ 0x5ea8,
-  /* 2nd byte: 73 */ 0x5eaa,
-  /* 2nd byte: 74 */ 0x5eac,
-  /* 2nd byte: 75 */ 0x5eb1,
-  /* 2nd byte: 76 */ 0x5eb3,
-  /* 2nd byte: 77 */ 0x5ebd,
-  /* 2nd byte: 78 */ 0x5ebe,
-  /* 2nd byte: 79 */ 0x5ebf,
-  /* 2nd byte: 80 */ 0x5ec6,
-  /* 2nd byte: 81 */ 0x5ecc,
-  /* 2nd byte: 82 */ 0x5ecb,
-  /* 2nd byte: 83 */ 0x5ece,
-  /* 2nd byte: 84 */ 0x5ed1,
-  /* 2nd byte: 85 */ 0x5ed2,
-  /* 2nd byte: 86 */ 0x5ed4,
-  /* 2nd byte: 87 */ 0x5ed5,
-  /* 2nd byte: 88 */ 0x5edc,
-  /* 2nd byte: 89 */ 0x5ede,
-  /* 2nd byte: 90 */ 0x5ee5,
-  /* 2nd byte: 91 */ 0x5eeb,
-  /* 2nd byte: 92 */ 0x5f02,
-  /* 2nd byte: 93 */ 0x5f06,
-  /* 2nd byte: 94 */ 0x5f07,
-  /* 2nd byte: 95 */ 0x5f08,
-  /* 2nd byte: 96 */ 0x5f0e,
-  /* 2nd byte: 97 */ 0x5f19,
-  /* 2nd byte: 98 */ 0x5f1c,
-  /* 2nd byte: 99 */ 0x5f1d,
-  /* 2nd byte: 100 */ 0x5f21,
-  /* 2nd byte: 101 */ 0x5f22,
-  /* 2nd byte: 102 */ 0x5f23,
-  /* 2nd byte: 103 */ 0x5f24,
-  /* 2nd byte: 104 */ 0x5f28,
-  /* 2nd byte: 105 */ 0x5f2b,
-  /* 2nd byte: 106 */ 0x5f2c,
-  /* 2nd byte: 107 */ 0x5f2e,
-  /* 2nd byte: 108 */ 0x5f30,
-  /* 2nd byte: 109 */ 0x5f34,
-  /* 2nd byte: 110 */ 0x5f36,
-  /* 2nd byte: 111 */ 0x5f3b,
-  /* 2nd byte: 112 */ 0x5f3d,
-  /* 2nd byte: 113 */ 0x5f3f,
-  /* 2nd byte: 114 */ 0x5f40,
-  /* 2nd byte: 115 */ 0x5f44,
-  /* 2nd byte: 116 */ 0x5f45,
-  /* 2nd byte: 117 */ 0x5f47,
-  /* 2nd byte: 118 */ 0x5f4d,
-  /* 2nd byte: 119 */ 0x5f50,
-  /* 2nd byte: 120 */ 0x5f54,
-  /* 2nd byte: 121 */ 0x5f58,
-  /* 2nd byte: 122 */ 0x5f5b,
-  /* 2nd byte: 123 */ 0x5f60,
-  /* 2nd byte: 124 */ 0x5f63,
-  /* 2nd byte: 125 */ 0x5f64,
-  /* 2nd byte: 126 */ 0x5f67},
-/* 1st byte: 61 */ { 
-  /* 2nd byte: 33 */ 0x5f6f,
-  /* 2nd byte: 34 */ 0x5f72,
-  /* 2nd byte: 35 */ 0x5f74,
-  /* 2nd byte: 36 */ 0x5f75,
-  /* 2nd byte: 37 */ 0x5f78,
-  /* 2nd byte: 38 */ 0x5f7a,
-  /* 2nd byte: 39 */ 0x5f7d,
-  /* 2nd byte: 40 */ 0x5f7e,
-  /* 2nd byte: 41 */ 0x5f89,
-  /* 2nd byte: 42 */ 0x5f8d,
-  /* 2nd byte: 43 */ 0x5f8f,
-  /* 2nd byte: 44 */ 0x5f96,
-  /* 2nd byte: 45 */ 0x5f9c,
-  /* 2nd byte: 46 */ 0x5f9d,
-  /* 2nd byte: 47 */ 0x5fa2,
-  /* 2nd byte: 48 */ 0x5fa7,
-  /* 2nd byte: 49 */ 0x5fab,
-  /* 2nd byte: 50 */ 0x5fa4,
-  /* 2nd byte: 51 */ 0x5fac,
-  /* 2nd byte: 52 */ 0x5faf,
-  /* 2nd byte: 53 */ 0x5fb0,
-  /* 2nd byte: 54 */ 0x5fb1,
-  /* 2nd byte: 55 */ 0x5fb8,
-  /* 2nd byte: 56 */ 0x5fc4,
-  /* 2nd byte: 57 */ 0x5fc7,
-  /* 2nd byte: 58 */ 0x5fc8,
-  /* 2nd byte: 59 */ 0x5fc9,
-  /* 2nd byte: 60 */ 0x5fcb,
-  /* 2nd byte: 61 */ 0x5fd0,
-  /* 2nd byte: 62 */ 0x5fd1,
-  /* 2nd byte: 63 */ 0x5fd2,
-  /* 2nd byte: 64 */ 0x5fd3,
-  /* 2nd byte: 65 */ 0x5fd4,
-  /* 2nd byte: 66 */ 0x5fde,
-  /* 2nd byte: 67 */ 0x5fe1,
-  /* 2nd byte: 68 */ 0x5fe2,
-  /* 2nd byte: 69 */ 0x5fe8,
-  /* 2nd byte: 70 */ 0x5fe9,
-  /* 2nd byte: 71 */ 0x5fea,
-  /* 2nd byte: 72 */ 0x5fec,
-  /* 2nd byte: 73 */ 0x5fed,
-  /* 2nd byte: 74 */ 0x5fee,
-  /* 2nd byte: 75 */ 0x5fef,
-  /* 2nd byte: 76 */ 0x5ff2,
-  /* 2nd byte: 77 */ 0x5ff3,
-  /* 2nd byte: 78 */ 0x5ff6,
-  /* 2nd byte: 79 */ 0x5ffa,
-  /* 2nd byte: 80 */ 0x5ffc,
-  /* 2nd byte: 81 */ 0x6007,
-  /* 2nd byte: 82 */ 0x600a,
-  /* 2nd byte: 83 */ 0x600d,
-  /* 2nd byte: 84 */ 0x6013,
-  /* 2nd byte: 85 */ 0x6014,
-  /* 2nd byte: 86 */ 0x6017,
-  /* 2nd byte: 87 */ 0x6018,
-  /* 2nd byte: 88 */ 0x601a,
-  /* 2nd byte: 89 */ 0x601f,
-  /* 2nd byte: 90 */ 0x6024,
-  /* 2nd byte: 91 */ 0x602d,
-  /* 2nd byte: 92 */ 0x6033,
-  /* 2nd byte: 93 */ 0x6035,
-  /* 2nd byte: 94 */ 0x6040,
-  /* 2nd byte: 95 */ 0x6047,
-  /* 2nd byte: 96 */ 0x6048,
-  /* 2nd byte: 97 */ 0x6049,
-  /* 2nd byte: 98 */ 0x604c,
-  /* 2nd byte: 99 */ 0x6051,
-  /* 2nd byte: 100 */ 0x6054,
-  /* 2nd byte: 101 */ 0x6056,
-  /* 2nd byte: 102 */ 0x6057,
-  /* 2nd byte: 103 */ 0x605d,
-  /* 2nd byte: 104 */ 0x6061,
-  /* 2nd byte: 105 */ 0x6067,
-  /* 2nd byte: 106 */ 0x6071,
-  /* 2nd byte: 107 */ 0x607e,
-  /* 2nd byte: 108 */ 0x607f,
-  /* 2nd byte: 109 */ 0x6082,
-  /* 2nd byte: 110 */ 0x6086,
-  /* 2nd byte: 111 */ 0x6088,
-  /* 2nd byte: 112 */ 0x608a,
-  /* 2nd byte: 113 */ 0x608e,
-  /* 2nd byte: 114 */ 0x6091,
-  /* 2nd byte: 115 */ 0x6093,
-  /* 2nd byte: 116 */ 0x6095,
-  /* 2nd byte: 117 */ 0x6098,
-  /* 2nd byte: 118 */ 0x609d,
-  /* 2nd byte: 119 */ 0x609e,
-  /* 2nd byte: 120 */ 0x60a2,
-  /* 2nd byte: 121 */ 0x60a4,
-  /* 2nd byte: 122 */ 0x60a5,
-  /* 2nd byte: 123 */ 0x60a8,
-  /* 2nd byte: 124 */ 0x60b0,
-  /* 2nd byte: 125 */ 0x60b1,
-  /* 2nd byte: 126 */ 0x60b7},
-/* 1st byte: 62 */ { 
-  /* 2nd byte: 33 */ 0x60bb,
-  /* 2nd byte: 34 */ 0x60be,
-  /* 2nd byte: 35 */ 0x60c2,
-  /* 2nd byte: 36 */ 0x60c4,
-  /* 2nd byte: 37 */ 0x60c8,
-  /* 2nd byte: 38 */ 0x60c9,
-  /* 2nd byte: 39 */ 0x60ca,
-  /* 2nd byte: 40 */ 0x60cb,
-  /* 2nd byte: 41 */ 0x60ce,
-  /* 2nd byte: 42 */ 0x60cf,
-  /* 2nd byte: 43 */ 0x60d4,
-  /* 2nd byte: 44 */ 0x60d5,
-  /* 2nd byte: 45 */ 0x60d9,
-  /* 2nd byte: 46 */ 0x60db,
-  /* 2nd byte: 47 */ 0x60dd,
-  /* 2nd byte: 48 */ 0x60de,
-  /* 2nd byte: 49 */ 0x60e2,
-  /* 2nd byte: 50 */ 0x60e5,
-  /* 2nd byte: 51 */ 0x60f2,
-  /* 2nd byte: 52 */ 0x60f5,
-  /* 2nd byte: 53 */ 0x60f8,
-  /* 2nd byte: 54 */ 0x60fc,
-  /* 2nd byte: 55 */ 0x60fd,
-  /* 2nd byte: 56 */ 0x6102,
-  /* 2nd byte: 57 */ 0x6107,
-  /* 2nd byte: 58 */ 0x610a,
-  /* 2nd byte: 59 */ 0x610c,
-  /* 2nd byte: 60 */ 0x6110,
-  /* 2nd byte: 61 */ 0x6111,
-  /* 2nd byte: 62 */ 0x6112,
-  /* 2nd byte: 63 */ 0x6113,
-  /* 2nd byte: 64 */ 0x6114,
-  /* 2nd byte: 65 */ 0x6116,
-  /* 2nd byte: 66 */ 0x6117,
-  /* 2nd byte: 67 */ 0x6119,
-  /* 2nd byte: 68 */ 0x611c,
-  /* 2nd byte: 69 */ 0x611e,
-  /* 2nd byte: 70 */ 0x6122,
-  /* 2nd byte: 71 */ 0x612a,
-  /* 2nd byte: 72 */ 0x612b,
-  /* 2nd byte: 73 */ 0x6130,
-  /* 2nd byte: 74 */ 0x6131,
-  /* 2nd byte: 75 */ 0x6135,
-  /* 2nd byte: 76 */ 0x6136,
-  /* 2nd byte: 77 */ 0x6137,
-  /* 2nd byte: 78 */ 0x6139,
-  /* 2nd byte: 79 */ 0x6141,
-  /* 2nd byte: 80 */ 0x6145,
-  /* 2nd byte: 81 */ 0x6146,
-  /* 2nd byte: 82 */ 0x6149,
-  /* 2nd byte: 83 */ 0x615e,
-  /* 2nd byte: 84 */ 0x6160,
-  /* 2nd byte: 85 */ 0x616c,
-  /* 2nd byte: 86 */ 0x6172,
-  /* 2nd byte: 87 */ 0x6178,
-  /* 2nd byte: 88 */ 0x617b,
-  /* 2nd byte: 89 */ 0x617c,
-  /* 2nd byte: 90 */ 0x617f,
-  /* 2nd byte: 91 */ 0x6180,
-  /* 2nd byte: 92 */ 0x6181,
-  /* 2nd byte: 93 */ 0x6183,
-  /* 2nd byte: 94 */ 0x6184,
-  /* 2nd byte: 95 */ 0x618b,
-  /* 2nd byte: 96 */ 0x618d,
-  /* 2nd byte: 97 */ 0x6192,
-  /* 2nd byte: 98 */ 0x6193,
-  /* 2nd byte: 99 */ 0x6197,
-  /* 2nd byte: 100 */ 0x6198,
-  /* 2nd byte: 101 */ 0x619c,
-  /* 2nd byte: 102 */ 0x619d,
-  /* 2nd byte: 103 */ 0x619f,
-  /* 2nd byte: 104 */ 0x61a0,
-  /* 2nd byte: 105 */ 0x61a5,
-  /* 2nd byte: 106 */ 0x61a8,
-  /* 2nd byte: 107 */ 0x61aa,
-  /* 2nd byte: 108 */ 0x61ad,
-  /* 2nd byte: 109 */ 0x61b8,
-  /* 2nd byte: 110 */ 0x61b9,
-  /* 2nd byte: 111 */ 0x61bc,
-  /* 2nd byte: 112 */ 0x61c0,
-  /* 2nd byte: 113 */ 0x61c1,
-  /* 2nd byte: 114 */ 0x61c2,
-  /* 2nd byte: 115 */ 0x61ce,
-  /* 2nd byte: 116 */ 0x61cf,
-  /* 2nd byte: 117 */ 0x61d5,
-  /* 2nd byte: 118 */ 0x61dc,
-  /* 2nd byte: 119 */ 0x61dd,
-  /* 2nd byte: 120 */ 0x61de,
-  /* 2nd byte: 121 */ 0x61df,
-  /* 2nd byte: 122 */ 0x61e1,
-  /* 2nd byte: 123 */ 0x61e2,
-  /* 2nd byte: 124 */ 0x61e7,
-  /* 2nd byte: 125 */ 0x61e9,
-  /* 2nd byte: 126 */ 0x61e5},
-/* 1st byte: 63 */ { 
-  /* 2nd byte: 33 */ 0x61ec,
-  /* 2nd byte: 34 */ 0x61ed,
-  /* 2nd byte: 35 */ 0x61ef,
-  /* 2nd byte: 36 */ 0x6201,
-  /* 2nd byte: 37 */ 0x6203,
-  /* 2nd byte: 38 */ 0x6204,
-  /* 2nd byte: 39 */ 0x6207,
-  /* 2nd byte: 40 */ 0x6213,
-  /* 2nd byte: 41 */ 0x6215,
-  /* 2nd byte: 42 */ 0x621c,
-  /* 2nd byte: 43 */ 0x6220,
-  /* 2nd byte: 44 */ 0x6222,
-  /* 2nd byte: 45 */ 0x6223,
-  /* 2nd byte: 46 */ 0x6227,
-  /* 2nd byte: 47 */ 0x6229,
-  /* 2nd byte: 48 */ 0x622b,
-  /* 2nd byte: 49 */ 0x6239,
-  /* 2nd byte: 50 */ 0x623d,
-  /* 2nd byte: 51 */ 0x6242,
-  /* 2nd byte: 52 */ 0x6243,
-  /* 2nd byte: 53 */ 0x6244,
-  /* 2nd byte: 54 */ 0x6246,
-  /* 2nd byte: 55 */ 0x624c,
-  /* 2nd byte: 56 */ 0x6250,
-  /* 2nd byte: 57 */ 0x6251,
-  /* 2nd byte: 58 */ 0x6252,
-  /* 2nd byte: 59 */ 0x6254,
-  /* 2nd byte: 60 */ 0x6256,
-  /* 2nd byte: 61 */ 0x625a,
-  /* 2nd byte: 62 */ 0x625c,
-  /* 2nd byte: 63 */ 0x6264,
-  /* 2nd byte: 64 */ 0x626d,
-  /* 2nd byte: 65 */ 0x626f,
-  /* 2nd byte: 66 */ 0x6273,
-  /* 2nd byte: 67 */ 0x627a,
-  /* 2nd byte: 68 */ 0x627d,
-  /* 2nd byte: 69 */ 0x628d,
-  /* 2nd byte: 70 */ 0x628e,
-  /* 2nd byte: 71 */ 0x628f,
-  /* 2nd byte: 72 */ 0x6290,
-  /* 2nd byte: 73 */ 0x62a6,
-  /* 2nd byte: 74 */ 0x62a8,
-  /* 2nd byte: 75 */ 0x62b3,
-  /* 2nd byte: 76 */ 0x62b6,
-  /* 2nd byte: 77 */ 0x62b7,
-  /* 2nd byte: 78 */ 0x62ba,
-  /* 2nd byte: 79 */ 0x62be,
-  /* 2nd byte: 80 */ 0x62bf,
-  /* 2nd byte: 81 */ 0x62c4,
-  /* 2nd byte: 82 */ 0x62ce,
-  /* 2nd byte: 83 */ 0x62d5,
-  /* 2nd byte: 84 */ 0x62d6,
-  /* 2nd byte: 85 */ 0x62da,
-  /* 2nd byte: 86 */ 0x62ea,
-  /* 2nd byte: 87 */ 0x62f2,
-  /* 2nd byte: 88 */ 0x62f4,
-  /* 2nd byte: 89 */ 0x62fc,
-  /* 2nd byte: 90 */ 0x62fd,
-  /* 2nd byte: 91 */ 0x6303,
-  /* 2nd byte: 92 */ 0x6304,
-  /* 2nd byte: 93 */ 0x630a,
-  /* 2nd byte: 94 */ 0x630b,
-  /* 2nd byte: 95 */ 0x630d,
-  /* 2nd byte: 96 */ 0x6310,
-  /* 2nd byte: 97 */ 0x6313,
-  /* 2nd byte: 98 */ 0x6316,
-  /* 2nd byte: 99 */ 0x6318,
-  /* 2nd byte: 100 */ 0x6329,
-  /* 2nd byte: 101 */ 0x632a,
-  /* 2nd byte: 102 */ 0x632d,
-  /* 2nd byte: 103 */ 0x6335,
-  /* 2nd byte: 104 */ 0x6336,
-  /* 2nd byte: 105 */ 0x6339,
-  /* 2nd byte: 106 */ 0x633c,
-  /* 2nd byte: 107 */ 0x6341,
-  /* 2nd byte: 108 */ 0x6342,
-  /* 2nd byte: 109 */ 0x6343,
-  /* 2nd byte: 110 */ 0x6344,
-  /* 2nd byte: 111 */ 0x6346,
-  /* 2nd byte: 112 */ 0x634a,
-  /* 2nd byte: 113 */ 0x634b,
-  /* 2nd byte: 114 */ 0x634e,
-  /* 2nd byte: 115 */ 0x6352,
-  /* 2nd byte: 116 */ 0x6353,
-  /* 2nd byte: 117 */ 0x6354,
-  /* 2nd byte: 118 */ 0x6358,
-  /* 2nd byte: 119 */ 0x635b,
-  /* 2nd byte: 120 */ 0x6365,
-  /* 2nd byte: 121 */ 0x6366,
-  /* 2nd byte: 122 */ 0x636c,
-  /* 2nd byte: 123 */ 0x636d,
-  /* 2nd byte: 124 */ 0x6371,
-  /* 2nd byte: 125 */ 0x6374,
-  /* 2nd byte: 126 */ 0x6375},
-/* 1st byte: 64 */ { 
-  /* 2nd byte: 33 */ 0x6378,
-  /* 2nd byte: 34 */ 0x637c,
-  /* 2nd byte: 35 */ 0x637d,
-  /* 2nd byte: 36 */ 0x637f,
-  /* 2nd byte: 37 */ 0x6382,
-  /* 2nd byte: 38 */ 0x6384,
-  /* 2nd byte: 39 */ 0x6387,
-  /* 2nd byte: 40 */ 0x638a,
-  /* 2nd byte: 41 */ 0x6390,
-  /* 2nd byte: 42 */ 0x6394,
-  /* 2nd byte: 43 */ 0x6395,
-  /* 2nd byte: 44 */ 0x6399,
-  /* 2nd byte: 45 */ 0x639a,
-  /* 2nd byte: 46 */ 0x639e,
-  /* 2nd byte: 47 */ 0x63a4,
-  /* 2nd byte: 48 */ 0x63a6,
-  /* 2nd byte: 49 */ 0x63ad,
-  /* 2nd byte: 50 */ 0x63ae,
-  /* 2nd byte: 51 */ 0x63af,
-  /* 2nd byte: 52 */ 0x63bd,
-  /* 2nd byte: 53 */ 0x63c1,
-  /* 2nd byte: 54 */ 0x63c5,
-  /* 2nd byte: 55 */ 0x63c8,
-  /* 2nd byte: 56 */ 0x63ce,
-  /* 2nd byte: 57 */ 0x63d1,
-  /* 2nd byte: 58 */ 0x63d3,
-  /* 2nd byte: 59 */ 0x63d4,
-  /* 2nd byte: 60 */ 0x63d5,
-  /* 2nd byte: 61 */ 0x63dc,
-  /* 2nd byte: 62 */ 0x63e0,
-  /* 2nd byte: 63 */ 0x63e5,
-  /* 2nd byte: 64 */ 0x63ea,
-  /* 2nd byte: 65 */ 0x63ec,
-  /* 2nd byte: 66 */ 0x63f2,
-  /* 2nd byte: 67 */ 0x63f3,
-  /* 2nd byte: 68 */ 0x63f5,
-  /* 2nd byte: 69 */ 0x63f8,
-  /* 2nd byte: 70 */ 0x63f9,
-  /* 2nd byte: 71 */ 0x6409,
-  /* 2nd byte: 72 */ 0x640a,
-  /* 2nd byte: 73 */ 0x6410,
-  /* 2nd byte: 74 */ 0x6412,
-  /* 2nd byte: 75 */ 0x6414,
-  /* 2nd byte: 76 */ 0x6418,
-  /* 2nd byte: 77 */ 0x641e,
-  /* 2nd byte: 78 */ 0x6420,
-  /* 2nd byte: 79 */ 0x6422,
-  /* 2nd byte: 80 */ 0x6424,
-  /* 2nd byte: 81 */ 0x6425,
-  /* 2nd byte: 82 */ 0x6429,
-  /* 2nd byte: 83 */ 0x642a,
-  /* 2nd byte: 84 */ 0x642f,
-  /* 2nd byte: 85 */ 0x6430,
-  /* 2nd byte: 86 */ 0x6435,
-  /* 2nd byte: 87 */ 0x643d,
-  /* 2nd byte: 88 */ 0x643f,
-  /* 2nd byte: 89 */ 0x644b,
-  /* 2nd byte: 90 */ 0x644f,
-  /* 2nd byte: 91 */ 0x6451,
-  /* 2nd byte: 92 */ 0x6452,
-  /* 2nd byte: 93 */ 0x6453,
-  /* 2nd byte: 94 */ 0x6454,
-  /* 2nd byte: 95 */ 0x645a,
-  /* 2nd byte: 96 */ 0x645b,
-  /* 2nd byte: 97 */ 0x645c,
-  /* 2nd byte: 98 */ 0x645d,
-  /* 2nd byte: 99 */ 0x645f,
-  /* 2nd byte: 100 */ 0x6460,
-  /* 2nd byte: 101 */ 0x6461,
-  /* 2nd byte: 102 */ 0x6463,
-  /* 2nd byte: 103 */ 0x646d,
-  /* 2nd byte: 104 */ 0x6473,
-  /* 2nd byte: 105 */ 0x6474,
-  /* 2nd byte: 106 */ 0x647b,
-  /* 2nd byte: 107 */ 0x647d,
-  /* 2nd byte: 108 */ 0x6485,
-  /* 2nd byte: 109 */ 0x6487,
-  /* 2nd byte: 110 */ 0x648f,
-  /* 2nd byte: 111 */ 0x6490,
-  /* 2nd byte: 112 */ 0x6491,
-  /* 2nd byte: 113 */ 0x6498,
-  /* 2nd byte: 114 */ 0x6499,
-  /* 2nd byte: 115 */ 0x649b,
-  /* 2nd byte: 116 */ 0x649d,
-  /* 2nd byte: 117 */ 0x649f,
-  /* 2nd byte: 118 */ 0x64a1,
-  /* 2nd byte: 119 */ 0x64a3,
-  /* 2nd byte: 120 */ 0x64a6,
-  /* 2nd byte: 121 */ 0x64a8,
-  /* 2nd byte: 122 */ 0x64ac,
-  /* 2nd byte: 123 */ 0x64b3,
-  /* 2nd byte: 124 */ 0x64bd,
-  /* 2nd byte: 125 */ 0x64be,
-  /* 2nd byte: 126 */ 0x64bf},
-/* 1st byte: 65 */ { 
-  /* 2nd byte: 33 */ 0x64c4,
-  /* 2nd byte: 34 */ 0x64c9,
-  /* 2nd byte: 35 */ 0x64ca,
-  /* 2nd byte: 36 */ 0x64cb,
-  /* 2nd byte: 37 */ 0x64cc,
-  /* 2nd byte: 38 */ 0x64ce,
-  /* 2nd byte: 39 */ 0x64d0,
-  /* 2nd byte: 40 */ 0x64d1,
-  /* 2nd byte: 41 */ 0x64d5,
-  /* 2nd byte: 42 */ 0x64d7,
-  /* 2nd byte: 43 */ 0x64e4,
-  /* 2nd byte: 44 */ 0x64e5,
-  /* 2nd byte: 45 */ 0x64e9,
-  /* 2nd byte: 46 */ 0x64ea,
-  /* 2nd byte: 47 */ 0x64ed,
-  /* 2nd byte: 48 */ 0x64f0,
-  /* 2nd byte: 49 */ 0x64f5,
-  /* 2nd byte: 50 */ 0x64f7,
-  /* 2nd byte: 51 */ 0x64fb,
-  /* 2nd byte: 52 */ 0x64ff,
-  /* 2nd byte: 53 */ 0x6501,
-  /* 2nd byte: 54 */ 0x6504,
-  /* 2nd byte: 55 */ 0x6508,
-  /* 2nd byte: 56 */ 0x6509,
-  /* 2nd byte: 57 */ 0x650a,
-  /* 2nd byte: 58 */ 0x650f,
-  /* 2nd byte: 59 */ 0x6513,
-  /* 2nd byte: 60 */ 0x6514,
-  /* 2nd byte: 61 */ 0x6516,
-  /* 2nd byte: 62 */ 0x6519,
-  /* 2nd byte: 63 */ 0x651b,
-  /* 2nd byte: 64 */ 0x651e,
-  /* 2nd byte: 65 */ 0x651f,
-  /* 2nd byte: 66 */ 0x6522,
-  /* 2nd byte: 67 */ 0x6526,
-  /* 2nd byte: 68 */ 0x6529,
-  /* 2nd byte: 69 */ 0x652e,
-  /* 2nd byte: 70 */ 0x6531,
-  /* 2nd byte: 71 */ 0x653a,
-  /* 2nd byte: 72 */ 0x653c,
-  /* 2nd byte: 73 */ 0x653d,
-  /* 2nd byte: 74 */ 0x6543,
-  /* 2nd byte: 75 */ 0x6547,
-  /* 2nd byte: 76 */ 0x6549,
-  /* 2nd byte: 77 */ 0x6550,
-  /* 2nd byte: 78 */ 0x6552,
-  /* 2nd byte: 79 */ 0x6554,
-  /* 2nd byte: 80 */ 0x655f,
-  /* 2nd byte: 81 */ 0x6560,
-  /* 2nd byte: 82 */ 0x6567,
-  /* 2nd byte: 83 */ 0x656b,
-  /* 2nd byte: 84 */ 0x657a,
-  /* 2nd byte: 85 */ 0x657d,
-  /* 2nd byte: 86 */ 0x6581,
-  /* 2nd byte: 87 */ 0x6585,
-  /* 2nd byte: 88 */ 0x658a,
-  /* 2nd byte: 89 */ 0x6592,
-  /* 2nd byte: 90 */ 0x6595,
-  /* 2nd byte: 91 */ 0x6598,
-  /* 2nd byte: 92 */ 0x659d,
-  /* 2nd byte: 93 */ 0x65a0,
-  /* 2nd byte: 94 */ 0x65a3,
-  /* 2nd byte: 95 */ 0x65a6,
-  /* 2nd byte: 96 */ 0x65ae,
-  /* 2nd byte: 97 */ 0x65b2,
-  /* 2nd byte: 98 */ 0x65b3,
-  /* 2nd byte: 99 */ 0x65b4,
-  /* 2nd byte: 100 */ 0x65bf,
-  /* 2nd byte: 101 */ 0x65c2,
-  /* 2nd byte: 102 */ 0x65c8,
-  /* 2nd byte: 103 */ 0x65c9,
-  /* 2nd byte: 104 */ 0x65ce,
-  /* 2nd byte: 105 */ 0x65d0,
-  /* 2nd byte: 106 */ 0x65d4,
-  /* 2nd byte: 107 */ 0x65d6,
-  /* 2nd byte: 108 */ 0x65d8,
-  /* 2nd byte: 109 */ 0x65df,
-  /* 2nd byte: 110 */ 0x65f0,
-  /* 2nd byte: 111 */ 0x65f2,
-  /* 2nd byte: 112 */ 0x65f4,
-  /* 2nd byte: 113 */ 0x65f5,
-  /* 2nd byte: 114 */ 0x65f9,
-  /* 2nd byte: 115 */ 0x65fe,
-  /* 2nd byte: 116 */ 0x65ff,
-  /* 2nd byte: 117 */ 0x6600,
-  /* 2nd byte: 118 */ 0x6604,
-  /* 2nd byte: 119 */ 0x6608,
-  /* 2nd byte: 120 */ 0x6609,
-  /* 2nd byte: 121 */ 0x660d,
-  /* 2nd byte: 122 */ 0x6611,
-  /* 2nd byte: 123 */ 0x6612,
-  /* 2nd byte: 124 */ 0x6615,
-  /* 2nd byte: 125 */ 0x6616,
-  /* 2nd byte: 126 */ 0x661d},
-/* 1st byte: 66 */ { 
-  /* 2nd byte: 33 */ 0x661e,
-  /* 2nd byte: 34 */ 0x6621,
-  /* 2nd byte: 35 */ 0x6622,
-  /* 2nd byte: 36 */ 0x6623,
-  /* 2nd byte: 37 */ 0x6624,
-  /* 2nd byte: 38 */ 0x6626,
-  /* 2nd byte: 39 */ 0x6629,
-  /* 2nd byte: 40 */ 0x662a,
-  /* 2nd byte: 41 */ 0x662b,
-  /* 2nd byte: 42 */ 0x662c,
-  /* 2nd byte: 43 */ 0x662e,
-  /* 2nd byte: 44 */ 0x6630,
-  /* 2nd byte: 45 */ 0x6631,
-  /* 2nd byte: 46 */ 0x6633,
-  /* 2nd byte: 47 */ 0x6639,
-  /* 2nd byte: 48 */ 0x6637,
-  /* 2nd byte: 49 */ 0x6640,
-  /* 2nd byte: 50 */ 0x6645,
-  /* 2nd byte: 51 */ 0x6646,
-  /* 2nd byte: 52 */ 0x664a,
-  /* 2nd byte: 53 */ 0x664c,
-  /* 2nd byte: 54 */ 0x6651,
-  /* 2nd byte: 55 */ 0x664e,
-  /* 2nd byte: 56 */ 0x6657,
-  /* 2nd byte: 57 */ 0x6658,
-  /* 2nd byte: 58 */ 0x6659,
-  /* 2nd byte: 59 */ 0x665b,
-  /* 2nd byte: 60 */ 0x665c,
-  /* 2nd byte: 61 */ 0x6660,
-  /* 2nd byte: 62 */ 0x6661,
-  /* 2nd byte: 63 */ 0x66fb,
-  /* 2nd byte: 64 */ 0x666a,
-  /* 2nd byte: 65 */ 0x666b,
-  /* 2nd byte: 66 */ 0x666c,
-  /* 2nd byte: 67 */ 0x667e,
-  /* 2nd byte: 68 */ 0x6673,
-  /* 2nd byte: 69 */ 0x6675,
-  /* 2nd byte: 70 */ 0x667f,
-  /* 2nd byte: 71 */ 0x6677,
-  /* 2nd byte: 72 */ 0x6678,
-  /* 2nd byte: 73 */ 0x6679,
-  /* 2nd byte: 74 */ 0x667b,
-  /* 2nd byte: 75 */ 0x6680,
-  /* 2nd byte: 76 */ 0x667c,
-  /* 2nd byte: 77 */ 0x668b,
-  /* 2nd byte: 78 */ 0x668c,
-  /* 2nd byte: 79 */ 0x668d,
-  /* 2nd byte: 80 */ 0x6690,
-  /* 2nd byte: 81 */ 0x6692,
-  /* 2nd byte: 82 */ 0x6699,
-  /* 2nd byte: 83 */ 0x669a,
-  /* 2nd byte: 84 */ 0x669b,
-  /* 2nd byte: 85 */ 0x669c,
-  /* 2nd byte: 86 */ 0x669f,
-  /* 2nd byte: 87 */ 0x66a0,
-  /* 2nd byte: 88 */ 0x66a4,
-  /* 2nd byte: 89 */ 0x66ad,
-  /* 2nd byte: 90 */ 0x66b1,
-  /* 2nd byte: 91 */ 0x66b2,
-  /* 2nd byte: 92 */ 0x66b5,
-  /* 2nd byte: 93 */ 0x66bb,
-  /* 2nd byte: 94 */ 0x66bf,
-  /* 2nd byte: 95 */ 0x66c0,
-  /* 2nd byte: 96 */ 0x66c2,
-  /* 2nd byte: 97 */ 0x66c3,
-  /* 2nd byte: 98 */ 0x66c8,
-  /* 2nd byte: 99 */ 0x66cc,
-  /* 2nd byte: 100 */ 0x66ce,
-  /* 2nd byte: 101 */ 0x66cf,
-  /* 2nd byte: 102 */ 0x66d4,
-  /* 2nd byte: 103 */ 0x66db,
-  /* 2nd byte: 104 */ 0x66df,
-  /* 2nd byte: 105 */ 0x66e8,
-  /* 2nd byte: 106 */ 0x66eb,
-  /* 2nd byte: 107 */ 0x66ec,
-  /* 2nd byte: 108 */ 0x66ee,
-  /* 2nd byte: 109 */ 0x66fa,
-  /* 2nd byte: 110 */ 0x6705,
-  /* 2nd byte: 111 */ 0x6707,
-  /* 2nd byte: 112 */ 0x670e,
-  /* 2nd byte: 113 */ 0x6713,
-  /* 2nd byte: 114 */ 0x6719,
-  /* 2nd byte: 115 */ 0x671c,
-  /* 2nd byte: 116 */ 0x6720,
-  /* 2nd byte: 117 */ 0x6722,
-  /* 2nd byte: 118 */ 0x6733,
-  /* 2nd byte: 119 */ 0x673e,
-  /* 2nd byte: 120 */ 0x6745,
-  /* 2nd byte: 121 */ 0x6747,
-  /* 2nd byte: 122 */ 0x6748,
-  /* 2nd byte: 123 */ 0x674c,
-  /* 2nd byte: 124 */ 0x6754,
-  /* 2nd byte: 125 */ 0x6755,
-  /* 2nd byte: 126 */ 0x675d},
-/* 1st byte: 67 */ { 
-  /* 2nd byte: 33 */ 0x6766,
-  /* 2nd byte: 34 */ 0x676c,
-  /* 2nd byte: 35 */ 0x676e,
-  /* 2nd byte: 36 */ 0x6774,
-  /* 2nd byte: 37 */ 0x6776,
-  /* 2nd byte: 38 */ 0x677b,
-  /* 2nd byte: 39 */ 0x6781,
-  /* 2nd byte: 40 */ 0x6784,
-  /* 2nd byte: 41 */ 0x678e,
-  /* 2nd byte: 42 */ 0x678f,
-  /* 2nd byte: 43 */ 0x6791,
-  /* 2nd byte: 44 */ 0x6793,
-  /* 2nd byte: 45 */ 0x6796,
-  /* 2nd byte: 46 */ 0x6798,
-  /* 2nd byte: 47 */ 0x6799,
-  /* 2nd byte: 48 */ 0x679b,
-  /* 2nd byte: 49 */ 0x67b0,
-  /* 2nd byte: 50 */ 0x67b1,
-  /* 2nd byte: 51 */ 0x67b2,
-  /* 2nd byte: 52 */ 0x67b5,
-  /* 2nd byte: 53 */ 0x67bb,
-  /* 2nd byte: 54 */ 0x67bc,
-  /* 2nd byte: 55 */ 0x67bd,
-  /* 2nd byte: 56 */ 0x67f9,
-  /* 2nd byte: 57 */ 0x67c0,
-  /* 2nd byte: 58 */ 0x67c2,
-  /* 2nd byte: 59 */ 0x67c3,
-  /* 2nd byte: 60 */ 0x67c5,
-  /* 2nd byte: 61 */ 0x67c8,
-  /* 2nd byte: 62 */ 0x67c9,
-  /* 2nd byte: 63 */ 0x67d2,
-  /* 2nd byte: 64 */ 0x67d7,
-  /* 2nd byte: 65 */ 0x67d9,
-  /* 2nd byte: 66 */ 0x67dc,
-  /* 2nd byte: 67 */ 0x67e1,
-  /* 2nd byte: 68 */ 0x67e6,
-  /* 2nd byte: 69 */ 0x67f0,
-  /* 2nd byte: 70 */ 0x67f2,
-  /* 2nd byte: 71 */ 0x67f6,
-  /* 2nd byte: 72 */ 0x67f7,
-  /* 2nd byte: 73 */ 0x6852,
-  /* 2nd byte: 74 */ 0x6814,
-  /* 2nd byte: 75 */ 0x6819,
-  /* 2nd byte: 76 */ 0x681d,
-  /* 2nd byte: 77 */ 0x681f,
-  /* 2nd byte: 78 */ 0x6828,
-  /* 2nd byte: 79 */ 0x6827,
-  /* 2nd byte: 80 */ 0x682c,
-  /* 2nd byte: 81 */ 0x682d,
-  /* 2nd byte: 82 */ 0x682f,
-  /* 2nd byte: 83 */ 0x6830,
-  /* 2nd byte: 84 */ 0x6831,
-  /* 2nd byte: 85 */ 0x6833,
-  /* 2nd byte: 86 */ 0x683b,
-  /* 2nd byte: 87 */ 0x683f,
-  /* 2nd byte: 88 */ 0x6844,
-  /* 2nd byte: 89 */ 0x6845,
-  /* 2nd byte: 90 */ 0x684a,
-  /* 2nd byte: 91 */ 0x684c,
-  /* 2nd byte: 92 */ 0x6855,
-  /* 2nd byte: 93 */ 0x6857,
-  /* 2nd byte: 94 */ 0x6858,
-  /* 2nd byte: 95 */ 0x685b,
-  /* 2nd byte: 96 */ 0x686b,
-  /* 2nd byte: 97 */ 0x686e,
-  /* 2nd byte: 98 */ 0x686f,
-  /* 2nd byte: 99 */ 0x6870,
-  /* 2nd byte: 100 */ 0x6871,
-  /* 2nd byte: 101 */ 0x6872,
-  /* 2nd byte: 102 */ 0x6875,
-  /* 2nd byte: 103 */ 0x6879,
-  /* 2nd byte: 104 */ 0x687a,
-  /* 2nd byte: 105 */ 0x687b,
-  /* 2nd byte: 106 */ 0x687c,
-  /* 2nd byte: 107 */ 0x6882,
-  /* 2nd byte: 108 */ 0x6884,
-  /* 2nd byte: 109 */ 0x6886,
-  /* 2nd byte: 110 */ 0x6888,
-  /* 2nd byte: 111 */ 0x6896,
-  /* 2nd byte: 112 */ 0x6898,
-  /* 2nd byte: 113 */ 0x689a,
-  /* 2nd byte: 114 */ 0x689c,
-  /* 2nd byte: 115 */ 0x68a1,
-  /* 2nd byte: 116 */ 0x68a3,
-  /* 2nd byte: 117 */ 0x68a5,
-  /* 2nd byte: 118 */ 0x68a9,
-  /* 2nd byte: 119 */ 0x68aa,
-  /* 2nd byte: 120 */ 0x68ae,
-  /* 2nd byte: 121 */ 0x68b2,
-  /* 2nd byte: 122 */ 0x68bb,
-  /* 2nd byte: 123 */ 0x68c5,
-  /* 2nd byte: 124 */ 0x68c8,
-  /* 2nd byte: 125 */ 0x68cc,
-  /* 2nd byte: 126 */ 0x68cf},
-/* 1st byte: 68 */ { 
-  /* 2nd byte: 33 */ 0x68d0,
-  /* 2nd byte: 34 */ 0x68d1,
-  /* 2nd byte: 35 */ 0x68d3,
-  /* 2nd byte: 36 */ 0x68d6,
-  /* 2nd byte: 37 */ 0x68d9,
-  /* 2nd byte: 38 */ 0x68dc,
-  /* 2nd byte: 39 */ 0x68dd,
-  /* 2nd byte: 40 */ 0x68e5,
-  /* 2nd byte: 41 */ 0x68e8,
-  /* 2nd byte: 42 */ 0x68ea,
-  /* 2nd byte: 43 */ 0x68eb,
-  /* 2nd byte: 44 */ 0x68ec,
-  /* 2nd byte: 45 */ 0x68ed,
-  /* 2nd byte: 46 */ 0x68f0,
-  /* 2nd byte: 47 */ 0x68f1,
-  /* 2nd byte: 48 */ 0x68f5,
-  /* 2nd byte: 49 */ 0x68f6,
-  /* 2nd byte: 50 */ 0x68fb,
-  /* 2nd byte: 51 */ 0x68fc,
-  /* 2nd byte: 52 */ 0x68fd,
-  /* 2nd byte: 53 */ 0x6906,
-  /* 2nd byte: 54 */ 0x6909,
-  /* 2nd byte: 55 */ 0x690a,
-  /* 2nd byte: 56 */ 0x6910,
-  /* 2nd byte: 57 */ 0x6911,
-  /* 2nd byte: 58 */ 0x6913,
-  /* 2nd byte: 59 */ 0x6916,
-  /* 2nd byte: 60 */ 0x6917,
-  /* 2nd byte: 61 */ 0x6931,
-  /* 2nd byte: 62 */ 0x6933,
-  /* 2nd byte: 63 */ 0x6935,
-  /* 2nd byte: 64 */ 0x6938,
-  /* 2nd byte: 65 */ 0x693b,
-  /* 2nd byte: 66 */ 0x6942,
-  /* 2nd byte: 67 */ 0x6945,
-  /* 2nd byte: 68 */ 0x6949,
-  /* 2nd byte: 69 */ 0x694e,
-  /* 2nd byte: 70 */ 0x6957,
-  /* 2nd byte: 71 */ 0x695b,
-  /* 2nd byte: 72 */ 0x6963,
-  /* 2nd byte: 73 */ 0x6964,
-  /* 2nd byte: 74 */ 0x6965,
-  /* 2nd byte: 75 */ 0x6966,
-  /* 2nd byte: 76 */ 0x6968,
-  /* 2nd byte: 77 */ 0x6969,
-  /* 2nd byte: 78 */ 0x696c,
-  /* 2nd byte: 79 */ 0x6970,
-  /* 2nd byte: 80 */ 0x6971,
-  /* 2nd byte: 81 */ 0x6972,
-  /* 2nd byte: 82 */ 0x697a,
-  /* 2nd byte: 83 */ 0x697b,
-  /* 2nd byte: 84 */ 0x697f,
-  /* 2nd byte: 85 */ 0x6980,
-  /* 2nd byte: 86 */ 0x698d,
-  /* 2nd byte: 87 */ 0x6992,
-  /* 2nd byte: 88 */ 0x6996,
-  /* 2nd byte: 89 */ 0x6998,
-  /* 2nd byte: 90 */ 0x69a1,
-  /* 2nd byte: 91 */ 0x69a5,
-  /* 2nd byte: 92 */ 0x69a6,
-  /* 2nd byte: 93 */ 0x69a8,
-  /* 2nd byte: 94 */ 0x69ab,
-  /* 2nd byte: 95 */ 0x69ad,
-  /* 2nd byte: 96 */ 0x69af,
-  /* 2nd byte: 97 */ 0x69b7,
-  /* 2nd byte: 98 */ 0x69b8,
-  /* 2nd byte: 99 */ 0x69ba,
-  /* 2nd byte: 100 */ 0x69bc,
-  /* 2nd byte: 101 */ 0x69c5,
-  /* 2nd byte: 102 */ 0x69c8,
-  /* 2nd byte: 103 */ 0x69d1,
-  /* 2nd byte: 104 */ 0x69d6,
-  /* 2nd byte: 105 */ 0x69d7,
-  /* 2nd byte: 106 */ 0x69e2,
-  /* 2nd byte: 107 */ 0x69e5,
-  /* 2nd byte: 108 */ 0x69ee,
-  /* 2nd byte: 109 */ 0x69ef,
-  /* 2nd byte: 110 */ 0x69f1,
-  /* 2nd byte: 111 */ 0x69f3,
-  /* 2nd byte: 112 */ 0x69f5,
-  /* 2nd byte: 113 */ 0x69fe,
-  /* 2nd byte: 114 */ 0x6a00,
-  /* 2nd byte: 115 */ 0x6a01,
-  /* 2nd byte: 116 */ 0x6a03,
-  /* 2nd byte: 117 */ 0x6a0f,
-  /* 2nd byte: 118 */ 0x6a11,
-  /* 2nd byte: 119 */ 0x6a15,
-  /* 2nd byte: 120 */ 0x6a1a,
-  /* 2nd byte: 121 */ 0x6a1d,
-  /* 2nd byte: 122 */ 0x6a20,
-  /* 2nd byte: 123 */ 0x6a24,
-  /* 2nd byte: 124 */ 0x6a28,
-  /* 2nd byte: 125 */ 0x6a30,
-  /* 2nd byte: 126 */ 0x6a32},
-/* 1st byte: 69 */ { 
-  /* 2nd byte: 33 */ 0x6a34,
-  /* 2nd byte: 34 */ 0x6a37,
-  /* 2nd byte: 35 */ 0x6a3b,
-  /* 2nd byte: 36 */ 0x6a3e,
-  /* 2nd byte: 37 */ 0x6a3f,
-  /* 2nd byte: 38 */ 0x6a45,
-  /* 2nd byte: 39 */ 0x6a46,
-  /* 2nd byte: 40 */ 0x6a49,
-  /* 2nd byte: 41 */ 0x6a4a,
-  /* 2nd byte: 42 */ 0x6a4e,
-  /* 2nd byte: 43 */ 0x6a50,
-  /* 2nd byte: 44 */ 0x6a51,
-  /* 2nd byte: 45 */ 0x6a52,
-  /* 2nd byte: 46 */ 0x6a55,
-  /* 2nd byte: 47 */ 0x6a56,
-  /* 2nd byte: 48 */ 0x6a5b,
-  /* 2nd byte: 49 */ 0x6a64,
-  /* 2nd byte: 50 */ 0x6a67,
-  /* 2nd byte: 51 */ 0x6a6a,
-  /* 2nd byte: 52 */ 0x6a71,
-  /* 2nd byte: 53 */ 0x6a73,
-  /* 2nd byte: 54 */ 0x6a7e,
-  /* 2nd byte: 55 */ 0x6a81,
-  /* 2nd byte: 56 */ 0x6a83,
-  /* 2nd byte: 57 */ 0x6a86,
-  /* 2nd byte: 58 */ 0x6a87,
-  /* 2nd byte: 59 */ 0x6a89,
-  /* 2nd byte: 60 */ 0x6a8b,
-  /* 2nd byte: 61 */ 0x6a91,
-  /* 2nd byte: 62 */ 0x6a9b,
-  /* 2nd byte: 63 */ 0x6a9d,
-  /* 2nd byte: 64 */ 0x6a9e,
-  /* 2nd byte: 65 */ 0x6a9f,
-  /* 2nd byte: 66 */ 0x6aa5,
-  /* 2nd byte: 67 */ 0x6aab,
-  /* 2nd byte: 68 */ 0x6aaf,
-  /* 2nd byte: 69 */ 0x6ab0,
-  /* 2nd byte: 70 */ 0x6ab1,
-  /* 2nd byte: 71 */ 0x6ab4,
-  /* 2nd byte: 72 */ 0x6abd,
-  /* 2nd byte: 73 */ 0x6abe,
-  /* 2nd byte: 74 */ 0x6abf,
-  /* 2nd byte: 75 */ 0x6ac6,
-  /* 2nd byte: 76 */ 0x6ac9,
-  /* 2nd byte: 77 */ 0x6ac8,
-  /* 2nd byte: 78 */ 0x6acc,
-  /* 2nd byte: 79 */ 0x6ad0,
-  /* 2nd byte: 80 */ 0x6ad4,
-  /* 2nd byte: 81 */ 0x6ad5,
-  /* 2nd byte: 82 */ 0x6ad6,
-  /* 2nd byte: 83 */ 0x6adc,
-  /* 2nd byte: 84 */ 0x6add,
-  /* 2nd byte: 85 */ 0x6ae4,
-  /* 2nd byte: 86 */ 0x6ae7,
-  /* 2nd byte: 87 */ 0x6aec,
-  /* 2nd byte: 88 */ 0x6af0,
-  /* 2nd byte: 89 */ 0x6af1,
-  /* 2nd byte: 90 */ 0x6af2,
-  /* 2nd byte: 91 */ 0x6afc,
-  /* 2nd byte: 92 */ 0x6afd,
-  /* 2nd byte: 93 */ 0x6b02,
-  /* 2nd byte: 94 */ 0x6b03,
-  /* 2nd byte: 95 */ 0x6b06,
-  /* 2nd byte: 96 */ 0x6b07,
-  /* 2nd byte: 97 */ 0x6b09,
-  /* 2nd byte: 98 */ 0x6b0f,
-  /* 2nd byte: 99 */ 0x6b10,
-  /* 2nd byte: 100 */ 0x6b11,
-  /* 2nd byte: 101 */ 0x6b17,
-  /* 2nd byte: 102 */ 0x6b1b,
-  /* 2nd byte: 103 */ 0x6b1e,
-  /* 2nd byte: 104 */ 0x6b24,
-  /* 2nd byte: 105 */ 0x6b28,
-  /* 2nd byte: 106 */ 0x6b2b,
-  /* 2nd byte: 107 */ 0x6b2c,
-  /* 2nd byte: 108 */ 0x6b2f,
-  /* 2nd byte: 109 */ 0x6b35,
-  /* 2nd byte: 110 */ 0x6b36,
-  /* 2nd byte: 111 */ 0x6b3b,
-  /* 2nd byte: 112 */ 0x6b3f,
-  /* 2nd byte: 113 */ 0x6b46,
-  /* 2nd byte: 114 */ 0x6b4a,
-  /* 2nd byte: 115 */ 0x6b4d,
-  /* 2nd byte: 116 */ 0x6b52,
-  /* 2nd byte: 117 */ 0x6b56,
-  /* 2nd byte: 118 */ 0x6b58,
-  /* 2nd byte: 119 */ 0x6b5d,
-  /* 2nd byte: 120 */ 0x6b60,
-  /* 2nd byte: 121 */ 0x6b67,
-  /* 2nd byte: 122 */ 0x6b6b,
-  /* 2nd byte: 123 */ 0x6b6e,
-  /* 2nd byte: 124 */ 0x6b70,
-  /* 2nd byte: 125 */ 0x6b75,
-  /* 2nd byte: 126 */ 0x6b7d},
-/* 1st byte: 70 */ { 
-  /* 2nd byte: 33 */ 0x6b7e,
-  /* 2nd byte: 34 */ 0x6b82,
-  /* 2nd byte: 35 */ 0x6b85,
-  /* 2nd byte: 36 */ 0x6b97,
-  /* 2nd byte: 37 */ 0x6b9b,
-  /* 2nd byte: 38 */ 0x6b9f,
-  /* 2nd byte: 39 */ 0x6ba0,
-  /* 2nd byte: 40 */ 0x6ba2,
-  /* 2nd byte: 41 */ 0x6ba3,
-  /* 2nd byte: 42 */ 0x6ba8,
-  /* 2nd byte: 43 */ 0x6ba9,
-  /* 2nd byte: 44 */ 0x6bac,
-  /* 2nd byte: 45 */ 0x6bad,
-  /* 2nd byte: 46 */ 0x6bae,
-  /* 2nd byte: 47 */ 0x6bb0,
-  /* 2nd byte: 48 */ 0x6bb8,
-  /* 2nd byte: 49 */ 0x6bb9,
-  /* 2nd byte: 50 */ 0x6bbd,
-  /* 2nd byte: 51 */ 0x6bbe,
-  /* 2nd byte: 52 */ 0x6bc3,
-  /* 2nd byte: 53 */ 0x6bc4,
-  /* 2nd byte: 54 */ 0x6bc9,
-  /* 2nd byte: 55 */ 0x6bcc,
-  /* 2nd byte: 56 */ 0x6bd6,
-  /* 2nd byte: 57 */ 0x6bda,
-  /* 2nd byte: 58 */ 0x6be1,
-  /* 2nd byte: 59 */ 0x6be3,
-  /* 2nd byte: 60 */ 0x6be6,
-  /* 2nd byte: 61 */ 0x6be7,
-  /* 2nd byte: 62 */ 0x6bee,
-  /* 2nd byte: 63 */ 0x6bf1,
-  /* 2nd byte: 64 */ 0x6bf7,
-  /* 2nd byte: 65 */ 0x6bf9,
-  /* 2nd byte: 66 */ 0x6bff,
-  /* 2nd byte: 67 */ 0x6c02,
-  /* 2nd byte: 68 */ 0x6c04,
-  /* 2nd byte: 69 */ 0x6c05,
-  /* 2nd byte: 70 */ 0x6c09,
-  /* 2nd byte: 71 */ 0x6c0d,
-  /* 2nd byte: 72 */ 0x6c0e,
-  /* 2nd byte: 73 */ 0x6c10,
-  /* 2nd byte: 74 */ 0x6c12,
-  /* 2nd byte: 75 */ 0x6c19,
-  /* 2nd byte: 76 */ 0x6c1f,
-  /* 2nd byte: 77 */ 0x6c26,
-  /* 2nd byte: 78 */ 0x6c27,
-  /* 2nd byte: 79 */ 0x6c28,
-  /* 2nd byte: 80 */ 0x6c2c,
-  /* 2nd byte: 81 */ 0x6c2e,
-  /* 2nd byte: 82 */ 0x6c33,
-  /* 2nd byte: 83 */ 0x6c35,
-  /* 2nd byte: 84 */ 0x6c36,
-  /* 2nd byte: 85 */ 0x6c3a,
-  /* 2nd byte: 86 */ 0x6c3b,
-  /* 2nd byte: 87 */ 0x6c3f,
-  /* 2nd byte: 88 */ 0x6c4a,
-  /* 2nd byte: 89 */ 0x6c4b,
-  /* 2nd byte: 90 */ 0x6c4d,
-  /* 2nd byte: 91 */ 0x6c4f,
-  /* 2nd byte: 92 */ 0x6c52,
-  /* 2nd byte: 93 */ 0x6c54,
-  /* 2nd byte: 94 */ 0x6c59,
-  /* 2nd byte: 95 */ 0x6c5b,
-  /* 2nd byte: 96 */ 0x6c5c,
-  /* 2nd byte: 97 */ 0x6c6b,
-  /* 2nd byte: 98 */ 0x6c6d,
-  /* 2nd byte: 99 */ 0x6c6f,
-  /* 2nd byte: 100 */ 0x6c74,
-  /* 2nd byte: 101 */ 0x6c76,
-  /* 2nd byte: 102 */ 0x6c78,
-  /* 2nd byte: 103 */ 0x6c79,
-  /* 2nd byte: 104 */ 0x6c7b,
-  /* 2nd byte: 105 */ 0x6c85,
-  /* 2nd byte: 106 */ 0x6c86,
-  /* 2nd byte: 107 */ 0x6c87,
-  /* 2nd byte: 108 */ 0x6c89,
-  /* 2nd byte: 109 */ 0x6c94,
-  /* 2nd byte: 110 */ 0x6c95,
-  /* 2nd byte: 111 */ 0x6c97,
-  /* 2nd byte: 112 */ 0x6c98,
-  /* 2nd byte: 113 */ 0x6c9c,
-  /* 2nd byte: 114 */ 0x6c9f,
-  /* 2nd byte: 115 */ 0x6cb0,
-  /* 2nd byte: 116 */ 0x6cb2,
-  /* 2nd byte: 117 */ 0x6cb4,
-  /* 2nd byte: 118 */ 0x6cc2,
-  /* 2nd byte: 119 */ 0x6cc6,
-  /* 2nd byte: 120 */ 0x6ccd,
-  /* 2nd byte: 121 */ 0x6ccf,
-  /* 2nd byte: 122 */ 0x6cd0,
-  /* 2nd byte: 123 */ 0x6cd1,
-  /* 2nd byte: 124 */ 0x6cd2,
-  /* 2nd byte: 125 */ 0x6cd4,
-  /* 2nd byte: 126 */ 0x6cd6},
-/* 1st byte: 71 */ { 
-  /* 2nd byte: 33 */ 0x6cda,
-  /* 2nd byte: 34 */ 0x6cdc,
-  /* 2nd byte: 35 */ 0x6ce0,
-  /* 2nd byte: 36 */ 0x6ce7,
-  /* 2nd byte: 37 */ 0x6ce9,
-  /* 2nd byte: 38 */ 0x6ceb,
-  /* 2nd byte: 39 */ 0x6cec,
-  /* 2nd byte: 40 */ 0x6cee,
-  /* 2nd byte: 41 */ 0x6cf2,
-  /* 2nd byte: 42 */ 0x6cf4,
-  /* 2nd byte: 43 */ 0x6d04,
-  /* 2nd byte: 44 */ 0x6d07,
-  /* 2nd byte: 45 */ 0x6d0a,
-  /* 2nd byte: 46 */ 0x6d0e,
-  /* 2nd byte: 47 */ 0x6d0f,
-  /* 2nd byte: 48 */ 0x6d11,
-  /* 2nd byte: 49 */ 0x6d13,
-  /* 2nd byte: 50 */ 0x6d1a,
-  /* 2nd byte: 51 */ 0x6d26,
-  /* 2nd byte: 52 */ 0x6d27,
-  /* 2nd byte: 53 */ 0x6d28,
-  /* 2nd byte: 54 */ 0x6c67,
-  /* 2nd byte: 55 */ 0x6d2e,
-  /* 2nd byte: 56 */ 0x6d2f,
-  /* 2nd byte: 57 */ 0x6d31,
-  /* 2nd byte: 58 */ 0x6d39,
-  /* 2nd byte: 59 */ 0x6d3c,
-  /* 2nd byte: 60 */ 0x6d3f,
-  /* 2nd byte: 61 */ 0x6d57,
-  /* 2nd byte: 62 */ 0x6d5e,
-  /* 2nd byte: 63 */ 0x6d5f,
-  /* 2nd byte: 64 */ 0x6d61,
-  /* 2nd byte: 65 */ 0x6d65,
-  /* 2nd byte: 66 */ 0x6d67,
-  /* 2nd byte: 67 */ 0x6d6f,
-  /* 2nd byte: 68 */ 0x6d70,
-  /* 2nd byte: 69 */ 0x6d7c,
-  /* 2nd byte: 70 */ 0x6d82,
-  /* 2nd byte: 71 */ 0x6d87,
-  /* 2nd byte: 72 */ 0x6d91,
-  /* 2nd byte: 73 */ 0x6d92,
-  /* 2nd byte: 74 */ 0x6d94,
-  /* 2nd byte: 75 */ 0x6d96,
-  /* 2nd byte: 76 */ 0x6d97,
-  /* 2nd byte: 77 */ 0x6d98,
-  /* 2nd byte: 78 */ 0x6daa,
-  /* 2nd byte: 79 */ 0x6dac,
-  /* 2nd byte: 80 */ 0x6db4,
-  /* 2nd byte: 81 */ 0x6db7,
-  /* 2nd byte: 82 */ 0x6db9,
-  /* 2nd byte: 83 */ 0x6dbd,
-  /* 2nd byte: 84 */ 0x6dbf,
-  /* 2nd byte: 85 */ 0x6dc4,
-  /* 2nd byte: 86 */ 0x6dc8,
-  /* 2nd byte: 87 */ 0x6dca,
-  /* 2nd byte: 88 */ 0x6dce,
-  /* 2nd byte: 89 */ 0x6dcf,
-  /* 2nd byte: 90 */ 0x6dd6,
-  /* 2nd byte: 91 */ 0x6ddb,
-  /* 2nd byte: 92 */ 0x6ddd,
-  /* 2nd byte: 93 */ 0x6ddf,
-  /* 2nd byte: 94 */ 0x6de0,
-  /* 2nd byte: 95 */ 0x6de2,
-  /* 2nd byte: 96 */ 0x6de5,
-  /* 2nd byte: 97 */ 0x6de9,
-  /* 2nd byte: 98 */ 0x6def,
-  /* 2nd byte: 99 */ 0x6df0,
-  /* 2nd byte: 100 */ 0x6df4,
-  /* 2nd byte: 101 */ 0x6df6,
-  /* 2nd byte: 102 */ 0x6dfc,
-  /* 2nd byte: 103 */ 0x6e00,
-  /* 2nd byte: 104 */ 0x6e04,
-  /* 2nd byte: 105 */ 0x6e1e,
-  /* 2nd byte: 106 */ 0x6e22,
-  /* 2nd byte: 107 */ 0x6e27,
-  /* 2nd byte: 108 */ 0x6e32,
-  /* 2nd byte: 109 */ 0x6e36,
-  /* 2nd byte: 110 */ 0x6e39,
-  /* 2nd byte: 111 */ 0x6e3b,
-  /* 2nd byte: 112 */ 0x6e3c,
-  /* 2nd byte: 113 */ 0x6e44,
-  /* 2nd byte: 114 */ 0x6e45,
-  /* 2nd byte: 115 */ 0x6e48,
-  /* 2nd byte: 116 */ 0x6e49,
-  /* 2nd byte: 117 */ 0x6e4b,
-  /* 2nd byte: 118 */ 0x6e4f,
-  /* 2nd byte: 119 */ 0x6e51,
-  /* 2nd byte: 120 */ 0x6e52,
-  /* 2nd byte: 121 */ 0x6e53,
-  /* 2nd byte: 122 */ 0x6e54,
-  /* 2nd byte: 123 */ 0x6e57,
-  /* 2nd byte: 124 */ 0x6e5c,
-  /* 2nd byte: 125 */ 0x6e5d,
-  /* 2nd byte: 126 */ 0x6e5e},
-/* 1st byte: 72 */ { 
-  /* 2nd byte: 33 */ 0x6e62,
-  /* 2nd byte: 34 */ 0x6e63,
-  /* 2nd byte: 35 */ 0x6e68,
-  /* 2nd byte: 36 */ 0x6e73,
-  /* 2nd byte: 37 */ 0x6e7b,
-  /* 2nd byte: 38 */ 0x6e7d,
-  /* 2nd byte: 39 */ 0x6e8d,
-  /* 2nd byte: 40 */ 0x6e93,
-  /* 2nd byte: 41 */ 0x6e99,
-  /* 2nd byte: 42 */ 0x6ea0,
-  /* 2nd byte: 43 */ 0x6ea7,
-  /* 2nd byte: 44 */ 0x6ead,
-  /* 2nd byte: 45 */ 0x6eae,
-  /* 2nd byte: 46 */ 0x6eb1,
-  /* 2nd byte: 47 */ 0x6eb3,
-  /* 2nd byte: 48 */ 0x6ebb,
-  /* 2nd byte: 49 */ 0x6ebf,
-  /* 2nd byte: 50 */ 0x6ec0,
-  /* 2nd byte: 51 */ 0x6ec1,
-  /* 2nd byte: 52 */ 0x6ec3,
-  /* 2nd byte: 53 */ 0x6ec7,
-  /* 2nd byte: 54 */ 0x6ec8,
-  /* 2nd byte: 55 */ 0x6eca,
-  /* 2nd byte: 56 */ 0x6ecd,
-  /* 2nd byte: 57 */ 0x6ece,
-  /* 2nd byte: 58 */ 0x6ecf,
-  /* 2nd byte: 59 */ 0x6eeb,
-  /* 2nd byte: 60 */ 0x6eed,
-  /* 2nd byte: 61 */ 0x6eee,
-  /* 2nd byte: 62 */ 0x6ef9,
-  /* 2nd byte: 63 */ 0x6efb,
-  /* 2nd byte: 64 */ 0x6efd,
-  /* 2nd byte: 65 */ 0x6f04,
-  /* 2nd byte: 66 */ 0x6f08,
-  /* 2nd byte: 67 */ 0x6f0a,
-  /* 2nd byte: 68 */ 0x6f0c,
-  /* 2nd byte: 69 */ 0x6f0d,
-  /* 2nd byte: 70 */ 0x6f16,
-  /* 2nd byte: 71 */ 0x6f18,
-  /* 2nd byte: 72 */ 0x6f1a,
-  /* 2nd byte: 73 */ 0x6f1b,
-  /* 2nd byte: 74 */ 0x6f26,
-  /* 2nd byte: 75 */ 0x6f29,
-  /* 2nd byte: 76 */ 0x6f2a,
-  /* 2nd byte: 77 */ 0x6f2f,
-  /* 2nd byte: 78 */ 0x6f30,
-  /* 2nd byte: 79 */ 0x6f33,
-  /* 2nd byte: 80 */ 0x6f36,
-  /* 2nd byte: 81 */ 0x6f3b,
-  /* 2nd byte: 82 */ 0x6f3c,
-  /* 2nd byte: 83 */ 0x6f2d,
-  /* 2nd byte: 84 */ 0x6f4f,
-  /* 2nd byte: 85 */ 0x6f51,
-  /* 2nd byte: 86 */ 0x6f52,
-  /* 2nd byte: 87 */ 0x6f53,
-  /* 2nd byte: 88 */ 0x6f57,
-  /* 2nd byte: 89 */ 0x6f59,
-  /* 2nd byte: 90 */ 0x6f5a,
-  /* 2nd byte: 91 */ 0x6f5d,
-  /* 2nd byte: 92 */ 0x6f5e,
-  /* 2nd byte: 93 */ 0x6f61,
-  /* 2nd byte: 94 */ 0x6f62,
-  /* 2nd byte: 95 */ 0x6f68,
-  /* 2nd byte: 96 */ 0x6f6c,
-  /* 2nd byte: 97 */ 0x6f7d,
-  /* 2nd byte: 98 */ 0x6f7e,
-  /* 2nd byte: 99 */ 0x6f83,
-  /* 2nd byte: 100 */ 0x6f87,
-  /* 2nd byte: 101 */ 0x6f88,
-  /* 2nd byte: 102 */ 0x6f8b,
-  /* 2nd byte: 103 */ 0x6f8c,
-  /* 2nd byte: 104 */ 0x6f8d,
-  /* 2nd byte: 105 */ 0x6f90,
-  /* 2nd byte: 106 */ 0x6f92,
-  /* 2nd byte: 107 */ 0x6f93,
-  /* 2nd byte: 108 */ 0x6f94,
-  /* 2nd byte: 109 */ 0x6f96,
-  /* 2nd byte: 110 */ 0x6f9a,
-  /* 2nd byte: 111 */ 0x6f9f,
-  /* 2nd byte: 112 */ 0x6fa0,
-  /* 2nd byte: 113 */ 0x6fa5,
-  /* 2nd byte: 114 */ 0x6fa6,
-  /* 2nd byte: 115 */ 0x6fa7,
-  /* 2nd byte: 116 */ 0x6fa8,
-  /* 2nd byte: 117 */ 0x6fae,
-  /* 2nd byte: 118 */ 0x6faf,
-  /* 2nd byte: 119 */ 0x6fb0,
-  /* 2nd byte: 120 */ 0x6fb5,
-  /* 2nd byte: 121 */ 0x6fb6,
-  /* 2nd byte: 122 */ 0x6fbc,
-  /* 2nd byte: 123 */ 0x6fc5,
-  /* 2nd byte: 124 */ 0x6fc7,
-  /* 2nd byte: 125 */ 0x6fc8,
-  /* 2nd byte: 126 */ 0x6fca},
-/* 1st byte: 73 */ { 
-  /* 2nd byte: 33 */ 0x6fda,
-  /* 2nd byte: 34 */ 0x6fde,
-  /* 2nd byte: 35 */ 0x6fe8,
-  /* 2nd byte: 36 */ 0x6fe9,
-  /* 2nd byte: 37 */ 0x6ff0,
-  /* 2nd byte: 38 */ 0x6ff5,
-  /* 2nd byte: 39 */ 0x6ff9,
-  /* 2nd byte: 40 */ 0x6ffc,
-  /* 2nd byte: 41 */ 0x6ffd,
-  /* 2nd byte: 42 */ 0x7000,
-  /* 2nd byte: 43 */ 0x7005,
-  /* 2nd byte: 44 */ 0x7006,
-  /* 2nd byte: 45 */ 0x7007,
-  /* 2nd byte: 46 */ 0x700d,
-  /* 2nd byte: 47 */ 0x7017,
-  /* 2nd byte: 48 */ 0x7020,
-  /* 2nd byte: 49 */ 0x7023,
-  /* 2nd byte: 50 */ 0x702f,
-  /* 2nd byte: 51 */ 0x7034,
-  /* 2nd byte: 52 */ 0x7037,
-  /* 2nd byte: 53 */ 0x7039,
-  /* 2nd byte: 54 */ 0x703c,
-  /* 2nd byte: 55 */ 0x7043,
-  /* 2nd byte: 56 */ 0x7044,
-  /* 2nd byte: 57 */ 0x7048,
-  /* 2nd byte: 58 */ 0x7049,
-  /* 2nd byte: 59 */ 0x704a,
-  /* 2nd byte: 60 */ 0x704b,
-  /* 2nd byte: 61 */ 0x7054,
-  /* 2nd byte: 62 */ 0x7055,
-  /* 2nd byte: 63 */ 0x705d,
-  /* 2nd byte: 64 */ 0x705e,
-  /* 2nd byte: 65 */ 0x704e,
-  /* 2nd byte: 66 */ 0x7064,
-  /* 2nd byte: 67 */ 0x7065,
-  /* 2nd byte: 68 */ 0x706c,
-  /* 2nd byte: 69 */ 0x706e,
-  /* 2nd byte: 70 */ 0x7075,
-  /* 2nd byte: 71 */ 0x7076,
-  /* 2nd byte: 72 */ 0x707e,
-  /* 2nd byte: 73 */ 0x7081,
-  /* 2nd byte: 74 */ 0x7085,
-  /* 2nd byte: 75 */ 0x7086,
-  /* 2nd byte: 76 */ 0x7094,
-  /* 2nd byte: 77 */ 0x7095,
-  /* 2nd byte: 78 */ 0x7096,
-  /* 2nd byte: 79 */ 0x7097,
-  /* 2nd byte: 80 */ 0x7098,
-  /* 2nd byte: 81 */ 0x709b,
-  /* 2nd byte: 82 */ 0x70a4,
-  /* 2nd byte: 83 */ 0x70ab,
-  /* 2nd byte: 84 */ 0x70b0,
-  /* 2nd byte: 85 */ 0x70b1,
-  /* 2nd byte: 86 */ 0x70b4,
-  /* 2nd byte: 87 */ 0x70b7,
-  /* 2nd byte: 88 */ 0x70ca,
-  /* 2nd byte: 89 */ 0x70d1,
-  /* 2nd byte: 90 */ 0x70d3,
-  /* 2nd byte: 91 */ 0x70d4,
-  /* 2nd byte: 92 */ 0x70d5,
-  /* 2nd byte: 93 */ 0x70d6,
-  /* 2nd byte: 94 */ 0x70d8,
-  /* 2nd byte: 95 */ 0x70dc,
-  /* 2nd byte: 96 */ 0x70e4,
-  /* 2nd byte: 97 */ 0x70fa,
-  /* 2nd byte: 98 */ 0x7103,
-  /* 2nd byte: 99 */ 0x7104,
-  /* 2nd byte: 100 */ 0x7105,
-  /* 2nd byte: 101 */ 0x7106,
-  /* 2nd byte: 102 */ 0x7107,
-  /* 2nd byte: 103 */ 0x710b,
-  /* 2nd byte: 104 */ 0x710c,
-  /* 2nd byte: 105 */ 0x710f,
-  /* 2nd byte: 106 */ 0x711e,
-  /* 2nd byte: 107 */ 0x7120,
-  /* 2nd byte: 108 */ 0x712b,
-  /* 2nd byte: 109 */ 0x712d,
-  /* 2nd byte: 110 */ 0x712f,
-  /* 2nd byte: 111 */ 0x7130,
-  /* 2nd byte: 112 */ 0x7131,
-  /* 2nd byte: 113 */ 0x7138,
-  /* 2nd byte: 114 */ 0x7141,
-  /* 2nd byte: 115 */ 0x7145,
-  /* 2nd byte: 116 */ 0x7146,
-  /* 2nd byte: 117 */ 0x7147,
-  /* 2nd byte: 118 */ 0x714a,
-  /* 2nd byte: 119 */ 0x714b,
-  /* 2nd byte: 120 */ 0x7150,
-  /* 2nd byte: 121 */ 0x7152,
-  /* 2nd byte: 122 */ 0x7157,
-  /* 2nd byte: 123 */ 0x715a,
-  /* 2nd byte: 124 */ 0x715c,
-  /* 2nd byte: 125 */ 0x715e,
-  /* 2nd byte: 126 */ 0x7160},
-/* 1st byte: 74 */ { 
-  /* 2nd byte: 33 */ 0x7168,
-  /* 2nd byte: 34 */ 0x7179,
-  /* 2nd byte: 35 */ 0x7180,
-  /* 2nd byte: 36 */ 0x7185,
-  /* 2nd byte: 37 */ 0x7187,
-  /* 2nd byte: 38 */ 0x718c,
-  /* 2nd byte: 39 */ 0x7192,
-  /* 2nd byte: 40 */ 0x719a,
-  /* 2nd byte: 41 */ 0x719b,
-  /* 2nd byte: 42 */ 0x71a0,
-  /* 2nd byte: 43 */ 0x71a2,
-  /* 2nd byte: 44 */ 0x71af,
-  /* 2nd byte: 45 */ 0x71b0,
-  /* 2nd byte: 46 */ 0x71b2,
-  /* 2nd byte: 47 */ 0x71b3,
-  /* 2nd byte: 48 */ 0x71ba,
-  /* 2nd byte: 49 */ 0x71bf,
-  /* 2nd byte: 50 */ 0x71c0,
-  /* 2nd byte: 51 */ 0x71c1,
-  /* 2nd byte: 52 */ 0x71c4,
-  /* 2nd byte: 53 */ 0x71cb,
-  /* 2nd byte: 54 */ 0x71cc,
-  /* 2nd byte: 55 */ 0x71d3,
-  /* 2nd byte: 56 */ 0x71d6,
-  /* 2nd byte: 57 */ 0x71d9,
-  /* 2nd byte: 58 */ 0x71da,
-  /* 2nd byte: 59 */ 0x71dc,
-  /* 2nd byte: 60 */ 0x71f8,
-  /* 2nd byte: 61 */ 0x71fe,
-  /* 2nd byte: 62 */ 0x7200,
-  /* 2nd byte: 63 */ 0x7207,
-  /* 2nd byte: 64 */ 0x7208,
-  /* 2nd byte: 65 */ 0x7209,
-  /* 2nd byte: 66 */ 0x7213,
-  /* 2nd byte: 67 */ 0x7217,
-  /* 2nd byte: 68 */ 0x721a,
-  /* 2nd byte: 69 */ 0x721d,
-  /* 2nd byte: 70 */ 0x721f,
-  /* 2nd byte: 71 */ 0x7224,
-  /* 2nd byte: 72 */ 0x722b,
-  /* 2nd byte: 73 */ 0x722f,
-  /* 2nd byte: 74 */ 0x7234,
-  /* 2nd byte: 75 */ 0x7238,
-  /* 2nd byte: 76 */ 0x7239,
-  /* 2nd byte: 77 */ 0x7241,
-  /* 2nd byte: 78 */ 0x7242,
-  /* 2nd byte: 79 */ 0x7243,
-  /* 2nd byte: 80 */ 0x7245,
-  /* 2nd byte: 81 */ 0x724e,
-  /* 2nd byte: 82 */ 0x724f,
-  /* 2nd byte: 83 */ 0x7250,
-  /* 2nd byte: 84 */ 0x7253,
-  /* 2nd byte: 85 */ 0x7255,
-  /* 2nd byte: 86 */ 0x7256,
-  /* 2nd byte: 87 */ 0x725a,
-  /* 2nd byte: 88 */ 0x725c,
-  /* 2nd byte: 89 */ 0x725e,
-  /* 2nd byte: 90 */ 0x7260,
-  /* 2nd byte: 91 */ 0x7263,
-  /* 2nd byte: 92 */ 0x7268,
-  /* 2nd byte: 93 */ 0x726b,
-  /* 2nd byte: 94 */ 0x726e,
-  /* 2nd byte: 95 */ 0x726f,
-  /* 2nd byte: 96 */ 0x7271,
-  /* 2nd byte: 97 */ 0x7277,
-  /* 2nd byte: 98 */ 0x7278,
-  /* 2nd byte: 99 */ 0x727b,
-  /* 2nd byte: 100 */ 0x727c,
-  /* 2nd byte: 101 */ 0x727f,
-  /* 2nd byte: 102 */ 0x7284,
-  /* 2nd byte: 103 */ 0x7289,
-  /* 2nd byte: 104 */ 0x728d,
-  /* 2nd byte: 105 */ 0x728e,
-  /* 2nd byte: 106 */ 0x7293,
-  /* 2nd byte: 107 */ 0x729b,
-  /* 2nd byte: 108 */ 0x72a8,
-  /* 2nd byte: 109 */ 0x72ad,
-  /* 2nd byte: 110 */ 0x72ae,
-  /* 2nd byte: 111 */ 0x72b1,
-  /* 2nd byte: 112 */ 0x72b4,
-  /* 2nd byte: 113 */ 0x72be,
-  /* 2nd byte: 114 */ 0x72c1,
-  /* 2nd byte: 115 */ 0x72c7,
-  /* 2nd byte: 116 */ 0x72c9,
-  /* 2nd byte: 117 */ 0x72cc,
-  /* 2nd byte: 118 */ 0x72d5,
-  /* 2nd byte: 119 */ 0x72d6,
-  /* 2nd byte: 120 */ 0x72d8,
-  /* 2nd byte: 121 */ 0x72df,
-  /* 2nd byte: 122 */ 0x72e5,
-  /* 2nd byte: 123 */ 0x72f3,
-  /* 2nd byte: 124 */ 0x72f4,
-  /* 2nd byte: 125 */ 0x72fa,
-  /* 2nd byte: 126 */ 0x72fb},
-/* 1st byte: 75 */ { 
-  /* 2nd byte: 33 */ 0x72fe,
-  /* 2nd byte: 34 */ 0x7302,
-  /* 2nd byte: 35 */ 0x7304,
-  /* 2nd byte: 36 */ 0x7305,
-  /* 2nd byte: 37 */ 0x7307,
-  /* 2nd byte: 38 */ 0x730b,
-  /* 2nd byte: 39 */ 0x730d,
-  /* 2nd byte: 40 */ 0x7312,
-  /* 2nd byte: 41 */ 0x7313,
-  /* 2nd byte: 42 */ 0x7318,
-  /* 2nd byte: 43 */ 0x7319,
-  /* 2nd byte: 44 */ 0x731e,
-  /* 2nd byte: 45 */ 0x7322,
-  /* 2nd byte: 46 */ 0x7324,
-  /* 2nd byte: 47 */ 0x7327,
-  /* 2nd byte: 48 */ 0x7328,
-  /* 2nd byte: 49 */ 0x732c,
-  /* 2nd byte: 50 */ 0x7331,
-  /* 2nd byte: 51 */ 0x7332,
-  /* 2nd byte: 52 */ 0x7335,
-  /* 2nd byte: 53 */ 0x733a,
-  /* 2nd byte: 54 */ 0x733b,
-  /* 2nd byte: 55 */ 0x733d,
-  /* 2nd byte: 56 */ 0x7343,
-  /* 2nd byte: 57 */ 0x734d,
-  /* 2nd byte: 58 */ 0x7350,
-  /* 2nd byte: 59 */ 0x7352,
-  /* 2nd byte: 60 */ 0x7356,
-  /* 2nd byte: 61 */ 0x7358,
-  /* 2nd byte: 62 */ 0x735d,
-  /* 2nd byte: 63 */ 0x735e,
-  /* 2nd byte: 64 */ 0x735f,
-  /* 2nd byte: 65 */ 0x7360,
-  /* 2nd byte: 66 */ 0x7366,
-  /* 2nd byte: 67 */ 0x7367,
-  /* 2nd byte: 68 */ 0x7369,
-  /* 2nd byte: 69 */ 0x736b,
-  /* 2nd byte: 70 */ 0x736c,
-  /* 2nd byte: 71 */ 0x736e,
-  /* 2nd byte: 72 */ 0x736f,
-  /* 2nd byte: 73 */ 0x7371,
-  /* 2nd byte: 74 */ 0x7377,
-  /* 2nd byte: 75 */ 0x7379,
-  /* 2nd byte: 76 */ 0x737c,
-  /* 2nd byte: 77 */ 0x7380,
-  /* 2nd byte: 78 */ 0x7381,
-  /* 2nd byte: 79 */ 0x7383,
-  /* 2nd byte: 80 */ 0x7385,
-  /* 2nd byte: 81 */ 0x7386,
-  /* 2nd byte: 82 */ 0x738e,
-  /* 2nd byte: 83 */ 0x7390,
-  /* 2nd byte: 84 */ 0x7393,
-  /* 2nd byte: 85 */ 0x7395,
-  /* 2nd byte: 86 */ 0x7397,
-  /* 2nd byte: 87 */ 0x7398,
-  /* 2nd byte: 88 */ 0x739c,
-  /* 2nd byte: 89 */ 0x739e,
-  /* 2nd byte: 90 */ 0x739f,
-  /* 2nd byte: 91 */ 0x73a0,
-  /* 2nd byte: 92 */ 0x73a2,
-  /* 2nd byte: 93 */ 0x73a5,
-  /* 2nd byte: 94 */ 0x73a6,
-  /* 2nd byte: 95 */ 0x73aa,
-  /* 2nd byte: 96 */ 0x73ab,
-  /* 2nd byte: 97 */ 0x73ad,
-  /* 2nd byte: 98 */ 0x73b5,
-  /* 2nd byte: 99 */ 0x73b7,
-  /* 2nd byte: 100 */ 0x73b9,
-  /* 2nd byte: 101 */ 0x73bc,
-  /* 2nd byte: 102 */ 0x73bd,
-  /* 2nd byte: 103 */ 0x73bf,
-  /* 2nd byte: 104 */ 0x73c5,
-  /* 2nd byte: 105 */ 0x73c6,
-  /* 2nd byte: 106 */ 0x73c9,
-  /* 2nd byte: 107 */ 0x73cb,
-  /* 2nd byte: 108 */ 0x73cc,
-  /* 2nd byte: 109 */ 0x73cf,
-  /* 2nd byte: 110 */ 0x73d2,
-  /* 2nd byte: 111 */ 0x73d3,
-  /* 2nd byte: 112 */ 0x73d6,
-  /* 2nd byte: 113 */ 0x73d9,
-  /* 2nd byte: 114 */ 0x73dd,
-  /* 2nd byte: 115 */ 0x73e1,
-  /* 2nd byte: 116 */ 0x73e3,
-  /* 2nd byte: 117 */ 0x73e6,
-  /* 2nd byte: 118 */ 0x73e7,
-  /* 2nd byte: 119 */ 0x73e9,
-  /* 2nd byte: 120 */ 0x73f4,
-  /* 2nd byte: 121 */ 0x73f5,
-  /* 2nd byte: 122 */ 0x73f7,
-  /* 2nd byte: 123 */ 0x73f9,
-  /* 2nd byte: 124 */ 0x73fa,
-  /* 2nd byte: 125 */ 0x73fb,
-  /* 2nd byte: 126 */ 0x73fd},
-/* 1st byte: 76 */ { 
-  /* 2nd byte: 33 */ 0x73ff,
-  /* 2nd byte: 34 */ 0x7400,
-  /* 2nd byte: 35 */ 0x7401,
-  /* 2nd byte: 36 */ 0x7404,
-  /* 2nd byte: 37 */ 0x7407,
-  /* 2nd byte: 38 */ 0x740a,
-  /* 2nd byte: 39 */ 0x7411,
-  /* 2nd byte: 40 */ 0x741a,
-  /* 2nd byte: 41 */ 0x741b,
-  /* 2nd byte: 42 */ 0x7424,
-  /* 2nd byte: 43 */ 0x7426,
-  /* 2nd byte: 44 */ 0x7428,
-  /* 2nd byte: 45 */ 0x7429,
-  /* 2nd byte: 46 */ 0x742a,
-  /* 2nd byte: 47 */ 0x742b,
-  /* 2nd byte: 48 */ 0x742c,
-  /* 2nd byte: 49 */ 0x742d,
-  /* 2nd byte: 50 */ 0x742e,
-  /* 2nd byte: 51 */ 0x742f,
-  /* 2nd byte: 52 */ 0x7430,
-  /* 2nd byte: 53 */ 0x7431,
-  /* 2nd byte: 54 */ 0x7439,
-  /* 2nd byte: 55 */ 0x7440,
-  /* 2nd byte: 56 */ 0x7443,
-  /* 2nd byte: 57 */ 0x7444,
-  /* 2nd byte: 58 */ 0x7446,
-  /* 2nd byte: 59 */ 0x7447,
-  /* 2nd byte: 60 */ 0x744b,
-  /* 2nd byte: 61 */ 0x744d,
-  /* 2nd byte: 62 */ 0x7451,
-  /* 2nd byte: 63 */ 0x7452,
-  /* 2nd byte: 64 */ 0x7457,
-  /* 2nd byte: 65 */ 0x745d,
-  /* 2nd byte: 66 */ 0x7462,
-  /* 2nd byte: 67 */ 0x7466,
-  /* 2nd byte: 68 */ 0x7467,
-  /* 2nd byte: 69 */ 0x7468,
-  /* 2nd byte: 70 */ 0x746b,
-  /* 2nd byte: 71 */ 0x746d,
-  /* 2nd byte: 72 */ 0x746e,
-  /* 2nd byte: 73 */ 0x7471,
-  /* 2nd byte: 74 */ 0x7472,
-  /* 2nd byte: 75 */ 0x7480,
-  /* 2nd byte: 76 */ 0x7481,
-  /* 2nd byte: 77 */ 0x7485,
-  /* 2nd byte: 78 */ 0x7486,
-  /* 2nd byte: 79 */ 0x7487,
-  /* 2nd byte: 80 */ 0x7489,
-  /* 2nd byte: 81 */ 0x748f,
-  /* 2nd byte: 82 */ 0x7490,
-  /* 2nd byte: 83 */ 0x7491,
-  /* 2nd byte: 84 */ 0x7492,
-  /* 2nd byte: 85 */ 0x7498,
-  /* 2nd byte: 86 */ 0x7499,
-  /* 2nd byte: 87 */ 0x749a,
-  /* 2nd byte: 88 */ 0x749c,
-  /* 2nd byte: 89 */ 0x749f,
-  /* 2nd byte: 90 */ 0x74a0,
-  /* 2nd byte: 91 */ 0x74a1,
-  /* 2nd byte: 92 */ 0x74a3,
-  /* 2nd byte: 93 */ 0x74a6,
-  /* 2nd byte: 94 */ 0x74a8,
-  /* 2nd byte: 95 */ 0x74a9,
-  /* 2nd byte: 96 */ 0x74aa,
-  /* 2nd byte: 97 */ 0x74ab,
-  /* 2nd byte: 98 */ 0x74ae,
-  /* 2nd byte: 99 */ 0x74af,
-  /* 2nd byte: 100 */ 0x74b1,
-  /* 2nd byte: 101 */ 0x74b2,
-  /* 2nd byte: 102 */ 0x74b5,
-  /* 2nd byte: 103 */ 0x74b9,
-  /* 2nd byte: 104 */ 0x74bb,
-  /* 2nd byte: 105 */ 0x74bf,
-  /* 2nd byte: 106 */ 0x74c8,
-  /* 2nd byte: 107 */ 0x74c9,
-  /* 2nd byte: 108 */ 0x74cc,
-  /* 2nd byte: 109 */ 0x74d0,
-  /* 2nd byte: 110 */ 0x74d3,
-  /* 2nd byte: 111 */ 0x74d8,
-  /* 2nd byte: 112 */ 0x74da,
-  /* 2nd byte: 113 */ 0x74db,
-  /* 2nd byte: 114 */ 0x74de,
-  /* 2nd byte: 115 */ 0x74df,
-  /* 2nd byte: 116 */ 0x74e4,
-  /* 2nd byte: 117 */ 0x74e8,
-  /* 2nd byte: 118 */ 0x74ea,
-  /* 2nd byte: 119 */ 0x74eb,
-  /* 2nd byte: 120 */ 0x74ef,
-  /* 2nd byte: 121 */ 0x74f4,
-  /* 2nd byte: 122 */ 0x74fa,
-  /* 2nd byte: 123 */ 0x74fb,
-  /* 2nd byte: 124 */ 0x74fc,
-  /* 2nd byte: 125 */ 0x74ff,
-  /* 2nd byte: 126 */ 0x7506},
-/* 1st byte: 77 */ { 
-  /* 2nd byte: 33 */ 0x7512,
-  /* 2nd byte: 34 */ 0x7516,
-  /* 2nd byte: 35 */ 0x7517,
-  /* 2nd byte: 36 */ 0x7520,
-  /* 2nd byte: 37 */ 0x7521,
-  /* 2nd byte: 38 */ 0x7524,
-  /* 2nd byte: 39 */ 0x7527,
-  /* 2nd byte: 40 */ 0x7529,
-  /* 2nd byte: 41 */ 0x752a,
-  /* 2nd byte: 42 */ 0x752f,
-  /* 2nd byte: 43 */ 0x7536,
-  /* 2nd byte: 44 */ 0x7539,
-  /* 2nd byte: 45 */ 0x753d,
-  /* 2nd byte: 46 */ 0x753e,
-  /* 2nd byte: 47 */ 0x753f,
-  /* 2nd byte: 48 */ 0x7540,
-  /* 2nd byte: 49 */ 0x7543,
-  /* 2nd byte: 50 */ 0x7547,
-  /* 2nd byte: 51 */ 0x7548,
-  /* 2nd byte: 52 */ 0x754e,
-  /* 2nd byte: 53 */ 0x7550,
-  /* 2nd byte: 54 */ 0x7552,
-  /* 2nd byte: 55 */ 0x7557,
-  /* 2nd byte: 56 */ 0x755e,
-  /* 2nd byte: 57 */ 0x755f,
-  /* 2nd byte: 58 */ 0x7561,
-  /* 2nd byte: 59 */ 0x756f,
-  /* 2nd byte: 60 */ 0x7571,
-  /* 2nd byte: 61 */ 0x7579,
-  /* 2nd byte: 62 */ 0x757a,
-  /* 2nd byte: 63 */ 0x757b,
-  /* 2nd byte: 64 */ 0x757c,
-  /* 2nd byte: 65 */ 0x757d,
-  /* 2nd byte: 66 */ 0x757e,
-  /* 2nd byte: 67 */ 0x7581,
-  /* 2nd byte: 68 */ 0x7585,
-  /* 2nd byte: 69 */ 0x7590,
-  /* 2nd byte: 70 */ 0x7592,
-  /* 2nd byte: 71 */ 0x7593,
-  /* 2nd byte: 72 */ 0x7595,
-  /* 2nd byte: 73 */ 0x7599,
-  /* 2nd byte: 74 */ 0x759c,
-  /* 2nd byte: 75 */ 0x75a2,
-  /* 2nd byte: 76 */ 0x75a4,
-  /* 2nd byte: 77 */ 0x75b4,
-  /* 2nd byte: 78 */ 0x75ba,
-  /* 2nd byte: 79 */ 0x75bf,
-  /* 2nd byte: 80 */ 0x75c0,
-  /* 2nd byte: 81 */ 0x75c1,
-  /* 2nd byte: 82 */ 0x75c4,
-  /* 2nd byte: 83 */ 0x75c6,
-  /* 2nd byte: 84 */ 0x75cc,
-  /* 2nd byte: 85 */ 0x75ce,
-  /* 2nd byte: 86 */ 0x75cf,
-  /* 2nd byte: 87 */ 0x75d7,
-  /* 2nd byte: 88 */ 0x75dc,
-  /* 2nd byte: 89 */ 0x75df,
-  /* 2nd byte: 90 */ 0x75e0,
-  /* 2nd byte: 91 */ 0x75e1,
-  /* 2nd byte: 92 */ 0x75e4,
-  /* 2nd byte: 93 */ 0x75e7,
-  /* 2nd byte: 94 */ 0x75ec,
-  /* 2nd byte: 95 */ 0x75ee,
-  /* 2nd byte: 96 */ 0x75ef,
-  /* 2nd byte: 97 */ 0x75f1,
-  /* 2nd byte: 98 */ 0x75f9,
-  /* 2nd byte: 99 */ 0x7600,
-  /* 2nd byte: 100 */ 0x7602,
-  /* 2nd byte: 101 */ 0x7603,
-  /* 2nd byte: 102 */ 0x7604,
-  /* 2nd byte: 103 */ 0x7607,
-  /* 2nd byte: 104 */ 0x7608,
-  /* 2nd byte: 105 */ 0x760a,
-  /* 2nd byte: 106 */ 0x760c,
-  /* 2nd byte: 107 */ 0x760f,
-  /* 2nd byte: 108 */ 0x7612,
-  /* 2nd byte: 109 */ 0x7613,
-  /* 2nd byte: 110 */ 0x7615,
-  /* 2nd byte: 111 */ 0x7616,
-  /* 2nd byte: 112 */ 0x7619,
-  /* 2nd byte: 113 */ 0x761b,
-  /* 2nd byte: 114 */ 0x761c,
-  /* 2nd byte: 115 */ 0x761d,
-  /* 2nd byte: 116 */ 0x761e,
-  /* 2nd byte: 117 */ 0x7623,
-  /* 2nd byte: 118 */ 0x7625,
-  /* 2nd byte: 119 */ 0x7626,
-  /* 2nd byte: 120 */ 0x7629,
-  /* 2nd byte: 121 */ 0x762d,
-  /* 2nd byte: 122 */ 0x7632,
-  /* 2nd byte: 123 */ 0x7633,
-  /* 2nd byte: 124 */ 0x7635,
-  /* 2nd byte: 125 */ 0x7638,
-  /* 2nd byte: 126 */ 0x7639},
-/* 1st byte: 78 */ { 
-  /* 2nd byte: 33 */ 0x763a,
-  /* 2nd byte: 34 */ 0x763c,
-  /* 2nd byte: 35 */ 0x764a,
-  /* 2nd byte: 36 */ 0x7640,
-  /* 2nd byte: 37 */ 0x7641,
-  /* 2nd byte: 38 */ 0x7643,
-  /* 2nd byte: 39 */ 0x7644,
-  /* 2nd byte: 40 */ 0x7645,
-  /* 2nd byte: 41 */ 0x7649,
-  /* 2nd byte: 42 */ 0x764b,
-  /* 2nd byte: 43 */ 0x7655,
-  /* 2nd byte: 44 */ 0x7659,
-  /* 2nd byte: 45 */ 0x765f,
-  /* 2nd byte: 46 */ 0x7664,
-  /* 2nd byte: 47 */ 0x7665,
-  /* 2nd byte: 48 */ 0x766d,
-  /* 2nd byte: 49 */ 0x766e,
-  /* 2nd byte: 50 */ 0x766f,
-  /* 2nd byte: 51 */ 0x7671,
-  /* 2nd byte: 52 */ 0x7674,
-  /* 2nd byte: 53 */ 0x7681,
-  /* 2nd byte: 54 */ 0x7685,
-  /* 2nd byte: 55 */ 0x768c,
-  /* 2nd byte: 56 */ 0x768d,
-  /* 2nd byte: 57 */ 0x7695,
-  /* 2nd byte: 58 */ 0x769b,
-  /* 2nd byte: 59 */ 0x769c,
-  /* 2nd byte: 60 */ 0x769d,
-  /* 2nd byte: 61 */ 0x769f,
-  /* 2nd byte: 62 */ 0x76a0,
-  /* 2nd byte: 63 */ 0x76a2,
-  /* 2nd byte: 64 */ 0x76a3,
-  /* 2nd byte: 65 */ 0x76a4,
-  /* 2nd byte: 66 */ 0x76a5,
-  /* 2nd byte: 67 */ 0x76a6,
-  /* 2nd byte: 68 */ 0x76a7,
-  /* 2nd byte: 69 */ 0x76a8,
-  /* 2nd byte: 70 */ 0x76aa,
-  /* 2nd byte: 71 */ 0x76ad,
-  /* 2nd byte: 72 */ 0x76bd,
-  /* 2nd byte: 73 */ 0x76c1,
-  /* 2nd byte: 74 */ 0x76c5,
-  /* 2nd byte: 75 */ 0x76c9,
-  /* 2nd byte: 76 */ 0x76cb,
-  /* 2nd byte: 77 */ 0x76cc,
-  /* 2nd byte: 78 */ 0x76ce,
-  /* 2nd byte: 79 */ 0x76d4,
-  /* 2nd byte: 80 */ 0x76d9,
-  /* 2nd byte: 81 */ 0x76e0,
-  /* 2nd byte: 82 */ 0x76e6,
-  /* 2nd byte: 83 */ 0x76e8,
-  /* 2nd byte: 84 */ 0x76ec,
-  /* 2nd byte: 85 */ 0x76f0,
-  /* 2nd byte: 86 */ 0x76f1,
-  /* 2nd byte: 87 */ 0x76f6,
-  /* 2nd byte: 88 */ 0x76f9,
-  /* 2nd byte: 89 */ 0x76fc,
-  /* 2nd byte: 90 */ 0x7700,
-  /* 2nd byte: 91 */ 0x7706,
-  /* 2nd byte: 92 */ 0x770a,
-  /* 2nd byte: 93 */ 0x770e,
-  /* 2nd byte: 94 */ 0x7712,
-  /* 2nd byte: 95 */ 0x7714,
-  /* 2nd byte: 96 */ 0x7715,
-  /* 2nd byte: 97 */ 0x7717,
-  /* 2nd byte: 98 */ 0x7719,
-  /* 2nd byte: 99 */ 0x771a,
-  /* 2nd byte: 100 */ 0x771c,
-  /* 2nd byte: 101 */ 0x7722,
-  /* 2nd byte: 102 */ 0x7728,
-  /* 2nd byte: 103 */ 0x772d,
-  /* 2nd byte: 104 */ 0x772e,
-  /* 2nd byte: 105 */ 0x772f,
-  /* 2nd byte: 106 */ 0x7734,
-  /* 2nd byte: 107 */ 0x7735,
-  /* 2nd byte: 108 */ 0x7736,
-  /* 2nd byte: 109 */ 0x7739,
-  /* 2nd byte: 110 */ 0x773d,
-  /* 2nd byte: 111 */ 0x773e,
-  /* 2nd byte: 112 */ 0x7742,
-  /* 2nd byte: 113 */ 0x7745,
-  /* 2nd byte: 114 */ 0x7746,
-  /* 2nd byte: 115 */ 0x774a,
-  /* 2nd byte: 116 */ 0x774d,
-  /* 2nd byte: 117 */ 0x774e,
-  /* 2nd byte: 118 */ 0x774f,
-  /* 2nd byte: 119 */ 0x7752,
-  /* 2nd byte: 120 */ 0x7756,
-  /* 2nd byte: 121 */ 0x7757,
-  /* 2nd byte: 122 */ 0x775c,
-  /* 2nd byte: 123 */ 0x775e,
-  /* 2nd byte: 124 */ 0x775f,
-  /* 2nd byte: 125 */ 0x7760,
-  /* 2nd byte: 126 */ 0x7762},
-/* 1st byte: 79 */ { 
-  /* 2nd byte: 33 */ 0x7764,
-  /* 2nd byte: 34 */ 0x7767,
-  /* 2nd byte: 35 */ 0x776a,
-  /* 2nd byte: 36 */ 0x776c,
-  /* 2nd byte: 37 */ 0x7770,
-  /* 2nd byte: 38 */ 0x7772,
-  /* 2nd byte: 39 */ 0x7773,
-  /* 2nd byte: 40 */ 0x7774,
-  /* 2nd byte: 41 */ 0x777a,
-  /* 2nd byte: 42 */ 0x777d,
-  /* 2nd byte: 43 */ 0x7780,
-  /* 2nd byte: 44 */ 0x7784,
-  /* 2nd byte: 45 */ 0x778c,
-  /* 2nd byte: 46 */ 0x778d,
-  /* 2nd byte: 47 */ 0x7794,
-  /* 2nd byte: 48 */ 0x7795,
-  /* 2nd byte: 49 */ 0x7796,
-  /* 2nd byte: 50 */ 0x779a,
-  /* 2nd byte: 51 */ 0x779f,
-  /* 2nd byte: 52 */ 0x77a2,
-  /* 2nd byte: 53 */ 0x77a7,
-  /* 2nd byte: 54 */ 0x77aa,
-  /* 2nd byte: 55 */ 0x77ae,
-  /* 2nd byte: 56 */ 0x77af,
-  /* 2nd byte: 57 */ 0x77b1,
-  /* 2nd byte: 58 */ 0x77b5,
-  /* 2nd byte: 59 */ 0x77be,
-  /* 2nd byte: 60 */ 0x77c3,
-  /* 2nd byte: 61 */ 0x77c9,
-  /* 2nd byte: 62 */ 0x77d1,
-  /* 2nd byte: 63 */ 0x77d2,
-  /* 2nd byte: 64 */ 0x77d5,
-  /* 2nd byte: 65 */ 0x77d9,
-  /* 2nd byte: 66 */ 0x77de,
-  /* 2nd byte: 67 */ 0x77df,
-  /* 2nd byte: 68 */ 0x77e0,
-  /* 2nd byte: 69 */ 0x77e4,
-  /* 2nd byte: 70 */ 0x77e6,
-  /* 2nd byte: 71 */ 0x77ea,
-  /* 2nd byte: 72 */ 0x77ec,
-  /* 2nd byte: 73 */ 0x77f0,
-  /* 2nd byte: 74 */ 0x77f1,
-  /* 2nd byte: 75 */ 0x77f4,
-  /* 2nd byte: 76 */ 0x77f8,
-  /* 2nd byte: 77 */ 0x77fb,
-  /* 2nd byte: 78 */ 0x7805,
-  /* 2nd byte: 79 */ 0x7806,
-  /* 2nd byte: 80 */ 0x7809,
-  /* 2nd byte: 81 */ 0x780d,
-  /* 2nd byte: 82 */ 0x780e,
-  /* 2nd byte: 83 */ 0x7811,
-  /* 2nd byte: 84 */ 0x781d,
-  /* 2nd byte: 85 */ 0x7821,
-  /* 2nd byte: 86 */ 0x7822,
-  /* 2nd byte: 87 */ 0x7823,
-  /* 2nd byte: 88 */ 0x782d,
-  /* 2nd byte: 89 */ 0x782e,
-  /* 2nd byte: 90 */ 0x7830,
-  /* 2nd byte: 91 */ 0x7835,
-  /* 2nd byte: 92 */ 0x7837,
-  /* 2nd byte: 93 */ 0x7843,
-  /* 2nd byte: 94 */ 0x7844,
-  /* 2nd byte: 95 */ 0x7847,
-  /* 2nd byte: 96 */ 0x7848,
-  /* 2nd byte: 97 */ 0x784c,
-  /* 2nd byte: 98 */ 0x784e,
-  /* 2nd byte: 99 */ 0x7852,
-  /* 2nd byte: 100 */ 0x785c,
-  /* 2nd byte: 101 */ 0x785e,
-  /* 2nd byte: 102 */ 0x7860,
-  /* 2nd byte: 103 */ 0x7861,
-  /* 2nd byte: 104 */ 0x7863,
-  /* 2nd byte: 105 */ 0x7864,
-  /* 2nd byte: 106 */ 0x7868,
-  /* 2nd byte: 107 */ 0x786a,
-  /* 2nd byte: 108 */ 0x786e,
-  /* 2nd byte: 109 */ 0x787a,
-  /* 2nd byte: 110 */ 0x787e,
-  /* 2nd byte: 111 */ 0x788a,
-  /* 2nd byte: 112 */ 0x788f,
-  /* 2nd byte: 113 */ 0x7894,
-  /* 2nd byte: 114 */ 0x7898,
-  /* 2nd byte: 115 */ 0x78a1,
-  /* 2nd byte: 116 */ 0x789d,
-  /* 2nd byte: 117 */ 0x789e,
-  /* 2nd byte: 118 */ 0x789f,
-  /* 2nd byte: 119 */ 0x78a4,
-  /* 2nd byte: 120 */ 0x78a8,
-  /* 2nd byte: 121 */ 0x78ac,
-  /* 2nd byte: 122 */ 0x78ad,
-  /* 2nd byte: 123 */ 0x78b0,
-  /* 2nd byte: 124 */ 0x78b1,
-  /* 2nd byte: 125 */ 0x78b2,
-  /* 2nd byte: 126 */ 0x78b3},
-/* 1st byte: 80 */ { 
-  /* 2nd byte: 33 */ 0x78bb,
-  /* 2nd byte: 34 */ 0x78bd,
-  /* 2nd byte: 35 */ 0x78bf,
-  /* 2nd byte: 36 */ 0x78c7,
-  /* 2nd byte: 37 */ 0x78c8,
-  /* 2nd byte: 38 */ 0x78c9,
-  /* 2nd byte: 39 */ 0x78cc,
-  /* 2nd byte: 40 */ 0x78ce,
-  /* 2nd byte: 41 */ 0x78d2,
-  /* 2nd byte: 42 */ 0x78d3,
-  /* 2nd byte: 43 */ 0x78d5,
-  /* 2nd byte: 44 */ 0x78d6,
-  /* 2nd byte: 45 */ 0x78e4,
-  /* 2nd byte: 46 */ 0x78db,
-  /* 2nd byte: 47 */ 0x78df,
-  /* 2nd byte: 48 */ 0x78e0,
-  /* 2nd byte: 49 */ 0x78e1,
-  /* 2nd byte: 50 */ 0x78e6,
-  /* 2nd byte: 51 */ 0x78ea,
-  /* 2nd byte: 52 */ 0x78f2,
-  /* 2nd byte: 53 */ 0x78f3,
-  /* 2nd byte: 54 */ 0x7900,
-  /* 2nd byte: 55 */ 0x78f6,
-  /* 2nd byte: 56 */ 0x78f7,
-  /* 2nd byte: 57 */ 0x78fa,
-  /* 2nd byte: 58 */ 0x78fb,
-  /* 2nd byte: 59 */ 0x78ff,
-  /* 2nd byte: 60 */ 0x7906,
-  /* 2nd byte: 61 */ 0x790c,
-  /* 2nd byte: 62 */ 0x7910,
-  /* 2nd byte: 63 */ 0x791a,
-  /* 2nd byte: 64 */ 0x791c,
-  /* 2nd byte: 65 */ 0x791e,
-  /* 2nd byte: 66 */ 0x791f,
-  /* 2nd byte: 67 */ 0x7920,
-  /* 2nd byte: 68 */ 0x7925,
-  /* 2nd byte: 69 */ 0x7927,
-  /* 2nd byte: 70 */ 0x7929,
-  /* 2nd byte: 71 */ 0x792d,
-  /* 2nd byte: 72 */ 0x7931,
-  /* 2nd byte: 73 */ 0x7934,
-  /* 2nd byte: 74 */ 0x7935,
-  /* 2nd byte: 75 */ 0x793b,
-  /* 2nd byte: 76 */ 0x793d,
-  /* 2nd byte: 77 */ 0x793f,
-  /* 2nd byte: 78 */ 0x7944,
-  /* 2nd byte: 79 */ 0x7945,
-  /* 2nd byte: 80 */ 0x7946,
-  /* 2nd byte: 81 */ 0x794a,
-  /* 2nd byte: 82 */ 0x794b,
-  /* 2nd byte: 83 */ 0x794f,
-  /* 2nd byte: 84 */ 0x7951,
-  /* 2nd byte: 85 */ 0x7954,
-  /* 2nd byte: 86 */ 0x7958,
-  /* 2nd byte: 87 */ 0x795b,
-  /* 2nd byte: 88 */ 0x795c,
-  /* 2nd byte: 89 */ 0x7967,
-  /* 2nd byte: 90 */ 0x7969,
-  /* 2nd byte: 91 */ 0x796b,
-  /* 2nd byte: 92 */ 0x7972,
-  /* 2nd byte: 93 */ 0x7979,
-  /* 2nd byte: 94 */ 0x797b,
-  /* 2nd byte: 95 */ 0x797c,
-  /* 2nd byte: 96 */ 0x797e,
-  /* 2nd byte: 97 */ 0x798b,
-  /* 2nd byte: 98 */ 0x798c,
-  /* 2nd byte: 99 */ 0x7991,
-  /* 2nd byte: 100 */ 0x7993,
-  /* 2nd byte: 101 */ 0x7994,
-  /* 2nd byte: 102 */ 0x7995,
-  /* 2nd byte: 103 */ 0x7996,
-  /* 2nd byte: 104 */ 0x7998,
-  /* 2nd byte: 105 */ 0x799b,
-  /* 2nd byte: 106 */ 0x799c,
-  /* 2nd byte: 107 */ 0x79a1,
-  /* 2nd byte: 108 */ 0x79a8,
-  /* 2nd byte: 109 */ 0x79a9,
-  /* 2nd byte: 110 */ 0x79ab,
-  /* 2nd byte: 111 */ 0x79af,
-  /* 2nd byte: 112 */ 0x79b1,
-  /* 2nd byte: 113 */ 0x79b4,
-  /* 2nd byte: 114 */ 0x79b8,
-  /* 2nd byte: 115 */ 0x79bb,
-  /* 2nd byte: 116 */ 0x79c2,
-  /* 2nd byte: 117 */ 0x79c4,
-  /* 2nd byte: 118 */ 0x79c7,
-  /* 2nd byte: 119 */ 0x79c8,
-  /* 2nd byte: 120 */ 0x79ca,
-  /* 2nd byte: 121 */ 0x79cf,
-  /* 2nd byte: 122 */ 0x79d4,
-  /* 2nd byte: 123 */ 0x79d6,
-  /* 2nd byte: 124 */ 0x79da,
-  /* 2nd byte: 125 */ 0x79dd,
-  /* 2nd byte: 126 */ 0x79de},
-/* 1st byte: 81 */ { 
-  /* 2nd byte: 33 */ 0x79e0,
-  /* 2nd byte: 34 */ 0x79e2,
-  /* 2nd byte: 35 */ 0x79e5,
-  /* 2nd byte: 36 */ 0x79ea,
-  /* 2nd byte: 37 */ 0x79eb,
-  /* 2nd byte: 38 */ 0x79ed,
-  /* 2nd byte: 39 */ 0x79f1,
-  /* 2nd byte: 40 */ 0x79f8,
-  /* 2nd byte: 41 */ 0x79fc,
-  /* 2nd byte: 42 */ 0x7a02,
-  /* 2nd byte: 43 */ 0x7a03,
-  /* 2nd byte: 44 */ 0x7a07,
-  /* 2nd byte: 45 */ 0x7a09,
-  /* 2nd byte: 46 */ 0x7a0a,
-  /* 2nd byte: 47 */ 0x7a0c,
-  /* 2nd byte: 48 */ 0x7a11,
-  /* 2nd byte: 49 */ 0x7a15,
-  /* 2nd byte: 50 */ 0x7a1b,
-  /* 2nd byte: 51 */ 0x7a1e,
-  /* 2nd byte: 52 */ 0x7a21,
-  /* 2nd byte: 53 */ 0x7a27,
-  /* 2nd byte: 54 */ 0x7a2b,
-  /* 2nd byte: 55 */ 0x7a2d,
-  /* 2nd byte: 56 */ 0x7a2f,
-  /* 2nd byte: 57 */ 0x7a30,
-  /* 2nd byte: 58 */ 0x7a34,
-  /* 2nd byte: 59 */ 0x7a35,
-  /* 2nd byte: 60 */ 0x7a38,
-  /* 2nd byte: 61 */ 0x7a39,
-  /* 2nd byte: 62 */ 0x7a3a,
-  /* 2nd byte: 63 */ 0x7a44,
-  /* 2nd byte: 64 */ 0x7a45,
-  /* 2nd byte: 65 */ 0x7a47,
-  /* 2nd byte: 66 */ 0x7a48,
-  /* 2nd byte: 67 */ 0x7a4c,
-  /* 2nd byte: 68 */ 0x7a55,
-  /* 2nd byte: 69 */ 0x7a56,
-  /* 2nd byte: 70 */ 0x7a59,
-  /* 2nd byte: 71 */ 0x7a5c,
-  /* 2nd byte: 72 */ 0x7a5d,
-  /* 2nd byte: 73 */ 0x7a5f,
-  /* 2nd byte: 74 */ 0x7a60,
-  /* 2nd byte: 75 */ 0x7a65,
-  /* 2nd byte: 76 */ 0x7a67,
-  /* 2nd byte: 77 */ 0x7a6a,
-  /* 2nd byte: 78 */ 0x7a6d,
-  /* 2nd byte: 79 */ 0x7a75,
-  /* 2nd byte: 80 */ 0x7a78,
-  /* 2nd byte: 81 */ 0x7a7e,
-  /* 2nd byte: 82 */ 0x7a80,
-  /* 2nd byte: 83 */ 0x7a82,
-  /* 2nd byte: 84 */ 0x7a85,
-  /* 2nd byte: 85 */ 0x7a86,
-  /* 2nd byte: 86 */ 0x7a8a,
-  /* 2nd byte: 87 */ 0x7a8b,
-  /* 2nd byte: 88 */ 0x7a90,
-  /* 2nd byte: 89 */ 0x7a91,
-  /* 2nd byte: 90 */ 0x7a94,
-  /* 2nd byte: 91 */ 0x7a9e,
-  /* 2nd byte: 92 */ 0x7aa0,
-  /* 2nd byte: 93 */ 0x7aa3,
-  /* 2nd byte: 94 */ 0x7aac,
-  /* 2nd byte: 95 */ 0x7ab3,
-  /* 2nd byte: 96 */ 0x7ab5,
-  /* 2nd byte: 97 */ 0x7ab9,
-  /* 2nd byte: 98 */ 0x7abb,
-  /* 2nd byte: 99 */ 0x7abc,
-  /* 2nd byte: 100 */ 0x7ac6,
-  /* 2nd byte: 101 */ 0x7ac9,
-  /* 2nd byte: 102 */ 0x7acc,
-  /* 2nd byte: 103 */ 0x7ace,
-  /* 2nd byte: 104 */ 0x7ad1,
-  /* 2nd byte: 105 */ 0x7adb,
-  /* 2nd byte: 106 */ 0x7ae8,
-  /* 2nd byte: 107 */ 0x7ae9,
-  /* 2nd byte: 108 */ 0x7aeb,
-  /* 2nd byte: 109 */ 0x7aec,
-  /* 2nd byte: 110 */ 0x7af1,
-  /* 2nd byte: 111 */ 0x7af4,
-  /* 2nd byte: 112 */ 0x7afb,
-  /* 2nd byte: 113 */ 0x7afd,
-  /* 2nd byte: 114 */ 0x7afe,
-  /* 2nd byte: 115 */ 0x7b07,
-  /* 2nd byte: 116 */ 0x7b14,
-  /* 2nd byte: 117 */ 0x7b1f,
-  /* 2nd byte: 118 */ 0x7b23,
-  /* 2nd byte: 119 */ 0x7b27,
-  /* 2nd byte: 120 */ 0x7b29,
-  /* 2nd byte: 121 */ 0x7b2a,
-  /* 2nd byte: 122 */ 0x7b2b,
-  /* 2nd byte: 123 */ 0x7b2d,
-  /* 2nd byte: 124 */ 0x7b2e,
-  /* 2nd byte: 125 */ 0x7b2f,
-  /* 2nd byte: 126 */ 0x7b30},
-/* 1st byte: 82 */ { 
-  /* 2nd byte: 33 */ 0x7b31,
-  /* 2nd byte: 34 */ 0x7b34,
-  /* 2nd byte: 35 */ 0x7b3d,
-  /* 2nd byte: 36 */ 0x7b3f,
-  /* 2nd byte: 37 */ 0x7b40,
-  /* 2nd byte: 38 */ 0x7b41,
-  /* 2nd byte: 39 */ 0x7b47,
-  /* 2nd byte: 40 */ 0x7b4e,
-  /* 2nd byte: 41 */ 0x7b55,
-  /* 2nd byte: 42 */ 0x7b60,
-  /* 2nd byte: 43 */ 0x7b64,
-  /* 2nd byte: 44 */ 0x7b66,
-  /* 2nd byte: 45 */ 0x7b69,
-  /* 2nd byte: 46 */ 0x7b6a,
-  /* 2nd byte: 47 */ 0x7b6d,
-  /* 2nd byte: 48 */ 0x7b6f,
-  /* 2nd byte: 49 */ 0x7b72,
-  /* 2nd byte: 50 */ 0x7b73,
-  /* 2nd byte: 51 */ 0x7b77,
-  /* 2nd byte: 52 */ 0x7b84,
-  /* 2nd byte: 53 */ 0x7b89,
-  /* 2nd byte: 54 */ 0x7b8e,
-  /* 2nd byte: 55 */ 0x7b90,
-  /* 2nd byte: 56 */ 0x7b91,
-  /* 2nd byte: 57 */ 0x7b96,
-  /* 2nd byte: 58 */ 0x7b9b,
-  /* 2nd byte: 59 */ 0x7b9e,
-  /* 2nd byte: 60 */ 0x7ba0,
-  /* 2nd byte: 61 */ 0x7ba5,
-  /* 2nd byte: 62 */ 0x7bac,
-  /* 2nd byte: 63 */ 0x7baf,
-  /* 2nd byte: 64 */ 0x7bb0,
-  /* 2nd byte: 65 */ 0x7bb2,
-  /* 2nd byte: 66 */ 0x7bb5,
-  /* 2nd byte: 67 */ 0x7bb6,
-  /* 2nd byte: 68 */ 0x7bba,
-  /* 2nd byte: 69 */ 0x7bbb,
-  /* 2nd byte: 70 */ 0x7bbc,
-  /* 2nd byte: 71 */ 0x7bbd,
-  /* 2nd byte: 72 */ 0x7bc2,
-  /* 2nd byte: 73 */ 0x7bc5,
-  /* 2nd byte: 74 */ 0x7bc8,
-  /* 2nd byte: 75 */ 0x7bca,
-  /* 2nd byte: 76 */ 0x7bd4,
-  /* 2nd byte: 77 */ 0x7bd6,
-  /* 2nd byte: 78 */ 0x7bd7,
-  /* 2nd byte: 79 */ 0x7bd9,
-  /* 2nd byte: 80 */ 0x7bda,
-  /* 2nd byte: 81 */ 0x7bdb,
-  /* 2nd byte: 82 */ 0x7be8,
-  /* 2nd byte: 83 */ 0x7bea,
-  /* 2nd byte: 84 */ 0x7bf2,
-  /* 2nd byte: 85 */ 0x7bf4,
-  /* 2nd byte: 86 */ 0x7bf5,
-  /* 2nd byte: 87 */ 0x7bf8,
-  /* 2nd byte: 88 */ 0x7bf9,
-  /* 2nd byte: 89 */ 0x7bfa,
-  /* 2nd byte: 90 */ 0x7bfc,
-  /* 2nd byte: 91 */ 0x7bfe,
-  /* 2nd byte: 92 */ 0x7c01,
-  /* 2nd byte: 93 */ 0x7c02,
-  /* 2nd byte: 94 */ 0x7c03,
-  /* 2nd byte: 95 */ 0x7c04,
-  /* 2nd byte: 96 */ 0x7c06,
-  /* 2nd byte: 97 */ 0x7c09,
-  /* 2nd byte: 98 */ 0x7c0b,
-  /* 2nd byte: 99 */ 0x7c0c,
-  /* 2nd byte: 100 */ 0x7c0e,
-  /* 2nd byte: 101 */ 0x7c0f,
-  /* 2nd byte: 102 */ 0x7c19,
-  /* 2nd byte: 103 */ 0x7c1b,
-  /* 2nd byte: 104 */ 0x7c20,
-  /* 2nd byte: 105 */ 0x7c25,
-  /* 2nd byte: 106 */ 0x7c26,
-  /* 2nd byte: 107 */ 0x7c28,
-  /* 2nd byte: 108 */ 0x7c2c,
-  /* 2nd byte: 109 */ 0x7c31,
-  /* 2nd byte: 110 */ 0x7c33,
-  /* 2nd byte: 111 */ 0x7c34,
-  /* 2nd byte: 112 */ 0x7c36,
-  /* 2nd byte: 113 */ 0x7c39,
-  /* 2nd byte: 114 */ 0x7c3a,
-  /* 2nd byte: 115 */ 0x7c46,
-  /* 2nd byte: 116 */ 0x7c4a,
-  /* 2nd byte: 117 */ 0x7c55,
-  /* 2nd byte: 118 */ 0x7c51,
-  /* 2nd byte: 119 */ 0x7c52,
-  /* 2nd byte: 120 */ 0x7c53,
-  /* 2nd byte: 121 */ 0x7c59,
-  /* 2nd byte: 122 */ 0x7c5a,
-  /* 2nd byte: 123 */ 0x7c5b,
-  /* 2nd byte: 124 */ 0x7c5c,
-  /* 2nd byte: 125 */ 0x7c5d,
-  /* 2nd byte: 126 */ 0x7c5e},
-/* 1st byte: 83 */ { 
-  /* 2nd byte: 33 */ 0x7c61,
-  /* 2nd byte: 34 */ 0x7c63,
-  /* 2nd byte: 35 */ 0x7c67,
-  /* 2nd byte: 36 */ 0x7c69,
-  /* 2nd byte: 37 */ 0x7c6d,
-  /* 2nd byte: 38 */ 0x7c6e,
-  /* 2nd byte: 39 */ 0x7c70,
-  /* 2nd byte: 40 */ 0x7c72,
-  /* 2nd byte: 41 */ 0x7c79,
-  /* 2nd byte: 42 */ 0x7c7c,
-  /* 2nd byte: 43 */ 0x7c7d,
-  /* 2nd byte: 44 */ 0x7c86,
-  /* 2nd byte: 45 */ 0x7c87,
-  /* 2nd byte: 46 */ 0x7c8f,
-  /* 2nd byte: 47 */ 0x7c94,
-  /* 2nd byte: 48 */ 0x7c9e,
-  /* 2nd byte: 49 */ 0x7ca0,
-  /* 2nd byte: 50 */ 0x7ca6,
-  /* 2nd byte: 51 */ 0x7cb0,
-  /* 2nd byte: 52 */ 0x7cb6,
-  /* 2nd byte: 53 */ 0x7cb7,
-  /* 2nd byte: 54 */ 0x7cba,
-  /* 2nd byte: 55 */ 0x7cbb,
-  /* 2nd byte: 56 */ 0x7cbc,
-  /* 2nd byte: 57 */ 0x7cbf,
-  /* 2nd byte: 58 */ 0x7cc4,
-  /* 2nd byte: 59 */ 0x7cc7,
-  /* 2nd byte: 60 */ 0x7cc8,
-  /* 2nd byte: 61 */ 0x7cc9,
-  /* 2nd byte: 62 */ 0x7ccd,
-  /* 2nd byte: 63 */ 0x7ccf,
-  /* 2nd byte: 64 */ 0x7cd3,
-  /* 2nd byte: 65 */ 0x7cd4,
-  /* 2nd byte: 66 */ 0x7cd5,
-  /* 2nd byte: 67 */ 0x7cd7,
-  /* 2nd byte: 68 */ 0x7cd9,
-  /* 2nd byte: 69 */ 0x7cda,
-  /* 2nd byte: 70 */ 0x7cdd,
-  /* 2nd byte: 71 */ 0x7ce6,
-  /* 2nd byte: 72 */ 0x7ce9,
-  /* 2nd byte: 73 */ 0x7ceb,
-  /* 2nd byte: 74 */ 0x7cf5,
-  /* 2nd byte: 75 */ 0x7d03,
-  /* 2nd byte: 76 */ 0x7d07,
-  /* 2nd byte: 77 */ 0x7d08,
-  /* 2nd byte: 78 */ 0x7d09,
-  /* 2nd byte: 79 */ 0x7d0f,
-  /* 2nd byte: 80 */ 0x7d11,
-  /* 2nd byte: 81 */ 0x7d12,
-  /* 2nd byte: 82 */ 0x7d13,
-  /* 2nd byte: 83 */ 0x7d16,
-  /* 2nd byte: 84 */ 0x7d1d,
-  /* 2nd byte: 85 */ 0x7d1e,
-  /* 2nd byte: 86 */ 0x7d23,
-  /* 2nd byte: 87 */ 0x7d26,
-  /* 2nd byte: 88 */ 0x7d2a,
-  /* 2nd byte: 89 */ 0x7d2d,
-  /* 2nd byte: 90 */ 0x7d31,
-  /* 2nd byte: 91 */ 0x7d3c,
-  /* 2nd byte: 92 */ 0x7d3d,
-  /* 2nd byte: 93 */ 0x7d3e,
-  /* 2nd byte: 94 */ 0x7d40,
-  /* 2nd byte: 95 */ 0x7d41,
-  /* 2nd byte: 96 */ 0x7d47,
-  /* 2nd byte: 97 */ 0x7d48,
-  /* 2nd byte: 98 */ 0x7d4d,
-  /* 2nd byte: 99 */ 0x7d51,
-  /* 2nd byte: 100 */ 0x7d53,
-  /* 2nd byte: 101 */ 0x7d57,
-  /* 2nd byte: 102 */ 0x7d59,
-  /* 2nd byte: 103 */ 0x7d5a,
-  /* 2nd byte: 104 */ 0x7d5c,
-  /* 2nd byte: 105 */ 0x7d5d,
-  /* 2nd byte: 106 */ 0x7d65,
-  /* 2nd byte: 107 */ 0x7d67,
-  /* 2nd byte: 108 */ 0x7d6a,
-  /* 2nd byte: 109 */ 0x7d70,
-  /* 2nd byte: 110 */ 0x7d78,
-  /* 2nd byte: 111 */ 0x7d7a,
-  /* 2nd byte: 112 */ 0x7d7b,
-  /* 2nd byte: 113 */ 0x7d7f,
-  /* 2nd byte: 114 */ 0x7d81,
-  /* 2nd byte: 115 */ 0x7d82,
-  /* 2nd byte: 116 */ 0x7d83,
-  /* 2nd byte: 117 */ 0x7d85,
-  /* 2nd byte: 118 */ 0x7d86,
-  /* 2nd byte: 119 */ 0x7d88,
-  /* 2nd byte: 120 */ 0x7d8b,
-  /* 2nd byte: 121 */ 0x7d8c,
-  /* 2nd byte: 122 */ 0x7d8d,
-  /* 2nd byte: 123 */ 0x7d91,
-  /* 2nd byte: 124 */ 0x7d96,
-  /* 2nd byte: 125 */ 0x7d97,
-  /* 2nd byte: 126 */ 0x7d9d},
-/* 1st byte: 84 */ { 
-  /* 2nd byte: 33 */ 0x7d9e,
-  /* 2nd byte: 34 */ 0x7da6,
-  /* 2nd byte: 35 */ 0x7da7,
-  /* 2nd byte: 36 */ 0x7daa,
-  /* 2nd byte: 37 */ 0x7db3,
-  /* 2nd byte: 38 */ 0x7db6,
-  /* 2nd byte: 39 */ 0x7db7,
-  /* 2nd byte: 40 */ 0x7db9,
-  /* 2nd byte: 41 */ 0x7dc2,
-  /* 2nd byte: 42 */ 0x7dc3,
-  /* 2nd byte: 43 */ 0x7dc4,
-  /* 2nd byte: 44 */ 0x7dc5,
-  /* 2nd byte: 45 */ 0x7dc6,
-  /* 2nd byte: 46 */ 0x7dcc,
-  /* 2nd byte: 47 */ 0x7dcd,
-  /* 2nd byte: 48 */ 0x7dce,
-  /* 2nd byte: 49 */ 0x7dd7,
-  /* 2nd byte: 50 */ 0x7dd9,
-  /* 2nd byte: 51 */ 0x7e00,
-  /* 2nd byte: 52 */ 0x7de2,
-  /* 2nd byte: 53 */ 0x7de5,
-  /* 2nd byte: 54 */ 0x7de6,
-  /* 2nd byte: 55 */ 0x7dea,
-  /* 2nd byte: 56 */ 0x7deb,
-  /* 2nd byte: 57 */ 0x7ded,
-  /* 2nd byte: 58 */ 0x7df1,
-  /* 2nd byte: 59 */ 0x7df5,
-  /* 2nd byte: 60 */ 0x7df6,
-  /* 2nd byte: 61 */ 0x7df9,
-  /* 2nd byte: 62 */ 0x7dfa,
-  /* 2nd byte: 63 */ 0x7e08,
-  /* 2nd byte: 64 */ 0x7e10,
-  /* 2nd byte: 65 */ 0x7e11,
-  /* 2nd byte: 66 */ 0x7e15,
-  /* 2nd byte: 67 */ 0x7e17,
-  /* 2nd byte: 68 */ 0x7e1c,
-  /* 2nd byte: 69 */ 0x7e1d,
-  /* 2nd byte: 70 */ 0x7e20,
-  /* 2nd byte: 71 */ 0x7e27,
-  /* 2nd byte: 72 */ 0x7e28,
-  /* 2nd byte: 73 */ 0x7e2c,
-  /* 2nd byte: 74 */ 0x7e2d,
-  /* 2nd byte: 75 */ 0x7e2f,
-  /* 2nd byte: 76 */ 0x7e33,
-  /* 2nd byte: 77 */ 0x7e36,
-  /* 2nd byte: 78 */ 0x7e3f,
-  /* 2nd byte: 79 */ 0x7e44,
-  /* 2nd byte: 80 */ 0x7e45,
-  /* 2nd byte: 81 */ 0x7e47,
-  /* 2nd byte: 82 */ 0x7e4e,
-  /* 2nd byte: 83 */ 0x7e50,
-  /* 2nd byte: 84 */ 0x7e52,
-  /* 2nd byte: 85 */ 0x7e58,
-  /* 2nd byte: 86 */ 0x7e5f,
-  /* 2nd byte: 87 */ 0x7e61,
-  /* 2nd byte: 88 */ 0x7e62,
-  /* 2nd byte: 89 */ 0x7e65,
-  /* 2nd byte: 90 */ 0x7e6b,
-  /* 2nd byte: 91 */ 0x7e6e,
-  /* 2nd byte: 92 */ 0x7e6f,
-  /* 2nd byte: 93 */ 0x7e73,
-  /* 2nd byte: 94 */ 0x7e78,
-  /* 2nd byte: 95 */ 0x7e7e,
-  /* 2nd byte: 96 */ 0x7e81,
-  /* 2nd byte: 97 */ 0x7e86,
-  /* 2nd byte: 98 */ 0x7e87,
-  /* 2nd byte: 99 */ 0x7e8a,
-  /* 2nd byte: 100 */ 0x7e8d,
-  /* 2nd byte: 101 */ 0x7e91,
-  /* 2nd byte: 102 */ 0x7e95,
-  /* 2nd byte: 103 */ 0x7e98,
-  /* 2nd byte: 104 */ 0x7e9a,
-  /* 2nd byte: 105 */ 0x7e9d,
-  /* 2nd byte: 106 */ 0x7e9e,
-  /* 2nd byte: 107 */ 0x7f3c,
-  /* 2nd byte: 108 */ 0x7f3b,
-  /* 2nd byte: 109 */ 0x7f3d,
-  /* 2nd byte: 110 */ 0x7f3e,
-  /* 2nd byte: 111 */ 0x7f3f,
-  /* 2nd byte: 112 */ 0x7f43,
-  /* 2nd byte: 113 */ 0x7f44,
-  /* 2nd byte: 114 */ 0x7f47,
-  /* 2nd byte: 115 */ 0x7f4f,
-  /* 2nd byte: 116 */ 0x7f52,
-  /* 2nd byte: 117 */ 0x7f53,
-  /* 2nd byte: 118 */ 0x7f5b,
-  /* 2nd byte: 119 */ 0x7f5c,
-  /* 2nd byte: 120 */ 0x7f5d,
-  /* 2nd byte: 121 */ 0x7f61,
-  /* 2nd byte: 122 */ 0x7f63,
-  /* 2nd byte: 123 */ 0x7f64,
-  /* 2nd byte: 124 */ 0x7f65,
-  /* 2nd byte: 125 */ 0x7f66,
-  /* 2nd byte: 126 */ 0x7f6d},
-/* 1st byte: 85 */ { 
-  /* 2nd byte: 33 */ 0x7f71,
-  /* 2nd byte: 34 */ 0x7f7d,
-  /* 2nd byte: 35 */ 0x7f7e,
-  /* 2nd byte: 36 */ 0x7f7f,
-  /* 2nd byte: 37 */ 0x7f80,
-  /* 2nd byte: 38 */ 0x7f8b,
-  /* 2nd byte: 39 */ 0x7f8d,
-  /* 2nd byte: 40 */ 0x7f8f,
-  /* 2nd byte: 41 */ 0x7f90,
-  /* 2nd byte: 42 */ 0x7f91,
-  /* 2nd byte: 43 */ 0x7f96,
-  /* 2nd byte: 44 */ 0x7f97,
-  /* 2nd byte: 45 */ 0x7f9c,
-  /* 2nd byte: 46 */ 0x7fa1,
-  /* 2nd byte: 47 */ 0x7fa2,
-  /* 2nd byte: 48 */ 0x7fa6,
-  /* 2nd byte: 49 */ 0x7faa,
-  /* 2nd byte: 50 */ 0x7fad,
-  /* 2nd byte: 51 */ 0x7fb4,
-  /* 2nd byte: 52 */ 0x7fbc,
-  /* 2nd byte: 53 */ 0x7fbf,
-  /* 2nd byte: 54 */ 0x7fc0,
-  /* 2nd byte: 55 */ 0x7fc3,
-  /* 2nd byte: 56 */ 0x7fc8,
-  /* 2nd byte: 57 */ 0x7fce,
-  /* 2nd byte: 58 */ 0x7fcf,
-  /* 2nd byte: 59 */ 0x7fdb,
-  /* 2nd byte: 60 */ 0x7fdf,
-  /* 2nd byte: 61 */ 0x7fe3,
-  /* 2nd byte: 62 */ 0x7fe5,
-  /* 2nd byte: 63 */ 0x7fe8,
-  /* 2nd byte: 64 */ 0x7fec,
-  /* 2nd byte: 65 */ 0x7fee,
-  /* 2nd byte: 66 */ 0x7fef,
-  /* 2nd byte: 67 */ 0x7ff2,
-  /* 2nd byte: 68 */ 0x7ffa,
-  /* 2nd byte: 69 */ 0x7ffd,
-  /* 2nd byte: 70 */ 0x7ffe,
-  /* 2nd byte: 71 */ 0x7fff,
-  /* 2nd byte: 72 */ 0x8007,
-  /* 2nd byte: 73 */ 0x8008,
-  /* 2nd byte: 74 */ 0x800a,
-  /* 2nd byte: 75 */ 0x800d,
-  /* 2nd byte: 76 */ 0x800e,
-  /* 2nd byte: 77 */ 0x800f,
-  /* 2nd byte: 78 */ 0x8011,
-  /* 2nd byte: 79 */ 0x8013,
-  /* 2nd byte: 80 */ 0x8014,
-  /* 2nd byte: 81 */ 0x8016,
-  /* 2nd byte: 82 */ 0x801d,
-  /* 2nd byte: 83 */ 0x801e,
-  /* 2nd byte: 84 */ 0x801f,
-  /* 2nd byte: 85 */ 0x8020,
-  /* 2nd byte: 86 */ 0x8024,
-  /* 2nd byte: 87 */ 0x8026,
-  /* 2nd byte: 88 */ 0x802c,
-  /* 2nd byte: 89 */ 0x802e,
-  /* 2nd byte: 90 */ 0x8030,
-  /* 2nd byte: 91 */ 0x8034,
-  /* 2nd byte: 92 */ 0x8035,
-  /* 2nd byte: 93 */ 0x8037,
-  /* 2nd byte: 94 */ 0x8039,
-  /* 2nd byte: 95 */ 0x803a,
-  /* 2nd byte: 96 */ 0x803c,
-  /* 2nd byte: 97 */ 0x803e,
-  /* 2nd byte: 98 */ 0x8040,
-  /* 2nd byte: 99 */ 0x8044,
-  /* 2nd byte: 100 */ 0x8060,
-  /* 2nd byte: 101 */ 0x8064,
-  /* 2nd byte: 102 */ 0x8066,
-  /* 2nd byte: 103 */ 0x806d,
-  /* 2nd byte: 104 */ 0x8071,
-  /* 2nd byte: 105 */ 0x8075,
-  /* 2nd byte: 106 */ 0x8081,
-  /* 2nd byte: 107 */ 0x8088,
-  /* 2nd byte: 108 */ 0x808e,
-  /* 2nd byte: 109 */ 0x809c,
-  /* 2nd byte: 110 */ 0x809e,
-  /* 2nd byte: 111 */ 0x80a6,
-  /* 2nd byte: 112 */ 0x80a7,
-  /* 2nd byte: 113 */ 0x80ab,
-  /* 2nd byte: 114 */ 0x80b8,
-  /* 2nd byte: 115 */ 0x80b9,
-  /* 2nd byte: 116 */ 0x80c8,
-  /* 2nd byte: 117 */ 0x80cd,
-  /* 2nd byte: 118 */ 0x80cf,
-  /* 2nd byte: 119 */ 0x80d2,
-  /* 2nd byte: 120 */ 0x80d4,
-  /* 2nd byte: 121 */ 0x80d5,
-  /* 2nd byte: 122 */ 0x80d7,
-  /* 2nd byte: 123 */ 0x80d8,
-  /* 2nd byte: 124 */ 0x80e0,
-  /* 2nd byte: 125 */ 0x80ed,
-  /* 2nd byte: 126 */ 0x80ee},
-/* 1st byte: 86 */ { 
-  /* 2nd byte: 33 */ 0x80f0,
-  /* 2nd byte: 34 */ 0x80f2,
-  /* 2nd byte: 35 */ 0x80f3,
-  /* 2nd byte: 36 */ 0x80f6,
-  /* 2nd byte: 37 */ 0x80f9,
-  /* 2nd byte: 38 */ 0x80fa,
-  /* 2nd byte: 39 */ 0x80fe,
-  /* 2nd byte: 40 */ 0x8103,
-  /* 2nd byte: 41 */ 0x810b,
-  /* 2nd byte: 42 */ 0x8116,
-  /* 2nd byte: 43 */ 0x8117,
-  /* 2nd byte: 44 */ 0x8118,
-  /* 2nd byte: 45 */ 0x811c,
-  /* 2nd byte: 46 */ 0x811e,
-  /* 2nd byte: 47 */ 0x8120,
-  /* 2nd byte: 48 */ 0x8124,
-  /* 2nd byte: 49 */ 0x8127,
-  /* 2nd byte: 50 */ 0x812c,
-  /* 2nd byte: 51 */ 0x8130,
-  /* 2nd byte: 52 */ 0x8135,
-  /* 2nd byte: 53 */ 0x813a,
-  /* 2nd byte: 54 */ 0x813c,
-  /* 2nd byte: 55 */ 0x8145,
-  /* 2nd byte: 56 */ 0x8147,
-  /* 2nd byte: 57 */ 0x814a,
-  /* 2nd byte: 58 */ 0x814c,
-  /* 2nd byte: 59 */ 0x8152,
-  /* 2nd byte: 60 */ 0x8157,
-  /* 2nd byte: 61 */ 0x8160,
-  /* 2nd byte: 62 */ 0x8161,
-  /* 2nd byte: 63 */ 0x8167,
-  /* 2nd byte: 64 */ 0x8168,
-  /* 2nd byte: 65 */ 0x8169,
-  /* 2nd byte: 66 */ 0x816d,
-  /* 2nd byte: 67 */ 0x816f,
-  /* 2nd byte: 68 */ 0x8177,
-  /* 2nd byte: 69 */ 0x8181,
-  /* 2nd byte: 70 */ 0x8190,
-  /* 2nd byte: 71 */ 0x8184,
-  /* 2nd byte: 72 */ 0x8185,
-  /* 2nd byte: 73 */ 0x8186,
-  /* 2nd byte: 74 */ 0x818b,
-  /* 2nd byte: 75 */ 0x818e,
-  /* 2nd byte: 76 */ 0x8196,
-  /* 2nd byte: 77 */ 0x8198,
-  /* 2nd byte: 78 */ 0x819b,
-  /* 2nd byte: 79 */ 0x819e,
-  /* 2nd byte: 80 */ 0x81a2,
-  /* 2nd byte: 81 */ 0x81ae,
-  /* 2nd byte: 82 */ 0x81b2,
-  /* 2nd byte: 83 */ 0x81b4,
-  /* 2nd byte: 84 */ 0x81bb,
-  /* 2nd byte: 85 */ 0x81cb,
-  /* 2nd byte: 86 */ 0x81c3,
-  /* 2nd byte: 87 */ 0x81c5,
-  /* 2nd byte: 88 */ 0x81ca,
-  /* 2nd byte: 89 */ 0x81ce,
-  /* 2nd byte: 90 */ 0x81cf,
-  /* 2nd byte: 91 */ 0x81d5,
-  /* 2nd byte: 92 */ 0x81d7,
-  /* 2nd byte: 93 */ 0x81db,
-  /* 2nd byte: 94 */ 0x81dd,
-  /* 2nd byte: 95 */ 0x81de,
-  /* 2nd byte: 96 */ 0x81e1,
-  /* 2nd byte: 97 */ 0x81e4,
-  /* 2nd byte: 98 */ 0x81eb,
-  /* 2nd byte: 99 */ 0x81ec,
-  /* 2nd byte: 100 */ 0x81f0,
-  /* 2nd byte: 101 */ 0x81f1,
-  /* 2nd byte: 102 */ 0x81f2,
-  /* 2nd byte: 103 */ 0x81f5,
-  /* 2nd byte: 104 */ 0x81f6,
-  /* 2nd byte: 105 */ 0x81f8,
-  /* 2nd byte: 106 */ 0x81f9,
-  /* 2nd byte: 107 */ 0x81fd,
-  /* 2nd byte: 108 */ 0x81ff,
-  /* 2nd byte: 109 */ 0x8200,
-  /* 2nd byte: 110 */ 0x8203,
-  /* 2nd byte: 111 */ 0x820f,
-  /* 2nd byte: 112 */ 0x8213,
-  /* 2nd byte: 113 */ 0x8214,
-  /* 2nd byte: 114 */ 0x8219,
-  /* 2nd byte: 115 */ 0x821a,
-  /* 2nd byte: 116 */ 0x821d,
-  /* 2nd byte: 117 */ 0x8221,
-  /* 2nd byte: 118 */ 0x8222,
-  /* 2nd byte: 119 */ 0x8228,
-  /* 2nd byte: 120 */ 0x8232,
-  /* 2nd byte: 121 */ 0x8234,
-  /* 2nd byte: 122 */ 0x823a,
-  /* 2nd byte: 123 */ 0x8243,
-  /* 2nd byte: 124 */ 0x8244,
-  /* 2nd byte: 125 */ 0x8245,
-  /* 2nd byte: 126 */ 0x8246},
-/* 1st byte: 87 */ { 
-  /* 2nd byte: 33 */ 0x824b,
-  /* 2nd byte: 34 */ 0x824e,
-  /* 2nd byte: 35 */ 0x824f,
-  /* 2nd byte: 36 */ 0x8251,
-  /* 2nd byte: 37 */ 0x8256,
-  /* 2nd byte: 38 */ 0x825c,
-  /* 2nd byte: 39 */ 0x8260,
-  /* 2nd byte: 40 */ 0x8263,
-  /* 2nd byte: 41 */ 0x8267,
-  /* 2nd byte: 42 */ 0x826d,
-  /* 2nd byte: 43 */ 0x8274,
-  /* 2nd byte: 44 */ 0x827b,
-  /* 2nd byte: 45 */ 0x827d,
-  /* 2nd byte: 46 */ 0x827f,
-  /* 2nd byte: 47 */ 0x8280,
-  /* 2nd byte: 48 */ 0x8281,
-  /* 2nd byte: 49 */ 0x8283,
-  /* 2nd byte: 50 */ 0x8284,
-  /* 2nd byte: 51 */ 0x8287,
-  /* 2nd byte: 52 */ 0x8289,
-  /* 2nd byte: 53 */ 0x828a,
-  /* 2nd byte: 54 */ 0x828e,
-  /* 2nd byte: 55 */ 0x8291,
-  /* 2nd byte: 56 */ 0x8294,
-  /* 2nd byte: 57 */ 0x8296,
-  /* 2nd byte: 58 */ 0x8298,
-  /* 2nd byte: 59 */ 0x829a,
-  /* 2nd byte: 60 */ 0x829b,
-  /* 2nd byte: 61 */ 0x82a0,
-  /* 2nd byte: 62 */ 0x82a1,
-  /* 2nd byte: 63 */ 0x82a3,
-  /* 2nd byte: 64 */ 0x82a4,
-  /* 2nd byte: 65 */ 0x82a7,
-  /* 2nd byte: 66 */ 0x82a8,
-  /* 2nd byte: 67 */ 0x82a9,
-  /* 2nd byte: 68 */ 0x82aa,
-  /* 2nd byte: 69 */ 0x82ae,
-  /* 2nd byte: 70 */ 0x82b0,
-  /* 2nd byte: 71 */ 0x82b2,
-  /* 2nd byte: 72 */ 0x82b4,
-  /* 2nd byte: 73 */ 0x82b7,
-  /* 2nd byte: 74 */ 0x82ba,
-  /* 2nd byte: 75 */ 0x82bc,
-  /* 2nd byte: 76 */ 0x82be,
-  /* 2nd byte: 77 */ 0x82bf,
-  /* 2nd byte: 78 */ 0x82c6,
-  /* 2nd byte: 79 */ 0x82d0,
-  /* 2nd byte: 80 */ 0x82d5,
-  /* 2nd byte: 81 */ 0x82da,
-  /* 2nd byte: 82 */ 0x82e0,
-  /* 2nd byte: 83 */ 0x82e2,
-  /* 2nd byte: 84 */ 0x82e4,
-  /* 2nd byte: 85 */ 0x82e8,
-  /* 2nd byte: 86 */ 0x82ea,
-  /* 2nd byte: 87 */ 0x82ed,
-  /* 2nd byte: 88 */ 0x82ef,
-  /* 2nd byte: 89 */ 0x82f6,
-  /* 2nd byte: 90 */ 0x82f7,
-  /* 2nd byte: 91 */ 0x82fd,
-  /* 2nd byte: 92 */ 0x82fe,
-  /* 2nd byte: 93 */ 0x8300,
-  /* 2nd byte: 94 */ 0x8301,
-  /* 2nd byte: 95 */ 0x8307,
-  /* 2nd byte: 96 */ 0x8308,
-  /* 2nd byte: 97 */ 0x830a,
-  /* 2nd byte: 98 */ 0x830b,
-  /* 2nd byte: 99 */ 0x8354,
-  /* 2nd byte: 100 */ 0x831b,
-  /* 2nd byte: 101 */ 0x831d,
-  /* 2nd byte: 102 */ 0x831e,
-  /* 2nd byte: 103 */ 0x831f,
-  /* 2nd byte: 104 */ 0x8321,
-  /* 2nd byte: 105 */ 0x8322,
-  /* 2nd byte: 106 */ 0x832c,
-  /* 2nd byte: 107 */ 0x832d,
-  /* 2nd byte: 108 */ 0x832e,
-  /* 2nd byte: 109 */ 0x8330,
-  /* 2nd byte: 110 */ 0x8333,
-  /* 2nd byte: 111 */ 0x8337,
-  /* 2nd byte: 112 */ 0x833a,
-  /* 2nd byte: 113 */ 0x833c,
-  /* 2nd byte: 114 */ 0x833d,
-  /* 2nd byte: 115 */ 0x8342,
-  /* 2nd byte: 116 */ 0x8343,
-  /* 2nd byte: 117 */ 0x8344,
-  /* 2nd byte: 118 */ 0x8347,
-  /* 2nd byte: 119 */ 0x834d,
-  /* 2nd byte: 120 */ 0x834e,
-  /* 2nd byte: 121 */ 0x8351,
-  /* 2nd byte: 122 */ 0x8355,
-  /* 2nd byte: 123 */ 0x8356,
-  /* 2nd byte: 124 */ 0x8357,
-  /* 2nd byte: 125 */ 0x8370,
-  /* 2nd byte: 126 */ 0x8378},
-/* 1st byte: 88 */ { 
-  /* 2nd byte: 33 */ 0x837d,
-  /* 2nd byte: 34 */ 0x837f,
-  /* 2nd byte: 35 */ 0x8380,
-  /* 2nd byte: 36 */ 0x8382,
-  /* 2nd byte: 37 */ 0x8384,
-  /* 2nd byte: 38 */ 0x8386,
-  /* 2nd byte: 39 */ 0x838d,
-  /* 2nd byte: 40 */ 0x8392,
-  /* 2nd byte: 41 */ 0x8394,
-  /* 2nd byte: 42 */ 0x8395,
-  /* 2nd byte: 43 */ 0x8398,
-  /* 2nd byte: 44 */ 0x8399,
-  /* 2nd byte: 45 */ 0x839b,
-  /* 2nd byte: 46 */ 0x839c,
-  /* 2nd byte: 47 */ 0x839d,
-  /* 2nd byte: 48 */ 0x83a6,
-  /* 2nd byte: 49 */ 0x83a7,
-  /* 2nd byte: 50 */ 0x83a9,
-  /* 2nd byte: 51 */ 0x83ac,
-  /* 2nd byte: 52 */ 0x83be,
-  /* 2nd byte: 53 */ 0x83bf,
-  /* 2nd byte: 54 */ 0x83c0,
-  /* 2nd byte: 55 */ 0x83c7,
-  /* 2nd byte: 56 */ 0x83c9,
-  /* 2nd byte: 57 */ 0x83cf,
-  /* 2nd byte: 58 */ 0x83d0,
-  /* 2nd byte: 59 */ 0x83d1,
-  /* 2nd byte: 60 */ 0x83d4,
-  /* 2nd byte: 61 */ 0x83dd,
-  /* 2nd byte: 62 */ 0x8353,
-  /* 2nd byte: 63 */ 0x83e8,
-  /* 2nd byte: 64 */ 0x83ea,
-  /* 2nd byte: 65 */ 0x83f6,
-  /* 2nd byte: 66 */ 0x83f8,
-  /* 2nd byte: 67 */ 0x83f9,
-  /* 2nd byte: 68 */ 0x83fc,
-  /* 2nd byte: 69 */ 0x8401,
-  /* 2nd byte: 70 */ 0x8406,
-  /* 2nd byte: 71 */ 0x840a,
-  /* 2nd byte: 72 */ 0x840f,
-  /* 2nd byte: 73 */ 0x8411,
-  /* 2nd byte: 74 */ 0x8415,
-  /* 2nd byte: 75 */ 0x8419,
-  /* 2nd byte: 76 */ 0x83ad,
-  /* 2nd byte: 77 */ 0x842f,
-  /* 2nd byte: 78 */ 0x8439,
-  /* 2nd byte: 79 */ 0x8445,
-  /* 2nd byte: 80 */ 0x8447,
-  /* 2nd byte: 81 */ 0x8448,
-  /* 2nd byte: 82 */ 0x844a,
-  /* 2nd byte: 83 */ 0x844d,
-  /* 2nd byte: 84 */ 0x844f,
-  /* 2nd byte: 85 */ 0x8451,
-  /* 2nd byte: 86 */ 0x8452,
-  /* 2nd byte: 87 */ 0x8456,
-  /* 2nd byte: 88 */ 0x8458,
-  /* 2nd byte: 89 */ 0x8459,
-  /* 2nd byte: 90 */ 0x845a,
-  /* 2nd byte: 91 */ 0x845c,
-  /* 2nd byte: 92 */ 0x8460,
-  /* 2nd byte: 93 */ 0x8464,
-  /* 2nd byte: 94 */ 0x8465,
-  /* 2nd byte: 95 */ 0x8467,
-  /* 2nd byte: 96 */ 0x846a,
-  /* 2nd byte: 97 */ 0x8470,
-  /* 2nd byte: 98 */ 0x8473,
-  /* 2nd byte: 99 */ 0x8474,
-  /* 2nd byte: 100 */ 0x8476,
-  /* 2nd byte: 101 */ 0x8478,
-  /* 2nd byte: 102 */ 0x847c,
-  /* 2nd byte: 103 */ 0x847d,
-  /* 2nd byte: 104 */ 0x8481,
-  /* 2nd byte: 105 */ 0x8485,
-  /* 2nd byte: 106 */ 0x8492,
-  /* 2nd byte: 107 */ 0x8493,
-  /* 2nd byte: 108 */ 0x8495,
-  /* 2nd byte: 109 */ 0x849e,
-  /* 2nd byte: 110 */ 0x84a6,
-  /* 2nd byte: 111 */ 0x84a8,
-  /* 2nd byte: 112 */ 0x84a9,
-  /* 2nd byte: 113 */ 0x84aa,
-  /* 2nd byte: 114 */ 0x84af,
-  /* 2nd byte: 115 */ 0x84b1,
-  /* 2nd byte: 116 */ 0x84b4,
-  /* 2nd byte: 117 */ 0x84ba,
-  /* 2nd byte: 118 */ 0x84bd,
-  /* 2nd byte: 119 */ 0x84be,
-  /* 2nd byte: 120 */ 0x84c0,
-  /* 2nd byte: 121 */ 0x84c2,
-  /* 2nd byte: 122 */ 0x84c7,
-  /* 2nd byte: 123 */ 0x84c8,
-  /* 2nd byte: 124 */ 0x84cc,
-  /* 2nd byte: 125 */ 0x84cf,
-  /* 2nd byte: 126 */ 0x84d3},
-/* 1st byte: 89 */ { 
-  /* 2nd byte: 33 */ 0x84dc,
-  /* 2nd byte: 34 */ 0x84e7,
-  /* 2nd byte: 35 */ 0x84ea,
-  /* 2nd byte: 36 */ 0x84ef,
-  /* 2nd byte: 37 */ 0x84f0,
-  /* 2nd byte: 38 */ 0x84f1,
-  /* 2nd byte: 39 */ 0x84f2,
-  /* 2nd byte: 40 */ 0x84f7,
-  /* 2nd byte: 41 */ 0x8532,
-  /* 2nd byte: 42 */ 0x84fa,
-  /* 2nd byte: 43 */ 0x84fb,
-  /* 2nd byte: 44 */ 0x84fd,
-  /* 2nd byte: 45 */ 0x8502,
-  /* 2nd byte: 46 */ 0x8503,
-  /* 2nd byte: 47 */ 0x8507,
-  /* 2nd byte: 48 */ 0x850c,
-  /* 2nd byte: 49 */ 0x850e,
-  /* 2nd byte: 50 */ 0x8510,
-  /* 2nd byte: 51 */ 0x851c,
-  /* 2nd byte: 52 */ 0x851e,
-  /* 2nd byte: 53 */ 0x8522,
-  /* 2nd byte: 54 */ 0x8523,
-  /* 2nd byte: 55 */ 0x8524,
-  /* 2nd byte: 56 */ 0x8525,
-  /* 2nd byte: 57 */ 0x8527,
-  /* 2nd byte: 58 */ 0x852a,
-  /* 2nd byte: 59 */ 0x852b,
-  /* 2nd byte: 60 */ 0x852f,
-  /* 2nd byte: 61 */ 0x8533,
-  /* 2nd byte: 62 */ 0x8534,
-  /* 2nd byte: 63 */ 0x8536,
-  /* 2nd byte: 64 */ 0x853f,
-  /* 2nd byte: 65 */ 0x8546,
-  /* 2nd byte: 66 */ 0x854f,
-  /* 2nd byte: 67 */ 0x8550,
-  /* 2nd byte: 68 */ 0x8551,
-  /* 2nd byte: 69 */ 0x8552,
-  /* 2nd byte: 70 */ 0x8553,
-  /* 2nd byte: 71 */ 0x8556,
-  /* 2nd byte: 72 */ 0x8559,
-  /* 2nd byte: 73 */ 0x855c,
-  /* 2nd byte: 74 */ 0x855d,
-  /* 2nd byte: 75 */ 0x855e,
-  /* 2nd byte: 76 */ 0x855f,
-  /* 2nd byte: 77 */ 0x8560,
-  /* 2nd byte: 78 */ 0x8561,
-  /* 2nd byte: 79 */ 0x8562,
-  /* 2nd byte: 80 */ 0x8564,
-  /* 2nd byte: 81 */ 0x856b,
-  /* 2nd byte: 82 */ 0x856f,
-  /* 2nd byte: 83 */ 0x8579,
-  /* 2nd byte: 84 */ 0x857a,
-  /* 2nd byte: 85 */ 0x857b,
-  /* 2nd byte: 86 */ 0x857d,
-  /* 2nd byte: 87 */ 0x857f,
-  /* 2nd byte: 88 */ 0x8581,
-  /* 2nd byte: 89 */ 0x8585,
-  /* 2nd byte: 90 */ 0x8586,
-  /* 2nd byte: 91 */ 0x8589,
-  /* 2nd byte: 92 */ 0x858b,
-  /* 2nd byte: 93 */ 0x858c,
-  /* 2nd byte: 94 */ 0x858f,
-  /* 2nd byte: 95 */ 0x8593,
-  /* 2nd byte: 96 */ 0x8598,
-  /* 2nd byte: 97 */ 0x859d,
-  /* 2nd byte: 98 */ 0x859f,
-  /* 2nd byte: 99 */ 0x85a0,
-  /* 2nd byte: 100 */ 0x85a2,
-  /* 2nd byte: 101 */ 0x85a5,
-  /* 2nd byte: 102 */ 0x85a7,
-  /* 2nd byte: 103 */ 0x85b4,
-  /* 2nd byte: 104 */ 0x85b6,
-  /* 2nd byte: 105 */ 0x85b7,
-  /* 2nd byte: 106 */ 0x85b8,
-  /* 2nd byte: 107 */ 0x85bc,
-  /* 2nd byte: 108 */ 0x85bd,
-  /* 2nd byte: 109 */ 0x85be,
-  /* 2nd byte: 110 */ 0x85bf,
-  /* 2nd byte: 111 */ 0x85c2,
-  /* 2nd byte: 112 */ 0x85c7,
-  /* 2nd byte: 113 */ 0x85ca,
-  /* 2nd byte: 114 */ 0x85cb,
-  /* 2nd byte: 115 */ 0x85ce,
-  /* 2nd byte: 116 */ 0x85ad,
-  /* 2nd byte: 117 */ 0x85d8,
-  /* 2nd byte: 118 */ 0x85da,
-  /* 2nd byte: 119 */ 0x85df,
-  /* 2nd byte: 120 */ 0x85e0,
-  /* 2nd byte: 121 */ 0x85e6,
-  /* 2nd byte: 122 */ 0x85e8,
-  /* 2nd byte: 123 */ 0x85ed,
-  /* 2nd byte: 124 */ 0x85f3,
-  /* 2nd byte: 125 */ 0x85f6,
-  /* 2nd byte: 126 */ 0x85fc},
-/* 1st byte: 90 */ { 
-  /* 2nd byte: 33 */ 0x85ff,
-  /* 2nd byte: 34 */ 0x8600,
-  /* 2nd byte: 35 */ 0x8604,
-  /* 2nd byte: 36 */ 0x8605,
-  /* 2nd byte: 37 */ 0x860d,
-  /* 2nd byte: 38 */ 0x860e,
-  /* 2nd byte: 39 */ 0x8610,
-  /* 2nd byte: 40 */ 0x8611,
-  /* 2nd byte: 41 */ 0x8612,
-  /* 2nd byte: 42 */ 0x8618,
-  /* 2nd byte: 43 */ 0x8619,
-  /* 2nd byte: 44 */ 0x861b,
-  /* 2nd byte: 45 */ 0x861e,
-  /* 2nd byte: 46 */ 0x8621,
-  /* 2nd byte: 47 */ 0x8627,
-  /* 2nd byte: 48 */ 0x8629,
-  /* 2nd byte: 49 */ 0x8636,
-  /* 2nd byte: 50 */ 0x8638,
-  /* 2nd byte: 51 */ 0x863a,
-  /* 2nd byte: 52 */ 0x863c,
-  /* 2nd byte: 53 */ 0x863d,
-  /* 2nd byte: 54 */ 0x8640,
-  /* 2nd byte: 55 */ 0x8642,
-  /* 2nd byte: 56 */ 0x8646,
-  /* 2nd byte: 57 */ 0x8652,
-  /* 2nd byte: 58 */ 0x8653,
-  /* 2nd byte: 59 */ 0x8656,
-  /* 2nd byte: 60 */ 0x8657,
-  /* 2nd byte: 61 */ 0x8658,
-  /* 2nd byte: 62 */ 0x8659,
-  /* 2nd byte: 63 */ 0x865d,
-  /* 2nd byte: 64 */ 0x8660,
-  /* 2nd byte: 65 */ 0x8661,
-  /* 2nd byte: 66 */ 0x8662,
-  /* 2nd byte: 67 */ 0x8663,
-  /* 2nd byte: 68 */ 0x8664,
-  /* 2nd byte: 69 */ 0x8669,
-  /* 2nd byte: 70 */ 0x866c,
-  /* 2nd byte: 71 */ 0x866f,
-  /* 2nd byte: 72 */ 0x8675,
-  /* 2nd byte: 73 */ 0x8676,
-  /* 2nd byte: 74 */ 0x8677,
-  /* 2nd byte: 75 */ 0x867a,
-  /* 2nd byte: 76 */ 0x868d,
-  /* 2nd byte: 77 */ 0x8691,
-  /* 2nd byte: 78 */ 0x8696,
-  /* 2nd byte: 79 */ 0x8698,
-  /* 2nd byte: 80 */ 0x869a,
-  /* 2nd byte: 81 */ 0x869c,
-  /* 2nd byte: 82 */ 0x86a1,
-  /* 2nd byte: 83 */ 0x86a6,
-  /* 2nd byte: 84 */ 0x86a7,
-  /* 2nd byte: 85 */ 0x86a8,
-  /* 2nd byte: 86 */ 0x86ad,
-  /* 2nd byte: 87 */ 0x86b1,
-  /* 2nd byte: 88 */ 0x86b3,
-  /* 2nd byte: 89 */ 0x86b4,
-  /* 2nd byte: 90 */ 0x86b5,
-  /* 2nd byte: 91 */ 0x86b7,
-  /* 2nd byte: 92 */ 0x86b8,
-  /* 2nd byte: 93 */ 0x86b9,
-  /* 2nd byte: 94 */ 0x86bf,
-  /* 2nd byte: 95 */ 0x86c0,
-  /* 2nd byte: 96 */ 0x86c1,
-  /* 2nd byte: 97 */ 0x86c3,
-  /* 2nd byte: 98 */ 0x86c5,
-  /* 2nd byte: 99 */ 0x86d1,
-  /* 2nd byte: 100 */ 0x86d2,
-  /* 2nd byte: 101 */ 0x86d5,
-  /* 2nd byte: 102 */ 0x86d7,
-  /* 2nd byte: 103 */ 0x86da,
-  /* 2nd byte: 104 */ 0x86dc,
-  /* 2nd byte: 105 */ 0x86e0,
-  /* 2nd byte: 106 */ 0x86e3,
-  /* 2nd byte: 107 */ 0x86e5,
-  /* 2nd byte: 108 */ 0x86e7,
-  /* 2nd byte: 109 */ 0x8688,
-  /* 2nd byte: 110 */ 0x86fa,
-  /* 2nd byte: 111 */ 0x86fc,
-  /* 2nd byte: 112 */ 0x86fd,
-  /* 2nd byte: 113 */ 0x8704,
-  /* 2nd byte: 114 */ 0x8705,
-  /* 2nd byte: 115 */ 0x8707,
-  /* 2nd byte: 116 */ 0x870b,
-  /* 2nd byte: 117 */ 0x870e,
-  /* 2nd byte: 118 */ 0x870f,
-  /* 2nd byte: 119 */ 0x8710,
-  /* 2nd byte: 120 */ 0x8713,
-  /* 2nd byte: 121 */ 0x8714,
-  /* 2nd byte: 122 */ 0x8719,
-  /* 2nd byte: 123 */ 0x871e,
-  /* 2nd byte: 124 */ 0x871f,
-  /* 2nd byte: 125 */ 0x8721,
-  /* 2nd byte: 126 */ 0x8723},
-/* 1st byte: 91 */ { 
-  /* 2nd byte: 33 */ 0x8728,
-  /* 2nd byte: 34 */ 0x872e,
-  /* 2nd byte: 35 */ 0x872f,
-  /* 2nd byte: 36 */ 0x8731,
-  /* 2nd byte: 37 */ 0x8732,
-  /* 2nd byte: 38 */ 0x8739,
-  /* 2nd byte: 39 */ 0x873a,
-  /* 2nd byte: 40 */ 0x873c,
-  /* 2nd byte: 41 */ 0x873d,
-  /* 2nd byte: 42 */ 0x873e,
-  /* 2nd byte: 43 */ 0x8740,
-  /* 2nd byte: 44 */ 0x8743,
-  /* 2nd byte: 45 */ 0x8745,
-  /* 2nd byte: 46 */ 0x874d,
-  /* 2nd byte: 47 */ 0x8758,
-  /* 2nd byte: 48 */ 0x875d,
-  /* 2nd byte: 49 */ 0x8761,
-  /* 2nd byte: 50 */ 0x8764,
-  /* 2nd byte: 51 */ 0x8765,
-  /* 2nd byte: 52 */ 0x876f,
-  /* 2nd byte: 53 */ 0x8771,
-  /* 2nd byte: 54 */ 0x8772,
-  /* 2nd byte: 55 */ 0x877b,
-  /* 2nd byte: 56 */ 0x8783,
-  /* 2nd byte: 57 */ 0x8784,
-  /* 2nd byte: 58 */ 0x8785,
-  /* 2nd byte: 59 */ 0x8786,
-  /* 2nd byte: 60 */ 0x8787,
-  /* 2nd byte: 61 */ 0x8788,
-  /* 2nd byte: 62 */ 0x8789,
-  /* 2nd byte: 63 */ 0x878b,
-  /* 2nd byte: 64 */ 0x878c,
-  /* 2nd byte: 65 */ 0x8790,
-  /* 2nd byte: 66 */ 0x8793,
-  /* 2nd byte: 67 */ 0x8795,
-  /* 2nd byte: 68 */ 0x8797,
-  /* 2nd byte: 69 */ 0x8798,
-  /* 2nd byte: 70 */ 0x8799,
-  /* 2nd byte: 71 */ 0x879e,
-  /* 2nd byte: 72 */ 0x87a0,
-  /* 2nd byte: 73 */ 0x87a3,
-  /* 2nd byte: 74 */ 0x87a7,
-  /* 2nd byte: 75 */ 0x87ac,
-  /* 2nd byte: 76 */ 0x87ad,
-  /* 2nd byte: 77 */ 0x87ae,
-  /* 2nd byte: 78 */ 0x87b1,
-  /* 2nd byte: 79 */ 0x87b5,
-  /* 2nd byte: 80 */ 0x87be,
-  /* 2nd byte: 81 */ 0x87bf,
-  /* 2nd byte: 82 */ 0x87c1,
-  /* 2nd byte: 83 */ 0x87c8,
-  /* 2nd byte: 84 */ 0x87c9,
-  /* 2nd byte: 85 */ 0x87ca,
-  /* 2nd byte: 86 */ 0x87ce,
-  /* 2nd byte: 87 */ 0x87d5,
-  /* 2nd byte: 88 */ 0x87d6,
-  /* 2nd byte: 89 */ 0x87d9,
-  /* 2nd byte: 90 */ 0x87da,
-  /* 2nd byte: 91 */ 0x87dc,
-  /* 2nd byte: 92 */ 0x87df,
-  /* 2nd byte: 93 */ 0x87e2,
-  /* 2nd byte: 94 */ 0x87e3,
-  /* 2nd byte: 95 */ 0x87e4,
-  /* 2nd byte: 96 */ 0x87ea,
-  /* 2nd byte: 97 */ 0x87eb,
-  /* 2nd byte: 98 */ 0x87ed,
-  /* 2nd byte: 99 */ 0x87f1,
-  /* 2nd byte: 100 */ 0x87f3,
-  /* 2nd byte: 101 */ 0x87f8,
-  /* 2nd byte: 102 */ 0x87fa,
-  /* 2nd byte: 103 */ 0x87ff,
-  /* 2nd byte: 104 */ 0x8801,
-  /* 2nd byte: 105 */ 0x8803,
-  /* 2nd byte: 106 */ 0x8806,
-  /* 2nd byte: 107 */ 0x8809,
-  /* 2nd byte: 108 */ 0x880a,
-  /* 2nd byte: 109 */ 0x880b,
-  /* 2nd byte: 110 */ 0x8810,
-  /* 2nd byte: 111 */ 0x8819,
-  /* 2nd byte: 112 */ 0x8812,
-  /* 2nd byte: 113 */ 0x8813,
-  /* 2nd byte: 114 */ 0x8814,
-  /* 2nd byte: 115 */ 0x8818,
-  /* 2nd byte: 116 */ 0x881a,
-  /* 2nd byte: 117 */ 0x881b,
-  /* 2nd byte: 118 */ 0x881c,
-  /* 2nd byte: 119 */ 0x881e,
-  /* 2nd byte: 120 */ 0x881f,
-  /* 2nd byte: 121 */ 0x8828,
-  /* 2nd byte: 122 */ 0x882d,
-  /* 2nd byte: 123 */ 0x882e,
-  /* 2nd byte: 124 */ 0x8830,
-  /* 2nd byte: 125 */ 0x8832,
-  /* 2nd byte: 126 */ 0x8835},
-/* 1st byte: 92 */ { 
-  /* 2nd byte: 33 */ 0x883a,
-  /* 2nd byte: 34 */ 0x883c,
-  /* 2nd byte: 35 */ 0x8841,
-  /* 2nd byte: 36 */ 0x8843,
-  /* 2nd byte: 37 */ 0x8845,
-  /* 2nd byte: 38 */ 0x8848,
-  /* 2nd byte: 39 */ 0x8849,
-  /* 2nd byte: 40 */ 0x884a,
-  /* 2nd byte: 41 */ 0x884b,
-  /* 2nd byte: 42 */ 0x884e,
-  /* 2nd byte: 43 */ 0x8851,
-  /* 2nd byte: 44 */ 0x8855,
-  /* 2nd byte: 45 */ 0x8856,
-  /* 2nd byte: 46 */ 0x8858,
-  /* 2nd byte: 47 */ 0x885a,
-  /* 2nd byte: 48 */ 0x885c,
-  /* 2nd byte: 49 */ 0x885f,
-  /* 2nd byte: 50 */ 0x8860,
-  /* 2nd byte: 51 */ 0x8864,
-  /* 2nd byte: 52 */ 0x8869,
-  /* 2nd byte: 53 */ 0x8871,
-  /* 2nd byte: 54 */ 0x8879,
-  /* 2nd byte: 55 */ 0x887b,
-  /* 2nd byte: 56 */ 0x8880,
-  /* 2nd byte: 57 */ 0x8898,
-  /* 2nd byte: 58 */ 0x889a,
-  /* 2nd byte: 59 */ 0x889b,
-  /* 2nd byte: 60 */ 0x889c,
-  /* 2nd byte: 61 */ 0x889f,
-  /* 2nd byte: 62 */ 0x88a0,
-  /* 2nd byte: 63 */ 0x88a8,
-  /* 2nd byte: 64 */ 0x88aa,
-  /* 2nd byte: 65 */ 0x88ba,
-  /* 2nd byte: 66 */ 0x88bd,
-  /* 2nd byte: 67 */ 0x88be,
-  /* 2nd byte: 68 */ 0x88c0,
-  /* 2nd byte: 69 */ 0x88ca,
-  /* 2nd byte: 70 */ 0x88cb,
-  /* 2nd byte: 71 */ 0x88cc,
-  /* 2nd byte: 72 */ 0x88cd,
-  /* 2nd byte: 73 */ 0x88ce,
-  /* 2nd byte: 74 */ 0x88d1,
-  /* 2nd byte: 75 */ 0x88d2,
-  /* 2nd byte: 76 */ 0x88d3,
-  /* 2nd byte: 77 */ 0x88db,
-  /* 2nd byte: 78 */ 0x88de,
-  /* 2nd byte: 79 */ 0x88e7,
-  /* 2nd byte: 80 */ 0x88ef,
-  /* 2nd byte: 81 */ 0x88f0,
-  /* 2nd byte: 82 */ 0x88f1,
-  /* 2nd byte: 83 */ 0x88f5,
-  /* 2nd byte: 84 */ 0x88f7,
-  /* 2nd byte: 85 */ 0x8901,
-  /* 2nd byte: 86 */ 0x8906,
-  /* 2nd byte: 87 */ 0x890d,
-  /* 2nd byte: 88 */ 0x890e,
-  /* 2nd byte: 89 */ 0x890f,
-  /* 2nd byte: 90 */ 0x8915,
-  /* 2nd byte: 91 */ 0x8916,
-  /* 2nd byte: 92 */ 0x8918,
-  /* 2nd byte: 93 */ 0x8919,
-  /* 2nd byte: 94 */ 0x891a,
-  /* 2nd byte: 95 */ 0x891c,
-  /* 2nd byte: 96 */ 0x8920,
-  /* 2nd byte: 97 */ 0x8926,
-  /* 2nd byte: 98 */ 0x8927,
-  /* 2nd byte: 99 */ 0x8928,
-  /* 2nd byte: 100 */ 0x8930,
-  /* 2nd byte: 101 */ 0x8931,
-  /* 2nd byte: 102 */ 0x8932,
-  /* 2nd byte: 103 */ 0x8935,
-  /* 2nd byte: 104 */ 0x8939,
-  /* 2nd byte: 105 */ 0x893a,
-  /* 2nd byte: 106 */ 0x893e,
-  /* 2nd byte: 107 */ 0x8940,
-  /* 2nd byte: 108 */ 0x8942,
-  /* 2nd byte: 109 */ 0x8945,
-  /* 2nd byte: 110 */ 0x8946,
-  /* 2nd byte: 111 */ 0x8949,
-  /* 2nd byte: 112 */ 0x894f,
-  /* 2nd byte: 113 */ 0x8952,
-  /* 2nd byte: 114 */ 0x8957,
-  /* 2nd byte: 115 */ 0x895a,
-  /* 2nd byte: 116 */ 0x895b,
-  /* 2nd byte: 117 */ 0x895c,
-  /* 2nd byte: 118 */ 0x8961,
-  /* 2nd byte: 119 */ 0x8962,
-  /* 2nd byte: 120 */ 0x8963,
-  /* 2nd byte: 121 */ 0x896b,
-  /* 2nd byte: 122 */ 0x896e,
-  /* 2nd byte: 123 */ 0x8970,
-  /* 2nd byte: 124 */ 0x8973,
-  /* 2nd byte: 125 */ 0x8975,
-  /* 2nd byte: 126 */ 0x897a},
-/* 1st byte: 93 */ { 
-  /* 2nd byte: 33 */ 0x897b,
-  /* 2nd byte: 34 */ 0x897c,
-  /* 2nd byte: 35 */ 0x897d,
-  /* 2nd byte: 36 */ 0x8989,
-  /* 2nd byte: 37 */ 0x898d,
-  /* 2nd byte: 38 */ 0x8990,
-  /* 2nd byte: 39 */ 0x8994,
-  /* 2nd byte: 40 */ 0x8995,
-  /* 2nd byte: 41 */ 0x899b,
-  /* 2nd byte: 42 */ 0x899c,
-  /* 2nd byte: 43 */ 0x899f,
-  /* 2nd byte: 44 */ 0x89a0,
-  /* 2nd byte: 45 */ 0x89a5,
-  /* 2nd byte: 46 */ 0x89b0,
-  /* 2nd byte: 47 */ 0x89b4,
-  /* 2nd byte: 48 */ 0x89b5,
-  /* 2nd byte: 49 */ 0x89b6,
-  /* 2nd byte: 50 */ 0x89b7,
-  /* 2nd byte: 51 */ 0x89bc,
-  /* 2nd byte: 52 */ 0x89d4,
-  /* 2nd byte: 53 */ 0x89d5,
-  /* 2nd byte: 54 */ 0x89d6,
-  /* 2nd byte: 55 */ 0x89d7,
-  /* 2nd byte: 56 */ 0x89d8,
-  /* 2nd byte: 57 */ 0x89e5,
-  /* 2nd byte: 58 */ 0x89e9,
-  /* 2nd byte: 59 */ 0x89eb,
-  /* 2nd byte: 60 */ 0x89ed,
-  /* 2nd byte: 61 */ 0x89f1,
-  /* 2nd byte: 62 */ 0x89f3,
-  /* 2nd byte: 63 */ 0x89f6,
-  /* 2nd byte: 64 */ 0x89f9,
-  /* 2nd byte: 65 */ 0x89fd,
-  /* 2nd byte: 66 */ 0x89ff,
-  /* 2nd byte: 67 */ 0x8a04,
-  /* 2nd byte: 68 */ 0x8a05,
-  /* 2nd byte: 69 */ 0x8a07,
-  /* 2nd byte: 70 */ 0x8a0f,
-  /* 2nd byte: 71 */ 0x8a11,
-  /* 2nd byte: 72 */ 0x8a12,
-  /* 2nd byte: 73 */ 0x8a14,
-  /* 2nd byte: 74 */ 0x8a15,
-  /* 2nd byte: 75 */ 0x8a1e,
-  /* 2nd byte: 76 */ 0x8a20,
-  /* 2nd byte: 77 */ 0x8a22,
-  /* 2nd byte: 78 */ 0x8a24,
-  /* 2nd byte: 79 */ 0x8a26,
-  /* 2nd byte: 80 */ 0x8a2b,
-  /* 2nd byte: 81 */ 0x8a2c,
-  /* 2nd byte: 82 */ 0x8a2f,
-  /* 2nd byte: 83 */ 0x8a35,
-  /* 2nd byte: 84 */ 0x8a37,
-  /* 2nd byte: 85 */ 0x8a3d,
-  /* 2nd byte: 86 */ 0x8a3e,
-  /* 2nd byte: 87 */ 0x8a40,
-  /* 2nd byte: 88 */ 0x8a43,
-  /* 2nd byte: 89 */ 0x8a45,
-  /* 2nd byte: 90 */ 0x8a47,
-  /* 2nd byte: 91 */ 0x8a49,
-  /* 2nd byte: 92 */ 0x8a4d,
-  /* 2nd byte: 93 */ 0x8a4e,
-  /* 2nd byte: 94 */ 0x8a53,
-  /* 2nd byte: 95 */ 0x8a56,
-  /* 2nd byte: 96 */ 0x8a57,
-  /* 2nd byte: 97 */ 0x8a58,
-  /* 2nd byte: 98 */ 0x8a5c,
-  /* 2nd byte: 99 */ 0x8a5d,
-  /* 2nd byte: 100 */ 0x8a61,
-  /* 2nd byte: 101 */ 0x8a65,
-  /* 2nd byte: 102 */ 0x8a67,
-  /* 2nd byte: 103 */ 0x8a75,
-  /* 2nd byte: 104 */ 0x8a76,
-  /* 2nd byte: 105 */ 0x8a77,
-  /* 2nd byte: 106 */ 0x8a79,
-  /* 2nd byte: 107 */ 0x8a7a,
-  /* 2nd byte: 108 */ 0x8a7b,
-  /* 2nd byte: 109 */ 0x8a7e,
-  /* 2nd byte: 110 */ 0x8a7f,
-  /* 2nd byte: 111 */ 0x8a80,
-  /* 2nd byte: 112 */ 0x8a83,
-  /* 2nd byte: 113 */ 0x8a86,
-  /* 2nd byte: 114 */ 0x8a8b,
-  /* 2nd byte: 115 */ 0x8a8f,
-  /* 2nd byte: 116 */ 0x8a90,
-  /* 2nd byte: 117 */ 0x8a92,
-  /* 2nd byte: 118 */ 0x8a96,
-  /* 2nd byte: 119 */ 0x8a97,
-  /* 2nd byte: 120 */ 0x8a99,
-  /* 2nd byte: 121 */ 0x8a9f,
-  /* 2nd byte: 122 */ 0x8aa7,
-  /* 2nd byte: 123 */ 0x8aa9,
-  /* 2nd byte: 124 */ 0x8aae,
-  /* 2nd byte: 125 */ 0x8aaf,
-  /* 2nd byte: 126 */ 0x8ab3},
-/* 1st byte: 94 */ { 
-  /* 2nd byte: 33 */ 0x8ab6,
-  /* 2nd byte: 34 */ 0x8ab7,
-  /* 2nd byte: 35 */ 0x8abb,
-  /* 2nd byte: 36 */ 0x8abe,
-  /* 2nd byte: 37 */ 0x8ac3,
-  /* 2nd byte: 38 */ 0x8ac6,
-  /* 2nd byte: 39 */ 0x8ac8,
-  /* 2nd byte: 40 */ 0x8ac9,
-  /* 2nd byte: 41 */ 0x8aca,
-  /* 2nd byte: 42 */ 0x8ad1,
-  /* 2nd byte: 43 */ 0x8ad3,
-  /* 2nd byte: 44 */ 0x8ad4,
-  /* 2nd byte: 45 */ 0x8ad5,
-  /* 2nd byte: 46 */ 0x8ad7,
-  /* 2nd byte: 47 */ 0x8add,
-  /* 2nd byte: 48 */ 0x8adf,
-  /* 2nd byte: 49 */ 0x8aec,
-  /* 2nd byte: 50 */ 0x8af0,
-  /* 2nd byte: 51 */ 0x8af4,
-  /* 2nd byte: 52 */ 0x8af5,
-  /* 2nd byte: 53 */ 0x8af6,
-  /* 2nd byte: 54 */ 0x8afc,
-  /* 2nd byte: 55 */ 0x8aff,
-  /* 2nd byte: 56 */ 0x8b05,
-  /* 2nd byte: 57 */ 0x8b06,
-  /* 2nd byte: 58 */ 0x8b0b,
-  /* 2nd byte: 59 */ 0x8b11,
-  /* 2nd byte: 60 */ 0x8b1c,
-  /* 2nd byte: 61 */ 0x8b1e,
-  /* 2nd byte: 62 */ 0x8b1f,
-  /* 2nd byte: 63 */ 0x8b0a,
-  /* 2nd byte: 64 */ 0x8b2d,
-  /* 2nd byte: 65 */ 0x8b30,
-  /* 2nd byte: 66 */ 0x8b37,
-  /* 2nd byte: 67 */ 0x8b3c,
-  /* 2nd byte: 68 */ 0x8b42,
-  /* 2nd byte: 69 */ 0x8b43,
-  /* 2nd byte: 70 */ 0x8b44,
-  /* 2nd byte: 71 */ 0x8b45,
-  /* 2nd byte: 72 */ 0x8b46,
-  /* 2nd byte: 73 */ 0x8b48,
-  /* 2nd byte: 74 */ 0x8b52,
-  /* 2nd byte: 75 */ 0x8b53,
-  /* 2nd byte: 76 */ 0x8b54,
-  /* 2nd byte: 77 */ 0x8b59,
-  /* 2nd byte: 78 */ 0x8b4d,
-  /* 2nd byte: 79 */ 0x8b5e,
-  /* 2nd byte: 80 */ 0x8b63,
-  /* 2nd byte: 81 */ 0x8b6d,
-  /* 2nd byte: 82 */ 0x8b76,
-  /* 2nd byte: 83 */ 0x8b78,
-  /* 2nd byte: 84 */ 0x8b79,
-  /* 2nd byte: 85 */ 0x8b7c,
-  /* 2nd byte: 86 */ 0x8b7e,
-  /* 2nd byte: 87 */ 0x8b81,
-  /* 2nd byte: 88 */ 0x8b84,
-  /* 2nd byte: 89 */ 0x8b85,
-  /* 2nd byte: 90 */ 0x8b8b,
-  /* 2nd byte: 91 */ 0x8b8d,
-  /* 2nd byte: 92 */ 0x8b8f,
-  /* 2nd byte: 93 */ 0x8b94,
-  /* 2nd byte: 94 */ 0x8b95,
-  /* 2nd byte: 95 */ 0x8b9c,
-  /* 2nd byte: 96 */ 0x8b9e,
-  /* 2nd byte: 97 */ 0x8b9f,
-  /* 2nd byte: 98 */ 0x8c38,
-  /* 2nd byte: 99 */ 0x8c39,
-  /* 2nd byte: 100 */ 0x8c3d,
-  /* 2nd byte: 101 */ 0x8c3e,
-  /* 2nd byte: 102 */ 0x8c45,
-  /* 2nd byte: 103 */ 0x8c47,
-  /* 2nd byte: 104 */ 0x8c49,
-  /* 2nd byte: 105 */ 0x8c4b,
-  /* 2nd byte: 106 */ 0x8c4f,
-  /* 2nd byte: 107 */ 0x8c51,
-  /* 2nd byte: 108 */ 0x8c53,
-  /* 2nd byte: 109 */ 0x8c54,
-  /* 2nd byte: 110 */ 0x8c57,
-  /* 2nd byte: 111 */ 0x8c58,
-  /* 2nd byte: 112 */ 0x8c5b,
-  /* 2nd byte: 113 */ 0x8c5d,
-  /* 2nd byte: 114 */ 0x8c59,
-  /* 2nd byte: 115 */ 0x8c63,
-  /* 2nd byte: 116 */ 0x8c64,
-  /* 2nd byte: 117 */ 0x8c66,
-  /* 2nd byte: 118 */ 0x8c68,
-  /* 2nd byte: 119 */ 0x8c69,
-  /* 2nd byte: 120 */ 0x8c6d,
-  /* 2nd byte: 121 */ 0x8c73,
-  /* 2nd byte: 122 */ 0x8c75,
-  /* 2nd byte: 123 */ 0x8c76,
-  /* 2nd byte: 124 */ 0x8c7b,
-  /* 2nd byte: 125 */ 0x8c7e,
-  /* 2nd byte: 126 */ 0x8c86},
-/* 1st byte: 95 */ { 
-  /* 2nd byte: 33 */ 0x8c87,
-  /* 2nd byte: 34 */ 0x8c8b,
-  /* 2nd byte: 35 */ 0x8c90,
-  /* 2nd byte: 36 */ 0x8c92,
-  /* 2nd byte: 37 */ 0x8c93,
-  /* 2nd byte: 38 */ 0x8c99,
-  /* 2nd byte: 39 */ 0x8c9b,
-  /* 2nd byte: 40 */ 0x8c9c,
-  /* 2nd byte: 41 */ 0x8ca4,
-  /* 2nd byte: 42 */ 0x8cb9,
-  /* 2nd byte: 43 */ 0x8cba,
-  /* 2nd byte: 44 */ 0x8cc5,
-  /* 2nd byte: 45 */ 0x8cc6,
-  /* 2nd byte: 46 */ 0x8cc9,
-  /* 2nd byte: 47 */ 0x8ccb,
-  /* 2nd byte: 48 */ 0x8ccf,
-  /* 2nd byte: 49 */ 0x8cd6,
-  /* 2nd byte: 50 */ 0x8cd5,
-  /* 2nd byte: 51 */ 0x8cd9,
-  /* 2nd byte: 52 */ 0x8cdd,
-  /* 2nd byte: 53 */ 0x8ce1,
-  /* 2nd byte: 54 */ 0x8ce8,
-  /* 2nd byte: 55 */ 0x8cec,
-  /* 2nd byte: 56 */ 0x8cef,
-  /* 2nd byte: 57 */ 0x8cf0,
-  /* 2nd byte: 58 */ 0x8cf2,
-  /* 2nd byte: 59 */ 0x8cf5,
-  /* 2nd byte: 60 */ 0x8cf7,
-  /* 2nd byte: 61 */ 0x8cf8,
-  /* 2nd byte: 62 */ 0x8cfe,
-  /* 2nd byte: 63 */ 0x8cff,
-  /* 2nd byte: 64 */ 0x8d01,
-  /* 2nd byte: 65 */ 0x8d03,
-  /* 2nd byte: 66 */ 0x8d09,
-  /* 2nd byte: 67 */ 0x8d12,
-  /* 2nd byte: 68 */ 0x8d17,
-  /* 2nd byte: 69 */ 0x8d1b,
-  /* 2nd byte: 70 */ 0x8d65,
-  /* 2nd byte: 71 */ 0x8d69,
-  /* 2nd byte: 72 */ 0x8d6c,
-  /* 2nd byte: 73 */ 0x8d6e,
-  /* 2nd byte: 74 */ 0x8d7f,
-  /* 2nd byte: 75 */ 0x8d82,
-  /* 2nd byte: 76 */ 0x8d84,
-  /* 2nd byte: 77 */ 0x8d88,
-  /* 2nd byte: 78 */ 0x8d8d,
-  /* 2nd byte: 79 */ 0x8d90,
-  /* 2nd byte: 80 */ 0x8d91,
-  /* 2nd byte: 81 */ 0x8d95,
-  /* 2nd byte: 82 */ 0x8d9e,
-  /* 2nd byte: 83 */ 0x8d9f,
-  /* 2nd byte: 84 */ 0x8da0,
-  /* 2nd byte: 85 */ 0x8da6,
-  /* 2nd byte: 86 */ 0x8dab,
-  /* 2nd byte: 87 */ 0x8dac,
-  /* 2nd byte: 88 */ 0x8daf,
-  /* 2nd byte: 89 */ 0x8db2,
-  /* 2nd byte: 90 */ 0x8db5,
-  /* 2nd byte: 91 */ 0x8db7,
-  /* 2nd byte: 92 */ 0x8db9,
-  /* 2nd byte: 93 */ 0x8dbb,
-  /* 2nd byte: 94 */ 0x8dc0,
-  /* 2nd byte: 95 */ 0x8dc5,
-  /* 2nd byte: 96 */ 0x8dc6,
-  /* 2nd byte: 97 */ 0x8dc7,
-  /* 2nd byte: 98 */ 0x8dc8,
-  /* 2nd byte: 99 */ 0x8dca,
-  /* 2nd byte: 100 */ 0x8dce,
-  /* 2nd byte: 101 */ 0x8dd1,
-  /* 2nd byte: 102 */ 0x8dd4,
-  /* 2nd byte: 103 */ 0x8dd5,
-  /* 2nd byte: 104 */ 0x8dd7,
-  /* 2nd byte: 105 */ 0x8dd9,
-  /* 2nd byte: 106 */ 0x8de4,
-  /* 2nd byte: 107 */ 0x8de5,
-  /* 2nd byte: 108 */ 0x8de7,
-  /* 2nd byte: 109 */ 0x8dec,
-  /* 2nd byte: 110 */ 0x8df0,
-  /* 2nd byte: 111 */ 0x8dbc,
-  /* 2nd byte: 112 */ 0x8df1,
-  /* 2nd byte: 113 */ 0x8df2,
-  /* 2nd byte: 114 */ 0x8df4,
-  /* 2nd byte: 115 */ 0x8dfd,
-  /* 2nd byte: 116 */ 0x8e01,
-  /* 2nd byte: 117 */ 0x8e04,
-  /* 2nd byte: 118 */ 0x8e05,
-  /* 2nd byte: 119 */ 0x8e06,
-  /* 2nd byte: 120 */ 0x8e0b,
-  /* 2nd byte: 121 */ 0x8e11,
-  /* 2nd byte: 122 */ 0x8e14,
-  /* 2nd byte: 123 */ 0x8e16,
-  /* 2nd byte: 124 */ 0x8e20,
-  /* 2nd byte: 125 */ 0x8e21,
-  /* 2nd byte: 126 */ 0x8e22},
-/* 1st byte: 96 */ { 
-  /* 2nd byte: 33 */ 0x8e23,
-  /* 2nd byte: 34 */ 0x8e26,
-  /* 2nd byte: 35 */ 0x8e27,
-  /* 2nd byte: 36 */ 0x8e31,
-  /* 2nd byte: 37 */ 0x8e33,
-  /* 2nd byte: 38 */ 0x8e36,
-  /* 2nd byte: 39 */ 0x8e37,
-  /* 2nd byte: 40 */ 0x8e38,
-  /* 2nd byte: 41 */ 0x8e39,
-  /* 2nd byte: 42 */ 0x8e3d,
-  /* 2nd byte: 43 */ 0x8e40,
-  /* 2nd byte: 44 */ 0x8e41,
-  /* 2nd byte: 45 */ 0x8e4b,
-  /* 2nd byte: 46 */ 0x8e4d,
-  /* 2nd byte: 47 */ 0x8e4e,
-  /* 2nd byte: 48 */ 0x8e4f,
-  /* 2nd byte: 49 */ 0x8e54,
-  /* 2nd byte: 50 */ 0x8e5b,
-  /* 2nd byte: 51 */ 0x8e5c,
-  /* 2nd byte: 52 */ 0x8e5d,
-  /* 2nd byte: 53 */ 0x8e5e,
-  /* 2nd byte: 54 */ 0x8e61,
-  /* 2nd byte: 55 */ 0x8e62,
-  /* 2nd byte: 56 */ 0x8e69,
-  /* 2nd byte: 57 */ 0x8e6c,
-  /* 2nd byte: 58 */ 0x8e6d,
-  /* 2nd byte: 59 */ 0x8e6f,
-  /* 2nd byte: 60 */ 0x8e70,
-  /* 2nd byte: 61 */ 0x8e71,
-  /* 2nd byte: 62 */ 0x8e79,
-  /* 2nd byte: 63 */ 0x8e7a,
-  /* 2nd byte: 64 */ 0x8e7b,
-  /* 2nd byte: 65 */ 0x8e82,
-  /* 2nd byte: 66 */ 0x8e83,
-  /* 2nd byte: 67 */ 0x8e89,
-  /* 2nd byte: 68 */ 0x8e90,
-  /* 2nd byte: 69 */ 0x8e92,
-  /* 2nd byte: 70 */ 0x8e95,
-  /* 2nd byte: 71 */ 0x8e9a,
-  /* 2nd byte: 72 */ 0x8e9b,
-  /* 2nd byte: 73 */ 0x8e9d,
-  /* 2nd byte: 74 */ 0x8e9e,
-  /* 2nd byte: 75 */ 0x8ea2,
-  /* 2nd byte: 76 */ 0x8ea7,
-  /* 2nd byte: 77 */ 0x8ea9,
-  /* 2nd byte: 78 */ 0x8ead,
-  /* 2nd byte: 79 */ 0x8eae,
-  /* 2nd byte: 80 */ 0x8eb3,
-  /* 2nd byte: 81 */ 0x8eb5,
-  /* 2nd byte: 82 */ 0x8eba,
-  /* 2nd byte: 83 */ 0x8ebb,
-  /* 2nd byte: 84 */ 0x8ec0,
-  /* 2nd byte: 85 */ 0x8ec1,
-  /* 2nd byte: 86 */ 0x8ec3,
-  /* 2nd byte: 87 */ 0x8ec4,
-  /* 2nd byte: 88 */ 0x8ec7,
-  /* 2nd byte: 89 */ 0x8ecf,
-  /* 2nd byte: 90 */ 0x8ed1,
-  /* 2nd byte: 91 */ 0x8ed4,
-  /* 2nd byte: 92 */ 0x8edc,
-  /* 2nd byte: 93 */ 0x8ee8,
-  /* 2nd byte: 94 */ 0x8eee,
-  /* 2nd byte: 95 */ 0x8ef0,
-  /* 2nd byte: 96 */ 0x8ef1,
-  /* 2nd byte: 97 */ 0x8ef7,
-  /* 2nd byte: 98 */ 0x8ef9,
-  /* 2nd byte: 99 */ 0x8efa,
-  /* 2nd byte: 100 */ 0x8eed,
-  /* 2nd byte: 101 */ 0x8f00,
-  /* 2nd byte: 102 */ 0x8f02,
-  /* 2nd byte: 103 */ 0x8f07,
-  /* 2nd byte: 104 */ 0x8f08,
-  /* 2nd byte: 105 */ 0x8f0f,
-  /* 2nd byte: 106 */ 0x8f10,
-  /* 2nd byte: 107 */ 0x8f16,
-  /* 2nd byte: 108 */ 0x8f17,
-  /* 2nd byte: 109 */ 0x8f18,
-  /* 2nd byte: 110 */ 0x8f1e,
-  /* 2nd byte: 111 */ 0x8f20,
-  /* 2nd byte: 112 */ 0x8f21,
-  /* 2nd byte: 113 */ 0x8f23,
-  /* 2nd byte: 114 */ 0x8f25,
-  /* 2nd byte: 115 */ 0x8f27,
-  /* 2nd byte: 116 */ 0x8f28,
-  /* 2nd byte: 117 */ 0x8f2c,
-  /* 2nd byte: 118 */ 0x8f2d,
-  /* 2nd byte: 119 */ 0x8f2e,
-  /* 2nd byte: 120 */ 0x8f34,
-  /* 2nd byte: 121 */ 0x8f35,
-  /* 2nd byte: 122 */ 0x8f36,
-  /* 2nd byte: 123 */ 0x8f37,
-  /* 2nd byte: 124 */ 0x8f3a,
-  /* 2nd byte: 125 */ 0x8f40,
-  /* 2nd byte: 126 */ 0x8f41},
-/* 1st byte: 97 */ { 
-  /* 2nd byte: 33 */ 0x8f43,
-  /* 2nd byte: 34 */ 0x8f47,
-  /* 2nd byte: 35 */ 0x8f4f,
-  /* 2nd byte: 36 */ 0x8f51,
-  /* 2nd byte: 37 */ 0x8f52,
-  /* 2nd byte: 38 */ 0x8f53,
-  /* 2nd byte: 39 */ 0x8f54,
-  /* 2nd byte: 40 */ 0x8f55,
-  /* 2nd byte: 41 */ 0x8f58,
-  /* 2nd byte: 42 */ 0x8f5d,
-  /* 2nd byte: 43 */ 0x8f5e,
-  /* 2nd byte: 44 */ 0x8f65,
-  /* 2nd byte: 45 */ 0x8f9d,
-  /* 2nd byte: 46 */ 0x8fa0,
-  /* 2nd byte: 47 */ 0x8fa1,
-  /* 2nd byte: 48 */ 0x8fa4,
-  /* 2nd byte: 49 */ 0x8fa5,
-  /* 2nd byte: 50 */ 0x8fa6,
-  /* 2nd byte: 51 */ 0x8fb5,
-  /* 2nd byte: 52 */ 0x8fb6,
-  /* 2nd byte: 53 */ 0x8fb8,
-  /* 2nd byte: 54 */ 0x8fbe,
-  /* 2nd byte: 55 */ 0x8fc0,
-  /* 2nd byte: 56 */ 0x8fc1,
-  /* 2nd byte: 57 */ 0x8fc6,
-  /* 2nd byte: 58 */ 0x8fca,
-  /* 2nd byte: 59 */ 0x8fcb,
-  /* 2nd byte: 60 */ 0x8fcd,
-  /* 2nd byte: 61 */ 0x8fd0,
-  /* 2nd byte: 62 */ 0x8fd2,
-  /* 2nd byte: 63 */ 0x8fd3,
-  /* 2nd byte: 64 */ 0x8fd5,
-  /* 2nd byte: 65 */ 0x8fe0,
-  /* 2nd byte: 66 */ 0x8fe3,
-  /* 2nd byte: 67 */ 0x8fe4,
-  /* 2nd byte: 68 */ 0x8fe8,
-  /* 2nd byte: 69 */ 0x8fee,
-  /* 2nd byte: 70 */ 0x8ff1,
-  /* 2nd byte: 71 */ 0x8ff5,
-  /* 2nd byte: 72 */ 0x8ff6,
-  /* 2nd byte: 73 */ 0x8ffb,
-  /* 2nd byte: 74 */ 0x8ffe,
-  /* 2nd byte: 75 */ 0x9002,
-  /* 2nd byte: 76 */ 0x9004,
-  /* 2nd byte: 77 */ 0x9008,
-  /* 2nd byte: 78 */ 0x900c,
-  /* 2nd byte: 79 */ 0x9018,
-  /* 2nd byte: 80 */ 0x901b,
-  /* 2nd byte: 81 */ 0x9028,
-  /* 2nd byte: 82 */ 0x9029,
-  /* 2nd byte: 83 */ 0x902f,
-  /* 2nd byte: 84 */ 0x902a,
-  /* 2nd byte: 85 */ 0x902c,
-  /* 2nd byte: 86 */ 0x902d,
-  /* 2nd byte: 87 */ 0x9033,
-  /* 2nd byte: 88 */ 0x9034,
-  /* 2nd byte: 89 */ 0x9037,
-  /* 2nd byte: 90 */ 0x903f,
-  /* 2nd byte: 91 */ 0x9043,
-  /* 2nd byte: 92 */ 0x9044,
-  /* 2nd byte: 93 */ 0x904c,
-  /* 2nd byte: 94 */ 0x905b,
-  /* 2nd byte: 95 */ 0x905d,
-  /* 2nd byte: 96 */ 0x9062,
-  /* 2nd byte: 97 */ 0x9066,
-  /* 2nd byte: 98 */ 0x9067,
-  /* 2nd byte: 99 */ 0x906c,
-  /* 2nd byte: 100 */ 0x9070,
-  /* 2nd byte: 101 */ 0x9074,
-  /* 2nd byte: 102 */ 0x9079,
-  /* 2nd byte: 103 */ 0x9085,
-  /* 2nd byte: 104 */ 0x9088,
-  /* 2nd byte: 105 */ 0x908b,
-  /* 2nd byte: 106 */ 0x908c,
-  /* 2nd byte: 107 */ 0x908e,
-  /* 2nd byte: 108 */ 0x9090,
-  /* 2nd byte: 109 */ 0x9095,
-  /* 2nd byte: 110 */ 0x9097,
-  /* 2nd byte: 111 */ 0x9098,
-  /* 2nd byte: 112 */ 0x9099,
-  /* 2nd byte: 113 */ 0x909b,
-  /* 2nd byte: 114 */ 0x90a0,
-  /* 2nd byte: 115 */ 0x90a1,
-  /* 2nd byte: 116 */ 0x90a2,
-  /* 2nd byte: 117 */ 0x90a5,
-  /* 2nd byte: 118 */ 0x90b0,
-  /* 2nd byte: 119 */ 0x90b2,
-  /* 2nd byte: 120 */ 0x90b3,
-  /* 2nd byte: 121 */ 0x90b4,
-  /* 2nd byte: 122 */ 0x90b6,
-  /* 2nd byte: 123 */ 0x90bd,
-  /* 2nd byte: 124 */ 0x90cc,
-  /* 2nd byte: 125 */ 0x90be,
-  /* 2nd byte: 126 */ 0x90c3},
-/* 1st byte: 98 */ { 
-  /* 2nd byte: 33 */ 0x90c4,
-  /* 2nd byte: 34 */ 0x90c5,
-  /* 2nd byte: 35 */ 0x90c7,
-  /* 2nd byte: 36 */ 0x90c8,
-  /* 2nd byte: 37 */ 0x90d5,
-  /* 2nd byte: 38 */ 0x90d7,
-  /* 2nd byte: 39 */ 0x90d8,
-  /* 2nd byte: 40 */ 0x90d9,
-  /* 2nd byte: 41 */ 0x90dc,
-  /* 2nd byte: 42 */ 0x90dd,
-  /* 2nd byte: 43 */ 0x90df,
-  /* 2nd byte: 44 */ 0x90e5,
-  /* 2nd byte: 45 */ 0x90d2,
-  /* 2nd byte: 46 */ 0x90f6,
-  /* 2nd byte: 47 */ 0x90eb,
-  /* 2nd byte: 48 */ 0x90ef,
-  /* 2nd byte: 49 */ 0x90f0,
-  /* 2nd byte: 50 */ 0x90f4,
-  /* 2nd byte: 51 */ 0x90fe,
-  /* 2nd byte: 52 */ 0x90ff,
-  /* 2nd byte: 53 */ 0x9100,
-  /* 2nd byte: 54 */ 0x9104,
-  /* 2nd byte: 55 */ 0x9105,
-  /* 2nd byte: 56 */ 0x9106,
-  /* 2nd byte: 57 */ 0x9108,
-  /* 2nd byte: 58 */ 0x910d,
-  /* 2nd byte: 59 */ 0x9110,
-  /* 2nd byte: 60 */ 0x9114,
-  /* 2nd byte: 61 */ 0x9116,
-  /* 2nd byte: 62 */ 0x9117,
-  /* 2nd byte: 63 */ 0x9118,
-  /* 2nd byte: 64 */ 0x911a,
-  /* 2nd byte: 65 */ 0x911c,
-  /* 2nd byte: 66 */ 0x911e,
-  /* 2nd byte: 67 */ 0x9120,
-  /* 2nd byte: 68 */ 0x9125,
-  /* 2nd byte: 69 */ 0x9122,
-  /* 2nd byte: 70 */ 0x9123,
-  /* 2nd byte: 71 */ 0x9127,
-  /* 2nd byte: 72 */ 0x9129,
-  /* 2nd byte: 73 */ 0x912e,
-  /* 2nd byte: 74 */ 0x912f,
-  /* 2nd byte: 75 */ 0x9131,
-  /* 2nd byte: 76 */ 0x9134,
-  /* 2nd byte: 77 */ 0x9136,
-  /* 2nd byte: 78 */ 0x9137,
-  /* 2nd byte: 79 */ 0x9139,
-  /* 2nd byte: 80 */ 0x913a,
-  /* 2nd byte: 81 */ 0x913c,
-  /* 2nd byte: 82 */ 0x913d,
-  /* 2nd byte: 83 */ 0x9143,
-  /* 2nd byte: 84 */ 0x9147,
-  /* 2nd byte: 85 */ 0x9148,
-  /* 2nd byte: 86 */ 0x914f,
-  /* 2nd byte: 87 */ 0x9153,
-  /* 2nd byte: 88 */ 0x9157,
-  /* 2nd byte: 89 */ 0x9159,
-  /* 2nd byte: 90 */ 0x915a,
-  /* 2nd byte: 91 */ 0x915b,
-  /* 2nd byte: 92 */ 0x9161,
-  /* 2nd byte: 93 */ 0x9164,
-  /* 2nd byte: 94 */ 0x9167,
-  /* 2nd byte: 95 */ 0x916d,
-  /* 2nd byte: 96 */ 0x9174,
-  /* 2nd byte: 97 */ 0x9179,
-  /* 2nd byte: 98 */ 0x917a,
-  /* 2nd byte: 99 */ 0x917b,
-  /* 2nd byte: 100 */ 0x9181,
-  /* 2nd byte: 101 */ 0x9183,
-  /* 2nd byte: 102 */ 0x9185,
-  /* 2nd byte: 103 */ 0x9186,
-  /* 2nd byte: 104 */ 0x918a,
-  /* 2nd byte: 105 */ 0x918e,
-  /* 2nd byte: 106 */ 0x9191,
-  /* 2nd byte: 107 */ 0x9193,
-  /* 2nd byte: 108 */ 0x9194,
-  /* 2nd byte: 109 */ 0x9195,
-  /* 2nd byte: 110 */ 0x9198,
-  /* 2nd byte: 111 */ 0x919e,
-  /* 2nd byte: 112 */ 0x91a1,
-  /* 2nd byte: 113 */ 0x91a6,
-  /* 2nd byte: 114 */ 0x91a8,
-  /* 2nd byte: 115 */ 0x91ac,
-  /* 2nd byte: 116 */ 0x91ad,
-  /* 2nd byte: 117 */ 0x91ae,
-  /* 2nd byte: 118 */ 0x91b0,
-  /* 2nd byte: 119 */ 0x91b1,
-  /* 2nd byte: 120 */ 0x91b2,
-  /* 2nd byte: 121 */ 0x91b3,
-  /* 2nd byte: 122 */ 0x91b6,
-  /* 2nd byte: 123 */ 0x91bb,
-  /* 2nd byte: 124 */ 0x91bc,
-  /* 2nd byte: 125 */ 0x91bd,
-  /* 2nd byte: 126 */ 0x91bf},
-/* 1st byte: 99 */ { 
-  /* 2nd byte: 33 */ 0x91c2,
-  /* 2nd byte: 34 */ 0x91c3,
-  /* 2nd byte: 35 */ 0x91c5,
-  /* 2nd byte: 36 */ 0x91d3,
-  /* 2nd byte: 37 */ 0x91d4,
-  /* 2nd byte: 38 */ 0x91d7,
-  /* 2nd byte: 39 */ 0x91d9,
-  /* 2nd byte: 40 */ 0x91da,
-  /* 2nd byte: 41 */ 0x91de,
-  /* 2nd byte: 42 */ 0x91e4,
-  /* 2nd byte: 43 */ 0x91e5,
-  /* 2nd byte: 44 */ 0x91e9,
-  /* 2nd byte: 45 */ 0x91ea,
-  /* 2nd byte: 46 */ 0x91ec,
-  /* 2nd byte: 47 */ 0x91ed,
-  /* 2nd byte: 48 */ 0x91ee,
-  /* 2nd byte: 49 */ 0x91ef,
-  /* 2nd byte: 50 */ 0x91f0,
-  /* 2nd byte: 51 */ 0x91f1,
-  /* 2nd byte: 52 */ 0x91f7,
-  /* 2nd byte: 53 */ 0x91f9,
-  /* 2nd byte: 54 */ 0x91fb,
-  /* 2nd byte: 55 */ 0x91fd,
-  /* 2nd byte: 56 */ 0x9200,
-  /* 2nd byte: 57 */ 0x9201,
-  /* 2nd byte: 58 */ 0x9204,
-  /* 2nd byte: 59 */ 0x9205,
-  /* 2nd byte: 60 */ 0x9206,
-  /* 2nd byte: 61 */ 0x9207,
-  /* 2nd byte: 62 */ 0x9209,
-  /* 2nd byte: 63 */ 0x920a,
-  /* 2nd byte: 64 */ 0x920c,
-  /* 2nd byte: 65 */ 0x9210,
-  /* 2nd byte: 66 */ 0x9212,
-  /* 2nd byte: 67 */ 0x9213,
-  /* 2nd byte: 68 */ 0x9216,
-  /* 2nd byte: 69 */ 0x9218,
-  /* 2nd byte: 70 */ 0x921c,
-  /* 2nd byte: 71 */ 0x921d,
-  /* 2nd byte: 72 */ 0x9223,
-  /* 2nd byte: 73 */ 0x9224,
-  /* 2nd byte: 74 */ 0x9225,
-  /* 2nd byte: 75 */ 0x9226,
-  /* 2nd byte: 76 */ 0x9228,
-  /* 2nd byte: 77 */ 0x922e,
-  /* 2nd byte: 78 */ 0x922f,
-  /* 2nd byte: 79 */ 0x9230,
-  /* 2nd byte: 80 */ 0x9233,
-  /* 2nd byte: 81 */ 0x9235,
-  /* 2nd byte: 82 */ 0x9236,
-  /* 2nd byte: 83 */ 0x9238,
-  /* 2nd byte: 84 */ 0x9239,
-  /* 2nd byte: 85 */ 0x923a,
-  /* 2nd byte: 86 */ 0x923c,
-  /* 2nd byte: 87 */ 0x923e,
-  /* 2nd byte: 88 */ 0x9240,
-  /* 2nd byte: 89 */ 0x9242,
-  /* 2nd byte: 90 */ 0x9243,
-  /* 2nd byte: 91 */ 0x9246,
-  /* 2nd byte: 92 */ 0x9247,
-  /* 2nd byte: 93 */ 0x924a,
-  /* 2nd byte: 94 */ 0x924d,
-  /* 2nd byte: 95 */ 0x924e,
-  /* 2nd byte: 96 */ 0x924f,
-  /* 2nd byte: 97 */ 0x9251,
-  /* 2nd byte: 98 */ 0x9258,
-  /* 2nd byte: 99 */ 0x9259,
-  /* 2nd byte: 100 */ 0x925c,
-  /* 2nd byte: 101 */ 0x925d,
-  /* 2nd byte: 102 */ 0x9260,
-  /* 2nd byte: 103 */ 0x9261,
-  /* 2nd byte: 104 */ 0x9265,
-  /* 2nd byte: 105 */ 0x9267,
-  /* 2nd byte: 106 */ 0x9268,
-  /* 2nd byte: 107 */ 0x9269,
-  /* 2nd byte: 108 */ 0x926e,
-  /* 2nd byte: 109 */ 0x926f,
-  /* 2nd byte: 110 */ 0x9270,
-  /* 2nd byte: 111 */ 0x9275,
-  /* 2nd byte: 112 */ 0x9276,
-  /* 2nd byte: 113 */ 0x9277,
-  /* 2nd byte: 114 */ 0x9278,
-  /* 2nd byte: 115 */ 0x9279,
-  /* 2nd byte: 116 */ 0x927b,
-  /* 2nd byte: 117 */ 0x927c,
-  /* 2nd byte: 118 */ 0x927d,
-  /* 2nd byte: 119 */ 0x927f,
-  /* 2nd byte: 120 */ 0x9288,
-  /* 2nd byte: 121 */ 0x9289,
-  /* 2nd byte: 122 */ 0x928a,
-  /* 2nd byte: 123 */ 0x928d,
-  /* 2nd byte: 124 */ 0x928e,
-  /* 2nd byte: 125 */ 0x9292,
-  /* 2nd byte: 126 */ 0x9297},
-/* 1st byte: 100 */ { 
-  /* 2nd byte: 33 */ 0x9299,
-  /* 2nd byte: 34 */ 0x929f,
-  /* 2nd byte: 35 */ 0x92a0,
-  /* 2nd byte: 36 */ 0x92a4,
-  /* 2nd byte: 37 */ 0x92a5,
-  /* 2nd byte: 38 */ 0x92a7,
-  /* 2nd byte: 39 */ 0x92a8,
-  /* 2nd byte: 40 */ 0x92ab,
-  /* 2nd byte: 41 */ 0x92af,
-  /* 2nd byte: 42 */ 0x92b2,
-  /* 2nd byte: 43 */ 0x92b6,
-  /* 2nd byte: 44 */ 0x92b8,
-  /* 2nd byte: 45 */ 0x92ba,
-  /* 2nd byte: 46 */ 0x92bb,
-  /* 2nd byte: 47 */ 0x92bc,
-  /* 2nd byte: 48 */ 0x92bd,
-  /* 2nd byte: 49 */ 0x92bf,
-  /* 2nd byte: 50 */ 0x92c0,
-  /* 2nd byte: 51 */ 0x92c1,
-  /* 2nd byte: 52 */ 0x92c2,
-  /* 2nd byte: 53 */ 0x92c3,
-  /* 2nd byte: 54 */ 0x92c5,
-  /* 2nd byte: 55 */ 0x92c6,
-  /* 2nd byte: 56 */ 0x92c7,
-  /* 2nd byte: 57 */ 0x92c8,
-  /* 2nd byte: 58 */ 0x92cb,
-  /* 2nd byte: 59 */ 0x92cc,
-  /* 2nd byte: 60 */ 0x92cd,
-  /* 2nd byte: 61 */ 0x92ce,
-  /* 2nd byte: 62 */ 0x92d0,
-  /* 2nd byte: 63 */ 0x92d3,
-  /* 2nd byte: 64 */ 0x92d5,
-  /* 2nd byte: 65 */ 0x92d7,
-  /* 2nd byte: 66 */ 0x92d8,
-  /* 2nd byte: 67 */ 0x92d9,
-  /* 2nd byte: 68 */ 0x92dc,
-  /* 2nd byte: 69 */ 0x92dd,
-  /* 2nd byte: 70 */ 0x92df,
-  /* 2nd byte: 71 */ 0x92e0,
-  /* 2nd byte: 72 */ 0x92e1,
-  /* 2nd byte: 73 */ 0x92e3,
-  /* 2nd byte: 74 */ 0x92e5,
-  /* 2nd byte: 75 */ 0x92e7,
-  /* 2nd byte: 76 */ 0x92e8,
-  /* 2nd byte: 77 */ 0x92ec,
-  /* 2nd byte: 78 */ 0x92ee,
-  /* 2nd byte: 79 */ 0x92f0,
-  /* 2nd byte: 80 */ 0x92f9,
-  /* 2nd byte: 81 */ 0x92fb,
-  /* 2nd byte: 82 */ 0x92ff,
-  /* 2nd byte: 83 */ 0x9300,
-  /* 2nd byte: 84 */ 0x9302,
-  /* 2nd byte: 85 */ 0x9308,
-  /* 2nd byte: 86 */ 0x930d,
-  /* 2nd byte: 87 */ 0x9311,
-  /* 2nd byte: 88 */ 0x9314,
-  /* 2nd byte: 89 */ 0x9315,
-  /* 2nd byte: 90 */ 0x931c,
-  /* 2nd byte: 91 */ 0x931d,
-  /* 2nd byte: 92 */ 0x931e,
-  /* 2nd byte: 93 */ 0x931f,
-  /* 2nd byte: 94 */ 0x9321,
-  /* 2nd byte: 95 */ 0x9324,
-  /* 2nd byte: 96 */ 0x9325,
-  /* 2nd byte: 97 */ 0x9327,
-  /* 2nd byte: 98 */ 0x9329,
-  /* 2nd byte: 99 */ 0x932a,
-  /* 2nd byte: 100 */ 0x9333,
-  /* 2nd byte: 101 */ 0x9334,
-  /* 2nd byte: 102 */ 0x9336,
-  /* 2nd byte: 103 */ 0x9337,
-  /* 2nd byte: 104 */ 0x9347,
-  /* 2nd byte: 105 */ 0x9348,
-  /* 2nd byte: 106 */ 0x9349,
-  /* 2nd byte: 107 */ 0x9350,
-  /* 2nd byte: 108 */ 0x9351,
-  /* 2nd byte: 109 */ 0x9352,
-  /* 2nd byte: 110 */ 0x9355,
-  /* 2nd byte: 111 */ 0x9357,
-  /* 2nd byte: 112 */ 0x9358,
-  /* 2nd byte: 113 */ 0x935a,
-  /* 2nd byte: 114 */ 0x935e,
-  /* 2nd byte: 115 */ 0x9364,
-  /* 2nd byte: 116 */ 0x9365,
-  /* 2nd byte: 117 */ 0x9367,
-  /* 2nd byte: 118 */ 0x9369,
-  /* 2nd byte: 119 */ 0x936a,
-  /* 2nd byte: 120 */ 0x936d,
-  /* 2nd byte: 121 */ 0x936f,
-  /* 2nd byte: 122 */ 0x9370,
-  /* 2nd byte: 123 */ 0x9371,
-  /* 2nd byte: 124 */ 0x9373,
-  /* 2nd byte: 125 */ 0x9374,
-  /* 2nd byte: 126 */ 0x9376},
-/* 1st byte: 101 */ { 
-  /* 2nd byte: 33 */ 0x937a,
-  /* 2nd byte: 34 */ 0x937d,
-  /* 2nd byte: 35 */ 0x937f,
-  /* 2nd byte: 36 */ 0x9380,
-  /* 2nd byte: 37 */ 0x9381,
-  /* 2nd byte: 38 */ 0x9382,
-  /* 2nd byte: 39 */ 0x9388,
-  /* 2nd byte: 40 */ 0x938a,
-  /* 2nd byte: 41 */ 0x938b,
-  /* 2nd byte: 42 */ 0x938d,
-  /* 2nd byte: 43 */ 0x938f,
-  /* 2nd byte: 44 */ 0x9392,
-  /* 2nd byte: 45 */ 0x9395,
-  /* 2nd byte: 46 */ 0x9398,
-  /* 2nd byte: 47 */ 0x939b,
-  /* 2nd byte: 48 */ 0x939e,
-  /* 2nd byte: 49 */ 0x93a1,
-  /* 2nd byte: 50 */ 0x93a3,
-  /* 2nd byte: 51 */ 0x93a4,
-  /* 2nd byte: 52 */ 0x93a6,
-  /* 2nd byte: 53 */ 0x93a8,
-  /* 2nd byte: 54 */ 0x93ab,
-  /* 2nd byte: 55 */ 0x93b4,
-  /* 2nd byte: 56 */ 0x93b5,
-  /* 2nd byte: 57 */ 0x93b6,
-  /* 2nd byte: 58 */ 0x93ba,
-  /* 2nd byte: 59 */ 0x93a9,
-  /* 2nd byte: 60 */ 0x93c1,
-  /* 2nd byte: 61 */ 0x93c4,
-  /* 2nd byte: 62 */ 0x93c5,
-  /* 2nd byte: 63 */ 0x93c6,
-  /* 2nd byte: 64 */ 0x93c7,
-  /* 2nd byte: 65 */ 0x93c9,
-  /* 2nd byte: 66 */ 0x93ca,
-  /* 2nd byte: 67 */ 0x93cb,
-  /* 2nd byte: 68 */ 0x93cc,
-  /* 2nd byte: 69 */ 0x93cd,
-  /* 2nd byte: 70 */ 0x93d3,
-  /* 2nd byte: 71 */ 0x93d9,
-  /* 2nd byte: 72 */ 0x93dc,
-  /* 2nd byte: 73 */ 0x93de,
-  /* 2nd byte: 74 */ 0x93df,
-  /* 2nd byte: 75 */ 0x93e2,
-  /* 2nd byte: 76 */ 0x93e6,
-  /* 2nd byte: 77 */ 0x93e7,
-  /* 2nd byte: 78 */ 0x93f9,
-  /* 2nd byte: 79 */ 0x93f7,
-  /* 2nd byte: 80 */ 0x93f8,
-  /* 2nd byte: 81 */ 0x93fa,
-  /* 2nd byte: 82 */ 0x93fb,
-  /* 2nd byte: 83 */ 0x93fd,
-  /* 2nd byte: 84 */ 0x9401,
-  /* 2nd byte: 85 */ 0x9402,
-  /* 2nd byte: 86 */ 0x9404,
-  /* 2nd byte: 87 */ 0x9408,
-  /* 2nd byte: 88 */ 0x9409,
-  /* 2nd byte: 89 */ 0x940d,
-  /* 2nd byte: 90 */ 0x940e,
-  /* 2nd byte: 91 */ 0x940f,
-  /* 2nd byte: 92 */ 0x9415,
-  /* 2nd byte: 93 */ 0x9416,
-  /* 2nd byte: 94 */ 0x9417,
-  /* 2nd byte: 95 */ 0x941f,
-  /* 2nd byte: 96 */ 0x942e,
-  /* 2nd byte: 97 */ 0x942f,
-  /* 2nd byte: 98 */ 0x9431,
-  /* 2nd byte: 99 */ 0x9432,
-  /* 2nd byte: 100 */ 0x9433,
-  /* 2nd byte: 101 */ 0x9434,
-  /* 2nd byte: 102 */ 0x943b,
-  /* 2nd byte: 103 */ 0x943f,
-  /* 2nd byte: 104 */ 0x943d,
-  /* 2nd byte: 105 */ 0x9443,
-  /* 2nd byte: 106 */ 0x9445,
-  /* 2nd byte: 107 */ 0x9448,
-  /* 2nd byte: 108 */ 0x944a,
-  /* 2nd byte: 109 */ 0x944c,
-  /* 2nd byte: 110 */ 0x9455,
-  /* 2nd byte: 111 */ 0x9459,
-  /* 2nd byte: 112 */ 0x945c,
-  /* 2nd byte: 113 */ 0x945f,
-  /* 2nd byte: 114 */ 0x9461,
-  /* 2nd byte: 115 */ 0x9463,
-  /* 2nd byte: 116 */ 0x9468,
-  /* 2nd byte: 117 */ 0x946b,
-  /* 2nd byte: 118 */ 0x946d,
-  /* 2nd byte: 119 */ 0x946e,
-  /* 2nd byte: 120 */ 0x946f,
-  /* 2nd byte: 121 */ 0x9471,
-  /* 2nd byte: 122 */ 0x9472,
-  /* 2nd byte: 123 */ 0x9484,
-  /* 2nd byte: 124 */ 0x9483,
-  /* 2nd byte: 125 */ 0x9578,
-  /* 2nd byte: 126 */ 0x9579},
-/* 1st byte: 102 */ { 
-  /* 2nd byte: 33 */ 0x957e,
-  /* 2nd byte: 34 */ 0x9584,
-  /* 2nd byte: 35 */ 0x9588,
-  /* 2nd byte: 36 */ 0x958c,
-  /* 2nd byte: 37 */ 0x958d,
-  /* 2nd byte: 38 */ 0x958e,
-  /* 2nd byte: 39 */ 0x959d,
-  /* 2nd byte: 40 */ 0x959e,
-  /* 2nd byte: 41 */ 0x959f,
-  /* 2nd byte: 42 */ 0x95a1,
-  /* 2nd byte: 43 */ 0x95a6,
-  /* 2nd byte: 44 */ 0x95a9,
-  /* 2nd byte: 45 */ 0x95ab,
-  /* 2nd byte: 46 */ 0x95ac,
-  /* 2nd byte: 47 */ 0x95b4,
-  /* 2nd byte: 48 */ 0x95b6,
-  /* 2nd byte: 49 */ 0x95ba,
-  /* 2nd byte: 50 */ 0x95bd,
-  /* 2nd byte: 51 */ 0x95bf,
-  /* 2nd byte: 52 */ 0x95c6,
-  /* 2nd byte: 53 */ 0x95c8,
-  /* 2nd byte: 54 */ 0x95c9,
-  /* 2nd byte: 55 */ 0x95cb,
-  /* 2nd byte: 56 */ 0x95d0,
-  /* 2nd byte: 57 */ 0x95d1,
-  /* 2nd byte: 58 */ 0x95d2,
-  /* 2nd byte: 59 */ 0x95d3,
-  /* 2nd byte: 60 */ 0x95d9,
-  /* 2nd byte: 61 */ 0x95da,
-  /* 2nd byte: 62 */ 0x95dd,
-  /* 2nd byte: 63 */ 0x95de,
-  /* 2nd byte: 64 */ 0x95df,
-  /* 2nd byte: 65 */ 0x95e0,
-  /* 2nd byte: 66 */ 0x95e4,
-  /* 2nd byte: 67 */ 0x95e6,
-  /* 2nd byte: 68 */ 0x961d,
-  /* 2nd byte: 69 */ 0x961e,
-  /* 2nd byte: 70 */ 0x9622,
-  /* 2nd byte: 71 */ 0x9624,
-  /* 2nd byte: 72 */ 0x9625,
-  /* 2nd byte: 73 */ 0x9626,
-  /* 2nd byte: 74 */ 0x962c,
-  /* 2nd byte: 75 */ 0x9631,
-  /* 2nd byte: 76 */ 0x9633,
-  /* 2nd byte: 77 */ 0x9637,
-  /* 2nd byte: 78 */ 0x9638,
-  /* 2nd byte: 79 */ 0x9639,
-  /* 2nd byte: 80 */ 0x963a,
-  /* 2nd byte: 81 */ 0x963c,
-  /* 2nd byte: 82 */ 0x963d,
-  /* 2nd byte: 83 */ 0x9641,
-  /* 2nd byte: 84 */ 0x9652,
-  /* 2nd byte: 85 */ 0x9654,
-  /* 2nd byte: 86 */ 0x9656,
-  /* 2nd byte: 87 */ 0x9657,
-  /* 2nd byte: 88 */ 0x9658,
-  /* 2nd byte: 89 */ 0x9661,
-  /* 2nd byte: 90 */ 0x966e,
-  /* 2nd byte: 91 */ 0x9674,
-  /* 2nd byte: 92 */ 0x967b,
-  /* 2nd byte: 93 */ 0x967c,
-  /* 2nd byte: 94 */ 0x967e,
-  /* 2nd byte: 95 */ 0x967f,
-  /* 2nd byte: 96 */ 0x9681,
-  /* 2nd byte: 97 */ 0x9682,
-  /* 2nd byte: 98 */ 0x9683,
-  /* 2nd byte: 99 */ 0x9684,
-  /* 2nd byte: 100 */ 0x9689,
-  /* 2nd byte: 101 */ 0x9691,
-  /* 2nd byte: 102 */ 0x9696,
-  /* 2nd byte: 103 */ 0x969a,
-  /* 2nd byte: 104 */ 0x969d,
-  /* 2nd byte: 105 */ 0x969f,
-  /* 2nd byte: 106 */ 0x96a4,
-  /* 2nd byte: 107 */ 0x96a5,
-  /* 2nd byte: 108 */ 0x96a6,
-  /* 2nd byte: 109 */ 0x96a9,
-  /* 2nd byte: 110 */ 0x96ae,
-  /* 2nd byte: 111 */ 0x96af,
-  /* 2nd byte: 112 */ 0x96b3,
-  /* 2nd byte: 113 */ 0x96ba,
-  /* 2nd byte: 114 */ 0x96ca,
-  /* 2nd byte: 115 */ 0x96d2,
-  /* 2nd byte: 116 */ 0x5db2,
-  /* 2nd byte: 117 */ 0x96d8,
-  /* 2nd byte: 118 */ 0x96da,
-  /* 2nd byte: 119 */ 0x96dd,
-  /* 2nd byte: 120 */ 0x96de,
-  /* 2nd byte: 121 */ 0x96df,
-  /* 2nd byte: 122 */ 0x96e9,
-  /* 2nd byte: 123 */ 0x96ef,
-  /* 2nd byte: 124 */ 0x96f1,
-  /* 2nd byte: 125 */ 0x96fa,
-  /* 2nd byte: 126 */ 0x9702},
-/* 1st byte: 103 */ { 
-  /* 2nd byte: 33 */ 0x9703,
-  /* 2nd byte: 34 */ 0x9705,
-  /* 2nd byte: 35 */ 0x9709,
-  /* 2nd byte: 36 */ 0x971a,
-  /* 2nd byte: 37 */ 0x971b,
-  /* 2nd byte: 38 */ 0x971d,
-  /* 2nd byte: 39 */ 0x9721,
-  /* 2nd byte: 40 */ 0x9722,
-  /* 2nd byte: 41 */ 0x9723,
-  /* 2nd byte: 42 */ 0x9728,
-  /* 2nd byte: 43 */ 0x9731,
-  /* 2nd byte: 44 */ 0x9733,
-  /* 2nd byte: 45 */ 0x9741,
-  /* 2nd byte: 46 */ 0x9743,
-  /* 2nd byte: 47 */ 0x974a,
-  /* 2nd byte: 48 */ 0x974e,
-  /* 2nd byte: 49 */ 0x974f,
-  /* 2nd byte: 50 */ 0x9755,
-  /* 2nd byte: 51 */ 0x9757,
-  /* 2nd byte: 52 */ 0x9758,
-  /* 2nd byte: 53 */ 0x975a,
-  /* 2nd byte: 54 */ 0x975b,
-  /* 2nd byte: 55 */ 0x9763,
-  /* 2nd byte: 56 */ 0x9767,
-  /* 2nd byte: 57 */ 0x976a,
-  /* 2nd byte: 58 */ 0x976e,
-  /* 2nd byte: 59 */ 0x9773,
-  /* 2nd byte: 60 */ 0x9776,
-  /* 2nd byte: 61 */ 0x9777,
-  /* 2nd byte: 62 */ 0x9778,
-  /* 2nd byte: 63 */ 0x977b,
-  /* 2nd byte: 64 */ 0x977d,
-  /* 2nd byte: 65 */ 0x977f,
-  /* 2nd byte: 66 */ 0x9780,
-  /* 2nd byte: 67 */ 0x9789,
-  /* 2nd byte: 68 */ 0x9795,
-  /* 2nd byte: 69 */ 0x9796,
-  /* 2nd byte: 70 */ 0x9797,
-  /* 2nd byte: 71 */ 0x9799,
-  /* 2nd byte: 72 */ 0x979a,
-  /* 2nd byte: 73 */ 0x979e,
-  /* 2nd byte: 74 */ 0x979f,
-  /* 2nd byte: 75 */ 0x97a2,
-  /* 2nd byte: 76 */ 0x97ac,
-  /* 2nd byte: 77 */ 0x97ae,
-  /* 2nd byte: 78 */ 0x97b1,
-  /* 2nd byte: 79 */ 0x97b2,
-  /* 2nd byte: 80 */ 0x97b5,
-  /* 2nd byte: 81 */ 0x97b6,
-  /* 2nd byte: 82 */ 0x97b8,
-  /* 2nd byte: 83 */ 0x97b9,
-  /* 2nd byte: 84 */ 0x97ba,
-  /* 2nd byte: 85 */ 0x97bc,
-  /* 2nd byte: 86 */ 0x97be,
-  /* 2nd byte: 87 */ 0x97bf,
-  /* 2nd byte: 88 */ 0x97c1,
-  /* 2nd byte: 89 */ 0x97c4,
-  /* 2nd byte: 90 */ 0x97c5,
-  /* 2nd byte: 91 */ 0x97c7,
-  /* 2nd byte: 92 */ 0x97c9,
-  /* 2nd byte: 93 */ 0x97ca,
-  /* 2nd byte: 94 */ 0x97cc,
-  /* 2nd byte: 95 */ 0x97cd,
-  /* 2nd byte: 96 */ 0x97ce,
-  /* 2nd byte: 97 */ 0x97d0,
-  /* 2nd byte: 98 */ 0x97d1,
-  /* 2nd byte: 99 */ 0x97d4,
-  /* 2nd byte: 100 */ 0x97d7,
-  /* 2nd byte: 101 */ 0x97d8,
-  /* 2nd byte: 102 */ 0x97d9,
-  /* 2nd byte: 103 */ 0x97dd,
-  /* 2nd byte: 104 */ 0x97de,
-  /* 2nd byte: 105 */ 0x97e0,
-  /* 2nd byte: 106 */ 0x97db,
-  /* 2nd byte: 107 */ 0x97e1,
-  /* 2nd byte: 108 */ 0x97e4,
-  /* 2nd byte: 109 */ 0x97ef,
-  /* 2nd byte: 110 */ 0x97f1,
-  /* 2nd byte: 111 */ 0x97f4,
-  /* 2nd byte: 112 */ 0x97f7,
-  /* 2nd byte: 113 */ 0x97f8,
-  /* 2nd byte: 114 */ 0x97fa,
-  /* 2nd byte: 115 */ 0x9807,
-  /* 2nd byte: 116 */ 0x980a,
-  /* 2nd byte: 117 */ 0x9819,
-  /* 2nd byte: 118 */ 0x980d,
-  /* 2nd byte: 119 */ 0x980e,
-  /* 2nd byte: 120 */ 0x9814,
-  /* 2nd byte: 121 */ 0x9816,
-  /* 2nd byte: 122 */ 0x981c,
-  /* 2nd byte: 123 */ 0x981e,
-  /* 2nd byte: 124 */ 0x9820,
-  /* 2nd byte: 125 */ 0x9823,
-  /* 2nd byte: 126 */ 0x9826},
-/* 1st byte: 104 */ { 
-  /* 2nd byte: 33 */ 0x982b,
-  /* 2nd byte: 34 */ 0x982e,
-  /* 2nd byte: 35 */ 0x982f,
-  /* 2nd byte: 36 */ 0x9830,
-  /* 2nd byte: 37 */ 0x9832,
-  /* 2nd byte: 38 */ 0x9833,
-  /* 2nd byte: 39 */ 0x9835,
-  /* 2nd byte: 40 */ 0x9825,
-  /* 2nd byte: 41 */ 0x983e,
-  /* 2nd byte: 42 */ 0x9844,
-  /* 2nd byte: 43 */ 0x9847,
-  /* 2nd byte: 44 */ 0x984a,
-  /* 2nd byte: 45 */ 0x9851,
-  /* 2nd byte: 46 */ 0x9852,
-  /* 2nd byte: 47 */ 0x9853,
-  /* 2nd byte: 48 */ 0x9856,
-  /* 2nd byte: 49 */ 0x9857,
-  /* 2nd byte: 50 */ 0x9859,
-  /* 2nd byte: 51 */ 0x985a,
-  /* 2nd byte: 52 */ 0x9862,
-  /* 2nd byte: 53 */ 0x9863,
-  /* 2nd byte: 54 */ 0x9865,
-  /* 2nd byte: 55 */ 0x9866,
-  /* 2nd byte: 56 */ 0x986a,
-  /* 2nd byte: 57 */ 0x986c,
-  /* 2nd byte: 58 */ 0x98ab,
-  /* 2nd byte: 59 */ 0x98ad,
-  /* 2nd byte: 60 */ 0x98ae,
-  /* 2nd byte: 61 */ 0x98b0,
-  /* 2nd byte: 62 */ 0x98b4,
-  /* 2nd byte: 63 */ 0x98b7,
-  /* 2nd byte: 64 */ 0x98b8,
-  /* 2nd byte: 65 */ 0x98ba,
-  /* 2nd byte: 66 */ 0x98bb,
-  /* 2nd byte: 67 */ 0x98bf,
-  /* 2nd byte: 68 */ 0x98c2,
-  /* 2nd byte: 69 */ 0x98c5,
-  /* 2nd byte: 70 */ 0x98c8,
-  /* 2nd byte: 71 */ 0x98cc,
-  /* 2nd byte: 72 */ 0x98e1,
-  /* 2nd byte: 73 */ 0x98e3,
-  /* 2nd byte: 74 */ 0x98e5,
-  /* 2nd byte: 75 */ 0x98e6,
-  /* 2nd byte: 76 */ 0x98e7,
-  /* 2nd byte: 77 */ 0x98ea,
-  /* 2nd byte: 78 */ 0x98f3,
-  /* 2nd byte: 79 */ 0x98f6,
-  /* 2nd byte: 80 */ 0x9902,
-  /* 2nd byte: 81 */ 0x9907,
-  /* 2nd byte: 82 */ 0x9908,
-  /* 2nd byte: 83 */ 0x9911,
-  /* 2nd byte: 84 */ 0x9915,
-  /* 2nd byte: 85 */ 0x9916,
-  /* 2nd byte: 86 */ 0x9917,
-  /* 2nd byte: 87 */ 0x991a,
-  /* 2nd byte: 88 */ 0x991b,
-  /* 2nd byte: 89 */ 0x991c,
-  /* 2nd byte: 90 */ 0x991f,
-  /* 2nd byte: 91 */ 0x9922,
-  /* 2nd byte: 92 */ 0x9926,
-  /* 2nd byte: 93 */ 0x9927,
-  /* 2nd byte: 94 */ 0x992b,
-  /* 2nd byte: 95 */ 0x9931,
-  /* 2nd byte: 96 */ 0x9932,
-  /* 2nd byte: 97 */ 0x9933,
-  /* 2nd byte: 98 */ 0x9934,
-  /* 2nd byte: 99 */ 0x9935,
-  /* 2nd byte: 100 */ 0x9939,
-  /* 2nd byte: 101 */ 0x993a,
-  /* 2nd byte: 102 */ 0x993b,
-  /* 2nd byte: 103 */ 0x993c,
-  /* 2nd byte: 104 */ 0x9940,
-  /* 2nd byte: 105 */ 0x9941,
-  /* 2nd byte: 106 */ 0x9946,
-  /* 2nd byte: 107 */ 0x9947,
-  /* 2nd byte: 108 */ 0x9948,
-  /* 2nd byte: 109 */ 0x994d,
-  /* 2nd byte: 110 */ 0x994e,
-  /* 2nd byte: 111 */ 0x9954,
-  /* 2nd byte: 112 */ 0x9958,
-  /* 2nd byte: 113 */ 0x9959,
-  /* 2nd byte: 114 */ 0x995b,
-  /* 2nd byte: 115 */ 0x995c,
-  /* 2nd byte: 116 */ 0x995e,
-  /* 2nd byte: 117 */ 0x995f,
-  /* 2nd byte: 118 */ 0x9960,
-  /* 2nd byte: 119 */ 0x999b,
-  /* 2nd byte: 120 */ 0x999d,
-  /* 2nd byte: 121 */ 0x999f,
-  /* 2nd byte: 122 */ 0x99a6,
-  /* 2nd byte: 123 */ 0x99b0,
-  /* 2nd byte: 124 */ 0x99b1,
-  /* 2nd byte: 125 */ 0x99b2,
-  /* 2nd byte: 126 */ 0x99b5},
-/* 1st byte: 105 */ { 
-  /* 2nd byte: 33 */ 0x99b9,
-  /* 2nd byte: 34 */ 0x99ba,
-  /* 2nd byte: 35 */ 0x99bd,
-  /* 2nd byte: 36 */ 0x99bf,
-  /* 2nd byte: 37 */ 0x99c3,
-  /* 2nd byte: 38 */ 0x99c9,
-  /* 2nd byte: 39 */ 0x99d3,
-  /* 2nd byte: 40 */ 0x99d4,
-  /* 2nd byte: 41 */ 0x99d9,
-  /* 2nd byte: 42 */ 0x99da,
-  /* 2nd byte: 43 */ 0x99dc,
-  /* 2nd byte: 44 */ 0x99de,
-  /* 2nd byte: 45 */ 0x99e7,
-  /* 2nd byte: 46 */ 0x99ea,
-  /* 2nd byte: 47 */ 0x99eb,
-  /* 2nd byte: 48 */ 0x99ec,
-  /* 2nd byte: 49 */ 0x99f0,
-  /* 2nd byte: 50 */ 0x99f4,
-  /* 2nd byte: 51 */ 0x99f5,
-  /* 2nd byte: 52 */ 0x99f9,
-  /* 2nd byte: 53 */ 0x99fd,
-  /* 2nd byte: 54 */ 0x99fe,
-  /* 2nd byte: 55 */ 0x9a02,
-  /* 2nd byte: 56 */ 0x9a03,
-  /* 2nd byte: 57 */ 0x9a04,
-  /* 2nd byte: 58 */ 0x9a0b,
-  /* 2nd byte: 59 */ 0x9a0c,
-  /* 2nd byte: 60 */ 0x9a10,
-  /* 2nd byte: 61 */ 0x9a11,
-  /* 2nd byte: 62 */ 0x9a16,
-  /* 2nd byte: 63 */ 0x9a1e,
-  /* 2nd byte: 64 */ 0x9a20,
-  /* 2nd byte: 65 */ 0x9a22,
-  /* 2nd byte: 66 */ 0x9a23,
-  /* 2nd byte: 67 */ 0x9a24,
-  /* 2nd byte: 68 */ 0x9a27,
-  /* 2nd byte: 69 */ 0x9a2d,
-  /* 2nd byte: 70 */ 0x9a2e,
-  /* 2nd byte: 71 */ 0x9a33,
-  /* 2nd byte: 72 */ 0x9a35,
-  /* 2nd byte: 73 */ 0x9a36,
-  /* 2nd byte: 74 */ 0x9a38,
-  /* 2nd byte: 75 */ 0x9a47,
-  /* 2nd byte: 76 */ 0x9a41,
-  /* 2nd byte: 77 */ 0x9a44,
-  /* 2nd byte: 78 */ 0x9a4a,
-  /* 2nd byte: 79 */ 0x9a4b,
-  /* 2nd byte: 80 */ 0x9a4c,
-  /* 2nd byte: 81 */ 0x9a4e,
-  /* 2nd byte: 82 */ 0x9a51,
-  /* 2nd byte: 83 */ 0x9a54,
-  /* 2nd byte: 84 */ 0x9a56,
-  /* 2nd byte: 85 */ 0x9a5d,
-  /* 2nd byte: 86 */ 0x9aaa,
-  /* 2nd byte: 87 */ 0x9aac,
-  /* 2nd byte: 88 */ 0x9aae,
-  /* 2nd byte: 89 */ 0x9aaf,
-  /* 2nd byte: 90 */ 0x9ab2,
-  /* 2nd byte: 91 */ 0x9ab4,
-  /* 2nd byte: 92 */ 0x9ab5,
-  /* 2nd byte: 93 */ 0x9ab6,
-  /* 2nd byte: 94 */ 0x9ab9,
-  /* 2nd byte: 95 */ 0x9abb,
-  /* 2nd byte: 96 */ 0x9abe,
-  /* 2nd byte: 97 */ 0x9abf,
-  /* 2nd byte: 98 */ 0x9ac1,
-  /* 2nd byte: 99 */ 0x9ac3,
-  /* 2nd byte: 100 */ 0x9ac6,
-  /* 2nd byte: 101 */ 0x9ac8,
-  /* 2nd byte: 102 */ 0x9ace,
-  /* 2nd byte: 103 */ 0x9ad0,
-  /* 2nd byte: 104 */ 0x9ad2,
-  /* 2nd byte: 105 */ 0x9ad5,
-  /* 2nd byte: 106 */ 0x9ad6,
-  /* 2nd byte: 107 */ 0x9ad7,
-  /* 2nd byte: 108 */ 0x9adb,
-  /* 2nd byte: 109 */ 0x9adc,
-  /* 2nd byte: 110 */ 0x9ae0,
-  /* 2nd byte: 111 */ 0x9ae4,
-  /* 2nd byte: 112 */ 0x9ae5,
-  /* 2nd byte: 113 */ 0x9ae7,
-  /* 2nd byte: 114 */ 0x9ae9,
-  /* 2nd byte: 115 */ 0x9aec,
-  /* 2nd byte: 116 */ 0x9af2,
-  /* 2nd byte: 117 */ 0x9af3,
-  /* 2nd byte: 118 */ 0x9af5,
-  /* 2nd byte: 119 */ 0x9af9,
-  /* 2nd byte: 120 */ 0x9afa,
-  /* 2nd byte: 121 */ 0x9afd,
-  /* 2nd byte: 122 */ 0x9aff,
-  /* 2nd byte: 123 */ 0x9b00,
-  /* 2nd byte: 124 */ 0x9b01,
-  /* 2nd byte: 125 */ 0x9b02,
-  /* 2nd byte: 126 */ 0x9b03},
-/* 1st byte: 106 */ { 
-  /* 2nd byte: 33 */ 0x9b04,
-  /* 2nd byte: 34 */ 0x9b05,
-  /* 2nd byte: 35 */ 0x9b08,
-  /* 2nd byte: 36 */ 0x9b09,
-  /* 2nd byte: 37 */ 0x9b0b,
-  /* 2nd byte: 38 */ 0x9b0c,
-  /* 2nd byte: 39 */ 0x9b0d,
-  /* 2nd byte: 40 */ 0x9b0e,
-  /* 2nd byte: 41 */ 0x9b10,
-  /* 2nd byte: 42 */ 0x9b12,
-  /* 2nd byte: 43 */ 0x9b16,
-  /* 2nd byte: 44 */ 0x9b19,
-  /* 2nd byte: 45 */ 0x9b1b,
-  /* 2nd byte: 46 */ 0x9b1c,
-  /* 2nd byte: 47 */ 0x9b20,
-  /* 2nd byte: 48 */ 0x9b26,
-  /* 2nd byte: 49 */ 0x9b2b,
-  /* 2nd byte: 50 */ 0x9b2d,
-  /* 2nd byte: 51 */ 0x9b33,
-  /* 2nd byte: 52 */ 0x9b34,
-  /* 2nd byte: 53 */ 0x9b35,
-  /* 2nd byte: 54 */ 0x9b37,
-  /* 2nd byte: 55 */ 0x9b39,
-  /* 2nd byte: 56 */ 0x9b3a,
-  /* 2nd byte: 57 */ 0x9b3d,
-  /* 2nd byte: 58 */ 0x9b48,
-  /* 2nd byte: 59 */ 0x9b4b,
-  /* 2nd byte: 60 */ 0x9b4c,
-  /* 2nd byte: 61 */ 0x9b55,
-  /* 2nd byte: 62 */ 0x9b56,
-  /* 2nd byte: 63 */ 0x9b57,
-  /* 2nd byte: 64 */ 0x9b5b,
-  /* 2nd byte: 65 */ 0x9b5e,
-  /* 2nd byte: 66 */ 0x9b61,
-  /* 2nd byte: 67 */ 0x9b63,
-  /* 2nd byte: 68 */ 0x9b65,
-  /* 2nd byte: 69 */ 0x9b66,
-  /* 2nd byte: 70 */ 0x9b68,
-  /* 2nd byte: 71 */ 0x9b6a,
-  /* 2nd byte: 72 */ 0x9b6b,
-  /* 2nd byte: 73 */ 0x9b6c,
-  /* 2nd byte: 74 */ 0x9b6d,
-  /* 2nd byte: 75 */ 0x9b6e,
-  /* 2nd byte: 76 */ 0x9b73,
-  /* 2nd byte: 77 */ 0x9b75,
-  /* 2nd byte: 78 */ 0x9b77,
-  /* 2nd byte: 79 */ 0x9b78,
-  /* 2nd byte: 80 */ 0x9b79,
-  /* 2nd byte: 81 */ 0x9b7f,
-  /* 2nd byte: 82 */ 0x9b80,
-  /* 2nd byte: 83 */ 0x9b84,
-  /* 2nd byte: 84 */ 0x9b85,
-  /* 2nd byte: 85 */ 0x9b86,
-  /* 2nd byte: 86 */ 0x9b87,
-  /* 2nd byte: 87 */ 0x9b89,
-  /* 2nd byte: 88 */ 0x9b8a,
-  /* 2nd byte: 89 */ 0x9b8b,
-  /* 2nd byte: 90 */ 0x9b8d,
-  /* 2nd byte: 91 */ 0x9b8f,
-  /* 2nd byte: 92 */ 0x9b90,
-  /* 2nd byte: 93 */ 0x9b94,
-  /* 2nd byte: 94 */ 0x9b9a,
-  /* 2nd byte: 95 */ 0x9b9d,
-  /* 2nd byte: 96 */ 0x9b9e,
-  /* 2nd byte: 97 */ 0x9ba6,
-  /* 2nd byte: 98 */ 0x9ba7,
-  /* 2nd byte: 99 */ 0x9ba9,
-  /* 2nd byte: 100 */ 0x9bac,
-  /* 2nd byte: 101 */ 0x9bb0,
-  /* 2nd byte: 102 */ 0x9bb1,
-  /* 2nd byte: 103 */ 0x9bb2,
-  /* 2nd byte: 104 */ 0x9bb7,
-  /* 2nd byte: 105 */ 0x9bb8,
-  /* 2nd byte: 106 */ 0x9bbb,
-  /* 2nd byte: 107 */ 0x9bbc,
-  /* 2nd byte: 108 */ 0x9bbe,
-  /* 2nd byte: 109 */ 0x9bbf,
-  /* 2nd byte: 110 */ 0x9bc1,
-  /* 2nd byte: 111 */ 0x9bc7,
-  /* 2nd byte: 112 */ 0x9bc8,
-  /* 2nd byte: 113 */ 0x9bce,
-  /* 2nd byte: 114 */ 0x9bd0,
-  /* 2nd byte: 115 */ 0x9bd7,
-  /* 2nd byte: 116 */ 0x9bd8,
-  /* 2nd byte: 117 */ 0x9bdd,
-  /* 2nd byte: 118 */ 0x9bdf,
-  /* 2nd byte: 119 */ 0x9be5,
-  /* 2nd byte: 120 */ 0x9be7,
-  /* 2nd byte: 121 */ 0x9bea,
-  /* 2nd byte: 122 */ 0x9beb,
-  /* 2nd byte: 123 */ 0x9bef,
-  /* 2nd byte: 124 */ 0x9bf3,
-  /* 2nd byte: 125 */ 0x9bf7,
-  /* 2nd byte: 126 */ 0x9bf8},
-/* 1st byte: 107 */ { 
-  /* 2nd byte: 33 */ 0x9bf9,
-  /* 2nd byte: 34 */ 0x9bfa,
-  /* 2nd byte: 35 */ 0x9bfd,
-  /* 2nd byte: 36 */ 0x9bff,
-  /* 2nd byte: 37 */ 0x9c00,
-  /* 2nd byte: 38 */ 0x9c02,
-  /* 2nd byte: 39 */ 0x9c0b,
-  /* 2nd byte: 40 */ 0x9c0f,
-  /* 2nd byte: 41 */ 0x9c11,
-  /* 2nd byte: 42 */ 0x9c16,
-  /* 2nd byte: 43 */ 0x9c18,
-  /* 2nd byte: 44 */ 0x9c19,
-  /* 2nd byte: 45 */ 0x9c1a,
-  /* 2nd byte: 46 */ 0x9c1c,
-  /* 2nd byte: 47 */ 0x9c1e,
-  /* 2nd byte: 48 */ 0x9c22,
-  /* 2nd byte: 49 */ 0x9c23,
-  /* 2nd byte: 50 */ 0x9c26,
-  /* 2nd byte: 51 */ 0x9c27,
-  /* 2nd byte: 52 */ 0x9c28,
-  /* 2nd byte: 53 */ 0x9c29,
-  /* 2nd byte: 54 */ 0x9c2a,
-  /* 2nd byte: 55 */ 0x9c31,
-  /* 2nd byte: 56 */ 0x9c35,
-  /* 2nd byte: 57 */ 0x9c36,
-  /* 2nd byte: 58 */ 0x9c37,
-  /* 2nd byte: 59 */ 0x9c3d,
-  /* 2nd byte: 60 */ 0x9c41,
-  /* 2nd byte: 61 */ 0x9c43,
-  /* 2nd byte: 62 */ 0x9c44,
-  /* 2nd byte: 63 */ 0x9c45,
-  /* 2nd byte: 64 */ 0x9c49,
-  /* 2nd byte: 65 */ 0x9c4a,
-  /* 2nd byte: 66 */ 0x9c4e,
-  /* 2nd byte: 67 */ 0x9c4f,
-  /* 2nd byte: 68 */ 0x9c50,
-  /* 2nd byte: 69 */ 0x9c53,
-  /* 2nd byte: 70 */ 0x9c54,
-  /* 2nd byte: 71 */ 0x9c56,
-  /* 2nd byte: 72 */ 0x9c58,
-  /* 2nd byte: 73 */ 0x9c5b,
-  /* 2nd byte: 74 */ 0x9c5d,
-  /* 2nd byte: 75 */ 0x9c5e,
-  /* 2nd byte: 76 */ 0x9c5f,
-  /* 2nd byte: 77 */ 0x9c63,
-  /* 2nd byte: 78 */ 0x9c69,
-  /* 2nd byte: 79 */ 0x9c6a,
-  /* 2nd byte: 80 */ 0x9c5c,
-  /* 2nd byte: 81 */ 0x9c6b,
-  /* 2nd byte: 82 */ 0x9c68,
-  /* 2nd byte: 83 */ 0x9c6e,
-  /* 2nd byte: 84 */ 0x9c70,
-  /* 2nd byte: 85 */ 0x9c72,
-  /* 2nd byte: 86 */ 0x9c75,
-  /* 2nd byte: 87 */ 0x9c77,
-  /* 2nd byte: 88 */ 0x9c7b,
-  /* 2nd byte: 89 */ 0x9ce6,
-  /* 2nd byte: 90 */ 0x9cf2,
-  /* 2nd byte: 91 */ 0x9cf7,
-  /* 2nd byte: 92 */ 0x9cf9,
-  /* 2nd byte: 93 */ 0x9d0b,
-  /* 2nd byte: 94 */ 0x9d02,
-  /* 2nd byte: 95 */ 0x9d11,
-  /* 2nd byte: 96 */ 0x9d17,
-  /* 2nd byte: 97 */ 0x9d18,
-  /* 2nd byte: 98 */ 0x9d1c,
-  /* 2nd byte: 99 */ 0x9d1d,
-  /* 2nd byte: 100 */ 0x9d1e,
-  /* 2nd byte: 101 */ 0x9d2f,
-  /* 2nd byte: 102 */ 0x9d30,
-  /* 2nd byte: 103 */ 0x9d32,
-  /* 2nd byte: 104 */ 0x9d33,
-  /* 2nd byte: 105 */ 0x9d34,
-  /* 2nd byte: 106 */ 0x9d3a,
-  /* 2nd byte: 107 */ 0x9d3c,
-  /* 2nd byte: 108 */ 0x9d45,
-  /* 2nd byte: 109 */ 0x9d3d,
-  /* 2nd byte: 110 */ 0x9d42,
-  /* 2nd byte: 111 */ 0x9d43,
-  /* 2nd byte: 112 */ 0x9d47,
-  /* 2nd byte: 113 */ 0x9d4a,
-  /* 2nd byte: 114 */ 0x9d53,
-  /* 2nd byte: 115 */ 0x9d54,
-  /* 2nd byte: 116 */ 0x9d5f,
-  /* 2nd byte: 117 */ 0x9d63,
-  /* 2nd byte: 118 */ 0x9d62,
-  /* 2nd byte: 119 */ 0x9d65,
-  /* 2nd byte: 120 */ 0x9d69,
-  /* 2nd byte: 121 */ 0x9d6a,
-  /* 2nd byte: 122 */ 0x9d6b,
-  /* 2nd byte: 123 */ 0x9d70,
-  /* 2nd byte: 124 */ 0x9d76,
-  /* 2nd byte: 125 */ 0x9d77,
-  /* 2nd byte: 126 */ 0x9d7b},
-/* 1st byte: 108 */ { 
-  /* 2nd byte: 33 */ 0x9d7c,
-  /* 2nd byte: 34 */ 0x9d7e,
-  /* 2nd byte: 35 */ 0x9d83,
-  /* 2nd byte: 36 */ 0x9d84,
-  /* 2nd byte: 37 */ 0x9d86,
-  /* 2nd byte: 38 */ 0x9d8a,
-  /* 2nd byte: 39 */ 0x9d8d,
-  /* 2nd byte: 40 */ 0x9d8e,
-  /* 2nd byte: 41 */ 0x9d92,
-  /* 2nd byte: 42 */ 0x9d93,
-  /* 2nd byte: 43 */ 0x9d95,
-  /* 2nd byte: 44 */ 0x9d96,
-  /* 2nd byte: 45 */ 0x9d97,
-  /* 2nd byte: 46 */ 0x9d98,
-  /* 2nd byte: 47 */ 0x9da1,
-  /* 2nd byte: 48 */ 0x9daa,
-  /* 2nd byte: 49 */ 0x9dac,
-  /* 2nd byte: 50 */ 0x9dae,
-  /* 2nd byte: 51 */ 0x9db1,
-  /* 2nd byte: 52 */ 0x9db5,
-  /* 2nd byte: 53 */ 0x9db9,
-  /* 2nd byte: 54 */ 0x9dbc,
-  /* 2nd byte: 55 */ 0x9dbf,
-  /* 2nd byte: 56 */ 0x9dc3,
-  /* 2nd byte: 57 */ 0x9dc7,
-  /* 2nd byte: 58 */ 0x9dc9,
-  /* 2nd byte: 59 */ 0x9dca,
-  /* 2nd byte: 60 */ 0x9dd4,
-  /* 2nd byte: 61 */ 0x9dd5,
-  /* 2nd byte: 62 */ 0x9dd6,
-  /* 2nd byte: 63 */ 0x9dd7,
-  /* 2nd byte: 64 */ 0x9dda,
-  /* 2nd byte: 65 */ 0x9dde,
-  /* 2nd byte: 66 */ 0x9ddf,
-  /* 2nd byte: 67 */ 0x9de0,
-  /* 2nd byte: 68 */ 0x9de5,
-  /* 2nd byte: 69 */ 0x9de7,
-  /* 2nd byte: 70 */ 0x9de9,
-  /* 2nd byte: 71 */ 0x9deb,
-  /* 2nd byte: 72 */ 0x9dee,
-  /* 2nd byte: 73 */ 0x9df0,
-  /* 2nd byte: 74 */ 0x9df3,
-  /* 2nd byte: 75 */ 0x9df4,
-  /* 2nd byte: 76 */ 0x9dfe,
-  /* 2nd byte: 77 */ 0x9e0a,
-  /* 2nd byte: 78 */ 0x9e02,
-  /* 2nd byte: 79 */ 0x9e07,
-  /* 2nd byte: 80 */ 0x9e0e,
-  /* 2nd byte: 81 */ 0x9e10,
-  /* 2nd byte: 82 */ 0x9e11,
-  /* 2nd byte: 83 */ 0x9e12,
-  /* 2nd byte: 84 */ 0x9e15,
-  /* 2nd byte: 85 */ 0x9e16,
-  /* 2nd byte: 86 */ 0x9e19,
-  /* 2nd byte: 87 */ 0x9e1c,
-  /* 2nd byte: 88 */ 0x9e1d,
-  /* 2nd byte: 89 */ 0x9e7a,
-  /* 2nd byte: 90 */ 0x9e7b,
-  /* 2nd byte: 91 */ 0x9e7c,
-  /* 2nd byte: 92 */ 0x9e80,
-  /* 2nd byte: 93 */ 0x9e82,
-  /* 2nd byte: 94 */ 0x9e83,
-  /* 2nd byte: 95 */ 0x9e84,
-  /* 2nd byte: 96 */ 0x9e85,
-  /* 2nd byte: 97 */ 0x9e87,
-  /* 2nd byte: 98 */ 0x9e8e,
-  /* 2nd byte: 99 */ 0x9e8f,
-  /* 2nd byte: 100 */ 0x9e96,
-  /* 2nd byte: 101 */ 0x9e98,
-  /* 2nd byte: 102 */ 0x9e9b,
-  /* 2nd byte: 103 */ 0x9e9e,
-  /* 2nd byte: 104 */ 0x9ea4,
-  /* 2nd byte: 105 */ 0x9ea8,
-  /* 2nd byte: 106 */ 0x9eac,
-  /* 2nd byte: 107 */ 0x9eae,
-  /* 2nd byte: 108 */ 0x9eaf,
-  /* 2nd byte: 109 */ 0x9eb0,
-  /* 2nd byte: 110 */ 0x9eb3,
-  /* 2nd byte: 111 */ 0x9eb4,
-  /* 2nd byte: 112 */ 0x9eb5,
-  /* 2nd byte: 113 */ 0x9ec6,
-  /* 2nd byte: 114 */ 0x9ec8,
-  /* 2nd byte: 115 */ 0x9ecb,
-  /* 2nd byte: 116 */ 0x9ed5,
-  /* 2nd byte: 117 */ 0x9edf,
-  /* 2nd byte: 118 */ 0x9ee4,
-  /* 2nd byte: 119 */ 0x9ee7,
-  /* 2nd byte: 120 */ 0x9eec,
-  /* 2nd byte: 121 */ 0x9eed,
-  /* 2nd byte: 122 */ 0x9eee,
-  /* 2nd byte: 123 */ 0x9ef0,
-  /* 2nd byte: 124 */ 0x9ef1,
-  /* 2nd byte: 125 */ 0x9ef2,
-  /* 2nd byte: 126 */ 0x9ef5},
-/* 1st byte: 109 */ { 
-  /* 2nd byte: 33 */ 0x9ef8,
-  /* 2nd byte: 34 */ 0x9eff,
-  /* 2nd byte: 35 */ 0x9f02,
-  /* 2nd byte: 36 */ 0x9f03,
-  /* 2nd byte: 37 */ 0x9f09,
-  /* 2nd byte: 38 */ 0x9f0f,
-  /* 2nd byte: 39 */ 0x9f10,
-  /* 2nd byte: 40 */ 0x9f11,
-  /* 2nd byte: 41 */ 0x9f12,
-  /* 2nd byte: 42 */ 0x9f14,
-  /* 2nd byte: 43 */ 0x9f16,
-  /* 2nd byte: 44 */ 0x9f17,
-  /* 2nd byte: 45 */ 0x9f19,
-  /* 2nd byte: 46 */ 0x9f1a,
-  /* 2nd byte: 47 */ 0x9f1b,
-  /* 2nd byte: 48 */ 0x9f1f,
-  /* 2nd byte: 49 */ 0x9f22,
-  /* 2nd byte: 50 */ 0x9f26,
-  /* 2nd byte: 51 */ 0x9f2a,
-  /* 2nd byte: 52 */ 0x9f2b,
-  /* 2nd byte: 53 */ 0x9f2f,
-  /* 2nd byte: 54 */ 0x9f31,
-  /* 2nd byte: 55 */ 0x9f32,
-  /* 2nd byte: 56 */ 0x9f34,
-  /* 2nd byte: 57 */ 0x9f37,
-  /* 2nd byte: 58 */ 0x9f39,
-  /* 2nd byte: 59 */ 0x9f3a,
-  /* 2nd byte: 60 */ 0x9f3c,
-  /* 2nd byte: 61 */ 0x9f3d,
-  /* 2nd byte: 62 */ 0x9f3f,
-  /* 2nd byte: 63 */ 0x9f41,
-  /* 2nd byte: 64 */ 0x9f43,
-  /* 2nd byte: 65 */ 0x9f44,
-  /* 2nd byte: 66 */ 0x9f45,
-  /* 2nd byte: 67 */ 0x9f46,
-  /* 2nd byte: 68 */ 0x9f47,
-  /* 2nd byte: 69 */ 0x9f53,
-  /* 2nd byte: 70 */ 0x9f55,
-  /* 2nd byte: 71 */ 0x9f56,
-  /* 2nd byte: 72 */ 0x9f57,
-  /* 2nd byte: 73 */ 0x9f58,
-  /* 2nd byte: 74 */ 0x9f5a,
-  /* 2nd byte: 75 */ 0x9f5d,
-  /* 2nd byte: 76 */ 0x9f5e,
-  /* 2nd byte: 77 */ 0x9f68,
-  /* 2nd byte: 78 */ 0x9f69,
-  /* 2nd byte: 79 */ 0x9f6d,
-  /* 2nd byte: 80 */ 0x9f6e,
-  /* 2nd byte: 81 */ 0x9f6f,
-  /* 2nd byte: 82 */ 0x9f70,
-  /* 2nd byte: 83 */ 0x9f71,
-  /* 2nd byte: 84 */ 0x9f73,
-  /* 2nd byte: 85 */ 0x9f75,
-  /* 2nd byte: 86 */ 0x9f7a,
-  /* 2nd byte: 87 */ 0x9f7d,
-  /* 2nd byte: 88 */ 0x9f8f,
-  /* 2nd byte: 89 */ 0x9f90,
-  /* 2nd byte: 90 */ 0x9f91,
-  /* 2nd byte: 91 */ 0x9f92,
-  /* 2nd byte: 92 */ 0x9f94,
-  /* 2nd byte: 93 */ 0x9f96,
-  /* 2nd byte: 94 */ 0x9f97,
-  /* 2nd byte: 95 */ 0x9f9e,
-  /* 2nd byte: 96 */ 0x9fa1,
-  /* 2nd byte: 97 */ 0x9fa2,
-  /* 2nd byte: 98 */ 0x9fa3,
-  /* 2nd byte: 99 */ 0x9fa5,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0}
-};
diff --git a/libjava/gnu/gcj/convert/Output_8859_1.h b/libjava/gnu/gcj/convert/Output_8859_1.h
deleted file mode 100644
index 8dcd92d..0000000
--- a/libjava/gnu/gcj/convert/Output_8859_1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_8859_1__
-#define __gnu_gcj_convert_Output_8859_1__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_8859_1;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_8859_1 : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_8859_1();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_8859_1__
diff --git a/libjava/gnu/gcj/convert/Output_8859_1.java b/libjava/gnu/gcj/convert/Output_8859_1.java
deleted file mode 100644
index 7ae6a61..0000000
--- a/libjava/gnu/gcj/convert/Output_8859_1.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
- 
-/**
- * Convert Unicode ISO-Latin-1 (8851-1) text.
- * Unrecognized characters are printed as `?'.
- * @author Per Bothner <bothner@cygnus.com>
- * @date March 1999.
- */
-
-public class Output_8859_1 extends UnicodeToBytes
-{
-  public String getName() { return "8859_1"; }
-
-  /**
-   * @return number of chars converted. */
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    int count = this.count;
-    byte[] buf = this.buf;
-    int avail = buf.length - count;
-    if (inlength > avail)
-      inlength = avail;
-    for (int i = inlength;  --i >= 0;  )
-      {
-	char c = inbuffer[inpos++];
-	buf[count++] = (byte) ((c > 0xff) ? '?' : c);
-      }
-    this.count = count;
-    return inlength;
-  }
-
-  public int write (String str, int inpos, int inlength, char[] work)
-  {
-    int count = this.count;
-    byte[] buf = this.buf;
-    int avail = buf.length - count;
-    if (inlength > avail)
-      inlength = avail;
-    for (int i = inlength;  --i >= 0;  )
-      {
-	char c = str.charAt(inpos++);
-	buf[count++] = (byte) ((c > 0xff) ? '?' : c);
-      }
-    this.count = count;
-    return inlength;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Output_ASCII.h b/libjava/gnu/gcj/convert/Output_ASCII.h
deleted file mode 100644
index 3dc551c..0000000
--- a/libjava/gnu/gcj/convert/Output_ASCII.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_ASCII__
-#define __gnu_gcj_convert_Output_ASCII__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_ASCII;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_ASCII : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_ASCII();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_ASCII__
diff --git a/libjava/gnu/gcj/convert/Output_ASCII.java b/libjava/gnu/gcj/convert/Output_ASCII.java
deleted file mode 100644
index 9f33645..0000000
--- a/libjava/gnu/gcj/convert/Output_ASCII.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
- 
-/**
- * Convert Unicode ASCII
- * Unrecognized characters are printed as `?'.
- * @date October 2000
- */
-
-public class Output_ASCII extends UnicodeToBytes
-{
-  public String getName() { return "ASCII"; }
-
-  /**
-   * @return number of chars converted. */
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    int count = this.count;
-    byte[] buf = this.buf;
-    int avail = buf.length - count;
-    if (inlength > avail)
-      inlength = avail;
-    for (int i = inlength;  --i >= 0;  )
-      {
-	char c = inbuffer[inpos++];
-	buf[count++] = (byte) ((c > 0x7f) ? '?' : c);
-      }
-    this.count = count;
-    return inlength;
-  }
-
-  public int write (String str, int inpos, int inlength, char[] work)
-  {
-    int count = this.count;
-    byte[] buf = this.buf;
-    int avail = buf.length - count;
-    if (inlength > avail)
-      inlength = avail;
-    for (int i = inlength;  --i >= 0;  )
-      {
-	char c = str.charAt(inpos++);
-	buf[count++] = (byte) ((c > 0x7f) ? '?' : c);
-      }
-    this.count = count;
-    return inlength;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Output_EUCJIS.h b/libjava/gnu/gcj/convert/Output_EUCJIS.h
deleted file mode 100644
index f1d9258..0000000
--- a/libjava/gnu/gcj/convert/Output_EUCJIS.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_EUCJIS__
-#define __gnu_gcj_convert_Output_EUCJIS__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_EUCJIS;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_EUCJIS : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_EUCJIS();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
-  virtual jboolean havePendingBytes();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) pending1;
-  jint pending2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_EUCJIS__
diff --git a/libjava/gnu/gcj/convert/Output_EUCJIS.java b/libjava/gnu/gcj/convert/Output_EUCJIS.java
deleted file mode 100644
index c0cc437..0000000
--- a/libjava/gnu/gcj/convert/Output_EUCJIS.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1999, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert Unicode to EUCJIS (Extended Unix Code for Japan).
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Output_EUCJIS extends UnicodeToBytes
-{
-  public String getName() { return "EUCJIS"; }
-
-  public native int write (char[] inbuffer, int inpos, int inlength);
-
-  public native int write (String str, int inpos, int inlength, char[] work);
-
-  public boolean havePendingBytes()
-  {
-    return pending1 >= 0;
-  }
-
-  int pending1 = -1;
-  int pending2;
-}
diff --git a/libjava/gnu/gcj/convert/Output_JavaSrc.h b/libjava/gnu/gcj/convert/Output_JavaSrc.h
deleted file mode 100644
index 8cea373..0000000
--- a/libjava/gnu/gcj/convert/Output_JavaSrc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_JavaSrc__
-#define __gnu_gcj_convert_Output_JavaSrc__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_JavaSrc;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_JavaSrc : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_JavaSrc();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) todo;
-  jint pending_char;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_JavaSrc__
diff --git a/libjava/gnu/gcj/convert/Output_JavaSrc.java b/libjava/gnu/gcj/convert/Output_JavaSrc.java
deleted file mode 100644
index dc99218..0000000
--- a/libjava/gnu/gcj/convert/Output_JavaSrc.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
- 
-/**
- * Convert Unicode to Ascii with \ u XXXX-escapes.
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Output_JavaSrc extends UnicodeToBytes
-{
-  public String getName() { return "JavaSrc"; }
-
-  // Number of bytes remaining before pending_char has been written.
-  int todo;
- int pending_char;
-
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    int start_pos = inpos;
-    int avail = buf.length - count;
-    for (;;)
-      {
-	if (avail == 0)
-	  break;
-	switch (todo)
-	  {
-	  case 1:
-	    if (pending_char == '\\')
-	      {
-		buf[count++] = (byte) '\\';
-		avail--;
-		todo = 0;
-		continue;
-	      }
-	    /* ... else fall through ... */
-	  case 2:
-	  case 3:
-	  case 4:
-	    todo--;
-	    int digit = ((int) pending_char >> (todo * 4)) & 0xF;
-	    buf[count++] = (byte) Character.forDigit(digit, 16);
-	    avail--;
-	    continue;
-	  case 5:
-	    buf[count++] = (byte) 'u';
-	    avail--;
-	    todo = 4;
-	    continue;
-	  default:
-	    ;
-	  }
-	if (inlength == 0)
-	  break;
-	char ch = inbuffer[inpos++];
-	inlength--;
-	if (ch == '\\')
-	  {
-	    buf[count++] = (byte) '\\';
-	    pending_char = ch;
-	    todo = 1;
-	    avail--;
-	  }
-	else if (ch < 127)
-	  {
-	    buf[count++] = (byte) ch;
-	    avail--;
-	  }
-	else
-	  {
-	    buf[count++] = (byte) '\\';
-	    pending_char = ch;
-	    todo = 5;
-	    avail--;
-	  }
-      }
-    return inpos - start_pos;
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Output_SJIS.h b/libjava/gnu/gcj/convert/Output_SJIS.h
deleted file mode 100644
index 5175d20..0000000
--- a/libjava/gnu/gcj/convert/Output_SJIS.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_SJIS__
-#define __gnu_gcj_convert_Output_SJIS__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_SJIS;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_SJIS : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_SJIS();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
-  virtual jboolean havePendingBytes();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) pending;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_SJIS__
diff --git a/libjava/gnu/gcj/convert/Output_SJIS.java b/libjava/gnu/gcj/convert/Output_SJIS.java
deleted file mode 100644
index 67470ba..0000000
--- a/libjava/gnu/gcj/convert/Output_SJIS.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1999, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert Unicode to SJIS (Shift JIS, used on Japanese MS-Windows).
- * @author Per Bothner <bothner@cygnus.com>
- * @date April 1999.
- */
-
-public class Output_SJIS extends UnicodeToBytes
-{
-  public String getName() { return "SJIS"; }
-
-  public native int write (char[] inbuffer, int inpos, int inlength);
-
-  public native int write (String str, int inpos, int inlength, char[] work);
-
-  public boolean havePendingBytes()
-  {
-    return pending >= 0;
-  }
-
-  int pending = -1;
-}
diff --git a/libjava/gnu/gcj/convert/Output_UTF8.h b/libjava/gnu/gcj/convert/Output_UTF8.h
deleted file mode 100644
index 167b62d..0000000
--- a/libjava/gnu/gcj/convert/Output_UTF8.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_UTF8__
-#define __gnu_gcj_convert_Output_UTF8__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_UTF8;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_UTF8 : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_UTF8();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual jboolean havePendingBytes();
-  jboolean __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) standardUTF8;
-public: // actually package-private
-  jchar hi_part;
-  jint value;
-  jint bytes_todo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_UTF8__
diff --git a/libjava/gnu/gcj/convert/Output_UTF8.java b/libjava/gnu/gcj/convert/Output_UTF8.java
deleted file mode 100644
index e550a7f..0000000
--- a/libjava/gnu/gcj/convert/Output_UTF8.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright (C) 1999, 2000, 2003, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert Unicode to UTF8.
- * @author Per Bothner <bothner@cygnus.com>
- * @date Match 1999.
- */
-
-public class Output_UTF8 extends UnicodeToBytes
-{
-  public String getName() { return "UTF8"; }
-
-  /** True if a surrogate pair should be emitted as a single UTF8 sequence.
-   * Otherwise, a surrogate pair is treated as two separate characters.
-   * Also, '\0' is emitted as {0} if true, and as {0xC0,0x80} if false. */
-  public boolean standardUTF8 = true;
-
-  // Saves the previous char if it was a high-surrogate.
-  char hi_part;
-  // Value of incomplete character.
-  int value;
-  // Number of continuation bytes still to emit.
-  int bytes_todo;
-
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    int start_pos = inpos;
-    int avail = buf.length - count;
-    for (;;)
-      {
-	if (avail == 0 || (inlength == 0 && bytes_todo == 0 && hi_part == 0))
-	  break;
-	// The algorithm is made more complicated because we want to write
-	// at least one byte in the output buffer, if there is room for
-	// that byte, and at least one input character is available.
-	// This makes the code more robust, since client code will
-	// always "make progress", even in the complicated cases,
-	// where the output buffer only has room for only *part* of a
-	// multi-byte sequence, or the input char buffer only has half
-	// of a surrogate pair (when standardUTF8 is set), or both.
-
-	// Handle continuation characters we did not have room for before.
-	if (bytes_todo > 0)
-	  {
-	    do
-	      {
-		bytes_todo--;
-		buf[count++] = (byte)
-		  (((value >> (bytes_todo * 6)) & 0x3F) | 0x80);
-		avail--;
-	      }
-	    while (bytes_todo > 0 && avail > 0);
-	    continue;
-	  }
-
-	// Handle a high surrogate at the end of the input stream.
-	if (inlength == 0 && hi_part != 0)
-	  {
-	    buf[count++] = (byte) (0xE0 | (hi_part >> 12));
-	    value = hi_part;
-	    hi_part = 0;
-	    avail--;
-	    bytes_todo = 2;
-	    continue;
-	  }
-
-	char ch = inbuffer[inpos++];
-	inlength--;
-
-	if (hi_part != 0 && (ch <= 0xDBFF || ch > 0xDFFF))
-	  {
-	    // If the previous character was a high surrogate, and we
-	    // don't now have a low surrogate, we print the high
-	    // surrogate as an isolated character.
-	    --inpos;
-	    ++inlength;
-	    buf[count++] = (byte) (0xE0 | (hi_part >> 12));
-	    value = hi_part;
-	    hi_part = 0;
-	    avail--;
-	    bytes_todo = 2;
-	  }
-	else if (hi_part == 0 && ch >= 0xDC00 && ch <= 0xDFFF)
-	  {
-	    // If this character is a low surrogate and we didn't
-	    // previously see a high surrogate, we do the same thing
-	    // as above.
-	    buf[count++] = (byte) (0xE0 | (ch >> 12));
-	    value = ch;
-	    avail--;
-	    bytes_todo = 2;
-	  }
-	else if (ch < 128 && (ch != 0 || standardUTF8))
-	  {
-	    avail--;
-	    buf[count++] = (byte) ch;
-	  }
-	else if (ch <= 0x07FF)
-	  {
-	    buf[count++] = (byte) (0xC0 | (ch >> 6));
-	    avail--;
-	    value = ch;
-	    bytes_todo = 1;
-	  }
-	else if (ch >= 0xD800 && ch <= 0xDFFF && standardUTF8)
-	  {
-	    if (ch <= 0xDBFF)  // High surrogates
-	      {
-		// Just save the high surrogate until the next
-		// character comes along.
-		hi_part = ch;
-	      }
-	    else // Low surrogates
-	      {
-		value = (hi_part - 0xD800) * 0x400 + (ch - 0xDC00) + 0x10000;
-		buf[count++] = (byte) (0xF0 | (value >> 18));
-		avail--;
-		bytes_todo = 3;
-		hi_part = 0;
-	      }
-	  }
-	else
-	  {
-	    buf[count++] = (byte) (0xE0 | (ch >> 12));
-	    value = ch;
-	    avail--;
-	    bytes_todo = 2;
-	  }
-      }
-    return inpos - start_pos;
-  }
-
-  public boolean havePendingBytes()
-  {
-    return bytes_todo > 0 || hi_part != 0;
-  }
-
-}
diff --git a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h
deleted file mode 100644
index 747846b..0000000
--- a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
-#define __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class Output_UnicodeLittleUnmarked;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_UnicodeLittleUnmarked : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_UnicodeLittleUnmarked();
-  virtual ::java::lang::String * getName();
-  virtual jint write(JArray< jchar > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
diff --git a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java
deleted file mode 100644
index a6b6336..0000000
--- a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-
-/**
- * Convert to Unicode Little Endian, no marker
- */
-public class Output_UnicodeLittleUnmarked extends UnicodeToBytes
-{
-  public String getName() { return "UnicodeLittleUnmarked"; }
-
-  /** Convert chars to bytes.
-    * Converted bytes are written to buf, starting at count.
-    * @param inbuffer source of characters to convert
-    * @param inpos index of initial character in inbuffer to convert
-    * @param inlength number of characters to convert
-    * @return number of chars converted
-    * Also, this.count is increment by the number of bytes converted.
-    */
-  public int write (char[] inbuffer, int inpos, int inlength)
-  {
-    int avail = buf.length - count;
-    if (inlength * 2 > avail)
-      inlength = avail / 2;
-    for (int i = inlength; i > 0; i--)
-      {
-        char c = inbuffer[inpos++];
-        buf[count] = (byte)c;
-        buf[count+1] = (byte)(c >> 8);
-	count += 2;
-      }
-    return inlength;
-  }
-}
-
diff --git a/libjava/gnu/gcj/convert/Output_iconv.h b/libjava/gnu/gcj/convert/Output_iconv.h
deleted file mode 100644
index a06f96b..0000000
--- a/libjava/gnu/gcj/convert/Output_iconv.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_Output_iconv__
-#define __gnu_gcj_convert_Output_iconv__
-
-#pragma interface
-
-#include <gnu/gcj/convert/UnicodeToBytes.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace convert
-      {
-          class Output_iconv;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::Output_iconv : public ::gnu::gcj::convert::UnicodeToBytes
-{
-
-public:
-  Output_iconv(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void finalize();
-private:
-  void init(::java::lang::String *);
-public:
-  virtual jint write(JArray< jchar > *, jint, jint);
-  virtual void done();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) encoding;
-  ::gnu::gcj::RawData * handle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_Output_iconv__
diff --git a/libjava/gnu/gcj/convert/Output_iconv.java b/libjava/gnu/gcj/convert/Output_iconv.java
deleted file mode 100644
index aa071c0..0000000
--- a/libjava/gnu/gcj/convert/Output_iconv.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Output_iconv.java -- Java side of iconv() writer.
-
-/* Copyright (C) 2000, 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert;
-import gnu.gcj.RawData;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Convert Unicode to bytes in some iconv-supported encoding.
- * @author Tom Tromey <tromey@redhat.com>
- * @date January 30, 2000
- */
-
-public class Output_iconv extends UnicodeToBytes
-{
-  public Output_iconv (String encoding) throws UnsupportedEncodingException
-  {
-    this.encoding = encoding;
-    this.handle = null;
-    init (encoding);
-  }
-
-  public String getName() { return encoding; }
-
-  public native void finalize ();
-  private native void init (String encoding)
-    throws UnsupportedEncodingException;
-  public native int write (char[] inbuffer, int inpos, int count);
-  public native void done ();
-
-  // The encoding we're using.
-  private String encoding;
-
-  // The iconv handle.
-  private RawData handle;
-}
diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.h b/libjava/gnu/gcj/convert/UnicodeToBytes.h
deleted file mode 100644
index ea3a38c..0000000
--- a/libjava/gnu/gcj/convert/UnicodeToBytes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_convert_UnicodeToBytes__
-#define __gnu_gcj_convert_UnicodeToBytes__
-
-#pragma interface
-
-#include <gnu/gcj/convert/IOConverter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class UnicodeToBytes;
-      }
-    }
-  }
-}
-
-class gnu::gcj::convert::UnicodeToBytes : public ::gnu::gcj::convert::IOConverter
-{
-
-public:
-  UnicodeToBytes();
-  virtual ::java::lang::String * getName() = 0;
-  static ::gnu::gcj::convert::UnicodeToBytes * getDefaultEncoder();
-  static ::gnu::gcj::convert::UnicodeToBytes * getEncoder(::java::lang::String *);
-  virtual void setOutput(JArray< jbyte > *, jint);
-  virtual jint write(JArray< jchar > *, jint, jint) = 0;
-  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
-  virtual jboolean havePendingBytes();
-  virtual void setFinished();
-  virtual void done();
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::IOConverter)))) buf;
-  jint count;
-public: // actually package-private
-  static ::java::lang::String * defaultEncoding;
-private:
-  static const jint CACHE_SIZE = 4;
-  static JArray< ::gnu::gcj::convert::UnicodeToBytes * > * encoderCache;
-  static jint currCachePos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_convert_UnicodeToBytes__
diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java
deleted file mode 100644
index 51d6939..0000000
--- a/libjava/gnu/gcj/convert/UnicodeToBytes.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001, 2003, 2005, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.convert; 
-
-import java.nio.charset.Charset;
-
-public abstract class UnicodeToBytes extends IOConverter
-{
-  /** Buffer to emit bytes to.
-   * The locations buf[count] ... buf[buf.length-1] are available. */
-  public byte[] buf;
-  public int count;
-
-  // The name of the default encoding.
-  static String defaultEncoding;
-
-  /* These keep a small cache of encoders for reuse.  The array holds
-     the actual encoders.  The currCachePos is the next value we are
-     going to replace in the cache.  We don't just throw the data away
-     if the cache is full, because if the cache filled up with stuff we
-     don't need then the cache would be worthless.  We instead
-     circulate through the cache the implement kind of an LRU
-     algorithm. */
-  private static final int CACHE_SIZE = 4;  // A power of 2 for speed
-  private static UnicodeToBytes[] encoderCache
-    = new UnicodeToBytes[CACHE_SIZE];
-  private static int currCachePos = 0;
-
-  public abstract String getName();
-
-  public static UnicodeToBytes getDefaultEncoder()
-  {
-    try
-      {
-	synchronized (UnicodeToBytes.class)
-	  {
-	    if (defaultEncoding == null)
-	      {
-		String encoding
-		  = canonicalize (System.getProperty("file.encoding",
-						     "8859_1"));
-		String className = "gnu.gcj.convert.Output_" + encoding;
-		try
-		  {
-		    Class defaultEncodingClass = Class.forName(className);
-		    defaultEncoding = encoding;
-		  }
-		catch (ClassNotFoundException ex)
-		  {
-		    throw new NoClassDefFoundError("missing default encoding "
-						   + encoding + " (class "
-						   + className
-						   + " not found)");
-		  }
-	      }
-	  }
-
-	return getEncoder (defaultEncoding);
-      }
-    catch (Throwable ex)
-      {
-	return new Output_8859_1();
-      }
-  }
-
-  /** Get a char-stream->byte-stream converter given an encoding name. */
-  public static UnicodeToBytes getEncoder (String encoding)
-    throws java.io.UnsupportedEncodingException
-  {
-    /* First hunt in our cache to see if we have a encoder that is
-       already allocated. */
-    String canonicalEncoding = canonicalize(encoding);
-    synchronized (UnicodeToBytes.class)
-      {
-	int i;
-	for (i = 0; i < encoderCache.length; ++i)
-	  {
-	    if (encoderCache[i] != null
-		&& canonicalEncoding.equals(encoderCache[i].getName ()))
-	      {
-		UnicodeToBytes rv = encoderCache[i];
-		encoderCache[i] = null;
-		return rv;
-	    }
-	  }
-      }
-
-    String className = "gnu.gcj.convert.Output_" + canonicalEncoding;
-    Class encodingClass;
-    try 
-      { 
-	encodingClass = Class.forName(className); 
-	return (UnicodeToBytes) encodingClass.newInstance();
-      } 
-    catch (Throwable ex) 
-      { 
-	try
-          {
-	    // We pass the original name to iconv and let it handle
-	    // its own aliasing.  Note that we intentionally prefer
-	    // iconv over nio.
-	    return new Output_iconv (encoding);
-          }
-        catch (Throwable _)
-          {
-            // Ignore, and try the next method.
-          }
-	try
-	  {
-            // Try using finding java.nio.charset.Charset and using
-            // the adaptor.  Use the original name as Charsets have
-            // their own canonical names.
-            return new CharsetToBytesAdaptor(Charset.forName(encoding));
-	  }
-	catch (Throwable _)
-	  {
-	    // Put the original exception in the throwable.
-	    throw new java.io.UnsupportedEncodingException(encoding + " ("
-							   + ex + ')');
-	  }
-      }
-  }
-
-  public final void setOutput(byte[] buffer, int count)
-  {
-    this.buf = buffer;
-    this.count = count;
-  }
-
-  /** Convert chars to bytes.
-    * Converted bytes are written to buf, starting at count.
-    * @param inbuffer source of characters to convert
-    * @param inpos index of initial character in inbuffer to convert
-    * @param inlength number of characters to convert
-    * @return number of chars converted
-    * Also, this.count is increment by the number of bytes converted.
-    */
-  public abstract int write (char[] inbuffer, int inpos, int inlength);
-
-  /** Convert chars to bytes.
-    * Converted bytes are written to buf, starting at count.
-    * @param str source of characters to convert
-    * @param inpos index of initial character in str to convert
-    * @param inlength number of characters to convert
-    * @param work if non-null, a buffer than can be used
-    * @return number of chars converted
-    * Also, this.count is increment by the number of bytes converted.
-    */
-  public int write (String str, int inpos, int inlength, char[] work)
-  {
-    if (work == null)
-      work = new char[inlength];
-    int srcEnd = inpos + (inlength > work.length ? work.length : inlength);
-    str.getChars(inpos, srcEnd, work, 0);
-    return write(work, 0, srcEnd - inpos);
-  }
-
-  /**
-   * Returns true when the converter has consumed some bytes that are
-   * not yet converted to characters because further continuation
-   * bytes are needed.  Defaults to false, should be overridden by
-   * decoders that internally store some bytes.
-   */
-  public boolean havePendingBytes()
-  {
-    return false;
-  }
-
-  /**
-   * Users should call this method when the input is coming to an
-   * end.  This signals that the next write (which might be
-   * zero-length) ought to flush any internal state.
-   */
-  public void setFinished()
-  {
-  }
-
-  /** Indicate that the converter is resuable.
-   * This class keeps track of converters on a per-encoding basis.
-   * When done with an encoder you may call this method to indicate
-   * that it can be reused later.
-   */
-  public void done ()
-  {
-    synchronized (UnicodeToBytes.class)
-      {
-	this.buf = null;
-	this.count = 0;
-
-	encoderCache[currCachePos] = this;
-	currCachePos = (currCachePos + 1) % CACHE_SIZE;
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/convert/Unicode_to_JIS.cc b/libjava/gnu/gcj/convert/Unicode_to_JIS.cc
deleted file mode 100644
index 10b3b70..0000000
--- a/libjava/gnu/gcj/convert/Unicode_to_JIS.cc
+++ /dev/null
@@ -1,23139 +0,0 @@
-/* This file is automatically generated. */
-unsigned short Unicode_to_JIS[] = {
- /* branch: 0x0XXX */ 16,
- /* branch: 0x1XXX */ 0,
- /* branch: 0x2XXX */ 720,
- /* branch: 0x3XXX */ 1296,
- /* branch: 0x4XXX */ 1552,
- /* branch: 0x5XXX */ 2112,
- /* branch: 0x6XXX */ 6480,
- /* branch: 0x7XXX */ 10848,
- /* branch: 0x8XXX */ 15072,
- /* branch: 0x9XXX */ 19184,
- /* branch: 0xaXXX */ 0,
- /* branch: 0xbXXX */ 0,
- /* branch: 0xcXXX */ 0,
- /* branch: 0xdXXX */ 0,
- /* branch: 0xeXXX */ 0,
- /* branch: 0xfXXX */ 22928,
- /* branch: 0x00XX */ 32,
- /* branch: 0x01XX */ 272,
- /* branch: 0x02XX */ 464,
- /* branch: 0x03XX */ 512,
- /* branch: 0x04XX */ 608,
- /* branch: 0x05XX */ 0,
- /* branch: 0x06XX */ 0,
- /* branch: 0x07XX */ 0,
- /* branch: 0x08XX */ 0,
- /* branch: 0x09XX */ 0,
- /* branch: 0x0aXX */ 0,
- /* branch: 0x0bXX */ 0,
- /* branch: 0x0cXX */ 0,
- /* branch: 0x0dXX */ 0,
- /* branch: 0x0eXX */ 0,
- /* branch: 0x0fXX */ 0,
- /* branch: 0x000X */ 48,
- /* branch: 0x001X */ 64,
- /* branch: 0x002X */ 80,
- /* branch: 0x003X */ 96,
- /* branch: 0x004X */ 112,
- /* branch: 0x005X */ 128,
- /* branch: 0x006X */ 144,
- /* branch: 0x007X */ 160,
- /* branch: 0x008X */ 0,
- /* branch: 0x009X */ 0,
- /* branch: 0x00aX */ 176,
- /* branch: 0x00bX */ 192,
- /* branch: 0x00cX */ 208,
- /* branch: 0x00dX */ 224,
- /* branch: 0x00eX */ 240,
- /* branch: 0x00fX */ 256,
- /* key: 0x0 */ 0x0,
- /* key: 0x1 */ 0x1,
- /* key: 0x2 */ 0x2,
- /* key: 0x3 */ 0x3,
- /* key: 0x4 */ 0x4,
- /* key: 0x5 */ 0x5,
- /* key: 0x6 */ 0x6,
- /* key: 0x7 */ 0x7,
- /* key: 0x8 */ 0x8,
- /* key: 0x9 */ 0x9,
- /* key: 0xa */ 0xa,
- /* key: 0xb */ 0xb,
- /* key: 0xc */ 0xc,
- /* key: 0xd */ 0xd,
- /* key: 0xe */ 0xe,
- /* key: 0xf */ 0xf,
- /* key: 0x10 */ 0x10,
- /* key: 0x11 */ 0x11,
- /* key: 0x12 */ 0x12,
- /* key: 0x13 */ 0x13,
- /* key: 0x14 */ 0x14,
- /* key: 0x15 */ 0x15,
- /* key: 0x16 */ 0x16,
- /* key: 0x17 */ 0x17,
- /* key: 0x18 */ 0x18,
- /* key: 0x19 */ 0x19,
- /* key: 0x1a */ 0x1a,
- /* key: 0x1b */ 0x1b,
- /* key: 0x1c */ 0x1c,
- /* key: 0x1d */ 0x1d,
- /* key: 0x1e */ 0x1e,
- /* key: 0x1f */ 0x1f,
- /* key: 0x20 */ 0x20,
- /* key: 0x21 */ 0x21,
- /* key: 0x22 */ 0x22,
- /* key: 0x23 */ 0x23,
- /* key: 0x24 */ 0x24,
- /* key: 0x25 */ 0x25,
- /* key: 0x26 */ 0x26,
- /* key: 0x27 */ 0x27,
- /* key: 0x28 */ 0x28,
- /* key: 0x29 */ 0x29,
- /* key: 0x2a */ 0x2a,
- /* key: 0x2b */ 0x2b,
- /* key: 0x2c */ 0x2c,
- /* key: 0x2d */ 0x2d,
- /* key: 0x2e */ 0x2e,
- /* key: 0x2f */ 0x2f,
- /* key: 0x30 */ 0x30,
- /* key: 0x31 */ 0x31,
- /* key: 0x32 */ 0x32,
- /* key: 0x33 */ 0x33,
- /* key: 0x34 */ 0x34,
- /* key: 0x35 */ 0x35,
- /* key: 0x36 */ 0x36,
- /* key: 0x37 */ 0x37,
- /* key: 0x38 */ 0x38,
- /* key: 0x39 */ 0x39,
- /* key: 0x3a */ 0x3a,
- /* key: 0x3b */ 0x3b,
- /* key: 0x3c */ 0x3c,
- /* key: 0x3d */ 0x3d,
- /* key: 0x3e */ 0x3e,
- /* key: 0x3f */ 0x3f,
- /* key: 0x40 */ 0x40,
- /* key: 0x41 */ 0x41,
- /* key: 0x42 */ 0x42,
- /* key: 0x43 */ 0x43,
- /* key: 0x44 */ 0x44,
- /* key: 0x45 */ 0x45,
- /* key: 0x46 */ 0x46,
- /* key: 0x47 */ 0x47,
- /* key: 0x48 */ 0x48,
- /* key: 0x49 */ 0x49,
- /* key: 0x4a */ 0x4a,
- /* key: 0x4b */ 0x4b,
- /* key: 0x4c */ 0x4c,
- /* key: 0x4d */ 0x4d,
- /* key: 0x4e */ 0x4e,
- /* key: 0x4f */ 0x4f,
- /* key: 0x50 */ 0x50,
- /* key: 0x51 */ 0x51,
- /* key: 0x52 */ 0x52,
- /* key: 0x53 */ 0x53,
- /* key: 0x54 */ 0x54,
- /* key: 0x55 */ 0x55,
- /* key: 0x56 */ 0x56,
- /* key: 0x57 */ 0x57,
- /* key: 0x58 */ 0x58,
- /* key: 0x59 */ 0x59,
- /* key: 0x5a */ 0x5a,
- /* key: 0x5b */ 0x5b,
- /* key: 0x5c */ 0x2140,
- /* key: 0x5d */ 0x5d,
- /* key: 0x5e */ 0x5e,
- /* key: 0x5f */ 0x5f,
- /* key: 0x60 */ 0x60,
- /* key: 0x61 */ 0x61,
- /* key: 0x62 */ 0x62,
- /* key: 0x63 */ 0x63,
- /* key: 0x64 */ 0x64,
- /* key: 0x65 */ 0x65,
- /* key: 0x66 */ 0x66,
- /* key: 0x67 */ 0x67,
- /* key: 0x68 */ 0x68,
- /* key: 0x69 */ 0x69,
- /* key: 0x6a */ 0x6a,
- /* key: 0x6b */ 0x6b,
- /* key: 0x6c */ 0x6c,
- /* key: 0x6d */ 0x6d,
- /* key: 0x6e */ 0x6e,
- /* key: 0x6f */ 0x6f,
- /* key: 0x70 */ 0x70,
- /* key: 0x71 */ 0x71,
- /* key: 0x72 */ 0x72,
- /* key: 0x73 */ 0x73,
- /* key: 0x74 */ 0x74,
- /* key: 0x75 */ 0x75,
- /* key: 0x76 */ 0x76,
- /* key: 0x77 */ 0x77,
- /* key: 0x78 */ 0x78,
- /* key: 0x79 */ 0x79,
- /* key: 0x7a */ 0x7a,
- /* key: 0x7b */ 0x7b,
- /* key: 0x7c */ 0x7c,
- /* key: 0x7d */ 0x7d,
- /* key: 0x7e */ 0xa237,
- /* key: 0x7f */ 0x7f,
- /* key: 0xa0 */ 0xffff,
- /* key: 0xa1 */ 0xa242,
- /* key: 0xa2 */ 0x2171,
- /* key: 0xa3 */ 0x2172,
- /* key: 0xa4 */ 0xa270,
- /* key: 0xa5 */ 0x5c,
- /* key: 0xa6 */ 0xa243,
- /* key: 0xa7 */ 0x2178,
- /* key: 0xa8 */ 0x212f,
- /* key: 0xa9 */ 0xa26d,
- /* key: 0xaa */ 0xa26c,
- /* key: 0xab */ 0xffff,
- /* key: 0xac */ 0x224c,
- /* key: 0xad */ 0xffff,
- /* key: 0xae */ 0xa26e,
- /* key: 0xaf */ 0xa234,
- /* key: 0xb0 */ 0x216b,
- /* key: 0xb1 */ 0x215e,
- /* key: 0xb2 */ 0xffff,
- /* key: 0xb3 */ 0xffff,
- /* key: 0xb4 */ 0x212d,
- /* key: 0xb5 */ 0xffff,
- /* key: 0xb6 */ 0x2279,
- /* key: 0xb7 */ 0xffff,
- /* key: 0xb8 */ 0xa231,
- /* key: 0xb9 */ 0xffff,
- /* key: 0xba */ 0xa26b,
- /* key: 0xbb */ 0xffff,
- /* key: 0xbc */ 0xffff,
- /* key: 0xbd */ 0xffff,
- /* key: 0xbe */ 0xffff,
- /* key: 0xbf */ 0xa244,
- /* key: 0xc0 */ 0xaa22,
- /* key: 0xc1 */ 0xaa21,
- /* key: 0xc2 */ 0xaa24,
- /* key: 0xc3 */ 0xaa2a,
- /* key: 0xc4 */ 0xaa23,
- /* key: 0xc5 */ 0xaa29,
- /* key: 0xc6 */ 0xa921,
- /* key: 0xc7 */ 0xaa2e,
- /* key: 0xc8 */ 0xaa32,
- /* key: 0xc9 */ 0xaa31,
- /* key: 0xca */ 0xaa34,
- /* key: 0xcb */ 0xaa33,
- /* key: 0xcc */ 0xaa40,
- /* key: 0xcd */ 0xaa3f,
- /* key: 0xce */ 0xaa42,
- /* key: 0xcf */ 0xaa41,
- /* key: 0xd0 */ 0xffff,
- /* key: 0xd1 */ 0xaa50,
- /* key: 0xd2 */ 0xaa52,
- /* key: 0xd3 */ 0xaa51,
- /* key: 0xd4 */ 0xaa54,
- /* key: 0xd5 */ 0xaa58,
- /* key: 0xd6 */ 0xaa53,
- /* key: 0xd7 */ 0x215f,
- /* key: 0xd8 */ 0xa92c,
- /* key: 0xd9 */ 0xaa63,
- /* key: 0xda */ 0xaa62,
- /* key: 0xdb */ 0xaa65,
- /* key: 0xdc */ 0xaa64,
- /* key: 0xdd */ 0xaa72,
- /* key: 0xde */ 0xa930,
- /* key: 0xdf */ 0xa94e,
- /* key: 0xe0 */ 0xab22,
- /* key: 0xe1 */ 0xab21,
- /* key: 0xe2 */ 0xab24,
- /* key: 0xe3 */ 0xab2a,
- /* key: 0xe4 */ 0xab23,
- /* key: 0xe5 */ 0xab29,
- /* key: 0xe6 */ 0xa941,
- /* key: 0xe7 */ 0xab2e,
- /* key: 0xe8 */ 0xab32,
- /* key: 0xe9 */ 0xab31,
- /* key: 0xea */ 0xab34,
- /* key: 0xeb */ 0xab33,
- /* key: 0xec */ 0xab40,
- /* key: 0xed */ 0xab3f,
- /* key: 0xee */ 0xab42,
- /* key: 0xef */ 0xab41,
- /* key: 0xf0 */ 0xa943,
- /* key: 0xf1 */ 0xab50,
- /* key: 0xf2 */ 0xab52,
- /* key: 0xf3 */ 0xab51,
- /* key: 0xf4 */ 0xab54,
- /* key: 0xf5 */ 0xab58,
- /* key: 0xf6 */ 0xab53,
- /* key: 0xf7 */ 0x2160,
- /* key: 0xf8 */ 0xa94c,
- /* key: 0xf9 */ 0xab63,
- /* key: 0xfa */ 0xab62,
- /* key: 0xfb */ 0xab65,
- /* key: 0xfc */ 0xab64,
- /* key: 0xfd */ 0xab72,
- /* key: 0xfe */ 0xa950,
- /* key: 0xff */ 0xab73,
- /* branch: 0x010X */ 288,
- /* branch: 0x011X */ 304,
- /* branch: 0x012X */ 320,
- /* branch: 0x013X */ 336,
- /* branch: 0x014X */ 352,
- /* branch: 0x015X */ 368,
- /* branch: 0x016X */ 384,
- /* branch: 0x017X */ 400,
- /* branch: 0x018X */ 0,
- /* branch: 0x019X */ 0,
- /* branch: 0x01aX */ 0,
- /* branch: 0x01bX */ 0,
- /* branch: 0x01cX */ 416,
- /* branch: 0x01dX */ 432,
- /* branch: 0x01eX */ 0,
- /* branch: 0x01fX */ 448,
- /* key: 0x100 */ 0xaa27,
- /* key: 0x101 */ 0xab27,
- /* key: 0x102 */ 0xaa25,
- /* key: 0x103 */ 0xab25,
- /* key: 0x104 */ 0xaa28,
- /* key: 0x105 */ 0xab28,
- /* key: 0x106 */ 0xaa2b,
- /* key: 0x107 */ 0xab2b,
- /* key: 0x108 */ 0xaa2c,
- /* key: 0x109 */ 0xab2c,
- /* key: 0x10a */ 0xaa2f,
- /* key: 0x10b */ 0xab2f,
- /* key: 0x10c */ 0xaa2d,
- /* key: 0x10d */ 0xab2d,
- /* key: 0x10e */ 0xaa30,
- /* key: 0x10f */ 0xab30,
- /* key: 0x110 */ 0xa922,
- /* key: 0x111 */ 0xa942,
- /* key: 0x112 */ 0xaa37,
- /* key: 0x113 */ 0xab37,
- /* key: 0x114 */ 0xffff,
- /* key: 0x115 */ 0xffff,
- /* key: 0x116 */ 0xaa36,
- /* key: 0x117 */ 0xab36,
- /* key: 0x118 */ 0xaa38,
- /* key: 0x119 */ 0xab38,
- /* key: 0x11a */ 0xaa35,
- /* key: 0x11b */ 0xab35,
- /* key: 0x11c */ 0xaa3a,
- /* key: 0x11d */ 0xab3a,
- /* key: 0x11e */ 0xaa3b,
- /* key: 0x11f */ 0xab3b,
- /* key: 0x120 */ 0xaa3d,
- /* key: 0x121 */ 0xab3d,
- /* key: 0x122 */ 0xaa3c,
- /* key: 0x123 */ 0xffff,
- /* key: 0x124 */ 0xaa3e,
- /* key: 0x125 */ 0xab3e,
- /* key: 0x126 */ 0xa924,
- /* key: 0x127 */ 0xa944,
- /* key: 0x128 */ 0xaa47,
- /* key: 0x129 */ 0xab47,
- /* key: 0x12a */ 0xaa45,
- /* key: 0x12b */ 0xab45,
- /* key: 0x12c */ 0xffff,
- /* key: 0x12d */ 0xffff,
- /* key: 0x12e */ 0xaa46,
- /* key: 0x12f */ 0xab46,
- /* key: 0x130 */ 0xaa44,
- /* key: 0x131 */ 0xa945,
- /* key: 0x132 */ 0xa926,
- /* key: 0x133 */ 0xa946,
- /* key: 0x134 */ 0xaa48,
- /* key: 0x135 */ 0xab48,
- /* key: 0x136 */ 0xaa49,
- /* key: 0x137 */ 0xab49,
- /* key: 0x138 */ 0xa947,
- /* key: 0x139 */ 0xaa4a,
- /* key: 0x13a */ 0xab4a,
- /* key: 0x13b */ 0xaa4c,
- /* key: 0x13c */ 0xab4c,
- /* key: 0x13d */ 0xaa4b,
- /* key: 0x13e */ 0xab4b,
- /* key: 0x13f */ 0xa929,
- /* key: 0x140 */ 0xa949,
- /* key: 0x141 */ 0xa928,
- /* key: 0x142 */ 0xa948,
- /* key: 0x143 */ 0xaa4d,
- /* key: 0x144 */ 0xab4d,
- /* key: 0x145 */ 0xaa4f,
- /* key: 0x146 */ 0xab4f,
- /* key: 0x147 */ 0xaa4e,
- /* key: 0x148 */ 0xab4e,
- /* key: 0x149 */ 0xa94a,
- /* key: 0x14a */ 0xa92b,
- /* key: 0x14b */ 0xa94b,
- /* key: 0x14c */ 0xaa57,
- /* key: 0x14d */ 0xab57,
- /* key: 0x14e */ 0xffff,
- /* key: 0x14f */ 0xffff,
- /* key: 0x150 */ 0xaa56,
- /* key: 0x151 */ 0xab56,
- /* key: 0x152 */ 0xa92d,
- /* key: 0x153 */ 0xa94d,
- /* key: 0x154 */ 0xaa59,
- /* key: 0x155 */ 0xab59,
- /* key: 0x156 */ 0xaa5b,
- /* key: 0x157 */ 0xab5b,
- /* key: 0x158 */ 0xaa5a,
- /* key: 0x159 */ 0xab5a,
- /* key: 0x15a */ 0xaa5c,
- /* key: 0x15b */ 0xab5c,
- /* key: 0x15c */ 0xaa5d,
- /* key: 0x15d */ 0xab5d,
- /* key: 0x15e */ 0xaa5f,
- /* key: 0x15f */ 0xab5f,
- /* key: 0x160 */ 0xaa5e,
- /* key: 0x161 */ 0xab5e,
- /* key: 0x162 */ 0xaa61,
- /* key: 0x163 */ 0xab61,
- /* key: 0x164 */ 0xaa60,
- /* key: 0x165 */ 0xab60,
- /* key: 0x166 */ 0xa92f,
- /* key: 0x167 */ 0xa94f,
- /* key: 0x168 */ 0xaa6c,
- /* key: 0x169 */ 0xab6c,
- /* key: 0x16a */ 0xaa69,
- /* key: 0x16b */ 0xab69,
- /* key: 0x16c */ 0xaa66,
- /* key: 0x16d */ 0xab66,
- /* key: 0x16e */ 0xaa6b,
- /* key: 0x16f */ 0xab6b,
- /* key: 0x170 */ 0xaa68,
- /* key: 0x171 */ 0xab68,
- /* key: 0x172 */ 0xaa6a,
- /* key: 0x173 */ 0xab6a,
- /* key: 0x174 */ 0xaa71,
- /* key: 0x175 */ 0xab71,
- /* key: 0x176 */ 0xaa74,
- /* key: 0x177 */ 0xab74,
- /* key: 0x178 */ 0xaa73,
- /* key: 0x179 */ 0xaa75,
- /* key: 0x17a */ 0xab75,
- /* key: 0x17b */ 0xaa77,
- /* key: 0x17c */ 0xab77,
- /* key: 0x17d */ 0xaa76,
- /* key: 0x17e */ 0xab76,
- /* key: 0x17f */ 0xffff,
- /* key: 0x1c0 */ 0xffff,
- /* key: 0x1c1 */ 0xffff,
- /* key: 0x1c2 */ 0xffff,
- /* key: 0x1c3 */ 0xffff,
- /* key: 0x1c4 */ 0xffff,
- /* key: 0x1c5 */ 0xffff,
- /* key: 0x1c6 */ 0xffff,
- /* key: 0x1c7 */ 0xffff,
- /* key: 0x1c8 */ 0xffff,
- /* key: 0x1c9 */ 0xffff,
- /* key: 0x1ca */ 0xffff,
- /* key: 0x1cb */ 0xffff,
- /* key: 0x1cc */ 0xffff,
- /* key: 0x1cd */ 0xaa26,
- /* key: 0x1ce */ 0xab26,
- /* key: 0x1cf */ 0xaa43,
- /* key: 0x1d0 */ 0xab43,
- /* key: 0x1d1 */ 0xaa55,
- /* key: 0x1d2 */ 0xab55,
- /* key: 0x1d3 */ 0xaa67,
- /* key: 0x1d4 */ 0xab67,
- /* key: 0x1d5 */ 0xaa70,
- /* key: 0x1d6 */ 0xab70,
- /* key: 0x1d7 */ 0xaa6d,
- /* key: 0x1d8 */ 0xab6d,
- /* key: 0x1d9 */ 0xaa6f,
- /* key: 0x1da */ 0xab6f,
- /* key: 0x1db */ 0xaa6e,
- /* key: 0x1dc */ 0xab6e,
- /* key: 0x1dd */ 0xffff,
- /* key: 0x1de */ 0xffff,
- /* key: 0x1df */ 0xffff,
- /* key: 0x1f0 */ 0xffff,
- /* key: 0x1f1 */ 0xffff,
- /* key: 0x1f2 */ 0xffff,
- /* key: 0x1f3 */ 0xffff,
- /* key: 0x1f4 */ 0xffff,
- /* key: 0x1f5 */ 0xab39,
- /* key: 0x1f6 */ 0xffff,
- /* key: 0x1f7 */ 0xffff,
- /* key: 0x1f8 */ 0xffff,
- /* key: 0x1f9 */ 0xffff,
- /* key: 0x1fa */ 0xffff,
- /* key: 0x1fb */ 0xffff,
- /* key: 0x1fc */ 0xffff,
- /* key: 0x1fd */ 0xffff,
- /* key: 0x1fe */ 0xffff,
- /* key: 0x1ff */ 0xffff,
- /* branch: 0x020X */ 0,
- /* branch: 0x021X */ 0,
- /* branch: 0x022X */ 0,
- /* branch: 0x023X */ 0,
- /* branch: 0x024X */ 0,
- /* branch: 0x025X */ 0,
- /* branch: 0x026X */ 0,
- /* branch: 0x027X */ 0,
- /* branch: 0x028X */ 0,
- /* branch: 0x029X */ 0,
- /* branch: 0x02aX */ 0,
- /* branch: 0x02bX */ 0,
- /* branch: 0x02cX */ 480,
- /* branch: 0x02dX */ 496,
- /* branch: 0x02eX */ 0,
- /* branch: 0x02fX */ 0,
- /* key: 0x2c0 */ 0xffff,
- /* key: 0x2c1 */ 0xffff,
- /* key: 0x2c2 */ 0xffff,
- /* key: 0x2c3 */ 0xffff,
- /* key: 0x2c4 */ 0xffff,
- /* key: 0x2c5 */ 0xffff,
- /* key: 0x2c6 */ 0xffff,
- /* key: 0x2c7 */ 0xa230,
- /* key: 0x2c8 */ 0xffff,
- /* key: 0x2c9 */ 0xffff,
- /* key: 0x2ca */ 0xffff,
- /* key: 0x2cb */ 0xffff,
- /* key: 0x2cc */ 0xffff,
- /* key: 0x2cd */ 0xffff,
- /* key: 0x2ce */ 0xffff,
- /* key: 0x2cf */ 0xffff,
- /* key: 0x2d0 */ 0xffff,
- /* key: 0x2d1 */ 0xffff,
- /* key: 0x2d2 */ 0xffff,
- /* key: 0x2d3 */ 0xffff,
- /* key: 0x2d4 */ 0xffff,
- /* key: 0x2d5 */ 0xffff,
- /* key: 0x2d6 */ 0xffff,
- /* key: 0x2d7 */ 0xffff,
- /* key: 0x2d8 */ 0xa22f,
- /* key: 0x2d9 */ 0xa232,
- /* key: 0x2da */ 0xa236,
- /* key: 0x2db */ 0xa235,
- /* key: 0x2dc */ 0xffff,
- /* key: 0x2dd */ 0xa233,
- /* key: 0x2de */ 0xffff,
- /* key: 0x2df */ 0xffff,
- /* branch: 0x030X */ 0,
- /* branch: 0x031X */ 0,
- /* branch: 0x032X */ 0,
- /* branch: 0x033X */ 0,
- /* branch: 0x034X */ 0,
- /* branch: 0x035X */ 0,
- /* branch: 0x036X */ 0,
- /* branch: 0x037X */ 0,
- /* branch: 0x038X */ 528,
- /* branch: 0x039X */ 544,
- /* branch: 0x03aX */ 560,
- /* branch: 0x03bX */ 576,
- /* branch: 0x03cX */ 592,
- /* branch: 0x03dX */ 0,
- /* branch: 0x03eX */ 0,
- /* branch: 0x03fX */ 0,
- /* key: 0x380 */ 0xffff,
- /* key: 0x381 */ 0xffff,
- /* key: 0x382 */ 0xffff,
- /* key: 0x383 */ 0xffff,
- /* key: 0x384 */ 0xa238,
- /* key: 0x385 */ 0xa239,
- /* key: 0x386 */ 0xa661,
- /* key: 0x387 */ 0xffff,
- /* key: 0x388 */ 0xa662,
- /* key: 0x389 */ 0xa663,
- /* key: 0x38a */ 0xa664,
- /* key: 0x38b */ 0xffff,
- /* key: 0x38c */ 0xa667,
- /* key: 0x38d */ 0xffff,
- /* key: 0x38e */ 0xa669,
- /* key: 0x38f */ 0xa66c,
- /* key: 0x390 */ 0xa676,
- /* key: 0x391 */ 0x2621,
- /* key: 0x392 */ 0x2622,
- /* key: 0x393 */ 0x2623,
- /* key: 0x394 */ 0x2624,
- /* key: 0x395 */ 0x2625,
- /* key: 0x396 */ 0x2626,
- /* key: 0x397 */ 0x2627,
- /* key: 0x398 */ 0x2628,
- /* key: 0x399 */ 0x2629,
- /* key: 0x39a */ 0x262a,
- /* key: 0x39b */ 0x262b,
- /* key: 0x39c */ 0x262c,
- /* key: 0x39d */ 0x262d,
- /* key: 0x39e */ 0x262e,
- /* key: 0x39f */ 0x262f,
- /* key: 0x3a0 */ 0x2630,
- /* key: 0x3a1 */ 0x2631,
- /* key: 0x3a2 */ 0xffff,
- /* key: 0x3a3 */ 0x2632,
- /* key: 0x3a4 */ 0x2633,
- /* key: 0x3a5 */ 0x2634,
- /* key: 0x3a6 */ 0x2635,
- /* key: 0x3a7 */ 0x2636,
- /* key: 0x3a8 */ 0x2637,
- /* key: 0x3a9 */ 0x2638,
- /* key: 0x3aa */ 0xa665,
- /* key: 0x3ab */ 0xa66a,
- /* key: 0x3ac */ 0xa671,
- /* key: 0x3ad */ 0xa672,
- /* key: 0x3ae */ 0xa673,
- /* key: 0x3af */ 0xa674,
- /* key: 0x3b0 */ 0xa67b,
- /* key: 0x3b1 */ 0x2641,
- /* key: 0x3b2 */ 0x2642,
- /* key: 0x3b3 */ 0x2643,
- /* key: 0x3b4 */ 0x2644,
- /* key: 0x3b5 */ 0x2645,
- /* key: 0x3b6 */ 0x2646,
- /* key: 0x3b7 */ 0x2647,
- /* key: 0x3b8 */ 0x2648,
- /* key: 0x3b9 */ 0x2649,
- /* key: 0x3ba */ 0x264a,
- /* key: 0x3bb */ 0x264b,
- /* key: 0x3bc */ 0x264c,
- /* key: 0x3bd */ 0x264d,
- /* key: 0x3be */ 0x264e,
- /* key: 0x3bf */ 0x264f,
- /* key: 0x3c0 */ 0x2650,
- /* key: 0x3c1 */ 0x2651,
- /* key: 0x3c2 */ 0xa678,
- /* key: 0x3c3 */ 0x2652,
- /* key: 0x3c4 */ 0x2653,
- /* key: 0x3c5 */ 0x2654,
- /* key: 0x3c6 */ 0x2655,
- /* key: 0x3c7 */ 0x2656,
- /* key: 0x3c8 */ 0x2657,
- /* key: 0x3c9 */ 0x2658,
- /* key: 0x3ca */ 0xa675,
- /* key: 0x3cb */ 0xa67a,
- /* key: 0x3cc */ 0xa677,
- /* key: 0x3cd */ 0xa679,
- /* key: 0x3ce */ 0xa67c,
- /* key: 0x3cf */ 0xffff,
- /* branch: 0x040X */ 624,
- /* branch: 0x041X */ 640,
- /* branch: 0x042X */ 656,
- /* branch: 0x043X */ 672,
- /* branch: 0x044X */ 688,
- /* branch: 0x045X */ 704,
- /* branch: 0x046X */ 0,
- /* branch: 0x047X */ 0,
- /* branch: 0x048X */ 0,
- /* branch: 0x049X */ 0,
- /* branch: 0x04aX */ 0,
- /* branch: 0x04bX */ 0,
- /* branch: 0x04cX */ 0,
- /* branch: 0x04dX */ 0,
- /* branch: 0x04eX */ 0,
- /* branch: 0x04fX */ 0,
- /* key: 0x400 */ 0xffff,
- /* key: 0x401 */ 0x2727,
- /* key: 0x402 */ 0xa742,
- /* key: 0x403 */ 0xa743,
- /* key: 0x404 */ 0xa744,
- /* key: 0x405 */ 0xa745,
- /* key: 0x406 */ 0xa746,
- /* key: 0x407 */ 0xa747,
- /* key: 0x408 */ 0xa748,
- /* key: 0x409 */ 0xa749,
- /* key: 0x40a */ 0xa74a,
- /* key: 0x40b */ 0xa74b,
- /* key: 0x40c */ 0xa74c,
- /* key: 0x40d */ 0xffff,
- /* key: 0x40e */ 0xa74d,
- /* key: 0x40f */ 0xa74e,
- /* key: 0x410 */ 0x2721,
- /* key: 0x411 */ 0x2722,
- /* key: 0x412 */ 0x2723,
- /* key: 0x413 */ 0x2724,
- /* key: 0x414 */ 0x2725,
- /* key: 0x415 */ 0x2726,
- /* key: 0x416 */ 0x2728,
- /* key: 0x417 */ 0x2729,
- /* key: 0x418 */ 0x272a,
- /* key: 0x419 */ 0x272b,
- /* key: 0x41a */ 0x272c,
- /* key: 0x41b */ 0x272d,
- /* key: 0x41c */ 0x272e,
- /* key: 0x41d */ 0x272f,
- /* key: 0x41e */ 0x2730,
- /* key: 0x41f */ 0x2731,
- /* key: 0x420 */ 0x2732,
- /* key: 0x421 */ 0x2733,
- /* key: 0x422 */ 0x2734,
- /* key: 0x423 */ 0x2735,
- /* key: 0x424 */ 0x2736,
- /* key: 0x425 */ 0x2737,
- /* key: 0x426 */ 0x2738,
- /* key: 0x427 */ 0x2739,
- /* key: 0x428 */ 0x273a,
- /* key: 0x429 */ 0x273b,
- /* key: 0x42a */ 0x273c,
- /* key: 0x42b */ 0x273d,
- /* key: 0x42c */ 0x273e,
- /* key: 0x42d */ 0x273f,
- /* key: 0x42e */ 0x2740,
- /* key: 0x42f */ 0x2741,
- /* key: 0x430 */ 0x2751,
- /* key: 0x431 */ 0x2752,
- /* key: 0x432 */ 0x2753,
- /* key: 0x433 */ 0x2754,
- /* key: 0x434 */ 0x2755,
- /* key: 0x435 */ 0x2756,
- /* key: 0x436 */ 0x2758,
- /* key: 0x437 */ 0x2759,
- /* key: 0x438 */ 0x275a,
- /* key: 0x439 */ 0x275b,
- /* key: 0x43a */ 0x275c,
- /* key: 0x43b */ 0x275d,
- /* key: 0x43c */ 0x275e,
- /* key: 0x43d */ 0x275f,
- /* key: 0x43e */ 0x2760,
- /* key: 0x43f */ 0x2761,
- /* key: 0x440 */ 0x2762,
- /* key: 0x441 */ 0x2763,
- /* key: 0x442 */ 0x2764,
- /* key: 0x443 */ 0x2765,
- /* key: 0x444 */ 0x2766,
- /* key: 0x445 */ 0x2767,
- /* key: 0x446 */ 0x2768,
- /* key: 0x447 */ 0x2769,
- /* key: 0x448 */ 0x276a,
- /* key: 0x449 */ 0x276b,
- /* key: 0x44a */ 0x276c,
- /* key: 0x44b */ 0x276d,
- /* key: 0x44c */ 0x276e,
- /* key: 0x44d */ 0x276f,
- /* key: 0x44e */ 0x2770,
- /* key: 0x44f */ 0x2771,
- /* key: 0x450 */ 0xffff,
- /* key: 0x451 */ 0x2757,
- /* key: 0x452 */ 0xa772,
- /* key: 0x453 */ 0xa773,
- /* key: 0x454 */ 0xa774,
- /* key: 0x455 */ 0xa775,
- /* key: 0x456 */ 0xa776,
- /* key: 0x457 */ 0xa777,
- /* key: 0x458 */ 0xa778,
- /* key: 0x459 */ 0xa779,
- /* key: 0x45a */ 0xa77a,
- /* key: 0x45b */ 0xa77b,
- /* key: 0x45c */ 0xa77c,
- /* key: 0x45d */ 0xffff,
- /* key: 0x45e */ 0xa77d,
- /* key: 0x45f */ 0xa77e,
- /* branch: 0x20XX */ 736,
- /* branch: 0x21XX */ 800,
- /* branch: 0x22XX */ 896,
- /* branch: 0x23XX */ 1040,
- /* branch: 0x24XX */ 0,
- /* branch: 0x25XX */ 1072,
- /* branch: 0x26XX */ 1232,
- /* branch: 0x27XX */ 0,
- /* branch: 0x28XX */ 0,
- /* branch: 0x29XX */ 0,
- /* branch: 0x2aXX */ 0,
- /* branch: 0x2bXX */ 0,
- /* branch: 0x2cXX */ 0,
- /* branch: 0x2dXX */ 0,
- /* branch: 0x2eXX */ 0,
- /* branch: 0x2fXX */ 0,
- /* branch: 0x200X */ 0,
- /* branch: 0x201X */ 752,
- /* branch: 0x202X */ 768,
- /* branch: 0x203X */ 784,
- /* branch: 0x204X */ 0,
- /* branch: 0x205X */ 0,
- /* branch: 0x206X */ 0,
- /* branch: 0x207X */ 0,
- /* branch: 0x208X */ 0,
- /* branch: 0x209X */ 0,
- /* branch: 0x20aX */ 0,
- /* branch: 0x20bX */ 0,
- /* branch: 0x20cX */ 0,
- /* branch: 0x20dX */ 0,
- /* branch: 0x20eX */ 0,
- /* branch: 0x20fX */ 0,
- /* key: 0x2010 */ 0x213e,
- /* key: 0x2011 */ 0xffff,
- /* key: 0x2012 */ 0xffff,
- /* key: 0x2013 */ 0xffff,
- /* key: 0x2014 */ 0xffff,
- /* key: 0x2015 */ 0x213d,
- /* key: 0x2016 */ 0x2142,
- /* key: 0x2017 */ 0xffff,
- /* key: 0x2018 */ 0x2146,
- /* key: 0x2019 */ 0x2147,
- /* key: 0x201a */ 0xffff,
- /* key: 0x201b */ 0xffff,
- /* key: 0x201c */ 0x2148,
- /* key: 0x201d */ 0x2149,
- /* key: 0x201e */ 0xffff,
- /* key: 0x201f */ 0xffff,
- /* key: 0x2020 */ 0x2277,
- /* key: 0x2021 */ 0x2278,
- /* key: 0x2022 */ 0xffff,
- /* key: 0x2023 */ 0xffff,
- /* key: 0x2024 */ 0xffff,
- /* key: 0x2025 */ 0x2145,
- /* key: 0x2026 */ 0x2144,
- /* key: 0x2027 */ 0xffff,
- /* key: 0x2028 */ 0xffff,
- /* key: 0x2029 */ 0xffff,
- /* key: 0x202a */ 0xffff,
- /* key: 0x202b */ 0xffff,
- /* key: 0x202c */ 0xffff,
- /* key: 0x202d */ 0xffff,
- /* key: 0x202e */ 0xffff,
- /* key: 0x202f */ 0xffff,
- /* key: 0x2030 */ 0x2273,
- /* key: 0x2031 */ 0xffff,
- /* key: 0x2032 */ 0x216c,
- /* key: 0x2033 */ 0x216d,
- /* key: 0x2034 */ 0xffff,
- /* key: 0x2035 */ 0xffff,
- /* key: 0x2036 */ 0xffff,
- /* key: 0x2037 */ 0xffff,
- /* key: 0x2038 */ 0xffff,
- /* key: 0x2039 */ 0xffff,
- /* key: 0x203a */ 0xffff,
- /* key: 0x203b */ 0x2228,
- /* key: 0x203c */ 0xffff,
- /* key: 0x203d */ 0xffff,
- /* key: 0x203e */ 0x7e,
- /* key: 0x203f */ 0xffff,
- /* branch: 0x210X */ 816,
- /* branch: 0x211X */ 832,
- /* branch: 0x212X */ 848,
- /* branch: 0x213X */ 0,
- /* branch: 0x214X */ 0,
- /* branch: 0x215X */ 0,
- /* branch: 0x216X */ 0,
- /* branch: 0x217X */ 0,
- /* branch: 0x218X */ 0,
- /* branch: 0x219X */ 864,
- /* branch: 0x21aX */ 0,
- /* branch: 0x21bX */ 0,
- /* branch: 0x21cX */ 0,
- /* branch: 0x21dX */ 880,
- /* branch: 0x21eX */ 0,
- /* branch: 0x21fX */ 0,
- /* key: 0x2100 */ 0xffff,
- /* key: 0x2101 */ 0xffff,
- /* key: 0x2102 */ 0xffff,
- /* key: 0x2103 */ 0x216e,
- /* key: 0x2104 */ 0xffff,
- /* key: 0x2105 */ 0xffff,
- /* key: 0x2106 */ 0xffff,
- /* key: 0x2107 */ 0xffff,
- /* key: 0x2108 */ 0xffff,
- /* key: 0x2109 */ 0xffff,
- /* key: 0x210a */ 0xffff,
- /* key: 0x210b */ 0xffff,
- /* key: 0x210c */ 0xffff,
- /* key: 0x210d */ 0xffff,
- /* key: 0x210e */ 0xffff,
- /* key: 0x210f */ 0xffff,
- /* key: 0x2110 */ 0xffff,
- /* key: 0x2111 */ 0xffff,
- /* key: 0x2112 */ 0xffff,
- /* key: 0x2113 */ 0xffff,
- /* key: 0x2114 */ 0xffff,
- /* key: 0x2115 */ 0xffff,
- /* key: 0x2116 */ 0xa271,
- /* key: 0x2117 */ 0xffff,
- /* key: 0x2118 */ 0xffff,
- /* key: 0x2119 */ 0xffff,
- /* key: 0x211a */ 0xffff,
- /* key: 0x211b */ 0xffff,
- /* key: 0x211c */ 0xffff,
- /* key: 0x211d */ 0xffff,
- /* key: 0x211e */ 0xffff,
- /* key: 0x211f */ 0xffff,
- /* key: 0x2120 */ 0xffff,
- /* key: 0x2121 */ 0xffff,
- /* key: 0x2122 */ 0xa26f,
- /* key: 0x2123 */ 0xffff,
- /* key: 0x2124 */ 0xffff,
- /* key: 0x2125 */ 0xffff,
- /* key: 0x2126 */ 0xffff,
- /* key: 0x2127 */ 0xffff,
- /* key: 0x2128 */ 0xffff,
- /* key: 0x2129 */ 0xffff,
- /* key: 0x212a */ 0xffff,
- /* key: 0x212b */ 0x2272,
- /* key: 0x212c */ 0xffff,
- /* key: 0x212d */ 0xffff,
- /* key: 0x212e */ 0xffff,
- /* key: 0x212f */ 0xffff,
- /* key: 0x2190 */ 0x222b,
- /* key: 0x2191 */ 0x222c,
- /* key: 0x2192 */ 0x222a,
- /* key: 0x2193 */ 0x222d,
- /* key: 0x2194 */ 0xffff,
- /* key: 0x2195 */ 0xffff,
- /* key: 0x2196 */ 0xffff,
- /* key: 0x2197 */ 0xffff,
- /* key: 0x2198 */ 0xffff,
- /* key: 0x2199 */ 0xffff,
- /* key: 0x219a */ 0xffff,
- /* key: 0x219b */ 0xffff,
- /* key: 0x219c */ 0xffff,
- /* key: 0x219d */ 0xffff,
- /* key: 0x219e */ 0xffff,
- /* key: 0x219f */ 0xffff,
- /* key: 0x21d0 */ 0xffff,
- /* key: 0x21d1 */ 0xffff,
- /* key: 0x21d2 */ 0x224d,
- /* key: 0x21d3 */ 0xffff,
- /* key: 0x21d4 */ 0x224e,
- /* key: 0x21d5 */ 0xffff,
- /* key: 0x21d6 */ 0xffff,
- /* key: 0x21d7 */ 0xffff,
- /* key: 0x21d8 */ 0xffff,
- /* key: 0x21d9 */ 0xffff,
- /* key: 0x21da */ 0xffff,
- /* key: 0x21db */ 0xffff,
- /* key: 0x21dc */ 0xffff,
- /* key: 0x21dd */ 0xffff,
- /* key: 0x21de */ 0xffff,
- /* key: 0x21df */ 0xffff,
- /* branch: 0x220X */ 912,
- /* branch: 0x221X */ 928,
- /* branch: 0x222X */ 944,
- /* branch: 0x223X */ 960,
- /* branch: 0x224X */ 0,
- /* branch: 0x225X */ 976,
- /* branch: 0x226X */ 992,
- /* branch: 0x227X */ 0,
- /* branch: 0x228X */ 1008,
- /* branch: 0x229X */ 0,
- /* branch: 0x22aX */ 1024,
- /* branch: 0x22bX */ 0,
- /* branch: 0x22cX */ 0,
- /* branch: 0x22dX */ 0,
- /* branch: 0x22eX */ 0,
- /* branch: 0x22fX */ 0,
- /* key: 0x2200 */ 0x224f,
- /* key: 0x2201 */ 0xffff,
- /* key: 0x2202 */ 0x225f,
- /* key: 0x2203 */ 0x2250,
- /* key: 0x2204 */ 0xffff,
- /* key: 0x2205 */ 0xffff,
- /* key: 0x2206 */ 0xffff,
- /* key: 0x2207 */ 0x2260,
- /* key: 0x2208 */ 0x223a,
- /* key: 0x2209 */ 0xffff,
- /* key: 0x220a */ 0xffff,
- /* key: 0x220b */ 0x223b,
- /* key: 0x220c */ 0xffff,
- /* key: 0x220d */ 0xffff,
- /* key: 0x220e */ 0xffff,
- /* key: 0x220f */ 0xffff,
- /* key: 0x2210 */ 0xffff,
- /* key: 0x2211 */ 0xffff,
- /* key: 0x2212 */ 0x215d,
- /* key: 0x2213 */ 0xffff,
- /* key: 0x2214 */ 0xffff,
- /* key: 0x2215 */ 0xffff,
- /* key: 0x2216 */ 0xffff,
- /* key: 0x2217 */ 0xffff,
- /* key: 0x2218 */ 0xffff,
- /* key: 0x2219 */ 0xffff,
- /* key: 0x221a */ 0x2265,
- /* key: 0x221b */ 0xffff,
- /* key: 0x221c */ 0xffff,
- /* key: 0x221d */ 0x2267,
- /* key: 0x221e */ 0x2167,
- /* key: 0x221f */ 0xffff,
- /* key: 0x2220 */ 0x225c,
- /* key: 0x2221 */ 0xffff,
- /* key: 0x2222 */ 0xffff,
- /* key: 0x2223 */ 0xffff,
- /* key: 0x2224 */ 0xffff,
- /* key: 0x2225 */ 0xffff,
- /* key: 0x2226 */ 0xffff,
- /* key: 0x2227 */ 0x224a,
- /* key: 0x2228 */ 0x224b,
- /* key: 0x2229 */ 0x2241,
- /* key: 0x222a */ 0x2240,
- /* key: 0x222b */ 0x2269,
- /* key: 0x222c */ 0x226a,
- /* key: 0x222d */ 0xffff,
- /* key: 0x222e */ 0xffff,
- /* key: 0x222f */ 0xffff,
- /* key: 0x2230 */ 0xffff,
- /* key: 0x2231 */ 0xffff,
- /* key: 0x2232 */ 0xffff,
- /* key: 0x2233 */ 0xffff,
- /* key: 0x2234 */ 0x2168,
- /* key: 0x2235 */ 0x2268,
- /* key: 0x2236 */ 0xffff,
- /* key: 0x2237 */ 0xffff,
- /* key: 0x2238 */ 0xffff,
- /* key: 0x2239 */ 0xffff,
- /* key: 0x223a */ 0xffff,
- /* key: 0x223b */ 0xffff,
- /* key: 0x223c */ 0xffff,
- /* key: 0x223d */ 0x2266,
- /* key: 0x223e */ 0xffff,
- /* key: 0x223f */ 0xffff,
- /* key: 0x2250 */ 0xffff,
- /* key: 0x2251 */ 0xffff,
- /* key: 0x2252 */ 0x2262,
- /* key: 0x2253 */ 0xffff,
- /* key: 0x2254 */ 0xffff,
- /* key: 0x2255 */ 0xffff,
- /* key: 0x2256 */ 0xffff,
- /* key: 0x2257 */ 0xffff,
- /* key: 0x2258 */ 0xffff,
- /* key: 0x2259 */ 0xffff,
- /* key: 0x225a */ 0xffff,
- /* key: 0x225b */ 0xffff,
- /* key: 0x225c */ 0xffff,
- /* key: 0x225d */ 0xffff,
- /* key: 0x225e */ 0xffff,
- /* key: 0x225f */ 0xffff,
- /* key: 0x2260 */ 0x2162,
- /* key: 0x2261 */ 0x2261,
- /* key: 0x2262 */ 0xffff,
- /* key: 0x2263 */ 0xffff,
- /* key: 0x2264 */ 0xffff,
- /* key: 0x2265 */ 0xffff,
- /* key: 0x2266 */ 0x2165,
- /* key: 0x2267 */ 0x2166,
- /* key: 0x2268 */ 0xffff,
- /* key: 0x2269 */ 0xffff,
- /* key: 0x226a */ 0x2263,
- /* key: 0x226b */ 0x2264,
- /* key: 0x226c */ 0xffff,
- /* key: 0x226d */ 0xffff,
- /* key: 0x226e */ 0xffff,
- /* key: 0x226f */ 0xffff,
- /* key: 0x2280 */ 0xffff,
- /* key: 0x2281 */ 0xffff,
- /* key: 0x2282 */ 0x223e,
- /* key: 0x2283 */ 0x223f,
- /* key: 0x2284 */ 0xffff,
- /* key: 0x2285 */ 0xffff,
- /* key: 0x2286 */ 0x223c,
- /* key: 0x2287 */ 0x223d,
- /* key: 0x2288 */ 0xffff,
- /* key: 0x2289 */ 0xffff,
- /* key: 0x228a */ 0xffff,
- /* key: 0x228b */ 0xffff,
- /* key: 0x228c */ 0xffff,
- /* key: 0x228d */ 0xffff,
- /* key: 0x228e */ 0xffff,
- /* key: 0x228f */ 0xffff,
- /* key: 0x22a0 */ 0xffff,
- /* key: 0x22a1 */ 0xffff,
- /* key: 0x22a2 */ 0xffff,
- /* key: 0x22a3 */ 0xffff,
- /* key: 0x22a4 */ 0xffff,
- /* key: 0x22a5 */ 0x225d,
- /* key: 0x22a6 */ 0xffff,
- /* key: 0x22a7 */ 0xffff,
- /* key: 0x22a8 */ 0xffff,
- /* key: 0x22a9 */ 0xffff,
- /* key: 0x22aa */ 0xffff,
- /* key: 0x22ab */ 0xffff,
- /* key: 0x22ac */ 0xffff,
- /* key: 0x22ad */ 0xffff,
- /* key: 0x22ae */ 0xffff,
- /* key: 0x22af */ 0xffff,
- /* branch: 0x230X */ 0,
- /* branch: 0x231X */ 1056,
- /* branch: 0x232X */ 0,
- /* branch: 0x233X */ 0,
- /* branch: 0x234X */ 0,
- /* branch: 0x235X */ 0,
- /* branch: 0x236X */ 0,
- /* branch: 0x237X */ 0,
- /* branch: 0x238X */ 0,
- /* branch: 0x239X */ 0,
- /* branch: 0x23aX */ 0,
- /* branch: 0x23bX */ 0,
- /* branch: 0x23cX */ 0,
- /* branch: 0x23dX */ 0,
- /* branch: 0x23eX */ 0,
- /* branch: 0x23fX */ 0,
- /* key: 0x2310 */ 0xffff,
- /* key: 0x2311 */ 0xffff,
- /* key: 0x2312 */ 0x225e,
- /* key: 0x2313 */ 0xffff,
- /* key: 0x2314 */ 0xffff,
- /* key: 0x2315 */ 0xffff,
- /* key: 0x2316 */ 0xffff,
- /* key: 0x2317 */ 0xffff,
- /* key: 0x2318 */ 0xffff,
- /* key: 0x2319 */ 0xffff,
- /* key: 0x231a */ 0xffff,
- /* key: 0x231b */ 0xffff,
- /* key: 0x231c */ 0xffff,
- /* key: 0x231d */ 0xffff,
- /* key: 0x231e */ 0xffff,
- /* key: 0x231f */ 0xffff,
- /* branch: 0x250X */ 1088,
- /* branch: 0x251X */ 1104,
- /* branch: 0x252X */ 1120,
- /* branch: 0x253X */ 1136,
- /* branch: 0x254X */ 1152,
- /* branch: 0x255X */ 0,
- /* branch: 0x256X */ 0,
- /* branch: 0x257X */ 0,
- /* branch: 0x258X */ 0,
- /* branch: 0x259X */ 0,
- /* branch: 0x25aX */ 1168,
- /* branch: 0x25bX */ 1184,
- /* branch: 0x25cX */ 1200,
- /* branch: 0x25dX */ 0,
- /* branch: 0x25eX */ 1216,
- /* branch: 0x25fX */ 0,
- /* key: 0x2500 */ 0x2821,
- /* key: 0x2501 */ 0x282c,
- /* key: 0x2502 */ 0x2822,
- /* key: 0x2503 */ 0x282d,
- /* key: 0x2504 */ 0xffff,
- /* key: 0x2505 */ 0xffff,
- /* key: 0x2506 */ 0xffff,
- /* key: 0x2507 */ 0xffff,
- /* key: 0x2508 */ 0xffff,
- /* key: 0x2509 */ 0xffff,
- /* key: 0x250a */ 0xffff,
- /* key: 0x250b */ 0xffff,
- /* key: 0x250c */ 0x2823,
- /* key: 0x250d */ 0xffff,
- /* key: 0x250e */ 0xffff,
- /* key: 0x250f */ 0x282e,
- /* key: 0x2510 */ 0x2824,
- /* key: 0x2511 */ 0xffff,
- /* key: 0x2512 */ 0xffff,
- /* key: 0x2513 */ 0x282f,
- /* key: 0x2514 */ 0x2826,
- /* key: 0x2515 */ 0xffff,
- /* key: 0x2516 */ 0xffff,
- /* key: 0x2517 */ 0x2831,
- /* key: 0x2518 */ 0x2825,
- /* key: 0x2519 */ 0xffff,
- /* key: 0x251a */ 0xffff,
- /* key: 0x251b */ 0x2830,
- /* key: 0x251c */ 0x2827,
- /* key: 0x251d */ 0x283c,
- /* key: 0x251e */ 0xffff,
- /* key: 0x251f */ 0xffff,
- /* key: 0x2520 */ 0x2837,
- /* key: 0x2521 */ 0xffff,
- /* key: 0x2522 */ 0xffff,
- /* key: 0x2523 */ 0x2832,
- /* key: 0x2524 */ 0x2829,
- /* key: 0x2525 */ 0x283e,
- /* key: 0x2526 */ 0xffff,
- /* key: 0x2527 */ 0xffff,
- /* key: 0x2528 */ 0x2839,
- /* key: 0x2529 */ 0xffff,
- /* key: 0x252a */ 0xffff,
- /* key: 0x252b */ 0x2834,
- /* key: 0x252c */ 0x2828,
- /* key: 0x252d */ 0xffff,
- /* key: 0x252e */ 0xffff,
- /* key: 0x252f */ 0x2838,
- /* key: 0x2530 */ 0x283d,
- /* key: 0x2531 */ 0xffff,
- /* key: 0x2532 */ 0xffff,
- /* key: 0x2533 */ 0x2833,
- /* key: 0x2534 */ 0x282a,
- /* key: 0x2535 */ 0xffff,
- /* key: 0x2536 */ 0xffff,
- /* key: 0x2537 */ 0x283a,
- /* key: 0x2538 */ 0x283f,
- /* key: 0x2539 */ 0xffff,
- /* key: 0x253a */ 0xffff,
- /* key: 0x253b */ 0x2835,
- /* key: 0x253c */ 0x282b,
- /* key: 0x253d */ 0xffff,
- /* key: 0x253e */ 0xffff,
- /* key: 0x253f */ 0x283b,
- /* key: 0x2540 */ 0xffff,
- /* key: 0x2541 */ 0xffff,
- /* key: 0x2542 */ 0x2840,
- /* key: 0x2543 */ 0xffff,
- /* key: 0x2544 */ 0xffff,
- /* key: 0x2545 */ 0xffff,
- /* key: 0x2546 */ 0xffff,
- /* key: 0x2547 */ 0xffff,
- /* key: 0x2548 */ 0xffff,
- /* key: 0x2549 */ 0xffff,
- /* key: 0x254a */ 0xffff,
- /* key: 0x254b */ 0x2836,
- /* key: 0x254c */ 0xffff,
- /* key: 0x254d */ 0xffff,
- /* key: 0x254e */ 0xffff,
- /* key: 0x254f */ 0xffff,
- /* key: 0x25a0 */ 0x2223,
- /* key: 0x25a1 */ 0x2222,
- /* key: 0x25a2 */ 0xffff,
- /* key: 0x25a3 */ 0xffff,
- /* key: 0x25a4 */ 0xffff,
- /* key: 0x25a5 */ 0xffff,
- /* key: 0x25a6 */ 0xffff,
- /* key: 0x25a7 */ 0xffff,
- /* key: 0x25a8 */ 0xffff,
- /* key: 0x25a9 */ 0xffff,
- /* key: 0x25aa */ 0xffff,
- /* key: 0x25ab */ 0xffff,
- /* key: 0x25ac */ 0xffff,
- /* key: 0x25ad */ 0xffff,
- /* key: 0x25ae */ 0xffff,
- /* key: 0x25af */ 0xffff,
- /* key: 0x25b0 */ 0xffff,
- /* key: 0x25b1 */ 0xffff,
- /* key: 0x25b2 */ 0x2225,
- /* key: 0x25b3 */ 0x2224,
- /* key: 0x25b4 */ 0xffff,
- /* key: 0x25b5 */ 0xffff,
- /* key: 0x25b6 */ 0xffff,
- /* key: 0x25b7 */ 0xffff,
- /* key: 0x25b8 */ 0xffff,
- /* key: 0x25b9 */ 0xffff,
- /* key: 0x25ba */ 0xffff,
- /* key: 0x25bb */ 0xffff,
- /* key: 0x25bc */ 0x2227,
- /* key: 0x25bd */ 0x2226,
- /* key: 0x25be */ 0xffff,
- /* key: 0x25bf */ 0xffff,
- /* key: 0x25c0 */ 0xffff,
- /* key: 0x25c1 */ 0xffff,
- /* key: 0x25c2 */ 0xffff,
- /* key: 0x25c3 */ 0xffff,
- /* key: 0x25c4 */ 0xffff,
- /* key: 0x25c5 */ 0xffff,
- /* key: 0x25c6 */ 0x2221,
- /* key: 0x25c7 */ 0x217e,
- /* key: 0x25c8 */ 0xffff,
- /* key: 0x25c9 */ 0xffff,
- /* key: 0x25ca */ 0xffff,
- /* key: 0x25cb */ 0x217b,
- /* key: 0x25cc */ 0xffff,
- /* key: 0x25cd */ 0xffff,
- /* key: 0x25ce */ 0x217d,
- /* key: 0x25cf */ 0x217c,
- /* key: 0x25e0 */ 0xffff,
- /* key: 0x25e1 */ 0xffff,
- /* key: 0x25e2 */ 0xffff,
- /* key: 0x25e3 */ 0xffff,
- /* key: 0x25e4 */ 0xffff,
- /* key: 0x25e5 */ 0xffff,
- /* key: 0x25e6 */ 0xffff,
- /* key: 0x25e7 */ 0xffff,
- /* key: 0x25e8 */ 0xffff,
- /* key: 0x25e9 */ 0xffff,
- /* key: 0x25ea */ 0xffff,
- /* key: 0x25eb */ 0xffff,
- /* key: 0x25ec */ 0xffff,
- /* key: 0x25ed */ 0xffff,
- /* key: 0x25ee */ 0xffff,
- /* key: 0x25ef */ 0x227e,
- /* branch: 0x260X */ 1248,
- /* branch: 0x261X */ 0,
- /* branch: 0x262X */ 0,
- /* branch: 0x263X */ 0,
- /* branch: 0x264X */ 1264,
- /* branch: 0x265X */ 0,
- /* branch: 0x266X */ 1280,
- /* branch: 0x267X */ 0,
- /* branch: 0x268X */ 0,
- /* branch: 0x269X */ 0,
- /* branch: 0x26aX */ 0,
- /* branch: 0x26bX */ 0,
- /* branch: 0x26cX */ 0,
- /* branch: 0x26dX */ 0,
- /* branch: 0x26eX */ 0,
- /* branch: 0x26fX */ 0,
- /* key: 0x2600 */ 0xffff,
- /* key: 0x2601 */ 0xffff,
- /* key: 0x2602 */ 0xffff,
- /* key: 0x2603 */ 0xffff,
- /* key: 0x2604 */ 0xffff,
- /* key: 0x2605 */ 0x217a,
- /* key: 0x2606 */ 0x2179,
- /* key: 0x2607 */ 0xffff,
- /* key: 0x2608 */ 0xffff,
- /* key: 0x2609 */ 0xffff,
- /* key: 0x260a */ 0xffff,
- /* key: 0x260b */ 0xffff,
- /* key: 0x260c */ 0xffff,
- /* key: 0x260d */ 0xffff,
- /* key: 0x260e */ 0xffff,
- /* key: 0x260f */ 0xffff,
- /* key: 0x2640 */ 0x216a,
- /* key: 0x2641 */ 0xffff,
- /* key: 0x2642 */ 0x2169,
- /* key: 0x2643 */ 0xffff,
- /* key: 0x2644 */ 0xffff,
- /* key: 0x2645 */ 0xffff,
- /* key: 0x2646 */ 0xffff,
- /* key: 0x2647 */ 0xffff,
- /* key: 0x2648 */ 0xffff,
- /* key: 0x2649 */ 0xffff,
- /* key: 0x264a */ 0xffff,
- /* key: 0x264b */ 0xffff,
- /* key: 0x264c */ 0xffff,
- /* key: 0x264d */ 0xffff,
- /* key: 0x264e */ 0xffff,
- /* key: 0x264f */ 0xffff,
- /* key: 0x2660 */ 0xffff,
- /* key: 0x2661 */ 0xffff,
- /* key: 0x2662 */ 0xffff,
- /* key: 0x2663 */ 0xffff,
- /* key: 0x2664 */ 0xffff,
- /* key: 0x2665 */ 0xffff,
- /* key: 0x2666 */ 0xffff,
- /* key: 0x2667 */ 0xffff,
- /* key: 0x2668 */ 0xffff,
- /* key: 0x2669 */ 0xffff,
- /* key: 0x266a */ 0x2276,
- /* key: 0x266b */ 0xffff,
- /* key: 0x266c */ 0xffff,
- /* key: 0x266d */ 0x2275,
- /* key: 0x266e */ 0xffff,
- /* key: 0x266f */ 0x2274,
- /* branch: 0x30XX */ 1312,
- /* branch: 0x31XX */ 0,
- /* branch: 0x32XX */ 0,
- /* branch: 0x33XX */ 0,
- /* branch: 0x34XX */ 0,
- /* branch: 0x35XX */ 0,
- /* branch: 0x36XX */ 0,
- /* branch: 0x37XX */ 0,
- /* branch: 0x38XX */ 0,
- /* branch: 0x39XX */ 0,
- /* branch: 0x3aXX */ 0,
- /* branch: 0x3bXX */ 0,
- /* branch: 0x3cXX */ 0,
- /* branch: 0x3dXX */ 0,
- /* branch: 0x3eXX */ 0,
- /* branch: 0x3fXX */ 0,
- /* branch: 0x300X */ 1328,
- /* branch: 0x301X */ 1344,
- /* branch: 0x302X */ 0,
- /* branch: 0x303X */ 0,
- /* branch: 0x304X */ 1360,
- /* branch: 0x305X */ 1376,
- /* branch: 0x306X */ 1392,
- /* branch: 0x307X */ 1408,
- /* branch: 0x308X */ 1424,
- /* branch: 0x309X */ 1440,
- /* branch: 0x30aX */ 1456,
- /* branch: 0x30bX */ 1472,
- /* branch: 0x30cX */ 1488,
- /* branch: 0x30dX */ 1504,
- /* branch: 0x30eX */ 1520,
- /* branch: 0x30fX */ 1536,
- /* key: 0x3000 */ 0x2121,
- /* key: 0x3001 */ 0x2122,
- /* key: 0x3002 */ 0x2123,
- /* key: 0x3003 */ 0x2137,
- /* key: 0x3004 */ 0xffff,
- /* key: 0x3005 */ 0x2139,
- /* key: 0x3006 */ 0x213a,
- /* key: 0x3007 */ 0x213b,
- /* key: 0x3008 */ 0x2152,
- /* key: 0x3009 */ 0x2153,
- /* key: 0x300a */ 0x2154,
- /* key: 0x300b */ 0x2155,
- /* key: 0x300c */ 0x2156,
- /* key: 0x300d */ 0x2157,
- /* key: 0x300e */ 0x2158,
- /* key: 0x300f */ 0x2159,
- /* key: 0x3010 */ 0x215a,
- /* key: 0x3011 */ 0x215b,
- /* key: 0x3012 */ 0x2229,
- /* key: 0x3013 */ 0x222e,
- /* key: 0x3014 */ 0x214c,
- /* key: 0x3015 */ 0x214d,
- /* key: 0x3016 */ 0xffff,
- /* key: 0x3017 */ 0xffff,
- /* key: 0x3018 */ 0xffff,
- /* key: 0x3019 */ 0xffff,
- /* key: 0x301a */ 0xffff,
- /* key: 0x301b */ 0xffff,
- /* key: 0x301c */ 0x2141,
- /* key: 0x301d */ 0xffff,
- /* key: 0x301e */ 0xffff,
- /* key: 0x301f */ 0xffff,
- /* key: 0x3040 */ 0xffff,
- /* key: 0x3041 */ 0x2421,
- /* key: 0x3042 */ 0x2422,
- /* key: 0x3043 */ 0x2423,
- /* key: 0x3044 */ 0x2424,
- /* key: 0x3045 */ 0x2425,
- /* key: 0x3046 */ 0x2426,
- /* key: 0x3047 */ 0x2427,
- /* key: 0x3048 */ 0x2428,
- /* key: 0x3049 */ 0x2429,
- /* key: 0x304a */ 0x242a,
- /* key: 0x304b */ 0x242b,
- /* key: 0x304c */ 0x242c,
- /* key: 0x304d */ 0x242d,
- /* key: 0x304e */ 0x242e,
- /* key: 0x304f */ 0x242f,
- /* key: 0x3050 */ 0x2430,
- /* key: 0x3051 */ 0x2431,
- /* key: 0x3052 */ 0x2432,
- /* key: 0x3053 */ 0x2433,
- /* key: 0x3054 */ 0x2434,
- /* key: 0x3055 */ 0x2435,
- /* key: 0x3056 */ 0x2436,
- /* key: 0x3057 */ 0x2437,
- /* key: 0x3058 */ 0x2438,
- /* key: 0x3059 */ 0x2439,
- /* key: 0x305a */ 0x243a,
- /* key: 0x305b */ 0x243b,
- /* key: 0x305c */ 0x243c,
- /* key: 0x305d */ 0x243d,
- /* key: 0x305e */ 0x243e,
- /* key: 0x305f */ 0x243f,
- /* key: 0x3060 */ 0x2440,
- /* key: 0x3061 */ 0x2441,
- /* key: 0x3062 */ 0x2442,
- /* key: 0x3063 */ 0x2443,
- /* key: 0x3064 */ 0x2444,
- /* key: 0x3065 */ 0x2445,
- /* key: 0x3066 */ 0x2446,
- /* key: 0x3067 */ 0x2447,
- /* key: 0x3068 */ 0x2448,
- /* key: 0x3069 */ 0x2449,
- /* key: 0x306a */ 0x244a,
- /* key: 0x306b */ 0x244b,
- /* key: 0x306c */ 0x244c,
- /* key: 0x306d */ 0x244d,
- /* key: 0x306e */ 0x244e,
- /* key: 0x306f */ 0x244f,
- /* key: 0x3070 */ 0x2450,
- /* key: 0x3071 */ 0x2451,
- /* key: 0x3072 */ 0x2452,
- /* key: 0x3073 */ 0x2453,
- /* key: 0x3074 */ 0x2454,
- /* key: 0x3075 */ 0x2455,
- /* key: 0x3076 */ 0x2456,
- /* key: 0x3077 */ 0x2457,
- /* key: 0x3078 */ 0x2458,
- /* key: 0x3079 */ 0x2459,
- /* key: 0x307a */ 0x245a,
- /* key: 0x307b */ 0x245b,
- /* key: 0x307c */ 0x245c,
- /* key: 0x307d */ 0x245d,
- /* key: 0x307e */ 0x245e,
- /* key: 0x307f */ 0x245f,
- /* key: 0x3080 */ 0x2460,
- /* key: 0x3081 */ 0x2461,
- /* key: 0x3082 */ 0x2462,
- /* key: 0x3083 */ 0x2463,
- /* key: 0x3084 */ 0x2464,
- /* key: 0x3085 */ 0x2465,
- /* key: 0x3086 */ 0x2466,
- /* key: 0x3087 */ 0x2467,
- /* key: 0x3088 */ 0x2468,
- /* key: 0x3089 */ 0x2469,
- /* key: 0x308a */ 0x246a,
- /* key: 0x308b */ 0x246b,
- /* key: 0x308c */ 0x246c,
- /* key: 0x308d */ 0x246d,
- /* key: 0x308e */ 0x246e,
- /* key: 0x308f */ 0x246f,
- /* key: 0x3090 */ 0x2470,
- /* key: 0x3091 */ 0x2471,
- /* key: 0x3092 */ 0x2472,
- /* key: 0x3093 */ 0x2473,
- /* key: 0x3094 */ 0xffff,
- /* key: 0x3095 */ 0xffff,
- /* key: 0x3096 */ 0xffff,
- /* key: 0x3097 */ 0xffff,
- /* key: 0x3098 */ 0xffff,
- /* key: 0x3099 */ 0xffff,
- /* key: 0x309a */ 0xffff,
- /* key: 0x309b */ 0x212b,
- /* key: 0x309c */ 0x212c,
- /* key: 0x309d */ 0x2135,
- /* key: 0x309e */ 0x2136,
- /* key: 0x309f */ 0xffff,
- /* key: 0x30a0 */ 0xffff,
- /* key: 0x30a1 */ 0x2521,
- /* key: 0x30a2 */ 0x2522,
- /* key: 0x30a3 */ 0x2523,
- /* key: 0x30a4 */ 0x2524,
- /* key: 0x30a5 */ 0x2525,
- /* key: 0x30a6 */ 0x2526,
- /* key: 0x30a7 */ 0x2527,
- /* key: 0x30a8 */ 0x2528,
- /* key: 0x30a9 */ 0x2529,
- /* key: 0x30aa */ 0x252a,
- /* key: 0x30ab */ 0x252b,
- /* key: 0x30ac */ 0x252c,
- /* key: 0x30ad */ 0x252d,
- /* key: 0x30ae */ 0x252e,
- /* key: 0x30af */ 0x252f,
- /* key: 0x30b0 */ 0x2530,
- /* key: 0x30b1 */ 0x2531,
- /* key: 0x30b2 */ 0x2532,
- /* key: 0x30b3 */ 0x2533,
- /* key: 0x30b4 */ 0x2534,
- /* key: 0x30b5 */ 0x2535,
- /* key: 0x30b6 */ 0x2536,
- /* key: 0x30b7 */ 0x2537,
- /* key: 0x30b8 */ 0x2538,
- /* key: 0x30b9 */ 0x2539,
- /* key: 0x30ba */ 0x253a,
- /* key: 0x30bb */ 0x253b,
- /* key: 0x30bc */ 0x253c,
- /* key: 0x30bd */ 0x253d,
- /* key: 0x30be */ 0x253e,
- /* key: 0x30bf */ 0x253f,
- /* key: 0x30c0 */ 0x2540,
- /* key: 0x30c1 */ 0x2541,
- /* key: 0x30c2 */ 0x2542,
- /* key: 0x30c3 */ 0x2543,
- /* key: 0x30c4 */ 0x2544,
- /* key: 0x30c5 */ 0x2545,
- /* key: 0x30c6 */ 0x2546,
- /* key: 0x30c7 */ 0x2547,
- /* key: 0x30c8 */ 0x2548,
- /* key: 0x30c9 */ 0x2549,
- /* key: 0x30ca */ 0x254a,
- /* key: 0x30cb */ 0x254b,
- /* key: 0x30cc */ 0x254c,
- /* key: 0x30cd */ 0x254d,
- /* key: 0x30ce */ 0x254e,
- /* key: 0x30cf */ 0x254f,
- /* key: 0x30d0 */ 0x2550,
- /* key: 0x30d1 */ 0x2551,
- /* key: 0x30d2 */ 0x2552,
- /* key: 0x30d3 */ 0x2553,
- /* key: 0x30d4 */ 0x2554,
- /* key: 0x30d5 */ 0x2555,
- /* key: 0x30d6 */ 0x2556,
- /* key: 0x30d7 */ 0x2557,
- /* key: 0x30d8 */ 0x2558,
- /* key: 0x30d9 */ 0x2559,
- /* key: 0x30da */ 0x255a,
- /* key: 0x30db */ 0x255b,
- /* key: 0x30dc */ 0x255c,
- /* key: 0x30dd */ 0x255d,
- /* key: 0x30de */ 0x255e,
- /* key: 0x30df */ 0x255f,
- /* key: 0x30e0 */ 0x2560,
- /* key: 0x30e1 */ 0x2561,
- /* key: 0x30e2 */ 0x2562,
- /* key: 0x30e3 */ 0x2563,
- /* key: 0x30e4 */ 0x2564,
- /* key: 0x30e5 */ 0x2565,
- /* key: 0x30e6 */ 0x2566,
- /* key: 0x30e7 */ 0x2567,
- /* key: 0x30e8 */ 0x2568,
- /* key: 0x30e9 */ 0x2569,
- /* key: 0x30ea */ 0x256a,
- /* key: 0x30eb */ 0x256b,
- /* key: 0x30ec */ 0x256c,
- /* key: 0x30ed */ 0x256d,
- /* key: 0x30ee */ 0x256e,
- /* key: 0x30ef */ 0x256f,
- /* key: 0x30f0 */ 0x2570,
- /* key: 0x30f1 */ 0x2571,
- /* key: 0x30f2 */ 0x2572,
- /* key: 0x30f3 */ 0x2573,
- /* key: 0x30f4 */ 0x2574,
- /* key: 0x30f5 */ 0x2575,
- /* key: 0x30f6 */ 0x2576,
- /* key: 0x30f7 */ 0xffff,
- /* key: 0x30f8 */ 0xffff,
- /* key: 0x30f9 */ 0xffff,
- /* key: 0x30fa */ 0xffff,
- /* key: 0x30fb */ 0x2126,
- /* key: 0x30fc */ 0x213c,
- /* key: 0x30fd */ 0x2133,
- /* key: 0x30fe */ 0x2134,
- /* key: 0x30ff */ 0xffff,
- /* branch: 0x40XX */ 0,
- /* branch: 0x41XX */ 0,
- /* branch: 0x42XX */ 0,
- /* branch: 0x43XX */ 0,
- /* branch: 0x44XX */ 0,
- /* branch: 0x45XX */ 0,
- /* branch: 0x46XX */ 0,
- /* branch: 0x47XX */ 0,
- /* branch: 0x48XX */ 0,
- /* branch: 0x49XX */ 0,
- /* branch: 0x4aXX */ 0,
- /* branch: 0x4bXX */ 0,
- /* branch: 0x4cXX */ 0,
- /* branch: 0x4dXX */ 0,
- /* branch: 0x4eXX */ 1568,
- /* branch: 0x4fXX */ 1840,
- /* branch: 0x4e0X */ 1584,
- /* branch: 0x4e1X */ 1600,
- /* branch: 0x4e2X */ 1616,
- /* branch: 0x4e3X */ 1632,
- /* branch: 0x4e4X */ 1648,
- /* branch: 0x4e5X */ 1664,
- /* branch: 0x4e6X */ 1680,
- /* branch: 0x4e7X */ 1696,
- /* branch: 0x4e8X */ 1712,
- /* branch: 0x4e9X */ 1728,
- /* branch: 0x4eaX */ 1744,
- /* branch: 0x4ebX */ 1760,
- /* branch: 0x4ecX */ 1776,
- /* branch: 0x4edX */ 1792,
- /* branch: 0x4eeX */ 1808,
- /* branch: 0x4efX */ 1824,
- /* key: 0x4e00 */ 0x306c,
- /* key: 0x4e01 */ 0x437a,
- /* key: 0x4e02 */ 0xb021,
- /* key: 0x4e03 */ 0x3c37,
- /* key: 0x4e04 */ 0xb022,
- /* key: 0x4e05 */ 0xb023,
- /* key: 0x4e06 */ 0xffff,
- /* key: 0x4e07 */ 0x4b7c,
- /* key: 0x4e08 */ 0x3e66,
- /* key: 0x4e09 */ 0x3b30,
- /* key: 0x4e0a */ 0x3e65,
- /* key: 0x4e0b */ 0x323c,
- /* key: 0x4e0c */ 0xb024,
- /* key: 0x4e0d */ 0x4954,
- /* key: 0x4e0e */ 0x4d3f,
- /* key: 0x4e0f */ 0xffff,
- /* key: 0x4e10 */ 0x5022,
- /* key: 0x4e11 */ 0x312f,
- /* key: 0x4e12 */ 0xb025,
- /* key: 0x4e13 */ 0xffff,
- /* key: 0x4e14 */ 0x336e,
- /* key: 0x4e15 */ 0x5023,
- /* key: 0x4e16 */ 0x4024,
- /* key: 0x4e17 */ 0x5242,
- /* key: 0x4e18 */ 0x3556,
- /* key: 0x4e19 */ 0x4a3a,
- /* key: 0x4e1a */ 0xffff,
- /* key: 0x4e1b */ 0xffff,
- /* key: 0x4e1c */ 0xffff,
- /* key: 0x4e1d */ 0xffff,
- /* key: 0x4e1e */ 0x3e67,
- /* key: 0x4e1f */ 0xb026,
- /* key: 0x4e20 */ 0xffff,
- /* key: 0x4e21 */ 0x4e3e,
- /* key: 0x4e22 */ 0xffff,
- /* key: 0x4e23 */ 0xb027,
- /* key: 0x4e24 */ 0xb028,
- /* key: 0x4e25 */ 0xffff,
- /* key: 0x4e26 */ 0x4a42,
- /* key: 0x4e27 */ 0xffff,
- /* key: 0x4e28 */ 0xb029,
- /* key: 0x4e29 */ 0xffff,
- /* key: 0x4e2a */ 0x5024,
- /* key: 0x4e2b */ 0xb02a,
- /* key: 0x4e2c */ 0xffff,
- /* key: 0x4e2d */ 0x4366,
- /* key: 0x4e2e */ 0xb02b,
- /* key: 0x4e2f */ 0xb02c,
- /* key: 0x4e30 */ 0xb02d,
- /* key: 0x4e31 */ 0x5025,
- /* key: 0x4e32 */ 0x367a,
- /* key: 0x4e33 */ 0xffff,
- /* key: 0x4e34 */ 0xffff,
- /* key: 0x4e35 */ 0xb02e,
- /* key: 0x4e36 */ 0x5026,
- /* key: 0x4e37 */ 0xffff,
- /* key: 0x4e38 */ 0x345d,
- /* key: 0x4e39 */ 0x4330,
- /* key: 0x4e3a */ 0xffff,
- /* key: 0x4e3b */ 0x3c67,
- /* key: 0x4e3c */ 0x5027,
- /* key: 0x4e3d */ 0xffff,
- /* key: 0x4e3e */ 0xffff,
- /* key: 0x4e3f */ 0x5028,
- /* key: 0x4e40 */ 0xb02f,
- /* key: 0x4e41 */ 0xb030,
- /* key: 0x4e42 */ 0x5029,
- /* key: 0x4e43 */ 0x4735,
- /* key: 0x4e44 */ 0xb031,
- /* key: 0x4e45 */ 0x3557,
- /* key: 0x4e46 */ 0xffff,
- /* key: 0x4e47 */ 0xb032,
- /* key: 0x4e48 */ 0xffff,
- /* key: 0x4e49 */ 0xffff,
- /* key: 0x4e4a */ 0xffff,
- /* key: 0x4e4b */ 0x4737,
- /* key: 0x4e4c */ 0xffff,
- /* key: 0x4e4d */ 0x4663,
- /* key: 0x4e4e */ 0x3843,
- /* key: 0x4e4f */ 0x4b33,
- /* key: 0x4e50 */ 0xffff,
- /* key: 0x4e51 */ 0xb033,
- /* key: 0x4e52 */ 0xffff,
- /* key: 0x4e53 */ 0xffff,
- /* key: 0x4e54 */ 0xffff,
- /* key: 0x4e55 */ 0x6949,
- /* key: 0x4e56 */ 0x502a,
- /* key: 0x4e57 */ 0x3e68,
- /* key: 0x4e58 */ 0x502b,
- /* key: 0x4e59 */ 0x3235,
- /* key: 0x4e5a */ 0xb034,
- /* key: 0x4e5b */ 0xffff,
- /* key: 0x4e5c */ 0xb035,
- /* key: 0x4e5d */ 0x3665,
- /* key: 0x4e5e */ 0x3870,
- /* key: 0x4e5f */ 0x4c69,
- /* key: 0x4e60 */ 0xffff,
- /* key: 0x4e61 */ 0xffff,
- /* key: 0x4e62 */ 0x5626,
- /* key: 0x4e63 */ 0xb036,
- /* key: 0x4e64 */ 0xffff,
- /* key: 0x4e65 */ 0xffff,
- /* key: 0x4e66 */ 0xffff,
- /* key: 0x4e67 */ 0xffff,
- /* key: 0x4e68 */ 0xb037,
- /* key: 0x4e69 */ 0xb038,
- /* key: 0x4e6a */ 0xffff,
- /* key: 0x4e6b */ 0xffff,
- /* key: 0x4e6c */ 0xffff,
- /* key: 0x4e6d */ 0xffff,
- /* key: 0x4e6e */ 0xffff,
- /* key: 0x4e6f */ 0xffff,
- /* key: 0x4e70 */ 0xffff,
- /* key: 0x4e71 */ 0x4d70,
- /* key: 0x4e72 */ 0xffff,
- /* key: 0x4e73 */ 0x467d,
- /* key: 0x4e74 */ 0xb039,
- /* key: 0x4e75 */ 0xb03a,
- /* key: 0x4e76 */ 0xffff,
- /* key: 0x4e77 */ 0xffff,
- /* key: 0x4e78 */ 0xffff,
- /* key: 0x4e79 */ 0xb03b,
- /* key: 0x4e7a */ 0xffff,
- /* key: 0x4e7b */ 0xffff,
- /* key: 0x4e7c */ 0xffff,
- /* key: 0x4e7d */ 0xffff,
- /* key: 0x4e7e */ 0x3425,
- /* key: 0x4e7f */ 0xb03c,
- /* key: 0x4e80 */ 0x3535,
- /* key: 0x4e81 */ 0xffff,
- /* key: 0x4e82 */ 0x502c,
- /* key: 0x4e83 */ 0xffff,
- /* key: 0x4e84 */ 0xffff,
- /* key: 0x4e85 */ 0x502d,
- /* key: 0x4e86 */ 0x4e3b,
- /* key: 0x4e87 */ 0xffff,
- /* key: 0x4e88 */ 0x4d3d,
- /* key: 0x4e89 */ 0x4168,
- /* key: 0x4e8a */ 0x502f,
- /* key: 0x4e8b */ 0x3b76,
- /* key: 0x4e8c */ 0x4673,
- /* key: 0x4e8d */ 0xb03d,
- /* key: 0x4e8e */ 0x5032,
- /* key: 0x4e8f */ 0xffff,
- /* key: 0x4e90 */ 0xffff,
- /* key: 0x4e91 */ 0x313e,
- /* key: 0x4e92 */ 0x385f,
- /* key: 0x4e93 */ 0xffff,
- /* key: 0x4e94 */ 0x385e,
- /* key: 0x4e95 */ 0x3066,
- /* key: 0x4e96 */ 0xb03e,
- /* key: 0x4e97 */ 0xb03f,
- /* key: 0x4e98 */ 0x4f4b,
- /* key: 0x4e99 */ 0x4f4a,
- /* key: 0x4e9a */ 0xffff,
- /* key: 0x4e9b */ 0x3a33,
- /* key: 0x4e9c */ 0x3021,
- /* key: 0x4e9d */ 0xb040,
- /* key: 0x4e9e */ 0x5033,
- /* key: 0x4e9f */ 0x5034,
- /* key: 0x4ea0 */ 0x5035,
- /* key: 0x4ea1 */ 0x4b34,
- /* key: 0x4ea2 */ 0x5036,
- /* key: 0x4ea3 */ 0xffff,
- /* key: 0x4ea4 */ 0x3872,
- /* key: 0x4ea5 */ 0x3067,
- /* key: 0x4ea6 */ 0x4b72,
- /* key: 0x4ea7 */ 0xffff,
- /* key: 0x4ea8 */ 0x357c,
- /* key: 0x4ea9 */ 0xffff,
- /* key: 0x4eaa */ 0xffff,
- /* key: 0x4eab */ 0x357d,
- /* key: 0x4eac */ 0x357e,
- /* key: 0x4ead */ 0x4462,
- /* key: 0x4eae */ 0x4e3c,
- /* key: 0x4eaf */ 0xb041,
- /* key: 0x4eb0 */ 0x5037,
- /* key: 0x4eb1 */ 0xffff,
- /* key: 0x4eb2 */ 0xffff,
- /* key: 0x4eb3 */ 0x5038,
- /* key: 0x4eb4 */ 0xffff,
- /* key: 0x4eb5 */ 0xffff,
- /* key: 0x4eb6 */ 0x5039,
- /* key: 0x4eb7 */ 0xffff,
- /* key: 0x4eb8 */ 0xffff,
- /* key: 0x4eb9 */ 0xb042,
- /* key: 0x4eba */ 0x3f4d,
- /* key: 0x4ebb */ 0xffff,
- /* key: 0x4ebc */ 0xffff,
- /* key: 0x4ebd */ 0xffff,
- /* key: 0x4ebe */ 0xffff,
- /* key: 0x4ebf */ 0xffff,
- /* key: 0x4ec0 */ 0x3d3a,
- /* key: 0x4ec1 */ 0x3f4e,
- /* key: 0x4ec2 */ 0x503e,
- /* key: 0x4ec3 */ 0xb043,
- /* key: 0x4ec4 */ 0x503c,
- /* key: 0x4ec5 */ 0xffff,
- /* key: 0x4ec6 */ 0x503d,
- /* key: 0x4ec7 */ 0x3558,
- /* key: 0x4ec8 */ 0xffff,
- /* key: 0x4ec9 */ 0xffff,
- /* key: 0x4eca */ 0x3a23,
- /* key: 0x4ecb */ 0x3270,
- /* key: 0x4ecc */ 0xffff,
- /* key: 0x4ecd */ 0x503b,
- /* key: 0x4ece */ 0x503a,
- /* key: 0x4ecf */ 0x4a29,
- /* key: 0x4ed0 */ 0xb044,
- /* key: 0x4ed1 */ 0xffff,
- /* key: 0x4ed2 */ 0xffff,
- /* key: 0x4ed3 */ 0xffff,
- /* key: 0x4ed4 */ 0x3b46,
- /* key: 0x4ed5 */ 0x3b45,
- /* key: 0x4ed6 */ 0x423e,
- /* key: 0x4ed7 */ 0x503f,
- /* key: 0x4ed8 */ 0x4955,
- /* key: 0x4ed9 */ 0x4067,
- /* key: 0x4eda */ 0xb045,
- /* key: 0x4edb */ 0xb046,
- /* key: 0x4edc */ 0xffff,
- /* key: 0x4edd */ 0x2138,
- /* key: 0x4ede */ 0x5040,
- /* key: 0x4edf */ 0x5042,
- /* key: 0x4ee0 */ 0xb047,
- /* key: 0x4ee1 */ 0xb048,
- /* key: 0x4ee2 */ 0xb049,
- /* key: 0x4ee3 */ 0x4265,
- /* key: 0x4ee4 */ 0x4e61,
- /* key: 0x4ee5 */ 0x304a,
- /* key: 0x4ee6 */ 0xffff,
- /* key: 0x4ee7 */ 0xffff,
- /* key: 0x4ee8 */ 0xb04a,
- /* key: 0x4ee9 */ 0xffff,
- /* key: 0x4eea */ 0xffff,
- /* key: 0x4eeb */ 0xffff,
- /* key: 0x4eec */ 0xffff,
- /* key: 0x4eed */ 0x5041,
- /* key: 0x4eee */ 0x323e,
- /* key: 0x4eef */ 0xb04b,
- /* key: 0x4ef0 */ 0x3644,
- /* key: 0x4ef1 */ 0xb04c,
- /* key: 0x4ef2 */ 0x4367,
- /* key: 0x4ef3 */ 0xb04d,
- /* key: 0x4ef4 */ 0xffff,
- /* key: 0x4ef5 */ 0xb04e,
- /* key: 0x4ef6 */ 0x376f,
- /* key: 0x4ef7 */ 0x5043,
- /* key: 0x4ef8 */ 0xffff,
- /* key: 0x4ef9 */ 0xffff,
- /* key: 0x4efa */ 0xffff,
- /* key: 0x4efb */ 0x4724,
- /* key: 0x4efc */ 0xffff,
- /* key: 0x4efd */ 0xb04f,
- /* key: 0x4efe */ 0xb050,
- /* key: 0x4eff */ 0xb051,
- /* branch: 0x4f0X */ 1856,
- /* branch: 0x4f1X */ 1872,
- /* branch: 0x4f2X */ 1888,
- /* branch: 0x4f3X */ 1904,
- /* branch: 0x4f4X */ 1920,
- /* branch: 0x4f5X */ 1936,
- /* branch: 0x4f6X */ 1952,
- /* branch: 0x4f7X */ 1968,
- /* branch: 0x4f8X */ 1984,
- /* branch: 0x4f9X */ 2000,
- /* branch: 0x4faX */ 2016,
- /* branch: 0x4fbX */ 2032,
- /* branch: 0x4fcX */ 2048,
- /* branch: 0x4fdX */ 2064,
- /* branch: 0x4feX */ 2080,
- /* branch: 0x4ffX */ 2096,
- /* key: 0x4f00 */ 0xb052,
- /* key: 0x4f01 */ 0x346b,
- /* key: 0x4f02 */ 0xb053,
- /* key: 0x4f03 */ 0xb054,
- /* key: 0x4f04 */ 0xffff,
- /* key: 0x4f05 */ 0xffff,
- /* key: 0x4f06 */ 0xffff,
- /* key: 0x4f07 */ 0xffff,
- /* key: 0x4f08 */ 0xb055,
- /* key: 0x4f09 */ 0x5044,
- /* key: 0x4f0a */ 0x304b,
- /* key: 0x4f0b */ 0xb056,
- /* key: 0x4f0c */ 0xb057,
- /* key: 0x4f0d */ 0x3860,
- /* key: 0x4f0e */ 0x346c,
- /* key: 0x4f0f */ 0x497a,
- /* key: 0x4f10 */ 0x4832,
- /* key: 0x4f11 */ 0x3559,
- /* key: 0x4f12 */ 0xb058,
- /* key: 0x4f13 */ 0xffff,
- /* key: 0x4f14 */ 0xffff,
- /* key: 0x4f15 */ 0xb059,
- /* key: 0x4f16 */ 0xb05a,
- /* key: 0x4f17 */ 0xb05b,
- /* key: 0x4f18 */ 0xffff,
- /* key: 0x4f19 */ 0xb05c,
- /* key: 0x4f1a */ 0x3271,
- /* key: 0x4f1b */ 0xffff,
- /* key: 0x4f1c */ 0x5067,
- /* key: 0x4f1d */ 0x4541,
- /* key: 0x4f1e */ 0xffff,
- /* key: 0x4f1f */ 0xffff,
- /* key: 0x4f20 */ 0xffff,
- /* key: 0x4f21 */ 0xffff,
- /* key: 0x4f22 */ 0xffff,
- /* key: 0x4f23 */ 0xffff,
- /* key: 0x4f24 */ 0xffff,
- /* key: 0x4f25 */ 0xffff,
- /* key: 0x4f26 */ 0xffff,
- /* key: 0x4f27 */ 0xffff,
- /* key: 0x4f28 */ 0xffff,
- /* key: 0x4f29 */ 0xffff,
- /* key: 0x4f2a */ 0xffff,
- /* key: 0x4f2b */ 0xffff,
- /* key: 0x4f2c */ 0xffff,
- /* key: 0x4f2d */ 0xffff,
- /* key: 0x4f2e */ 0xb05d,
- /* key: 0x4f2f */ 0x476c,
- /* key: 0x4f30 */ 0x5046,
- /* key: 0x4f31 */ 0xb05e,
- /* key: 0x4f32 */ 0xffff,
- /* key: 0x4f33 */ 0xb060,
- /* key: 0x4f34 */ 0x483c,
- /* key: 0x4f35 */ 0xb061,
- /* key: 0x4f36 */ 0x4e62,
- /* key: 0x4f37 */ 0xb062,
- /* key: 0x4f38 */ 0x3f2d,
- /* key: 0x4f39 */ 0xb063,
- /* key: 0x4f3a */ 0x3b47,
- /* key: 0x4f3b */ 0xb064,
- /* key: 0x4f3c */ 0x3b77,
- /* key: 0x4f3d */ 0x3240,
- /* key: 0x4f3e */ 0xb065,
- /* key: 0x4f3f */ 0xffff,
- /* key: 0x4f40 */ 0xb066,
- /* key: 0x4f41 */ 0xffff,
- /* key: 0x4f42 */ 0xb067,
- /* key: 0x4f43 */ 0x4451,
- /* key: 0x4f44 */ 0xffff,
- /* key: 0x4f45 */ 0xffff,
- /* key: 0x4f46 */ 0x4322,
- /* key: 0x4f47 */ 0x504a,
- /* key: 0x4f48 */ 0xb068,
- /* key: 0x4f49 */ 0xb069,
- /* key: 0x4f4a */ 0xffff,
- /* key: 0x4f4b */ 0xb06a,
- /* key: 0x4f4c */ 0xb06b,
- /* key: 0x4f4d */ 0x304c,
- /* key: 0x4f4e */ 0x4463,
- /* key: 0x4f4f */ 0x3d3b,
- /* key: 0x4f50 */ 0x3a34,
- /* key: 0x4f51 */ 0x4d24,
- /* key: 0x4f52 */ 0xb06c,
- /* key: 0x4f53 */ 0x424e,
- /* key: 0x4f54 */ 0xb06d,
- /* key: 0x4f55 */ 0x323f,
- /* key: 0x4f56 */ 0xb06e,
- /* key: 0x4f57 */ 0x5049,
- /* key: 0x4f58 */ 0xb06f,
- /* key: 0x4f59 */ 0x4d3e,
- /* key: 0x4f5a */ 0x5045,
- /* key: 0x4f5b */ 0x5047,
- /* key: 0x4f5c */ 0x3a6e,
- /* key: 0x4f5d */ 0x5048,
- /* key: 0x4f5e */ 0x5524,
- /* key: 0x4f5f */ 0xb070,
- /* key: 0x4f60 */ 0xb05f,
- /* key: 0x4f61 */ 0xffff,
- /* key: 0x4f62 */ 0xffff,
- /* key: 0x4f63 */ 0xb071,
- /* key: 0x4f64 */ 0xffff,
- /* key: 0x4f65 */ 0xffff,
- /* key: 0x4f66 */ 0xffff,
- /* key: 0x4f67 */ 0xffff,
- /* key: 0x4f68 */ 0xffff,
- /* key: 0x4f69 */ 0x5050,
- /* key: 0x4f6a */ 0xb072,
- /* key: 0x4f6b */ 0xffff,
- /* key: 0x4f6c */ 0xb073,
- /* key: 0x4f6d */ 0xffff,
- /* key: 0x4f6e */ 0xb074,
- /* key: 0x4f6f */ 0x5053,
- /* key: 0x4f70 */ 0x5051,
- /* key: 0x4f71 */ 0xb075,
- /* key: 0x4f72 */ 0xffff,
- /* key: 0x4f73 */ 0x3242,
- /* key: 0x4f74 */ 0xffff,
- /* key: 0x4f75 */ 0x4a3b,
- /* key: 0x4f76 */ 0x504b,
- /* key: 0x4f77 */ 0xb076,
- /* key: 0x4f78 */ 0xb077,
- /* key: 0x4f79 */ 0xb078,
- /* key: 0x4f7a */ 0xb079,
- /* key: 0x4f7b */ 0x504f,
- /* key: 0x4f7c */ 0x3873,
- /* key: 0x4f7d */ 0xb07a,
- /* key: 0x4f7e */ 0xb07b,
- /* key: 0x4f7f */ 0x3b48,
- /* key: 0x4f80 */ 0xffff,
- /* key: 0x4f81 */ 0xb07c,
- /* key: 0x4f82 */ 0xb07d,
- /* key: 0x4f83 */ 0x3426,
- /* key: 0x4f84 */ 0xb07e,
- /* key: 0x4f85 */ 0xb121,
- /* key: 0x4f86 */ 0x5054,
- /* key: 0x4f87 */ 0xffff,
- /* key: 0x4f88 */ 0x504c,
- /* key: 0x4f89 */ 0xb122,
- /* key: 0x4f8a */ 0xb123,
- /* key: 0x4f8b */ 0x4e63,
- /* key: 0x4f8c */ 0xb124,
- /* key: 0x4f8d */ 0x3b78,
- /* key: 0x4f8e */ 0xb125,
- /* key: 0x4f8f */ 0x504d,
- /* key: 0x4f90 */ 0xb126,
- /* key: 0x4f91 */ 0x5052,
- /* key: 0x4f92 */ 0xb127,
- /* key: 0x4f93 */ 0xb128,
- /* key: 0x4f94 */ 0xb129,
- /* key: 0x4f95 */ 0xffff,
- /* key: 0x4f96 */ 0x5055,
- /* key: 0x4f97 */ 0xb12a,
- /* key: 0x4f98 */ 0x504e,
- /* key: 0x4f99 */ 0xb12b,
- /* key: 0x4f9a */ 0xb12c,
- /* key: 0x4f9b */ 0x3621,
- /* key: 0x4f9c */ 0xffff,
- /* key: 0x4f9d */ 0x304d,
- /* key: 0x4f9e */ 0xb12d,
- /* key: 0x4f9f */ 0xb12e,
- /* key: 0x4fa0 */ 0x3622,
- /* key: 0x4fa1 */ 0x3241,
- /* key: 0x4fa2 */ 0xffff,
- /* key: 0x4fa3 */ 0xffff,
- /* key: 0x4fa4 */ 0xffff,
- /* key: 0x4fa5 */ 0xffff,
- /* key: 0x4fa6 */ 0xffff,
- /* key: 0x4fa7 */ 0xffff,
- /* key: 0x4fa8 */ 0xffff,
- /* key: 0x4fa9 */ 0xffff,
- /* key: 0x4faa */ 0xffff,
- /* key: 0x4fab */ 0x5525,
- /* key: 0x4fac */ 0xffff,
- /* key: 0x4fad */ 0x4b79,
- /* key: 0x4fae */ 0x496e,
- /* key: 0x4faf */ 0x3874,
- /* key: 0x4fb0 */ 0xffff,
- /* key: 0x4fb1 */ 0xffff,
- /* key: 0x4fb2 */ 0xb12f,
- /* key: 0x4fb3 */ 0xffff,
- /* key: 0x4fb4 */ 0xffff,
- /* key: 0x4fb5 */ 0x3f2f,
- /* key: 0x4fb6 */ 0x4e37,
- /* key: 0x4fb7 */ 0xb130,
- /* key: 0x4fb8 */ 0xffff,
- /* key: 0x4fb9 */ 0xb131,
- /* key: 0x4fba */ 0xffff,
- /* key: 0x4fbb */ 0xb132,
- /* key: 0x4fbc */ 0xb133,
- /* key: 0x4fbd */ 0xb134,
- /* key: 0x4fbe */ 0xb135,
- /* key: 0x4fbf */ 0x4a58,
- /* key: 0x4fc0 */ 0xb136,
- /* key: 0x4fc1 */ 0xb137,
- /* key: 0x4fc2 */ 0x3738,
- /* key: 0x4fc3 */ 0x4225,
- /* key: 0x4fc4 */ 0x3264,
- /* key: 0x4fc5 */ 0xb138,
- /* key: 0x4fc6 */ 0xb139,
- /* key: 0x4fc7 */ 0xffff,
- /* key: 0x4fc8 */ 0xb13a,
- /* key: 0x4fc9 */ 0xb13b,
- /* key: 0x4fca */ 0x3d53,
- /* key: 0x4fcb */ 0xb13c,
- /* key: 0x4fcc */ 0xb13d,
- /* key: 0x4fcd */ 0xb13e,
- /* key: 0x4fce */ 0x5059,
- /* key: 0x4fcf */ 0xb13f,
- /* key: 0x4fd0 */ 0x505e,
- /* key: 0x4fd1 */ 0x505c,
- /* key: 0x4fd2 */ 0xb140,
- /* key: 0x4fd3 */ 0xffff,
- /* key: 0x4fd4 */ 0x5057,
- /* key: 0x4fd5 */ 0xffff,
- /* key: 0x4fd6 */ 0xffff,
- /* key: 0x4fd7 */ 0x422f,
- /* key: 0x4fd8 */ 0x505a,
- /* key: 0x4fd9 */ 0xffff,
- /* key: 0x4fda */ 0x505d,
- /* key: 0x4fdb */ 0x505b,
- /* key: 0x4fdc */ 0xb141,
- /* key: 0x4fdd */ 0x4a5d,
- /* key: 0x4fde */ 0xffff,
- /* key: 0x4fdf */ 0x5058,
- /* key: 0x4fe0 */ 0xb142,
- /* key: 0x4fe1 */ 0x3f2e,
- /* key: 0x4fe2 */ 0xb143,
- /* key: 0x4fe3 */ 0x4b73,
- /* key: 0x4fe4 */ 0x505f,
- /* key: 0x4fe5 */ 0x5060,
- /* key: 0x4fe6 */ 0xffff,
- /* key: 0x4fe7 */ 0xffff,
- /* key: 0x4fe8 */ 0xffff,
- /* key: 0x4fe9 */ 0xffff,
- /* key: 0x4fea */ 0xffff,
- /* key: 0x4feb */ 0xffff,
- /* key: 0x4fec */ 0xffff,
- /* key: 0x4fed */ 0xffff,
- /* key: 0x4fee */ 0x3d24,
- /* key: 0x4fef */ 0x506d,
- /* key: 0x4ff0 */ 0xb144,
- /* key: 0x4ff1 */ 0xffff,
- /* key: 0x4ff2 */ 0xb145,
- /* key: 0x4ff3 */ 0x4750,
- /* key: 0x4ff4 */ 0xffff,
- /* key: 0x4ff5 */ 0x4936,
- /* key: 0x4ff6 */ 0x5068,
- /* key: 0x4ff7 */ 0xffff,
- /* key: 0x4ff8 */ 0x4a70,
- /* key: 0x4ff9 */ 0xffff,
- /* key: 0x4ffa */ 0x3236,
- /* key: 0x4ffb */ 0xffff,
- /* key: 0x4ffc */ 0xb146,
- /* key: 0x4ffd */ 0xb147,
- /* key: 0x4ffe */ 0x506c,
- /* key: 0x4fff */ 0xb148,
- /* branch: 0x50XX */ 2128,
- /* branch: 0x51XX */ 2400,
- /* branch: 0x52XX */ 2672,
- /* branch: 0x53XX */ 2944,
- /* branch: 0x54XX */ 3216,
- /* branch: 0x55XX */ 3488,
- /* branch: 0x56XX */ 3760,
- /* branch: 0x57XX */ 4032,
- /* branch: 0x58XX */ 4304,
- /* branch: 0x59XX */ 4576,
- /* branch: 0x5aXX */ 4848,
- /* branch: 0x5bXX */ 5120,
- /* branch: 0x5cXX */ 5392,
- /* branch: 0x5dXX */ 5664,
- /* branch: 0x5eXX */ 5936,
- /* branch: 0x5fXX */ 6208,
- /* branch: 0x500X */ 2144,
- /* branch: 0x501X */ 2160,
- /* branch: 0x502X */ 2176,
- /* branch: 0x503X */ 2192,
- /* branch: 0x504X */ 2208,
- /* branch: 0x505X */ 2224,
- /* branch: 0x506X */ 2240,
- /* branch: 0x507X */ 2256,
- /* branch: 0x508X */ 2272,
- /* branch: 0x509X */ 2288,
- /* branch: 0x50aX */ 2304,
- /* branch: 0x50bX */ 2320,
- /* branch: 0x50cX */ 2336,
- /* branch: 0x50dX */ 2352,
- /* branch: 0x50eX */ 2368,
- /* branch: 0x50fX */ 2384,
- /* key: 0x5000 */ 0xb149,
- /* key: 0x5001 */ 0xb14a,
- /* key: 0x5002 */ 0xffff,
- /* key: 0x5003 */ 0xffff,
- /* key: 0x5004 */ 0xb14b,
- /* key: 0x5005 */ 0x5066,
- /* key: 0x5006 */ 0x506f,
- /* key: 0x5007 */ 0xb14c,
- /* key: 0x5008 */ 0xffff,
- /* key: 0x5009 */ 0x4152,
- /* key: 0x500a */ 0xb14d,
- /* key: 0x500b */ 0x3844,
- /* key: 0x500c */ 0xb14e,
- /* key: 0x500d */ 0x475c,
- /* key: 0x500e */ 0xb14f,
- /* key: 0x500f */ 0x6047,
- /* key: 0x5010 */ 0xb150,
- /* key: 0x5011 */ 0x506e,
- /* key: 0x5012 */ 0x455d,
- /* key: 0x5013 */ 0xb151,
- /* key: 0x5014 */ 0x5063,
- /* key: 0x5015 */ 0xffff,
- /* key: 0x5016 */ 0x3876,
- /* key: 0x5017 */ 0xb152,
- /* key: 0x5018 */ 0xb153,
- /* key: 0x5019 */ 0x3875,
- /* key: 0x501a */ 0x5061,
- /* key: 0x501b */ 0xb154,
- /* key: 0x501c */ 0xb155,
- /* key: 0x501d */ 0xb156,
- /* key: 0x501e */ 0xb157,
- /* key: 0x501f */ 0x3c5a,
- /* key: 0x5020 */ 0xffff,
- /* key: 0x5021 */ 0x5069,
- /* key: 0x5022 */ 0xb158,
- /* key: 0x5023 */ 0x4a6f,
- /* key: 0x5024 */ 0x434d,
- /* key: 0x5025 */ 0x5065,
- /* key: 0x5026 */ 0x3771,
- /* key: 0x5027 */ 0xb159,
- /* key: 0x5028 */ 0x5062,
- /* key: 0x5029 */ 0x506a,
- /* key: 0x502a */ 0x5064,
- /* key: 0x502b */ 0x4e51,
- /* key: 0x502c */ 0x506b,
- /* key: 0x502d */ 0x4f41,
- /* key: 0x502e */ 0xb15a,
- /* key: 0x502f */ 0xffff,
- /* key: 0x5030 */ 0xb15b,
- /* key: 0x5031 */ 0xffff,
- /* key: 0x5032 */ 0xb15c,
- /* key: 0x5033 */ 0xb15d,
- /* key: 0x5034 */ 0xffff,
- /* key: 0x5035 */ 0xb15e,
- /* key: 0x5036 */ 0x3666,
- /* key: 0x5037 */ 0xffff,
- /* key: 0x5038 */ 0xffff,
- /* key: 0x5039 */ 0x3770,
- /* key: 0x503a */ 0xffff,
- /* key: 0x503b */ 0xb176,
- /* key: 0x503c */ 0xffff,
- /* key: 0x503d */ 0xffff,
- /* key: 0x503e */ 0xffff,
- /* key: 0x503f */ 0xffff,
- /* key: 0x5040 */ 0xb15f,
- /* key: 0x5041 */ 0xb160,
- /* key: 0x5042 */ 0xb161,
- /* key: 0x5043 */ 0x5070,
- /* key: 0x5044 */ 0xffff,
- /* key: 0x5045 */ 0xb162,
- /* key: 0x5046 */ 0xb163,
- /* key: 0x5047 */ 0x5071,
- /* key: 0x5048 */ 0x5075,
- /* key: 0x5049 */ 0x304e,
- /* key: 0x504a */ 0xb164,
- /* key: 0x504b */ 0xffff,
- /* key: 0x504c */ 0xb165,
- /* key: 0x504d */ 0xffff,
- /* key: 0x504e */ 0xb166,
- /* key: 0x504f */ 0x4a50,
- /* key: 0x5050 */ 0x5074,
- /* key: 0x5051 */ 0xb167,
- /* key: 0x5052 */ 0xb168,
- /* key: 0x5053 */ 0xb169,
- /* key: 0x5054 */ 0xffff,
- /* key: 0x5055 */ 0x5073,
- /* key: 0x5056 */ 0x5077,
- /* key: 0x5057 */ 0xb16a,
- /* key: 0x5058 */ 0xffff,
- /* key: 0x5059 */ 0xb16b,
- /* key: 0x505a */ 0x5076,
- /* key: 0x505b */ 0xffff,
- /* key: 0x505c */ 0x4464,
- /* key: 0x505d */ 0xffff,
- /* key: 0x505e */ 0xffff,
- /* key: 0x505f */ 0xb16c,
- /* key: 0x5060 */ 0xb16d,
- /* key: 0x5061 */ 0xffff,
- /* key: 0x5062 */ 0xb16e,
- /* key: 0x5063 */ 0xb16f,
- /* key: 0x5064 */ 0xffff,
- /* key: 0x5065 */ 0x3772,
- /* key: 0x5066 */ 0xb170,
- /* key: 0x5067 */ 0xb171,
- /* key: 0x5068 */ 0xffff,
- /* key: 0x5069 */ 0xffff,
- /* key: 0x506a */ 0xb172,
- /* key: 0x506b */ 0xffff,
- /* key: 0x506c */ 0x5078,
- /* key: 0x506d */ 0xb173,
- /* key: 0x506e */ 0xffff,
- /* key: 0x506f */ 0xffff,
- /* key: 0x5070 */ 0xb174,
- /* key: 0x5071 */ 0xb175,
- /* key: 0x5072 */ 0x3c45,
- /* key: 0x5073 */ 0xffff,
- /* key: 0x5074 */ 0x4226,
- /* key: 0x5075 */ 0x4465,
- /* key: 0x5076 */ 0x3676,
- /* key: 0x5077 */ 0xffff,
- /* key: 0x5078 */ 0x5079,
- /* key: 0x5079 */ 0xffff,
- /* key: 0x507a */ 0xffff,
- /* key: 0x507b */ 0xffff,
- /* key: 0x507c */ 0xffff,
- /* key: 0x507d */ 0x3536,
- /* key: 0x507e */ 0xffff,
- /* key: 0x507f */ 0xffff,
- /* key: 0x5080 */ 0x507a,
- /* key: 0x5081 */ 0xb177,
- /* key: 0x5082 */ 0xffff,
- /* key: 0x5083 */ 0xb178,
- /* key: 0x5084 */ 0xb179,
- /* key: 0x5085 */ 0x507c,
- /* key: 0x5086 */ 0xb17a,
- /* key: 0x5087 */ 0xffff,
- /* key: 0x5088 */ 0xffff,
- /* key: 0x5089 */ 0xffff,
- /* key: 0x508a */ 0xb17b,
- /* key: 0x508b */ 0xffff,
- /* key: 0x508c */ 0xffff,
- /* key: 0x508d */ 0x4b35,
- /* key: 0x508e */ 0xb17c,
- /* key: 0x508f */ 0xb17d,
- /* key: 0x5090 */ 0xb17e,
- /* key: 0x5091 */ 0x3766,
- /* key: 0x5092 */ 0xb221,
- /* key: 0x5093 */ 0xb222,
- /* key: 0x5094 */ 0xb223,
- /* key: 0x5095 */ 0xffff,
- /* key: 0x5096 */ 0xb224,
- /* key: 0x5097 */ 0xffff,
- /* key: 0x5098 */ 0x3b31,
- /* key: 0x5099 */ 0x4877,
- /* key: 0x509a */ 0x507b,
- /* key: 0x509b */ 0xb225,
- /* key: 0x509c */ 0xb226,
- /* key: 0x509d */ 0xffff,
- /* key: 0x509e */ 0xb227,
- /* key: 0x509f */ 0xb228,
- /* key: 0x50a0 */ 0xb229,
- /* key: 0x50a1 */ 0xb22a,
- /* key: 0x50a2 */ 0xb22b,
- /* key: 0x50a3 */ 0xffff,
- /* key: 0x50a4 */ 0xffff,
- /* key: 0x50a5 */ 0xffff,
- /* key: 0x50a6 */ 0xffff,
- /* key: 0x50a7 */ 0xffff,
- /* key: 0x50a8 */ 0xffff,
- /* key: 0x50a9 */ 0xffff,
- /* key: 0x50aa */ 0xb22c,
- /* key: 0x50ab */ 0xffff,
- /* key: 0x50ac */ 0x3a45,
- /* key: 0x50ad */ 0x4d43,
- /* key: 0x50ae */ 0xffff,
- /* key: 0x50af */ 0xb22d,
- /* key: 0x50b0 */ 0xb22e,
- /* key: 0x50b1 */ 0xffff,
- /* key: 0x50b2 */ 0x507e,
- /* key: 0x50b3 */ 0x5123,
- /* key: 0x50b4 */ 0x507d,
- /* key: 0x50b5 */ 0x3a44,
- /* key: 0x50b6 */ 0xffff,
- /* key: 0x50b7 */ 0x3d7d,
- /* key: 0x50b8 */ 0xffff,
- /* key: 0x50b9 */ 0xb22f,
- /* key: 0x50ba */ 0xb230,
- /* key: 0x50bb */ 0xffff,
- /* key: 0x50bc */ 0xffff,
- /* key: 0x50bd */ 0xb231,
- /* key: 0x50be */ 0x3739,
- /* key: 0x50bf */ 0xffff,
- /* key: 0x50c0 */ 0xb232,
- /* key: 0x50c1 */ 0xffff,
- /* key: 0x50c2 */ 0x5124,
- /* key: 0x50c3 */ 0xb233,
- /* key: 0x50c4 */ 0xb234,
- /* key: 0x50c5 */ 0x364f,
- /* key: 0x50c6 */ 0xffff,
- /* key: 0x50c7 */ 0xb235,
- /* key: 0x50c8 */ 0xffff,
- /* key: 0x50c9 */ 0x5121,
- /* key: 0x50ca */ 0x5122,
- /* key: 0x50cb */ 0xffff,
- /* key: 0x50cc */ 0xb236,
- /* key: 0x50cd */ 0x462f,
- /* key: 0x50ce */ 0xb237,
- /* key: 0x50cf */ 0x417c,
- /* key: 0x50d0 */ 0xb238,
- /* key: 0x50d1 */ 0x3623,
- /* key: 0x50d2 */ 0xffff,
- /* key: 0x50d3 */ 0xb239,
- /* key: 0x50d4 */ 0xb23a,
- /* key: 0x50d5 */ 0x4b4d,
- /* key: 0x50d6 */ 0x5125,
- /* key: 0x50d7 */ 0xffff,
- /* key: 0x50d8 */ 0xb23b,
- /* key: 0x50d9 */ 0xffff,
- /* key: 0x50da */ 0x4e3d,
- /* key: 0x50db */ 0xffff,
- /* key: 0x50dc */ 0xb23c,
- /* key: 0x50dd */ 0xb23d,
- /* key: 0x50de */ 0x5126,
- /* key: 0x50df */ 0xb23e,
- /* key: 0x50e0 */ 0xffff,
- /* key: 0x50e1 */ 0xffff,
- /* key: 0x50e2 */ 0xb23f,
- /* key: 0x50e3 */ 0x5129,
- /* key: 0x50e4 */ 0xb240,
- /* key: 0x50e5 */ 0x5127,
- /* key: 0x50e6 */ 0xb241,
- /* key: 0x50e7 */ 0x414e,
- /* key: 0x50e8 */ 0xb242,
- /* key: 0x50e9 */ 0xb243,
- /* key: 0x50ea */ 0xffff,
- /* key: 0x50eb */ 0xffff,
- /* key: 0x50ec */ 0xffff,
- /* key: 0x50ed */ 0x5128,
- /* key: 0x50ee */ 0x512a,
- /* key: 0x50ef */ 0xb244,
- /* key: 0x50f0 */ 0xffff,
- /* key: 0x50f1 */ 0xb245,
- /* key: 0x50f2 */ 0xb251,
- /* key: 0x50f3 */ 0xffff,
- /* key: 0x50f4 */ 0xffff,
- /* key: 0x50f5 */ 0x512c,
- /* key: 0x50f6 */ 0xb246,
- /* key: 0x50f7 */ 0xffff,
- /* key: 0x50f8 */ 0xffff,
- /* key: 0x50f9 */ 0x512b,
- /* key: 0x50fa */ 0xb247,
- /* key: 0x50fb */ 0x4a48,
- /* key: 0x50fc */ 0xffff,
- /* key: 0x50fd */ 0xffff,
- /* key: 0x50fe */ 0xb248,
- /* key: 0x50ff */ 0xffff,
- /* branch: 0x510X */ 2416,
- /* branch: 0x511X */ 2432,
- /* branch: 0x512X */ 2448,
- /* branch: 0x513X */ 2464,
- /* branch: 0x514X */ 2480,
- /* branch: 0x515X */ 2496,
- /* branch: 0x516X */ 2512,
- /* branch: 0x517X */ 2528,
- /* branch: 0x518X */ 2544,
- /* branch: 0x519X */ 2560,
- /* branch: 0x51aX */ 2576,
- /* branch: 0x51bX */ 2592,
- /* branch: 0x51cX */ 2608,
- /* branch: 0x51dX */ 2624,
- /* branch: 0x51eX */ 2640,
- /* branch: 0x51fX */ 2656,
- /* key: 0x5100 */ 0x3537,
- /* key: 0x5101 */ 0x512e,
- /* key: 0x5102 */ 0x512f,
- /* key: 0x5103 */ 0xb249,
- /* key: 0x5104 */ 0x322f,
- /* key: 0x5105 */ 0xffff,
- /* key: 0x5106 */ 0xb24a,
- /* key: 0x5107 */ 0xb24b,
- /* key: 0x5108 */ 0xb24c,
- /* key: 0x5109 */ 0x512d,
- /* key: 0x510a */ 0xffff,
- /* key: 0x510b */ 0xb24d,
- /* key: 0x510c */ 0xb24e,
- /* key: 0x510d */ 0xb24f,
- /* key: 0x510e */ 0xb250,
- /* key: 0x510f */ 0xffff,
- /* key: 0x5110 */ 0xb252,
- /* key: 0x5111 */ 0xffff,
- /* key: 0x5112 */ 0x3c74,
- /* key: 0x5113 */ 0xffff,
- /* key: 0x5114 */ 0x5132,
- /* key: 0x5115 */ 0x5131,
- /* key: 0x5116 */ 0x5130,
- /* key: 0x5117 */ 0xb253,
- /* key: 0x5118 */ 0x5056,
- /* key: 0x5119 */ 0xb254,
- /* key: 0x511a */ 0x5133,
- /* key: 0x511b */ 0xb255,
- /* key: 0x511c */ 0xb256,
- /* key: 0x511d */ 0xb257,
- /* key: 0x511e */ 0xb258,
- /* key: 0x511f */ 0x3d7e,
- /* key: 0x5120 */ 0xffff,
- /* key: 0x5121 */ 0x5134,
- /* key: 0x5122 */ 0xffff,
- /* key: 0x5123 */ 0xb259,
- /* key: 0x5124 */ 0xffff,
- /* key: 0x5125 */ 0xffff,
- /* key: 0x5126 */ 0xffff,
- /* key: 0x5127 */ 0xb25a,
- /* key: 0x5128 */ 0xb25b,
- /* key: 0x5129 */ 0xffff,
- /* key: 0x512a */ 0x4d25,
- /* key: 0x512b */ 0xffff,
- /* key: 0x512c */ 0xb25c,
- /* key: 0x512d */ 0xb25d,
- /* key: 0x512e */ 0xffff,
- /* key: 0x512f */ 0xb25e,
- /* key: 0x5130 */ 0xffff,
- /* key: 0x5131 */ 0xb25f,
- /* key: 0x5132 */ 0x4c59,
- /* key: 0x5133 */ 0xb260,
- /* key: 0x5134 */ 0xb261,
- /* key: 0x5135 */ 0xb262,
- /* key: 0x5136 */ 0xffff,
- /* key: 0x5137 */ 0x5136,
- /* key: 0x5138 */ 0xb263,
- /* key: 0x5139 */ 0xb264,
- /* key: 0x513a */ 0x5135,
- /* key: 0x513b */ 0x5138,
- /* key: 0x513c */ 0x5137,
- /* key: 0x513d */ 0xffff,
- /* key: 0x513e */ 0xffff,
- /* key: 0x513f */ 0x5139,
- /* key: 0x5140 */ 0x513a,
- /* key: 0x5141 */ 0x3074,
- /* key: 0x5142 */ 0xb265,
- /* key: 0x5143 */ 0x3835,
- /* key: 0x5144 */ 0x373b,
- /* key: 0x5145 */ 0x3d3c,
- /* key: 0x5146 */ 0x437b,
- /* key: 0x5147 */ 0x3624,
- /* key: 0x5148 */ 0x4068,
- /* key: 0x5149 */ 0x3877,
- /* key: 0x514a */ 0xb266,
- /* key: 0x514b */ 0x396e,
- /* key: 0x514c */ 0x513c,
- /* key: 0x514d */ 0x4c48,
- /* key: 0x514e */ 0x4546,
- /* key: 0x514f */ 0xb267,
- /* key: 0x5150 */ 0x3b79,
- /* key: 0x5151 */ 0xffff,
- /* key: 0x5152 */ 0x513b,
- /* key: 0x5153 */ 0xb268,
- /* key: 0x5154 */ 0x513d,
- /* key: 0x5155 */ 0xb269,
- /* key: 0x5156 */ 0xffff,
- /* key: 0x5157 */ 0xb26a,
- /* key: 0x5158 */ 0xb26b,
- /* key: 0x5159 */ 0xffff,
- /* key: 0x515a */ 0x455e,
- /* key: 0x515b */ 0xffff,
- /* key: 0x515c */ 0x3375,
- /* key: 0x515d */ 0xffff,
- /* key: 0x515e */ 0xffff,
- /* key: 0x515f */ 0xb26c,
- /* key: 0x5160 */ 0xffff,
- /* key: 0x5161 */ 0xffff,
- /* key: 0x5162 */ 0x513e,
- /* key: 0x5163 */ 0xffff,
- /* key: 0x5164 */ 0xb26d,
- /* key: 0x5165 */ 0x467e,
- /* key: 0x5166 */ 0xb26e,
- /* key: 0x5167 */ 0xffff,
- /* key: 0x5168 */ 0x4134,
- /* key: 0x5169 */ 0x5140,
- /* key: 0x516a */ 0x5141,
- /* key: 0x516b */ 0x482c,
- /* key: 0x516c */ 0x3878,
- /* key: 0x516d */ 0x4f3b,
- /* key: 0x516e */ 0x5142,
- /* key: 0x516f */ 0xffff,
- /* key: 0x5170 */ 0xffff,
- /* key: 0x5171 */ 0x3626,
- /* key: 0x5172 */ 0xffff,
- /* key: 0x5173 */ 0xffff,
- /* key: 0x5174 */ 0xffff,
- /* key: 0x5175 */ 0x4a3c,
- /* key: 0x5176 */ 0x4236,
- /* key: 0x5177 */ 0x3671,
- /* key: 0x5178 */ 0x4535,
- /* key: 0x5179 */ 0xffff,
- /* key: 0x517a */ 0xffff,
- /* key: 0x517b */ 0xffff,
- /* key: 0x517c */ 0x3773,
- /* key: 0x517d */ 0xffff,
- /* key: 0x517e */ 0xb26f,
- /* key: 0x517f */ 0xffff,
- /* key: 0x5180 */ 0x5143,
- /* key: 0x5181 */ 0xffff,
- /* key: 0x5182 */ 0x5144,
- /* key: 0x5183 */ 0xb270,
- /* key: 0x5184 */ 0xb271,
- /* key: 0x5185 */ 0x4662,
- /* key: 0x5186 */ 0x315f,
- /* key: 0x5187 */ 0xffff,
- /* key: 0x5188 */ 0xffff,
- /* key: 0x5189 */ 0x5147,
- /* key: 0x518a */ 0x3a7d,
- /* key: 0x518b */ 0xb272,
- /* key: 0x518c */ 0x5146,
- /* key: 0x518d */ 0x3a46,
- /* key: 0x518e */ 0xb273,
- /* key: 0x518f */ 0x5148,
- /* key: 0x5190 */ 0x666e,
- /* key: 0x5191 */ 0x5149,
- /* key: 0x5192 */ 0x4b41,
- /* key: 0x5193 */ 0x514a,
- /* key: 0x5194 */ 0xffff,
- /* key: 0x5195 */ 0x514b,
- /* key: 0x5196 */ 0x514c,
- /* key: 0x5197 */ 0x3e69,
- /* key: 0x5198 */ 0xb274,
- /* key: 0x5199 */ 0x3c4c,
- /* key: 0x519a */ 0xffff,
- /* key: 0x519b */ 0xffff,
- /* key: 0x519c */ 0xffff,
- /* key: 0x519d */ 0xb275,
- /* key: 0x519e */ 0xffff,
- /* key: 0x519f */ 0xffff,
- /* key: 0x51a0 */ 0x3427,
- /* key: 0x51a1 */ 0xb276,
- /* key: 0x51a2 */ 0x514f,
- /* key: 0x51a3 */ 0xb277,
- /* key: 0x51a4 */ 0x514d,
- /* key: 0x51a5 */ 0x4c3d,
- /* key: 0x51a6 */ 0x514e,
- /* key: 0x51a7 */ 0xffff,
- /* key: 0x51a8 */ 0x495a,
- /* key: 0x51a9 */ 0x5150,
- /* key: 0x51aa */ 0x5151,
- /* key: 0x51ab */ 0x5152,
- /* key: 0x51ac */ 0x455f,
- /* key: 0x51ad */ 0xb278,
- /* key: 0x51ae */ 0xffff,
- /* key: 0x51af */ 0xffff,
- /* key: 0x51b0 */ 0x5156,
- /* key: 0x51b1 */ 0x5154,
- /* key: 0x51b2 */ 0x5155,
- /* key: 0x51b3 */ 0x5153,
- /* key: 0x51b4 */ 0x3a63,
- /* key: 0x51b5 */ 0x5157,
- /* key: 0x51b6 */ 0x4c6a,
- /* key: 0x51b7 */ 0x4e64,
- /* key: 0x51b8 */ 0xb279,
- /* key: 0x51b9 */ 0xffff,
- /* key: 0x51ba */ 0xb27a,
- /* key: 0x51bb */ 0xffff,
- /* key: 0x51bc */ 0xb27b,
- /* key: 0x51bd */ 0x5158,
- /* key: 0x51be */ 0xb27c,
- /* key: 0x51bf */ 0xb27d,
- /* key: 0x51c0 */ 0xffff,
- /* key: 0x51c1 */ 0xffff,
- /* key: 0x51c2 */ 0xb27e,
- /* key: 0x51c3 */ 0xffff,
- /* key: 0x51c4 */ 0x4028,
- /* key: 0x51c5 */ 0x5159,
- /* key: 0x51c6 */ 0x3d5a,
- /* key: 0x51c7 */ 0xffff,
- /* key: 0x51c8 */ 0xb321,
- /* key: 0x51c9 */ 0x515a,
- /* key: 0x51ca */ 0xffff,
- /* key: 0x51cb */ 0x437c,
- /* key: 0x51cc */ 0x4e3f,
- /* key: 0x51cd */ 0x4560,
- /* key: 0x51ce */ 0xffff,
- /* key: 0x51cf */ 0xb322,
- /* key: 0x51d0 */ 0xffff,
- /* key: 0x51d1 */ 0xb323,
- /* key: 0x51d2 */ 0xb324,
- /* key: 0x51d3 */ 0xb325,
- /* key: 0x51d4 */ 0xffff,
- /* key: 0x51d5 */ 0xb326,
- /* key: 0x51d6 */ 0x5245,
- /* key: 0x51d7 */ 0xffff,
- /* key: 0x51d8 */ 0xb327,
- /* key: 0x51d9 */ 0xffff,
- /* key: 0x51da */ 0xffff,
- /* key: 0x51db */ 0x515b,
- /* key: 0x51dc */ 0x7425,
- /* key: 0x51dd */ 0x3645,
- /* key: 0x51de */ 0xb328,
- /* key: 0x51df */ 0xffff,
- /* key: 0x51e0 */ 0x515c,
- /* key: 0x51e1 */ 0x4b5e,
- /* key: 0x51e2 */ 0xb329,
- /* key: 0x51e3 */ 0xffff,
- /* key: 0x51e4 */ 0xffff,
- /* key: 0x51e5 */ 0xb32a,
- /* key: 0x51e6 */ 0x3d68,
- /* key: 0x51e7 */ 0x427c,
- /* key: 0x51e8 */ 0xffff,
- /* key: 0x51e9 */ 0x515e,
- /* key: 0x51ea */ 0x4664,
- /* key: 0x51eb */ 0xffff,
- /* key: 0x51ec */ 0xffff,
- /* key: 0x51ed */ 0x515f,
- /* key: 0x51ee */ 0xb32b,
- /* key: 0x51ef */ 0xffff,
- /* key: 0x51f0 */ 0x5160,
- /* key: 0x51f1 */ 0x332e,
- /* key: 0x51f2 */ 0xb32c,
- /* key: 0x51f3 */ 0xb32d,
- /* key: 0x51f4 */ 0xb32e,
- /* key: 0x51f5 */ 0x5161,
- /* key: 0x51f6 */ 0x3627,
- /* key: 0x51f7 */ 0xb32f,
- /* key: 0x51f8 */ 0x464c,
- /* key: 0x51f9 */ 0x317a,
- /* key: 0x51fa */ 0x3d50,
- /* key: 0x51fb */ 0xffff,
- /* key: 0x51fc */ 0xffff,
- /* key: 0x51fd */ 0x4821,
- /* key: 0x51fe */ 0x5162,
- /* key: 0x51ff */ 0xffff,
- /* branch: 0x520X */ 2688,
- /* branch: 0x521X */ 2704,
- /* branch: 0x522X */ 2720,
- /* branch: 0x523X */ 2736,
- /* branch: 0x524X */ 2752,
- /* branch: 0x525X */ 2768,
- /* branch: 0x526X */ 2784,
- /* branch: 0x527X */ 2800,
- /* branch: 0x528X */ 2816,
- /* branch: 0x529X */ 2832,
- /* branch: 0x52aX */ 2848,
- /* branch: 0x52bX */ 2864,
- /* branch: 0x52cX */ 2880,
- /* branch: 0x52dX */ 2896,
- /* branch: 0x52eX */ 2912,
- /* branch: 0x52fX */ 2928,
- /* key: 0x5200 */ 0x4561,
- /* key: 0x5201 */ 0xb330,
- /* key: 0x5202 */ 0xb331,
- /* key: 0x5203 */ 0x3f4f,
- /* key: 0x5204 */ 0x5163,
- /* key: 0x5205 */ 0xb332,
- /* key: 0x5206 */ 0x4a2c,
- /* key: 0x5207 */ 0x405a,
- /* key: 0x5208 */ 0x3422,
- /* key: 0x5209 */ 0xffff,
- /* key: 0x520a */ 0x3429,
- /* key: 0x520b */ 0x5164,
- /* key: 0x520c */ 0xffff,
- /* key: 0x520d */ 0xffff,
- /* key: 0x520e */ 0x5166,
- /* key: 0x520f */ 0xffff,
- /* key: 0x5210 */ 0xffff,
- /* key: 0x5211 */ 0x373a,
- /* key: 0x5212 */ 0xb333,
- /* key: 0x5213 */ 0xb334,
- /* key: 0x5214 */ 0x5165,
- /* key: 0x5215 */ 0xb335,
- /* key: 0x5216 */ 0xb336,
- /* key: 0x5217 */ 0x4e73,
- /* key: 0x5218 */ 0xb337,
- /* key: 0x5219 */ 0xffff,
- /* key: 0x521a */ 0xffff,
- /* key: 0x521b */ 0xffff,
- /* key: 0x521c */ 0xffff,
- /* key: 0x521d */ 0x3d69,
- /* key: 0x521e */ 0xffff,
- /* key: 0x521f */ 0xffff,
- /* key: 0x5220 */ 0xffff,
- /* key: 0x5221 */ 0xffff,
- /* key: 0x5222 */ 0xb338,
- /* key: 0x5223 */ 0xffff,
- /* key: 0x5224 */ 0x483d,
- /* key: 0x5225 */ 0x4a4c,
- /* key: 0x5226 */ 0xffff,
- /* key: 0x5227 */ 0x5167,
- /* key: 0x5228 */ 0xb339,
- /* key: 0x5229 */ 0x4d78,
- /* key: 0x522a */ 0x5168,
- /* key: 0x522b */ 0xffff,
- /* key: 0x522c */ 0xffff,
- /* key: 0x522d */ 0xffff,
- /* key: 0x522e */ 0x5169,
- /* key: 0x522f */ 0xffff,
- /* key: 0x5230 */ 0x457e,
- /* key: 0x5231 */ 0xb33a,
- /* key: 0x5232 */ 0xb33b,
- /* key: 0x5233 */ 0x516a,
- /* key: 0x5234 */ 0xffff,
- /* key: 0x5235 */ 0xb33c,
- /* key: 0x5236 */ 0x4029,
- /* key: 0x5237 */ 0x3a7e,
- /* key: 0x5238 */ 0x3774,
- /* key: 0x5239 */ 0x516b,
- /* key: 0x523a */ 0x3b49,
- /* key: 0x523b */ 0x396f,
- /* key: 0x523c */ 0xb33d,
- /* key: 0x523d */ 0xffff,
- /* key: 0x523e */ 0xffff,
- /* key: 0x523f */ 0xffff,
- /* key: 0x5240 */ 0xffff,
- /* key: 0x5241 */ 0xffff,
- /* key: 0x5242 */ 0xffff,
- /* key: 0x5243 */ 0x4466,
- /* key: 0x5244 */ 0x516d,
- /* key: 0x5245 */ 0xb33e,
- /* key: 0x5246 */ 0xffff,
- /* key: 0x5247 */ 0x4227,
- /* key: 0x5248 */ 0xffff,
- /* key: 0x5249 */ 0xb33f,
- /* key: 0x524a */ 0x3a6f,
- /* key: 0x524b */ 0x516e,
- /* key: 0x524c */ 0x516f,
- /* key: 0x524d */ 0x4130,
- /* key: 0x524e */ 0xffff,
- /* key: 0x524f */ 0x516c,
- /* key: 0x5250 */ 0xffff,
- /* key: 0x5251 */ 0xffff,
- /* key: 0x5252 */ 0xffff,
- /* key: 0x5253 */ 0xffff,
- /* key: 0x5254 */ 0x5171,
- /* key: 0x5255 */ 0xb340,
- /* key: 0x5256 */ 0x4b36,
- /* key: 0x5257 */ 0xb341,
- /* key: 0x5258 */ 0xb342,
- /* key: 0x5259 */ 0xffff,
- /* key: 0x525a */ 0xb343,
- /* key: 0x525b */ 0x3964,
- /* key: 0x525c */ 0xb344,
- /* key: 0x525d */ 0xffff,
- /* key: 0x525e */ 0x5170,
- /* key: 0x525f */ 0xb345,
- /* key: 0x5260 */ 0xb346,
- /* key: 0x5261 */ 0xb347,
- /* key: 0x5262 */ 0xffff,
- /* key: 0x5263 */ 0x3775,
- /* key: 0x5264 */ 0x3a5e,
- /* key: 0x5265 */ 0x476d,
- /* key: 0x5266 */ 0xb348,
- /* key: 0x5267 */ 0xffff,
- /* key: 0x5268 */ 0xffff,
- /* key: 0x5269 */ 0x5174,
- /* key: 0x526a */ 0x5172,
- /* key: 0x526b */ 0xffff,
- /* key: 0x526c */ 0xffff,
- /* key: 0x526d */ 0xffff,
- /* key: 0x526e */ 0xb349,
- /* key: 0x526f */ 0x497b,
- /* key: 0x5270 */ 0x3e6a,
- /* key: 0x5271 */ 0x517b,
- /* key: 0x5272 */ 0x3364,
- /* key: 0x5273 */ 0x5175,
- /* key: 0x5274 */ 0x5173,
- /* key: 0x5275 */ 0x414f,
- /* key: 0x5276 */ 0xffff,
- /* key: 0x5277 */ 0xb34a,
- /* key: 0x5278 */ 0xb34b,
- /* key: 0x5279 */ 0xb34c,
- /* key: 0x527a */ 0xffff,
- /* key: 0x527b */ 0xffff,
- /* key: 0x527c */ 0xffff,
- /* key: 0x527d */ 0x5177,
- /* key: 0x527e */ 0xffff,
- /* key: 0x527f */ 0x5176,
- /* key: 0x5280 */ 0xb34d,
- /* key: 0x5281 */ 0xffff,
- /* key: 0x5282 */ 0xb34e,
- /* key: 0x5283 */ 0x3344,
- /* key: 0x5284 */ 0xffff,
- /* key: 0x5285 */ 0xb34f,
- /* key: 0x5286 */ 0xffff,
- /* key: 0x5287 */ 0x3760,
- /* key: 0x5288 */ 0x517c,
- /* key: 0x5289 */ 0x4e2d,
- /* key: 0x528a */ 0xb350,
- /* key: 0x528b */ 0xffff,
- /* key: 0x528c */ 0xb351,
- /* key: 0x528d */ 0x5178,
- /* key: 0x528e */ 0xffff,
- /* key: 0x528f */ 0xffff,
- /* key: 0x5290 */ 0xffff,
- /* key: 0x5291 */ 0x517d,
- /* key: 0x5292 */ 0x517a,
- /* key: 0x5293 */ 0xb352,
- /* key: 0x5294 */ 0x5179,
- /* key: 0x5295 */ 0xb353,
- /* key: 0x5296 */ 0xb354,
- /* key: 0x5297 */ 0xb355,
- /* key: 0x5298 */ 0xb356,
- /* key: 0x5299 */ 0xffff,
- /* key: 0x529a */ 0xb357,
- /* key: 0x529b */ 0x4e4f,
- /* key: 0x529c */ 0xb358,
- /* key: 0x529d */ 0xffff,
- /* key: 0x529e */ 0xffff,
- /* key: 0x529f */ 0x3879,
- /* key: 0x52a0 */ 0x3243,
- /* key: 0x52a1 */ 0xffff,
- /* key: 0x52a2 */ 0xffff,
- /* key: 0x52a3 */ 0x4e74,
- /* key: 0x52a4 */ 0xb359,
- /* key: 0x52a5 */ 0xb35a,
- /* key: 0x52a6 */ 0xb35b,
- /* key: 0x52a7 */ 0xb35c,
- /* key: 0x52a8 */ 0xffff,
- /* key: 0x52a9 */ 0x3d75,
- /* key: 0x52aa */ 0x4558,
- /* key: 0x52ab */ 0x3965,
- /* key: 0x52ac */ 0x5222,
- /* key: 0x52ad */ 0x5223,
- /* key: 0x52ae */ 0xffff,
- /* key: 0x52af */ 0xb35d,
- /* key: 0x52b0 */ 0xb35e,
- /* key: 0x52b1 */ 0x4e65,
- /* key: 0x52b2 */ 0xffff,
- /* key: 0x52b3 */ 0xffff,
- /* key: 0x52b4 */ 0x4f2b,
- /* key: 0x52b5 */ 0x5225,
- /* key: 0x52b6 */ 0xb35f,
- /* key: 0x52b7 */ 0xb360,
- /* key: 0x52b8 */ 0xb361,
- /* key: 0x52b9 */ 0x387a,
- /* key: 0x52ba */ 0xb362,
- /* key: 0x52bb */ 0xb363,
- /* key: 0x52bc */ 0x5224,
- /* key: 0x52bd */ 0xb364,
- /* key: 0x52be */ 0x332f,
- /* key: 0x52bf */ 0xffff,
- /* key: 0x52c0 */ 0xb365,
- /* key: 0x52c1 */ 0x5226,
- /* key: 0x52c2 */ 0xffff,
- /* key: 0x52c3 */ 0x4b56,
- /* key: 0x52c4 */ 0xb366,
- /* key: 0x52c5 */ 0x443c,
- /* key: 0x52c6 */ 0xb367,
- /* key: 0x52c7 */ 0x4d26,
- /* key: 0x52c8 */ 0xb368,
- /* key: 0x52c9 */ 0x4a59,
- /* key: 0x52ca */ 0xffff,
- /* key: 0x52cb */ 0xffff,
- /* key: 0x52cc */ 0xb369,
- /* key: 0x52cd */ 0x5227,
- /* key: 0x52ce */ 0xffff,
- /* key: 0x52cf */ 0xb36a,
- /* key: 0x52d0 */ 0xffff,
- /* key: 0x52d1 */ 0xb36b,
- /* key: 0x52d2 */ 0x7055,
- /* key: 0x52d3 */ 0xffff,
- /* key: 0x52d4 */ 0xb36c,
- /* key: 0x52d5 */ 0x4630,
- /* key: 0x52d6 */ 0xb36d,
- /* key: 0x52d7 */ 0x5228,
- /* key: 0x52d8 */ 0x342a,
- /* key: 0x52d9 */ 0x4c33,
- /* key: 0x52da */ 0xffff,
- /* key: 0x52db */ 0xb36e,
- /* key: 0x52dc */ 0xb36f,
- /* key: 0x52dd */ 0x3e21,
- /* key: 0x52de */ 0x5229,
- /* key: 0x52df */ 0x4a67,
- /* key: 0x52e0 */ 0x522d,
- /* key: 0x52e1 */ 0xb370,
- /* key: 0x52e2 */ 0x402a,
- /* key: 0x52e3 */ 0x522a,
- /* key: 0x52e4 */ 0x3650,
- /* key: 0x52e5 */ 0xb371,
- /* key: 0x52e6 */ 0x522b,
- /* key: 0x52e7 */ 0x342b,
- /* key: 0x52e8 */ 0xb372,
- /* key: 0x52e9 */ 0xb373,
- /* key: 0x52ea */ 0xb374,
- /* key: 0x52eb */ 0xffff,
- /* key: 0x52ec */ 0xb375,
- /* key: 0x52ed */ 0xffff,
- /* key: 0x52ee */ 0xffff,
- /* key: 0x52ef */ 0xffff,
- /* key: 0x52f0 */ 0xb376,
- /* key: 0x52f1 */ 0xb377,
- /* key: 0x52f2 */ 0x372e,
- /* key: 0x52f3 */ 0x522e,
- /* key: 0x52f4 */ 0xb378,
- /* key: 0x52f5 */ 0x522f,
- /* key: 0x52f6 */ 0xb379,
- /* key: 0x52f7 */ 0xb37a,
- /* key: 0x52f8 */ 0x5230,
- /* key: 0x52f9 */ 0x5231,
- /* key: 0x52fa */ 0x3c5b,
- /* key: 0x52fb */ 0xffff,
- /* key: 0x52fc */ 0xffff,
- /* key: 0x52fd */ 0xffff,
- /* key: 0x52fe */ 0x387b,
- /* key: 0x52ff */ 0x4c5e,
- /* branch: 0x530X */ 2960,
- /* branch: 0x531X */ 2976,
- /* branch: 0x532X */ 2992,
- /* branch: 0x533X */ 3008,
- /* branch: 0x534X */ 3024,
- /* branch: 0x535X */ 3040,
- /* branch: 0x536X */ 3056,
- /* branch: 0x537X */ 3072,
- /* branch: 0x538X */ 3088,
- /* branch: 0x539X */ 3104,
- /* branch: 0x53aX */ 3120,
- /* branch: 0x53bX */ 3136,
- /* branch: 0x53cX */ 3152,
- /* branch: 0x53dX */ 3168,
- /* branch: 0x53eX */ 3184,
- /* branch: 0x53fX */ 3200,
- /* key: 0x5300 */ 0xb37b,
- /* key: 0x5301 */ 0x4c68,
- /* key: 0x5302 */ 0x4677,
- /* key: 0x5303 */ 0xb37c,
- /* key: 0x5304 */ 0xffff,
- /* key: 0x5305 */ 0x4a71,
- /* key: 0x5306 */ 0x5232,
- /* key: 0x5307 */ 0xffff,
- /* key: 0x5308 */ 0x5233,
- /* key: 0x5309 */ 0xffff,
- /* key: 0x530a */ 0xb37d,
- /* key: 0x530b */ 0xb37e,
- /* key: 0x530c */ 0xb421,
- /* key: 0x530d */ 0x5235,
- /* key: 0x530e */ 0xffff,
- /* key: 0x530f */ 0x5237,
- /* key: 0x5310 */ 0x5236,
- /* key: 0x5311 */ 0xb422,
- /* key: 0x5312 */ 0xffff,
- /* key: 0x5313 */ 0xb423,
- /* key: 0x5314 */ 0xffff,
- /* key: 0x5315 */ 0x5238,
- /* key: 0x5316 */ 0x323d,
- /* key: 0x5317 */ 0x4b4c,
- /* key: 0x5318 */ 0xb424,
- /* key: 0x5319 */ 0x3a7c,
- /* key: 0x531a */ 0x5239,
- /* key: 0x531b */ 0xb425,
- /* key: 0x531c */ 0xb426,
- /* key: 0x531d */ 0x4159,
- /* key: 0x531e */ 0xb427,
- /* key: 0x531f */ 0xb428,
- /* key: 0x5320 */ 0x3e22,
- /* key: 0x5321 */ 0x3629,
- /* key: 0x5322 */ 0xffff,
- /* key: 0x5323 */ 0x523a,
- /* key: 0x5324 */ 0xffff,
- /* key: 0x5325 */ 0xb429,
- /* key: 0x5326 */ 0xffff,
- /* key: 0x5327 */ 0xb42a,
- /* key: 0x5328 */ 0xb42b,
- /* key: 0x5329 */ 0xb42c,
- /* key: 0x532a */ 0x485b,
- /* key: 0x532b */ 0xb42d,
- /* key: 0x532c */ 0xb42e,
- /* key: 0x532d */ 0xb42f,
- /* key: 0x532e */ 0xffff,
- /* key: 0x532f */ 0x523b,
- /* key: 0x5330 */ 0xb430,
- /* key: 0x5331 */ 0x523c,
- /* key: 0x5332 */ 0xb431,
- /* key: 0x5333 */ 0x523d,
- /* key: 0x5334 */ 0xffff,
- /* key: 0x5335 */ 0xb432,
- /* key: 0x5336 */ 0xffff,
- /* key: 0x5337 */ 0xffff,
- /* key: 0x5338 */ 0x523e,
- /* key: 0x5339 */ 0x4924,
- /* key: 0x533a */ 0x3668,
- /* key: 0x533b */ 0x3065,
- /* key: 0x533c */ 0xb433,
- /* key: 0x533d */ 0xb434,
- /* key: 0x533e */ 0xb435,
- /* key: 0x533f */ 0x463f,
- /* key: 0x5340 */ 0x523f,
- /* key: 0x5341 */ 0x3d3d,
- /* key: 0x5342 */ 0xb436,
- /* key: 0x5343 */ 0x4069,
- /* key: 0x5344 */ 0xffff,
- /* key: 0x5345 */ 0x5241,
- /* key: 0x5346 */ 0x5240,
- /* key: 0x5347 */ 0x3e23,
- /* key: 0x5348 */ 0x3861,
- /* key: 0x5349 */ 0x5243,
- /* key: 0x534a */ 0x483e,
- /* key: 0x534b */ 0xb438,
- /* key: 0x534c */ 0xb437,
- /* key: 0x534d */ 0x5244,
- /* key: 0x534e */ 0xffff,
- /* key: 0x534f */ 0xffff,
- /* key: 0x5350 */ 0xffff,
- /* key: 0x5351 */ 0x485c,
- /* key: 0x5352 */ 0x4234,
- /* key: 0x5353 */ 0x426e,
- /* key: 0x5354 */ 0x3628,
- /* key: 0x5355 */ 0xffff,
- /* key: 0x5356 */ 0xffff,
- /* key: 0x5357 */ 0x466e,
- /* key: 0x5358 */ 0x4331,
- /* key: 0x5359 */ 0xb439,
- /* key: 0x535a */ 0x476e,
- /* key: 0x535b */ 0xb43a,
- /* key: 0x535c */ 0x4b4e,
- /* key: 0x535d */ 0xffff,
- /* key: 0x535e */ 0x5246,
- /* key: 0x535f */ 0xffff,
- /* key: 0x5360 */ 0x406a,
- /* key: 0x5361 */ 0xb43b,
- /* key: 0x5362 */ 0xffff,
- /* key: 0x5363 */ 0xb43c,
- /* key: 0x5364 */ 0xffff,
- /* key: 0x5365 */ 0xb43d,
- /* key: 0x5366 */ 0x3735,
- /* key: 0x5367 */ 0xffff,
- /* key: 0x5368 */ 0xffff,
- /* key: 0x5369 */ 0x5247,
- /* key: 0x536a */ 0xffff,
- /* key: 0x536b */ 0xffff,
- /* key: 0x536c */ 0xb43e,
- /* key: 0x536d */ 0xb43f,
- /* key: 0x536e */ 0x5248,
- /* key: 0x536f */ 0x312c,
- /* key: 0x5370 */ 0x3075,
- /* key: 0x5371 */ 0x346d,
- /* key: 0x5372 */ 0xb440,
- /* key: 0x5373 */ 0x4228,
- /* key: 0x5374 */ 0x3551,
- /* key: 0x5375 */ 0x4d71,
- /* key: 0x5376 */ 0xffff,
- /* key: 0x5377 */ 0x524b,
- /* key: 0x5378 */ 0x3237,
- /* key: 0x5379 */ 0xb441,
- /* key: 0x537a */ 0xffff,
- /* key: 0x537b */ 0x524a,
- /* key: 0x537c */ 0xffff,
- /* key: 0x537d */ 0xffff,
- /* key: 0x537e */ 0xb442,
- /* key: 0x537f */ 0x362a,
- /* key: 0x5380 */ 0xffff,
- /* key: 0x5381 */ 0xffff,
- /* key: 0x5382 */ 0x524c,
- /* key: 0x5383 */ 0xb443,
- /* key: 0x5384 */ 0x4c71,
- /* key: 0x5385 */ 0xffff,
- /* key: 0x5386 */ 0xffff,
- /* key: 0x5387 */ 0xb444,
- /* key: 0x5388 */ 0xb445,
- /* key: 0x5389 */ 0xffff,
- /* key: 0x538a */ 0xffff,
- /* key: 0x538b */ 0xffff,
- /* key: 0x538c */ 0xffff,
- /* key: 0x538d */ 0xffff,
- /* key: 0x538e */ 0xb446,
- /* key: 0x538f */ 0xffff,
- /* key: 0x5390 */ 0xffff,
- /* key: 0x5391 */ 0xffff,
- /* key: 0x5392 */ 0xffff,
- /* key: 0x5393 */ 0xb447,
- /* key: 0x5394 */ 0xb448,
- /* key: 0x5395 */ 0xffff,
- /* key: 0x5396 */ 0x524d,
- /* key: 0x5397 */ 0xffff,
- /* key: 0x5398 */ 0x4e52,
- /* key: 0x5399 */ 0xb449,
- /* key: 0x539a */ 0x387c,
- /* key: 0x539b */ 0xffff,
- /* key: 0x539c */ 0xffff,
- /* key: 0x539d */ 0xb44a,
- /* key: 0x539e */ 0xffff,
- /* key: 0x539f */ 0x3836,
- /* key: 0x53a0 */ 0x524e,
- /* key: 0x53a1 */ 0xb44b,
- /* key: 0x53a2 */ 0xffff,
- /* key: 0x53a3 */ 0xffff,
- /* key: 0x53a4 */ 0xb44c,
- /* key: 0x53a5 */ 0x5250,
- /* key: 0x53a6 */ 0x524f,
- /* key: 0x53a7 */ 0xffff,
- /* key: 0x53a8 */ 0x3f5f,
- /* key: 0x53a9 */ 0x3139,
- /* key: 0x53aa */ 0xb44d,
- /* key: 0x53ab */ 0xb44e,
- /* key: 0x53ac */ 0xffff,
- /* key: 0x53ad */ 0x315e,
- /* key: 0x53ae */ 0x5251,
- /* key: 0x53af */ 0xb44f,
- /* key: 0x53b0 */ 0x5252,
- /* key: 0x53b1 */ 0xffff,
- /* key: 0x53b2 */ 0xb450,
- /* key: 0x53b3 */ 0x3837,
- /* key: 0x53b4 */ 0xb451,
- /* key: 0x53b5 */ 0xb452,
- /* key: 0x53b6 */ 0x5253,
- /* key: 0x53b7 */ 0xb453,
- /* key: 0x53b8 */ 0xb454,
- /* key: 0x53b9 */ 0xffff,
- /* key: 0x53ba */ 0xb455,
- /* key: 0x53bb */ 0x356e,
- /* key: 0x53bc */ 0xffff,
- /* key: 0x53bd */ 0xb456,
- /* key: 0x53be */ 0xffff,
- /* key: 0x53bf */ 0xffff,
- /* key: 0x53c0 */ 0xb457,
- /* key: 0x53c1 */ 0xffff,
- /* key: 0x53c2 */ 0x3b32,
- /* key: 0x53c3 */ 0x5254,
- /* key: 0x53c4 */ 0xffff,
- /* key: 0x53c5 */ 0xb458,
- /* key: 0x53c6 */ 0xffff,
- /* key: 0x53c7 */ 0xffff,
- /* key: 0x53c8 */ 0x4b74,
- /* key: 0x53c9 */ 0x3a35,
- /* key: 0x53ca */ 0x355a,
- /* key: 0x53cb */ 0x4d27,
- /* key: 0x53cc */ 0x4150,
- /* key: 0x53cd */ 0x483f,
- /* key: 0x53ce */ 0x3c7d,
- /* key: 0x53cf */ 0xb459,
- /* key: 0x53d0 */ 0xffff,
- /* key: 0x53d1 */ 0xffff,
- /* key: 0x53d2 */ 0xb45a,
- /* key: 0x53d3 */ 0xb45b,
- /* key: 0x53d4 */ 0x3d47,
- /* key: 0x53d5 */ 0xb45c,
- /* key: 0x53d6 */ 0x3c68,
- /* key: 0x53d7 */ 0x3c75,
- /* key: 0x53d8 */ 0xffff,
- /* key: 0x53d9 */ 0x3d76,
- /* key: 0x53da */ 0xb45d,
- /* key: 0x53db */ 0x4840,
- /* key: 0x53dc */ 0xffff,
- /* key: 0x53dd */ 0xb45e,
- /* key: 0x53de */ 0xb45f,
- /* key: 0x53df */ 0x5257,
- /* key: 0x53e0 */ 0xb460,
- /* key: 0x53e1 */ 0x3143,
- /* key: 0x53e2 */ 0x4151,
- /* key: 0x53e3 */ 0x387d,
- /* key: 0x53e4 */ 0x3845,
- /* key: 0x53e5 */ 0x3667,
- /* key: 0x53e6 */ 0xb461,
- /* key: 0x53e7 */ 0xb462,
- /* key: 0x53e8 */ 0x525b,
- /* key: 0x53e9 */ 0x4321,
- /* key: 0x53ea */ 0x427e,
- /* key: 0x53eb */ 0x362b,
- /* key: 0x53ec */ 0x3e24,
- /* key: 0x53ed */ 0x525c,
- /* key: 0x53ee */ 0x525a,
- /* key: 0x53ef */ 0x3244,
- /* key: 0x53f0 */ 0x4266,
- /* key: 0x53f1 */ 0x3c38,
- /* key: 0x53f2 */ 0x3b4b,
- /* key: 0x53f3 */ 0x3126,
- /* key: 0x53f4 */ 0xffff,
- /* key: 0x53f5 */ 0xb463,
- /* key: 0x53f6 */ 0x3370,
- /* key: 0x53f7 */ 0x3966,
- /* key: 0x53f8 */ 0x3b4a,
- /* key: 0x53f9 */ 0xffff,
- /* key: 0x53fa */ 0x525d,
- /* key: 0x53fb */ 0xffff,
- /* key: 0x53fc */ 0xffff,
- /* key: 0x53fd */ 0xffff,
- /* key: 0x53fe */ 0xffff,
- /* key: 0x53ff */ 0xffff,
- /* branch: 0x540X */ 3232,
- /* branch: 0x541X */ 3248,
- /* branch: 0x542X */ 3264,
- /* branch: 0x543X */ 3280,
- /* branch: 0x544X */ 3296,
- /* branch: 0x545X */ 3312,
- /* branch: 0x546X */ 3328,
- /* branch: 0x547X */ 3344,
- /* branch: 0x548X */ 3360,
- /* branch: 0x549X */ 3376,
- /* branch: 0x54aX */ 3392,
- /* branch: 0x54bX */ 3408,
- /* branch: 0x54cX */ 3424,
- /* branch: 0x54dX */ 3440,
- /* branch: 0x54eX */ 3456,
- /* branch: 0x54fX */ 3472,
- /* key: 0x5400 */ 0xffff,
- /* key: 0x5401 */ 0x525e,
- /* key: 0x5402 */ 0xb464,
- /* key: 0x5403 */ 0x3549,
- /* key: 0x5404 */ 0x3346,
- /* key: 0x5405 */ 0xffff,
- /* key: 0x5406 */ 0xffff,
- /* key: 0x5407 */ 0xffff,
- /* key: 0x5408 */ 0x3967,
- /* key: 0x5409 */ 0x3548,
- /* key: 0x540a */ 0x445f,
- /* key: 0x540b */ 0x3125,
- /* key: 0x540c */ 0x4631,
- /* key: 0x540d */ 0x4c3e,
- /* key: 0x540e */ 0x3921,
- /* key: 0x540f */ 0x4d79,
- /* key: 0x5410 */ 0x4547,
- /* key: 0x5411 */ 0x387e,
- /* key: 0x5412 */ 0xffff,
- /* key: 0x5413 */ 0xb465,
- /* key: 0x5414 */ 0xffff,
- /* key: 0x5415 */ 0xffff,
- /* key: 0x5416 */ 0xffff,
- /* key: 0x5417 */ 0xffff,
- /* key: 0x5418 */ 0xffff,
- /* key: 0x5419 */ 0xffff,
- /* key: 0x541a */ 0xb466,
- /* key: 0x541b */ 0x372f,
- /* key: 0x541c */ 0xffff,
- /* key: 0x541d */ 0x5267,
- /* key: 0x541e */ 0xffff,
- /* key: 0x541f */ 0x3663,
- /* key: 0x5420 */ 0x4b4a,
- /* key: 0x5421 */ 0xb467,
- /* key: 0x5422 */ 0xffff,
- /* key: 0x5423 */ 0xffff,
- /* key: 0x5424 */ 0xffff,
- /* key: 0x5425 */ 0xffff,
- /* key: 0x5426 */ 0x485d,
- /* key: 0x5427 */ 0xb468,
- /* key: 0x5428 */ 0xb469,
- /* key: 0x5429 */ 0x5266,
- /* key: 0x542a */ 0xb46a,
- /* key: 0x542b */ 0x345e,
- /* key: 0x542c */ 0x5261,
- /* key: 0x542d */ 0x5262,
- /* key: 0x542e */ 0x5264,
- /* key: 0x542f */ 0xb46b,
- /* key: 0x5430 */ 0xffff,
- /* key: 0x5431 */ 0xb46c,
- /* key: 0x5432 */ 0xffff,
- /* key: 0x5433 */ 0xffff,
- /* key: 0x5434 */ 0xb46d,
- /* key: 0x5435 */ 0xb46e,
- /* key: 0x5436 */ 0x5265,
- /* key: 0x5437 */ 0xffff,
- /* key: 0x5438 */ 0x355b,
- /* key: 0x5439 */ 0x3f61,
- /* key: 0x543a */ 0xffff,
- /* key: 0x543b */ 0x4a2d,
- /* key: 0x543c */ 0x5263,
- /* key: 0x543d */ 0x525f,
- /* key: 0x543e */ 0x3863,
- /* key: 0x543f */ 0xffff,
- /* key: 0x5440 */ 0x5260,
- /* key: 0x5441 */ 0xffff,
- /* key: 0x5442 */ 0x4f24,
- /* key: 0x5443 */ 0xb46f,
- /* key: 0x5444 */ 0xb470,
- /* key: 0x5445 */ 0xffff,
- /* key: 0x5446 */ 0x4a72,
- /* key: 0x5447 */ 0xb471,
- /* key: 0x5448 */ 0x4468,
- /* key: 0x5449 */ 0x3862,
- /* key: 0x544a */ 0x3970,
- /* key: 0x544b */ 0xffff,
- /* key: 0x544c */ 0xffff,
- /* key: 0x544d */ 0xb472,
- /* key: 0x544e */ 0x5268,
- /* key: 0x544f */ 0xb473,
- /* key: 0x5450 */ 0xffff,
- /* key: 0x5451 */ 0x465d,
- /* key: 0x5452 */ 0xffff,
- /* key: 0x5453 */ 0xffff,
- /* key: 0x5454 */ 0xffff,
- /* key: 0x5455 */ 0xffff,
- /* key: 0x5456 */ 0xffff,
- /* key: 0x5457 */ 0xffff,
- /* key: 0x5458 */ 0xffff,
- /* key: 0x5459 */ 0xffff,
- /* key: 0x545a */ 0xffff,
- /* key: 0x545b */ 0xffff,
- /* key: 0x545c */ 0xffff,
- /* key: 0x545d */ 0xffff,
- /* key: 0x545e */ 0xb474,
- /* key: 0x545f */ 0x526c,
- /* key: 0x5460 */ 0xffff,
- /* key: 0x5461 */ 0xffff,
- /* key: 0x5462 */ 0xb475,
- /* key: 0x5463 */ 0xffff,
- /* key: 0x5464 */ 0xb476,
- /* key: 0x5465 */ 0xffff,
- /* key: 0x5466 */ 0xb477,
- /* key: 0x5467 */ 0xb478,
- /* key: 0x5468 */ 0x3c7e,
- /* key: 0x5469 */ 0xb479,
- /* key: 0x546a */ 0x3c76,
- /* key: 0x546b */ 0xb47a,
- /* key: 0x546c */ 0xffff,
- /* key: 0x546d */ 0xb47b,
- /* key: 0x546e */ 0xb47c,
- /* key: 0x546f */ 0xffff,
- /* key: 0x5470 */ 0x526f,
- /* key: 0x5471 */ 0x526d,
- /* key: 0x5472 */ 0xffff,
- /* key: 0x5473 */ 0x4c23,
- /* key: 0x5474 */ 0xb47d,
- /* key: 0x5475 */ 0x526a,
- /* key: 0x5476 */ 0x5273,
- /* key: 0x5477 */ 0x526e,
- /* key: 0x5478 */ 0xffff,
- /* key: 0x5479 */ 0xffff,
- /* key: 0x547a */ 0xffff,
- /* key: 0x547b */ 0x5271,
- /* key: 0x547c */ 0x3846,
- /* key: 0x547d */ 0x4c3f,
- /* key: 0x547e */ 0xffff,
- /* key: 0x547f */ 0xb47e,
- /* key: 0x5480 */ 0x5272,
- /* key: 0x5481 */ 0xb521,
- /* key: 0x5482 */ 0xffff,
- /* key: 0x5483 */ 0xb522,
- /* key: 0x5484 */ 0x5274,
- /* key: 0x5485 */ 0xb523,
- /* key: 0x5486 */ 0x5276,
- /* key: 0x5487 */ 0xffff,
- /* key: 0x5488 */ 0xb524,
- /* key: 0x5489 */ 0xb525,
- /* key: 0x548a */ 0xffff,
- /* key: 0x548b */ 0x3a70,
- /* key: 0x548c */ 0x4f42,
- /* key: 0x548d */ 0xb526,
- /* key: 0x548e */ 0x526b,
- /* key: 0x548f */ 0x5269,
- /* key: 0x5490 */ 0x5275,
- /* key: 0x5491 */ 0xb527,
- /* key: 0x5492 */ 0x5270,
- /* key: 0x5493 */ 0xffff,
- /* key: 0x5494 */ 0xffff,
- /* key: 0x5495 */ 0xb528,
- /* key: 0x5496 */ 0xb529,
- /* key: 0x5497 */ 0xffff,
- /* key: 0x5498 */ 0xffff,
- /* key: 0x5499 */ 0xffff,
- /* key: 0x549a */ 0xffff,
- /* key: 0x549b */ 0xffff,
- /* key: 0x549c */ 0xb52a,
- /* key: 0x549d */ 0xffff,
- /* key: 0x549e */ 0xffff,
- /* key: 0x549f */ 0xb52b,
- /* key: 0x54a0 */ 0xffff,
- /* key: 0x54a1 */ 0xb52c,
- /* key: 0x54a2 */ 0x5278,
- /* key: 0x54a3 */ 0xffff,
- /* key: 0x54a4 */ 0x5323,
- /* key: 0x54a5 */ 0x527a,
- /* key: 0x54a6 */ 0xb52d,
- /* key: 0x54a7 */ 0xb52e,
- /* key: 0x54a8 */ 0x527e,
- /* key: 0x54a9 */ 0xb52f,
- /* key: 0x54aa */ 0xb530,
- /* key: 0x54ab */ 0x5321,
- /* key: 0x54ac */ 0x527b,
- /* key: 0x54ad */ 0xb531,
- /* key: 0x54ae */ 0xb532,
- /* key: 0x54af */ 0x533e,
- /* key: 0x54b0 */ 0xffff,
- /* key: 0x54b1 */ 0xb533,
- /* key: 0x54b2 */ 0x3a69,
- /* key: 0x54b3 */ 0x3331,
- /* key: 0x54b4 */ 0xffff,
- /* key: 0x54b5 */ 0xffff,
- /* key: 0x54b6 */ 0xffff,
- /* key: 0x54b7 */ 0xb534,
- /* key: 0x54b8 */ 0x5279,
- /* key: 0x54b9 */ 0xb535,
- /* key: 0x54ba */ 0xb536,
- /* key: 0x54bb */ 0xb537,
- /* key: 0x54bc */ 0x5325,
- /* key: 0x54bd */ 0x3076,
- /* key: 0x54be */ 0x5324,
- /* key: 0x54bf */ 0xb538,
- /* key: 0x54c0 */ 0x3025,
- /* key: 0x54c1 */ 0x494a,
- /* key: 0x54c2 */ 0x5322,
- /* key: 0x54c3 */ 0xffff,
- /* key: 0x54c4 */ 0x527c,
- /* key: 0x54c5 */ 0xffff,
- /* key: 0x54c6 */ 0xb539,
- /* key: 0x54c7 */ 0x5277,
- /* key: 0x54c8 */ 0x527d,
- /* key: 0x54c9 */ 0x3a48,
- /* key: 0x54ca */ 0xb53a,
- /* key: 0x54cb */ 0xffff,
- /* key: 0x54cc */ 0xffff,
- /* key: 0x54cd */ 0xb53b,
- /* key: 0x54ce */ 0xb53c,
- /* key: 0x54cf */ 0xffff,
- /* key: 0x54d0 */ 0xffff,
- /* key: 0x54d1 */ 0xffff,
- /* key: 0x54d2 */ 0xffff,
- /* key: 0x54d3 */ 0xffff,
- /* key: 0x54d4 */ 0xffff,
- /* key: 0x54d5 */ 0xffff,
- /* key: 0x54d6 */ 0xffff,
- /* key: 0x54d7 */ 0xffff,
- /* key: 0x54d8 */ 0x5326,
- /* key: 0x54d9 */ 0xffff,
- /* key: 0x54da */ 0xffff,
- /* key: 0x54db */ 0xffff,
- /* key: 0x54dc */ 0xffff,
- /* key: 0x54dd */ 0xffff,
- /* key: 0x54de */ 0xffff,
- /* key: 0x54df */ 0xffff,
- /* key: 0x54e0 */ 0xb53d,
- /* key: 0x54e1 */ 0x3077,
- /* key: 0x54e2 */ 0x532f,
- /* key: 0x54e3 */ 0xffff,
- /* key: 0x54e4 */ 0xffff,
- /* key: 0x54e5 */ 0x5327,
- /* key: 0x54e6 */ 0x5328,
- /* key: 0x54e7 */ 0xffff,
- /* key: 0x54e8 */ 0x3e25,
- /* key: 0x54e9 */ 0x4b69,
- /* key: 0x54ea */ 0xb53e,
- /* key: 0x54eb */ 0xffff,
- /* key: 0x54ec */ 0xb53f,
- /* key: 0x54ed */ 0x532d,
- /* key: 0x54ee */ 0x532c,
- /* key: 0x54ef */ 0xb540,
- /* key: 0x54f0 */ 0xffff,
- /* key: 0x54f1 */ 0xffff,
- /* key: 0x54f2 */ 0x452f,
- /* key: 0x54f3 */ 0xffff,
- /* key: 0x54f4 */ 0xffff,
- /* key: 0x54f5 */ 0xffff,
- /* key: 0x54f6 */ 0xb541,
- /* key: 0x54f7 */ 0xffff,
- /* key: 0x54f8 */ 0xffff,
- /* key: 0x54f9 */ 0xffff,
- /* key: 0x54fa */ 0x532e,
- /* key: 0x54fb */ 0xffff,
- /* key: 0x54fc */ 0xb542,
- /* key: 0x54fd */ 0x532b,
- /* key: 0x54fe */ 0xb543,
- /* key: 0x54ff */ 0xb544,
- /* branch: 0x550X */ 3504,
- /* branch: 0x551X */ 3520,
- /* branch: 0x552X */ 3536,
- /* branch: 0x553X */ 3552,
- /* branch: 0x554X */ 3568,
- /* branch: 0x555X */ 3584,
- /* branch: 0x556X */ 3600,
- /* branch: 0x557X */ 3616,
- /* branch: 0x558X */ 3632,
- /* branch: 0x559X */ 3648,
- /* branch: 0x55aX */ 3664,
- /* branch: 0x55bX */ 3680,
- /* branch: 0x55cX */ 3696,
- /* branch: 0x55dX */ 3712,
- /* branch: 0x55eX */ 3728,
- /* branch: 0x55fX */ 3744,
- /* key: 0x5500 */ 0xb545,
- /* key: 0x5501 */ 0xb546,
- /* key: 0x5502 */ 0xffff,
- /* key: 0x5503 */ 0xffff,
- /* key: 0x5504 */ 0x3134,
- /* key: 0x5505 */ 0xb547,
- /* key: 0x5506 */ 0x3a36,
- /* key: 0x5507 */ 0x3f30,
- /* key: 0x5508 */ 0xb548,
- /* key: 0x5509 */ 0xb549,
- /* key: 0x550a */ 0xffff,
- /* key: 0x550b */ 0xffff,
- /* key: 0x550c */ 0xb54a,
- /* key: 0x550d */ 0xb54b,
- /* key: 0x550e */ 0xb54c,
- /* key: 0x550f */ 0x5329,
- /* key: 0x5510 */ 0x4562,
- /* key: 0x5511 */ 0xffff,
- /* key: 0x5512 */ 0xffff,
- /* key: 0x5513 */ 0xffff,
- /* key: 0x5514 */ 0x532a,
- /* key: 0x5515 */ 0xb54d,
- /* key: 0x5516 */ 0x3022,
- /* key: 0x5517 */ 0xffff,
- /* key: 0x5518 */ 0xffff,
- /* key: 0x5519 */ 0xffff,
- /* key: 0x551a */ 0xffff,
- /* key: 0x551b */ 0xffff,
- /* key: 0x551c */ 0xffff,
- /* key: 0x551d */ 0xffff,
- /* key: 0x551e */ 0xffff,
- /* key: 0x551f */ 0xffff,
- /* key: 0x5520 */ 0xffff,
- /* key: 0x5521 */ 0xffff,
- /* key: 0x5522 */ 0xffff,
- /* key: 0x5523 */ 0xffff,
- /* key: 0x5524 */ 0xffff,
- /* key: 0x5525 */ 0xffff,
- /* key: 0x5526 */ 0xffff,
- /* key: 0x5527 */ 0xffff,
- /* key: 0x5528 */ 0xffff,
- /* key: 0x5529 */ 0xffff,
- /* key: 0x552a */ 0xb54e,
- /* key: 0x552b */ 0xb54f,
- /* key: 0x552c */ 0xffff,
- /* key: 0x552d */ 0xffff,
- /* key: 0x552e */ 0x5334,
- /* key: 0x552f */ 0x4d23,
- /* key: 0x5530 */ 0xffff,
- /* key: 0x5531 */ 0x3e27,
- /* key: 0x5532 */ 0xb550,
- /* key: 0x5533 */ 0x533a,
- /* key: 0x5534 */ 0xffff,
- /* key: 0x5535 */ 0xb551,
- /* key: 0x5536 */ 0xb552,
- /* key: 0x5537 */ 0xffff,
- /* key: 0x5538 */ 0x5339,
- /* key: 0x5539 */ 0x5330,
- /* key: 0x553a */ 0xffff,
- /* key: 0x553b */ 0xb553,
- /* key: 0x553c */ 0xb554,
- /* key: 0x553d */ 0xb555,
- /* key: 0x553e */ 0x4243,
- /* key: 0x553f */ 0xffff,
- /* key: 0x5540 */ 0x5331,
- /* key: 0x5541 */ 0xb556,
- /* key: 0x5542 */ 0xffff,
- /* key: 0x5543 */ 0xffff,
- /* key: 0x5544 */ 0x426f,
- /* key: 0x5545 */ 0x5336,
- /* key: 0x5546 */ 0x3e26,
- /* key: 0x5547 */ 0xb557,
- /* key: 0x5548 */ 0xffff,
- /* key: 0x5549 */ 0xb558,
- /* key: 0x554a */ 0xb559,
- /* key: 0x554b */ 0xffff,
- /* key: 0x554c */ 0x5333,
- /* key: 0x554d */ 0xb55a,
- /* key: 0x554e */ 0xffff,
- /* key: 0x554f */ 0x4c64,
- /* key: 0x5550 */ 0xb55b,
- /* key: 0x5551 */ 0xb55c,
- /* key: 0x5552 */ 0xffff,
- /* key: 0x5553 */ 0x373c,
- /* key: 0x5554 */ 0xffff,
- /* key: 0x5555 */ 0xffff,
- /* key: 0x5556 */ 0x5337,
- /* key: 0x5557 */ 0x5338,
- /* key: 0x5558 */ 0xb55d,
- /* key: 0x5559 */ 0xffff,
- /* key: 0x555a */ 0xb55e,
- /* key: 0x555b */ 0xb55f,
- /* key: 0x555c */ 0x5335,
- /* key: 0x555d */ 0x533b,
- /* key: 0x555e */ 0xb560,
- /* key: 0x555f */ 0xffff,
- /* key: 0x5560 */ 0xb561,
- /* key: 0x5561 */ 0xb562,
- /* key: 0x5562 */ 0xffff,
- /* key: 0x5563 */ 0x5332,
- /* key: 0x5564 */ 0xb563,
- /* key: 0x5565 */ 0xffff,
- /* key: 0x5566 */ 0xb564,
- /* key: 0x5567 */ 0xffff,
- /* key: 0x5568 */ 0xffff,
- /* key: 0x5569 */ 0xffff,
- /* key: 0x556a */ 0xffff,
- /* key: 0x556b */ 0xffff,
- /* key: 0x556c */ 0xffff,
- /* key: 0x556d */ 0xffff,
- /* key: 0x556e */ 0xffff,
- /* key: 0x556f */ 0xffff,
- /* key: 0x5570 */ 0xffff,
- /* key: 0x5571 */ 0xffff,
- /* key: 0x5572 */ 0xffff,
- /* key: 0x5573 */ 0xffff,
- /* key: 0x5574 */ 0xffff,
- /* key: 0x5575 */ 0xffff,
- /* key: 0x5576 */ 0xffff,
- /* key: 0x5577 */ 0xffff,
- /* key: 0x5578 */ 0xffff,
- /* key: 0x5579 */ 0xffff,
- /* key: 0x557a */ 0xffff,
- /* key: 0x557b */ 0x5341,
- /* key: 0x557c */ 0x5346,
- /* key: 0x557d */ 0xffff,
- /* key: 0x557e */ 0x5342,
- /* key: 0x557f */ 0xb565,
- /* key: 0x5580 */ 0x533d,
- /* key: 0x5581 */ 0xb566,
- /* key: 0x5582 */ 0xb567,
- /* key: 0x5583 */ 0x5347,
- /* key: 0x5584 */ 0x4131,
- /* key: 0x5585 */ 0xffff,
- /* key: 0x5586 */ 0xb568,
- /* key: 0x5587 */ 0x5349,
- /* key: 0x5588 */ 0xb569,
- /* key: 0x5589 */ 0x3922,
- /* key: 0x558a */ 0x533f,
- /* key: 0x558b */ 0x437d,
- /* key: 0x558c */ 0xffff,
- /* key: 0x558d */ 0xffff,
- /* key: 0x558e */ 0xb56a,
- /* key: 0x558f */ 0xb56b,
- /* key: 0x5590 */ 0xffff,
- /* key: 0x5591 */ 0xb56c,
- /* key: 0x5592 */ 0xb56d,
- /* key: 0x5593 */ 0xb56e,
- /* key: 0x5594 */ 0xb56f,
- /* key: 0x5595 */ 0xffff,
- /* key: 0x5596 */ 0xffff,
- /* key: 0x5597 */ 0xb570,
- /* key: 0x5598 */ 0x5343,
- /* key: 0x5599 */ 0x533c,
- /* key: 0x559a */ 0x342d,
- /* key: 0x559b */ 0xffff,
- /* key: 0x559c */ 0x346e,
- /* key: 0x559d */ 0x3365,
- /* key: 0x559e */ 0x5344,
- /* key: 0x559f */ 0x5340,
- /* key: 0x55a0 */ 0xffff,
- /* key: 0x55a1 */ 0xffff,
- /* key: 0x55a2 */ 0xffff,
- /* key: 0x55a3 */ 0xb571,
- /* key: 0x55a4 */ 0xb572,
- /* key: 0x55a5 */ 0xffff,
- /* key: 0x55a6 */ 0xffff,
- /* key: 0x55a7 */ 0x3776,
- /* key: 0x55a8 */ 0x534a,
- /* key: 0x55a9 */ 0x5348,
- /* key: 0x55aa */ 0x4153,
- /* key: 0x55ab */ 0x354a,
- /* key: 0x55ac */ 0x362c,
- /* key: 0x55ad */ 0xb573,
- /* key: 0x55ae */ 0x5345,
- /* key: 0x55af */ 0xffff,
- /* key: 0x55b0 */ 0x3674,
- /* key: 0x55b1 */ 0xffff,
- /* key: 0x55b2 */ 0xb574,
- /* key: 0x55b3 */ 0xffff,
- /* key: 0x55b4 */ 0xffff,
- /* key: 0x55b5 */ 0xffff,
- /* key: 0x55b6 */ 0x3144,
- /* key: 0x55b7 */ 0xffff,
- /* key: 0x55b8 */ 0xffff,
- /* key: 0x55b9 */ 0xffff,
- /* key: 0x55ba */ 0xffff,
- /* key: 0x55bb */ 0xffff,
- /* key: 0x55bc */ 0xffff,
- /* key: 0x55bd */ 0xffff,
- /* key: 0x55be */ 0xffff,
- /* key: 0x55bf */ 0xb575,
- /* key: 0x55c0 */ 0xffff,
- /* key: 0x55c1 */ 0xb576,
- /* key: 0x55c2 */ 0xffff,
- /* key: 0x55c3 */ 0xb577,
- /* key: 0x55c4 */ 0x534e,
- /* key: 0x55c5 */ 0x534c,
- /* key: 0x55c6 */ 0xb578,
- /* key: 0x55c7 */ 0x5427,
- /* key: 0x55c8 */ 0xffff,
- /* key: 0x55c9 */ 0xb579,
- /* key: 0x55ca */ 0xffff,
- /* key: 0x55cb */ 0xb57a,
- /* key: 0x55cc */ 0xb57b,
- /* key: 0x55cd */ 0xffff,
- /* key: 0x55ce */ 0xb57c,
- /* key: 0x55cf */ 0xffff,
- /* key: 0x55d0 */ 0xffff,
- /* key: 0x55d1 */ 0xb57d,
- /* key: 0x55d2 */ 0xb57e,
- /* key: 0x55d3 */ 0xb621,
- /* key: 0x55d4 */ 0x5351,
- /* key: 0x55d5 */ 0xffff,
- /* key: 0x55d6 */ 0xffff,
- /* key: 0x55d7 */ 0xb622,
- /* key: 0x55d8 */ 0xb623,
- /* key: 0x55d9 */ 0xffff,
- /* key: 0x55da */ 0x534b,
- /* key: 0x55db */ 0xb624,
- /* key: 0x55dc */ 0x534f,
- /* key: 0x55dd */ 0xffff,
- /* key: 0x55de */ 0xb625,
- /* key: 0x55df */ 0x534d,
- /* key: 0x55e0 */ 0xffff,
- /* key: 0x55e1 */ 0xffff,
- /* key: 0x55e2 */ 0xb626,
- /* key: 0x55e3 */ 0x3b4c,
- /* key: 0x55e4 */ 0x5350,
- /* key: 0x55e5 */ 0xffff,
- /* key: 0x55e6 */ 0xffff,
- /* key: 0x55e7 */ 0xffff,
- /* key: 0x55e8 */ 0xffff,
- /* key: 0x55e9 */ 0xb627,
- /* key: 0x55ea */ 0xffff,
- /* key: 0x55eb */ 0xffff,
- /* key: 0x55ec */ 0xffff,
- /* key: 0x55ed */ 0xffff,
- /* key: 0x55ee */ 0xffff,
- /* key: 0x55ef */ 0xffff,
- /* key: 0x55f0 */ 0xffff,
- /* key: 0x55f1 */ 0xffff,
- /* key: 0x55f2 */ 0xffff,
- /* key: 0x55f3 */ 0xffff,
- /* key: 0x55f4 */ 0xffff,
- /* key: 0x55f5 */ 0xffff,
- /* key: 0x55f6 */ 0xb628,
- /* key: 0x55f7 */ 0x5353,
- /* key: 0x55f8 */ 0xffff,
- /* key: 0x55f9 */ 0x5358,
- /* key: 0x55fa */ 0xffff,
- /* key: 0x55fb */ 0xffff,
- /* key: 0x55fc */ 0xffff,
- /* key: 0x55fd */ 0x5356,
- /* key: 0x55fe */ 0x5355,
- /* key: 0x55ff */ 0xb629,
- /* branch: 0x560X */ 3776,
- /* branch: 0x561X */ 3792,
- /* branch: 0x562X */ 3808,
- /* branch: 0x563X */ 3824,
- /* branch: 0x564X */ 3840,
- /* branch: 0x565X */ 3856,
- /* branch: 0x566X */ 3872,
- /* branch: 0x567X */ 3888,
- /* branch: 0x568X */ 3904,
- /* branch: 0x569X */ 3920,
- /* branch: 0x56aX */ 3936,
- /* branch: 0x56bX */ 3952,
- /* branch: 0x56cX */ 3968,
- /* branch: 0x56dX */ 3984,
- /* branch: 0x56eX */ 4000,
- /* branch: 0x56fX */ 4016,
- /* key: 0x5600 */ 0xffff,
- /* key: 0x5601 */ 0xffff,
- /* key: 0x5602 */ 0xffff,
- /* key: 0x5603 */ 0xffff,
- /* key: 0x5604 */ 0xffff,
- /* key: 0x5605 */ 0xb62a,
- /* key: 0x5606 */ 0x4332,
- /* key: 0x5607 */ 0xffff,
- /* key: 0x5608 */ 0xb62b,
- /* key: 0x5609 */ 0x3245,
- /* key: 0x560a */ 0xb62c,
- /* key: 0x560b */ 0xffff,
- /* key: 0x560c */ 0xffff,
- /* key: 0x560d */ 0xb62d,
- /* key: 0x560e */ 0xb62e,
- /* key: 0x560f */ 0xb62f,
- /* key: 0x5610 */ 0xb630,
- /* key: 0x5611 */ 0xb631,
- /* key: 0x5612 */ 0xb632,
- /* key: 0x5613 */ 0xffff,
- /* key: 0x5614 */ 0x5352,
- /* key: 0x5615 */ 0xffff,
- /* key: 0x5616 */ 0x5354,
- /* key: 0x5617 */ 0x3e28,
- /* key: 0x5618 */ 0x3133,
- /* key: 0x5619 */ 0xb633,
- /* key: 0x561a */ 0xffff,
- /* key: 0x561b */ 0x5357,
- /* key: 0x561c */ 0xffff,
- /* key: 0x561d */ 0xffff,
- /* key: 0x561e */ 0xffff,
- /* key: 0x561f */ 0xffff,
- /* key: 0x5620 */ 0xffff,
- /* key: 0x5621 */ 0xffff,
- /* key: 0x5622 */ 0xffff,
- /* key: 0x5623 */ 0xffff,
- /* key: 0x5624 */ 0xffff,
- /* key: 0x5625 */ 0xffff,
- /* key: 0x5626 */ 0xffff,
- /* key: 0x5627 */ 0xffff,
- /* key: 0x5628 */ 0xffff,
- /* key: 0x5629 */ 0x325e,
- /* key: 0x562a */ 0xffff,
- /* key: 0x562b */ 0xffff,
- /* key: 0x562c */ 0xb634,
- /* key: 0x562d */ 0xffff,
- /* key: 0x562e */ 0xffff,
- /* key: 0x562f */ 0x5362,
- /* key: 0x5630 */ 0xb635,
- /* key: 0x5631 */ 0x3e7c,
- /* key: 0x5632 */ 0x535e,
- /* key: 0x5633 */ 0xb636,
- /* key: 0x5634 */ 0x535c,
- /* key: 0x5635 */ 0xb637,
- /* key: 0x5636 */ 0x535d,
- /* key: 0x5637 */ 0xb638,
- /* key: 0x5638 */ 0x535f,
- /* key: 0x5639 */ 0xb639,
- /* key: 0x563a */ 0xffff,
- /* key: 0x563b */ 0xb63a,
- /* key: 0x563c */ 0xb63b,
- /* key: 0x563d */ 0xb63c,
- /* key: 0x563e */ 0xffff,
- /* key: 0x563f */ 0xb63d,
- /* key: 0x5640 */ 0xb63e,
- /* key: 0x5641 */ 0xb63f,
- /* key: 0x5642 */ 0x313d,
- /* key: 0x5643 */ 0xb640,
- /* key: 0x5644 */ 0xb641,
- /* key: 0x5645 */ 0xffff,
- /* key: 0x5646 */ 0xb642,
- /* key: 0x5647 */ 0xffff,
- /* key: 0x5648 */ 0xffff,
- /* key: 0x5649 */ 0xb643,
- /* key: 0x564a */ 0xffff,
- /* key: 0x564b */ 0xb644,
- /* key: 0x564c */ 0x4139,
- /* key: 0x564d */ 0xb645,
- /* key: 0x564e */ 0x5359,
- /* key: 0x564f */ 0xb646,
- /* key: 0x5650 */ 0x535a,
- /* key: 0x5651 */ 0xffff,
- /* key: 0x5652 */ 0xffff,
- /* key: 0x5653 */ 0xffff,
- /* key: 0x5654 */ 0xb647,
- /* key: 0x5655 */ 0xffff,
- /* key: 0x5656 */ 0xffff,
- /* key: 0x5657 */ 0xffff,
- /* key: 0x5658 */ 0xffff,
- /* key: 0x5659 */ 0xffff,
- /* key: 0x565a */ 0xffff,
- /* key: 0x565b */ 0x337a,
- /* key: 0x565c */ 0xffff,
- /* key: 0x565d */ 0xffff,
- /* key: 0x565e */ 0xb648,
- /* key: 0x565f */ 0xffff,
- /* key: 0x5660 */ 0xb649,
- /* key: 0x5661 */ 0xb64a,
- /* key: 0x5662 */ 0xb64b,
- /* key: 0x5663 */ 0xb64c,
- /* key: 0x5664 */ 0x5361,
- /* key: 0x5665 */ 0xffff,
- /* key: 0x5666 */ 0xb64d,
- /* key: 0x5667 */ 0xffff,
- /* key: 0x5668 */ 0x346f,
- /* key: 0x5669 */ 0xb64e,
- /* key: 0x566a */ 0x5364,
- /* key: 0x566b */ 0x5360,
- /* key: 0x566c */ 0x5363,
- /* key: 0x566d */ 0xb64f,
- /* key: 0x566e */ 0xffff,
- /* key: 0x566f */ 0xb650,
- /* key: 0x5670 */ 0xffff,
- /* key: 0x5671 */ 0xb651,
- /* key: 0x5672 */ 0xb652,
- /* key: 0x5673 */ 0xffff,
- /* key: 0x5674 */ 0x4a2e,
- /* key: 0x5675 */ 0xb653,
- /* key: 0x5676 */ 0xffff,
- /* key: 0x5677 */ 0xffff,
- /* key: 0x5678 */ 0x4655,
- /* key: 0x5679 */ 0xffff,
- /* key: 0x567a */ 0x4838,
- /* key: 0x567b */ 0xffff,
- /* key: 0x567c */ 0xffff,
- /* key: 0x567d */ 0xffff,
- /* key: 0x567e */ 0xffff,
- /* key: 0x567f */ 0xffff,
- /* key: 0x5680 */ 0x5366,
- /* key: 0x5681 */ 0xffff,
- /* key: 0x5682 */ 0xffff,
- /* key: 0x5683 */ 0xffff,
- /* key: 0x5684 */ 0xb654,
- /* key: 0x5685 */ 0xb655,
- /* key: 0x5686 */ 0x5365,
- /* key: 0x5687 */ 0x3345,
- /* key: 0x5688 */ 0xb656,
- /* key: 0x5689 */ 0xffff,
- /* key: 0x568a */ 0x5367,
- /* key: 0x568b */ 0xb657,
- /* key: 0x568c */ 0xb658,
- /* key: 0x568d */ 0xffff,
- /* key: 0x568e */ 0xffff,
- /* key: 0x568f */ 0x536a,
- /* key: 0x5690 */ 0xffff,
- /* key: 0x5691 */ 0xffff,
- /* key: 0x5692 */ 0xffff,
- /* key: 0x5693 */ 0xffff,
- /* key: 0x5694 */ 0x5369,
- /* key: 0x5695 */ 0xb659,
- /* key: 0x5696 */ 0xffff,
- /* key: 0x5697 */ 0xffff,
- /* key: 0x5698 */ 0xffff,
- /* key: 0x5699 */ 0xb65a,
- /* key: 0x569a */ 0xb65b,
- /* key: 0x569b */ 0xffff,
- /* key: 0x569c */ 0xffff,
- /* key: 0x569d */ 0xb65c,
- /* key: 0x569e */ 0xb65d,
- /* key: 0x569f */ 0xb65e,
- /* key: 0x56a0 */ 0x5368,
- /* key: 0x56a1 */ 0xffff,
- /* key: 0x56a2 */ 0x4739,
- /* key: 0x56a3 */ 0xffff,
- /* key: 0x56a4 */ 0xffff,
- /* key: 0x56a5 */ 0x536b,
- /* key: 0x56a6 */ 0xb65f,
- /* key: 0x56a7 */ 0xb660,
- /* key: 0x56a8 */ 0xb661,
- /* key: 0x56a9 */ 0xb662,
- /* key: 0x56aa */ 0xffff,
- /* key: 0x56ab */ 0xb663,
- /* key: 0x56ac */ 0xb664,
- /* key: 0x56ad */ 0xb665,
- /* key: 0x56ae */ 0x536c,
- /* key: 0x56af */ 0xffff,
- /* key: 0x56b0 */ 0xffff,
- /* key: 0x56b1 */ 0xb666,
- /* key: 0x56b2 */ 0xffff,
- /* key: 0x56b3 */ 0xb667,
- /* key: 0x56b4 */ 0x536e,
- /* key: 0x56b5 */ 0xffff,
- /* key: 0x56b6 */ 0x536d,
- /* key: 0x56b7 */ 0xb668,
- /* key: 0x56b8 */ 0xffff,
- /* key: 0x56b9 */ 0xffff,
- /* key: 0x56ba */ 0xffff,
- /* key: 0x56bb */ 0xffff,
- /* key: 0x56bc */ 0x5370,
- /* key: 0x56bd */ 0xffff,
- /* key: 0x56be */ 0xb669,
- /* key: 0x56bf */ 0xffff,
- /* key: 0x56c0 */ 0x5373,
- /* key: 0x56c1 */ 0x5371,
- /* key: 0x56c2 */ 0x536f,
- /* key: 0x56c3 */ 0x5372,
- /* key: 0x56c4 */ 0xffff,
- /* key: 0x56c5 */ 0xb66a,
- /* key: 0x56c6 */ 0xffff,
- /* key: 0x56c7 */ 0xffff,
- /* key: 0x56c8 */ 0x5374,
- /* key: 0x56c9 */ 0xb66b,
- /* key: 0x56ca */ 0xb66c,
- /* key: 0x56cb */ 0xb66d,
- /* key: 0x56cc */ 0xb670,
- /* key: 0x56cd */ 0xb671,
- /* key: 0x56ce */ 0x5375,
- /* key: 0x56cf */ 0xb66e,
- /* key: 0x56d0 */ 0xb66f,
- /* key: 0x56d1 */ 0x5376,
- /* key: 0x56d2 */ 0xffff,
- /* key: 0x56d3 */ 0x5377,
- /* key: 0x56d4 */ 0xffff,
- /* key: 0x56d5 */ 0xffff,
- /* key: 0x56d6 */ 0xffff,
- /* key: 0x56d7 */ 0x5378,
- /* key: 0x56d8 */ 0x5145,
- /* key: 0x56d9 */ 0xb672,
- /* key: 0x56da */ 0x3c7c,
- /* key: 0x56db */ 0x3b4d,
- /* key: 0x56dc */ 0xb673,
- /* key: 0x56dd */ 0xb674,
- /* key: 0x56de */ 0x3273,
- /* key: 0x56df */ 0xb675,
- /* key: 0x56e0 */ 0x3078,
- /* key: 0x56e1 */ 0xb676,
- /* key: 0x56e2 */ 0xffff,
- /* key: 0x56e3 */ 0x4344,
- /* key: 0x56e4 */ 0xb677,
- /* key: 0x56e5 */ 0xb678,
- /* key: 0x56e6 */ 0xb679,
- /* key: 0x56e7 */ 0xb67a,
- /* key: 0x56e8 */ 0xb67b,
- /* key: 0x56e9 */ 0xffff,
- /* key: 0x56ea */ 0xffff,
- /* key: 0x56eb */ 0xb67d,
- /* key: 0x56ec */ 0xffff,
- /* key: 0x56ed */ 0xb67e,
- /* key: 0x56ee */ 0x5379,
- /* key: 0x56ef */ 0xffff,
- /* key: 0x56f0 */ 0x3a24,
- /* key: 0x56f1 */ 0xb67c,
- /* key: 0x56f2 */ 0x304f,
- /* key: 0x56f3 */ 0x3f5e,
- /* key: 0x56f4 */ 0xffff,
- /* key: 0x56f5 */ 0xffff,
- /* key: 0x56f6 */ 0xb721,
- /* key: 0x56f7 */ 0xb722,
- /* key: 0x56f8 */ 0xffff,
- /* key: 0x56f9 */ 0x537a,
- /* key: 0x56fa */ 0x3847,
- /* key: 0x56fb */ 0xffff,
- /* key: 0x56fc */ 0xffff,
- /* key: 0x56fd */ 0x3971,
- /* key: 0x56fe */ 0xffff,
- /* key: 0x56ff */ 0x537c,
- /* branch: 0x570X */ 4048,
- /* branch: 0x571X */ 4064,
- /* branch: 0x572X */ 4080,
- /* branch: 0x573X */ 4096,
- /* branch: 0x574X */ 4112,
- /* branch: 0x575X */ 4128,
- /* branch: 0x576X */ 4144,
- /* branch: 0x577X */ 4160,
- /* branch: 0x578X */ 4176,
- /* branch: 0x579X */ 4192,
- /* branch: 0x57aX */ 4208,
- /* branch: 0x57bX */ 4224,
- /* branch: 0x57cX */ 4240,
- /* branch: 0x57dX */ 4256,
- /* branch: 0x57eX */ 4272,
- /* branch: 0x57fX */ 4288,
- /* key: 0x5700 */ 0x537b,
- /* key: 0x5701 */ 0xb723,
- /* key: 0x5702 */ 0xb724,
- /* key: 0x5703 */ 0x4a60,
- /* key: 0x5704 */ 0x537d,
- /* key: 0x5705 */ 0xffff,
- /* key: 0x5706 */ 0xffff,
- /* key: 0x5707 */ 0xb725,
- /* key: 0x5708 */ 0x5421,
- /* key: 0x5709 */ 0x537e,
- /* key: 0x570a */ 0xb726,
- /* key: 0x570b */ 0x5422,
- /* key: 0x570c */ 0xb727,
- /* key: 0x570d */ 0x5423,
- /* key: 0x570e */ 0xffff,
- /* key: 0x570f */ 0x3777,
- /* key: 0x5710 */ 0xffff,
- /* key: 0x5711 */ 0xb728,
- /* key: 0x5712 */ 0x3160,
- /* key: 0x5713 */ 0x5424,
- /* key: 0x5714 */ 0xffff,
- /* key: 0x5715 */ 0xb729,
- /* key: 0x5716 */ 0x5426,
- /* key: 0x5717 */ 0xffff,
- /* key: 0x5718 */ 0x5425,
- /* key: 0x5719 */ 0xffff,
- /* key: 0x571a */ 0xb72a,
- /* key: 0x571b */ 0xb72b,
- /* key: 0x571c */ 0x5428,
- /* key: 0x571d */ 0xb72c,
- /* key: 0x571e */ 0xffff,
- /* key: 0x571f */ 0x455a,
- /* key: 0x5720 */ 0xb72d,
- /* key: 0x5721 */ 0xffff,
- /* key: 0x5722 */ 0xb72e,
- /* key: 0x5723 */ 0xb72f,
- /* key: 0x5724 */ 0xb730,
- /* key: 0x5725 */ 0xb731,
- /* key: 0x5726 */ 0x5429,
- /* key: 0x5727 */ 0x3035,
- /* key: 0x5728 */ 0x3a5f,
- /* key: 0x5729 */ 0xb732,
- /* key: 0x572a */ 0xb733,
- /* key: 0x572b */ 0xffff,
- /* key: 0x572c */ 0xb734,
- /* key: 0x572d */ 0x373d,
- /* key: 0x572e */ 0xb735,
- /* key: 0x572f */ 0xb736,
- /* key: 0x5730 */ 0x434f,
- /* key: 0x5731 */ 0xffff,
- /* key: 0x5732 */ 0xffff,
- /* key: 0x5733 */ 0xb737,
- /* key: 0x5734 */ 0xb738,
- /* key: 0x5735 */ 0xffff,
- /* key: 0x5736 */ 0xffff,
- /* key: 0x5737 */ 0x542a,
- /* key: 0x5738 */ 0x542b,
- /* key: 0x5739 */ 0xffff,
- /* key: 0x573a */ 0xffff,
- /* key: 0x573b */ 0x542d,
- /* key: 0x573c */ 0xffff,
- /* key: 0x573d */ 0xb739,
- /* key: 0x573e */ 0xb73a,
- /* key: 0x573f */ 0xb73b,
- /* key: 0x5740 */ 0x542e,
- /* key: 0x5741 */ 0xffff,
- /* key: 0x5742 */ 0x3a64,
- /* key: 0x5743 */ 0xffff,
- /* key: 0x5744 */ 0xffff,
- /* key: 0x5745 */ 0xb73c,
- /* key: 0x5746 */ 0xb73d,
- /* key: 0x5747 */ 0x3651,
- /* key: 0x5748 */ 0xffff,
- /* key: 0x5749 */ 0xffff,
- /* key: 0x574a */ 0x4b37,
- /* key: 0x574b */ 0xffff,
- /* key: 0x574c */ 0xb73e,
- /* key: 0x574d */ 0xb73f,
- /* key: 0x574e */ 0x542c,
- /* key: 0x574f */ 0x542f,
- /* key: 0x5750 */ 0x3a41,
- /* key: 0x5751 */ 0x3923,
- /* key: 0x5752 */ 0xb740,
- /* key: 0x5753 */ 0xffff,
- /* key: 0x5754 */ 0xffff,
- /* key: 0x5755 */ 0xffff,
- /* key: 0x5756 */ 0xffff,
- /* key: 0x5757 */ 0xffff,
- /* key: 0x5758 */ 0xffff,
- /* key: 0x5759 */ 0xffff,
- /* key: 0x575a */ 0xffff,
- /* key: 0x575b */ 0xffff,
- /* key: 0x575c */ 0xffff,
- /* key: 0x575d */ 0xffff,
- /* key: 0x575e */ 0xffff,
- /* key: 0x575f */ 0xffff,
- /* key: 0x5760 */ 0xffff,
- /* key: 0x5761 */ 0x5433,
- /* key: 0x5762 */ 0xb741,
- /* key: 0x5763 */ 0xffff,
- /* key: 0x5764 */ 0x3a25,
- /* key: 0x5765 */ 0xb742,
- /* key: 0x5766 */ 0x4333,
- /* key: 0x5767 */ 0xb743,
- /* key: 0x5768 */ 0xb744,
- /* key: 0x5769 */ 0x5430,
- /* key: 0x576a */ 0x445a,
- /* key: 0x576b */ 0xb745,
- /* key: 0x576c */ 0xffff,
- /* key: 0x576d */ 0xb746,
- /* key: 0x576e */ 0xb747,
- /* key: 0x576f */ 0xb748,
- /* key: 0x5770 */ 0xb749,
- /* key: 0x5771 */ 0xb74a,
- /* key: 0x5772 */ 0xffff,
- /* key: 0x5773 */ 0xb74b,
- /* key: 0x5774 */ 0xb74c,
- /* key: 0x5775 */ 0xb74d,
- /* key: 0x5776 */ 0xffff,
- /* key: 0x5777 */ 0xb74e,
- /* key: 0x5778 */ 0xffff,
- /* key: 0x5779 */ 0xb74f,
- /* key: 0x577a */ 0xb750,
- /* key: 0x577b */ 0xb751,
- /* key: 0x577c */ 0xb752,
- /* key: 0x577d */ 0xffff,
- /* key: 0x577e */ 0xb753,
- /* key: 0x577f */ 0x5434,
- /* key: 0x5780 */ 0xffff,
- /* key: 0x5781 */ 0xb754,
- /* key: 0x5782 */ 0x3f62,
- /* key: 0x5783 */ 0xb755,
- /* key: 0x5784 */ 0xffff,
- /* key: 0x5785 */ 0xffff,
- /* key: 0x5786 */ 0xffff,
- /* key: 0x5787 */ 0xffff,
- /* key: 0x5788 */ 0x5432,
- /* key: 0x5789 */ 0x5435,
- /* key: 0x578a */ 0xffff,
- /* key: 0x578b */ 0x373f,
- /* key: 0x578c */ 0xb756,
- /* key: 0x578d */ 0xffff,
- /* key: 0x578e */ 0xffff,
- /* key: 0x578f */ 0xffff,
- /* key: 0x5790 */ 0xffff,
- /* key: 0x5791 */ 0xffff,
- /* key: 0x5792 */ 0xffff,
- /* key: 0x5793 */ 0x5436,
- /* key: 0x5794 */ 0xb757,
- /* key: 0x5795 */ 0xb760,
- /* key: 0x5796 */ 0xffff,
- /* key: 0x5797 */ 0xb758,
- /* key: 0x5798 */ 0xffff,
- /* key: 0x5799 */ 0xb759,
- /* key: 0x579a */ 0xb75a,
- /* key: 0x579b */ 0xffff,
- /* key: 0x579c */ 0xb75b,
- /* key: 0x579d */ 0xb75c,
- /* key: 0x579e */ 0xb75d,
- /* key: 0x579f */ 0xb75e,
- /* key: 0x57a0 */ 0x5437,
- /* key: 0x57a1 */ 0xb75f,
- /* key: 0x57a2 */ 0x3924,
- /* key: 0x57a3 */ 0x3340,
- /* key: 0x57a4 */ 0x5439,
- /* key: 0x57a5 */ 0xffff,
- /* key: 0x57a6 */ 0xffff,
- /* key: 0x57a7 */ 0xb761,
- /* key: 0x57a8 */ 0xb762,
- /* key: 0x57a9 */ 0xb763,
- /* key: 0x57aa */ 0x543a,
- /* key: 0x57ab */ 0xffff,
- /* key: 0x57ac */ 0xb764,
- /* key: 0x57ad */ 0xffff,
- /* key: 0x57ae */ 0xffff,
- /* key: 0x57af */ 0xffff,
- /* key: 0x57b0 */ 0x543b,
- /* key: 0x57b1 */ 0xffff,
- /* key: 0x57b2 */ 0xffff,
- /* key: 0x57b3 */ 0x5438,
- /* key: 0x57b4 */ 0xffff,
- /* key: 0x57b5 */ 0xffff,
- /* key: 0x57b6 */ 0xffff,
- /* key: 0x57b7 */ 0xffff,
- /* key: 0x57b8 */ 0xb765,
- /* key: 0x57b9 */ 0xffff,
- /* key: 0x57ba */ 0xffff,
- /* key: 0x57bb */ 0xffff,
- /* key: 0x57bc */ 0xffff,
- /* key: 0x57bd */ 0xb766,
- /* key: 0x57be */ 0xffff,
- /* key: 0x57bf */ 0xffff,
- /* key: 0x57c0 */ 0x5431,
- /* key: 0x57c1 */ 0xffff,
- /* key: 0x57c2 */ 0xffff,
- /* key: 0x57c3 */ 0x543c,
- /* key: 0x57c4 */ 0xffff,
- /* key: 0x57c5 */ 0xffff,
- /* key: 0x57c6 */ 0x543d,
- /* key: 0x57c7 */ 0xb767,
- /* key: 0x57c8 */ 0xb768,
- /* key: 0x57c9 */ 0xffff,
- /* key: 0x57ca */ 0xffff,
- /* key: 0x57cb */ 0x4b64,
- /* key: 0x57cc */ 0xb769,
- /* key: 0x57cd */ 0xffff,
- /* key: 0x57ce */ 0x3e6b,
- /* key: 0x57cf */ 0xb76a,
- /* key: 0x57d0 */ 0xffff,
- /* key: 0x57d1 */ 0xffff,
- /* key: 0x57d2 */ 0x543f,
- /* key: 0x57d3 */ 0x5440,
- /* key: 0x57d4 */ 0x543e,
- /* key: 0x57d5 */ 0xb76b,
- /* key: 0x57d6 */ 0x5442,
- /* key: 0x57d7 */ 0xffff,
- /* key: 0x57d8 */ 0xffff,
- /* key: 0x57d9 */ 0xffff,
- /* key: 0x57da */ 0xffff,
- /* key: 0x57db */ 0xffff,
- /* key: 0x57dc */ 0x4738,
- /* key: 0x57dd */ 0xb76c,
- /* key: 0x57de */ 0xb76d,
- /* key: 0x57df */ 0x3068,
- /* key: 0x57e0 */ 0x4956,
- /* key: 0x57e1 */ 0xb77e,
- /* key: 0x57e2 */ 0xffff,
- /* key: 0x57e3 */ 0x5443,
- /* key: 0x57e4 */ 0xb76e,
- /* key: 0x57e5 */ 0xffff,
- /* key: 0x57e6 */ 0xb76f,
- /* key: 0x57e7 */ 0xb770,
- /* key: 0x57e8 */ 0xffff,
- /* key: 0x57e9 */ 0xb771,
- /* key: 0x57ea */ 0xffff,
- /* key: 0x57eb */ 0xffff,
- /* key: 0x57ec */ 0xffff,
- /* key: 0x57ed */ 0xb772,
- /* key: 0x57ee */ 0xffff,
- /* key: 0x57ef */ 0xffff,
- /* key: 0x57f0 */ 0xb773,
- /* key: 0x57f1 */ 0xffff,
- /* key: 0x57f2 */ 0xffff,
- /* key: 0x57f3 */ 0xffff,
- /* key: 0x57f4 */ 0x3e7d,
- /* key: 0x57f5 */ 0xb774,
- /* key: 0x57f6 */ 0xb775,
- /* key: 0x57f7 */ 0x3c39,
- /* key: 0x57f8 */ 0xb776,
- /* key: 0x57f9 */ 0x475d,
- /* key: 0x57fa */ 0x3470,
- /* key: 0x57fb */ 0xffff,
- /* key: 0x57fc */ 0x3a6b,
- /* key: 0x57fd */ 0xb777,
- /* key: 0x57fe */ 0xb778,
- /* key: 0x57ff */ 0xb779,
- /* branch: 0x580X */ 4320,
- /* branch: 0x581X */ 4336,
- /* branch: 0x582X */ 4352,
- /* branch: 0x583X */ 4368,
- /* branch: 0x584X */ 4384,
- /* branch: 0x585X */ 4400,
- /* branch: 0x586X */ 4416,
- /* branch: 0x587X */ 4432,
- /* branch: 0x588X */ 4448,
- /* branch: 0x589X */ 4464,
- /* branch: 0x58aX */ 4480,
- /* branch: 0x58bX */ 4496,
- /* branch: 0x58cX */ 4512,
- /* branch: 0x58dX */ 4528,
- /* branch: 0x58eX */ 4544,
- /* branch: 0x58fX */ 4560,
- /* key: 0x5800 */ 0x4b59,
- /* key: 0x5801 */ 0xffff,
- /* key: 0x5802 */ 0x4632,
- /* key: 0x5803 */ 0xb77a,
- /* key: 0x5804 */ 0xb77b,
- /* key: 0x5805 */ 0x3778,
- /* key: 0x5806 */ 0x424f,
- /* key: 0x5807 */ 0xffff,
- /* key: 0x5808 */ 0xb77c,
- /* key: 0x5809 */ 0xb77d,
- /* key: 0x580a */ 0x5441,
- /* key: 0x580b */ 0x5444,
- /* key: 0x580c */ 0xb821,
- /* key: 0x580d */ 0xb822,
- /* key: 0x580e */ 0xffff,
- /* key: 0x580f */ 0xffff,
- /* key: 0x5810 */ 0xffff,
- /* key: 0x5811 */ 0xffff,
- /* key: 0x5812 */ 0xffff,
- /* key: 0x5813 */ 0xffff,
- /* key: 0x5814 */ 0xffff,
- /* key: 0x5815 */ 0x4244,
- /* key: 0x5816 */ 0xffff,
- /* key: 0x5817 */ 0xffff,
- /* key: 0x5818 */ 0xffff,
- /* key: 0x5819 */ 0x5445,
- /* key: 0x581a */ 0xffff,
- /* key: 0x581b */ 0xb823,
- /* key: 0x581c */ 0xffff,
- /* key: 0x581d */ 0x5446,
- /* key: 0x581e */ 0xb824,
- /* key: 0x581f */ 0xb825,
- /* key: 0x5820 */ 0xb826,
- /* key: 0x5821 */ 0x5448,
- /* key: 0x5822 */ 0xffff,
- /* key: 0x5823 */ 0xffff,
- /* key: 0x5824 */ 0x4469,
- /* key: 0x5825 */ 0xffff,
- /* key: 0x5826 */ 0xb827,
- /* key: 0x5827 */ 0xb828,
- /* key: 0x5828 */ 0xffff,
- /* key: 0x5829 */ 0xffff,
- /* key: 0x582a */ 0x342e,
- /* key: 0x582b */ 0xffff,
- /* key: 0x582c */ 0xffff,
- /* key: 0x582d */ 0xb829,
- /* key: 0x582e */ 0xffff,
- /* key: 0x582f */ 0x7421,
- /* key: 0x5830 */ 0x3161,
- /* key: 0x5831 */ 0x4a73,
- /* key: 0x5832 */ 0xb82a,
- /* key: 0x5833 */ 0xffff,
- /* key: 0x5834 */ 0x3e6c,
- /* key: 0x5835 */ 0x4548,
- /* key: 0x5836 */ 0xffff,
- /* key: 0x5837 */ 0xffff,
- /* key: 0x5838 */ 0xffff,
- /* key: 0x5839 */ 0xb82b,
- /* key: 0x583a */ 0x3a66,
- /* key: 0x583b */ 0xffff,
- /* key: 0x583c */ 0xffff,
- /* key: 0x583d */ 0x544e,
- /* key: 0x583e */ 0xffff,
- /* key: 0x583f */ 0xb82c,
- /* key: 0x5840 */ 0x4a3d,
- /* key: 0x5841 */ 0x4e5d,
- /* key: 0x5842 */ 0xffff,
- /* key: 0x5843 */ 0xffff,
- /* key: 0x5844 */ 0xffff,
- /* key: 0x5845 */ 0xffff,
- /* key: 0x5846 */ 0xffff,
- /* key: 0x5847 */ 0xffff,
- /* key: 0x5848 */ 0xffff,
- /* key: 0x5849 */ 0xb82d,
- /* key: 0x584a */ 0x3274,
- /* key: 0x584b */ 0x544a,
- /* key: 0x584c */ 0xb82e,
- /* key: 0x584d */ 0xb82f,
- /* key: 0x584e */ 0xffff,
- /* key: 0x584f */ 0xb830,
- /* key: 0x5850 */ 0xb831,
- /* key: 0x5851 */ 0x413a,
- /* key: 0x5852 */ 0x544d,
- /* key: 0x5853 */ 0xffff,
- /* key: 0x5854 */ 0x4563,
- /* key: 0x5855 */ 0xb832,
- /* key: 0x5856 */ 0xffff,
- /* key: 0x5857 */ 0x4549,
- /* key: 0x5858 */ 0x4564,
- /* key: 0x5859 */ 0x4839,
- /* key: 0x585a */ 0x444d,
- /* key: 0x585b */ 0xffff,
- /* key: 0x585c */ 0xffff,
- /* key: 0x585d */ 0xffff,
- /* key: 0x585e */ 0x3a49,
- /* key: 0x585f */ 0xb833,
- /* key: 0x5860 */ 0xffff,
- /* key: 0x5861 */ 0xb834,
- /* key: 0x5862 */ 0x5449,
- /* key: 0x5863 */ 0xffff,
- /* key: 0x5864 */ 0xb835,
- /* key: 0x5865 */ 0xffff,
- /* key: 0x5866 */ 0xffff,
- /* key: 0x5867 */ 0xb836,
- /* key: 0x5868 */ 0xb837,
- /* key: 0x5869 */ 0x3176,
- /* key: 0x586a */ 0xffff,
- /* key: 0x586b */ 0x4536,
- /* key: 0x586c */ 0xffff,
- /* key: 0x586d */ 0xffff,
- /* key: 0x586e */ 0xffff,
- /* key: 0x586f */ 0xffff,
- /* key: 0x5870 */ 0x544b,
- /* key: 0x5871 */ 0xffff,
- /* key: 0x5872 */ 0x5447,
- /* key: 0x5873 */ 0xffff,
- /* key: 0x5874 */ 0xffff,
- /* key: 0x5875 */ 0x3f50,
- /* key: 0x5876 */ 0xffff,
- /* key: 0x5877 */ 0xffff,
- /* key: 0x5878 */ 0xb838,
- /* key: 0x5879 */ 0x544f,
- /* key: 0x587a */ 0xffff,
- /* key: 0x587b */ 0xffff,
- /* key: 0x587c */ 0xb839,
- /* key: 0x587d */ 0xffff,
- /* key: 0x587e */ 0x3d4e,
- /* key: 0x587f */ 0xb83a,
- /* key: 0x5880 */ 0xb83b,
- /* key: 0x5881 */ 0xb83c,
- /* key: 0x5882 */ 0xffff,
- /* key: 0x5883 */ 0x362d,
- /* key: 0x5884 */ 0xffff,
- /* key: 0x5885 */ 0x5450,
- /* key: 0x5886 */ 0xffff,
- /* key: 0x5887 */ 0xb83d,
- /* key: 0x5888 */ 0xb83e,
- /* key: 0x5889 */ 0xb83f,
- /* key: 0x588a */ 0xb840,
- /* key: 0x588b */ 0xffff,
- /* key: 0x588c */ 0xb841,
- /* key: 0x588d */ 0xb842,
- /* key: 0x588e */ 0xffff,
- /* key: 0x588f */ 0xb843,
- /* key: 0x5890 */ 0xb844,
- /* key: 0x5891 */ 0xffff,
- /* key: 0x5892 */ 0xffff,
- /* key: 0x5893 */ 0x4a68,
- /* key: 0x5894 */ 0xb845,
- /* key: 0x5895 */ 0xffff,
- /* key: 0x5896 */ 0xb846,
- /* key: 0x5897 */ 0x417d,
- /* key: 0x5898 */ 0xffff,
- /* key: 0x5899 */ 0xffff,
- /* key: 0x589a */ 0xffff,
- /* key: 0x589b */ 0xffff,
- /* key: 0x589c */ 0x4446,
- /* key: 0x589d */ 0xb847,
- /* key: 0x589e */ 0xffff,
- /* key: 0x589f */ 0x5452,
- /* key: 0x58a0 */ 0xb848,
- /* key: 0x58a1 */ 0xb849,
- /* key: 0x58a2 */ 0xb84a,
- /* key: 0x58a3 */ 0xffff,
- /* key: 0x58a4 */ 0xffff,
- /* key: 0x58a5 */ 0xffff,
- /* key: 0x58a6 */ 0xb84b,
- /* key: 0x58a7 */ 0xffff,
- /* key: 0x58a8 */ 0x4b4f,
- /* key: 0x58a9 */ 0xb84c,
- /* key: 0x58aa */ 0xffff,
- /* key: 0x58ab */ 0x5453,
- /* key: 0x58ac */ 0xffff,
- /* key: 0x58ad */ 0xffff,
- /* key: 0x58ae */ 0x5458,
- /* key: 0x58af */ 0xffff,
- /* key: 0x58b0 */ 0xffff,
- /* key: 0x58b1 */ 0xb84d,
- /* key: 0x58b2 */ 0xb84e,
- /* key: 0x58b3 */ 0x4a2f,
- /* key: 0x58b4 */ 0xffff,
- /* key: 0x58b5 */ 0xffff,
- /* key: 0x58b6 */ 0xffff,
- /* key: 0x58b7 */ 0xffff,
- /* key: 0x58b8 */ 0x5457,
- /* key: 0x58b9 */ 0x5451,
- /* key: 0x58ba */ 0x5454,
- /* key: 0x58bb */ 0x5456,
- /* key: 0x58bc */ 0xb850,
- /* key: 0x58bd */ 0xffff,
- /* key: 0x58be */ 0x3a26,
- /* key: 0x58bf */ 0xffff,
- /* key: 0x58c0 */ 0xffff,
- /* key: 0x58c1 */ 0x4a49,
- /* key: 0x58c2 */ 0xb851,
- /* key: 0x58c3 */ 0xffff,
- /* key: 0x58c4 */ 0xb84f,
- /* key: 0x58c5 */ 0x5459,
- /* key: 0x58c6 */ 0xffff,
- /* key: 0x58c7 */ 0x4345,
- /* key: 0x58c8 */ 0xb852,
- /* key: 0x58c9 */ 0xffff,
- /* key: 0x58ca */ 0x3275,
- /* key: 0x58cb */ 0xffff,
- /* key: 0x58cc */ 0x3e6d,
- /* key: 0x58cd */ 0xb853,
- /* key: 0x58ce */ 0xb854,
- /* key: 0x58cf */ 0xffff,
- /* key: 0x58d0 */ 0xb855,
- /* key: 0x58d1 */ 0x545b,
- /* key: 0x58d2 */ 0xb856,
- /* key: 0x58d3 */ 0x545a,
- /* key: 0x58d4 */ 0xb857,
- /* key: 0x58d5 */ 0x3968,
- /* key: 0x58d6 */ 0xb858,
- /* key: 0x58d7 */ 0x545c,
- /* key: 0x58d8 */ 0x545e,
- /* key: 0x58d9 */ 0x545d,
- /* key: 0x58da */ 0xb859,
- /* key: 0x58db */ 0xffff,
- /* key: 0x58dc */ 0x5460,
- /* key: 0x58dd */ 0xb85a,
- /* key: 0x58de */ 0x5455,
- /* key: 0x58df */ 0x5462,
- /* key: 0x58e0 */ 0xffff,
- /* key: 0x58e1 */ 0xb85b,
- /* key: 0x58e2 */ 0xb85c,
- /* key: 0x58e3 */ 0xffff,
- /* key: 0x58e4 */ 0x5461,
- /* key: 0x58e5 */ 0x545f,
- /* key: 0x58e6 */ 0xffff,
- /* key: 0x58e7 */ 0xffff,
- /* key: 0x58e8 */ 0xffff,
- /* key: 0x58e9 */ 0xb85d,
- /* key: 0x58ea */ 0xffff,
- /* key: 0x58eb */ 0x3b4e,
- /* key: 0x58ec */ 0x3f51,
- /* key: 0x58ed */ 0xffff,
- /* key: 0x58ee */ 0x4154,
- /* key: 0x58ef */ 0x5463,
- /* key: 0x58f0 */ 0x403c,
- /* key: 0x58f1 */ 0x306d,
- /* key: 0x58f2 */ 0x4764,
- /* key: 0x58f3 */ 0xb85e,
- /* key: 0x58f4 */ 0xffff,
- /* key: 0x58f5 */ 0xffff,
- /* key: 0x58f6 */ 0xffff,
- /* key: 0x58f7 */ 0x445b,
- /* key: 0x58f8 */ 0xffff,
- /* key: 0x58f9 */ 0x5465,
- /* key: 0x58fa */ 0x5464,
- /* key: 0x58fb */ 0x5466,
- /* key: 0x58fc */ 0x5467,
- /* key: 0x58fd */ 0x5468,
- /* key: 0x58fe */ 0xffff,
- /* key: 0x58ff */ 0xffff,
- /* branch: 0x590X */ 4592,
- /* branch: 0x591X */ 4608,
- /* branch: 0x592X */ 4624,
- /* branch: 0x593X */ 4640,
- /* branch: 0x594X */ 4656,
- /* branch: 0x595X */ 4672,
- /* branch: 0x596X */ 4688,
- /* branch: 0x597X */ 4704,
- /* branch: 0x598X */ 4720,
- /* branch: 0x599X */ 4736,
- /* branch: 0x59aX */ 4752,
- /* branch: 0x59bX */ 4768,
- /* branch: 0x59cX */ 4784,
- /* branch: 0x59dX */ 4800,
- /* branch: 0x59eX */ 4816,
- /* branch: 0x59fX */ 4832,
- /* key: 0x5900 */ 0xffff,
- /* key: 0x5901 */ 0xffff,
- /* key: 0x5902 */ 0x5469,
- /* key: 0x5903 */ 0xffff,
- /* key: 0x5904 */ 0xffff,
- /* key: 0x5905 */ 0xb85f,
- /* key: 0x5906 */ 0xb860,
- /* key: 0x5907 */ 0xffff,
- /* key: 0x5908 */ 0xffff,
- /* key: 0x5909 */ 0x4a51,
- /* key: 0x590a */ 0x546a,
- /* key: 0x590b */ 0xb861,
- /* key: 0x590c */ 0xb862,
- /* key: 0x590d */ 0xffff,
- /* key: 0x590e */ 0xffff,
- /* key: 0x590f */ 0x3246,
- /* key: 0x5910 */ 0x546b,
- /* key: 0x5911 */ 0xffff,
- /* key: 0x5912 */ 0xb863,
- /* key: 0x5913 */ 0xb864,
- /* key: 0x5914 */ 0xb865,
- /* key: 0x5915 */ 0x4d3c,
- /* key: 0x5916 */ 0x3330,
- /* key: 0x5917 */ 0xffff,
- /* key: 0x5918 */ 0x5249,
- /* key: 0x5919 */ 0x3d48,
- /* key: 0x591a */ 0x423f,
- /* key: 0x591b */ 0x546c,
- /* key: 0x591c */ 0x4c6b,
- /* key: 0x591d */ 0xb867,
- /* key: 0x591e */ 0xffff,
- /* key: 0x591f */ 0xffff,
- /* key: 0x5920 */ 0xffff,
- /* key: 0x5921 */ 0xb868,
- /* key: 0x5922 */ 0x4c34,
- /* key: 0x5923 */ 0xb869,
- /* key: 0x5924 */ 0xb86a,
- /* key: 0x5925 */ 0x546e,
- /* key: 0x5926 */ 0xffff,
- /* key: 0x5927 */ 0x4267,
- /* key: 0x5928 */ 0xb86b,
- /* key: 0x5929 */ 0x4537,
- /* key: 0x592a */ 0x4240,
- /* key: 0x592b */ 0x4957,
- /* key: 0x592c */ 0x546f,
- /* key: 0x592d */ 0x5470,
- /* key: 0x592e */ 0x317b,
- /* key: 0x592f */ 0xb86c,
- /* key: 0x5930 */ 0xb86d,
- /* key: 0x5931 */ 0x3c3a,
- /* key: 0x5932 */ 0x5471,
- /* key: 0x5933 */ 0xb86e,
- /* key: 0x5934 */ 0xffff,
- /* key: 0x5935 */ 0xb86f,
- /* key: 0x5936 */ 0xb870,
- /* key: 0x5937 */ 0x3050,
- /* key: 0x5938 */ 0x5472,
- /* key: 0x5939 */ 0xffff,
- /* key: 0x593a */ 0xffff,
- /* key: 0x593b */ 0xffff,
- /* key: 0x593c */ 0xffff,
- /* key: 0x593d */ 0xffff,
- /* key: 0x593e */ 0x5473,
- /* key: 0x593f */ 0xb871,
- /* key: 0x5940 */ 0xffff,
- /* key: 0x5941 */ 0xffff,
- /* key: 0x5942 */ 0xffff,
- /* key: 0x5943 */ 0xb872,
- /* key: 0x5944 */ 0x3162,
- /* key: 0x5945 */ 0xffff,
- /* key: 0x5946 */ 0xb873,
- /* key: 0x5947 */ 0x3471,
- /* key: 0x5948 */ 0x4660,
- /* key: 0x5949 */ 0x4a74,
- /* key: 0x594a */ 0xffff,
- /* key: 0x594b */ 0xffff,
- /* key: 0x594c */ 0xffff,
- /* key: 0x594d */ 0xffff,
- /* key: 0x594e */ 0x5477,
- /* key: 0x594f */ 0x4155,
- /* key: 0x5950 */ 0x5476,
- /* key: 0x5951 */ 0x3740,
- /* key: 0x5952 */ 0xb874,
- /* key: 0x5953 */ 0xb875,
- /* key: 0x5954 */ 0x4b5b,
- /* key: 0x5955 */ 0x5475,
- /* key: 0x5956 */ 0xffff,
- /* key: 0x5957 */ 0x4565,
- /* key: 0x5958 */ 0x5479,
- /* key: 0x5959 */ 0xb876,
- /* key: 0x595a */ 0x5478,
- /* key: 0x595b */ 0xb877,
- /* key: 0x595c */ 0xffff,
- /* key: 0x595d */ 0xb878,
- /* key: 0x595e */ 0xb879,
- /* key: 0x595f */ 0xb87a,
- /* key: 0x5960 */ 0x547b,
- /* key: 0x5961 */ 0xb87b,
- /* key: 0x5962 */ 0x547a,
- /* key: 0x5963 */ 0xb87c,
- /* key: 0x5964 */ 0xffff,
- /* key: 0x5965 */ 0x317c,
- /* key: 0x5966 */ 0xffff,
- /* key: 0x5967 */ 0x547c,
- /* key: 0x5968 */ 0x3e29,
- /* key: 0x5969 */ 0x547e,
- /* key: 0x596a */ 0x4325,
- /* key: 0x596b */ 0xb87d,
- /* key: 0x596c */ 0x547d,
- /* key: 0x596d */ 0xb87e,
- /* key: 0x596e */ 0x4a33,
- /* key: 0x596f */ 0xb921,
- /* key: 0x5970 */ 0xffff,
- /* key: 0x5971 */ 0xffff,
- /* key: 0x5972 */ 0xb922,
- /* key: 0x5973 */ 0x3d77,
- /* key: 0x5974 */ 0x455b,
- /* key: 0x5975 */ 0xb923,
- /* key: 0x5976 */ 0xb924,
- /* key: 0x5977 */ 0xffff,
- /* key: 0x5978 */ 0x5521,
- /* key: 0x5979 */ 0xb925,
- /* key: 0x597a */ 0xffff,
- /* key: 0x597b */ 0xb926,
- /* key: 0x597c */ 0xb927,
- /* key: 0x597d */ 0x3925,
- /* key: 0x597e */ 0xffff,
- /* key: 0x597f */ 0xffff,
- /* key: 0x5980 */ 0xffff,
- /* key: 0x5981 */ 0x5522,
- /* key: 0x5982 */ 0x4721,
- /* key: 0x5983 */ 0x485e,
- /* key: 0x5984 */ 0x4c51,
- /* key: 0x5985 */ 0xffff,
- /* key: 0x5986 */ 0xffff,
- /* key: 0x5987 */ 0xffff,
- /* key: 0x5988 */ 0xffff,
- /* key: 0x5989 */ 0xffff,
- /* key: 0x598a */ 0x4725,
- /* key: 0x598b */ 0xb928,
- /* key: 0x598c */ 0xb929,
- /* key: 0x598d */ 0x552b,
- /* key: 0x598e */ 0xb92a,
- /* key: 0x598f */ 0xffff,
- /* key: 0x5990 */ 0xffff,
- /* key: 0x5991 */ 0xffff,
- /* key: 0x5992 */ 0xb92b,
- /* key: 0x5993 */ 0x3538,
- /* key: 0x5994 */ 0xffff,
- /* key: 0x5995 */ 0xb92c,
- /* key: 0x5996 */ 0x4d45,
- /* key: 0x5997 */ 0xb92d,
- /* key: 0x5998 */ 0xffff,
- /* key: 0x5999 */ 0x4c2f,
- /* key: 0x599a */ 0xffff,
- /* key: 0x599b */ 0x562c,
- /* key: 0x599c */ 0xffff,
- /* key: 0x599d */ 0x5523,
- /* key: 0x599e */ 0xffff,
- /* key: 0x599f */ 0xb92e,
- /* key: 0x59a0 */ 0xffff,
- /* key: 0x59a1 */ 0xffff,
- /* key: 0x59a2 */ 0xffff,
- /* key: 0x59a3 */ 0x5526,
- /* key: 0x59a4 */ 0xb92f,
- /* key: 0x59a5 */ 0x4245,
- /* key: 0x59a6 */ 0xffff,
- /* key: 0x59a7 */ 0xb930,
- /* key: 0x59a8 */ 0x4b38,
- /* key: 0x59a9 */ 0xffff,
- /* key: 0x59aa */ 0xffff,
- /* key: 0x59ab */ 0xffff,
- /* key: 0x59ac */ 0x454a,
- /* key: 0x59ad */ 0xb931,
- /* key: 0x59ae */ 0xb932,
- /* key: 0x59af */ 0xb933,
- /* key: 0x59b0 */ 0xb934,
- /* key: 0x59b1 */ 0xffff,
- /* key: 0x59b2 */ 0x5527,
- /* key: 0x59b3 */ 0xb935,
- /* key: 0x59b4 */ 0xffff,
- /* key: 0x59b5 */ 0xffff,
- /* key: 0x59b6 */ 0xffff,
- /* key: 0x59b7 */ 0xb936,
- /* key: 0x59b8 */ 0xffff,
- /* key: 0x59b9 */ 0x4b65,
- /* key: 0x59ba */ 0xb937,
- /* key: 0x59bb */ 0x3a4a,
- /* key: 0x59bc */ 0xb938,
- /* key: 0x59bd */ 0xffff,
- /* key: 0x59be */ 0x3e2a,
- /* key: 0x59bf */ 0xffff,
- /* key: 0x59c0 */ 0xffff,
- /* key: 0x59c1 */ 0xb939,
- /* key: 0x59c2 */ 0xffff,
- /* key: 0x59c3 */ 0xb93a,
- /* key: 0x59c4 */ 0xb93b,
- /* key: 0x59c5 */ 0xffff,
- /* key: 0x59c6 */ 0x5528,
- /* key: 0x59c7 */ 0xffff,
- /* key: 0x59c8 */ 0xb93c,
- /* key: 0x59c9 */ 0x3b50,
- /* key: 0x59ca */ 0xb93d,
- /* key: 0x59cb */ 0x3b4f,
- /* key: 0x59cc */ 0xffff,
- /* key: 0x59cd */ 0xb93e,
- /* key: 0x59ce */ 0xffff,
- /* key: 0x59cf */ 0xffff,
- /* key: 0x59d0 */ 0x3039,
- /* key: 0x59d1 */ 0x3848,
- /* key: 0x59d2 */ 0xb93f,
- /* key: 0x59d3 */ 0x402b,
- /* key: 0x59d4 */ 0x3051,
- /* key: 0x59d5 */ 0xffff,
- /* key: 0x59d6 */ 0xffff,
- /* key: 0x59d7 */ 0xffff,
- /* key: 0x59d8 */ 0xffff,
- /* key: 0x59d9 */ 0x552c,
- /* key: 0x59da */ 0x552d,
- /* key: 0x59db */ 0xffff,
- /* key: 0x59dc */ 0x552a,
- /* key: 0x59dd */ 0xb940,
- /* key: 0x59de */ 0xb941,
- /* key: 0x59df */ 0xb942,
- /* key: 0x59e0 */ 0xffff,
- /* key: 0x59e1 */ 0xffff,
- /* key: 0x59e2 */ 0xffff,
- /* key: 0x59e3 */ 0xb943,
- /* key: 0x59e4 */ 0xb944,
- /* key: 0x59e5 */ 0x3138,
- /* key: 0x59e6 */ 0x342f,
- /* key: 0x59e7 */ 0xb945,
- /* key: 0x59e8 */ 0x5529,
- /* key: 0x59e9 */ 0xffff,
- /* key: 0x59ea */ 0x4c45,
- /* key: 0x59eb */ 0x4931,
- /* key: 0x59ec */ 0xffff,
- /* key: 0x59ed */ 0xffff,
- /* key: 0x59ee */ 0xb946,
- /* key: 0x59ef */ 0xb947,
- /* key: 0x59f0 */ 0xffff,
- /* key: 0x59f1 */ 0xb948,
- /* key: 0x59f2 */ 0xb949,
- /* key: 0x59f3 */ 0xffff,
- /* key: 0x59f4 */ 0xb94a,
- /* key: 0x59f5 */ 0xffff,
- /* key: 0x59f6 */ 0x3028,
- /* key: 0x59f7 */ 0xb94b,
- /* key: 0x59f8 */ 0xffff,
- /* key: 0x59f9 */ 0xffff,
- /* key: 0x59fa */ 0xffff,
- /* key: 0x59fb */ 0x3079,
- /* key: 0x59fc */ 0xffff,
- /* key: 0x59fd */ 0xffff,
- /* key: 0x59fe */ 0xffff,
- /* key: 0x59ff */ 0x3b51,
- /* branch: 0x5a0X */ 4864,
- /* branch: 0x5a1X */ 4880,
- /* branch: 0x5a2X */ 4896,
- /* branch: 0x5a3X */ 4912,
- /* branch: 0x5a4X */ 4928,
- /* branch: 0x5a5X */ 4944,
- /* branch: 0x5a6X */ 4960,
- /* branch: 0x5a7X */ 4976,
- /* branch: 0x5a8X */ 4992,
- /* branch: 0x5a9X */ 5008,
- /* branch: 0x5aaX */ 5024,
- /* branch: 0x5abX */ 5040,
- /* branch: 0x5acX */ 5056,
- /* branch: 0x5adX */ 5072,
- /* branch: 0x5aeX */ 5088,
- /* branch: 0x5afX */ 5104,
- /* key: 0x5a00 */ 0xb94c,
- /* key: 0x5a01 */ 0x3052,
- /* key: 0x5a02 */ 0xffff,
- /* key: 0x5a03 */ 0x3023,
- /* key: 0x5a04 */ 0xb94d,
- /* key: 0x5a05 */ 0xffff,
- /* key: 0x5a06 */ 0xffff,
- /* key: 0x5a07 */ 0xffff,
- /* key: 0x5a08 */ 0xffff,
- /* key: 0x5a09 */ 0x5532,
- /* key: 0x5a0a */ 0xffff,
- /* key: 0x5a0b */ 0xffff,
- /* key: 0x5a0c */ 0xb94e,
- /* key: 0x5a0d */ 0xb94f,
- /* key: 0x5a0e */ 0xb950,
- /* key: 0x5a0f */ 0xffff,
- /* key: 0x5a10 */ 0xffff,
- /* key: 0x5a11 */ 0x5530,
- /* key: 0x5a12 */ 0xb951,
- /* key: 0x5a13 */ 0xb952,
- /* key: 0x5a14 */ 0xffff,
- /* key: 0x5a15 */ 0xffff,
- /* key: 0x5a16 */ 0xffff,
- /* key: 0x5a17 */ 0xffff,
- /* key: 0x5a18 */ 0x4c3c,
- /* key: 0x5a19 */ 0xffff,
- /* key: 0x5a1a */ 0x5533,
- /* key: 0x5a1b */ 0xffff,
- /* key: 0x5a1c */ 0x5531,
- /* key: 0x5a1d */ 0xffff,
- /* key: 0x5a1e */ 0xb953,
- /* key: 0x5a1f */ 0x552f,
- /* key: 0x5a20 */ 0x3f31,
- /* key: 0x5a21 */ 0xffff,
- /* key: 0x5a22 */ 0xffff,
- /* key: 0x5a23 */ 0xb954,
- /* key: 0x5a24 */ 0xb955,
- /* key: 0x5a25 */ 0x552e,
- /* key: 0x5a26 */ 0xffff,
- /* key: 0x5a27 */ 0xb956,
- /* key: 0x5a28 */ 0xb957,
- /* key: 0x5a29 */ 0x4a5a,
- /* key: 0x5a2a */ 0xb958,
- /* key: 0x5a2b */ 0xffff,
- /* key: 0x5a2c */ 0xffff,
- /* key: 0x5a2d */ 0xb959,
- /* key: 0x5a2e */ 0xffff,
- /* key: 0x5a2f */ 0x3864,
- /* key: 0x5a30 */ 0xb95a,
- /* key: 0x5a31 */ 0xffff,
- /* key: 0x5a32 */ 0xffff,
- /* key: 0x5a33 */ 0xffff,
- /* key: 0x5a34 */ 0xffff,
- /* key: 0x5a35 */ 0x5537,
- /* key: 0x5a36 */ 0x5538,
- /* key: 0x5a37 */ 0xffff,
- /* key: 0x5a38 */ 0xffff,
- /* key: 0x5a39 */ 0xffff,
- /* key: 0x5a3a */ 0xffff,
- /* key: 0x5a3b */ 0xffff,
- /* key: 0x5a3c */ 0x3e2b,
- /* key: 0x5a3d */ 0xffff,
- /* key: 0x5a3e */ 0xffff,
- /* key: 0x5a3f */ 0xffff,
- /* key: 0x5a40 */ 0x5534,
- /* key: 0x5a41 */ 0x4f2c,
- /* key: 0x5a42 */ 0xffff,
- /* key: 0x5a43 */ 0xffff,
- /* key: 0x5a44 */ 0xb95b,
- /* key: 0x5a45 */ 0xb95c,
- /* key: 0x5a46 */ 0x474c,
- /* key: 0x5a47 */ 0xb95d,
- /* key: 0x5a48 */ 0xb95e,
- /* key: 0x5a49 */ 0x5536,
- /* key: 0x5a4a */ 0xffff,
- /* key: 0x5a4b */ 0xffff,
- /* key: 0x5a4c */ 0xb95f,
- /* key: 0x5a4d */ 0xffff,
- /* key: 0x5a4e */ 0xffff,
- /* key: 0x5a4f */ 0xffff,
- /* key: 0x5a50 */ 0xb960,
- /* key: 0x5a51 */ 0xffff,
- /* key: 0x5a52 */ 0xffff,
- /* key: 0x5a53 */ 0xffff,
- /* key: 0x5a54 */ 0xffff,
- /* key: 0x5a55 */ 0xb961,
- /* key: 0x5a56 */ 0xffff,
- /* key: 0x5a57 */ 0xffff,
- /* key: 0x5a58 */ 0xffff,
- /* key: 0x5a59 */ 0xffff,
- /* key: 0x5a5a */ 0x3a27,
- /* key: 0x5a5b */ 0xffff,
- /* key: 0x5a5c */ 0xffff,
- /* key: 0x5a5d */ 0xffff,
- /* key: 0x5a5e */ 0xb962,
- /* key: 0x5a5f */ 0xffff,
- /* key: 0x5a60 */ 0xffff,
- /* key: 0x5a61 */ 0xffff,
- /* key: 0x5a62 */ 0x5539,
- /* key: 0x5a63 */ 0xb963,
- /* key: 0x5a64 */ 0xffff,
- /* key: 0x5a65 */ 0xb964,
- /* key: 0x5a66 */ 0x4958,
- /* key: 0x5a67 */ 0xb965,
- /* key: 0x5a68 */ 0xffff,
- /* key: 0x5a69 */ 0xffff,
- /* key: 0x5a6a */ 0x553a,
- /* key: 0x5a6b */ 0xffff,
- /* key: 0x5a6c */ 0x5535,
- /* key: 0x5a6d */ 0xb966,
- /* key: 0x5a6e */ 0xffff,
- /* key: 0x5a6f */ 0xffff,
- /* key: 0x5a70 */ 0xffff,
- /* key: 0x5a71 */ 0xffff,
- /* key: 0x5a72 */ 0xffff,
- /* key: 0x5a73 */ 0xffff,
- /* key: 0x5a74 */ 0xffff,
- /* key: 0x5a75 */ 0xffff,
- /* key: 0x5a76 */ 0xffff,
- /* key: 0x5a77 */ 0xb967,
- /* key: 0x5a78 */ 0xffff,
- /* key: 0x5a79 */ 0xffff,
- /* key: 0x5a7a */ 0xb968,
- /* key: 0x5a7b */ 0xb969,
- /* key: 0x5a7c */ 0xffff,
- /* key: 0x5a7d */ 0xffff,
- /* key: 0x5a7e */ 0xb96a,
- /* key: 0x5a7f */ 0x4c3b,
- /* key: 0x5a80 */ 0xffff,
- /* key: 0x5a81 */ 0xffff,
- /* key: 0x5a82 */ 0xffff,
- /* key: 0x5a83 */ 0xffff,
- /* key: 0x5a84 */ 0xffff,
- /* key: 0x5a85 */ 0xffff,
- /* key: 0x5a86 */ 0xffff,
- /* key: 0x5a87 */ 0xffff,
- /* key: 0x5a88 */ 0xffff,
- /* key: 0x5a89 */ 0xffff,
- /* key: 0x5a8a */ 0xffff,
- /* key: 0x5a8b */ 0xb96b,
- /* key: 0x5a8c */ 0xffff,
- /* key: 0x5a8d */ 0xffff,
- /* key: 0x5a8e */ 0xffff,
- /* key: 0x5a8f */ 0xffff,
- /* key: 0x5a90 */ 0xb96c,
- /* key: 0x5a91 */ 0xffff,
- /* key: 0x5a92 */ 0x475e,
- /* key: 0x5a93 */ 0xb96d,
- /* key: 0x5a94 */ 0xffff,
- /* key: 0x5a95 */ 0xffff,
- /* key: 0x5a96 */ 0xb96e,
- /* key: 0x5a97 */ 0xffff,
- /* key: 0x5a98 */ 0xffff,
- /* key: 0x5a99 */ 0xb96f,
- /* key: 0x5a9a */ 0x553b,
- /* key: 0x5a9b */ 0x4932,
- /* key: 0x5a9c */ 0xb970,
- /* key: 0x5a9d */ 0xffff,
- /* key: 0x5a9e */ 0xb971,
- /* key: 0x5a9f */ 0xb972,
- /* key: 0x5aa0 */ 0xb973,
- /* key: 0x5aa1 */ 0xffff,
- /* key: 0x5aa2 */ 0xb974,
- /* key: 0x5aa3 */ 0xffff,
- /* key: 0x5aa4 */ 0xffff,
- /* key: 0x5aa5 */ 0xffff,
- /* key: 0x5aa6 */ 0xffff,
- /* key: 0x5aa7 */ 0xb975,
- /* key: 0x5aa8 */ 0xffff,
- /* key: 0x5aa9 */ 0xffff,
- /* key: 0x5aaa */ 0xffff,
- /* key: 0x5aab */ 0xffff,
- /* key: 0x5aac */ 0xb976,
- /* key: 0x5aad */ 0xffff,
- /* key: 0x5aae */ 0xffff,
- /* key: 0x5aaf */ 0xffff,
- /* key: 0x5ab0 */ 0xffff,
- /* key: 0x5ab1 */ 0xb977,
- /* key: 0x5ab2 */ 0xb978,
- /* key: 0x5ab3 */ 0xb979,
- /* key: 0x5ab4 */ 0xffff,
- /* key: 0x5ab5 */ 0xb97a,
- /* key: 0x5ab6 */ 0xffff,
- /* key: 0x5ab7 */ 0xffff,
- /* key: 0x5ab8 */ 0xb97b,
- /* key: 0x5ab9 */ 0xffff,
- /* key: 0x5aba */ 0xb97c,
- /* key: 0x5abb */ 0xb97d,
- /* key: 0x5abc */ 0x553c,
- /* key: 0x5abd */ 0x5540,
- /* key: 0x5abe */ 0x553d,
- /* key: 0x5abf */ 0xb97e,
- /* key: 0x5ac0 */ 0xffff,
- /* key: 0x5ac1 */ 0x3247,
- /* key: 0x5ac2 */ 0x553f,
- /* key: 0x5ac3 */ 0xffff,
- /* key: 0x5ac4 */ 0xba21,
- /* key: 0x5ac5 */ 0xffff,
- /* key: 0x5ac6 */ 0xba22,
- /* key: 0x5ac7 */ 0xffff,
- /* key: 0x5ac8 */ 0xba23,
- /* key: 0x5ac9 */ 0x3c3b,
- /* key: 0x5aca */ 0xffff,
- /* key: 0x5acb */ 0x553e,
- /* key: 0x5acc */ 0x3779,
- /* key: 0x5acd */ 0xffff,
- /* key: 0x5ace */ 0xffff,
- /* key: 0x5acf */ 0xba24,
- /* key: 0x5ad0 */ 0x554c,
- /* key: 0x5ad1 */ 0xffff,
- /* key: 0x5ad2 */ 0xffff,
- /* key: 0x5ad3 */ 0xffff,
- /* key: 0x5ad4 */ 0xffff,
- /* key: 0x5ad5 */ 0xffff,
- /* key: 0x5ad6 */ 0x5545,
- /* key: 0x5ad7 */ 0x5542,
- /* key: 0x5ad8 */ 0xffff,
- /* key: 0x5ad9 */ 0xffff,
- /* key: 0x5ada */ 0xba25,
- /* key: 0x5adb */ 0xffff,
- /* key: 0x5adc */ 0xba26,
- /* key: 0x5add */ 0xffff,
- /* key: 0x5ade */ 0xffff,
- /* key: 0x5adf */ 0xffff,
- /* key: 0x5ae0 */ 0xba27,
- /* key: 0x5ae1 */ 0x4364,
- /* key: 0x5ae2 */ 0xffff,
- /* key: 0x5ae3 */ 0x5541,
- /* key: 0x5ae4 */ 0xffff,
- /* key: 0x5ae5 */ 0xba28,
- /* key: 0x5ae6 */ 0x5543,
- /* key: 0x5ae7 */ 0xffff,
- /* key: 0x5ae8 */ 0xffff,
- /* key: 0x5ae9 */ 0x5544,
- /* key: 0x5aea */ 0xba29,
- /* key: 0x5aeb */ 0xffff,
- /* key: 0x5aec */ 0xffff,
- /* key: 0x5aed */ 0xffff,
- /* key: 0x5aee */ 0xba2a,
- /* key: 0x5aef */ 0xffff,
- /* key: 0x5af0 */ 0xffff,
- /* key: 0x5af1 */ 0xffff,
- /* key: 0x5af2 */ 0xffff,
- /* key: 0x5af3 */ 0xffff,
- /* key: 0x5af4 */ 0xffff,
- /* key: 0x5af5 */ 0xba2b,
- /* key: 0x5af6 */ 0xba2c,
- /* key: 0x5af7 */ 0xffff,
- /* key: 0x5af8 */ 0xffff,
- /* key: 0x5af9 */ 0xffff,
- /* key: 0x5afa */ 0x5546,
- /* key: 0x5afb */ 0x5547,
- /* key: 0x5afc */ 0xffff,
- /* key: 0x5afd */ 0xba2d,
- /* key: 0x5afe */ 0xffff,
- /* key: 0x5aff */ 0xffff,
- /* branch: 0x5b0X */ 5136,
- /* branch: 0x5b1X */ 5152,
- /* branch: 0x5b2X */ 5168,
- /* branch: 0x5b3X */ 5184,
- /* branch: 0x5b4X */ 5200,
- /* branch: 0x5b5X */ 5216,
- /* branch: 0x5b6X */ 5232,
- /* branch: 0x5b7X */ 5248,
- /* branch: 0x5b8X */ 5264,
- /* branch: 0x5b9X */ 5280,
- /* branch: 0x5baX */ 5296,
- /* branch: 0x5bbX */ 5312,
- /* branch: 0x5bcX */ 5328,
- /* branch: 0x5bdX */ 5344,
- /* branch: 0x5beX */ 5360,
- /* branch: 0x5bfX */ 5376,
- /* key: 0x5b00 */ 0xba2e,
- /* key: 0x5b01 */ 0xba2f,
- /* key: 0x5b02 */ 0xffff,
- /* key: 0x5b03 */ 0xffff,
- /* key: 0x5b04 */ 0xffff,
- /* key: 0x5b05 */ 0xffff,
- /* key: 0x5b06 */ 0xffff,
- /* key: 0x5b07 */ 0xffff,
- /* key: 0x5b08 */ 0xba30,
- /* key: 0x5b09 */ 0x3472,
- /* key: 0x5b0a */ 0xffff,
- /* key: 0x5b0b */ 0x5549,
- /* key: 0x5b0c */ 0x5548,
- /* key: 0x5b0d */ 0xffff,
- /* key: 0x5b0e */ 0xffff,
- /* key: 0x5b0f */ 0xffff,
- /* key: 0x5b10 */ 0xffff,
- /* key: 0x5b11 */ 0xffff,
- /* key: 0x5b12 */ 0xffff,
- /* key: 0x5b13 */ 0xffff,
- /* key: 0x5b14 */ 0xffff,
- /* key: 0x5b15 */ 0xffff,
- /* key: 0x5b16 */ 0x554a,
- /* key: 0x5b17 */ 0xba31,
- /* key: 0x5b18 */ 0xffff,
- /* key: 0x5b19 */ 0xba33,
- /* key: 0x5b1a */ 0xffff,
- /* key: 0x5b1b */ 0xba34,
- /* key: 0x5b1c */ 0xffff,
- /* key: 0x5b1d */ 0xba35,
- /* key: 0x5b1e */ 0xffff,
- /* key: 0x5b1f */ 0xffff,
- /* key: 0x5b20 */ 0xffff,
- /* key: 0x5b21 */ 0xba36,
- /* key: 0x5b22 */ 0x3e6e,
- /* key: 0x5b23 */ 0xffff,
- /* key: 0x5b24 */ 0xffff,
- /* key: 0x5b25 */ 0xba37,
- /* key: 0x5b26 */ 0xffff,
- /* key: 0x5b27 */ 0xffff,
- /* key: 0x5b28 */ 0xffff,
- /* key: 0x5b29 */ 0xffff,
- /* key: 0x5b2a */ 0x554d,
- /* key: 0x5b2b */ 0xffff,
- /* key: 0x5b2c */ 0x445c,
- /* key: 0x5b2d */ 0xba38,
- /* key: 0x5b2e */ 0xffff,
- /* key: 0x5b2f */ 0xffff,
- /* key: 0x5b30 */ 0x3145,
- /* key: 0x5b31 */ 0xffff,
- /* key: 0x5b32 */ 0x554b,
- /* key: 0x5b33 */ 0xffff,
- /* key: 0x5b34 */ 0xba32,
- /* key: 0x5b35 */ 0xffff,
- /* key: 0x5b36 */ 0x554e,
- /* key: 0x5b37 */ 0xffff,
- /* key: 0x5b38 */ 0xba39,
- /* key: 0x5b39 */ 0xffff,
- /* key: 0x5b3a */ 0xffff,
- /* key: 0x5b3b */ 0xffff,
- /* key: 0x5b3c */ 0xffff,
- /* key: 0x5b3d */ 0xffff,
- /* key: 0x5b3e */ 0x554f,
- /* key: 0x5b3f */ 0xffff,
- /* key: 0x5b40 */ 0x5552,
- /* key: 0x5b41 */ 0xba3a,
- /* key: 0x5b42 */ 0xffff,
- /* key: 0x5b43 */ 0x5550,
- /* key: 0x5b44 */ 0xffff,
- /* key: 0x5b45 */ 0x5551,
- /* key: 0x5b46 */ 0xffff,
- /* key: 0x5b47 */ 0xffff,
- /* key: 0x5b48 */ 0xffff,
- /* key: 0x5b49 */ 0xffff,
- /* key: 0x5b4a */ 0xffff,
- /* key: 0x5b4b */ 0xba3b,
- /* key: 0x5b4c */ 0xba3c,
- /* key: 0x5b4d */ 0xffff,
- /* key: 0x5b4e */ 0xffff,
- /* key: 0x5b4f */ 0xffff,
- /* key: 0x5b50 */ 0x3b52,
- /* key: 0x5b51 */ 0x5553,
- /* key: 0x5b52 */ 0xba3d,
- /* key: 0x5b53 */ 0xffff,
- /* key: 0x5b54 */ 0x3926,
- /* key: 0x5b55 */ 0x5554,
- /* key: 0x5b56 */ 0xba3e,
- /* key: 0x5b57 */ 0x3b7a,
- /* key: 0x5b58 */ 0x4238,
- /* key: 0x5b59 */ 0xffff,
- /* key: 0x5b5a */ 0x5555,
- /* key: 0x5b5b */ 0x5556,
- /* key: 0x5b5c */ 0x3b5a,
- /* key: 0x5b5d */ 0x3927,
- /* key: 0x5b5e */ 0xba3f,
- /* key: 0x5b5f */ 0x4c52,
- /* key: 0x5b60 */ 0xffff,
- /* key: 0x5b61 */ 0xffff,
- /* key: 0x5b62 */ 0xffff,
- /* key: 0x5b63 */ 0x3528,
- /* key: 0x5b64 */ 0x3849,
- /* key: 0x5b65 */ 0x5557,
- /* key: 0x5b66 */ 0x3358,
- /* key: 0x5b67 */ 0xffff,
- /* key: 0x5b68 */ 0xba40,
- /* key: 0x5b69 */ 0x5558,
- /* key: 0x5b6a */ 0xffff,
- /* key: 0x5b6b */ 0x4239,
- /* key: 0x5b6c */ 0xffff,
- /* key: 0x5b6d */ 0xffff,
- /* key: 0x5b6e */ 0xba41,
- /* key: 0x5b6f */ 0xba42,
- /* key: 0x5b70 */ 0x5559,
- /* key: 0x5b71 */ 0x5623,
- /* key: 0x5b72 */ 0xffff,
- /* key: 0x5b73 */ 0x555a,
- /* key: 0x5b74 */ 0xffff,
- /* key: 0x5b75 */ 0x555b,
- /* key: 0x5b76 */ 0xffff,
- /* key: 0x5b77 */ 0xffff,
- /* key: 0x5b78 */ 0x555c,
- /* key: 0x5b79 */ 0xffff,
- /* key: 0x5b7a */ 0x555e,
- /* key: 0x5b7b */ 0xffff,
- /* key: 0x5b7c */ 0xba43,
- /* key: 0x5b7d */ 0xba44,
- /* key: 0x5b7e */ 0xba45,
- /* key: 0x5b7f */ 0xba46,
- /* key: 0x5b80 */ 0x555f,
- /* key: 0x5b81 */ 0xba47,
- /* key: 0x5b82 */ 0xffff,
- /* key: 0x5b83 */ 0x5560,
- /* key: 0x5b84 */ 0xba48,
- /* key: 0x5b85 */ 0x4270,
- /* key: 0x5b86 */ 0xba49,
- /* key: 0x5b87 */ 0x3127,
- /* key: 0x5b88 */ 0x3c69,
- /* key: 0x5b89 */ 0x3042,
- /* key: 0x5b8a */ 0xba4a,
- /* key: 0x5b8b */ 0x4157,
- /* key: 0x5b8c */ 0x3430,
- /* key: 0x5b8d */ 0x3c35,
- /* key: 0x5b8e */ 0xba4b,
- /* key: 0x5b8f */ 0x3928,
- /* key: 0x5b90 */ 0xba4c,
- /* key: 0x5b91 */ 0xba4d,
- /* key: 0x5b92 */ 0xffff,
- /* key: 0x5b93 */ 0xba4e,
- /* key: 0x5b94 */ 0xba4f,
- /* key: 0x5b95 */ 0x4566,
- /* key: 0x5b96 */ 0xba50,
- /* key: 0x5b97 */ 0x3d21,
- /* key: 0x5b98 */ 0x3431,
- /* key: 0x5b99 */ 0x4368,
- /* key: 0x5b9a */ 0x446a,
- /* key: 0x5b9b */ 0x3038,
- /* key: 0x5b9c */ 0x3539,
- /* key: 0x5b9d */ 0x4a75,
- /* key: 0x5b9e */ 0xffff,
- /* key: 0x5b9f */ 0x3c42,
- /* key: 0x5ba0 */ 0xffff,
- /* key: 0x5ba1 */ 0xffff,
- /* key: 0x5ba2 */ 0x3552,
- /* key: 0x5ba3 */ 0x406b,
- /* key: 0x5ba4 */ 0x3c3c,
- /* key: 0x5ba5 */ 0x4d28,
- /* key: 0x5ba6 */ 0x5561,
- /* key: 0x5ba7 */ 0xffff,
- /* key: 0x5ba8 */ 0xba51,
- /* key: 0x5ba9 */ 0xba52,
- /* key: 0x5baa */ 0xffff,
- /* key: 0x5bab */ 0xffff,
- /* key: 0x5bac */ 0xba53,
- /* key: 0x5bad */ 0xba54,
- /* key: 0x5bae */ 0x355c,
- /* key: 0x5baf */ 0xba55,
- /* key: 0x5bb0 */ 0x3a4b,
- /* key: 0x5bb1 */ 0xba56,
- /* key: 0x5bb2 */ 0xba57,
- /* key: 0x5bb3 */ 0x3332,
- /* key: 0x5bb4 */ 0x3163,
- /* key: 0x5bb5 */ 0x3e2c,
- /* key: 0x5bb6 */ 0x3248,
- /* key: 0x5bb7 */ 0xba58,
- /* key: 0x5bb8 */ 0x5562,
- /* key: 0x5bb9 */ 0x4d46,
- /* key: 0x5bba */ 0xba59,
- /* key: 0x5bbb */ 0xffff,
- /* key: 0x5bbc */ 0xba5a,
- /* key: 0x5bbd */ 0xffff,
- /* key: 0x5bbe */ 0xffff,
- /* key: 0x5bbf */ 0x3d49,
- /* key: 0x5bc0 */ 0xba5b,
- /* key: 0x5bc1 */ 0xba5c,
- /* key: 0x5bc2 */ 0x3c64,
- /* key: 0x5bc3 */ 0x5563,
- /* key: 0x5bc4 */ 0x3473,
- /* key: 0x5bc5 */ 0x4652,
- /* key: 0x5bc6 */ 0x4c29,
- /* key: 0x5bc7 */ 0x5564,
- /* key: 0x5bc8 */ 0xffff,
- /* key: 0x5bc9 */ 0x5565,
- /* key: 0x5bca */ 0xffff,
- /* key: 0x5bcb */ 0xffff,
- /* key: 0x5bcc */ 0x4959,
- /* key: 0x5bcd */ 0xba5d,
- /* key: 0x5bce */ 0xffff,
- /* key: 0x5bcf */ 0xba5e,
- /* key: 0x5bd0 */ 0x5567,
- /* key: 0x5bd1 */ 0xffff,
- /* key: 0x5bd2 */ 0x3428,
- /* key: 0x5bd3 */ 0x3677,
- /* key: 0x5bd4 */ 0x5566,
- /* key: 0x5bd5 */ 0xffff,
- /* key: 0x5bd6 */ 0xba5f,
- /* key: 0x5bd7 */ 0xba60,
- /* key: 0x5bd8 */ 0xba61,
- /* key: 0x5bd9 */ 0xba62,
- /* key: 0x5bda */ 0xba63,
- /* key: 0x5bdb */ 0x3432,
- /* key: 0x5bdc */ 0xffff,
- /* key: 0x5bdd */ 0x3f32,
- /* key: 0x5bde */ 0x556b,
- /* key: 0x5bdf */ 0x3b21,
- /* key: 0x5be0 */ 0xba64,
- /* key: 0x5be1 */ 0x3249,
- /* key: 0x5be2 */ 0x556a,
- /* key: 0x5be3 */ 0xffff,
- /* key: 0x5be4 */ 0x5568,
- /* key: 0x5be5 */ 0x556c,
- /* key: 0x5be6 */ 0x5569,
- /* key: 0x5be7 */ 0x472b,
- /* key: 0x5be8 */ 0x5c4d,
- /* key: 0x5be9 */ 0x3f33,
- /* key: 0x5bea */ 0xffff,
- /* key: 0x5beb */ 0x556d,
- /* key: 0x5bec */ 0xffff,
- /* key: 0x5bed */ 0xffff,
- /* key: 0x5bee */ 0x4e40,
- /* key: 0x5bef */ 0xba65,
- /* key: 0x5bf0 */ 0x556e,
- /* key: 0x5bf1 */ 0xba66,
- /* key: 0x5bf2 */ 0xffff,
- /* key: 0x5bf3 */ 0x5570,
- /* key: 0x5bf4 */ 0xba67,
- /* key: 0x5bf5 */ 0x437e,
- /* key: 0x5bf6 */ 0x556f,
- /* key: 0x5bf7 */ 0xffff,
- /* key: 0x5bf8 */ 0x4023,
- /* key: 0x5bf9 */ 0xffff,
- /* key: 0x5bfa */ 0x3b7b,
- /* key: 0x5bfb */ 0xffff,
- /* key: 0x5bfc */ 0xffff,
- /* key: 0x5bfd */ 0xba68,
- /* key: 0x5bfe */ 0x4250,
- /* key: 0x5bff */ 0x3c77,
- /* branch: 0x5c0X */ 5408,
- /* branch: 0x5c1X */ 5424,
- /* branch: 0x5c2X */ 5440,
- /* branch: 0x5c3X */ 5456,
- /* branch: 0x5c4X */ 5472,
- /* branch: 0x5c5X */ 5488,
- /* branch: 0x5c6X */ 5504,
- /* branch: 0x5c7X */ 5520,
- /* branch: 0x5c8X */ 5536,
- /* branch: 0x5c9X */ 5552,
- /* branch: 0x5caX */ 5568,
- /* branch: 0x5cbX */ 5584,
- /* branch: 0x5ccX */ 5600,
- /* branch: 0x5cdX */ 5616,
- /* branch: 0x5ceX */ 5632,
- /* branch: 0x5cfX */ 5648,
- /* key: 0x5c00 */ 0xffff,
- /* key: 0x5c01 */ 0x4975,
- /* key: 0x5c02 */ 0x406c,
- /* key: 0x5c03 */ 0xffff,
- /* key: 0x5c04 */ 0x3c4d,
- /* key: 0x5c05 */ 0x5571,
- /* key: 0x5c06 */ 0x3e2d,
- /* key: 0x5c07 */ 0x5572,
- /* key: 0x5c08 */ 0x5573,
- /* key: 0x5c09 */ 0x3053,
- /* key: 0x5c0a */ 0x423a,
- /* key: 0x5c0b */ 0x3f52,
- /* key: 0x5c0c */ 0xba69,
- /* key: 0x5c0d */ 0x5574,
- /* key: 0x5c0e */ 0x4633,
- /* key: 0x5c0f */ 0x3e2e,
- /* key: 0x5c10 */ 0xffff,
- /* key: 0x5c11 */ 0x3e2f,
- /* key: 0x5c12 */ 0xffff,
- /* key: 0x5c13 */ 0x5575,
- /* key: 0x5c14 */ 0xffff,
- /* key: 0x5c15 */ 0xffff,
- /* key: 0x5c16 */ 0x406d,
- /* key: 0x5c17 */ 0xba6a,
- /* key: 0x5c18 */ 0xffff,
- /* key: 0x5c19 */ 0xffff,
- /* key: 0x5c1a */ 0x3e30,
- /* key: 0x5c1b */ 0xffff,
- /* key: 0x5c1c */ 0xffff,
- /* key: 0x5c1d */ 0xffff,
- /* key: 0x5c1e */ 0xba6b,
- /* key: 0x5c1f */ 0xba6c,
- /* key: 0x5c20 */ 0x5576,
- /* key: 0x5c21 */ 0xffff,
- /* key: 0x5c22 */ 0x5577,
- /* key: 0x5c23 */ 0xba6d,
- /* key: 0x5c24 */ 0x4c60,
- /* key: 0x5c25 */ 0xffff,
- /* key: 0x5c26 */ 0xba6e,
- /* key: 0x5c27 */ 0xffff,
- /* key: 0x5c28 */ 0x5578,
- /* key: 0x5c29 */ 0xba6f,
- /* key: 0x5c2a */ 0xffff,
- /* key: 0x5c2b */ 0xba70,
- /* key: 0x5c2c */ 0xba71,
- /* key: 0x5c2d */ 0x3646,
- /* key: 0x5c2e */ 0xba72,
- /* key: 0x5c2f */ 0xffff,
- /* key: 0x5c30 */ 0xba73,
- /* key: 0x5c31 */ 0x3d22,
- /* key: 0x5c32 */ 0xba74,
- /* key: 0x5c33 */ 0xffff,
- /* key: 0x5c34 */ 0xffff,
- /* key: 0x5c35 */ 0xba75,
- /* key: 0x5c36 */ 0xba76,
- /* key: 0x5c37 */ 0xffff,
- /* key: 0x5c38 */ 0x5579,
- /* key: 0x5c39 */ 0x557a,
- /* key: 0x5c3a */ 0x3c5c,
- /* key: 0x5c3b */ 0x3f2c,
- /* key: 0x5c3c */ 0x4674,
- /* key: 0x5c3d */ 0x3f54,
- /* key: 0x5c3e */ 0x4878,
- /* key: 0x5c3f */ 0x4722,
- /* key: 0x5c40 */ 0x3649,
- /* key: 0x5c41 */ 0x557b,
- /* key: 0x5c42 */ 0xffff,
- /* key: 0x5c43 */ 0xffff,
- /* key: 0x5c44 */ 0xffff,
- /* key: 0x5c45 */ 0x356f,
- /* key: 0x5c46 */ 0x557c,
- /* key: 0x5c47 */ 0xffff,
- /* key: 0x5c48 */ 0x367e,
- /* key: 0x5c49 */ 0xffff,
- /* key: 0x5c4a */ 0x464f,
- /* key: 0x5c4b */ 0x3230,
- /* key: 0x5c4c */ 0xffff,
- /* key: 0x5c4d */ 0x3b53,
- /* key: 0x5c4e */ 0x557d,
- /* key: 0x5c4f */ 0x5622,
- /* key: 0x5c50 */ 0x5621,
- /* key: 0x5c51 */ 0x367d,
- /* key: 0x5c52 */ 0xffff,
- /* key: 0x5c53 */ 0x557e,
- /* key: 0x5c54 */ 0xffff,
- /* key: 0x5c55 */ 0x4538,
- /* key: 0x5c56 */ 0xffff,
- /* key: 0x5c57 */ 0xffff,
- /* key: 0x5c58 */ 0xffff,
- /* key: 0x5c59 */ 0xba77,
- /* key: 0x5c5a */ 0xba78,
- /* key: 0x5c5b */ 0xffff,
- /* key: 0x5c5c */ 0xba79,
- /* key: 0x5c5d */ 0xffff,
- /* key: 0x5c5e */ 0x4230,
- /* key: 0x5c5f */ 0xffff,
- /* key: 0x5c60 */ 0x454b,
- /* key: 0x5c61 */ 0x3c48,
- /* key: 0x5c62 */ 0xba7a,
- /* key: 0x5c63 */ 0xba7b,
- /* key: 0x5c64 */ 0x4158,
- /* key: 0x5c65 */ 0x4d7a,
- /* key: 0x5c66 */ 0xffff,
- /* key: 0x5c67 */ 0xba7c,
- /* key: 0x5c68 */ 0xba7d,
- /* key: 0x5c69 */ 0xba7e,
- /* key: 0x5c6a */ 0xffff,
- /* key: 0x5c6b */ 0xffff,
- /* key: 0x5c6c */ 0x5624,
- /* key: 0x5c6d */ 0xbb21,
- /* key: 0x5c6e */ 0x5625,
- /* key: 0x5c6f */ 0x4656,
- /* key: 0x5c70 */ 0xbb22,
- /* key: 0x5c71 */ 0x3b33,
- /* key: 0x5c72 */ 0xffff,
- /* key: 0x5c73 */ 0xffff,
- /* key: 0x5c74 */ 0xbb23,
- /* key: 0x5c75 */ 0xbb24,
- /* key: 0x5c76 */ 0x5627,
- /* key: 0x5c77 */ 0xffff,
- /* key: 0x5c78 */ 0xffff,
- /* key: 0x5c79 */ 0x5628,
- /* key: 0x5c7a */ 0xbb25,
- /* key: 0x5c7b */ 0xbb26,
- /* key: 0x5c7c */ 0xbb27,
- /* key: 0x5c7d */ 0xbb28,
- /* key: 0x5c7e */ 0xffff,
- /* key: 0x5c7f */ 0xffff,
- /* key: 0x5c80 */ 0xffff,
- /* key: 0x5c81 */ 0xffff,
- /* key: 0x5c82 */ 0xffff,
- /* key: 0x5c83 */ 0xffff,
- /* key: 0x5c84 */ 0xffff,
- /* key: 0x5c85 */ 0xffff,
- /* key: 0x5c86 */ 0xffff,
- /* key: 0x5c87 */ 0xbb29,
- /* key: 0x5c88 */ 0xbb2a,
- /* key: 0x5c89 */ 0xffff,
- /* key: 0x5c8a */ 0xbb2b,
- /* key: 0x5c8b */ 0xffff,
- /* key: 0x5c8c */ 0x5629,
- /* key: 0x5c8d */ 0xffff,
- /* key: 0x5c8e */ 0xffff,
- /* key: 0x5c8f */ 0xbb2c,
- /* key: 0x5c90 */ 0x3474,
- /* key: 0x5c91 */ 0x562a,
- /* key: 0x5c92 */ 0xbb2d,
- /* key: 0x5c93 */ 0xffff,
- /* key: 0x5c94 */ 0x562b,
- /* key: 0x5c95 */ 0xffff,
- /* key: 0x5c96 */ 0xffff,
- /* key: 0x5c97 */ 0xffff,
- /* key: 0x5c98 */ 0xffff,
- /* key: 0x5c99 */ 0xffff,
- /* key: 0x5c9a */ 0xffff,
- /* key: 0x5c9b */ 0xffff,
- /* key: 0x5c9c */ 0xffff,
- /* key: 0x5c9d */ 0xbb2e,
- /* key: 0x5c9e */ 0xffff,
- /* key: 0x5c9f */ 0xbb2f,
- /* key: 0x5ca0 */ 0xbb30,
- /* key: 0x5ca1 */ 0x322c,
- /* key: 0x5ca2 */ 0xbb31,
- /* key: 0x5ca3 */ 0xbb32,
- /* key: 0x5ca4 */ 0xffff,
- /* key: 0x5ca5 */ 0xffff,
- /* key: 0x5ca6 */ 0xbb33,
- /* key: 0x5ca7 */ 0xffff,
- /* key: 0x5ca8 */ 0x413b,
- /* key: 0x5ca9 */ 0x3464,
- /* key: 0x5caa */ 0xbb34,
- /* key: 0x5cab */ 0x562d,
- /* key: 0x5cac */ 0x4c28,
- /* key: 0x5cad */ 0xffff,
- /* key: 0x5cae */ 0xffff,
- /* key: 0x5caf */ 0xffff,
- /* key: 0x5cb0 */ 0xffff,
- /* key: 0x5cb1 */ 0x4252,
- /* key: 0x5cb2 */ 0xbb35,
- /* key: 0x5cb3 */ 0x3359,
- /* key: 0x5cb4 */ 0xbb36,
- /* key: 0x5cb5 */ 0xbb37,
- /* key: 0x5cb6 */ 0x562f,
- /* key: 0x5cb7 */ 0x5631,
- /* key: 0x5cb8 */ 0x345f,
- /* key: 0x5cb9 */ 0xffff,
- /* key: 0x5cba */ 0xbb38,
- /* key: 0x5cbb */ 0x562e,
- /* key: 0x5cbc */ 0x5630,
- /* key: 0x5cbd */ 0xffff,
- /* key: 0x5cbe */ 0x5633,
- /* key: 0x5cbf */ 0xffff,
- /* key: 0x5cc0 */ 0xffff,
- /* key: 0x5cc1 */ 0xffff,
- /* key: 0x5cc2 */ 0xffff,
- /* key: 0x5cc3 */ 0xffff,
- /* key: 0x5cc4 */ 0xffff,
- /* key: 0x5cc5 */ 0x5632,
- /* key: 0x5cc6 */ 0xffff,
- /* key: 0x5cc7 */ 0x5634,
- /* key: 0x5cc8 */ 0xffff,
- /* key: 0x5cc9 */ 0xbb39,
- /* key: 0x5cca */ 0xffff,
- /* key: 0x5ccb */ 0xbb3a,
- /* key: 0x5ccc */ 0xffff,
- /* key: 0x5ccd */ 0xffff,
- /* key: 0x5cce */ 0xffff,
- /* key: 0x5ccf */ 0xffff,
- /* key: 0x5cd0 */ 0xffff,
- /* key: 0x5cd1 */ 0xffff,
- /* key: 0x5cd2 */ 0xbb3b,
- /* key: 0x5cd3 */ 0xffff,
- /* key: 0x5cd4 */ 0xffff,
- /* key: 0x5cd5 */ 0xffff,
- /* key: 0x5cd6 */ 0xffff,
- /* key: 0x5cd7 */ 0xbb3d,
- /* key: 0x5cd8 */ 0xffff,
- /* key: 0x5cd9 */ 0x5635,
- /* key: 0x5cda */ 0xffff,
- /* key: 0x5cdb */ 0xffff,
- /* key: 0x5cdc */ 0xffff,
- /* key: 0x5cdd */ 0xbb3c,
- /* key: 0x5cde */ 0xffff,
- /* key: 0x5cdf */ 0xffff,
- /* key: 0x5ce0 */ 0x463d,
- /* key: 0x5ce1 */ 0x362e,
- /* key: 0x5ce2 */ 0xffff,
- /* key: 0x5ce3 */ 0xffff,
- /* key: 0x5ce4 */ 0xffff,
- /* key: 0x5ce5 */ 0xffff,
- /* key: 0x5ce6 */ 0xffff,
- /* key: 0x5ce7 */ 0xffff,
- /* key: 0x5ce8 */ 0x3265,
- /* key: 0x5ce9 */ 0x5636,
- /* key: 0x5cea */ 0x563b,
- /* key: 0x5ceb */ 0xffff,
- /* key: 0x5cec */ 0xffff,
- /* key: 0x5ced */ 0x5639,
- /* key: 0x5cee */ 0xbb3e,
- /* key: 0x5cef */ 0x4a77,
- /* key: 0x5cf0 */ 0x4a76,
- /* key: 0x5cf1 */ 0xbb3f,
- /* key: 0x5cf2 */ 0xbb40,
- /* key: 0x5cf3 */ 0xffff,
- /* key: 0x5cf4 */ 0xbb41,
- /* key: 0x5cf5 */ 0xffff,
- /* key: 0x5cf6 */ 0x4567,
- /* key: 0x5cf7 */ 0xffff,
- /* key: 0x5cf8 */ 0xffff,
- /* key: 0x5cf9 */ 0xffff,
- /* key: 0x5cfa */ 0x5638,
- /* key: 0x5cfb */ 0x3d54,
- /* key: 0x5cfc */ 0xffff,
- /* key: 0x5cfd */ 0x5637,
- /* key: 0x5cfe */ 0xffff,
- /* key: 0x5cff */ 0xffff,
- /* branch: 0x5d0X */ 5680,
- /* branch: 0x5d1X */ 5696,
- /* branch: 0x5d2X */ 5712,
- /* branch: 0x5d3X */ 5728,
- /* branch: 0x5d4X */ 5744,
- /* branch: 0x5d5X */ 5760,
- /* branch: 0x5d6X */ 5776,
- /* branch: 0x5d7X */ 5792,
- /* branch: 0x5d8X */ 5808,
- /* branch: 0x5d9X */ 5824,
- /* branch: 0x5daX */ 5840,
- /* branch: 0x5dbX */ 5856,
- /* branch: 0x5dcX */ 5872,
- /* branch: 0x5ddX */ 5888,
- /* branch: 0x5deX */ 5904,
- /* branch: 0x5dfX */ 5920,
- /* key: 0x5d00 */ 0xffff,
- /* key: 0x5d01 */ 0xbb42,
- /* key: 0x5d02 */ 0xffff,
- /* key: 0x5d03 */ 0xffff,
- /* key: 0x5d04 */ 0xffff,
- /* key: 0x5d05 */ 0xffff,
- /* key: 0x5d06 */ 0xbb43,
- /* key: 0x5d07 */ 0x3f72,
- /* key: 0x5d08 */ 0xffff,
- /* key: 0x5d09 */ 0xffff,
- /* key: 0x5d0a */ 0xffff,
- /* key: 0x5d0b */ 0x563c,
- /* key: 0x5d0c */ 0xffff,
- /* key: 0x5d0d */ 0xbb44,
- /* key: 0x5d0e */ 0x3a6a,
- /* key: 0x5d0f */ 0xffff,
- /* key: 0x5d10 */ 0xffff,
- /* key: 0x5d11 */ 0x5642,
- /* key: 0x5d12 */ 0xbb45,
- /* key: 0x5d13 */ 0xffff,
- /* key: 0x5d14 */ 0x5643,
- /* key: 0x5d15 */ 0x563d,
- /* key: 0x5d16 */ 0x3333,
- /* key: 0x5d17 */ 0x563e,
- /* key: 0x5d18 */ 0x5647,
- /* key: 0x5d19 */ 0x5646,
- /* key: 0x5d1a */ 0x5645,
- /* key: 0x5d1b */ 0x5641,
- /* key: 0x5d1c */ 0xffff,
- /* key: 0x5d1d */ 0xffff,
- /* key: 0x5d1e */ 0xffff,
- /* key: 0x5d1f */ 0x5640,
- /* key: 0x5d20 */ 0xffff,
- /* key: 0x5d21 */ 0xffff,
- /* key: 0x5d22 */ 0x5644,
- /* key: 0x5d23 */ 0xbb47,
- /* key: 0x5d24 */ 0xbb48,
- /* key: 0x5d25 */ 0xffff,
- /* key: 0x5d26 */ 0xbb49,
- /* key: 0x5d27 */ 0xbb4a,
- /* key: 0x5d28 */ 0xffff,
- /* key: 0x5d29 */ 0x4a78,
- /* key: 0x5d2a */ 0xffff,
- /* key: 0x5d2b */ 0xbb46,
- /* key: 0x5d2c */ 0xffff,
- /* key: 0x5d2d */ 0xffff,
- /* key: 0x5d2e */ 0xffff,
- /* key: 0x5d2f */ 0xffff,
- /* key: 0x5d30 */ 0xffff,
- /* key: 0x5d31 */ 0xbb4b,
- /* key: 0x5d32 */ 0xffff,
- /* key: 0x5d33 */ 0xffff,
- /* key: 0x5d34 */ 0xbb4c,
- /* key: 0x5d35 */ 0xffff,
- /* key: 0x5d36 */ 0xffff,
- /* key: 0x5d37 */ 0xffff,
- /* key: 0x5d38 */ 0xffff,
- /* key: 0x5d39 */ 0xbb4d,
- /* key: 0x5d3a */ 0xffff,
- /* key: 0x5d3b */ 0xffff,
- /* key: 0x5d3c */ 0xffff,
- /* key: 0x5d3d */ 0xbb4e,
- /* key: 0x5d3e */ 0xffff,
- /* key: 0x5d3f */ 0xbb4f,
- /* key: 0x5d40 */ 0xffff,
- /* key: 0x5d41 */ 0xffff,
- /* key: 0x5d42 */ 0xbb50,
- /* key: 0x5d43 */ 0xbb51,
- /* key: 0x5d44 */ 0xffff,
- /* key: 0x5d45 */ 0xffff,
- /* key: 0x5d46 */ 0xbb52,
- /* key: 0x5d47 */ 0xffff,
- /* key: 0x5d48 */ 0xbb53,
- /* key: 0x5d49 */ 0xffff,
- /* key: 0x5d4a */ 0xbb57,
- /* key: 0x5d4b */ 0x564b,
- /* key: 0x5d4c */ 0x5648,
- /* key: 0x5d4d */ 0xffff,
- /* key: 0x5d4e */ 0x564a,
- /* key: 0x5d4f */ 0xffff,
- /* key: 0x5d50 */ 0x4d72,
- /* key: 0x5d51 */ 0xbb55,
- /* key: 0x5d52 */ 0x5649,
- /* key: 0x5d53 */ 0xffff,
- /* key: 0x5d54 */ 0xffff,
- /* key: 0x5d55 */ 0xbb54,
- /* key: 0x5d56 */ 0xffff,
- /* key: 0x5d57 */ 0xffff,
- /* key: 0x5d58 */ 0xffff,
- /* key: 0x5d59 */ 0xbb56,
- /* key: 0x5d5a */ 0xffff,
- /* key: 0x5d5b */ 0xffff,
- /* key: 0x5d5c */ 0x563f,
- /* key: 0x5d5d */ 0xffff,
- /* key: 0x5d5e */ 0xffff,
- /* key: 0x5d5f */ 0xbb58,
- /* key: 0x5d60 */ 0xbb59,
- /* key: 0x5d61 */ 0xbb5a,
- /* key: 0x5d62 */ 0xbb5b,
- /* key: 0x5d63 */ 0xffff,
- /* key: 0x5d64 */ 0xbb5c,
- /* key: 0x5d65 */ 0xffff,
- /* key: 0x5d66 */ 0xffff,
- /* key: 0x5d67 */ 0xffff,
- /* key: 0x5d68 */ 0xffff,
- /* key: 0x5d69 */ 0x3f73,
- /* key: 0x5d6a */ 0xbb5d,
- /* key: 0x5d6b */ 0xffff,
- /* key: 0x5d6c */ 0x564c,
- /* key: 0x5d6d */ 0xbb5e,
- /* key: 0x5d6e */ 0xffff,
- /* key: 0x5d6f */ 0x3a37,
- /* key: 0x5d70 */ 0xbb5f,
- /* key: 0x5d71 */ 0xffff,
- /* key: 0x5d72 */ 0xffff,
- /* key: 0x5d73 */ 0x564d,
- /* key: 0x5d74 */ 0xffff,
- /* key: 0x5d75 */ 0xffff,
- /* key: 0x5d76 */ 0x564e,
- /* key: 0x5d77 */ 0xffff,
- /* key: 0x5d78 */ 0xffff,
- /* key: 0x5d79 */ 0xbb60,
- /* key: 0x5d7a */ 0xbb61,
- /* key: 0x5d7b */ 0xffff,
- /* key: 0x5d7c */ 0xffff,
- /* key: 0x5d7d */ 0xffff,
- /* key: 0x5d7e */ 0xbb62,
- /* key: 0x5d7f */ 0xbb63,
- /* key: 0x5d80 */ 0xffff,
- /* key: 0x5d81 */ 0xbb64,
- /* key: 0x5d82 */ 0x5651,
- /* key: 0x5d83 */ 0xbb65,
- /* key: 0x5d84 */ 0x5650,
- /* key: 0x5d85 */ 0xffff,
- /* key: 0x5d86 */ 0xffff,
- /* key: 0x5d87 */ 0x564f,
- /* key: 0x5d88 */ 0xbb66,
- /* key: 0x5d89 */ 0xffff,
- /* key: 0x5d8a */ 0xbb67,
- /* key: 0x5d8b */ 0x4568,
- /* key: 0x5d8c */ 0x563a,
- /* key: 0x5d8d */ 0xffff,
- /* key: 0x5d8e */ 0xffff,
- /* key: 0x5d8f */ 0xffff,
- /* key: 0x5d90 */ 0x5657,
- /* key: 0x5d91 */ 0xffff,
- /* key: 0x5d92 */ 0xbb68,
- /* key: 0x5d93 */ 0xbb69,
- /* key: 0x5d94 */ 0xbb6a,
- /* key: 0x5d95 */ 0xbb6b,
- /* key: 0x5d96 */ 0xffff,
- /* key: 0x5d97 */ 0xffff,
- /* key: 0x5d98 */ 0xffff,
- /* key: 0x5d99 */ 0xbb6c,
- /* key: 0x5d9a */ 0xffff,
- /* key: 0x5d9b */ 0xbb6d,
- /* key: 0x5d9c */ 0xffff,
- /* key: 0x5d9d */ 0x5653,
- /* key: 0x5d9e */ 0xffff,
- /* key: 0x5d9f */ 0xbb6e,
- /* key: 0x5da0 */ 0xbb6f,
- /* key: 0x5da1 */ 0xffff,
- /* key: 0x5da2 */ 0x5652,
- /* key: 0x5da3 */ 0xffff,
- /* key: 0x5da4 */ 0xffff,
- /* key: 0x5da5 */ 0xffff,
- /* key: 0x5da6 */ 0xffff,
- /* key: 0x5da7 */ 0xbb70,
- /* key: 0x5da8 */ 0xffff,
- /* key: 0x5da9 */ 0xffff,
- /* key: 0x5daa */ 0xffff,
- /* key: 0x5dab */ 0xbb71,
- /* key: 0x5dac */ 0x5654,
- /* key: 0x5dad */ 0xffff,
- /* key: 0x5dae */ 0x5655,
- /* key: 0x5daf */ 0xffff,
- /* key: 0x5db0 */ 0xbb72,
- /* key: 0x5db1 */ 0xffff,
- /* key: 0x5db2 */ 0xe674,
- /* key: 0x5db3 */ 0xffff,
- /* key: 0x5db4 */ 0xbb73,
- /* key: 0x5db5 */ 0xffff,
- /* key: 0x5db6 */ 0xffff,
- /* key: 0x5db7 */ 0x5658,
- /* key: 0x5db8 */ 0xbb74,
- /* key: 0x5db9 */ 0xbb75,
- /* key: 0x5dba */ 0x4e66,
- /* key: 0x5dbb */ 0xffff,
- /* key: 0x5dbc */ 0x5659,
- /* key: 0x5dbd */ 0x5656,
- /* key: 0x5dbe */ 0xffff,
- /* key: 0x5dbf */ 0xffff,
- /* key: 0x5dc0 */ 0xffff,
- /* key: 0x5dc1 */ 0xffff,
- /* key: 0x5dc2 */ 0xffff,
- /* key: 0x5dc3 */ 0xbb76,
- /* key: 0x5dc4 */ 0xffff,
- /* key: 0x5dc5 */ 0xffff,
- /* key: 0x5dc6 */ 0xffff,
- /* key: 0x5dc7 */ 0xbb77,
- /* key: 0x5dc8 */ 0xffff,
- /* key: 0x5dc9 */ 0x565a,
- /* key: 0x5dca */ 0xffff,
- /* key: 0x5dcb */ 0xbb78,
- /* key: 0x5dcc */ 0x3460,
- /* key: 0x5dcd */ 0x565b,
- /* key: 0x5dce */ 0xbb7a,
- /* key: 0x5dcf */ 0xffff,
- /* key: 0x5dd0 */ 0xbb79,
- /* key: 0x5dd1 */ 0xffff,
- /* key: 0x5dd2 */ 0x565d,
- /* key: 0x5dd3 */ 0x565c,
- /* key: 0x5dd4 */ 0xffff,
- /* key: 0x5dd5 */ 0xffff,
- /* key: 0x5dd6 */ 0x565e,
- /* key: 0x5dd7 */ 0xffff,
- /* key: 0x5dd8 */ 0xbb7b,
- /* key: 0x5dd9 */ 0xbb7c,
- /* key: 0x5dda */ 0xffff,
- /* key: 0x5ddb */ 0x565f,
- /* key: 0x5ddc */ 0xffff,
- /* key: 0x5ddd */ 0x406e,
- /* key: 0x5dde */ 0x3d23,
- /* key: 0x5ddf */ 0xffff,
- /* key: 0x5de0 */ 0xbb7d,
- /* key: 0x5de1 */ 0x3d64,
- /* key: 0x5de2 */ 0xffff,
- /* key: 0x5de3 */ 0x4163,
- /* key: 0x5de4 */ 0xbb7e,
- /* key: 0x5de5 */ 0x3929,
- /* key: 0x5de6 */ 0x3a38,
- /* key: 0x5de7 */ 0x392a,
- /* key: 0x5de8 */ 0x3570,
- /* key: 0x5de9 */ 0xbc21,
- /* key: 0x5dea */ 0xffff,
- /* key: 0x5deb */ 0x5660,
- /* key: 0x5dec */ 0xffff,
- /* key: 0x5ded */ 0xffff,
- /* key: 0x5dee */ 0x3a39,
- /* key: 0x5def */ 0xffff,
- /* key: 0x5df0 */ 0xffff,
- /* key: 0x5df1 */ 0x384a,
- /* key: 0x5df2 */ 0x5661,
- /* key: 0x5df3 */ 0x4c26,
- /* key: 0x5df4 */ 0x4743,
- /* key: 0x5df5 */ 0x5662,
- /* key: 0x5df6 */ 0xffff,
- /* key: 0x5df7 */ 0x392b,
- /* key: 0x5df8 */ 0xbc22,
- /* key: 0x5df9 */ 0xbc23,
- /* key: 0x5dfa */ 0xffff,
- /* key: 0x5dfb */ 0x342c,
- /* key: 0x5dfc */ 0xffff,
- /* key: 0x5dfd */ 0x4327,
- /* key: 0x5dfe */ 0x3652,
- /* key: 0x5dff */ 0xffff,
- /* branch: 0x5e0X */ 5952,
- /* branch: 0x5e1X */ 5968,
- /* branch: 0x5e2X */ 5984,
- /* branch: 0x5e3X */ 6000,
- /* branch: 0x5e4X */ 6016,
- /* branch: 0x5e5X */ 6032,
- /* branch: 0x5e6X */ 6048,
- /* branch: 0x5e7X */ 6064,
- /* branch: 0x5e8X */ 6080,
- /* branch: 0x5e9X */ 6096,
- /* branch: 0x5eaX */ 6112,
- /* branch: 0x5ebX */ 6128,
- /* branch: 0x5ecX */ 6144,
- /* branch: 0x5edX */ 6160,
- /* branch: 0x5eeX */ 6176,
- /* branch: 0x5efX */ 6192,
- /* key: 0x5e00 */ 0xbc24,
- /* key: 0x5e01 */ 0xffff,
- /* key: 0x5e02 */ 0x3b54,
- /* key: 0x5e03 */ 0x495b,
- /* key: 0x5e04 */ 0xffff,
- /* key: 0x5e05 */ 0xffff,
- /* key: 0x5e06 */ 0x4841,
- /* key: 0x5e07 */ 0xbc25,
- /* key: 0x5e08 */ 0xffff,
- /* key: 0x5e09 */ 0xffff,
- /* key: 0x5e0a */ 0xffff,
- /* key: 0x5e0b */ 0x5663,
- /* key: 0x5e0c */ 0x3475,
- /* key: 0x5e0d */ 0xbc26,
- /* key: 0x5e0e */ 0xffff,
- /* key: 0x5e0f */ 0xffff,
- /* key: 0x5e10 */ 0xffff,
- /* key: 0x5e11 */ 0x5666,
- /* key: 0x5e12 */ 0xbc27,
- /* key: 0x5e13 */ 0xffff,
- /* key: 0x5e14 */ 0xbc28,
- /* key: 0x5e15 */ 0xbc29,
- /* key: 0x5e16 */ 0x4421,
- /* key: 0x5e17 */ 0xffff,
- /* key: 0x5e18 */ 0xbc2a,
- /* key: 0x5e19 */ 0x5665,
- /* key: 0x5e1a */ 0x5664,
- /* key: 0x5e1b */ 0x5667,
- /* key: 0x5e1c */ 0xffff,
- /* key: 0x5e1d */ 0x446b,
- /* key: 0x5e1e */ 0xffff,
- /* key: 0x5e1f */ 0xbc2b,
- /* key: 0x5e20 */ 0xbc2c,
- /* key: 0x5e21 */ 0xffff,
- /* key: 0x5e22 */ 0xffff,
- /* key: 0x5e23 */ 0xffff,
- /* key: 0x5e24 */ 0xffff,
- /* key: 0x5e25 */ 0x3f63,
- /* key: 0x5e26 */ 0xffff,
- /* key: 0x5e27 */ 0xffff,
- /* key: 0x5e28 */ 0xbc2e,
- /* key: 0x5e29 */ 0xffff,
- /* key: 0x5e2a */ 0xffff,
- /* key: 0x5e2b */ 0x3b55,
- /* key: 0x5e2c */ 0xffff,
- /* key: 0x5e2d */ 0x404a,
- /* key: 0x5e2e */ 0xbc2d,
- /* key: 0x5e2f */ 0x4253,
- /* key: 0x5e30 */ 0x3522,
- /* key: 0x5e31 */ 0xffff,
- /* key: 0x5e32 */ 0xbc2f,
- /* key: 0x5e33 */ 0x4422,
- /* key: 0x5e34 */ 0xffff,
- /* key: 0x5e35 */ 0xbc30,
- /* key: 0x5e36 */ 0x5668,
- /* key: 0x5e37 */ 0x5669,
- /* key: 0x5e38 */ 0x3e6f,
- /* key: 0x5e39 */ 0xffff,
- /* key: 0x5e3a */ 0xffff,
- /* key: 0x5e3b */ 0xffff,
- /* key: 0x5e3c */ 0xffff,
- /* key: 0x5e3d */ 0x4b39,
- /* key: 0x5e3e */ 0xbc31,
- /* key: 0x5e3f */ 0xffff,
- /* key: 0x5e40 */ 0x566c,
- /* key: 0x5e41 */ 0xffff,
- /* key: 0x5e42 */ 0xffff,
- /* key: 0x5e43 */ 0x566b,
- /* key: 0x5e44 */ 0x566a,
- /* key: 0x5e45 */ 0x497d,
- /* key: 0x5e46 */ 0xffff,
- /* key: 0x5e47 */ 0x5673,
- /* key: 0x5e48 */ 0xffff,
- /* key: 0x5e49 */ 0xbc34,
- /* key: 0x5e4a */ 0xffff,
- /* key: 0x5e4b */ 0xbc32,
- /* key: 0x5e4c */ 0x4b5a,
- /* key: 0x5e4d */ 0xffff,
- /* key: 0x5e4e */ 0x566d,
- /* key: 0x5e4f */ 0xffff,
- /* key: 0x5e50 */ 0xbc33,
- /* key: 0x5e51 */ 0xbc35,
- /* key: 0x5e52 */ 0xffff,
- /* key: 0x5e53 */ 0xffff,
- /* key: 0x5e54 */ 0x566f,
- /* key: 0x5e55 */ 0x4b6b,
- /* key: 0x5e56 */ 0xbc36,
- /* key: 0x5e57 */ 0x566e,
- /* key: 0x5e58 */ 0xbc37,
- /* key: 0x5e59 */ 0xffff,
- /* key: 0x5e5a */ 0xffff,
- /* key: 0x5e5b */ 0xbc38,
- /* key: 0x5e5c */ 0xbc39,
- /* key: 0x5e5d */ 0xffff,
- /* key: 0x5e5e */ 0xbc3a,
- /* key: 0x5e5f */ 0x5670,
- /* key: 0x5e60 */ 0xffff,
- /* key: 0x5e61 */ 0x4828,
- /* key: 0x5e62 */ 0x5671,
- /* key: 0x5e63 */ 0x4a3e,
- /* key: 0x5e64 */ 0x5672,
- /* key: 0x5e65 */ 0xffff,
- /* key: 0x5e66 */ 0xffff,
- /* key: 0x5e67 */ 0xffff,
- /* key: 0x5e68 */ 0xbc3b,
- /* key: 0x5e69 */ 0xffff,
- /* key: 0x5e6a */ 0xbc3c,
- /* key: 0x5e6b */ 0xbc3d,
- /* key: 0x5e6c */ 0xbc3e,
- /* key: 0x5e6d */ 0xbc3f,
- /* key: 0x5e6e */ 0xbc40,
- /* key: 0x5e6f */ 0xffff,
- /* key: 0x5e70 */ 0xbc41,
- /* key: 0x5e71 */ 0xffff,
- /* key: 0x5e72 */ 0x3433,
- /* key: 0x5e73 */ 0x4a3f,
- /* key: 0x5e74 */ 0x472f,
- /* key: 0x5e75 */ 0x5674,
- /* key: 0x5e76 */ 0x5675,
- /* key: 0x5e77 */ 0xffff,
- /* key: 0x5e78 */ 0x392c,
- /* key: 0x5e79 */ 0x3434,
- /* key: 0x5e7a */ 0x5676,
- /* key: 0x5e7b */ 0x3838,
- /* key: 0x5e7c */ 0x4d44,
- /* key: 0x5e7d */ 0x4d29,
- /* key: 0x5e7e */ 0x3476,
- /* key: 0x5e7f */ 0x5678,
- /* key: 0x5e80 */ 0xbc42,
- /* key: 0x5e81 */ 0x4423,
- /* key: 0x5e82 */ 0xffff,
- /* key: 0x5e83 */ 0x392d,
- /* key: 0x5e84 */ 0x3e31,
- /* key: 0x5e85 */ 0xffff,
- /* key: 0x5e86 */ 0xffff,
- /* key: 0x5e87 */ 0x485f,
- /* key: 0x5e88 */ 0xffff,
- /* key: 0x5e89 */ 0xffff,
- /* key: 0x5e8a */ 0x3e32,
- /* key: 0x5e8b */ 0xbc43,
- /* key: 0x5e8c */ 0xffff,
- /* key: 0x5e8d */ 0xffff,
- /* key: 0x5e8e */ 0xbc44,
- /* key: 0x5e8f */ 0x3d78,
- /* key: 0x5e90 */ 0xffff,
- /* key: 0x5e91 */ 0xffff,
- /* key: 0x5e92 */ 0xffff,
- /* key: 0x5e93 */ 0xffff,
- /* key: 0x5e94 */ 0xffff,
- /* key: 0x5e95 */ 0x446c,
- /* key: 0x5e96 */ 0x4a79,
- /* key: 0x5e97 */ 0x4539,
- /* key: 0x5e98 */ 0xffff,
- /* key: 0x5e99 */ 0xffff,
- /* key: 0x5e9a */ 0x392e,
- /* key: 0x5e9b */ 0xffff,
- /* key: 0x5e9c */ 0x495c,
- /* key: 0x5e9d */ 0xffff,
- /* key: 0x5e9e */ 0xffff,
- /* key: 0x5e9f */ 0xffff,
- /* key: 0x5ea0 */ 0x5679,
- /* key: 0x5ea1 */ 0xffff,
- /* key: 0x5ea2 */ 0xbc45,
- /* key: 0x5ea3 */ 0xffff,
- /* key: 0x5ea4 */ 0xbc46,
- /* key: 0x5ea5 */ 0xbc47,
- /* key: 0x5ea6 */ 0x4559,
- /* key: 0x5ea7 */ 0x3a42,
- /* key: 0x5ea8 */ 0xbc48,
- /* key: 0x5ea9 */ 0xffff,
- /* key: 0x5eaa */ 0xbc49,
- /* key: 0x5eab */ 0x384b,
- /* key: 0x5eac */ 0xbc4a,
- /* key: 0x5ead */ 0x446d,
- /* key: 0x5eae */ 0xffff,
- /* key: 0x5eaf */ 0xffff,
- /* key: 0x5eb0 */ 0xffff,
- /* key: 0x5eb1 */ 0xbc4b,
- /* key: 0x5eb2 */ 0xffff,
- /* key: 0x5eb3 */ 0xbc4c,
- /* key: 0x5eb4 */ 0xffff,
- /* key: 0x5eb5 */ 0x3043,
- /* key: 0x5eb6 */ 0x3d6e,
- /* key: 0x5eb7 */ 0x392f,
- /* key: 0x5eb8 */ 0x4d47,
- /* key: 0x5eb9 */ 0xffff,
- /* key: 0x5eba */ 0xffff,
- /* key: 0x5ebb */ 0xffff,
- /* key: 0x5ebc */ 0xffff,
- /* key: 0x5ebd */ 0xbc4d,
- /* key: 0x5ebe */ 0xbc4e,
- /* key: 0x5ebf */ 0xbc4f,
- /* key: 0x5ec0 */ 0xffff,
- /* key: 0x5ec1 */ 0x567a,
- /* key: 0x5ec2 */ 0x567b,
- /* key: 0x5ec3 */ 0x4751,
- /* key: 0x5ec4 */ 0xffff,
- /* key: 0x5ec5 */ 0xffff,
- /* key: 0x5ec6 */ 0xbc50,
- /* key: 0x5ec7 */ 0xffff,
- /* key: 0x5ec8 */ 0x567c,
- /* key: 0x5ec9 */ 0x4e77,
- /* key: 0x5eca */ 0x4f2d,
- /* key: 0x5ecb */ 0xbc52,
- /* key: 0x5ecc */ 0xbc51,
- /* key: 0x5ecd */ 0xffff,
- /* key: 0x5ece */ 0xbc53,
- /* key: 0x5ecf */ 0x567e,
- /* key: 0x5ed0 */ 0x567d,
- /* key: 0x5ed1 */ 0xbc54,
- /* key: 0x5ed2 */ 0xbc55,
- /* key: 0x5ed3 */ 0x3347,
- /* key: 0x5ed4 */ 0xbc56,
- /* key: 0x5ed5 */ 0xbc57,
- /* key: 0x5ed6 */ 0x5721,
- /* key: 0x5ed7 */ 0xffff,
- /* key: 0x5ed8 */ 0xffff,
- /* key: 0x5ed9 */ 0xffff,
- /* key: 0x5eda */ 0x5724,
- /* key: 0x5edb */ 0x5725,
- /* key: 0x5edc */ 0xbc58,
- /* key: 0x5edd */ 0x5723,
- /* key: 0x5ede */ 0xbc59,
- /* key: 0x5edf */ 0x4940,
- /* key: 0x5ee0 */ 0x3e33,
- /* key: 0x5ee1 */ 0x5727,
- /* key: 0x5ee2 */ 0x5726,
- /* key: 0x5ee3 */ 0x5722,
- /* key: 0x5ee4 */ 0xffff,
- /* key: 0x5ee5 */ 0xbc5a,
- /* key: 0x5ee6 */ 0xffff,
- /* key: 0x5ee7 */ 0xffff,
- /* key: 0x5ee8 */ 0x5728,
- /* key: 0x5ee9 */ 0x5729,
- /* key: 0x5eea */ 0xffff,
- /* key: 0x5eeb */ 0xbc5b,
- /* key: 0x5eec */ 0x572a,
- /* key: 0x5eed */ 0xffff,
- /* key: 0x5eee */ 0xffff,
- /* key: 0x5eef */ 0xffff,
- /* key: 0x5ef0 */ 0x572d,
- /* key: 0x5ef1 */ 0x572b,
- /* key: 0x5ef2 */ 0xffff,
- /* key: 0x5ef3 */ 0x572c,
- /* key: 0x5ef4 */ 0x572e,
- /* key: 0x5ef5 */ 0xffff,
- /* key: 0x5ef6 */ 0x3164,
- /* key: 0x5ef7 */ 0x446e,
- /* key: 0x5ef8 */ 0x572f,
- /* key: 0x5ef9 */ 0xffff,
- /* key: 0x5efa */ 0x377a,
- /* key: 0x5efb */ 0x3276,
- /* key: 0x5efc */ 0x4736,
- /* key: 0x5efd */ 0xffff,
- /* key: 0x5efe */ 0x5730,
- /* key: 0x5eff */ 0x467b,
- /* branch: 0x5f0X */ 6224,
- /* branch: 0x5f1X */ 6240,
- /* branch: 0x5f2X */ 6256,
- /* branch: 0x5f3X */ 6272,
- /* branch: 0x5f4X */ 6288,
- /* branch: 0x5f5X */ 6304,
- /* branch: 0x5f6X */ 6320,
- /* branch: 0x5f7X */ 6336,
- /* branch: 0x5f8X */ 6352,
- /* branch: 0x5f9X */ 6368,
- /* branch: 0x5faX */ 6384,
- /* branch: 0x5fbX */ 6400,
- /* branch: 0x5fcX */ 6416,
- /* branch: 0x5fdX */ 6432,
- /* branch: 0x5feX */ 6448,
- /* branch: 0x5ffX */ 6464,
- /* key: 0x5f00 */ 0xffff,
- /* key: 0x5f01 */ 0x4a5b,
- /* key: 0x5f02 */ 0xbc5c,
- /* key: 0x5f03 */ 0x5731,
- /* key: 0x5f04 */ 0x4f2e,
- /* key: 0x5f05 */ 0xffff,
- /* key: 0x5f06 */ 0xbc5d,
- /* key: 0x5f07 */ 0xbc5e,
- /* key: 0x5f08 */ 0xbc5f,
- /* key: 0x5f09 */ 0x5732,
- /* key: 0x5f0a */ 0x4a40,
- /* key: 0x5f0b */ 0x5735,
- /* key: 0x5f0c */ 0x5021,
- /* key: 0x5f0d */ 0x5031,
- /* key: 0x5f0e */ 0xbc60,
- /* key: 0x5f0f */ 0x3c30,
- /* key: 0x5f10 */ 0x4675,
- /* key: 0x5f11 */ 0x5736,
- /* key: 0x5f12 */ 0xffff,
- /* key: 0x5f13 */ 0x355d,
- /* key: 0x5f14 */ 0x4424,
- /* key: 0x5f15 */ 0x307a,
- /* key: 0x5f16 */ 0x5737,
- /* key: 0x5f17 */ 0x4a26,
- /* key: 0x5f18 */ 0x3930,
- /* key: 0x5f19 */ 0xbc61,
- /* key: 0x5f1a */ 0xffff,
- /* key: 0x5f1b */ 0x4350,
- /* key: 0x5f1c */ 0xbc62,
- /* key: 0x5f1d */ 0xbc63,
- /* key: 0x5f1e */ 0xffff,
- /* key: 0x5f1f */ 0x446f,
- /* key: 0x5f20 */ 0xffff,
- /* key: 0x5f21 */ 0xbc64,
- /* key: 0x5f22 */ 0xbc65,
- /* key: 0x5f23 */ 0xbc66,
- /* key: 0x5f24 */ 0xbc67,
- /* key: 0x5f25 */ 0x4c6f,
- /* key: 0x5f26 */ 0x3839,
- /* key: 0x5f27 */ 0x384c,
- /* key: 0x5f28 */ 0xbc68,
- /* key: 0x5f29 */ 0x5738,
- /* key: 0x5f2a */ 0xffff,
- /* key: 0x5f2b */ 0xbc69,
- /* key: 0x5f2c */ 0xbc6a,
- /* key: 0x5f2d */ 0x5739,
- /* key: 0x5f2e */ 0xbc6b,
- /* key: 0x5f2f */ 0x573f,
- /* key: 0x5f30 */ 0xbc6c,
- /* key: 0x5f31 */ 0x3c65,
- /* key: 0x5f32 */ 0xffff,
- /* key: 0x5f33 */ 0xffff,
- /* key: 0x5f34 */ 0xbc6d,
- /* key: 0x5f35 */ 0x4425,
- /* key: 0x5f36 */ 0xbc6e,
- /* key: 0x5f37 */ 0x362f,
- /* key: 0x5f38 */ 0x573a,
- /* key: 0x5f39 */ 0xffff,
- /* key: 0x5f3a */ 0xffff,
- /* key: 0x5f3b */ 0xbc6f,
- /* key: 0x5f3c */ 0x492b,
- /* key: 0x5f3d */ 0xbc70,
- /* key: 0x5f3e */ 0x4346,
- /* key: 0x5f3f */ 0xbc71,
- /* key: 0x5f40 */ 0xbc72,
- /* key: 0x5f41 */ 0x573b,
- /* key: 0x5f42 */ 0xffff,
- /* key: 0x5f43 */ 0xffff,
- /* key: 0x5f44 */ 0xbc73,
- /* key: 0x5f45 */ 0xbc74,
- /* key: 0x5f46 */ 0xffff,
- /* key: 0x5f47 */ 0xbc75,
- /* key: 0x5f48 */ 0x573c,
- /* key: 0x5f49 */ 0xffff,
- /* key: 0x5f4a */ 0x3630,
- /* key: 0x5f4b */ 0xffff,
- /* key: 0x5f4c */ 0x573d,
- /* key: 0x5f4d */ 0xbc76,
- /* key: 0x5f4e */ 0x573e,
- /* key: 0x5f4f */ 0xffff,
- /* key: 0x5f50 */ 0xbc77,
- /* key: 0x5f51 */ 0x5740,
- /* key: 0x5f52 */ 0xffff,
- /* key: 0x5f53 */ 0x4576,
- /* key: 0x5f54 */ 0xbc78,
- /* key: 0x5f55 */ 0xffff,
- /* key: 0x5f56 */ 0x5741,
- /* key: 0x5f57 */ 0x5742,
- /* key: 0x5f58 */ 0xbc79,
- /* key: 0x5f59 */ 0x5743,
- /* key: 0x5f5a */ 0xffff,
- /* key: 0x5f5b */ 0xbc7a,
- /* key: 0x5f5c */ 0x5734,
- /* key: 0x5f5d */ 0x5733,
- /* key: 0x5f5e */ 0xffff,
- /* key: 0x5f5f */ 0xffff,
- /* key: 0x5f60 */ 0xbc7b,
- /* key: 0x5f61 */ 0x5744,
- /* key: 0x5f62 */ 0x3741,
- /* key: 0x5f63 */ 0xbc7c,
- /* key: 0x5f64 */ 0xbc7d,
- /* key: 0x5f65 */ 0xffff,
- /* key: 0x5f66 */ 0x4927,
- /* key: 0x5f67 */ 0xbc7e,
- /* key: 0x5f68 */ 0xffff,
- /* key: 0x5f69 */ 0x3a4c,
- /* key: 0x5f6a */ 0x4937,
- /* key: 0x5f6b */ 0x4426,
- /* key: 0x5f6c */ 0x494b,
- /* key: 0x5f6d */ 0x5745,
- /* key: 0x5f6e */ 0xffff,
- /* key: 0x5f6f */ 0xbd21,
- /* key: 0x5f70 */ 0x3e34,
- /* key: 0x5f71 */ 0x3146,
- /* key: 0x5f72 */ 0xbd22,
- /* key: 0x5f73 */ 0x5746,
- /* key: 0x5f74 */ 0xbd23,
- /* key: 0x5f75 */ 0xbd24,
- /* key: 0x5f76 */ 0xffff,
- /* key: 0x5f77 */ 0x5747,
- /* key: 0x5f78 */ 0xbd25,
- /* key: 0x5f79 */ 0x4c72,
- /* key: 0x5f7a */ 0xbd26,
- /* key: 0x5f7b */ 0xffff,
- /* key: 0x5f7c */ 0x4860,
- /* key: 0x5f7d */ 0xbd27,
- /* key: 0x5f7e */ 0xbd28,
- /* key: 0x5f7f */ 0x574a,
- /* key: 0x5f80 */ 0x317d,
- /* key: 0x5f81 */ 0x402c,
- /* key: 0x5f82 */ 0x5749,
- /* key: 0x5f83 */ 0x5748,
- /* key: 0x5f84 */ 0x3742,
- /* key: 0x5f85 */ 0x4254,
- /* key: 0x5f86 */ 0xffff,
- /* key: 0x5f87 */ 0x574e,
- /* key: 0x5f88 */ 0x574c,
- /* key: 0x5f89 */ 0xbd29,
- /* key: 0x5f8a */ 0x574b,
- /* key: 0x5f8b */ 0x4e27,
- /* key: 0x5f8c */ 0x3865,
- /* key: 0x5f8d */ 0xbd2a,
- /* key: 0x5f8e */ 0xffff,
- /* key: 0x5f8f */ 0xbd2b,
- /* key: 0x5f90 */ 0x3d79,
- /* key: 0x5f91 */ 0x574d,
- /* key: 0x5f92 */ 0x454c,
- /* key: 0x5f93 */ 0x3d3e,
- /* key: 0x5f94 */ 0xffff,
- /* key: 0x5f95 */ 0xffff,
- /* key: 0x5f96 */ 0xbd2c,
- /* key: 0x5f97 */ 0x4640,
- /* key: 0x5f98 */ 0x5751,
- /* key: 0x5f99 */ 0x5750,
- /* key: 0x5f9a */ 0xffff,
- /* key: 0x5f9b */ 0xffff,
- /* key: 0x5f9c */ 0xbd2d,
- /* key: 0x5f9d */ 0xbd2e,
- /* key: 0x5f9e */ 0x574f,
- /* key: 0x5f9f */ 0xffff,
- /* key: 0x5fa0 */ 0x5752,
- /* key: 0x5fa1 */ 0x3866,
- /* key: 0x5fa2 */ 0xbd2f,
- /* key: 0x5fa3 */ 0xffff,
- /* key: 0x5fa4 */ 0xbd32,
- /* key: 0x5fa5 */ 0xffff,
- /* key: 0x5fa6 */ 0xffff,
- /* key: 0x5fa7 */ 0xbd30,
- /* key: 0x5fa8 */ 0x5753,
- /* key: 0x5fa9 */ 0x497c,
- /* key: 0x5faa */ 0x3d5b,
- /* key: 0x5fab */ 0xbd31,
- /* key: 0x5fac */ 0xbd33,
- /* key: 0x5fad */ 0x5754,
- /* key: 0x5fae */ 0x4879,
- /* key: 0x5faf */ 0xbd34,
- /* key: 0x5fb0 */ 0xbd35,
- /* key: 0x5fb1 */ 0xbd36,
- /* key: 0x5fb2 */ 0xffff,
- /* key: 0x5fb3 */ 0x4641,
- /* key: 0x5fb4 */ 0x4427,
- /* key: 0x5fb5 */ 0xffff,
- /* key: 0x5fb6 */ 0xffff,
- /* key: 0x5fb7 */ 0xffff,
- /* key: 0x5fb8 */ 0xbd37,
- /* key: 0x5fb9 */ 0x4530,
- /* key: 0x5fba */ 0xffff,
- /* key: 0x5fbb */ 0xffff,
- /* key: 0x5fbc */ 0x5755,
- /* key: 0x5fbd */ 0x352b,
- /* key: 0x5fbe */ 0xffff,
- /* key: 0x5fbf */ 0xffff,
- /* key: 0x5fc0 */ 0xffff,
- /* key: 0x5fc1 */ 0xffff,
- /* key: 0x5fc2 */ 0xffff,
- /* key: 0x5fc3 */ 0x3f34,
- /* key: 0x5fc4 */ 0xbd38,
- /* key: 0x5fc5 */ 0x492c,
- /* key: 0x5fc6 */ 0xffff,
- /* key: 0x5fc7 */ 0xbd39,
- /* key: 0x5fc8 */ 0xbd3a,
- /* key: 0x5fc9 */ 0xbd3b,
- /* key: 0x5fca */ 0xffff,
- /* key: 0x5fcb */ 0xbd3c,
- /* key: 0x5fcc */ 0x3477,
- /* key: 0x5fcd */ 0x4726,
- /* key: 0x5fce */ 0xffff,
- /* key: 0x5fcf */ 0xffff,
- /* key: 0x5fd0 */ 0xbd3d,
- /* key: 0x5fd1 */ 0xbd3e,
- /* key: 0x5fd2 */ 0xbd3f,
- /* key: 0x5fd3 */ 0xbd40,
- /* key: 0x5fd4 */ 0xbd41,
- /* key: 0x5fd5 */ 0xffff,
- /* key: 0x5fd6 */ 0x5756,
- /* key: 0x5fd7 */ 0x3b56,
- /* key: 0x5fd8 */ 0x4b3a,
- /* key: 0x5fd9 */ 0x4b3b,
- /* key: 0x5fda */ 0xffff,
- /* key: 0x5fdb */ 0xffff,
- /* key: 0x5fdc */ 0x317e,
- /* key: 0x5fdd */ 0x575b,
- /* key: 0x5fde */ 0xbd42,
- /* key: 0x5fdf */ 0xffff,
- /* key: 0x5fe0 */ 0x4369,
- /* key: 0x5fe1 */ 0xbd43,
- /* key: 0x5fe2 */ 0xbd44,
- /* key: 0x5fe3 */ 0xffff,
- /* key: 0x5fe4 */ 0x5758,
- /* key: 0x5fe5 */ 0xffff,
- /* key: 0x5fe6 */ 0xffff,
- /* key: 0x5fe7 */ 0xffff,
- /* key: 0x5fe8 */ 0xbd45,
- /* key: 0x5fe9 */ 0xbd46,
- /* key: 0x5fea */ 0xbd47,
- /* key: 0x5feb */ 0x3277,
- /* key: 0x5fec */ 0xbd48,
- /* key: 0x5fed */ 0xbd49,
- /* key: 0x5fee */ 0xbd4a,
- /* key: 0x5fef */ 0xbd4b,
- /* key: 0x5ff0 */ 0x582d,
- /* key: 0x5ff1 */ 0x575a,
- /* key: 0x5ff2 */ 0xbd4c,
- /* key: 0x5ff3 */ 0xbd4d,
- /* key: 0x5ff4 */ 0xffff,
- /* key: 0x5ff5 */ 0x4730,
- /* key: 0x5ff6 */ 0xbd4e,
- /* key: 0x5ff7 */ 0xffff,
- /* key: 0x5ff8 */ 0x5759,
- /* key: 0x5ff9 */ 0xffff,
- /* key: 0x5ffa */ 0xbd4f,
- /* key: 0x5ffb */ 0x5757,
- /* key: 0x5ffc */ 0xbd50,
- /* key: 0x5ffd */ 0x397a,
- /* key: 0x5ffe */ 0xffff,
- /* key: 0x5fff */ 0x575d,
- /* branch: 0x60XX */ 6496,
- /* branch: 0x61XX */ 6768,
- /* branch: 0x62XX */ 7040,
- /* branch: 0x63XX */ 7312,
- /* branch: 0x64XX */ 7584,
- /* branch: 0x65XX */ 7856,
- /* branch: 0x66XX */ 8128,
- /* branch: 0x67XX */ 8400,
- /* branch: 0x68XX */ 8672,
- /* branch: 0x69XX */ 8944,
- /* branch: 0x6aXX */ 9216,
- /* branch: 0x6bXX */ 9488,
- /* branch: 0x6cXX */ 9760,
- /* branch: 0x6dXX */ 10032,
- /* branch: 0x6eXX */ 10304,
- /* branch: 0x6fXX */ 10576,
- /* branch: 0x600X */ 6512,
- /* branch: 0x601X */ 6528,
- /* branch: 0x602X */ 6544,
- /* branch: 0x603X */ 6560,
- /* branch: 0x604X */ 6576,
- /* branch: 0x605X */ 6592,
- /* branch: 0x606X */ 6608,
- /* branch: 0x607X */ 6624,
- /* branch: 0x608X */ 6640,
- /* branch: 0x609X */ 6656,
- /* branch: 0x60aX */ 6672,
- /* branch: 0x60bX */ 6688,
- /* branch: 0x60cX */ 6704,
- /* branch: 0x60dX */ 6720,
- /* branch: 0x60eX */ 6736,
- /* branch: 0x60fX */ 6752,
- /* key: 0x6000 */ 0xffff,
- /* key: 0x6001 */ 0xffff,
- /* key: 0x6002 */ 0xffff,
- /* key: 0x6003 */ 0xffff,
- /* key: 0x6004 */ 0xffff,
- /* key: 0x6005 */ 0xffff,
- /* key: 0x6006 */ 0xffff,
- /* key: 0x6007 */ 0xbd51,
- /* key: 0x6008 */ 0xffff,
- /* key: 0x6009 */ 0xffff,
- /* key: 0x600a */ 0xbd52,
- /* key: 0x600b */ 0xffff,
- /* key: 0x600c */ 0xffff,
- /* key: 0x600d */ 0xbd53,
- /* key: 0x600e */ 0x5763,
- /* key: 0x600f */ 0x5769,
- /* key: 0x6010 */ 0x5761,
- /* key: 0x6011 */ 0xffff,
- /* key: 0x6012 */ 0x455c,
- /* key: 0x6013 */ 0xbd54,
- /* key: 0x6014 */ 0xbd55,
- /* key: 0x6015 */ 0x5766,
- /* key: 0x6016 */ 0x495d,
- /* key: 0x6017 */ 0xbd56,
- /* key: 0x6018 */ 0xbd57,
- /* key: 0x6019 */ 0x5760,
- /* key: 0x601a */ 0xbd58,
- /* key: 0x601b */ 0x5765,
- /* key: 0x601c */ 0x4e67,
- /* key: 0x601d */ 0x3b57,
- /* key: 0x601e */ 0xffff,
- /* key: 0x601f */ 0xbd59,
- /* key: 0x6020 */ 0x4255,
- /* key: 0x6021 */ 0x575e,
- /* key: 0x6022 */ 0xffff,
- /* key: 0x6023 */ 0xffff,
- /* key: 0x6024 */ 0xbd5a,
- /* key: 0x6025 */ 0x355e,
- /* key: 0x6026 */ 0x5768,
- /* key: 0x6027 */ 0x402d,
- /* key: 0x6028 */ 0x3165,
- /* key: 0x6029 */ 0x5762,
- /* key: 0x602a */ 0x3278,
- /* key: 0x602b */ 0x5767,
- /* key: 0x602c */ 0xffff,
- /* key: 0x602d */ 0xbd5b,
- /* key: 0x602e */ 0xffff,
- /* key: 0x602f */ 0x3631,
- /* key: 0x6030 */ 0xffff,
- /* key: 0x6031 */ 0x5764,
- /* key: 0x6032 */ 0xffff,
- /* key: 0x6033 */ 0xbd5c,
- /* key: 0x6034 */ 0xffff,
- /* key: 0x6035 */ 0xbd5d,
- /* key: 0x6036 */ 0xffff,
- /* key: 0x6037 */ 0xffff,
- /* key: 0x6038 */ 0xffff,
- /* key: 0x6039 */ 0xffff,
- /* key: 0x603a */ 0x576a,
- /* key: 0x603b */ 0xffff,
- /* key: 0x603c */ 0xffff,
- /* key: 0x603d */ 0xffff,
- /* key: 0x603e */ 0xffff,
- /* key: 0x603f */ 0xffff,
- /* key: 0x6040 */ 0xbd5e,
- /* key: 0x6041 */ 0x576c,
- /* key: 0x6042 */ 0x5776,
- /* key: 0x6043 */ 0x5774,
- /* key: 0x6044 */ 0xffff,
- /* key: 0x6045 */ 0xffff,
- /* key: 0x6046 */ 0x5771,
- /* key: 0x6047 */ 0xbd5f,
- /* key: 0x6048 */ 0xbd60,
- /* key: 0x6049 */ 0xbd61,
- /* key: 0x604a */ 0x5770,
- /* key: 0x604b */ 0x4e78,
- /* key: 0x604c */ 0xbd62,
- /* key: 0x604d */ 0x5772,
- /* key: 0x604e */ 0xffff,
- /* key: 0x604f */ 0xffff,
- /* key: 0x6050 */ 0x3632,
- /* key: 0x6051 */ 0xbd63,
- /* key: 0x6052 */ 0x3931,
- /* key: 0x6053 */ 0xffff,
- /* key: 0x6054 */ 0xbd64,
- /* key: 0x6055 */ 0x3d7a,
- /* key: 0x6056 */ 0xbd65,
- /* key: 0x6057 */ 0xbd66,
- /* key: 0x6058 */ 0xffff,
- /* key: 0x6059 */ 0x5779,
- /* key: 0x605a */ 0x576b,
- /* key: 0x605b */ 0xffff,
- /* key: 0x605c */ 0xffff,
- /* key: 0x605d */ 0xbd67,
- /* key: 0x605e */ 0xffff,
- /* key: 0x605f */ 0x576f,
- /* key: 0x6060 */ 0x575f,
- /* key: 0x6061 */ 0xbd68,
- /* key: 0x6062 */ 0x327a,
- /* key: 0x6063 */ 0x5773,
- /* key: 0x6064 */ 0x5775,
- /* key: 0x6065 */ 0x4351,
- /* key: 0x6066 */ 0xffff,
- /* key: 0x6067 */ 0xbd69,
- /* key: 0x6068 */ 0x3a28,
- /* key: 0x6069 */ 0x3238,
- /* key: 0x606a */ 0x576d,
- /* key: 0x606b */ 0x5778,
- /* key: 0x606c */ 0x5777,
- /* key: 0x606d */ 0x3633,
- /* key: 0x606e */ 0xffff,
- /* key: 0x606f */ 0x4229,
- /* key: 0x6070 */ 0x3366,
- /* key: 0x6071 */ 0xbd6a,
- /* key: 0x6072 */ 0xffff,
- /* key: 0x6073 */ 0xffff,
- /* key: 0x6074 */ 0xffff,
- /* key: 0x6075 */ 0x3743,
- /* key: 0x6076 */ 0xffff,
- /* key: 0x6077 */ 0x576e,
- /* key: 0x6078 */ 0xffff,
- /* key: 0x6079 */ 0xffff,
- /* key: 0x607a */ 0xffff,
- /* key: 0x607b */ 0xffff,
- /* key: 0x607c */ 0xffff,
- /* key: 0x607d */ 0xffff,
- /* key: 0x607e */ 0xbd6b,
- /* key: 0x607f */ 0xbd6c,
- /* key: 0x6080 */ 0xffff,
- /* key: 0x6081 */ 0x577a,
- /* key: 0x6082 */ 0xbd6d,
- /* key: 0x6083 */ 0x577d,
- /* key: 0x6084 */ 0x5821,
- /* key: 0x6085 */ 0xffff,
- /* key: 0x6086 */ 0xbd6e,
- /* key: 0x6087 */ 0xffff,
- /* key: 0x6088 */ 0xbd6f,
- /* key: 0x6089 */ 0x3c3d,
- /* key: 0x608a */ 0xbd70,
- /* key: 0x608b */ 0x5827,
- /* key: 0x608c */ 0x4470,
- /* key: 0x608d */ 0x577b,
- /* key: 0x608e */ 0xbd71,
- /* key: 0x608f */ 0xffff,
- /* key: 0x6090 */ 0xffff,
- /* key: 0x6091 */ 0xbd72,
- /* key: 0x6092 */ 0x5825,
- /* key: 0x6093 */ 0xbd73,
- /* key: 0x6094 */ 0x3279,
- /* key: 0x6095 */ 0xbd74,
- /* key: 0x6096 */ 0x5823,
- /* key: 0x6097 */ 0x5824,
- /* key: 0x6098 */ 0xbd75,
- /* key: 0x6099 */ 0xffff,
- /* key: 0x609a */ 0x577e,
- /* key: 0x609b */ 0x5822,
- /* key: 0x609c */ 0xffff,
- /* key: 0x609d */ 0xbd76,
- /* key: 0x609e */ 0xbd77,
- /* key: 0x609f */ 0x3867,
- /* key: 0x60a0 */ 0x4d2a,
- /* key: 0x60a1 */ 0xffff,
- /* key: 0x60a2 */ 0xbd78,
- /* key: 0x60a3 */ 0x3435,
- /* key: 0x60a4 */ 0xbd79,
- /* key: 0x60a5 */ 0xbd7a,
- /* key: 0x60a6 */ 0x3159,
- /* key: 0x60a7 */ 0x5826,
- /* key: 0x60a8 */ 0xbd7b,
- /* key: 0x60a9 */ 0x473a,
- /* key: 0x60aa */ 0x302d,
- /* key: 0x60ab */ 0xffff,
- /* key: 0x60ac */ 0xffff,
- /* key: 0x60ad */ 0xffff,
- /* key: 0x60ae */ 0xffff,
- /* key: 0x60af */ 0xffff,
- /* key: 0x60b0 */ 0xbd7c,
- /* key: 0x60b1 */ 0xbd7d,
- /* key: 0x60b2 */ 0x4861,
- /* key: 0x60b3 */ 0x575c,
- /* key: 0x60b4 */ 0x582c,
- /* key: 0x60b5 */ 0x5830,
- /* key: 0x60b6 */ 0x4c65,
- /* key: 0x60b7 */ 0xbd7e,
- /* key: 0x60b8 */ 0x5829,
- /* key: 0x60b9 */ 0xffff,
- /* key: 0x60ba */ 0xffff,
- /* key: 0x60bb */ 0xbe21,
- /* key: 0x60bc */ 0x4569,
- /* key: 0x60bd */ 0x582e,
- /* key: 0x60be */ 0xbe22,
- /* key: 0x60bf */ 0xffff,
- /* key: 0x60c0 */ 0xffff,
- /* key: 0x60c1 */ 0xffff,
- /* key: 0x60c2 */ 0xbe23,
- /* key: 0x60c3 */ 0xffff,
- /* key: 0x60c4 */ 0xbe24,
- /* key: 0x60c5 */ 0x3e70,
- /* key: 0x60c6 */ 0x582f,
- /* key: 0x60c7 */ 0x4657,
- /* key: 0x60c8 */ 0xbe25,
- /* key: 0x60c9 */ 0xbe26,
- /* key: 0x60ca */ 0xbe27,
- /* key: 0x60cb */ 0xbe28,
- /* key: 0x60cc */ 0xffff,
- /* key: 0x60cd */ 0xffff,
- /* key: 0x60ce */ 0xbe29,
- /* key: 0x60cf */ 0xbe2a,
- /* key: 0x60d0 */ 0xffff,
- /* key: 0x60d1 */ 0x4f47,
- /* key: 0x60d2 */ 0xffff,
- /* key: 0x60d3 */ 0x582b,
- /* key: 0x60d4 */ 0xbe2b,
- /* key: 0x60d5 */ 0xbe2c,
- /* key: 0x60d6 */ 0xffff,
- /* key: 0x60d7 */ 0xffff,
- /* key: 0x60d8 */ 0x5831,
- /* key: 0x60d9 */ 0xbe2d,
- /* key: 0x60da */ 0x397b,
- /* key: 0x60db */ 0xbe2e,
- /* key: 0x60dc */ 0x404b,
- /* key: 0x60dd */ 0xbe2f,
- /* key: 0x60de */ 0xbe30,
- /* key: 0x60df */ 0x3054,
- /* key: 0x60e0 */ 0x582a,
- /* key: 0x60e1 */ 0x5828,
- /* key: 0x60e2 */ 0xbe31,
- /* key: 0x60e3 */ 0x415a,
- /* key: 0x60e4 */ 0xffff,
- /* key: 0x60e5 */ 0xbe32,
- /* key: 0x60e6 */ 0xffff,
- /* key: 0x60e7 */ 0x577c,
- /* key: 0x60e8 */ 0x3b34,
- /* key: 0x60e9 */ 0xffff,
- /* key: 0x60ea */ 0xffff,
- /* key: 0x60eb */ 0xffff,
- /* key: 0x60ec */ 0xffff,
- /* key: 0x60ed */ 0xffff,
- /* key: 0x60ee */ 0xffff,
- /* key: 0x60ef */ 0xffff,
- /* key: 0x60f0 */ 0x4246,
- /* key: 0x60f1 */ 0x583d,
- /* key: 0x60f2 */ 0xbe33,
- /* key: 0x60f3 */ 0x415b,
- /* key: 0x60f4 */ 0x5838,
- /* key: 0x60f5 */ 0xbe34,
- /* key: 0x60f6 */ 0x5835,
- /* key: 0x60f7 */ 0x5836,
- /* key: 0x60f8 */ 0xbe35,
- /* key: 0x60f9 */ 0x3c66,
- /* key: 0x60fa */ 0x5839,
- /* key: 0x60fb */ 0x583c,
- /* key: 0x60fc */ 0xbe36,
- /* key: 0x60fd */ 0xbe37,
- /* key: 0x60fe */ 0xffff,
- /* key: 0x60ff */ 0xffff,
- /* branch: 0x610X */ 6784,
- /* branch: 0x611X */ 6800,
- /* branch: 0x612X */ 6816,
- /* branch: 0x613X */ 6832,
- /* branch: 0x614X */ 6848,
- /* branch: 0x615X */ 6864,
- /* branch: 0x616X */ 6880,
- /* branch: 0x617X */ 6896,
- /* branch: 0x618X */ 6912,
- /* branch: 0x619X */ 6928,
- /* branch: 0x61aX */ 6944,
- /* branch: 0x61bX */ 6960,
- /* branch: 0x61cX */ 6976,
- /* branch: 0x61dX */ 6992,
- /* branch: 0x61eX */ 7008,
- /* branch: 0x61fX */ 7024,
- /* key: 0x6100 */ 0x5837,
- /* key: 0x6101 */ 0x3d25,
- /* key: 0x6102 */ 0xbe38,
- /* key: 0x6103 */ 0x583a,
- /* key: 0x6104 */ 0xffff,
- /* key: 0x6105 */ 0xffff,
- /* key: 0x6106 */ 0x5834,
- /* key: 0x6107 */ 0xbe39,
- /* key: 0x6108 */ 0x4c7c,
- /* key: 0x6109 */ 0x4c7b,
- /* key: 0x610a */ 0xbe3a,
- /* key: 0x610b */ 0xffff,
- /* key: 0x610c */ 0xbe3b,
- /* key: 0x610d */ 0x583e,
- /* key: 0x610e */ 0x583f,
- /* key: 0x610f */ 0x3055,
- /* key: 0x6110 */ 0xbe3c,
- /* key: 0x6111 */ 0xbe3d,
- /* key: 0x6112 */ 0xbe3e,
- /* key: 0x6113 */ 0xbe3f,
- /* key: 0x6114 */ 0xbe40,
- /* key: 0x6115 */ 0x5833,
- /* key: 0x6116 */ 0xbe41,
- /* key: 0x6117 */ 0xbe42,
- /* key: 0x6118 */ 0xffff,
- /* key: 0x6119 */ 0xbe43,
- /* key: 0x611a */ 0x3672,
- /* key: 0x611b */ 0x3026,
- /* key: 0x611c */ 0xbe44,
- /* key: 0x611d */ 0xffff,
- /* key: 0x611e */ 0xbe45,
- /* key: 0x611f */ 0x3436,
- /* key: 0x6120 */ 0xffff,
- /* key: 0x6121 */ 0x583b,
- /* key: 0x6122 */ 0xbe46,
- /* key: 0x6123 */ 0xffff,
- /* key: 0x6124 */ 0xffff,
- /* key: 0x6125 */ 0xffff,
- /* key: 0x6126 */ 0xffff,
- /* key: 0x6127 */ 0x5843,
- /* key: 0x6128 */ 0x5842,
- /* key: 0x6129 */ 0xffff,
- /* key: 0x612a */ 0xbe47,
- /* key: 0x612b */ 0xbe48,
- /* key: 0x612c */ 0x5847,
- /* key: 0x612d */ 0xffff,
- /* key: 0x612e */ 0xffff,
- /* key: 0x612f */ 0xffff,
- /* key: 0x6130 */ 0xbe49,
- /* key: 0x6131 */ 0xbe4a,
- /* key: 0x6132 */ 0xffff,
- /* key: 0x6133 */ 0xffff,
- /* key: 0x6134 */ 0x5848,
- /* key: 0x6135 */ 0xbe4b,
- /* key: 0x6136 */ 0xbe4c,
- /* key: 0x6137 */ 0xbe4d,
- /* key: 0x6138 */ 0xffff,
- /* key: 0x6139 */ 0xbe4e,
- /* key: 0x613a */ 0xffff,
- /* key: 0x613b */ 0xffff,
- /* key: 0x613c */ 0x5846,
- /* key: 0x613d */ 0x5849,
- /* key: 0x613e */ 0x5841,
- /* key: 0x613f */ 0x5845,
- /* key: 0x6140 */ 0xffff,
- /* key: 0x6141 */ 0xbe4f,
- /* key: 0x6142 */ 0x584a,
- /* key: 0x6143 */ 0xffff,
- /* key: 0x6144 */ 0x584b,
- /* key: 0x6145 */ 0xbe50,
- /* key: 0x6146 */ 0xbe51,
- /* key: 0x6147 */ 0x5840,
- /* key: 0x6148 */ 0x3b7c,
- /* key: 0x6149 */ 0xbe52,
- /* key: 0x614a */ 0x5844,
- /* key: 0x614b */ 0x4256,
- /* key: 0x614c */ 0x3932,
- /* key: 0x614d */ 0x5832,
- /* key: 0x614e */ 0x3f35,
- /* key: 0x614f */ 0xffff,
- /* key: 0x6150 */ 0xffff,
- /* key: 0x6151 */ 0xffff,
- /* key: 0x6152 */ 0xffff,
- /* key: 0x6153 */ 0x5858,
- /* key: 0x6154 */ 0xffff,
- /* key: 0x6155 */ 0x4a69,
- /* key: 0x6156 */ 0xffff,
- /* key: 0x6157 */ 0xffff,
- /* key: 0x6158 */ 0x584e,
- /* key: 0x6159 */ 0x584f,
- /* key: 0x615a */ 0x5850,
- /* key: 0x615b */ 0xffff,
- /* key: 0x615c */ 0xffff,
- /* key: 0x615d */ 0x5857,
- /* key: 0x615e */ 0xbe53,
- /* key: 0x615f */ 0x5856,
- /* key: 0x6160 */ 0xbe54,
- /* key: 0x6161 */ 0xffff,
- /* key: 0x6162 */ 0x4b7d,
- /* key: 0x6163 */ 0x3437,
- /* key: 0x6164 */ 0xffff,
- /* key: 0x6165 */ 0x5854,
- /* key: 0x6166 */ 0xffff,
- /* key: 0x6167 */ 0x3745,
- /* key: 0x6168 */ 0x3334,
- /* key: 0x6169 */ 0xffff,
- /* key: 0x616a */ 0xffff,
- /* key: 0x616b */ 0x5851,
- /* key: 0x616c */ 0xbe55,
- /* key: 0x616d */ 0xffff,
- /* key: 0x616e */ 0x4e38,
- /* key: 0x616f */ 0x5853,
- /* key: 0x6170 */ 0x3056,
- /* key: 0x6171 */ 0x5855,
- /* key: 0x6172 */ 0xbe56,
- /* key: 0x6173 */ 0x584c,
- /* key: 0x6174 */ 0x5852,
- /* key: 0x6175 */ 0x5859,
- /* key: 0x6176 */ 0x3744,
- /* key: 0x6177 */ 0x584d,
- /* key: 0x6178 */ 0xbe57,
- /* key: 0x6179 */ 0xffff,
- /* key: 0x617a */ 0xffff,
- /* key: 0x617b */ 0xbe58,
- /* key: 0x617c */ 0xbe59,
- /* key: 0x617d */ 0xffff,
- /* key: 0x617e */ 0x4d5d,
- /* key: 0x617f */ 0xbe5a,
- /* key: 0x6180 */ 0xbe5b,
- /* key: 0x6181 */ 0xbe5c,
- /* key: 0x6182 */ 0x4d2b,
- /* key: 0x6183 */ 0xbe5d,
- /* key: 0x6184 */ 0xbe5e,
- /* key: 0x6185 */ 0xffff,
- /* key: 0x6186 */ 0xffff,
- /* key: 0x6187 */ 0x585c,
- /* key: 0x6188 */ 0xffff,
- /* key: 0x6189 */ 0xffff,
- /* key: 0x618a */ 0x5860,
- /* key: 0x618b */ 0xbe5f,
- /* key: 0x618c */ 0xffff,
- /* key: 0x618d */ 0xbe60,
- /* key: 0x618e */ 0x417e,
- /* key: 0x618f */ 0xffff,
- /* key: 0x6190 */ 0x4e79,
- /* key: 0x6191 */ 0x5861,
- /* key: 0x6192 */ 0xbe61,
- /* key: 0x6193 */ 0xbe62,
- /* key: 0x6194 */ 0x585e,
- /* key: 0x6195 */ 0xffff,
- /* key: 0x6196 */ 0x585b,
- /* key: 0x6197 */ 0xbe63,
- /* key: 0x6198 */ 0xbe64,
- /* key: 0x6199 */ 0x585a,
- /* key: 0x619a */ 0x585f,
- /* key: 0x619b */ 0xffff,
- /* key: 0x619c */ 0xbe65,
- /* key: 0x619d */ 0xbe66,
- /* key: 0x619e */ 0xffff,
- /* key: 0x619f */ 0xbe67,
- /* key: 0x61a0 */ 0xbe68,
- /* key: 0x61a1 */ 0xffff,
- /* key: 0x61a2 */ 0xffff,
- /* key: 0x61a3 */ 0xffff,
- /* key: 0x61a4 */ 0x4a30,
- /* key: 0x61a5 */ 0xbe69,
- /* key: 0x61a6 */ 0xffff,
- /* key: 0x61a7 */ 0x4634,
- /* key: 0x61a8 */ 0xbe6a,
- /* key: 0x61a9 */ 0x3746,
- /* key: 0x61aa */ 0xbe6b,
- /* key: 0x61ab */ 0x5862,
- /* key: 0x61ac */ 0x585d,
- /* key: 0x61ad */ 0xbe6c,
- /* key: 0x61ae */ 0x5863,
- /* key: 0x61af */ 0xffff,
- /* key: 0x61b0 */ 0xffff,
- /* key: 0x61b1 */ 0xffff,
- /* key: 0x61b2 */ 0x377b,
- /* key: 0x61b3 */ 0xffff,
- /* key: 0x61b4 */ 0xffff,
- /* key: 0x61b5 */ 0xffff,
- /* key: 0x61b6 */ 0x3231,
- /* key: 0x61b7 */ 0xffff,
- /* key: 0x61b8 */ 0xbe6d,
- /* key: 0x61b9 */ 0xbe6e,
- /* key: 0x61ba */ 0x586b,
- /* key: 0x61bb */ 0xffff,
- /* key: 0x61bc */ 0xbe6f,
- /* key: 0x61bd */ 0xffff,
- /* key: 0x61be */ 0x3438,
- /* key: 0x61bf */ 0xffff,
- /* key: 0x61c0 */ 0xbe70,
- /* key: 0x61c1 */ 0xbe71,
- /* key: 0x61c2 */ 0xbe72,
- /* key: 0x61c3 */ 0x5869,
- /* key: 0x61c4 */ 0xffff,
- /* key: 0x61c5 */ 0xffff,
- /* key: 0x61c6 */ 0x586a,
- /* key: 0x61c7 */ 0x3a29,
- /* key: 0x61c8 */ 0x5868,
- /* key: 0x61c9 */ 0x5866,
- /* key: 0x61ca */ 0x5865,
- /* key: 0x61cb */ 0x586c,
- /* key: 0x61cc */ 0x5864,
- /* key: 0x61cd */ 0x586e,
- /* key: 0x61ce */ 0xbe73,
- /* key: 0x61cf */ 0xbe74,
- /* key: 0x61d0 */ 0x327b,
- /* key: 0x61d1 */ 0xffff,
- /* key: 0x61d2 */ 0xffff,
- /* key: 0x61d3 */ 0xffff,
- /* key: 0x61d4 */ 0xffff,
- /* key: 0x61d5 */ 0xbe75,
- /* key: 0x61d6 */ 0xffff,
- /* key: 0x61d7 */ 0xffff,
- /* key: 0x61d8 */ 0xffff,
- /* key: 0x61d9 */ 0xffff,
- /* key: 0x61da */ 0xffff,
- /* key: 0x61db */ 0xffff,
- /* key: 0x61dc */ 0xbe76,
- /* key: 0x61dd */ 0xbe77,
- /* key: 0x61de */ 0xbe78,
- /* key: 0x61df */ 0xbe79,
- /* key: 0x61e0 */ 0xffff,
- /* key: 0x61e1 */ 0xbe7a,
- /* key: 0x61e2 */ 0xbe7b,
- /* key: 0x61e3 */ 0x5870,
- /* key: 0x61e4 */ 0xffff,
- /* key: 0x61e5 */ 0xbe7e,
- /* key: 0x61e6 */ 0x586f,
- /* key: 0x61e7 */ 0xbe7c,
- /* key: 0x61e8 */ 0xffff,
- /* key: 0x61e9 */ 0xbe7d,
- /* key: 0x61ea */ 0xffff,
- /* key: 0x61eb */ 0xffff,
- /* key: 0x61ec */ 0xbf21,
- /* key: 0x61ed */ 0xbf22,
- /* key: 0x61ee */ 0xffff,
- /* key: 0x61ef */ 0xbf23,
- /* key: 0x61f0 */ 0xffff,
- /* key: 0x61f1 */ 0xffff,
- /* key: 0x61f2 */ 0x4428,
- /* key: 0x61f3 */ 0xffff,
- /* key: 0x61f4 */ 0x5873,
- /* key: 0x61f5 */ 0xffff,
- /* key: 0x61f6 */ 0x5871,
- /* key: 0x61f7 */ 0x5867,
- /* key: 0x61f8 */ 0x377c,
- /* key: 0x61f9 */ 0xffff,
- /* key: 0x61fa */ 0x5872,
- /* key: 0x61fb */ 0xffff,
- /* key: 0x61fc */ 0x5876,
- /* key: 0x61fd */ 0x5875,
- /* key: 0x61fe */ 0x5877,
- /* key: 0x61ff */ 0x5874,
- /* branch: 0x620X */ 7056,
- /* branch: 0x621X */ 7072,
- /* branch: 0x622X */ 7088,
- /* branch: 0x623X */ 7104,
- /* branch: 0x624X */ 7120,
- /* branch: 0x625X */ 7136,
- /* branch: 0x626X */ 7152,
- /* branch: 0x627X */ 7168,
- /* branch: 0x628X */ 7184,
- /* branch: 0x629X */ 7200,
- /* branch: 0x62aX */ 7216,
- /* branch: 0x62bX */ 7232,
- /* branch: 0x62cX */ 7248,
- /* branch: 0x62dX */ 7264,
- /* branch: 0x62eX */ 7280,
- /* branch: 0x62fX */ 7296,
- /* key: 0x6200 */ 0x5878,
- /* key: 0x6201 */ 0xbf24,
- /* key: 0x6202 */ 0xffff,
- /* key: 0x6203 */ 0xbf25,
- /* key: 0x6204 */ 0xbf26,
- /* key: 0x6205 */ 0xffff,
- /* key: 0x6206 */ 0xffff,
- /* key: 0x6207 */ 0xbf27,
- /* key: 0x6208 */ 0x5879,
- /* key: 0x6209 */ 0x587a,
- /* key: 0x620a */ 0x4a6a,
- /* key: 0x620b */ 0xffff,
- /* key: 0x620c */ 0x587c,
- /* key: 0x620d */ 0x587b,
- /* key: 0x620e */ 0x3d3f,
- /* key: 0x620f */ 0xffff,
- /* key: 0x6210 */ 0x402e,
- /* key: 0x6211 */ 0x3266,
- /* key: 0x6212 */ 0x327c,
- /* key: 0x6213 */ 0xbf28,
- /* key: 0x6214 */ 0x587d,
- /* key: 0x6215 */ 0xbf29,
- /* key: 0x6216 */ 0x303f,
- /* key: 0x6217 */ 0xffff,
- /* key: 0x6218 */ 0xffff,
- /* key: 0x6219 */ 0xffff,
- /* key: 0x621a */ 0x404c,
- /* key: 0x621b */ 0x587e,
- /* key: 0x621c */ 0xbf2a,
- /* key: 0x621d */ 0x6c43,
- /* key: 0x621e */ 0x5921,
- /* key: 0x621f */ 0x3761,
- /* key: 0x6220 */ 0xbf2b,
- /* key: 0x6221 */ 0x5922,
- /* key: 0x6222 */ 0xbf2c,
- /* key: 0x6223 */ 0xbf2d,
- /* key: 0x6224 */ 0xffff,
- /* key: 0x6225 */ 0xffff,
- /* key: 0x6226 */ 0x406f,
- /* key: 0x6227 */ 0xbf2e,
- /* key: 0x6228 */ 0xffff,
- /* key: 0x6229 */ 0xbf2f,
- /* key: 0x622a */ 0x5923,
- /* key: 0x622b */ 0xbf30,
- /* key: 0x622c */ 0xffff,
- /* key: 0x622d */ 0xffff,
- /* key: 0x622e */ 0x5924,
- /* key: 0x622f */ 0x353a,
- /* key: 0x6230 */ 0x5925,
- /* key: 0x6231 */ 0xffff,
- /* key: 0x6232 */ 0x5926,
- /* key: 0x6233 */ 0x5927,
- /* key: 0x6234 */ 0x4257,
- /* key: 0x6235 */ 0xffff,
- /* key: 0x6236 */ 0xffff,
- /* key: 0x6237 */ 0xffff,
- /* key: 0x6238 */ 0x384d,
- /* key: 0x6239 */ 0xbf31,
- /* key: 0x623a */ 0xffff,
- /* key: 0x623b */ 0x4c61,
- /* key: 0x623c */ 0xffff,
- /* key: 0x623d */ 0xbf32,
- /* key: 0x623e */ 0xffff,
- /* key: 0x623f */ 0x4b3c,
- /* key: 0x6240 */ 0x3d6a,
- /* key: 0x6241 */ 0x5928,
- /* key: 0x6242 */ 0xbf33,
- /* key: 0x6243 */ 0xbf34,
- /* key: 0x6244 */ 0xbf35,
- /* key: 0x6245 */ 0xffff,
- /* key: 0x6246 */ 0xbf36,
- /* key: 0x6247 */ 0x4070,
- /* key: 0x6248 */ 0x6e3d,
- /* key: 0x6249 */ 0x4862,
- /* key: 0x624a */ 0xffff,
- /* key: 0x624b */ 0x3c6a,
- /* key: 0x624c */ 0xbf37,
- /* key: 0x624d */ 0x3a4d,
- /* key: 0x624e */ 0x5929,
- /* key: 0x624f */ 0xffff,
- /* key: 0x6250 */ 0xbf38,
- /* key: 0x6251 */ 0xbf39,
- /* key: 0x6252 */ 0xbf3a,
- /* key: 0x6253 */ 0x4247,
- /* key: 0x6254 */ 0xbf3b,
- /* key: 0x6255 */ 0x4a27,
- /* key: 0x6256 */ 0xbf3c,
- /* key: 0x6257 */ 0xffff,
- /* key: 0x6258 */ 0x4271,
- /* key: 0x6259 */ 0xffff,
- /* key: 0x625a */ 0xbf3d,
- /* key: 0x625b */ 0x592c,
- /* key: 0x625c */ 0xbf3e,
- /* key: 0x625d */ 0xffff,
- /* key: 0x625e */ 0x592a,
- /* key: 0x625f */ 0xffff,
- /* key: 0x6260 */ 0x592d,
- /* key: 0x6261 */ 0xffff,
- /* key: 0x6262 */ 0xffff,
- /* key: 0x6263 */ 0x592b,
- /* key: 0x6264 */ 0xbf3f,
- /* key: 0x6265 */ 0xffff,
- /* key: 0x6266 */ 0xffff,
- /* key: 0x6267 */ 0xffff,
- /* key: 0x6268 */ 0x592e,
- /* key: 0x6269 */ 0xffff,
- /* key: 0x626a */ 0xffff,
- /* key: 0x626b */ 0xffff,
- /* key: 0x626c */ 0xffff,
- /* key: 0x626d */ 0xbf40,
- /* key: 0x626e */ 0x4a31,
- /* key: 0x626f */ 0xbf41,
- /* key: 0x6270 */ 0xffff,
- /* key: 0x6271 */ 0x3037,
- /* key: 0x6272 */ 0xffff,
- /* key: 0x6273 */ 0xbf42,
- /* key: 0x6274 */ 0xffff,
- /* key: 0x6275 */ 0xffff,
- /* key: 0x6276 */ 0x495e,
- /* key: 0x6277 */ 0xffff,
- /* key: 0x6278 */ 0xffff,
- /* key: 0x6279 */ 0x4863,
- /* key: 0x627a */ 0xbf43,
- /* key: 0x627b */ 0xffff,
- /* key: 0x627c */ 0x592f,
- /* key: 0x627d */ 0xbf44,
- /* key: 0x627e */ 0x5932,
- /* key: 0x627f */ 0x3e35,
- /* key: 0x6280 */ 0x353b,
- /* key: 0x6281 */ 0xffff,
- /* key: 0x6282 */ 0x5930,
- /* key: 0x6283 */ 0x5937,
- /* key: 0x6284 */ 0x3e36,
- /* key: 0x6285 */ 0xffff,
- /* key: 0x6286 */ 0xffff,
- /* key: 0x6287 */ 0xffff,
- /* key: 0x6288 */ 0xffff,
- /* key: 0x6289 */ 0x5931,
- /* key: 0x628a */ 0x4744,
- /* key: 0x628b */ 0xffff,
- /* key: 0x628c */ 0xffff,
- /* key: 0x628d */ 0xbf45,
- /* key: 0x628e */ 0xbf46,
- /* key: 0x628f */ 0xbf47,
- /* key: 0x6290 */ 0xbf48,
- /* key: 0x6291 */ 0x4d5e,
- /* key: 0x6292 */ 0x5933,
- /* key: 0x6293 */ 0x5934,
- /* key: 0x6294 */ 0x5938,
- /* key: 0x6295 */ 0x456a,
- /* key: 0x6296 */ 0x5935,
- /* key: 0x6297 */ 0x3933,
- /* key: 0x6298 */ 0x405e,
- /* key: 0x6299 */ 0xffff,
- /* key: 0x629a */ 0xffff,
- /* key: 0x629b */ 0x5946,
- /* key: 0x629c */ 0x4834,
- /* key: 0x629d */ 0xffff,
- /* key: 0x629e */ 0x4272,
- /* key: 0x629f */ 0xffff,
- /* key: 0x62a0 */ 0xffff,
- /* key: 0x62a1 */ 0xffff,
- /* key: 0x62a2 */ 0xffff,
- /* key: 0x62a3 */ 0xffff,
- /* key: 0x62a4 */ 0xffff,
- /* key: 0x62a5 */ 0xffff,
- /* key: 0x62a6 */ 0xbf49,
- /* key: 0x62a7 */ 0xffff,
- /* key: 0x62a8 */ 0xbf4a,
- /* key: 0x62a9 */ 0xffff,
- /* key: 0x62aa */ 0xffff,
- /* key: 0x62ab */ 0x4864,
- /* key: 0x62ac */ 0x5a2d,
- /* key: 0x62ad */ 0xffff,
- /* key: 0x62ae */ 0xffff,
- /* key: 0x62af */ 0xffff,
- /* key: 0x62b0 */ 0xffff,
- /* key: 0x62b1 */ 0x4a7a,
- /* key: 0x62b2 */ 0xffff,
- /* key: 0x62b3 */ 0xbf4b,
- /* key: 0x62b4 */ 0xffff,
- /* key: 0x62b5 */ 0x4471,
- /* key: 0x62b6 */ 0xbf4c,
- /* key: 0x62b7 */ 0xbf4d,
- /* key: 0x62b8 */ 0xffff,
- /* key: 0x62b9 */ 0x4b75,
- /* key: 0x62ba */ 0xbf4e,
- /* key: 0x62bb */ 0x593b,
- /* key: 0x62bc */ 0x3221,
- /* key: 0x62bd */ 0x436a,
- /* key: 0x62be */ 0xbf4f,
- /* key: 0x62bf */ 0xbf50,
- /* key: 0x62c0 */ 0xffff,
- /* key: 0x62c1 */ 0xffff,
- /* key: 0x62c2 */ 0x5944,
- /* key: 0x62c3 */ 0xffff,
- /* key: 0x62c4 */ 0xbf51,
- /* key: 0x62c5 */ 0x4334,
- /* key: 0x62c6 */ 0x593e,
- /* key: 0x62c7 */ 0x5945,
- /* key: 0x62c8 */ 0x5940,
- /* key: 0x62c9 */ 0x5947,
- /* key: 0x62ca */ 0x5943,
- /* key: 0x62cb */ 0xffff,
- /* key: 0x62cc */ 0x5942,
- /* key: 0x62cd */ 0x476f,
- /* key: 0x62ce */ 0xbf52,
- /* key: 0x62cf */ 0x593c,
- /* key: 0x62d0 */ 0x327d,
- /* key: 0x62d1 */ 0x593a,
- /* key: 0x62d2 */ 0x3571,
- /* key: 0x62d3 */ 0x4273,
- /* key: 0x62d4 */ 0x5936,
- /* key: 0x62d5 */ 0xbf53,
- /* key: 0x62d6 */ 0xbf54,
- /* key: 0x62d7 */ 0x5939,
- /* key: 0x62d8 */ 0x3934,
- /* key: 0x62d9 */ 0x405b,
- /* key: 0x62da */ 0xbf55,
- /* key: 0x62db */ 0x3e37,
- /* key: 0x62dc */ 0x5941,
- /* key: 0x62dd */ 0x4752,
- /* key: 0x62de */ 0xffff,
- /* key: 0x62df */ 0xffff,
- /* key: 0x62e0 */ 0x3572,
- /* key: 0x62e1 */ 0x3348,
- /* key: 0x62e2 */ 0xffff,
- /* key: 0x62e3 */ 0xffff,
- /* key: 0x62e4 */ 0xffff,
- /* key: 0x62e5 */ 0xffff,
- /* key: 0x62e6 */ 0xffff,
- /* key: 0x62e7 */ 0xffff,
- /* key: 0x62e8 */ 0xffff,
- /* key: 0x62e9 */ 0xffff,
- /* key: 0x62ea */ 0xbf56,
- /* key: 0x62eb */ 0xffff,
- /* key: 0x62ec */ 0x3367,
- /* key: 0x62ed */ 0x3f21,
- /* key: 0x62ee */ 0x5949,
- /* key: 0x62ef */ 0x594e,
- /* key: 0x62f0 */ 0xffff,
- /* key: 0x62f1 */ 0x594a,
- /* key: 0x62f2 */ 0xbf57,
- /* key: 0x62f3 */ 0x377d,
- /* key: 0x62f4 */ 0xbf58,
- /* key: 0x62f5 */ 0x594f,
- /* key: 0x62f6 */ 0x3b22,
- /* key: 0x62f7 */ 0x3969,
- /* key: 0x62f8 */ 0xffff,
- /* key: 0x62f9 */ 0xffff,
- /* key: 0x62fa */ 0xffff,
- /* key: 0x62fb */ 0xffff,
- /* key: 0x62fc */ 0xbf59,
- /* key: 0x62fd */ 0xbf5a,
- /* key: 0x62fe */ 0x3d26,
- /* key: 0x62ff */ 0x593d,
- /* branch: 0x630X */ 7328,
- /* branch: 0x631X */ 7344,
- /* branch: 0x632X */ 7360,
- /* branch: 0x633X */ 7376,
- /* branch: 0x634X */ 7392,
- /* branch: 0x635X */ 7408,
- /* branch: 0x636X */ 7424,
- /* branch: 0x637X */ 7440,
- /* branch: 0x638X */ 7456,
- /* branch: 0x639X */ 7472,
- /* branch: 0x63aX */ 7488,
- /* branch: 0x63bX */ 7504,
- /* branch: 0x63cX */ 7520,
- /* branch: 0x63dX */ 7536,
- /* branch: 0x63eX */ 7552,
- /* branch: 0x63fX */ 7568,
- /* key: 0x6300 */ 0xffff,
- /* key: 0x6301 */ 0x3b7d,
- /* key: 0x6302 */ 0x594c,
- /* key: 0x6303 */ 0xbf5b,
- /* key: 0x6304 */ 0xbf5c,
- /* key: 0x6305 */ 0xffff,
- /* key: 0x6306 */ 0xffff,
- /* key: 0x6307 */ 0x3b58,
- /* key: 0x6308 */ 0x594d,
- /* key: 0x6309 */ 0x3044,
- /* key: 0x630a */ 0xbf5d,
- /* key: 0x630b */ 0xbf5e,
- /* key: 0x630c */ 0x5948,
- /* key: 0x630d */ 0xbf5f,
- /* key: 0x630e */ 0xffff,
- /* key: 0x630f */ 0xffff,
- /* key: 0x6310 */ 0xbf60,
- /* key: 0x6311 */ 0x4429,
- /* key: 0x6312 */ 0xffff,
- /* key: 0x6313 */ 0xbf61,
- /* key: 0x6314 */ 0xffff,
- /* key: 0x6315 */ 0xffff,
- /* key: 0x6316 */ 0xbf62,
- /* key: 0x6317 */ 0xffff,
- /* key: 0x6318 */ 0xbf63,
- /* key: 0x6319 */ 0x3573,
- /* key: 0x631a */ 0xffff,
- /* key: 0x631b */ 0xffff,
- /* key: 0x631c */ 0xffff,
- /* key: 0x631d */ 0xffff,
- /* key: 0x631e */ 0xffff,
- /* key: 0x631f */ 0x3634,
- /* key: 0x6320 */ 0xffff,
- /* key: 0x6321 */ 0xffff,
- /* key: 0x6322 */ 0xffff,
- /* key: 0x6323 */ 0xffff,
- /* key: 0x6324 */ 0xffff,
- /* key: 0x6325 */ 0xffff,
- /* key: 0x6326 */ 0xffff,
- /* key: 0x6327 */ 0x594b,
- /* key: 0x6328 */ 0x3027,
- /* key: 0x6329 */ 0xbf64,
- /* key: 0x632a */ 0xbf65,
- /* key: 0x632b */ 0x3a43,
- /* key: 0x632c */ 0xffff,
- /* key: 0x632d */ 0xbf66,
- /* key: 0x632e */ 0xffff,
- /* key: 0x632f */ 0x3f36,
- /* key: 0x6330 */ 0xffff,
- /* key: 0x6331 */ 0xffff,
- /* key: 0x6332 */ 0xffff,
- /* key: 0x6333 */ 0xffff,
- /* key: 0x6334 */ 0xffff,
- /* key: 0x6335 */ 0xbf67,
- /* key: 0x6336 */ 0xbf68,
- /* key: 0x6337 */ 0xffff,
- /* key: 0x6338 */ 0xffff,
- /* key: 0x6339 */ 0xbf69,
- /* key: 0x633a */ 0x4472,
- /* key: 0x633b */ 0xffff,
- /* key: 0x633c */ 0xbf6a,
- /* key: 0x633d */ 0x4854,
- /* key: 0x633e */ 0x5951,
- /* key: 0x633f */ 0x415e,
- /* key: 0x6340 */ 0xffff,
- /* key: 0x6341 */ 0xbf6b,
- /* key: 0x6342 */ 0xbf6c,
- /* key: 0x6343 */ 0xbf6d,
- /* key: 0x6344 */ 0xbf6e,
- /* key: 0x6345 */ 0xffff,
- /* key: 0x6346 */ 0xbf6f,
- /* key: 0x6347 */ 0xffff,
- /* key: 0x6348 */ 0xffff,
- /* key: 0x6349 */ 0x422a,
- /* key: 0x634a */ 0xbf70,
- /* key: 0x634b */ 0xbf71,
- /* key: 0x634c */ 0x3b2b,
- /* key: 0x634d */ 0x5952,
- /* key: 0x634e */ 0xbf72,
- /* key: 0x634f */ 0x5954,
- /* key: 0x6350 */ 0x5950,
- /* key: 0x6351 */ 0xffff,
- /* key: 0x6352 */ 0xbf73,
- /* key: 0x6353 */ 0xbf74,
- /* key: 0x6354 */ 0xbf75,
- /* key: 0x6355 */ 0x4a61,
- /* key: 0x6356 */ 0xffff,
- /* key: 0x6357 */ 0x443d,
- /* key: 0x6358 */ 0xbf76,
- /* key: 0x6359 */ 0xffff,
- /* key: 0x635a */ 0xffff,
- /* key: 0x635b */ 0xbf77,
- /* key: 0x635c */ 0x415c,
- /* key: 0x635d */ 0xffff,
- /* key: 0x635e */ 0xffff,
- /* key: 0x635f */ 0xffff,
- /* key: 0x6360 */ 0xffff,
- /* key: 0x6361 */ 0xffff,
- /* key: 0x6362 */ 0xffff,
- /* key: 0x6363 */ 0xffff,
- /* key: 0x6364 */ 0xffff,
- /* key: 0x6365 */ 0xbf78,
- /* key: 0x6366 */ 0xbf79,
- /* key: 0x6367 */ 0x4a7b,
- /* key: 0x6368 */ 0x3c4e,
- /* key: 0x6369 */ 0x5960,
- /* key: 0x636a */ 0xffff,
- /* key: 0x636b */ 0x595f,
- /* key: 0x636c */ 0xbf7a,
- /* key: 0x636d */ 0xbf7b,
- /* key: 0x636e */ 0x3f78,
- /* key: 0x636f */ 0xffff,
- /* key: 0x6370 */ 0xffff,
- /* key: 0x6371 */ 0xbf7c,
- /* key: 0x6372 */ 0x377e,
- /* key: 0x6373 */ 0xffff,
- /* key: 0x6374 */ 0xbf7d,
- /* key: 0x6375 */ 0xbf7e,
- /* key: 0x6376 */ 0x5959,
- /* key: 0x6377 */ 0x3e39,
- /* key: 0x6378 */ 0xc021,
- /* key: 0x6379 */ 0xffff,
- /* key: 0x637a */ 0x4668,
- /* key: 0x637b */ 0x4731,
- /* key: 0x637c */ 0xc022,
- /* key: 0x637d */ 0xc023,
- /* key: 0x637e */ 0xffff,
- /* key: 0x637f */ 0xc024,
- /* key: 0x6380 */ 0x5957,
- /* key: 0x6381 */ 0xffff,
- /* key: 0x6382 */ 0xc025,
- /* key: 0x6383 */ 0x415d,
- /* key: 0x6384 */ 0xc026,
- /* key: 0x6385 */ 0xffff,
- /* key: 0x6386 */ 0xffff,
- /* key: 0x6387 */ 0xc027,
- /* key: 0x6388 */ 0x3c78,
- /* key: 0x6389 */ 0x595c,
- /* key: 0x638a */ 0xc028,
- /* key: 0x638b */ 0xffff,
- /* key: 0x638c */ 0x3e38,
- /* key: 0x638d */ 0xffff,
- /* key: 0x638e */ 0x5956,
- /* key: 0x638f */ 0x595b,
- /* key: 0x6390 */ 0xc029,
- /* key: 0x6391 */ 0xffff,
- /* key: 0x6392 */ 0x4753,
- /* key: 0x6393 */ 0xffff,
- /* key: 0x6394 */ 0xc02a,
- /* key: 0x6395 */ 0xc02b,
- /* key: 0x6396 */ 0x5955,
- /* key: 0x6397 */ 0xffff,
- /* key: 0x6398 */ 0x3721,
- /* key: 0x6399 */ 0xc02c,
- /* key: 0x639a */ 0xc02d,
- /* key: 0x639b */ 0x335d,
- /* key: 0x639c */ 0xffff,
- /* key: 0x639d */ 0xffff,
- /* key: 0x639e */ 0xc02e,
- /* key: 0x639f */ 0x595d,
- /* key: 0x63a0 */ 0x4e2b,
- /* key: 0x63a1 */ 0x3a4e,
- /* key: 0x63a2 */ 0x4335,
- /* key: 0x63a3 */ 0x595a,
- /* key: 0x63a4 */ 0xc02f,
- /* key: 0x63a5 */ 0x405c,
- /* key: 0x63a6 */ 0xc030,
- /* key: 0x63a7 */ 0x3935,
- /* key: 0x63a8 */ 0x3f64,
- /* key: 0x63a9 */ 0x3166,
- /* key: 0x63aa */ 0x413c,
- /* key: 0x63ab */ 0x5958,
- /* key: 0x63ac */ 0x3545,
- /* key: 0x63ad */ 0xc031,
- /* key: 0x63ae */ 0xc032,
- /* key: 0x63af */ 0xc033,
- /* key: 0x63b0 */ 0xffff,
- /* key: 0x63b1 */ 0xffff,
- /* key: 0x63b2 */ 0x3747,
- /* key: 0x63b3 */ 0xffff,
- /* key: 0x63b4 */ 0x444f,
- /* key: 0x63b5 */ 0x595e,
- /* key: 0x63b6 */ 0xffff,
- /* key: 0x63b7 */ 0xffff,
- /* key: 0x63b8 */ 0xffff,
- /* key: 0x63b9 */ 0xffff,
- /* key: 0x63ba */ 0xffff,
- /* key: 0x63bb */ 0x415f,
- /* key: 0x63bc */ 0xffff,
- /* key: 0x63bd */ 0xc034,
- /* key: 0x63be */ 0x5961,
- /* key: 0x63bf */ 0xffff,
- /* key: 0x63c0 */ 0x5963,
- /* key: 0x63c1 */ 0xc035,
- /* key: 0x63c2 */ 0xffff,
- /* key: 0x63c3 */ 0x4237,
- /* key: 0x63c4 */ 0x5969,
- /* key: 0x63c5 */ 0xc036,
- /* key: 0x63c6 */ 0x5964,
- /* key: 0x63c7 */ 0xffff,
- /* key: 0x63c8 */ 0xc037,
- /* key: 0x63c9 */ 0x5966,
- /* key: 0x63ca */ 0xffff,
- /* key: 0x63cb */ 0xffff,
- /* key: 0x63cc */ 0xffff,
- /* key: 0x63cd */ 0xffff,
- /* key: 0x63ce */ 0xc038,
- /* key: 0x63cf */ 0x4941,
- /* key: 0x63d0 */ 0x4473,
- /* key: 0x63d1 */ 0xc039,
- /* key: 0x63d2 */ 0x5967,
- /* key: 0x63d3 */ 0xc03a,
- /* key: 0x63d4 */ 0xc03b,
- /* key: 0x63d5 */ 0xc03c,
- /* key: 0x63d6 */ 0x4d2c,
- /* key: 0x63d7 */ 0xffff,
- /* key: 0x63d8 */ 0xffff,
- /* key: 0x63d9 */ 0xffff,
- /* key: 0x63da */ 0x4d48,
- /* key: 0x63db */ 0x3439,
- /* key: 0x63dc */ 0xc03d,
- /* key: 0x63dd */ 0xffff,
- /* key: 0x63de */ 0xffff,
- /* key: 0x63df */ 0xffff,
- /* key: 0x63e0 */ 0xc03e,
- /* key: 0x63e1 */ 0x302e,
- /* key: 0x63e2 */ 0xffff,
- /* key: 0x63e3 */ 0x5965,
- /* key: 0x63e4 */ 0xffff,
- /* key: 0x63e5 */ 0xc03f,
- /* key: 0x63e6 */ 0xffff,
- /* key: 0x63e7 */ 0xffff,
- /* key: 0x63e8 */ 0xffff,
- /* key: 0x63e9 */ 0x5962,
- /* key: 0x63ea */ 0xc040,
- /* key: 0x63eb */ 0xffff,
- /* key: 0x63ec */ 0xc041,
- /* key: 0x63ed */ 0xffff,
- /* key: 0x63ee */ 0x3478,
- /* key: 0x63ef */ 0xffff,
- /* key: 0x63f0 */ 0xffff,
- /* key: 0x63f1 */ 0xffff,
- /* key: 0x63f2 */ 0xc042,
- /* key: 0x63f3 */ 0xc043,
- /* key: 0x63f4 */ 0x3167,
- /* key: 0x63f5 */ 0xc044,
- /* key: 0x63f6 */ 0x5968,
- /* key: 0x63f7 */ 0xffff,
- /* key: 0x63f8 */ 0xc045,
- /* key: 0x63f9 */ 0xc046,
- /* key: 0x63fa */ 0x4d49,
- /* key: 0x63fb */ 0xffff,
- /* key: 0x63fc */ 0xffff,
- /* key: 0x63fd */ 0xffff,
- /* key: 0x63fe */ 0xffff,
- /* key: 0x63ff */ 0xffff,
- /* branch: 0x640X */ 7600,
- /* branch: 0x641X */ 7616,
- /* branch: 0x642X */ 7632,
- /* branch: 0x643X */ 7648,
- /* branch: 0x644X */ 7664,
- /* branch: 0x645X */ 7680,
- /* branch: 0x646X */ 7696,
- /* branch: 0x647X */ 7712,
- /* branch: 0x648X */ 7728,
- /* branch: 0x649X */ 7744,
- /* branch: 0x64aX */ 7760,
- /* branch: 0x64bX */ 7776,
- /* branch: 0x64cX */ 7792,
- /* branch: 0x64dX */ 7808,
- /* branch: 0x64eX */ 7824,
- /* branch: 0x64fX */ 7840,
- /* key: 0x6400 */ 0xffff,
- /* key: 0x6401 */ 0xffff,
- /* key: 0x6402 */ 0xffff,
- /* key: 0x6403 */ 0xffff,
- /* key: 0x6404 */ 0xffff,
- /* key: 0x6405 */ 0xffff,
- /* key: 0x6406 */ 0x596c,
- /* key: 0x6407 */ 0xffff,
- /* key: 0x6408 */ 0xffff,
- /* key: 0x6409 */ 0xc047,
- /* key: 0x640a */ 0xc048,
- /* key: 0x640b */ 0xffff,
- /* key: 0x640c */ 0xffff,
- /* key: 0x640d */ 0x423b,
- /* key: 0x640e */ 0xffff,
- /* key: 0x640f */ 0x5973,
- /* key: 0x6410 */ 0xc049,
- /* key: 0x6411 */ 0xffff,
- /* key: 0x6412 */ 0xc04a,
- /* key: 0x6413 */ 0x596d,
- /* key: 0x6414 */ 0xc04b,
- /* key: 0x6415 */ 0xffff,
- /* key: 0x6416 */ 0x596a,
- /* key: 0x6417 */ 0x5971,
- /* key: 0x6418 */ 0xc04c,
- /* key: 0x6419 */ 0xffff,
- /* key: 0x641a */ 0xffff,
- /* key: 0x641b */ 0xffff,
- /* key: 0x641c */ 0x5953,
- /* key: 0x641d */ 0xffff,
- /* key: 0x641e */ 0xc04d,
- /* key: 0x641f */ 0xffff,
- /* key: 0x6420 */ 0xc04e,
- /* key: 0x6421 */ 0xffff,
- /* key: 0x6422 */ 0xc04f,
- /* key: 0x6423 */ 0xffff,
- /* key: 0x6424 */ 0xc050,
- /* key: 0x6425 */ 0xc051,
- /* key: 0x6426 */ 0x596e,
- /* key: 0x6427 */ 0xffff,
- /* key: 0x6428 */ 0x5972,
- /* key: 0x6429 */ 0xc052,
- /* key: 0x642a */ 0xc053,
- /* key: 0x642b */ 0xffff,
- /* key: 0x642c */ 0x4842,
- /* key: 0x642d */ 0x456b,
- /* key: 0x642e */ 0xffff,
- /* key: 0x642f */ 0xc054,
- /* key: 0x6430 */ 0xc055,
- /* key: 0x6431 */ 0xffff,
- /* key: 0x6432 */ 0xffff,
- /* key: 0x6433 */ 0xffff,
- /* key: 0x6434 */ 0x596b,
- /* key: 0x6435 */ 0xc056,
- /* key: 0x6436 */ 0x596f,
- /* key: 0x6437 */ 0xffff,
- /* key: 0x6438 */ 0xffff,
- /* key: 0x6439 */ 0xffff,
- /* key: 0x643a */ 0x3748,
- /* key: 0x643b */ 0xffff,
- /* key: 0x643c */ 0xffff,
- /* key: 0x643d */ 0xc057,
- /* key: 0x643e */ 0x3a71,
- /* key: 0x643f */ 0xc058,
- /* key: 0x6440 */ 0xffff,
- /* key: 0x6441 */ 0xffff,
- /* key: 0x6442 */ 0x405d,
- /* key: 0x6443 */ 0xffff,
- /* key: 0x6444 */ 0xffff,
- /* key: 0x6445 */ 0xffff,
- /* key: 0x6446 */ 0xffff,
- /* key: 0x6447 */ 0xffff,
- /* key: 0x6448 */ 0xffff,
- /* key: 0x6449 */ 0xffff,
- /* key: 0x644a */ 0xffff,
- /* key: 0x644b */ 0xc059,
- /* key: 0x644c */ 0xffff,
- /* key: 0x644d */ 0xffff,
- /* key: 0x644e */ 0x5977,
- /* key: 0x644f */ 0xc05a,
- /* key: 0x6450 */ 0xffff,
- /* key: 0x6451 */ 0xc05b,
- /* key: 0x6452 */ 0xc05c,
- /* key: 0x6453 */ 0xc05d,
- /* key: 0x6454 */ 0xc05e,
- /* key: 0x6455 */ 0xffff,
- /* key: 0x6456 */ 0xffff,
- /* key: 0x6457 */ 0xffff,
- /* key: 0x6458 */ 0x4526,
- /* key: 0x6459 */ 0xffff,
- /* key: 0x645a */ 0xc05f,
- /* key: 0x645b */ 0xc060,
- /* key: 0x645c */ 0xc061,
- /* key: 0x645d */ 0xc062,
- /* key: 0x645e */ 0xffff,
- /* key: 0x645f */ 0xc063,
- /* key: 0x6460 */ 0xc064,
- /* key: 0x6461 */ 0xc065,
- /* key: 0x6462 */ 0xffff,
- /* key: 0x6463 */ 0xc066,
- /* key: 0x6464 */ 0xffff,
- /* key: 0x6465 */ 0xffff,
- /* key: 0x6466 */ 0xffff,
- /* key: 0x6467 */ 0x5974,
- /* key: 0x6468 */ 0xffff,
- /* key: 0x6469 */ 0x4b60,
- /* key: 0x646a */ 0xffff,
- /* key: 0x646b */ 0xffff,
- /* key: 0x646c */ 0xffff,
- /* key: 0x646d */ 0xc067,
- /* key: 0x646e */ 0xffff,
- /* key: 0x646f */ 0x5975,
- /* key: 0x6470 */ 0xffff,
- /* key: 0x6471 */ 0xffff,
- /* key: 0x6472 */ 0xffff,
- /* key: 0x6473 */ 0xc068,
- /* key: 0x6474 */ 0xc069,
- /* key: 0x6475 */ 0xffff,
- /* key: 0x6476 */ 0x5976,
- /* key: 0x6477 */ 0xffff,
- /* key: 0x6478 */ 0x4c4e,
- /* key: 0x6479 */ 0xffff,
- /* key: 0x647a */ 0x4022,
- /* key: 0x647b */ 0xc06a,
- /* key: 0x647c */ 0xffff,
- /* key: 0x647d */ 0xc06b,
- /* key: 0x647e */ 0xffff,
- /* key: 0x647f */ 0xffff,
- /* key: 0x6480 */ 0xffff,
- /* key: 0x6481 */ 0xffff,
- /* key: 0x6482 */ 0xffff,
- /* key: 0x6483 */ 0x3762,
- /* key: 0x6484 */ 0xffff,
- /* key: 0x6485 */ 0xc06c,
- /* key: 0x6486 */ 0xffff,
- /* key: 0x6487 */ 0xc06d,
- /* key: 0x6488 */ 0x597d,
- /* key: 0x6489 */ 0xffff,
- /* key: 0x648a */ 0xffff,
- /* key: 0x648b */ 0xffff,
- /* key: 0x648c */ 0xffff,
- /* key: 0x648d */ 0xffff,
- /* key: 0x648e */ 0xffff,
- /* key: 0x648f */ 0xc06e,
- /* key: 0x6490 */ 0xc06f,
- /* key: 0x6491 */ 0xc070,
- /* key: 0x6492 */ 0x3b35,
- /* key: 0x6493 */ 0x597a,
- /* key: 0x6494 */ 0xffff,
- /* key: 0x6495 */ 0x5979,
- /* key: 0x6496 */ 0xffff,
- /* key: 0x6497 */ 0xffff,
- /* key: 0x6498 */ 0xc071,
- /* key: 0x6499 */ 0xc072,
- /* key: 0x649a */ 0x4732,
- /* key: 0x649b */ 0xc073,
- /* key: 0x649c */ 0xffff,
- /* key: 0x649d */ 0xc074,
- /* key: 0x649e */ 0x4635,
- /* key: 0x649f */ 0xc075,
- /* key: 0x64a0 */ 0xffff,
- /* key: 0x64a1 */ 0xc076,
- /* key: 0x64a2 */ 0xffff,
- /* key: 0x64a3 */ 0xc077,
- /* key: 0x64a4 */ 0x4531,
- /* key: 0x64a5 */ 0x597b,
- /* key: 0x64a6 */ 0xc078,
- /* key: 0x64a7 */ 0xffff,
- /* key: 0x64a8 */ 0xc079,
- /* key: 0x64a9 */ 0x597c,
- /* key: 0x64aa */ 0xffff,
- /* key: 0x64ab */ 0x496f,
- /* key: 0x64ac */ 0xc07a,
- /* key: 0x64ad */ 0x4745,
- /* key: 0x64ae */ 0x3b23,
- /* key: 0x64af */ 0xffff,
- /* key: 0x64b0 */ 0x4071,
- /* key: 0x64b1 */ 0xffff,
- /* key: 0x64b2 */ 0x4b50,
- /* key: 0x64b3 */ 0xc07b,
- /* key: 0x64b4 */ 0xffff,
- /* key: 0x64b5 */ 0xffff,
- /* key: 0x64b6 */ 0xffff,
- /* key: 0x64b7 */ 0xffff,
- /* key: 0x64b8 */ 0xffff,
- /* key: 0x64b9 */ 0x3349,
- /* key: 0x64ba */ 0xffff,
- /* key: 0x64bb */ 0x5a25,
- /* key: 0x64bc */ 0x597e,
- /* key: 0x64bd */ 0xc07c,
- /* key: 0x64be */ 0xc07d,
- /* key: 0x64bf */ 0xc07e,
- /* key: 0x64c0 */ 0xffff,
- /* key: 0x64c1 */ 0x4d4a,
- /* key: 0x64c2 */ 0x5a27,
- /* key: 0x64c3 */ 0xffff,
- /* key: 0x64c4 */ 0xc121,
- /* key: 0x64c5 */ 0x5a23,
- /* key: 0x64c6 */ 0xffff,
- /* key: 0x64c7 */ 0x5a24,
- /* key: 0x64c8 */ 0xffff,
- /* key: 0x64c9 */ 0xc122,
- /* key: 0x64ca */ 0xc123,
- /* key: 0x64cb */ 0xc124,
- /* key: 0x64cc */ 0xc125,
- /* key: 0x64cd */ 0x4160,
- /* key: 0x64ce */ 0xc126,
- /* key: 0x64cf */ 0xffff,
- /* key: 0x64d0 */ 0xc127,
- /* key: 0x64d1 */ 0xc128,
- /* key: 0x64d2 */ 0x5a22,
- /* key: 0x64d3 */ 0xffff,
- /* key: 0x64d4 */ 0x593f,
- /* key: 0x64d5 */ 0xc129,
- /* key: 0x64d6 */ 0xffff,
- /* key: 0x64d7 */ 0xc12a,
- /* key: 0x64d8 */ 0x5a26,
- /* key: 0x64d9 */ 0xffff,
- /* key: 0x64da */ 0x5a21,
- /* key: 0x64db */ 0xffff,
- /* key: 0x64dc */ 0xffff,
- /* key: 0x64dd */ 0xffff,
- /* key: 0x64de */ 0xffff,
- /* key: 0x64df */ 0xffff,
- /* key: 0x64e0 */ 0x5a2b,
- /* key: 0x64e1 */ 0x5a2c,
- /* key: 0x64e2 */ 0x4527,
- /* key: 0x64e3 */ 0x5a2e,
- /* key: 0x64e4 */ 0xc12b,
- /* key: 0x64e5 */ 0xc12c,
- /* key: 0x64e6 */ 0x3b24,
- /* key: 0x64e7 */ 0x5a29,
- /* key: 0x64e8 */ 0xffff,
- /* key: 0x64e9 */ 0xc12d,
- /* key: 0x64ea */ 0xc12e,
- /* key: 0x64eb */ 0xffff,
- /* key: 0x64ec */ 0x353c,
- /* key: 0x64ed */ 0xc12f,
- /* key: 0x64ee */ 0xffff,
- /* key: 0x64ef */ 0x5a2f,
- /* key: 0x64f0 */ 0xc130,
- /* key: 0x64f1 */ 0x5a28,
- /* key: 0x64f2 */ 0x5a33,
- /* key: 0x64f3 */ 0xffff,
- /* key: 0x64f4 */ 0x5a32,
- /* key: 0x64f5 */ 0xc131,
- /* key: 0x64f6 */ 0x5a31,
- /* key: 0x64f7 */ 0xc132,
- /* key: 0x64f8 */ 0xffff,
- /* key: 0x64f9 */ 0xffff,
- /* key: 0x64fa */ 0x5a34,
- /* key: 0x64fb */ 0xc133,
- /* key: 0x64fc */ 0xffff,
- /* key: 0x64fd */ 0x5a36,
- /* key: 0x64fe */ 0x3e71,
- /* key: 0x64ff */ 0xc134,
- /* branch: 0x650X */ 7872,
- /* branch: 0x651X */ 7888,
- /* branch: 0x652X */ 7904,
- /* branch: 0x653X */ 7920,
- /* branch: 0x654X */ 7936,
- /* branch: 0x655X */ 7952,
- /* branch: 0x656X */ 7968,
- /* branch: 0x657X */ 7984,
- /* branch: 0x658X */ 8000,
- /* branch: 0x659X */ 8016,
- /* branch: 0x65aX */ 8032,
- /* branch: 0x65bX */ 8048,
- /* branch: 0x65cX */ 8064,
- /* branch: 0x65dX */ 8080,
- /* branch: 0x65eX */ 8096,
- /* branch: 0x65fX */ 8112,
- /* key: 0x6500 */ 0x5a35,
- /* key: 0x6501 */ 0xc135,
- /* key: 0x6502 */ 0xffff,
- /* key: 0x6503 */ 0xffff,
- /* key: 0x6504 */ 0xc136,
- /* key: 0x6505 */ 0x5a39,
- /* key: 0x6506 */ 0xffff,
- /* key: 0x6507 */ 0xffff,
- /* key: 0x6508 */ 0xc137,
- /* key: 0x6509 */ 0xc138,
- /* key: 0x650a */ 0xc139,
- /* key: 0x650b */ 0xffff,
- /* key: 0x650c */ 0xffff,
- /* key: 0x650d */ 0xffff,
- /* key: 0x650e */ 0xffff,
- /* key: 0x650f */ 0xc13a,
- /* key: 0x6510 */ 0xffff,
- /* key: 0x6511 */ 0xffff,
- /* key: 0x6512 */ 0xffff,
- /* key: 0x6513 */ 0xc13b,
- /* key: 0x6514 */ 0xc13c,
- /* key: 0x6515 */ 0xffff,
- /* key: 0x6516 */ 0xc13d,
- /* key: 0x6517 */ 0xffff,
- /* key: 0x6518 */ 0x5a37,
- /* key: 0x6519 */ 0xc13e,
- /* key: 0x651a */ 0xffff,
- /* key: 0x651b */ 0xc13f,
- /* key: 0x651c */ 0x5a38,
- /* key: 0x651d */ 0x5970,
- /* key: 0x651e */ 0xc140,
- /* key: 0x651f */ 0xc141,
- /* key: 0x6520 */ 0xffff,
- /* key: 0x6521 */ 0xffff,
- /* key: 0x6522 */ 0xc142,
- /* key: 0x6523 */ 0x5a3b,
- /* key: 0x6524 */ 0x5a3a,
- /* key: 0x6525 */ 0xffff,
- /* key: 0x6526 */ 0xc143,
- /* key: 0x6527 */ 0xffff,
- /* key: 0x6528 */ 0xffff,
- /* key: 0x6529 */ 0xc144,
- /* key: 0x652a */ 0x5978,
- /* key: 0x652b */ 0x5a3c,
- /* key: 0x652c */ 0x5a30,
- /* key: 0x652d */ 0xffff,
- /* key: 0x652e */ 0xc145,
- /* key: 0x652f */ 0x3b59,
- /* key: 0x6530 */ 0xffff,
- /* key: 0x6531 */ 0xc146,
- /* key: 0x6532 */ 0xffff,
- /* key: 0x6533 */ 0xffff,
- /* key: 0x6534 */ 0x5a3d,
- /* key: 0x6535 */ 0x5a3e,
- /* key: 0x6536 */ 0x5a40,
- /* key: 0x6537 */ 0x5a3f,
- /* key: 0x6538 */ 0x5a41,
- /* key: 0x6539 */ 0x327e,
- /* key: 0x653a */ 0xc147,
- /* key: 0x653b */ 0x3936,
- /* key: 0x653c */ 0xc148,
- /* key: 0x653d */ 0xc149,
- /* key: 0x653e */ 0x4a7c,
- /* key: 0x653f */ 0x402f,
- /* key: 0x6540 */ 0xffff,
- /* key: 0x6541 */ 0xffff,
- /* key: 0x6542 */ 0xffff,
- /* key: 0x6543 */ 0xc14a,
- /* key: 0x6544 */ 0xffff,
- /* key: 0x6545 */ 0x384e,
- /* key: 0x6546 */ 0xffff,
- /* key: 0x6547 */ 0xc14b,
- /* key: 0x6548 */ 0x5a43,
- /* key: 0x6549 */ 0xc14c,
- /* key: 0x654a */ 0xffff,
- /* key: 0x654b */ 0xffff,
- /* key: 0x654c */ 0xffff,
- /* key: 0x654d */ 0x5a46,
- /* key: 0x654e */ 0xffff,
- /* key: 0x654f */ 0x4952,
- /* key: 0x6550 */ 0xc14d,
- /* key: 0x6551 */ 0x355f,
- /* key: 0x6552 */ 0xc14e,
- /* key: 0x6553 */ 0xffff,
- /* key: 0x6554 */ 0xc14f,
- /* key: 0x6555 */ 0x5a45,
- /* key: 0x6556 */ 0x5a44,
- /* key: 0x6557 */ 0x4754,
- /* key: 0x6558 */ 0x5a47,
- /* key: 0x6559 */ 0x3635,
- /* key: 0x655a */ 0xffff,
- /* key: 0x655b */ 0xffff,
- /* key: 0x655c */ 0xffff,
- /* key: 0x655d */ 0x5a49,
- /* key: 0x655e */ 0x5a48,
- /* key: 0x655f */ 0xc150,
- /* key: 0x6560 */ 0xc151,
- /* key: 0x6561 */ 0xffff,
- /* key: 0x6562 */ 0x343a,
- /* key: 0x6563 */ 0x3b36,
- /* key: 0x6564 */ 0xffff,
- /* key: 0x6565 */ 0xffff,
- /* key: 0x6566 */ 0x4658,
- /* key: 0x6567 */ 0xc152,
- /* key: 0x6568 */ 0xffff,
- /* key: 0x6569 */ 0xffff,
- /* key: 0x656a */ 0xffff,
- /* key: 0x656b */ 0xc153,
- /* key: 0x656c */ 0x3749,
- /* key: 0x656d */ 0xffff,
- /* key: 0x656e */ 0xffff,
- /* key: 0x656f */ 0xffff,
- /* key: 0x6570 */ 0x3f74,
- /* key: 0x6571 */ 0xffff,
- /* key: 0x6572 */ 0x5a4a,
- /* key: 0x6573 */ 0xffff,
- /* key: 0x6574 */ 0x4030,
- /* key: 0x6575 */ 0x4528,
- /* key: 0x6576 */ 0xffff,
- /* key: 0x6577 */ 0x495f,
- /* key: 0x6578 */ 0x5a4b,
- /* key: 0x6579 */ 0xffff,
- /* key: 0x657a */ 0xc154,
- /* key: 0x657b */ 0xffff,
- /* key: 0x657c */ 0xffff,
- /* key: 0x657d */ 0xc155,
- /* key: 0x657e */ 0xffff,
- /* key: 0x657f */ 0xffff,
- /* key: 0x6580 */ 0xffff,
- /* key: 0x6581 */ 0xc156,
- /* key: 0x6582 */ 0x5a4c,
- /* key: 0x6583 */ 0x5a4d,
- /* key: 0x6584 */ 0xffff,
- /* key: 0x6585 */ 0xc157,
- /* key: 0x6586 */ 0xffff,
- /* key: 0x6587 */ 0x4a38,
- /* key: 0x6588 */ 0x555d,
- /* key: 0x6589 */ 0x4046,
- /* key: 0x658a */ 0xc158,
- /* key: 0x658b */ 0xffff,
- /* key: 0x658c */ 0x494c,
- /* key: 0x658d */ 0xffff,
- /* key: 0x658e */ 0x3a58,
- /* key: 0x658f */ 0xffff,
- /* key: 0x6590 */ 0x4865,
- /* key: 0x6591 */ 0x4843,
- /* key: 0x6592 */ 0xc159,
- /* key: 0x6593 */ 0xffff,
- /* key: 0x6594 */ 0xffff,
- /* key: 0x6595 */ 0xc15a,
- /* key: 0x6596 */ 0xffff,
- /* key: 0x6597 */ 0x454d,
- /* key: 0x6598 */ 0xc15b,
- /* key: 0x6599 */ 0x4e41,
- /* key: 0x659a */ 0xffff,
- /* key: 0x659b */ 0x5a4f,
- /* key: 0x659c */ 0x3c50,
- /* key: 0x659d */ 0xc15c,
- /* key: 0x659e */ 0xffff,
- /* key: 0x659f */ 0x5a50,
- /* key: 0x65a0 */ 0xc15d,
- /* key: 0x65a1 */ 0x3036,
- /* key: 0x65a2 */ 0xffff,
- /* key: 0x65a3 */ 0xc15e,
- /* key: 0x65a4 */ 0x3654,
- /* key: 0x65a5 */ 0x404d,
- /* key: 0x65a6 */ 0xc15f,
- /* key: 0x65a7 */ 0x4960,
- /* key: 0x65a8 */ 0xffff,
- /* key: 0x65a9 */ 0xffff,
- /* key: 0x65aa */ 0xffff,
- /* key: 0x65ab */ 0x5a51,
- /* key: 0x65ac */ 0x3b42,
- /* key: 0x65ad */ 0x4347,
- /* key: 0x65ae */ 0xc160,
- /* key: 0x65af */ 0x3b5b,
- /* key: 0x65b0 */ 0x3f37,
- /* key: 0x65b1 */ 0xffff,
- /* key: 0x65b2 */ 0xc161,
- /* key: 0x65b3 */ 0xc162,
- /* key: 0x65b4 */ 0xc163,
- /* key: 0x65b5 */ 0xffff,
- /* key: 0x65b6 */ 0xffff,
- /* key: 0x65b7 */ 0x5a52,
- /* key: 0x65b8 */ 0xffff,
- /* key: 0x65b9 */ 0x4a7d,
- /* key: 0x65ba */ 0xffff,
- /* key: 0x65bb */ 0xffff,
- /* key: 0x65bc */ 0x3177,
- /* key: 0x65bd */ 0x3b5c,
- /* key: 0x65be */ 0xffff,
- /* key: 0x65bf */ 0xc164,
- /* key: 0x65c0 */ 0xffff,
- /* key: 0x65c1 */ 0x5a55,
- /* key: 0x65c2 */ 0xc165,
- /* key: 0x65c3 */ 0x5a53,
- /* key: 0x65c4 */ 0x5a56,
- /* key: 0x65c5 */ 0x4e39,
- /* key: 0x65c6 */ 0x5a54,
- /* key: 0x65c7 */ 0xffff,
- /* key: 0x65c8 */ 0xc166,
- /* key: 0x65c9 */ 0xc167,
- /* key: 0x65ca */ 0xffff,
- /* key: 0x65cb */ 0x407b,
- /* key: 0x65cc */ 0x5a57,
- /* key: 0x65cd */ 0xffff,
- /* key: 0x65ce */ 0xc168,
- /* key: 0x65cf */ 0x4232,
- /* key: 0x65d0 */ 0xc169,
- /* key: 0x65d1 */ 0xffff,
- /* key: 0x65d2 */ 0x5a58,
- /* key: 0x65d3 */ 0xffff,
- /* key: 0x65d4 */ 0xc16a,
- /* key: 0x65d5 */ 0xffff,
- /* key: 0x65d6 */ 0xc16b,
- /* key: 0x65d7 */ 0x347a,
- /* key: 0x65d8 */ 0xc16c,
- /* key: 0x65d9 */ 0x5a5a,
- /* key: 0x65da */ 0xffff,
- /* key: 0x65db */ 0x5a59,
- /* key: 0x65dc */ 0xffff,
- /* key: 0x65dd */ 0xffff,
- /* key: 0x65de */ 0xffff,
- /* key: 0x65df */ 0xc16d,
- /* key: 0x65e0 */ 0x5a5b,
- /* key: 0x65e1 */ 0x5a5c,
- /* key: 0x65e2 */ 0x347b,
- /* key: 0x65e3 */ 0xffff,
- /* key: 0x65e4 */ 0xffff,
- /* key: 0x65e5 */ 0x467c,
- /* key: 0x65e6 */ 0x4336,
- /* key: 0x65e7 */ 0x356c,
- /* key: 0x65e8 */ 0x3b5d,
- /* key: 0x65e9 */ 0x4161,
- /* key: 0x65ea */ 0xffff,
- /* key: 0x65eb */ 0xffff,
- /* key: 0x65ec */ 0x3d5c,
- /* key: 0x65ed */ 0x3030,
- /* key: 0x65ee */ 0xffff,
- /* key: 0x65ef */ 0xffff,
- /* key: 0x65f0 */ 0xc16e,
- /* key: 0x65f1 */ 0x5a5d,
- /* key: 0x65f2 */ 0xc16f,
- /* key: 0x65f3 */ 0xffff,
- /* key: 0x65f4 */ 0xc170,
- /* key: 0x65f5 */ 0xc171,
- /* key: 0x65f6 */ 0xffff,
- /* key: 0x65f7 */ 0xffff,
- /* key: 0x65f8 */ 0xffff,
- /* key: 0x65f9 */ 0xc172,
- /* key: 0x65fa */ 0x3222,
- /* key: 0x65fb */ 0x5a61,
- /* key: 0x65fc */ 0xffff,
- /* key: 0x65fd */ 0xffff,
- /* key: 0x65fe */ 0xc173,
- /* key: 0x65ff */ 0xc174,
- /* branch: 0x660X */ 8144,
- /* branch: 0x661X */ 8160,
- /* branch: 0x662X */ 8176,
- /* branch: 0x663X */ 8192,
- /* branch: 0x664X */ 8208,
- /* branch: 0x665X */ 8224,
- /* branch: 0x666X */ 8240,
- /* branch: 0x667X */ 8256,
- /* branch: 0x668X */ 8272,
- /* branch: 0x669X */ 8288,
- /* branch: 0x66aX */ 8304,
- /* branch: 0x66bX */ 8320,
- /* branch: 0x66cX */ 8336,
- /* branch: 0x66dX */ 8352,
- /* branch: 0x66eX */ 8368,
- /* branch: 0x66fX */ 8384,
- /* key: 0x6600 */ 0xc175,
- /* key: 0x6601 */ 0xffff,
- /* key: 0x6602 */ 0x3937,
- /* key: 0x6603 */ 0x5a60,
- /* key: 0x6604 */ 0xc176,
- /* key: 0x6605 */ 0xffff,
- /* key: 0x6606 */ 0x3a2b,
- /* key: 0x6607 */ 0x3e3a,
- /* key: 0x6608 */ 0xc177,
- /* key: 0x6609 */ 0xc178,
- /* key: 0x660a */ 0x5a5f,
- /* key: 0x660b */ 0xffff,
- /* key: 0x660c */ 0x3e3b,
- /* key: 0x660d */ 0xc179,
- /* key: 0x660e */ 0x4c40,
- /* key: 0x660f */ 0x3a2a,
- /* key: 0x6610 */ 0xffff,
- /* key: 0x6611 */ 0xc17a,
- /* key: 0x6612 */ 0xc17b,
- /* key: 0x6613 */ 0x3057,
- /* key: 0x6614 */ 0x404e,
- /* key: 0x6615 */ 0xc17c,
- /* key: 0x6616 */ 0xc17d,
- /* key: 0x6617 */ 0xffff,
- /* key: 0x6618 */ 0xffff,
- /* key: 0x6619 */ 0xffff,
- /* key: 0x661a */ 0xffff,
- /* key: 0x661b */ 0xffff,
- /* key: 0x661c */ 0x5a66,
- /* key: 0x661d */ 0xc17e,
- /* key: 0x661e */ 0xc221,
- /* key: 0x661f */ 0x4031,
- /* key: 0x6620 */ 0x3147,
- /* key: 0x6621 */ 0xc222,
- /* key: 0x6622 */ 0xc223,
- /* key: 0x6623 */ 0xc224,
- /* key: 0x6624 */ 0xc225,
- /* key: 0x6625 */ 0x3d55,
- /* key: 0x6626 */ 0xc226,
- /* key: 0x6627 */ 0x4b66,
- /* key: 0x6628 */ 0x3a72,
- /* key: 0x6629 */ 0xc227,
- /* key: 0x662a */ 0xc228,
- /* key: 0x662b */ 0xc229,
- /* key: 0x662c */ 0xc22a,
- /* key: 0x662d */ 0x3e3c,
- /* key: 0x662e */ 0xc22b,
- /* key: 0x662f */ 0x4027,
- /* key: 0x6630 */ 0xc22c,
- /* key: 0x6631 */ 0xc22d,
- /* key: 0x6632 */ 0xffff,
- /* key: 0x6633 */ 0xc22e,
- /* key: 0x6634 */ 0x5a65,
- /* key: 0x6635 */ 0x5a63,
- /* key: 0x6636 */ 0x5a64,
- /* key: 0x6637 */ 0xc230,
- /* key: 0x6638 */ 0xffff,
- /* key: 0x6639 */ 0xc22f,
- /* key: 0x663a */ 0xffff,
- /* key: 0x663b */ 0xffff,
- /* key: 0x663c */ 0x436b,
- /* key: 0x663d */ 0xffff,
- /* key: 0x663e */ 0xffff,
- /* key: 0x663f */ 0x5b26,
- /* key: 0x6640 */ 0xc231,
- /* key: 0x6641 */ 0x5a6a,
- /* key: 0x6642 */ 0x3b7e,
- /* key: 0x6643 */ 0x3938,
- /* key: 0x6644 */ 0x5a68,
- /* key: 0x6645 */ 0xc232,
- /* key: 0x6646 */ 0xc233,
- /* key: 0x6647 */ 0xffff,
- /* key: 0x6648 */ 0xffff,
- /* key: 0x6649 */ 0x5a69,
- /* key: 0x664a */ 0xc234,
- /* key: 0x664b */ 0x3f38,
- /* key: 0x664c */ 0xc235,
- /* key: 0x664d */ 0xffff,
- /* key: 0x664e */ 0xc237,
- /* key: 0x664f */ 0x5a67,
- /* key: 0x6650 */ 0xffff,
- /* key: 0x6651 */ 0xc236,
- /* key: 0x6652 */ 0x3b2f,
- /* key: 0x6653 */ 0xffff,
- /* key: 0x6654 */ 0xffff,
- /* key: 0x6655 */ 0xffff,
- /* key: 0x6656 */ 0xffff,
- /* key: 0x6657 */ 0xc238,
- /* key: 0x6658 */ 0xc239,
- /* key: 0x6659 */ 0xc23a,
- /* key: 0x665a */ 0xffff,
- /* key: 0x665b */ 0xc23b,
- /* key: 0x665c */ 0xc23c,
- /* key: 0x665d */ 0x5a6c,
- /* key: 0x665e */ 0x5a6b,
- /* key: 0x665f */ 0x5a70,
- /* key: 0x6660 */ 0xc23d,
- /* key: 0x6661 */ 0xc23e,
- /* key: 0x6662 */ 0x5a71,
- /* key: 0x6663 */ 0xffff,
- /* key: 0x6664 */ 0x5a6d,
- /* key: 0x6665 */ 0xffff,
- /* key: 0x6666 */ 0x3322,
- /* key: 0x6667 */ 0x5a6e,
- /* key: 0x6668 */ 0x5a6f,
- /* key: 0x6669 */ 0x4855,
- /* key: 0x666a */ 0xc240,
- /* key: 0x666b */ 0xc241,
- /* key: 0x666c */ 0xc242,
- /* key: 0x666d */ 0xffff,
- /* key: 0x666e */ 0x4961,
- /* key: 0x666f */ 0x374a,
- /* key: 0x6670 */ 0x5a72,
- /* key: 0x6671 */ 0xffff,
- /* key: 0x6672 */ 0xffff,
- /* key: 0x6673 */ 0xc244,
- /* key: 0x6674 */ 0x4032,
- /* key: 0x6675 */ 0xc245,
- /* key: 0x6676 */ 0x3e3d,
- /* key: 0x6677 */ 0xc247,
- /* key: 0x6678 */ 0xc248,
- /* key: 0x6679 */ 0xc249,
- /* key: 0x667a */ 0x4352,
- /* key: 0x667b */ 0xc24a,
- /* key: 0x667c */ 0xc24c,
- /* key: 0x667d */ 0xffff,
- /* key: 0x667e */ 0xc243,
- /* key: 0x667f */ 0xc246,
- /* key: 0x6680 */ 0xc24b,
- /* key: 0x6681 */ 0x3647,
- /* key: 0x6682 */ 0xffff,
- /* key: 0x6683 */ 0x5a73,
- /* key: 0x6684 */ 0x5a77,
- /* key: 0x6685 */ 0xffff,
- /* key: 0x6686 */ 0xffff,
- /* key: 0x6687 */ 0x324b,
- /* key: 0x6688 */ 0x5a74,
- /* key: 0x6689 */ 0x5a76,
- /* key: 0x668a */ 0xffff,
- /* key: 0x668b */ 0xc24d,
- /* key: 0x668c */ 0xc24e,
- /* key: 0x668d */ 0xc24f,
- /* key: 0x668e */ 0x5a75,
- /* key: 0x668f */ 0xffff,
- /* key: 0x6690 */ 0xc250,
- /* key: 0x6691 */ 0x3d6b,
- /* key: 0x6692 */ 0xc251,
- /* key: 0x6693 */ 0xffff,
- /* key: 0x6694 */ 0xffff,
- /* key: 0x6695 */ 0xffff,
- /* key: 0x6696 */ 0x4348,
- /* key: 0x6697 */ 0x3045,
- /* key: 0x6698 */ 0x5a78,
- /* key: 0x6699 */ 0xc252,
- /* key: 0x669a */ 0xc253,
- /* key: 0x669b */ 0xc254,
- /* key: 0x669c */ 0xc255,
- /* key: 0x669d */ 0x5a79,
- /* key: 0x669e */ 0xffff,
- /* key: 0x669f */ 0xc256,
- /* key: 0x66a0 */ 0xc257,
- /* key: 0x66a1 */ 0xffff,
- /* key: 0x66a2 */ 0x442a,
- /* key: 0x66a3 */ 0xffff,
- /* key: 0x66a4 */ 0xc258,
- /* key: 0x66a5 */ 0xffff,
- /* key: 0x66a6 */ 0x4e71,
- /* key: 0x66a7 */ 0xffff,
- /* key: 0x66a8 */ 0xffff,
- /* key: 0x66a9 */ 0xffff,
- /* key: 0x66aa */ 0xffff,
- /* key: 0x66ab */ 0x3b43,
- /* key: 0x66ac */ 0xffff,
- /* key: 0x66ad */ 0xc259,
- /* key: 0x66ae */ 0x4a6b,
- /* key: 0x66af */ 0xffff,
- /* key: 0x66b0 */ 0xffff,
- /* key: 0x66b1 */ 0xc25a,
- /* key: 0x66b2 */ 0xc25b,
- /* key: 0x66b3 */ 0xffff,
- /* key: 0x66b4 */ 0x4b3d,
- /* key: 0x66b5 */ 0xc25c,
- /* key: 0x66b6 */ 0xffff,
- /* key: 0x66b7 */ 0xffff,
- /* key: 0x66b8 */ 0x5b22,
- /* key: 0x66b9 */ 0x5a7b,
- /* key: 0x66ba */ 0xffff,
- /* key: 0x66bb */ 0xc25d,
- /* key: 0x66bc */ 0x5a7e,
- /* key: 0x66bd */ 0xffff,
- /* key: 0x66be */ 0x5a7d,
- /* key: 0x66bf */ 0xc25e,
- /* key: 0x66c0 */ 0xc25f,
- /* key: 0x66c1 */ 0x5a7a,
- /* key: 0x66c2 */ 0xc260,
- /* key: 0x66c3 */ 0xc261,
- /* key: 0x66c4 */ 0x5b21,
- /* key: 0x66c5 */ 0xffff,
- /* key: 0x66c6 */ 0xffff,
- /* key: 0x66c7 */ 0x465e,
- /* key: 0x66c8 */ 0xc262,
- /* key: 0x66c9 */ 0x5a7c,
- /* key: 0x66ca */ 0xffff,
- /* key: 0x66cb */ 0xffff,
- /* key: 0x66cc */ 0xc263,
- /* key: 0x66cd */ 0xffff,
- /* key: 0x66ce */ 0xc264,
- /* key: 0x66cf */ 0xc265,
- /* key: 0x66d0 */ 0xffff,
- /* key: 0x66d1 */ 0xffff,
- /* key: 0x66d2 */ 0xffff,
- /* key: 0x66d3 */ 0xffff,
- /* key: 0x66d4 */ 0xc266,
- /* key: 0x66d5 */ 0xffff,
- /* key: 0x66d6 */ 0x5b23,
- /* key: 0x66d7 */ 0xffff,
- /* key: 0x66d8 */ 0xffff,
- /* key: 0x66d9 */ 0x3d6c,
- /* key: 0x66da */ 0x5b24,
- /* key: 0x66db */ 0xc267,
- /* key: 0x66dc */ 0x4d4b,
- /* key: 0x66dd */ 0x4778,
- /* key: 0x66de */ 0xffff,
- /* key: 0x66df */ 0xc268,
- /* key: 0x66e0 */ 0x5b25,
- /* key: 0x66e1 */ 0xffff,
- /* key: 0x66e2 */ 0xffff,
- /* key: 0x66e3 */ 0xffff,
- /* key: 0x66e4 */ 0xffff,
- /* key: 0x66e5 */ 0xffff,
- /* key: 0x66e6 */ 0x5b27,
- /* key: 0x66e7 */ 0xffff,
- /* key: 0x66e8 */ 0xc269,
- /* key: 0x66e9 */ 0x5b28,
- /* key: 0x66ea */ 0xffff,
- /* key: 0x66eb */ 0xc26a,
- /* key: 0x66ec */ 0xc26b,
- /* key: 0x66ed */ 0xffff,
- /* key: 0x66ee */ 0xc26c,
- /* key: 0x66ef */ 0xffff,
- /* key: 0x66f0 */ 0x5b29,
- /* key: 0x66f1 */ 0xffff,
- /* key: 0x66f2 */ 0x364a,
- /* key: 0x66f3 */ 0x3148,
- /* key: 0x66f4 */ 0x3939,
- /* key: 0x66f5 */ 0x5b2a,
- /* key: 0x66f6 */ 0xffff,
- /* key: 0x66f7 */ 0x5b2b,
- /* key: 0x66f8 */ 0x3d71,
- /* key: 0x66f9 */ 0x4162,
- /* key: 0x66fa */ 0xc26d,
- /* key: 0x66fb */ 0xc23f,
- /* key: 0x66fc */ 0x5258,
- /* key: 0x66fd */ 0x413e,
- /* key: 0x66fe */ 0x413d,
- /* key: 0x66ff */ 0x4258,
- /* branch: 0x670X */ 8416,
- /* branch: 0x671X */ 8432,
- /* branch: 0x672X */ 8448,
- /* branch: 0x673X */ 8464,
- /* branch: 0x674X */ 8480,
- /* branch: 0x675X */ 8496,
- /* branch: 0x676X */ 8512,
- /* branch: 0x677X */ 8528,
- /* branch: 0x678X */ 8544,
- /* branch: 0x679X */ 8560,
- /* branch: 0x67aX */ 8576,
- /* branch: 0x67bX */ 8592,
- /* branch: 0x67cX */ 8608,
- /* branch: 0x67dX */ 8624,
- /* branch: 0x67eX */ 8640,
- /* branch: 0x67fX */ 8656,
- /* key: 0x6700 */ 0x3a47,
- /* key: 0x6701 */ 0xffff,
- /* key: 0x6702 */ 0xffff,
- /* key: 0x6703 */ 0x5072,
- /* key: 0x6704 */ 0xffff,
- /* key: 0x6705 */ 0xc26e,
- /* key: 0x6706 */ 0xffff,
- /* key: 0x6707 */ 0xc26f,
- /* key: 0x6708 */ 0x376e,
- /* key: 0x6709 */ 0x4d2d,
- /* key: 0x670a */ 0xffff,
- /* key: 0x670b */ 0x4a7e,
- /* key: 0x670c */ 0xffff,
- /* key: 0x670d */ 0x497e,
- /* key: 0x670e */ 0xc270,
- /* key: 0x670f */ 0x5b2c,
- /* key: 0x6710 */ 0xffff,
- /* key: 0x6711 */ 0xffff,
- /* key: 0x6712 */ 0xffff,
- /* key: 0x6713 */ 0xc271,
- /* key: 0x6714 */ 0x3a73,
- /* key: 0x6715 */ 0x443f,
- /* key: 0x6716 */ 0x5b2d,
- /* key: 0x6717 */ 0x4f2f,
- /* key: 0x6718 */ 0xffff,
- /* key: 0x6719 */ 0xc272,
- /* key: 0x671a */ 0xffff,
- /* key: 0x671b */ 0x4b3e,
- /* key: 0x671c */ 0xc273,
- /* key: 0x671d */ 0x442b,
- /* key: 0x671e */ 0x5b2e,
- /* key: 0x671f */ 0x347c,
- /* key: 0x6720 */ 0xc274,
- /* key: 0x6721 */ 0xffff,
- /* key: 0x6722 */ 0xc275,
- /* key: 0x6723 */ 0xffff,
- /* key: 0x6724 */ 0xffff,
- /* key: 0x6725 */ 0xffff,
- /* key: 0x6726 */ 0x5b2f,
- /* key: 0x6727 */ 0x5b30,
- /* key: 0x6728 */ 0x4c5a,
- /* key: 0x6729 */ 0xffff,
- /* key: 0x672a */ 0x4c24,
- /* key: 0x672b */ 0x4b76,
- /* key: 0x672c */ 0x4b5c,
- /* key: 0x672d */ 0x3b25,
- /* key: 0x672e */ 0x5b32,
- /* key: 0x672f */ 0xffff,
- /* key: 0x6730 */ 0xffff,
- /* key: 0x6731 */ 0x3c6b,
- /* key: 0x6732 */ 0xffff,
- /* key: 0x6733 */ 0xc276,
- /* key: 0x6734 */ 0x4b51,
- /* key: 0x6735 */ 0xffff,
- /* key: 0x6736 */ 0x5b34,
- /* key: 0x6737 */ 0x5b37,
- /* key: 0x6738 */ 0x5b36,
- /* key: 0x6739 */ 0xffff,
- /* key: 0x673a */ 0x3479,
- /* key: 0x673b */ 0xffff,
- /* key: 0x673c */ 0xffff,
- /* key: 0x673d */ 0x3560,
- /* key: 0x673e */ 0xc277,
- /* key: 0x673f */ 0x5b33,
- /* key: 0x6740 */ 0xffff,
- /* key: 0x6741 */ 0x5b35,
- /* key: 0x6742 */ 0xffff,
- /* key: 0x6743 */ 0xffff,
- /* key: 0x6744 */ 0xffff,
- /* key: 0x6745 */ 0xc278,
- /* key: 0x6746 */ 0x5b38,
- /* key: 0x6747 */ 0xc279,
- /* key: 0x6748 */ 0xc27a,
- /* key: 0x6749 */ 0x3f79,
- /* key: 0x674a */ 0xffff,
- /* key: 0x674b */ 0xffff,
- /* key: 0x674c */ 0xc27b,
- /* key: 0x674d */ 0xffff,
- /* key: 0x674e */ 0x4d7b,
- /* key: 0x674f */ 0x3049,
- /* key: 0x6750 */ 0x3a60,
- /* key: 0x6751 */ 0x423c,
- /* key: 0x6752 */ 0xffff,
- /* key: 0x6753 */ 0x3c5d,
- /* key: 0x6754 */ 0xc27c,
- /* key: 0x6755 */ 0xc27d,
- /* key: 0x6756 */ 0x3e73,
- /* key: 0x6757 */ 0xffff,
- /* key: 0x6758 */ 0xffff,
- /* key: 0x6759 */ 0x5b3b,
- /* key: 0x675a */ 0xffff,
- /* key: 0x675b */ 0xffff,
- /* key: 0x675c */ 0x454e,
- /* key: 0x675d */ 0xc27e,
- /* key: 0x675e */ 0x5b39,
- /* key: 0x675f */ 0x422b,
- /* key: 0x6760 */ 0x5b3a,
- /* key: 0x6761 */ 0x3e72,
- /* key: 0x6762 */ 0x4c5d,
- /* key: 0x6763 */ 0x5b3c,
- /* key: 0x6764 */ 0x5b3d,
- /* key: 0x6765 */ 0x4d68,
- /* key: 0x6766 */ 0xc321,
- /* key: 0x6767 */ 0xffff,
- /* key: 0x6768 */ 0xffff,
- /* key: 0x6769 */ 0xffff,
- /* key: 0x676a */ 0x5b42,
- /* key: 0x676b */ 0xffff,
- /* key: 0x676c */ 0xc322,
- /* key: 0x676d */ 0x393a,
- /* key: 0x676e */ 0xc323,
- /* key: 0x676f */ 0x4755,
- /* key: 0x6770 */ 0x5b3f,
- /* key: 0x6771 */ 0x456c,
- /* key: 0x6772 */ 0x5a5e,
- /* key: 0x6773 */ 0x5a62,
- /* key: 0x6774 */ 0xc324,
- /* key: 0x6775 */ 0x354f,
- /* key: 0x6776 */ 0xc325,
- /* key: 0x6777 */ 0x4747,
- /* key: 0x6778 */ 0xffff,
- /* key: 0x6779 */ 0xffff,
- /* key: 0x677a */ 0xffff,
- /* key: 0x677b */ 0xc326,
- /* key: 0x677c */ 0x5b41,
- /* key: 0x677d */ 0xffff,
- /* key: 0x677e */ 0x3e3e,
- /* key: 0x677f */ 0x4844,
- /* key: 0x6780 */ 0xffff,
- /* key: 0x6781 */ 0xc327,
- /* key: 0x6782 */ 0xffff,
- /* key: 0x6783 */ 0xffff,
- /* key: 0x6784 */ 0xc328,
- /* key: 0x6785 */ 0x5b47,
- /* key: 0x6786 */ 0xffff,
- /* key: 0x6787 */ 0x487a,
- /* key: 0x6788 */ 0xffff,
- /* key: 0x6789 */ 0x5b3e,
- /* key: 0x678a */ 0xffff,
- /* key: 0x678b */ 0x5b44,
- /* key: 0x678c */ 0x5b43,
- /* key: 0x678d */ 0xffff,
- /* key: 0x678e */ 0xc329,
- /* key: 0x678f */ 0xc32a,
- /* key: 0x6790 */ 0x404f,
- /* key: 0x6791 */ 0xc32b,
- /* key: 0x6792 */ 0xffff,
- /* key: 0x6793 */ 0xc32c,
- /* key: 0x6794 */ 0xffff,
- /* key: 0x6795 */ 0x4b6d,
- /* key: 0x6796 */ 0xc32d,
- /* key: 0x6797 */ 0x4e53,
- /* key: 0x6798 */ 0xc32e,
- /* key: 0x6799 */ 0xc32f,
- /* key: 0x679a */ 0x4b67,
- /* key: 0x679b */ 0xc330,
- /* key: 0x679c */ 0x324c,
- /* key: 0x679d */ 0x3b5e,
- /* key: 0x679e */ 0xffff,
- /* key: 0x679f */ 0xffff,
- /* key: 0x67a0 */ 0x4f48,
- /* key: 0x67a1 */ 0x5b46,
- /* key: 0x67a2 */ 0x3f75,
- /* key: 0x67a3 */ 0xffff,
- /* key: 0x67a4 */ 0xffff,
- /* key: 0x67a5 */ 0xffff,
- /* key: 0x67a6 */ 0x5b45,
- /* key: 0x67a7 */ 0xffff,
- /* key: 0x67a8 */ 0xffff,
- /* key: 0x67a9 */ 0x5b40,
- /* key: 0x67aa */ 0xffff,
- /* key: 0x67ab */ 0xffff,
- /* key: 0x67ac */ 0xffff,
- /* key: 0x67ad */ 0xffff,
- /* key: 0x67ae */ 0xffff,
- /* key: 0x67af */ 0x384f,
- /* key: 0x67b0 */ 0xc331,
- /* key: 0x67b1 */ 0xc332,
- /* key: 0x67b2 */ 0xc333,
- /* key: 0x67b3 */ 0x5b4c,
- /* key: 0x67b4 */ 0x5b4a,
- /* key: 0x67b5 */ 0xc334,
- /* key: 0x67b6 */ 0x324d,
- /* key: 0x67b7 */ 0x5b48,
- /* key: 0x67b8 */ 0x5b4e,
- /* key: 0x67b9 */ 0x5b54,
- /* key: 0x67ba */ 0xffff,
- /* key: 0x67bb */ 0xc335,
- /* key: 0x67bc */ 0xc336,
- /* key: 0x67bd */ 0xc337,
- /* key: 0x67be */ 0xffff,
- /* key: 0x67bf */ 0xffff,
- /* key: 0x67c0 */ 0xc339,
- /* key: 0x67c1 */ 0x4248,
- /* key: 0x67c2 */ 0xc33a,
- /* key: 0x67c3 */ 0xc33b,
- /* key: 0x67c4 */ 0x4a41,
- /* key: 0x67c5 */ 0xc33c,
- /* key: 0x67c6 */ 0x5b56,
- /* key: 0x67c7 */ 0xffff,
- /* key: 0x67c8 */ 0xc33d,
- /* key: 0x67c9 */ 0xc33e,
- /* key: 0x67ca */ 0x4922,
- /* key: 0x67cb */ 0xffff,
- /* key: 0x67cc */ 0xffff,
- /* key: 0x67cd */ 0xffff,
- /* key: 0x67ce */ 0x5b55,
- /* key: 0x67cf */ 0x4770,
- /* key: 0x67d0 */ 0x4b3f,
- /* key: 0x67d1 */ 0x343b,
- /* key: 0x67d2 */ 0xc33f,
- /* key: 0x67d3 */ 0x4077,
- /* key: 0x67d4 */ 0x3d40,
- /* key: 0x67d5 */ 0xffff,
- /* key: 0x67d6 */ 0xffff,
- /* key: 0x67d7 */ 0xc340,
- /* key: 0x67d8 */ 0x4453,
- /* key: 0x67d9 */ 0xc341,
- /* key: 0x67da */ 0x4d2e,
- /* key: 0x67db */ 0xffff,
- /* key: 0x67dc */ 0xc342,
- /* key: 0x67dd */ 0x5b51,
- /* key: 0x67de */ 0x5b50,
- /* key: 0x67df */ 0xffff,
- /* key: 0x67e0 */ 0xffff,
- /* key: 0x67e1 */ 0xc343,
- /* key: 0x67e2 */ 0x5b52,
- /* key: 0x67e3 */ 0xffff,
- /* key: 0x67e4 */ 0x5b4f,
- /* key: 0x67e5 */ 0xffff,
- /* key: 0x67e6 */ 0xc344,
- /* key: 0x67e7 */ 0x5b57,
- /* key: 0x67e8 */ 0xffff,
- /* key: 0x67e9 */ 0x5b4d,
- /* key: 0x67ea */ 0xffff,
- /* key: 0x67eb */ 0xffff,
- /* key: 0x67ec */ 0x5b4b,
- /* key: 0x67ed */ 0xffff,
- /* key: 0x67ee */ 0x5b53,
- /* key: 0x67ef */ 0x5b49,
- /* key: 0x67f0 */ 0xc345,
- /* key: 0x67f1 */ 0x436c,
- /* key: 0x67f2 */ 0xc346,
- /* key: 0x67f3 */ 0x4c78,
- /* key: 0x67f4 */ 0x3c46,
- /* key: 0x67f5 */ 0x3a74,
- /* key: 0x67f6 */ 0xc347,
- /* key: 0x67f7 */ 0xc348,
- /* key: 0x67f8 */ 0xffff,
- /* key: 0x67f9 */ 0xc338,
- /* key: 0x67fa */ 0xffff,
- /* key: 0x67fb */ 0x3a3a,
- /* key: 0x67fc */ 0xffff,
- /* key: 0x67fd */ 0xffff,
- /* key: 0x67fe */ 0x4b6f,
- /* key: 0x67ff */ 0x3341,
- /* branch: 0x680X */ 8688,
- /* branch: 0x681X */ 8704,
- /* branch: 0x682X */ 8720,
- /* branch: 0x683X */ 8736,
- /* branch: 0x684X */ 8752,
- /* branch: 0x685X */ 8768,
- /* branch: 0x686X */ 8784,
- /* branch: 0x687X */ 8800,
- /* branch: 0x688X */ 8816,
- /* branch: 0x689X */ 8832,
- /* branch: 0x68aX */ 8848,
- /* branch: 0x68bX */ 8864,
- /* branch: 0x68cX */ 8880,
- /* branch: 0x68dX */ 8896,
- /* branch: 0x68eX */ 8912,
- /* branch: 0x68fX */ 8928,
- /* key: 0x6800 */ 0xffff,
- /* key: 0x6801 */ 0xffff,
- /* key: 0x6802 */ 0x444e,
- /* key: 0x6803 */ 0x464a,
- /* key: 0x6804 */ 0x3149,
- /* key: 0x6805 */ 0xffff,
- /* key: 0x6806 */ 0xffff,
- /* key: 0x6807 */ 0xffff,
- /* key: 0x6808 */ 0xffff,
- /* key: 0x6809 */ 0xffff,
- /* key: 0x680a */ 0xffff,
- /* key: 0x680b */ 0xffff,
- /* key: 0x680c */ 0xffff,
- /* key: 0x680d */ 0xffff,
- /* key: 0x680e */ 0xffff,
- /* key: 0x680f */ 0xffff,
- /* key: 0x6810 */ 0xffff,
- /* key: 0x6811 */ 0xffff,
- /* key: 0x6812 */ 0xffff,
- /* key: 0x6813 */ 0x4072,
- /* key: 0x6814 */ 0xc34a,
- /* key: 0x6815 */ 0xffff,
- /* key: 0x6816 */ 0x4034,
- /* key: 0x6817 */ 0x372a,
- /* key: 0x6818 */ 0xffff,
- /* key: 0x6819 */ 0xc34b,
- /* key: 0x681a */ 0xffff,
- /* key: 0x681b */ 0xffff,
- /* key: 0x681c */ 0xffff,
- /* key: 0x681d */ 0xc34c,
- /* key: 0x681e */ 0x5b59,
- /* key: 0x681f */ 0xc34d,
- /* key: 0x6820 */ 0xffff,
- /* key: 0x6821 */ 0x393b,
- /* key: 0x6822 */ 0x337c,
- /* key: 0x6823 */ 0xffff,
- /* key: 0x6824 */ 0xffff,
- /* key: 0x6825 */ 0xffff,
- /* key: 0x6826 */ 0xffff,
- /* key: 0x6827 */ 0xc34f,
- /* key: 0x6828 */ 0xc34e,
- /* key: 0x6829 */ 0x5b5b,
- /* key: 0x682a */ 0x3374,
- /* key: 0x682b */ 0x5b61,
- /* key: 0x682c */ 0xc350,
- /* key: 0x682d */ 0xc351,
- /* key: 0x682e */ 0xffff,
- /* key: 0x682f */ 0xc352,
- /* key: 0x6830 */ 0xc353,
- /* key: 0x6831 */ 0xc354,
- /* key: 0x6832 */ 0x5b5e,
- /* key: 0x6833 */ 0xc355,
- /* key: 0x6834 */ 0x4073,
- /* key: 0x6835 */ 0xffff,
- /* key: 0x6836 */ 0xffff,
- /* key: 0x6837 */ 0xffff,
- /* key: 0x6838 */ 0x334b,
- /* key: 0x6839 */ 0x3a2c,
- /* key: 0x683a */ 0xffff,
- /* key: 0x683b */ 0xc356,
- /* key: 0x683c */ 0x334a,
- /* key: 0x683d */ 0x3a4f,
- /* key: 0x683e */ 0xffff,
- /* key: 0x683f */ 0xc357,
- /* key: 0x6840 */ 0x5b5c,
- /* key: 0x6841 */ 0x3765,
- /* key: 0x6842 */ 0x374b,
- /* key: 0x6843 */ 0x456d,
- /* key: 0x6844 */ 0xc358,
- /* key: 0x6845 */ 0xc359,
- /* key: 0x6846 */ 0x5b5a,
- /* key: 0x6847 */ 0xffff,
- /* key: 0x6848 */ 0x3046,
- /* key: 0x6849 */ 0xffff,
- /* key: 0x684a */ 0xc35a,
- /* key: 0x684b */ 0xffff,
- /* key: 0x684c */ 0xc35b,
- /* key: 0x684d */ 0x5b5d,
- /* key: 0x684e */ 0x5b5f,
- /* key: 0x684f */ 0xffff,
- /* key: 0x6850 */ 0x364d,
- /* key: 0x6851 */ 0x372c,
- /* key: 0x6852 */ 0xc349,
- /* key: 0x6853 */ 0x343c,
- /* key: 0x6854 */ 0x354b,
- /* key: 0x6855 */ 0xc35c,
- /* key: 0x6856 */ 0xffff,
- /* key: 0x6857 */ 0xc35d,
- /* key: 0x6858 */ 0xc35e,
- /* key: 0x6859 */ 0x5b62,
- /* key: 0x685a */ 0xffff,
- /* key: 0x685b */ 0xc35f,
- /* key: 0x685c */ 0x3a79,
- /* key: 0x685d */ 0x4b71,
- /* key: 0x685e */ 0xffff,
- /* key: 0x685f */ 0x3b37,
- /* key: 0x6860 */ 0xffff,
- /* key: 0x6861 */ 0xffff,
- /* key: 0x6862 */ 0xffff,
- /* key: 0x6863 */ 0x5b63,
- /* key: 0x6864 */ 0xffff,
- /* key: 0x6865 */ 0xffff,
- /* key: 0x6866 */ 0xffff,
- /* key: 0x6867 */ 0x4930,
- /* key: 0x6868 */ 0xffff,
- /* key: 0x6869 */ 0xffff,
- /* key: 0x686a */ 0xffff,
- /* key: 0x686b */ 0xc360,
- /* key: 0x686c */ 0xffff,
- /* key: 0x686d */ 0xffff,
- /* key: 0x686e */ 0xc361,
- /* key: 0x686f */ 0xc362,
- /* key: 0x6870 */ 0xc363,
- /* key: 0x6871 */ 0xc364,
- /* key: 0x6872 */ 0xc365,
- /* key: 0x6873 */ 0xffff,
- /* key: 0x6874 */ 0x5b6f,
- /* key: 0x6875 */ 0xc366,
- /* key: 0x6876 */ 0x3233,
- /* key: 0x6877 */ 0x5b64,
- /* key: 0x6878 */ 0xffff,
- /* key: 0x6879 */ 0xc367,
- /* key: 0x687a */ 0xc368,
- /* key: 0x687b */ 0xc369,
- /* key: 0x687c */ 0xc36a,
- /* key: 0x687d */ 0xffff,
- /* key: 0x687e */ 0x5b75,
- /* key: 0x687f */ 0x5b65,
- /* key: 0x6880 */ 0xffff,
- /* key: 0x6881 */ 0x4e42,
- /* key: 0x6882 */ 0xc36b,
- /* key: 0x6883 */ 0x5b6c,
- /* key: 0x6884 */ 0xc36c,
- /* key: 0x6885 */ 0x475f,
- /* key: 0x6886 */ 0xc36d,
- /* key: 0x6887 */ 0xffff,
- /* key: 0x6888 */ 0xc36e,
- /* key: 0x6889 */ 0xffff,
- /* key: 0x688a */ 0xffff,
- /* key: 0x688b */ 0xffff,
- /* key: 0x688c */ 0xffff,
- /* key: 0x688d */ 0x5b74,
- /* key: 0x688e */ 0xffff,
- /* key: 0x688f */ 0x5b67,
- /* key: 0x6890 */ 0xffff,
- /* key: 0x6891 */ 0xffff,
- /* key: 0x6892 */ 0xffff,
- /* key: 0x6893 */ 0x3034,
- /* key: 0x6894 */ 0x5b69,
- /* key: 0x6895 */ 0xffff,
- /* key: 0x6896 */ 0xc36f,
- /* key: 0x6897 */ 0x393c,
- /* key: 0x6898 */ 0xc370,
- /* key: 0x6899 */ 0xffff,
- /* key: 0x689a */ 0xc371,
- /* key: 0x689b */ 0x5b6b,
- /* key: 0x689c */ 0xc372,
- /* key: 0x689d */ 0x5b6a,
- /* key: 0x689e */ 0xffff,
- /* key: 0x689f */ 0x5b66,
- /* key: 0x68a0 */ 0x5b71,
- /* key: 0x68a1 */ 0xc373,
- /* key: 0x68a2 */ 0x3e3f,
- /* key: 0x68a3 */ 0xc374,
- /* key: 0x68a4 */ 0xffff,
- /* key: 0x68a5 */ 0xc375,
- /* key: 0x68a6 */ 0x546d,
- /* key: 0x68a7 */ 0x3868,
- /* key: 0x68a8 */ 0x4d7c,
- /* key: 0x68a9 */ 0xc376,
- /* key: 0x68aa */ 0xc377,
- /* key: 0x68ab */ 0xffff,
- /* key: 0x68ac */ 0xffff,
- /* key: 0x68ad */ 0x5b68,
- /* key: 0x68ae */ 0xc378,
- /* key: 0x68af */ 0x4474,
- /* key: 0x68b0 */ 0x3323,
- /* key: 0x68b1 */ 0x3a2d,
- /* key: 0x68b2 */ 0xc379,
- /* key: 0x68b3 */ 0x5b60,
- /* key: 0x68b4 */ 0xffff,
- /* key: 0x68b5 */ 0x5b70,
- /* key: 0x68b6 */ 0x3361,
- /* key: 0x68b7 */ 0xffff,
- /* key: 0x68b8 */ 0xffff,
- /* key: 0x68b9 */ 0x5b6e,
- /* key: 0x68ba */ 0x5b72,
- /* key: 0x68bb */ 0xc37a,
- /* key: 0x68bc */ 0x456e,
- /* key: 0x68bd */ 0xffff,
- /* key: 0x68be */ 0xffff,
- /* key: 0x68bf */ 0xffff,
- /* key: 0x68c0 */ 0xffff,
- /* key: 0x68c1 */ 0xffff,
- /* key: 0x68c2 */ 0xffff,
- /* key: 0x68c3 */ 0xffff,
- /* key: 0x68c4 */ 0x347e,
- /* key: 0x68c5 */ 0xc37b,
- /* key: 0x68c6 */ 0x5c32,
- /* key: 0x68c7 */ 0xffff,
- /* key: 0x68c8 */ 0xc37c,
- /* key: 0x68c9 */ 0x4c49,
- /* key: 0x68ca */ 0x5b77,
- /* key: 0x68cb */ 0x347d,
- /* key: 0x68cc */ 0xc37d,
- /* key: 0x68cd */ 0x5b7e,
- /* key: 0x68ce */ 0xffff,
- /* key: 0x68cf */ 0xc37e,
- /* key: 0x68d0 */ 0xc421,
- /* key: 0x68d1 */ 0xc422,
- /* key: 0x68d2 */ 0x4b40,
- /* key: 0x68d3 */ 0xc423,
- /* key: 0x68d4 */ 0x5c21,
- /* key: 0x68d5 */ 0x5c23,
- /* key: 0x68d6 */ 0xc424,
- /* key: 0x68d7 */ 0x5c27,
- /* key: 0x68d8 */ 0x5b79,
- /* key: 0x68d9 */ 0xc425,
- /* key: 0x68da */ 0x432a,
- /* key: 0x68db */ 0xffff,
- /* key: 0x68dc */ 0xc426,
- /* key: 0x68dd */ 0xc427,
- /* key: 0x68de */ 0xffff,
- /* key: 0x68df */ 0x456f,
- /* key: 0x68e0 */ 0x5c2b,
- /* key: 0x68e1 */ 0x5b7c,
- /* key: 0x68e2 */ 0xffff,
- /* key: 0x68e3 */ 0x5c28,
- /* key: 0x68e4 */ 0xffff,
- /* key: 0x68e5 */ 0xc428,
- /* key: 0x68e6 */ 0xffff,
- /* key: 0x68e7 */ 0x5c22,
- /* key: 0x68e8 */ 0xc429,
- /* key: 0x68e9 */ 0xffff,
- /* key: 0x68ea */ 0xc42a,
- /* key: 0x68eb */ 0xc42b,
- /* key: 0x68ec */ 0xc42c,
- /* key: 0x68ed */ 0xc42d,
- /* key: 0x68ee */ 0x3f39,
- /* key: 0x68ef */ 0x5c2c,
- /* key: 0x68f0 */ 0xc42e,
- /* key: 0x68f1 */ 0xc42f,
- /* key: 0x68f2 */ 0x4033,
- /* key: 0x68f3 */ 0xffff,
- /* key: 0x68f4 */ 0xffff,
- /* key: 0x68f5 */ 0xc430,
- /* key: 0x68f6 */ 0xc431,
- /* key: 0x68f7 */ 0xffff,
- /* key: 0x68f8 */ 0xffff,
- /* key: 0x68f9 */ 0x5c2a,
- /* key: 0x68fa */ 0x343d,
- /* key: 0x68fb */ 0xc432,
- /* key: 0x68fc */ 0xc433,
- /* key: 0x68fd */ 0xc434,
- /* key: 0x68fe */ 0xffff,
- /* key: 0x68ff */ 0xffff,
- /* branch: 0x690X */ 8960,
- /* branch: 0x691X */ 8976,
- /* branch: 0x692X */ 8992,
- /* branch: 0x693X */ 9008,
- /* branch: 0x694X */ 9024,
- /* branch: 0x695X */ 9040,
- /* branch: 0x696X */ 9056,
- /* branch: 0x697X */ 9072,
- /* branch: 0x698X */ 9088,
- /* branch: 0x699X */ 9104,
- /* branch: 0x69aX */ 9120,
- /* branch: 0x69bX */ 9136,
- /* branch: 0x69cX */ 9152,
- /* branch: 0x69dX */ 9168,
- /* branch: 0x69eX */ 9184,
- /* branch: 0x69fX */ 9200,
- /* key: 0x6900 */ 0x4f50,
- /* key: 0x6901 */ 0x5b76,
- /* key: 0x6902 */ 0xffff,
- /* key: 0x6903 */ 0xffff,
- /* key: 0x6904 */ 0x5c26,
- /* key: 0x6905 */ 0x3058,
- /* key: 0x6906 */ 0xc435,
- /* key: 0x6907 */ 0xffff,
- /* key: 0x6908 */ 0x5b78,
- /* key: 0x6909 */ 0xc436,
- /* key: 0x690a */ 0xc437,
- /* key: 0x690b */ 0x4c3a,
- /* key: 0x690c */ 0x5b7d,
- /* key: 0x690d */ 0x3f22,
- /* key: 0x690e */ 0x4447,
- /* key: 0x690f */ 0x5b73,
- /* key: 0x6910 */ 0xc438,
- /* key: 0x6911 */ 0xc439,
- /* key: 0x6912 */ 0x5c25,
- /* key: 0x6913 */ 0xc43a,
- /* key: 0x6914 */ 0xffff,
- /* key: 0x6915 */ 0xffff,
- /* key: 0x6916 */ 0xc43b,
- /* key: 0x6917 */ 0xc43c,
- /* key: 0x6918 */ 0xffff,
- /* key: 0x6919 */ 0x3f7a,
- /* key: 0x691a */ 0x5c2f,
- /* key: 0x691b */ 0x3371,
- /* key: 0x691c */ 0x3821,
- /* key: 0x691d */ 0xffff,
- /* key: 0x691e */ 0xffff,
- /* key: 0x691f */ 0xffff,
- /* key: 0x6920 */ 0xffff,
- /* key: 0x6921 */ 0x5c31,
- /* key: 0x6922 */ 0x5b7a,
- /* key: 0x6923 */ 0x5c30,
- /* key: 0x6924 */ 0xffff,
- /* key: 0x6925 */ 0x5c29,
- /* key: 0x6926 */ 0x5b7b,
- /* key: 0x6927 */ 0xffff,
- /* key: 0x6928 */ 0x5c2d,
- /* key: 0x6929 */ 0xffff,
- /* key: 0x692a */ 0x5c2e,
- /* key: 0x692b */ 0xffff,
- /* key: 0x692c */ 0xffff,
- /* key: 0x692d */ 0xffff,
- /* key: 0x692e */ 0xffff,
- /* key: 0x692f */ 0xffff,
- /* key: 0x6930 */ 0x5c3f,
- /* key: 0x6931 */ 0xc43d,
- /* key: 0x6932 */ 0xffff,
- /* key: 0x6933 */ 0xc43e,
- /* key: 0x6934 */ 0x464e,
- /* key: 0x6935 */ 0xc43f,
- /* key: 0x6936 */ 0x5c24,
- /* key: 0x6937 */ 0xffff,
- /* key: 0x6938 */ 0xc440,
- /* key: 0x6939 */ 0x5c3b,
- /* key: 0x693a */ 0xffff,
- /* key: 0x693b */ 0xc441,
- /* key: 0x693c */ 0xffff,
- /* key: 0x693d */ 0x5c3d,
- /* key: 0x693e */ 0xffff,
- /* key: 0x693f */ 0x4458,
- /* key: 0x6940 */ 0xffff,
- /* key: 0x6941 */ 0xffff,
- /* key: 0x6942 */ 0xc442,
- /* key: 0x6943 */ 0xffff,
- /* key: 0x6944 */ 0xffff,
- /* key: 0x6945 */ 0xc443,
- /* key: 0x6946 */ 0xffff,
- /* key: 0x6947 */ 0xffff,
- /* key: 0x6948 */ 0xffff,
- /* key: 0x6949 */ 0xc444,
- /* key: 0x694a */ 0x4d4c,
- /* key: 0x694b */ 0xffff,
- /* key: 0x694c */ 0xffff,
- /* key: 0x694d */ 0xffff,
- /* key: 0x694e */ 0xc445,
- /* key: 0x694f */ 0xffff,
- /* key: 0x6950 */ 0xffff,
- /* key: 0x6951 */ 0xffff,
- /* key: 0x6952 */ 0xffff,
- /* key: 0x6953 */ 0x4976,
- /* key: 0x6954 */ 0x5c38,
- /* key: 0x6955 */ 0x424a,
- /* key: 0x6956 */ 0xffff,
- /* key: 0x6957 */ 0xc446,
- /* key: 0x6958 */ 0xffff,
- /* key: 0x6959 */ 0x5c3e,
- /* key: 0x695a */ 0x413f,
- /* key: 0x695b */ 0xc447,
- /* key: 0x695c */ 0x5c35,
- /* key: 0x695d */ 0x5c42,
- /* key: 0x695e */ 0x5c41,
- /* key: 0x695f */ 0xffff,
- /* key: 0x6960 */ 0x466f,
- /* key: 0x6961 */ 0x5c40,
- /* key: 0x6962 */ 0x466a,
- /* key: 0x6963 */ 0xc448,
- /* key: 0x6964 */ 0xc449,
- /* key: 0x6965 */ 0xc44a,
- /* key: 0x6966 */ 0xc44b,
- /* key: 0x6967 */ 0xffff,
- /* key: 0x6968 */ 0xc44c,
- /* key: 0x6969 */ 0xc44d,
- /* key: 0x696a */ 0x5c44,
- /* key: 0x696b */ 0x5c37,
- /* key: 0x696c */ 0xc44e,
- /* key: 0x696d */ 0x3648,
- /* key: 0x696e */ 0x5c3a,
- /* key: 0x696f */ 0x3d5d,
- /* key: 0x6970 */ 0xc44f,
- /* key: 0x6971 */ 0xc450,
- /* key: 0x6972 */ 0xc451,
- /* key: 0x6973 */ 0x4760,
- /* key: 0x6974 */ 0x5c3c,
- /* key: 0x6975 */ 0x364b,
- /* key: 0x6976 */ 0xffff,
- /* key: 0x6977 */ 0x5c34,
- /* key: 0x6978 */ 0x5c36,
- /* key: 0x6979 */ 0x5c33,
- /* key: 0x697a */ 0xc452,
- /* key: 0x697b */ 0xc453,
- /* key: 0x697c */ 0x4f30,
- /* key: 0x697d */ 0x335a,
- /* key: 0x697e */ 0x5c39,
- /* key: 0x697f */ 0xc454,
- /* key: 0x6980 */ 0xc455,
- /* key: 0x6981 */ 0x5c43,
- /* key: 0x6982 */ 0x3335,
- /* key: 0x6983 */ 0xffff,
- /* key: 0x6984 */ 0xffff,
- /* key: 0x6985 */ 0xffff,
- /* key: 0x6986 */ 0xffff,
- /* key: 0x6987 */ 0xffff,
- /* key: 0x6988 */ 0xffff,
- /* key: 0x6989 */ 0xffff,
- /* key: 0x698a */ 0x3a67,
- /* key: 0x698b */ 0xffff,
- /* key: 0x698c */ 0xffff,
- /* key: 0x698d */ 0xc456,
- /* key: 0x698e */ 0x315d,
- /* key: 0x698f */ 0xffff,
- /* key: 0x6990 */ 0xffff,
- /* key: 0x6991 */ 0x5c54,
- /* key: 0x6992 */ 0xc457,
- /* key: 0x6993 */ 0xffff,
- /* key: 0x6994 */ 0x4f31,
- /* key: 0x6995 */ 0x5c57,
- /* key: 0x6996 */ 0xc458,
- /* key: 0x6997 */ 0xffff,
- /* key: 0x6998 */ 0xc459,
- /* key: 0x6999 */ 0xffff,
- /* key: 0x699a */ 0xffff,
- /* key: 0x699b */ 0x3f3a,
- /* key: 0x699c */ 0x5c56,
- /* key: 0x699d */ 0xffff,
- /* key: 0x699e */ 0xffff,
- /* key: 0x699f */ 0xffff,
- /* key: 0x69a0 */ 0x5c55,
- /* key: 0x69a1 */ 0xc45a,
- /* key: 0x69a2 */ 0xffff,
- /* key: 0x69a3 */ 0xffff,
- /* key: 0x69a4 */ 0xffff,
- /* key: 0x69a5 */ 0xc45b,
- /* key: 0x69a6 */ 0xc45c,
- /* key: 0x69a7 */ 0x5c52,
- /* key: 0x69a8 */ 0xc45d,
- /* key: 0x69a9 */ 0xffff,
- /* key: 0x69aa */ 0xffff,
- /* key: 0x69ab */ 0xc45e,
- /* key: 0x69ac */ 0xffff,
- /* key: 0x69ad */ 0xc45f,
- /* key: 0x69ae */ 0x5c46,
- /* key: 0x69af */ 0xc460,
- /* key: 0x69b0 */ 0xffff,
- /* key: 0x69b1 */ 0x5c63,
- /* key: 0x69b2 */ 0x5c45,
- /* key: 0x69b3 */ 0xffff,
- /* key: 0x69b4 */ 0x5c58,
- /* key: 0x69b5 */ 0xffff,
- /* key: 0x69b6 */ 0xffff,
- /* key: 0x69b7 */ 0xc461,
- /* key: 0x69b8 */ 0xc462,
- /* key: 0x69b9 */ 0xffff,
- /* key: 0x69ba */ 0xc463,
- /* key: 0x69bb */ 0x5c50,
- /* key: 0x69bc */ 0xc464,
- /* key: 0x69bd */ 0xffff,
- /* key: 0x69be */ 0x5c4b,
- /* key: 0x69bf */ 0x5c48,
- /* key: 0x69c0 */ 0xffff,
- /* key: 0x69c1 */ 0x5c49,
- /* key: 0x69c2 */ 0xffff,
- /* key: 0x69c3 */ 0x5c51,
- /* key: 0x69c4 */ 0xffff,
- /* key: 0x69c5 */ 0xc465,
- /* key: 0x69c6 */ 0xffff,
- /* key: 0x69c7 */ 0x7422,
- /* key: 0x69c8 */ 0xc466,
- /* key: 0x69c9 */ 0xffff,
- /* key: 0x69ca */ 0x5c4e,
- /* key: 0x69cb */ 0x393d,
- /* key: 0x69cc */ 0x4448,
- /* key: 0x69cd */ 0x4164,
- /* key: 0x69ce */ 0x5c4c,
- /* key: 0x69cf */ 0xffff,
- /* key: 0x69d0 */ 0x5c47,
- /* key: 0x69d1 */ 0xc467,
- /* key: 0x69d2 */ 0xffff,
- /* key: 0x69d3 */ 0x5c4a,
- /* key: 0x69d4 */ 0xffff,
- /* key: 0x69d5 */ 0xffff,
- /* key: 0x69d6 */ 0xc468,
- /* key: 0x69d7 */ 0xc469,
- /* key: 0x69d8 */ 0x4d4d,
- /* key: 0x69d9 */ 0x4b6a,
- /* key: 0x69da */ 0xffff,
- /* key: 0x69db */ 0xffff,
- /* key: 0x69dc */ 0xffff,
- /* key: 0x69dd */ 0x5c4f,
- /* key: 0x69de */ 0x5c59,
- /* key: 0x69df */ 0xffff,
- /* key: 0x69e0 */ 0xffff,
- /* key: 0x69e1 */ 0xffff,
- /* key: 0x69e2 */ 0xc46a,
- /* key: 0x69e3 */ 0xffff,
- /* key: 0x69e4 */ 0xffff,
- /* key: 0x69e5 */ 0xc46b,
- /* key: 0x69e6 */ 0xffff,
- /* key: 0x69e7 */ 0x5c61,
- /* key: 0x69e8 */ 0x5c5a,
- /* key: 0x69e9 */ 0xffff,
- /* key: 0x69ea */ 0xffff,
- /* key: 0x69eb */ 0x5c67,
- /* key: 0x69ec */ 0xffff,
- /* key: 0x69ed */ 0x5c65,
- /* key: 0x69ee */ 0xc46c,
- /* key: 0x69ef */ 0xc46d,
- /* key: 0x69f0 */ 0xffff,
- /* key: 0x69f1 */ 0xc46e,
- /* key: 0x69f2 */ 0x5c60,
- /* key: 0x69f3 */ 0xc46f,
- /* key: 0x69f4 */ 0xffff,
- /* key: 0x69f5 */ 0xc470,
- /* key: 0x69f6 */ 0xffff,
- /* key: 0x69f7 */ 0xffff,
- /* key: 0x69f8 */ 0xffff,
- /* key: 0x69f9 */ 0x5c5f,
- /* key: 0x69fa */ 0xffff,
- /* key: 0x69fb */ 0x4450,
- /* key: 0x69fc */ 0xffff,
- /* key: 0x69fd */ 0x4165,
- /* key: 0x69fe */ 0xc471,
- /* key: 0x69ff */ 0x5c5d,
- /* branch: 0x6a0X */ 9232,
- /* branch: 0x6a1X */ 9248,
- /* branch: 0x6a2X */ 9264,
- /* branch: 0x6a3X */ 9280,
- /* branch: 0x6a4X */ 9296,
- /* branch: 0x6a5X */ 9312,
- /* branch: 0x6a6X */ 9328,
- /* branch: 0x6a7X */ 9344,
- /* branch: 0x6a8X */ 9360,
- /* branch: 0x6a9X */ 9376,
- /* branch: 0x6aaX */ 9392,
- /* branch: 0x6abX */ 9408,
- /* branch: 0x6acX */ 9424,
- /* branch: 0x6adX */ 9440,
- /* branch: 0x6aeX */ 9456,
- /* branch: 0x6afX */ 9472,
- /* key: 0x6a00 */ 0xc472,
- /* key: 0x6a01 */ 0xc473,
- /* key: 0x6a02 */ 0x5c5b,
- /* key: 0x6a03 */ 0xc474,
- /* key: 0x6a04 */ 0xffff,
- /* key: 0x6a05 */ 0x5c62,
- /* key: 0x6a06 */ 0xffff,
- /* key: 0x6a07 */ 0xffff,
- /* key: 0x6a08 */ 0xffff,
- /* key: 0x6a09 */ 0xffff,
- /* key: 0x6a0a */ 0x5c68,
- /* key: 0x6a0b */ 0x4875,
- /* key: 0x6a0c */ 0x5c6e,
- /* key: 0x6a0d */ 0xffff,
- /* key: 0x6a0e */ 0xffff,
- /* key: 0x6a0f */ 0xc475,
- /* key: 0x6a10 */ 0xffff,
- /* key: 0x6a11 */ 0xc476,
- /* key: 0x6a12 */ 0x5c69,
- /* key: 0x6a13 */ 0x5c6c,
- /* key: 0x6a14 */ 0x5c66,
- /* key: 0x6a15 */ 0xc477,
- /* key: 0x6a16 */ 0xffff,
- /* key: 0x6a17 */ 0x4374,
- /* key: 0x6a18 */ 0xffff,
- /* key: 0x6a19 */ 0x4938,
- /* key: 0x6a1a */ 0xc478,
- /* key: 0x6a1b */ 0x5c5c,
- /* key: 0x6a1c */ 0xffff,
- /* key: 0x6a1d */ 0xc479,
- /* key: 0x6a1e */ 0x5c64,
- /* key: 0x6a1f */ 0x3e40,
- /* key: 0x6a20 */ 0xc47a,
- /* key: 0x6a21 */ 0x4c4f,
- /* key: 0x6a22 */ 0x5c78,
- /* key: 0x6a23 */ 0x5c6b,
- /* key: 0x6a24 */ 0xc47b,
- /* key: 0x6a25 */ 0xffff,
- /* key: 0x6a26 */ 0xffff,
- /* key: 0x6a27 */ 0xffff,
- /* key: 0x6a28 */ 0xc47c,
- /* key: 0x6a29 */ 0x3822,
- /* key: 0x6a2a */ 0x3223,
- /* key: 0x6a2b */ 0x335f,
- /* key: 0x6a2c */ 0xffff,
- /* key: 0x6a2d */ 0xffff,
- /* key: 0x6a2e */ 0x5c53,
- /* key: 0x6a2f */ 0xffff,
- /* key: 0x6a30 */ 0xc47d,
- /* key: 0x6a31 */ 0xffff,
- /* key: 0x6a32 */ 0xc47e,
- /* key: 0x6a33 */ 0xffff,
- /* key: 0x6a34 */ 0xc521,
- /* key: 0x6a35 */ 0x3e41,
- /* key: 0x6a36 */ 0x5c70,
- /* key: 0x6a37 */ 0xc522,
- /* key: 0x6a38 */ 0x5c77,
- /* key: 0x6a39 */ 0x3c79,
- /* key: 0x6a3a */ 0x3372,
- /* key: 0x6a3b */ 0xc523,
- /* key: 0x6a3c */ 0xffff,
- /* key: 0x6a3d */ 0x432e,
- /* key: 0x6a3e */ 0xc524,
- /* key: 0x6a3f */ 0xc525,
- /* key: 0x6a40 */ 0xffff,
- /* key: 0x6a41 */ 0xffff,
- /* key: 0x6a42 */ 0xffff,
- /* key: 0x6a43 */ 0xffff,
- /* key: 0x6a44 */ 0x5c6d,
- /* key: 0x6a45 */ 0xc526,
- /* key: 0x6a46 */ 0xc527,
- /* key: 0x6a47 */ 0x5c72,
- /* key: 0x6a48 */ 0x5c76,
- /* key: 0x6a49 */ 0xc528,
- /* key: 0x6a4a */ 0xc529,
- /* key: 0x6a4b */ 0x3636,
- /* key: 0x6a4c */ 0xffff,
- /* key: 0x6a4d */ 0xffff,
- /* key: 0x6a4e */ 0xc52a,
- /* key: 0x6a4f */ 0xffff,
- /* key: 0x6a50 */ 0xc52b,
- /* key: 0x6a51 */ 0xc52c,
- /* key: 0x6a52 */ 0xc52d,
- /* key: 0x6a53 */ 0xffff,
- /* key: 0x6a54 */ 0xffff,
- /* key: 0x6a55 */ 0xc52e,
- /* key: 0x6a56 */ 0xc52f,
- /* key: 0x6a57 */ 0xffff,
- /* key: 0x6a58 */ 0x354c,
- /* key: 0x6a59 */ 0x5c74,
- /* key: 0x6a5a */ 0xffff,
- /* key: 0x6a5b */ 0xc530,
- /* key: 0x6a5c */ 0xffff,
- /* key: 0x6a5d */ 0xffff,
- /* key: 0x6a5e */ 0xffff,
- /* key: 0x6a5f */ 0x3521,
- /* key: 0x6a60 */ 0xffff,
- /* key: 0x6a61 */ 0x464b,
- /* key: 0x6a62 */ 0x5c73,
- /* key: 0x6a63 */ 0xffff,
- /* key: 0x6a64 */ 0xc531,
- /* key: 0x6a65 */ 0xffff,
- /* key: 0x6a66 */ 0x5c75,
- /* key: 0x6a67 */ 0xc532,
- /* key: 0x6a68 */ 0xffff,
- /* key: 0x6a69 */ 0xffff,
- /* key: 0x6a6a */ 0xc533,
- /* key: 0x6a6b */ 0xffff,
- /* key: 0x6a6c */ 0xffff,
- /* key: 0x6a6d */ 0xffff,
- /* key: 0x6a6e */ 0xffff,
- /* key: 0x6a6f */ 0xffff,
- /* key: 0x6a70 */ 0xffff,
- /* key: 0x6a71 */ 0xc534,
- /* key: 0x6a72 */ 0x5c6f,
- /* key: 0x6a73 */ 0xc535,
- /* key: 0x6a74 */ 0xffff,
- /* key: 0x6a75 */ 0xffff,
- /* key: 0x6a76 */ 0xffff,
- /* key: 0x6a77 */ 0xffff,
- /* key: 0x6a78 */ 0x5c71,
- /* key: 0x6a79 */ 0xffff,
- /* key: 0x6a7a */ 0xffff,
- /* key: 0x6a7b */ 0xffff,
- /* key: 0x6a7c */ 0xffff,
- /* key: 0x6a7d */ 0xffff,
- /* key: 0x6a7e */ 0xc536,
- /* key: 0x6a7f */ 0x3360,
- /* key: 0x6a80 */ 0x4349,
- /* key: 0x6a81 */ 0xc537,
- /* key: 0x6a82 */ 0xffff,
- /* key: 0x6a83 */ 0xc538,
- /* key: 0x6a84 */ 0x5c7c,
- /* key: 0x6a85 */ 0xffff,
- /* key: 0x6a86 */ 0xc539,
- /* key: 0x6a87 */ 0xc53a,
- /* key: 0x6a88 */ 0xffff,
- /* key: 0x6a89 */ 0xc53b,
- /* key: 0x6a8a */ 0xffff,
- /* key: 0x6a8b */ 0xc53c,
- /* key: 0x6a8c */ 0xffff,
- /* key: 0x6a8d */ 0x5c7a,
- /* key: 0x6a8e */ 0x3869,
- /* key: 0x6a8f */ 0xffff,
- /* key: 0x6a90 */ 0x5c79,
- /* key: 0x6a91 */ 0xc53d,
- /* key: 0x6a92 */ 0xffff,
- /* key: 0x6a93 */ 0xffff,
- /* key: 0x6a94 */ 0xffff,
- /* key: 0x6a95 */ 0xffff,
- /* key: 0x6a96 */ 0xffff,
- /* key: 0x6a97 */ 0x5d21,
- /* key: 0x6a98 */ 0xffff,
- /* key: 0x6a99 */ 0xffff,
- /* key: 0x6a9a */ 0xffff,
- /* key: 0x6a9b */ 0xc53e,
- /* key: 0x6a9c */ 0x5b58,
- /* key: 0x6a9d */ 0xc53f,
- /* key: 0x6a9e */ 0xc540,
- /* key: 0x6a9f */ 0xc541,
- /* key: 0x6aa0 */ 0x5c7b,
- /* key: 0x6aa1 */ 0xffff,
- /* key: 0x6aa2 */ 0x5c7d,
- /* key: 0x6aa3 */ 0x5c7e,
- /* key: 0x6aa4 */ 0xffff,
- /* key: 0x6aa5 */ 0xc542,
- /* key: 0x6aa6 */ 0xffff,
- /* key: 0x6aa7 */ 0xffff,
- /* key: 0x6aa8 */ 0xffff,
- /* key: 0x6aa9 */ 0xffff,
- /* key: 0x6aaa */ 0x5d2c,
- /* key: 0x6aab */ 0xc543,
- /* key: 0x6aac */ 0x5d28,
- /* key: 0x6aad */ 0xffff,
- /* key: 0x6aae */ 0x5b6d,
- /* key: 0x6aaf */ 0xc544,
- /* key: 0x6ab0 */ 0xc545,
- /* key: 0x6ab1 */ 0xc546,
- /* key: 0x6ab2 */ 0xffff,
- /* key: 0x6ab3 */ 0x5d27,
- /* key: 0x6ab4 */ 0xc547,
- /* key: 0x6ab5 */ 0xffff,
- /* key: 0x6ab6 */ 0xffff,
- /* key: 0x6ab7 */ 0xffff,
- /* key: 0x6ab8 */ 0x5d26,
- /* key: 0x6ab9 */ 0xffff,
- /* key: 0x6aba */ 0xffff,
- /* key: 0x6abb */ 0x5d23,
- /* key: 0x6abc */ 0xffff,
- /* key: 0x6abd */ 0xc548,
- /* key: 0x6abe */ 0xc549,
- /* key: 0x6abf */ 0xc54a,
- /* key: 0x6ac0 */ 0xffff,
- /* key: 0x6ac1 */ 0x5c6a,
- /* key: 0x6ac2 */ 0x5d25,
- /* key: 0x6ac3 */ 0x5d24,
- /* key: 0x6ac4 */ 0xffff,
- /* key: 0x6ac5 */ 0xffff,
- /* key: 0x6ac6 */ 0xc54b,
- /* key: 0x6ac7 */ 0xffff,
- /* key: 0x6ac8 */ 0xc54d,
- /* key: 0x6ac9 */ 0xc54c,
- /* key: 0x6aca */ 0xffff,
- /* key: 0x6acb */ 0xffff,
- /* key: 0x6acc */ 0xc54e,
- /* key: 0x6acd */ 0xffff,
- /* key: 0x6ace */ 0xffff,
- /* key: 0x6acf */ 0xffff,
- /* key: 0x6ad0 */ 0xc54f,
- /* key: 0x6ad1 */ 0x5d2a,
- /* key: 0x6ad2 */ 0xffff,
- /* key: 0x6ad3 */ 0x4f26,
- /* key: 0x6ad4 */ 0xc550,
- /* key: 0x6ad5 */ 0xc551,
- /* key: 0x6ad6 */ 0xc552,
- /* key: 0x6ad7 */ 0xffff,
- /* key: 0x6ad8 */ 0xffff,
- /* key: 0x6ad9 */ 0xffff,
- /* key: 0x6ada */ 0x5d2d,
- /* key: 0x6adb */ 0x367b,
- /* key: 0x6adc */ 0xc553,
- /* key: 0x6add */ 0xc554,
- /* key: 0x6ade */ 0x5d29,
- /* key: 0x6adf */ 0x5d2b,
- /* key: 0x6ae0 */ 0xffff,
- /* key: 0x6ae1 */ 0xffff,
- /* key: 0x6ae2 */ 0xffff,
- /* key: 0x6ae3 */ 0xffff,
- /* key: 0x6ae4 */ 0xc555,
- /* key: 0x6ae5 */ 0xffff,
- /* key: 0x6ae6 */ 0xffff,
- /* key: 0x6ae7 */ 0xc556,
- /* key: 0x6ae8 */ 0x4827,
- /* key: 0x6ae9 */ 0xffff,
- /* key: 0x6aea */ 0x5d2e,
- /* key: 0x6aeb */ 0xffff,
- /* key: 0x6aec */ 0xc557,
- /* key: 0x6aed */ 0xffff,
- /* key: 0x6aee */ 0xffff,
- /* key: 0x6aef */ 0xffff,
- /* key: 0x6af0 */ 0xc558,
- /* key: 0x6af1 */ 0xc559,
- /* key: 0x6af2 */ 0xc55a,
- /* key: 0x6af3 */ 0xffff,
- /* key: 0x6af4 */ 0xffff,
- /* key: 0x6af5 */ 0xffff,
- /* key: 0x6af6 */ 0xffff,
- /* key: 0x6af7 */ 0xffff,
- /* key: 0x6af8 */ 0xffff,
- /* key: 0x6af9 */ 0xffff,
- /* key: 0x6afa */ 0x5d32,
- /* key: 0x6afb */ 0x5d2f,
- /* key: 0x6afc */ 0xc55b,
- /* key: 0x6afd */ 0xc55c,
- /* key: 0x6afe */ 0xffff,
- /* key: 0x6aff */ 0xffff,
- /* branch: 0x6b0X */ 9504,
- /* branch: 0x6b1X */ 9520,
- /* branch: 0x6b2X */ 9536,
- /* branch: 0x6b3X */ 9552,
- /* branch: 0x6b4X */ 9568,
- /* branch: 0x6b5X */ 9584,
- /* branch: 0x6b6X */ 9600,
- /* branch: 0x6b7X */ 9616,
- /* branch: 0x6b8X */ 9632,
- /* branch: 0x6b9X */ 9648,
- /* branch: 0x6baX */ 9664,
- /* branch: 0x6bbX */ 9680,
- /* branch: 0x6bcX */ 9696,
- /* branch: 0x6bdX */ 9712,
- /* branch: 0x6beX */ 9728,
- /* branch: 0x6bfX */ 9744,
- /* key: 0x6b00 */ 0xffff,
- /* key: 0x6b01 */ 0xffff,
- /* key: 0x6b02 */ 0xc55d,
- /* key: 0x6b03 */ 0xc55e,
- /* key: 0x6b04 */ 0x4d73,
- /* key: 0x6b05 */ 0x5d30,
- /* key: 0x6b06 */ 0xc55f,
- /* key: 0x6b07 */ 0xc560,
- /* key: 0x6b08 */ 0xffff,
- /* key: 0x6b09 */ 0xc561,
- /* key: 0x6b0a */ 0x5c5e,
- /* key: 0x6b0b */ 0xffff,
- /* key: 0x6b0c */ 0xffff,
- /* key: 0x6b0d */ 0xffff,
- /* key: 0x6b0e */ 0xffff,
- /* key: 0x6b0f */ 0xc562,
- /* key: 0x6b10 */ 0xc563,
- /* key: 0x6b11 */ 0xc564,
- /* key: 0x6b12 */ 0x5d33,
- /* key: 0x6b13 */ 0xffff,
- /* key: 0x6b14 */ 0xffff,
- /* key: 0x6b15 */ 0xffff,
- /* key: 0x6b16 */ 0x5d34,
- /* key: 0x6b17 */ 0xc565,
- /* key: 0x6b18 */ 0xffff,
- /* key: 0x6b19 */ 0xffff,
- /* key: 0x6b1a */ 0xffff,
- /* key: 0x6b1b */ 0xc566,
- /* key: 0x6b1c */ 0xffff,
- /* key: 0x6b1d */ 0x3135,
- /* key: 0x6b1e */ 0xc567,
- /* key: 0x6b1f */ 0x5d36,
- /* key: 0x6b20 */ 0x3767,
- /* key: 0x6b21 */ 0x3c21,
- /* key: 0x6b22 */ 0xffff,
- /* key: 0x6b23 */ 0x3655,
- /* key: 0x6b24 */ 0xc568,
- /* key: 0x6b25 */ 0xffff,
- /* key: 0x6b26 */ 0xffff,
- /* key: 0x6b27 */ 0x3224,
- /* key: 0x6b28 */ 0xc569,
- /* key: 0x6b29 */ 0xffff,
- /* key: 0x6b2a */ 0xffff,
- /* key: 0x6b2b */ 0xc56a,
- /* key: 0x6b2c */ 0xc56b,
- /* key: 0x6b2d */ 0xffff,
- /* key: 0x6b2e */ 0xffff,
- /* key: 0x6b2f */ 0xc56c,
- /* key: 0x6b30 */ 0xffff,
- /* key: 0x6b31 */ 0xffff,
- /* key: 0x6b32 */ 0x4d5f,
- /* key: 0x6b33 */ 0xffff,
- /* key: 0x6b34 */ 0xffff,
- /* key: 0x6b35 */ 0xc56d,
- /* key: 0x6b36 */ 0xc56e,
- /* key: 0x6b37 */ 0x5d38,
- /* key: 0x6b38 */ 0x5d37,
- /* key: 0x6b39 */ 0x5d3a,
- /* key: 0x6b3a */ 0x353d,
- /* key: 0x6b3b */ 0xc56f,
- /* key: 0x6b3c */ 0xffff,
- /* key: 0x6b3d */ 0x3656,
- /* key: 0x6b3e */ 0x343e,
- /* key: 0x6b3f */ 0xc570,
- /* key: 0x6b40 */ 0xffff,
- /* key: 0x6b41 */ 0xffff,
- /* key: 0x6b42 */ 0xffff,
- /* key: 0x6b43 */ 0x5d3d,
- /* key: 0x6b44 */ 0xffff,
- /* key: 0x6b45 */ 0xffff,
- /* key: 0x6b46 */ 0xc571,
- /* key: 0x6b47 */ 0x5d3c,
- /* key: 0x6b48 */ 0xffff,
- /* key: 0x6b49 */ 0x5d3e,
- /* key: 0x6b4a */ 0xc572,
- /* key: 0x6b4b */ 0xffff,
- /* key: 0x6b4c */ 0x324e,
- /* key: 0x6b4d */ 0xc573,
- /* key: 0x6b4e */ 0x4337,
- /* key: 0x6b4f */ 0xffff,
- /* key: 0x6b50 */ 0x5d3f,
- /* key: 0x6b51 */ 0xffff,
- /* key: 0x6b52 */ 0xc574,
- /* key: 0x6b53 */ 0x343f,
- /* key: 0x6b54 */ 0x5d41,
- /* key: 0x6b55 */ 0xffff,
- /* key: 0x6b56 */ 0xc575,
- /* key: 0x6b57 */ 0xffff,
- /* key: 0x6b58 */ 0xc576,
- /* key: 0x6b59 */ 0x5d40,
- /* key: 0x6b5a */ 0xffff,
- /* key: 0x6b5b */ 0x5d42,
- /* key: 0x6b5c */ 0xffff,
- /* key: 0x6b5d */ 0xc577,
- /* key: 0x6b5e */ 0xffff,
- /* key: 0x6b5f */ 0x5d43,
- /* key: 0x6b60 */ 0xc578,
- /* key: 0x6b61 */ 0x5d44,
- /* key: 0x6b62 */ 0x3b5f,
- /* key: 0x6b63 */ 0x4035,
- /* key: 0x6b64 */ 0x3a21,
- /* key: 0x6b65 */ 0xffff,
- /* key: 0x6b66 */ 0x4970,
- /* key: 0x6b67 */ 0xc579,
- /* key: 0x6b68 */ 0xffff,
- /* key: 0x6b69 */ 0x4a62,
- /* key: 0x6b6a */ 0x4f44,
- /* key: 0x6b6b */ 0xc57a,
- /* key: 0x6b6c */ 0xffff,
- /* key: 0x6b6d */ 0xffff,
- /* key: 0x6b6e */ 0xc57b,
- /* key: 0x6b6f */ 0x3b75,
- /* key: 0x6b70 */ 0xc57c,
- /* key: 0x6b71 */ 0xffff,
- /* key: 0x6b72 */ 0xffff,
- /* key: 0x6b73 */ 0x3a50,
- /* key: 0x6b74 */ 0x4e72,
- /* key: 0x6b75 */ 0xc57d,
- /* key: 0x6b76 */ 0xffff,
- /* key: 0x6b77 */ 0xffff,
- /* key: 0x6b78 */ 0x5d45,
- /* key: 0x6b79 */ 0x5d46,
- /* key: 0x6b7a */ 0xffff,
- /* key: 0x6b7b */ 0x3b60,
- /* key: 0x6b7c */ 0xffff,
- /* key: 0x6b7d */ 0xc57e,
- /* key: 0x6b7e */ 0xc621,
- /* key: 0x6b7f */ 0x5d47,
- /* key: 0x6b80 */ 0x5d48,
- /* key: 0x6b81 */ 0xffff,
- /* key: 0x6b82 */ 0xc622,
- /* key: 0x6b83 */ 0x5d4a,
- /* key: 0x6b84 */ 0x5d49,
- /* key: 0x6b85 */ 0xc623,
- /* key: 0x6b86 */ 0x4b58,
- /* key: 0x6b87 */ 0xffff,
- /* key: 0x6b88 */ 0xffff,
- /* key: 0x6b89 */ 0x3d5e,
- /* key: 0x6b8a */ 0x3c6c,
- /* key: 0x6b8b */ 0x3b44,
- /* key: 0x6b8c */ 0xffff,
- /* key: 0x6b8d */ 0x5d4b,
- /* key: 0x6b8e */ 0xffff,
- /* key: 0x6b8f */ 0xffff,
- /* key: 0x6b90 */ 0xffff,
- /* key: 0x6b91 */ 0xffff,
- /* key: 0x6b92 */ 0xffff,
- /* key: 0x6b93 */ 0xffff,
- /* key: 0x6b94 */ 0xffff,
- /* key: 0x6b95 */ 0x5d4d,
- /* key: 0x6b96 */ 0x3f23,
- /* key: 0x6b97 */ 0xc624,
- /* key: 0x6b98 */ 0x5d4c,
- /* key: 0x6b99 */ 0xffff,
- /* key: 0x6b9a */ 0xffff,
- /* key: 0x6b9b */ 0xc625,
- /* key: 0x6b9c */ 0xffff,
- /* key: 0x6b9d */ 0xffff,
- /* key: 0x6b9e */ 0x5d4e,
- /* key: 0x6b9f */ 0xc626,
- /* key: 0x6ba0 */ 0xc627,
- /* key: 0x6ba1 */ 0xffff,
- /* key: 0x6ba2 */ 0xc628,
- /* key: 0x6ba3 */ 0xc629,
- /* key: 0x6ba4 */ 0x5d4f,
- /* key: 0x6ba5 */ 0xffff,
- /* key: 0x6ba6 */ 0xffff,
- /* key: 0x6ba7 */ 0xffff,
- /* key: 0x6ba8 */ 0xc62a,
- /* key: 0x6ba9 */ 0xc62b,
- /* key: 0x6baa */ 0x5d50,
- /* key: 0x6bab */ 0x5d51,
- /* key: 0x6bac */ 0xc62c,
- /* key: 0x6bad */ 0xc62d,
- /* key: 0x6bae */ 0xc62e,
- /* key: 0x6baf */ 0x5d52,
- /* key: 0x6bb0 */ 0xc62f,
- /* key: 0x6bb1 */ 0x5d54,
- /* key: 0x6bb2 */ 0x5d53,
- /* key: 0x6bb3 */ 0x5d55,
- /* key: 0x6bb4 */ 0x3225,
- /* key: 0x6bb5 */ 0x434a,
- /* key: 0x6bb6 */ 0xffff,
- /* key: 0x6bb7 */ 0x5d56,
- /* key: 0x6bb8 */ 0xc630,
- /* key: 0x6bb9 */ 0xc631,
- /* key: 0x6bba */ 0x3b26,
- /* key: 0x6bbb */ 0x334c,
- /* key: 0x6bbc */ 0x5d57,
- /* key: 0x6bbd */ 0xc632,
- /* key: 0x6bbe */ 0xc633,
- /* key: 0x6bbf */ 0x4542,
- /* key: 0x6bc0 */ 0x544c,
- /* key: 0x6bc1 */ 0xffff,
- /* key: 0x6bc2 */ 0xffff,
- /* key: 0x6bc3 */ 0xc634,
- /* key: 0x6bc4 */ 0xc635,
- /* key: 0x6bc5 */ 0x3523,
- /* key: 0x6bc6 */ 0x5d58,
- /* key: 0x6bc7 */ 0xffff,
- /* key: 0x6bc8 */ 0xffff,
- /* key: 0x6bc9 */ 0xc636,
- /* key: 0x6bca */ 0xffff,
- /* key: 0x6bcb */ 0x5d59,
- /* key: 0x6bcc */ 0xc637,
- /* key: 0x6bcd */ 0x4a6c,
- /* key: 0x6bce */ 0x4b68,
- /* key: 0x6bcf */ 0xffff,
- /* key: 0x6bd0 */ 0xffff,
- /* key: 0x6bd1 */ 0xffff,
- /* key: 0x6bd2 */ 0x4647,
- /* key: 0x6bd3 */ 0x5d5a,
- /* key: 0x6bd4 */ 0x4866,
- /* key: 0x6bd5 */ 0xffff,
- /* key: 0x6bd6 */ 0xc638,
- /* key: 0x6bd7 */ 0xffff,
- /* key: 0x6bd8 */ 0x487b,
- /* key: 0x6bd9 */ 0xffff,
- /* key: 0x6bda */ 0xc639,
- /* key: 0x6bdb */ 0x4c53,
- /* key: 0x6bdc */ 0xffff,
- /* key: 0x6bdd */ 0xffff,
- /* key: 0x6bde */ 0xffff,
- /* key: 0x6bdf */ 0x5d5b,
- /* key: 0x6be0 */ 0xffff,
- /* key: 0x6be1 */ 0xc63a,
- /* key: 0x6be2 */ 0xffff,
- /* key: 0x6be3 */ 0xc63b,
- /* key: 0x6be4 */ 0xffff,
- /* key: 0x6be5 */ 0xffff,
- /* key: 0x6be6 */ 0xc63c,
- /* key: 0x6be7 */ 0xc63d,
- /* key: 0x6be8 */ 0xffff,
- /* key: 0x6be9 */ 0xffff,
- /* key: 0x6bea */ 0xffff,
- /* key: 0x6beb */ 0x5d5d,
- /* key: 0x6bec */ 0x5d5c,
- /* key: 0x6bed */ 0xffff,
- /* key: 0x6bee */ 0xc63e,
- /* key: 0x6bef */ 0x5d5f,
- /* key: 0x6bf0 */ 0xffff,
- /* key: 0x6bf1 */ 0xc63f,
- /* key: 0x6bf2 */ 0xffff,
- /* key: 0x6bf3 */ 0x5d5e,
- /* key: 0x6bf4 */ 0xffff,
- /* key: 0x6bf5 */ 0xffff,
- /* key: 0x6bf6 */ 0xffff,
- /* key: 0x6bf7 */ 0xc640,
- /* key: 0x6bf8 */ 0xffff,
- /* key: 0x6bf9 */ 0xc641,
- /* key: 0x6bfa */ 0xffff,
- /* key: 0x6bfb */ 0xffff,
- /* key: 0x6bfc */ 0xffff,
- /* key: 0x6bfd */ 0xffff,
- /* key: 0x6bfe */ 0xffff,
- /* key: 0x6bff */ 0xc642,
- /* branch: 0x6c0X */ 9776,
- /* branch: 0x6c1X */ 9792,
- /* branch: 0x6c2X */ 9808,
- /* branch: 0x6c3X */ 9824,
- /* branch: 0x6c4X */ 9840,
- /* branch: 0x6c5X */ 9856,
- /* branch: 0x6c6X */ 9872,
- /* branch: 0x6c7X */ 9888,
- /* branch: 0x6c8X */ 9904,
- /* branch: 0x6c9X */ 9920,
- /* branch: 0x6caX */ 9936,
- /* branch: 0x6cbX */ 9952,
- /* branch: 0x6ccX */ 9968,
- /* branch: 0x6cdX */ 9984,
- /* branch: 0x6ceX */ 10000,
- /* branch: 0x6cfX */ 10016,
- /* key: 0x6c00 */ 0xffff,
- /* key: 0x6c01 */ 0xffff,
- /* key: 0x6c02 */ 0xc643,
- /* key: 0x6c03 */ 0xffff,
- /* key: 0x6c04 */ 0xc644,
- /* key: 0x6c05 */ 0xc645,
- /* key: 0x6c06 */ 0xffff,
- /* key: 0x6c07 */ 0xffff,
- /* key: 0x6c08 */ 0x5d61,
- /* key: 0x6c09 */ 0xc646,
- /* key: 0x6c0a */ 0xffff,
- /* key: 0x6c0b */ 0xffff,
- /* key: 0x6c0c */ 0xffff,
- /* key: 0x6c0d */ 0xc647,
- /* key: 0x6c0e */ 0xc648,
- /* key: 0x6c0f */ 0x3b61,
- /* key: 0x6c10 */ 0xc649,
- /* key: 0x6c11 */ 0x4c31,
- /* key: 0x6c12 */ 0xc64a,
- /* key: 0x6c13 */ 0x5d62,
- /* key: 0x6c14 */ 0x5d63,
- /* key: 0x6c15 */ 0xffff,
- /* key: 0x6c16 */ 0xffff,
- /* key: 0x6c17 */ 0x3524,
- /* key: 0x6c18 */ 0xffff,
- /* key: 0x6c19 */ 0xc64b,
- /* key: 0x6c1a */ 0xffff,
- /* key: 0x6c1b */ 0x5d64,
- /* key: 0x6c1c */ 0xffff,
- /* key: 0x6c1d */ 0xffff,
- /* key: 0x6c1e */ 0xffff,
- /* key: 0x6c1f */ 0xc64c,
- /* key: 0x6c20 */ 0xffff,
- /* key: 0x6c21 */ 0xffff,
- /* key: 0x6c22 */ 0xffff,
- /* key: 0x6c23 */ 0x5d66,
- /* key: 0x6c24 */ 0x5d65,
- /* key: 0x6c25 */ 0xffff,
- /* key: 0x6c26 */ 0xc64d,
- /* key: 0x6c27 */ 0xc64e,
- /* key: 0x6c28 */ 0xc64f,
- /* key: 0x6c29 */ 0xffff,
- /* key: 0x6c2a */ 0xffff,
- /* key: 0x6c2b */ 0xffff,
- /* key: 0x6c2c */ 0xc650,
- /* key: 0x6c2d */ 0xffff,
- /* key: 0x6c2e */ 0xc651,
- /* key: 0x6c2f */ 0xffff,
- /* key: 0x6c30 */ 0xffff,
- /* key: 0x6c31 */ 0xffff,
- /* key: 0x6c32 */ 0xffff,
- /* key: 0x6c33 */ 0xc652,
- /* key: 0x6c34 */ 0x3f65,
- /* key: 0x6c35 */ 0xc653,
- /* key: 0x6c36 */ 0xc654,
- /* key: 0x6c37 */ 0x4939,
- /* key: 0x6c38 */ 0x314a,
- /* key: 0x6c39 */ 0xffff,
- /* key: 0x6c3a */ 0xc655,
- /* key: 0x6c3b */ 0xc656,
- /* key: 0x6c3c */ 0xffff,
- /* key: 0x6c3d */ 0xffff,
- /* key: 0x6c3e */ 0x4845,
- /* key: 0x6c3f */ 0xc657,
- /* key: 0x6c40 */ 0x4475,
- /* key: 0x6c41 */ 0x3d41,
- /* key: 0x6c42 */ 0x3561,
- /* key: 0x6c43 */ 0xffff,
- /* key: 0x6c44 */ 0xffff,
- /* key: 0x6c45 */ 0xffff,
- /* key: 0x6c46 */ 0xffff,
- /* key: 0x6c47 */ 0xffff,
- /* key: 0x6c48 */ 0xffff,
- /* key: 0x6c49 */ 0xffff,
- /* key: 0x6c4a */ 0xc658,
- /* key: 0x6c4b */ 0xc659,
- /* key: 0x6c4c */ 0xffff,
- /* key: 0x6c4d */ 0xc65a,
- /* key: 0x6c4e */ 0x4846,
- /* key: 0x6c4f */ 0xc65b,
- /* key: 0x6c50 */ 0x3c2e,
- /* key: 0x6c51 */ 0xffff,
- /* key: 0x6c52 */ 0xc65c,
- /* key: 0x6c53 */ 0xffff,
- /* key: 0x6c54 */ 0xc65d,
- /* key: 0x6c55 */ 0x5d68,
- /* key: 0x6c56 */ 0xffff,
- /* key: 0x6c57 */ 0x3440,
- /* key: 0x6c58 */ 0xffff,
- /* key: 0x6c59 */ 0xc65e,
- /* key: 0x6c5a */ 0x3178,
- /* key: 0x6c5b */ 0xc65f,
- /* key: 0x6c5c */ 0xc660,
- /* key: 0x6c5d */ 0x4672,
- /* key: 0x6c5e */ 0x5d67,
- /* key: 0x6c5f */ 0x393e,
- /* key: 0x6c60 */ 0x4353,
- /* key: 0x6c61 */ 0xffff,
- /* key: 0x6c62 */ 0x5d69,
- /* key: 0x6c63 */ 0xffff,
- /* key: 0x6c64 */ 0xffff,
- /* key: 0x6c65 */ 0xffff,
- /* key: 0x6c66 */ 0xffff,
- /* key: 0x6c67 */ 0xc736,
- /* key: 0x6c68 */ 0x5d71,
- /* key: 0x6c69 */ 0xffff,
- /* key: 0x6c6a */ 0x5d6a,
- /* key: 0x6c6b */ 0xc661,
- /* key: 0x6c6c */ 0xffff,
- /* key: 0x6c6d */ 0xc662,
- /* key: 0x6c6e */ 0xffff,
- /* key: 0x6c6f */ 0xc663,
- /* key: 0x6c70 */ 0x4241,
- /* key: 0x6c71 */ 0xffff,
- /* key: 0x6c72 */ 0x3562,
- /* key: 0x6c73 */ 0x5d72,
- /* key: 0x6c74 */ 0xc664,
- /* key: 0x6c75 */ 0xffff,
- /* key: 0x6c76 */ 0xc665,
- /* key: 0x6c77 */ 0xffff,
- /* key: 0x6c78 */ 0xc666,
- /* key: 0x6c79 */ 0xc667,
- /* key: 0x6c7a */ 0x3768,
- /* key: 0x6c7b */ 0xc668,
- /* key: 0x6c7c */ 0xffff,
- /* key: 0x6c7d */ 0x3525,
- /* key: 0x6c7e */ 0x5d70,
- /* key: 0x6c7f */ 0xffff,
- /* key: 0x6c80 */ 0xffff,
- /* key: 0x6c81 */ 0x5d6e,
- /* key: 0x6c82 */ 0x5d6b,
- /* key: 0x6c83 */ 0x4d60,
- /* key: 0x6c84 */ 0xffff,
- /* key: 0x6c85 */ 0xc669,
- /* key: 0x6c86 */ 0xc66a,
- /* key: 0x6c87 */ 0xc66b,
- /* key: 0x6c88 */ 0x4440,
- /* key: 0x6c89 */ 0xc66c,
- /* key: 0x6c8a */ 0xffff,
- /* key: 0x6c8b */ 0xffff,
- /* key: 0x6c8c */ 0x4659,
- /* key: 0x6c8d */ 0x5d6c,
- /* key: 0x6c8e */ 0xffff,
- /* key: 0x6c8f */ 0xffff,
- /* key: 0x6c90 */ 0x5d74,
- /* key: 0x6c91 */ 0xffff,
- /* key: 0x6c92 */ 0x5d73,
- /* key: 0x6c93 */ 0x3723,
- /* key: 0x6c94 */ 0xc66d,
- /* key: 0x6c95 */ 0xc66e,
- /* key: 0x6c96 */ 0x322d,
- /* key: 0x6c97 */ 0xc66f,
- /* key: 0x6c98 */ 0xc670,
- /* key: 0x6c99 */ 0x3a3b,
- /* key: 0x6c9a */ 0x5d6d,
- /* key: 0x6c9b */ 0x5d6f,
- /* key: 0x6c9c */ 0xc671,
- /* key: 0x6c9d */ 0xffff,
- /* key: 0x6c9e */ 0xffff,
- /* key: 0x6c9f */ 0xc672,
- /* key: 0x6ca0 */ 0xffff,
- /* key: 0x6ca1 */ 0x4b57,
- /* key: 0x6ca2 */ 0x4274,
- /* key: 0x6ca3 */ 0xffff,
- /* key: 0x6ca4 */ 0xffff,
- /* key: 0x6ca5 */ 0xffff,
- /* key: 0x6ca6 */ 0xffff,
- /* key: 0x6ca7 */ 0xffff,
- /* key: 0x6ca8 */ 0xffff,
- /* key: 0x6ca9 */ 0xffff,
- /* key: 0x6caa */ 0xffff,
- /* key: 0x6cab */ 0x4b77,
- /* key: 0x6cac */ 0xffff,
- /* key: 0x6cad */ 0xffff,
- /* key: 0x6cae */ 0x5d7c,
- /* key: 0x6caf */ 0xffff,
- /* key: 0x6cb0 */ 0xc673,
- /* key: 0x6cb1 */ 0x5d7d,
- /* key: 0x6cb2 */ 0xc674,
- /* key: 0x6cb3 */ 0x324f,
- /* key: 0x6cb4 */ 0xc675,
- /* key: 0x6cb5 */ 0xffff,
- /* key: 0x6cb6 */ 0xffff,
- /* key: 0x6cb7 */ 0xffff,
- /* key: 0x6cb8 */ 0x4a28,
- /* key: 0x6cb9 */ 0x4c7d,
- /* key: 0x6cba */ 0x5e21,
- /* key: 0x6cbb */ 0x3c23,
- /* key: 0x6cbc */ 0x3e42,
- /* key: 0x6cbd */ 0x5d78,
- /* key: 0x6cbe */ 0x5d7e,
- /* key: 0x6cbf */ 0x3168,
- /* key: 0x6cc0 */ 0xffff,
- /* key: 0x6cc1 */ 0x3637,
- /* key: 0x6cc2 */ 0xc676,
- /* key: 0x6cc3 */ 0xffff,
- /* key: 0x6cc4 */ 0x5d75,
- /* key: 0x6cc5 */ 0x5d7a,
- /* key: 0x6cc6 */ 0xc677,
- /* key: 0x6cc7 */ 0xffff,
- /* key: 0x6cc8 */ 0xffff,
- /* key: 0x6cc9 */ 0x4074,
- /* key: 0x6cca */ 0x4771,
- /* key: 0x6ccb */ 0xffff,
- /* key: 0x6ccc */ 0x4867,
- /* key: 0x6ccd */ 0xc678,
- /* key: 0x6cce */ 0xffff,
- /* key: 0x6ccf */ 0xc679,
- /* key: 0x6cd0 */ 0xc67a,
- /* key: 0x6cd1 */ 0xc67b,
- /* key: 0x6cd2 */ 0xc67c,
- /* key: 0x6cd3 */ 0x5d77,
- /* key: 0x6cd4 */ 0xc67d,
- /* key: 0x6cd5 */ 0x4b21,
- /* key: 0x6cd6 */ 0xc67e,
- /* key: 0x6cd7 */ 0x5d79,
- /* key: 0x6cd8 */ 0xffff,
- /* key: 0x6cd9 */ 0x5e24,
- /* key: 0x6cda */ 0xc721,
- /* key: 0x6cdb */ 0x5e22,
- /* key: 0x6cdc */ 0xc722,
- /* key: 0x6cdd */ 0x5d7b,
- /* key: 0x6cde */ 0xffff,
- /* key: 0x6cdf */ 0xffff,
- /* key: 0x6ce0 */ 0xc723,
- /* key: 0x6ce1 */ 0x4b22,
- /* key: 0x6ce2 */ 0x4748,
- /* key: 0x6ce3 */ 0x3563,
- /* key: 0x6ce4 */ 0xffff,
- /* key: 0x6ce5 */ 0x4525,
- /* key: 0x6ce6 */ 0xffff,
- /* key: 0x6ce7 */ 0xc724,
- /* key: 0x6ce8 */ 0x436d,
- /* key: 0x6ce9 */ 0xc725,
- /* key: 0x6cea */ 0x5e25,
- /* key: 0x6ceb */ 0xc726,
- /* key: 0x6cec */ 0xc727,
- /* key: 0x6ced */ 0xffff,
- /* key: 0x6cee */ 0xc728,
- /* key: 0x6cef */ 0x5e23,
- /* key: 0x6cf0 */ 0x4259,
- /* key: 0x6cf1 */ 0x5d76,
- /* key: 0x6cf2 */ 0xc729,
- /* key: 0x6cf3 */ 0x314b,
- /* key: 0x6cf4 */ 0xc72a,
- /* key: 0x6cf5 */ 0xffff,
- /* key: 0x6cf6 */ 0xffff,
- /* key: 0x6cf7 */ 0xffff,
- /* key: 0x6cf8 */ 0xffff,
- /* key: 0x6cf9 */ 0xffff,
- /* key: 0x6cfa */ 0xffff,
- /* key: 0x6cfb */ 0xffff,
- /* key: 0x6cfc */ 0xffff,
- /* key: 0x6cfd */ 0xffff,
- /* key: 0x6cfe */ 0xffff,
- /* key: 0x6cff */ 0xffff,
- /* branch: 0x6d0X */ 10048,
- /* branch: 0x6d1X */ 10064,
- /* branch: 0x6d2X */ 10080,
- /* branch: 0x6d3X */ 10096,
- /* branch: 0x6d4X */ 10112,
- /* branch: 0x6d5X */ 10128,
- /* branch: 0x6d6X */ 10144,
- /* branch: 0x6d7X */ 10160,
- /* branch: 0x6d8X */ 10176,
- /* branch: 0x6d9X */ 10192,
- /* branch: 0x6daX */ 10208,
- /* branch: 0x6dbX */ 10224,
- /* branch: 0x6dcX */ 10240,
- /* branch: 0x6ddX */ 10256,
- /* branch: 0x6deX */ 10272,
- /* branch: 0x6dfX */ 10288,
- /* key: 0x6d00 */ 0xffff,
- /* key: 0x6d01 */ 0xffff,
- /* key: 0x6d02 */ 0xffff,
- /* key: 0x6d03 */ 0xffff,
- /* key: 0x6d04 */ 0xc72b,
- /* key: 0x6d05 */ 0xffff,
- /* key: 0x6d06 */ 0xffff,
- /* key: 0x6d07 */ 0xc72c,
- /* key: 0x6d08 */ 0xffff,
- /* key: 0x6d09 */ 0xffff,
- /* key: 0x6d0a */ 0xc72d,
- /* key: 0x6d0b */ 0x4d4e,
- /* key: 0x6d0c */ 0x5e30,
- /* key: 0x6d0d */ 0xffff,
- /* key: 0x6d0e */ 0xc72e,
- /* key: 0x6d0f */ 0xc72f,
- /* key: 0x6d10 */ 0xffff,
- /* key: 0x6d11 */ 0xc730,
- /* key: 0x6d12 */ 0x5e2f,
- /* key: 0x6d13 */ 0xc731,
- /* key: 0x6d14 */ 0xffff,
- /* key: 0x6d15 */ 0xffff,
- /* key: 0x6d16 */ 0xffff,
- /* key: 0x6d17 */ 0x4076,
- /* key: 0x6d18 */ 0xffff,
- /* key: 0x6d19 */ 0x5e2c,
- /* key: 0x6d1a */ 0xc732,
- /* key: 0x6d1b */ 0x4d6c,
- /* key: 0x6d1c */ 0xffff,
- /* key: 0x6d1d */ 0xffff,
- /* key: 0x6d1e */ 0x4636,
- /* key: 0x6d1f */ 0x5e26,
- /* key: 0x6d20 */ 0xffff,
- /* key: 0x6d21 */ 0xffff,
- /* key: 0x6d22 */ 0xffff,
- /* key: 0x6d23 */ 0xffff,
- /* key: 0x6d24 */ 0xffff,
- /* key: 0x6d25 */ 0x4445,
- /* key: 0x6d26 */ 0xc733,
- /* key: 0x6d27 */ 0xc734,
- /* key: 0x6d28 */ 0xc735,
- /* key: 0x6d29 */ 0x314c,
- /* key: 0x6d2a */ 0x393f,
- /* key: 0x6d2b */ 0x5e29,
- /* key: 0x6d2c */ 0xffff,
- /* key: 0x6d2d */ 0xffff,
- /* key: 0x6d2e */ 0xc737,
- /* key: 0x6d2f */ 0xc738,
- /* key: 0x6d30 */ 0xffff,
- /* key: 0x6d31 */ 0xc739,
- /* key: 0x6d32 */ 0x3d27,
- /* key: 0x6d33 */ 0x5e2e,
- /* key: 0x6d34 */ 0xffff,
- /* key: 0x6d35 */ 0x5e2d,
- /* key: 0x6d36 */ 0x5e28,
- /* key: 0x6d37 */ 0xffff,
- /* key: 0x6d38 */ 0x5e2b,
- /* key: 0x6d39 */ 0xc73a,
- /* key: 0x6d3a */ 0xffff,
- /* key: 0x6d3b */ 0x3368,
- /* key: 0x6d3c */ 0xc73b,
- /* key: 0x6d3d */ 0x5e2a,
- /* key: 0x6d3e */ 0x4749,
- /* key: 0x6d3f */ 0xc73c,
- /* key: 0x6d40 */ 0xffff,
- /* key: 0x6d41 */ 0x4e2e,
- /* key: 0x6d42 */ 0xffff,
- /* key: 0x6d43 */ 0xffff,
- /* key: 0x6d44 */ 0x3e74,
- /* key: 0x6d45 */ 0x4075,
- /* key: 0x6d46 */ 0xffff,
- /* key: 0x6d47 */ 0xffff,
- /* key: 0x6d48 */ 0xffff,
- /* key: 0x6d49 */ 0xffff,
- /* key: 0x6d4a */ 0xffff,
- /* key: 0x6d4b */ 0xffff,
- /* key: 0x6d4c */ 0xffff,
- /* key: 0x6d4d */ 0xffff,
- /* key: 0x6d4e */ 0xffff,
- /* key: 0x6d4f */ 0xffff,
- /* key: 0x6d50 */ 0xffff,
- /* key: 0x6d51 */ 0xffff,
- /* key: 0x6d52 */ 0xffff,
- /* key: 0x6d53 */ 0xffff,
- /* key: 0x6d54 */ 0xffff,
- /* key: 0x6d55 */ 0xffff,
- /* key: 0x6d56 */ 0xffff,
- /* key: 0x6d57 */ 0xc73d,
- /* key: 0x6d58 */ 0xffff,
- /* key: 0x6d59 */ 0x5e36,
- /* key: 0x6d5a */ 0x5e34,
- /* key: 0x6d5b */ 0xffff,
- /* key: 0x6d5c */ 0x494d,
- /* key: 0x6d5d */ 0xffff,
- /* key: 0x6d5e */ 0xc73e,
- /* key: 0x6d5f */ 0xc73f,
- /* key: 0x6d60 */ 0xffff,
- /* key: 0x6d61 */ 0xc740,
- /* key: 0x6d62 */ 0xffff,
- /* key: 0x6d63 */ 0x5e31,
- /* key: 0x6d64 */ 0x5e33,
- /* key: 0x6d65 */ 0xc741,
- /* key: 0x6d66 */ 0x313a,
- /* key: 0x6d67 */ 0xc742,
- /* key: 0x6d68 */ 0xffff,
- /* key: 0x6d69 */ 0x3940,
- /* key: 0x6d6a */ 0x4f32,
- /* key: 0x6d6b */ 0xffff,
- /* key: 0x6d6c */ 0x333d,
- /* key: 0x6d6d */ 0xffff,
- /* key: 0x6d6e */ 0x4962,
- /* key: 0x6d6f */ 0xc743,
- /* key: 0x6d70 */ 0xc744,
- /* key: 0x6d71 */ 0xffff,
- /* key: 0x6d72 */ 0xffff,
- /* key: 0x6d73 */ 0xffff,
- /* key: 0x6d74 */ 0x4d61,
- /* key: 0x6d75 */ 0xffff,
- /* key: 0x6d76 */ 0xffff,
- /* key: 0x6d77 */ 0x3324,
- /* key: 0x6d78 */ 0x3f3b,
- /* key: 0x6d79 */ 0x5e35,
- /* key: 0x6d7a */ 0xffff,
- /* key: 0x6d7b */ 0xffff,
- /* key: 0x6d7c */ 0xc745,
- /* key: 0x6d7d */ 0xffff,
- /* key: 0x6d7e */ 0xffff,
- /* key: 0x6d7f */ 0xffff,
- /* key: 0x6d80 */ 0xffff,
- /* key: 0x6d81 */ 0xffff,
- /* key: 0x6d82 */ 0xc746,
- /* key: 0x6d83 */ 0xffff,
- /* key: 0x6d84 */ 0xffff,
- /* key: 0x6d85 */ 0x5e3a,
- /* key: 0x6d86 */ 0xffff,
- /* key: 0x6d87 */ 0xc747,
- /* key: 0x6d88 */ 0x3e43,
- /* key: 0x6d89 */ 0xffff,
- /* key: 0x6d8a */ 0xffff,
- /* key: 0x6d8b */ 0xffff,
- /* key: 0x6d8c */ 0x4d30,
- /* key: 0x6d8d */ 0xffff,
- /* key: 0x6d8e */ 0x5e37,
- /* key: 0x6d8f */ 0xffff,
- /* key: 0x6d90 */ 0xffff,
- /* key: 0x6d91 */ 0xc748,
- /* key: 0x6d92 */ 0xc749,
- /* key: 0x6d93 */ 0x5e32,
- /* key: 0x6d94 */ 0xc74a,
- /* key: 0x6d95 */ 0x5e38,
- /* key: 0x6d96 */ 0xc74b,
- /* key: 0x6d97 */ 0xc74c,
- /* key: 0x6d98 */ 0xc74d,
- /* key: 0x6d99 */ 0x4e5e,
- /* key: 0x6d9a */ 0xffff,
- /* key: 0x6d9b */ 0x4573,
- /* key: 0x6d9c */ 0x4642,
- /* key: 0x6d9d */ 0xffff,
- /* key: 0x6d9e */ 0xffff,
- /* key: 0x6d9f */ 0xffff,
- /* key: 0x6da0 */ 0xffff,
- /* key: 0x6da1 */ 0xffff,
- /* key: 0x6da2 */ 0xffff,
- /* key: 0x6da3 */ 0xffff,
- /* key: 0x6da4 */ 0xffff,
- /* key: 0x6da5 */ 0xffff,
- /* key: 0x6da6 */ 0xffff,
- /* key: 0x6da7 */ 0xffff,
- /* key: 0x6da8 */ 0xffff,
- /* key: 0x6da9 */ 0xffff,
- /* key: 0x6daa */ 0xc74e,
- /* key: 0x6dab */ 0xffff,
- /* key: 0x6dac */ 0xc74f,
- /* key: 0x6dad */ 0xffff,
- /* key: 0x6dae */ 0xffff,
- /* key: 0x6daf */ 0x3336,
- /* key: 0x6db0 */ 0xffff,
- /* key: 0x6db1 */ 0xffff,
- /* key: 0x6db2 */ 0x3155,
- /* key: 0x6db3 */ 0xffff,
- /* key: 0x6db4 */ 0xc750,
- /* key: 0x6db5 */ 0x5e3e,
- /* key: 0x6db6 */ 0xffff,
- /* key: 0x6db7 */ 0xc751,
- /* key: 0x6db8 */ 0x5e41,
- /* key: 0x6db9 */ 0xc752,
- /* key: 0x6dba */ 0xffff,
- /* key: 0x6dbb */ 0xffff,
- /* key: 0x6dbc */ 0x4e43,
- /* key: 0x6dbd */ 0xc753,
- /* key: 0x6dbe */ 0xffff,
- /* key: 0x6dbf */ 0xc754,
- /* key: 0x6dc0 */ 0x4d64,
- /* key: 0x6dc1 */ 0xffff,
- /* key: 0x6dc2 */ 0xffff,
- /* key: 0x6dc3 */ 0xffff,
- /* key: 0x6dc4 */ 0xc755,
- /* key: 0x6dc5 */ 0x5e48,
- /* key: 0x6dc6 */ 0x5e42,
- /* key: 0x6dc7 */ 0x5e3f,
- /* key: 0x6dc8 */ 0xc756,
- /* key: 0x6dc9 */ 0xffff,
- /* key: 0x6dca */ 0xc757,
- /* key: 0x6dcb */ 0x4e54,
- /* key: 0x6dcc */ 0x5e45,
- /* key: 0x6dcd */ 0xffff,
- /* key: 0x6dce */ 0xc758,
- /* key: 0x6dcf */ 0xc759,
- /* key: 0x6dd0 */ 0xffff,
- /* key: 0x6dd1 */ 0x3d4a,
- /* key: 0x6dd2 */ 0x5e47,
- /* key: 0x6dd3 */ 0xffff,
- /* key: 0x6dd4 */ 0xffff,
- /* key: 0x6dd5 */ 0x5e4c,
- /* key: 0x6dd6 */ 0xc75a,
- /* key: 0x6dd7 */ 0xffff,
- /* key: 0x6dd8 */ 0x4571,
- /* key: 0x6dd9 */ 0x5e4a,
- /* key: 0x6dda */ 0xffff,
- /* key: 0x6ddb */ 0xc75b,
- /* key: 0x6ddc */ 0xffff,
- /* key: 0x6ddd */ 0xc75c,
- /* key: 0x6dde */ 0x5e44,
- /* key: 0x6ddf */ 0xc75d,
- /* key: 0x6de0 */ 0xc75e,
- /* key: 0x6de1 */ 0x4338,
- /* key: 0x6de2 */ 0xc75f,
- /* key: 0x6de3 */ 0xffff,
- /* key: 0x6de4 */ 0x5e4b,
- /* key: 0x6de5 */ 0xc760,
- /* key: 0x6de6 */ 0x5e40,
- /* key: 0x6de7 */ 0xffff,
- /* key: 0x6de8 */ 0x5e46,
- /* key: 0x6de9 */ 0xc761,
- /* key: 0x6dea */ 0x5e4d,
- /* key: 0x6deb */ 0x307c,
- /* key: 0x6dec */ 0x5e43,
- /* key: 0x6ded */ 0xffff,
- /* key: 0x6dee */ 0x5e4e,
- /* key: 0x6def */ 0xc762,
- /* key: 0x6df0 */ 0xc763,
- /* key: 0x6df1 */ 0x3f3c,
- /* key: 0x6df2 */ 0xffff,
- /* key: 0x6df3 */ 0x3d5f,
- /* key: 0x6df4 */ 0xc764,
- /* key: 0x6df5 */ 0x4a25,
- /* key: 0x6df6 */ 0xc765,
- /* key: 0x6df7 */ 0x3a2e,
- /* key: 0x6df8 */ 0xffff,
- /* key: 0x6df9 */ 0x5e3b,
- /* key: 0x6dfa */ 0x5e49,
- /* key: 0x6dfb */ 0x453a,
- /* key: 0x6dfc */ 0xc766,
- /* key: 0x6dfd */ 0xffff,
- /* key: 0x6dfe */ 0xffff,
- /* key: 0x6dff */ 0xffff,
- /* branch: 0x6e0X */ 10320,
- /* branch: 0x6e1X */ 10336,
- /* branch: 0x6e2X */ 10352,
- /* branch: 0x6e3X */ 10368,
- /* branch: 0x6e4X */ 10384,
- /* branch: 0x6e5X */ 10400,
- /* branch: 0x6e6X */ 10416,
- /* branch: 0x6e7X */ 10432,
- /* branch: 0x6e8X */ 10448,
- /* branch: 0x6e9X */ 10464,
- /* branch: 0x6eaX */ 10480,
- /* branch: 0x6ebX */ 10496,
- /* branch: 0x6ecX */ 10512,
- /* branch: 0x6edX */ 10528,
- /* branch: 0x6eeX */ 10544,
- /* branch: 0x6efX */ 10560,
- /* key: 0x6e00 */ 0xc767,
- /* key: 0x6e01 */ 0xffff,
- /* key: 0x6e02 */ 0xffff,
- /* key: 0x6e03 */ 0xffff,
- /* key: 0x6e04 */ 0xc768,
- /* key: 0x6e05 */ 0x4036,
- /* key: 0x6e06 */ 0xffff,
- /* key: 0x6e07 */ 0x3369,
- /* key: 0x6e08 */ 0x3a51,
- /* key: 0x6e09 */ 0x3e44,
- /* key: 0x6e0a */ 0x5e3d,
- /* key: 0x6e0b */ 0x3d42,
- /* key: 0x6e0c */ 0xffff,
- /* key: 0x6e0d */ 0xffff,
- /* key: 0x6e0e */ 0xffff,
- /* key: 0x6e0f */ 0xffff,
- /* key: 0x6e10 */ 0xffff,
- /* key: 0x6e11 */ 0xffff,
- /* key: 0x6e12 */ 0xffff,
- /* key: 0x6e13 */ 0x374c,
- /* key: 0x6e14 */ 0xffff,
- /* key: 0x6e15 */ 0x5e3c,
- /* key: 0x6e16 */ 0xffff,
- /* key: 0x6e17 */ 0xffff,
- /* key: 0x6e18 */ 0xffff,
- /* key: 0x6e19 */ 0x5e52,
- /* key: 0x6e1a */ 0x3d6d,
- /* key: 0x6e1b */ 0x383a,
- /* key: 0x6e1c */ 0xffff,
- /* key: 0x6e1d */ 0x5e61,
- /* key: 0x6e1e */ 0xc769,
- /* key: 0x6e1f */ 0x5e5b,
- /* key: 0x6e20 */ 0x3574,
- /* key: 0x6e21 */ 0x454f,
- /* key: 0x6e22 */ 0xc76a,
- /* key: 0x6e23 */ 0x5e56,
- /* key: 0x6e24 */ 0x5e5f,
- /* key: 0x6e25 */ 0x302f,
- /* key: 0x6e26 */ 0x3132,
- /* key: 0x6e27 */ 0xc76b,
- /* key: 0x6e28 */ 0xffff,
- /* key: 0x6e29 */ 0x3239,
- /* key: 0x6e2a */ 0xffff,
- /* key: 0x6e2b */ 0x5e58,
- /* key: 0x6e2c */ 0x422c,
- /* key: 0x6e2d */ 0x5e4f,
- /* key: 0x6e2e */ 0x5e51,
- /* key: 0x6e2f */ 0x3941,
- /* key: 0x6e30 */ 0xffff,
- /* key: 0x6e31 */ 0xffff,
- /* key: 0x6e32 */ 0xc76c,
- /* key: 0x6e33 */ 0xffff,
- /* key: 0x6e34 */ 0xffff,
- /* key: 0x6e35 */ 0xffff,
- /* key: 0x6e36 */ 0xc76d,
- /* key: 0x6e37 */ 0xffff,
- /* key: 0x6e38 */ 0x5e62,
- /* key: 0x6e39 */ 0xc76e,
- /* key: 0x6e3a */ 0x5e5d,
- /* key: 0x6e3b */ 0xc76f,
- /* key: 0x6e3c */ 0xc770,
- /* key: 0x6e3d */ 0xffff,
- /* key: 0x6e3e */ 0x5e55,
- /* key: 0x6e3f */ 0xffff,
- /* key: 0x6e40 */ 0xffff,
- /* key: 0x6e41 */ 0xffff,
- /* key: 0x6e42 */ 0xffff,
- /* key: 0x6e43 */ 0x5e5c,
- /* key: 0x6e44 */ 0xc771,
- /* key: 0x6e45 */ 0xc772,
- /* key: 0x6e46 */ 0xffff,
- /* key: 0x6e47 */ 0xffff,
- /* key: 0x6e48 */ 0xc773,
- /* key: 0x6e49 */ 0xc774,
- /* key: 0x6e4a */ 0x4c2b,
- /* key: 0x6e4b */ 0xc775,
- /* key: 0x6e4c */ 0xffff,
- /* key: 0x6e4d */ 0x5e5a,
- /* key: 0x6e4e */ 0x5e5e,
- /* key: 0x6e4f */ 0xc776,
- /* key: 0x6e50 */ 0xffff,
- /* key: 0x6e51 */ 0xc777,
- /* key: 0x6e52 */ 0xc778,
- /* key: 0x6e53 */ 0xc779,
- /* key: 0x6e54 */ 0xc77a,
- /* key: 0x6e55 */ 0xffff,
- /* key: 0x6e56 */ 0x3850,
- /* key: 0x6e57 */ 0xc77b,
- /* key: 0x6e58 */ 0x3e45,
- /* key: 0x6e59 */ 0xffff,
- /* key: 0x6e5a */ 0xffff,
- /* key: 0x6e5b */ 0x4339,
- /* key: 0x6e5c */ 0xc77c,
- /* key: 0x6e5d */ 0xc77d,
- /* key: 0x6e5e */ 0xc77e,
- /* key: 0x6e5f */ 0x5e54,
- /* key: 0x6e60 */ 0xffff,
- /* key: 0x6e61 */ 0xffff,
- /* key: 0x6e62 */ 0xc821,
- /* key: 0x6e63 */ 0xc822,
- /* key: 0x6e64 */ 0xffff,
- /* key: 0x6e65 */ 0xffff,
- /* key: 0x6e66 */ 0xffff,
- /* key: 0x6e67 */ 0x4d2f,
- /* key: 0x6e68 */ 0xc823,
- /* key: 0x6e69 */ 0xffff,
- /* key: 0x6e6a */ 0xffff,
- /* key: 0x6e6b */ 0x5e57,
- /* key: 0x6e6c */ 0xffff,
- /* key: 0x6e6d */ 0xffff,
- /* key: 0x6e6e */ 0x5e50,
- /* key: 0x6e6f */ 0x4572,
- /* key: 0x6e70 */ 0xffff,
- /* key: 0x6e71 */ 0xffff,
- /* key: 0x6e72 */ 0x5e53,
- /* key: 0x6e73 */ 0xc824,
- /* key: 0x6e74 */ 0xffff,
- /* key: 0x6e75 */ 0xffff,
- /* key: 0x6e76 */ 0x5e59,
- /* key: 0x6e77 */ 0xffff,
- /* key: 0x6e78 */ 0xffff,
- /* key: 0x6e79 */ 0xffff,
- /* key: 0x6e7a */ 0xffff,
- /* key: 0x6e7b */ 0xc825,
- /* key: 0x6e7c */ 0xffff,
- /* key: 0x6e7d */ 0xc826,
- /* key: 0x6e7e */ 0x4f51,
- /* key: 0x6e7f */ 0x3c3e,
- /* key: 0x6e80 */ 0x4b7e,
- /* key: 0x6e81 */ 0xffff,
- /* key: 0x6e82 */ 0x5e63,
- /* key: 0x6e83 */ 0xffff,
- /* key: 0x6e84 */ 0xffff,
- /* key: 0x6e85 */ 0xffff,
- /* key: 0x6e86 */ 0xffff,
- /* key: 0x6e87 */ 0xffff,
- /* key: 0x6e88 */ 0xffff,
- /* key: 0x6e89 */ 0xffff,
- /* key: 0x6e8a */ 0xffff,
- /* key: 0x6e8b */ 0xffff,
- /* key: 0x6e8c */ 0x482e,
- /* key: 0x6e8d */ 0xc827,
- /* key: 0x6e8e */ 0xffff,
- /* key: 0x6e8f */ 0x5e6f,
- /* key: 0x6e90 */ 0x383b,
- /* key: 0x6e91 */ 0xffff,
- /* key: 0x6e92 */ 0xffff,
- /* key: 0x6e93 */ 0xc828,
- /* key: 0x6e94 */ 0xffff,
- /* key: 0x6e95 */ 0xffff,
- /* key: 0x6e96 */ 0x3d60,
- /* key: 0x6e97 */ 0xffff,
- /* key: 0x6e98 */ 0x5e65,
- /* key: 0x6e99 */ 0xc829,
- /* key: 0x6e9a */ 0xffff,
- /* key: 0x6e9b */ 0xffff,
- /* key: 0x6e9c */ 0x4e2f,
- /* key: 0x6e9d */ 0x3942,
- /* key: 0x6e9e */ 0xffff,
- /* key: 0x6e9f */ 0x5e72,
- /* key: 0x6ea0 */ 0xc82a,
- /* key: 0x6ea1 */ 0xffff,
- /* key: 0x6ea2 */ 0x306e,
- /* key: 0x6ea3 */ 0xffff,
- /* key: 0x6ea4 */ 0xffff,
- /* key: 0x6ea5 */ 0x5e70,
- /* key: 0x6ea6 */ 0xffff,
- /* key: 0x6ea7 */ 0xc82b,
- /* key: 0x6ea8 */ 0xffff,
- /* key: 0x6ea9 */ 0xffff,
- /* key: 0x6eaa */ 0x5e64,
- /* key: 0x6eab */ 0xffff,
- /* key: 0x6eac */ 0xffff,
- /* key: 0x6ead */ 0xc82c,
- /* key: 0x6eae */ 0xc82d,
- /* key: 0x6eaf */ 0x5e6a,
- /* key: 0x6eb0 */ 0xffff,
- /* key: 0x6eb1 */ 0xc82e,
- /* key: 0x6eb2 */ 0x5e6c,
- /* key: 0x6eb3 */ 0xc82f,
- /* key: 0x6eb4 */ 0xffff,
- /* key: 0x6eb5 */ 0xffff,
- /* key: 0x6eb6 */ 0x4d4f,
- /* key: 0x6eb7 */ 0x5e67,
- /* key: 0x6eb8 */ 0xffff,
- /* key: 0x6eb9 */ 0xffff,
- /* key: 0x6eba */ 0x452e,
- /* key: 0x6ebb */ 0xc830,
- /* key: 0x6ebc */ 0xffff,
- /* key: 0x6ebd */ 0x5e69,
- /* key: 0x6ebe */ 0xffff,
- /* key: 0x6ebf */ 0xc831,
- /* key: 0x6ec0 */ 0xc832,
- /* key: 0x6ec1 */ 0xc833,
- /* key: 0x6ec2 */ 0x5e71,
- /* key: 0x6ec3 */ 0xc834,
- /* key: 0x6ec4 */ 0x5e6b,
- /* key: 0x6ec5 */ 0x4c47,
- /* key: 0x6ec6 */ 0xffff,
- /* key: 0x6ec7 */ 0xc835,
- /* key: 0x6ec8 */ 0xc836,
- /* key: 0x6ec9 */ 0x5e66,
- /* key: 0x6eca */ 0xc837,
- /* key: 0x6ecb */ 0x3c22,
- /* key: 0x6ecc */ 0x5e7e,
- /* key: 0x6ecd */ 0xc838,
- /* key: 0x6ece */ 0xc839,
- /* key: 0x6ecf */ 0xc83a,
- /* key: 0x6ed0 */ 0xffff,
- /* key: 0x6ed1 */ 0x336a,
- /* key: 0x6ed2 */ 0xffff,
- /* key: 0x6ed3 */ 0x5e68,
- /* key: 0x6ed4 */ 0x5e6d,
- /* key: 0x6ed5 */ 0x5e6e,
- /* key: 0x6ed6 */ 0xffff,
- /* key: 0x6ed7 */ 0xffff,
- /* key: 0x6ed8 */ 0xffff,
- /* key: 0x6ed9 */ 0xffff,
- /* key: 0x6eda */ 0xffff,
- /* key: 0x6edb */ 0xffff,
- /* key: 0x6edc */ 0xffff,
- /* key: 0x6edd */ 0x426c,
- /* key: 0x6ede */ 0x425a,
- /* key: 0x6edf */ 0xffff,
- /* key: 0x6ee0 */ 0xffff,
- /* key: 0x6ee1 */ 0xffff,
- /* key: 0x6ee2 */ 0xffff,
- /* key: 0x6ee3 */ 0xffff,
- /* key: 0x6ee4 */ 0xffff,
- /* key: 0x6ee5 */ 0xffff,
- /* key: 0x6ee6 */ 0xffff,
- /* key: 0x6ee7 */ 0xffff,
- /* key: 0x6ee8 */ 0xffff,
- /* key: 0x6ee9 */ 0xffff,
- /* key: 0x6eea */ 0xffff,
- /* key: 0x6eeb */ 0xc83b,
- /* key: 0x6eec */ 0x5e76,
- /* key: 0x6eed */ 0xc83c,
- /* key: 0x6eee */ 0xc83d,
- /* key: 0x6eef */ 0x5e7c,
- /* key: 0x6ef0 */ 0xffff,
- /* key: 0x6ef1 */ 0xffff,
- /* key: 0x6ef2 */ 0x5e7a,
- /* key: 0x6ef3 */ 0xffff,
- /* key: 0x6ef4 */ 0x4529,
- /* key: 0x6ef5 */ 0xffff,
- /* key: 0x6ef6 */ 0xffff,
- /* key: 0x6ef7 */ 0x5f23,
- /* key: 0x6ef8 */ 0x5e77,
- /* key: 0x6ef9 */ 0xc83e,
- /* key: 0x6efa */ 0xffff,
- /* key: 0x6efb */ 0xc83f,
- /* key: 0x6efc */ 0xffff,
- /* key: 0x6efd */ 0xc840,
- /* key: 0x6efe */ 0x5e78,
- /* key: 0x6eff */ 0x5e60,
- /* branch: 0x6f0X */ 10592,
- /* branch: 0x6f1X */ 10608,
- /* branch: 0x6f2X */ 10624,
- /* branch: 0x6f3X */ 10640,
- /* branch: 0x6f4X */ 10656,
- /* branch: 0x6f5X */ 10672,
- /* branch: 0x6f6X */ 10688,
- /* branch: 0x6f7X */ 10704,
- /* branch: 0x6f8X */ 10720,
- /* branch: 0x6f9X */ 10736,
- /* branch: 0x6faX */ 10752,
- /* branch: 0x6fbX */ 10768,
- /* branch: 0x6fcX */ 10784,
- /* branch: 0x6fdX */ 10800,
- /* branch: 0x6feX */ 10816,
- /* branch: 0x6ffX */ 10832,
- /* key: 0x6f00 */ 0xffff,
- /* key: 0x6f01 */ 0x3579,
- /* key: 0x6f02 */ 0x493a,
- /* key: 0x6f03 */ 0xffff,
- /* key: 0x6f04 */ 0xc841,
- /* key: 0x6f05 */ 0xffff,
- /* key: 0x6f06 */ 0x3c3f,
- /* key: 0x6f07 */ 0xffff,
- /* key: 0x6f08 */ 0xc842,
- /* key: 0x6f09 */ 0x3977,
- /* key: 0x6f0a */ 0xc843,
- /* key: 0x6f0b */ 0xffff,
- /* key: 0x6f0c */ 0xc844,
- /* key: 0x6f0d */ 0xc845,
- /* key: 0x6f0e */ 0xffff,
- /* key: 0x6f0f */ 0x4f33,
- /* key: 0x6f10 */ 0xffff,
- /* key: 0x6f11 */ 0x5e74,
- /* key: 0x6f12 */ 0xffff,
- /* key: 0x6f13 */ 0x5f22,
- /* key: 0x6f14 */ 0x3169,
- /* key: 0x6f15 */ 0x4166,
- /* key: 0x6f16 */ 0xc846,
- /* key: 0x6f17 */ 0xffff,
- /* key: 0x6f18 */ 0xc847,
- /* key: 0x6f19 */ 0xffff,
- /* key: 0x6f1a */ 0xc848,
- /* key: 0x6f1b */ 0xc849,
- /* key: 0x6f1c */ 0xffff,
- /* key: 0x6f1d */ 0xffff,
- /* key: 0x6f1e */ 0xffff,
- /* key: 0x6f1f */ 0xffff,
- /* key: 0x6f20 */ 0x4779,
- /* key: 0x6f21 */ 0xffff,
- /* key: 0x6f22 */ 0x3441,
- /* key: 0x6f23 */ 0x4e7a,
- /* key: 0x6f24 */ 0xffff,
- /* key: 0x6f25 */ 0xffff,
- /* key: 0x6f26 */ 0xc84a,
- /* key: 0x6f27 */ 0xffff,
- /* key: 0x6f28 */ 0xffff,
- /* key: 0x6f29 */ 0xc84b,
- /* key: 0x6f2a */ 0xc84c,
- /* key: 0x6f2b */ 0x4c21,
- /* key: 0x6f2c */ 0x4452,
- /* key: 0x6f2d */ 0xc853,
- /* key: 0x6f2e */ 0xffff,
- /* key: 0x6f2f */ 0xc84d,
- /* key: 0x6f30 */ 0xc84e,
- /* key: 0x6f31 */ 0x5e7b,
- /* key: 0x6f32 */ 0x5e7d,
- /* key: 0x6f33 */ 0xc84f,
- /* key: 0x6f34 */ 0xffff,
- /* key: 0x6f35 */ 0xffff,
- /* key: 0x6f36 */ 0xc850,
- /* key: 0x6f37 */ 0xffff,
- /* key: 0x6f38 */ 0x4132,
- /* key: 0x6f39 */ 0xffff,
- /* key: 0x6f3a */ 0xffff,
- /* key: 0x6f3b */ 0xc851,
- /* key: 0x6f3c */ 0xc852,
- /* key: 0x6f3d */ 0xffff,
- /* key: 0x6f3e */ 0x5f21,
- /* key: 0x6f3f */ 0x5e79,
- /* key: 0x6f40 */ 0xffff,
- /* key: 0x6f41 */ 0x5e73,
- /* key: 0x6f42 */ 0xffff,
- /* key: 0x6f43 */ 0xffff,
- /* key: 0x6f44 */ 0xffff,
- /* key: 0x6f45 */ 0x3443,
- /* key: 0x6f46 */ 0xffff,
- /* key: 0x6f47 */ 0xffff,
- /* key: 0x6f48 */ 0xffff,
- /* key: 0x6f49 */ 0xffff,
- /* key: 0x6f4a */ 0xffff,
- /* key: 0x6f4b */ 0xffff,
- /* key: 0x6f4c */ 0xffff,
- /* key: 0x6f4d */ 0xffff,
- /* key: 0x6f4e */ 0xffff,
- /* key: 0x6f4f */ 0xc854,
- /* key: 0x6f50 */ 0xffff,
- /* key: 0x6f51 */ 0xc855,
- /* key: 0x6f52 */ 0xc856,
- /* key: 0x6f53 */ 0xc857,
- /* key: 0x6f54 */ 0x3769,
- /* key: 0x6f55 */ 0xffff,
- /* key: 0x6f56 */ 0xffff,
- /* key: 0x6f57 */ 0xc858,
- /* key: 0x6f58 */ 0x5f2f,
- /* key: 0x6f59 */ 0xc859,
- /* key: 0x6f5a */ 0xc85a,
- /* key: 0x6f5b */ 0x5f2a,
- /* key: 0x6f5c */ 0x4078,
- /* key: 0x6f5d */ 0xc85b,
- /* key: 0x6f5e */ 0xc85c,
- /* key: 0x6f5f */ 0x3363,
- /* key: 0x6f60 */ 0xffff,
- /* key: 0x6f61 */ 0xc85d,
- /* key: 0x6f62 */ 0xc85e,
- /* key: 0x6f63 */ 0xffff,
- /* key: 0x6f64 */ 0x3d61,
- /* key: 0x6f65 */ 0xffff,
- /* key: 0x6f66 */ 0x5f33,
- /* key: 0x6f67 */ 0xffff,
- /* key: 0x6f68 */ 0xc85f,
- /* key: 0x6f69 */ 0xffff,
- /* key: 0x6f6a */ 0xffff,
- /* key: 0x6f6b */ 0xffff,
- /* key: 0x6f6c */ 0xc860,
- /* key: 0x6f6d */ 0x5f2c,
- /* key: 0x6f6e */ 0x442c,
- /* key: 0x6f6f */ 0x5f29,
- /* key: 0x6f70 */ 0x4459,
- /* key: 0x6f71 */ 0xffff,
- /* key: 0x6f72 */ 0xffff,
- /* key: 0x6f73 */ 0xffff,
- /* key: 0x6f74 */ 0x5f4c,
- /* key: 0x6f75 */ 0xffff,
- /* key: 0x6f76 */ 0xffff,
- /* key: 0x6f77 */ 0xffff,
- /* key: 0x6f78 */ 0x5f26,
- /* key: 0x6f79 */ 0xffff,
- /* key: 0x6f7a */ 0x5f25,
- /* key: 0x6f7b */ 0xffff,
- /* key: 0x6f7c */ 0x5f2e,
- /* key: 0x6f7d */ 0xc861,
- /* key: 0x6f7e */ 0xc862,
- /* key: 0x6f7f */ 0xffff,
- /* key: 0x6f80 */ 0x5f28,
- /* key: 0x6f81 */ 0x5f27,
- /* key: 0x6f82 */ 0x5f2d,
- /* key: 0x6f83 */ 0xc863,
- /* key: 0x6f84 */ 0x4021,
- /* key: 0x6f85 */ 0xffff,
- /* key: 0x6f86 */ 0x5f24,
- /* key: 0x6f87 */ 0xc864,
- /* key: 0x6f88 */ 0xc865,
- /* key: 0x6f89 */ 0xffff,
- /* key: 0x6f8a */ 0xffff,
- /* key: 0x6f8b */ 0xc866,
- /* key: 0x6f8c */ 0xc867,
- /* key: 0x6f8d */ 0xc868,
- /* key: 0x6f8e */ 0x5f30,
- /* key: 0x6f8f */ 0xffff,
- /* key: 0x6f90 */ 0xc869,
- /* key: 0x6f91 */ 0x5f31,
- /* key: 0x6f92 */ 0xc86a,
- /* key: 0x6f93 */ 0xc86b,
- /* key: 0x6f94 */ 0xc86c,
- /* key: 0x6f95 */ 0xffff,
- /* key: 0x6f96 */ 0xc86d,
- /* key: 0x6f97 */ 0x3442,
- /* key: 0x6f98 */ 0xffff,
- /* key: 0x6f99 */ 0xffff,
- /* key: 0x6f9a */ 0xc86e,
- /* key: 0x6f9b */ 0xffff,
- /* key: 0x6f9c */ 0xffff,
- /* key: 0x6f9d */ 0xffff,
- /* key: 0x6f9e */ 0xffff,
- /* key: 0x6f9f */ 0xc86f,
- /* key: 0x6fa0 */ 0xc870,
- /* key: 0x6fa1 */ 0x5f36,
- /* key: 0x6fa2 */ 0xffff,
- /* key: 0x6fa3 */ 0x5f35,
- /* key: 0x6fa4 */ 0x5f37,
- /* key: 0x6fa5 */ 0xc871,
- /* key: 0x6fa6 */ 0xc872,
- /* key: 0x6fa7 */ 0xc873,
- /* key: 0x6fa8 */ 0xc874,
- /* key: 0x6fa9 */ 0xffff,
- /* key: 0x6faa */ 0x5f3a,
- /* key: 0x6fab */ 0xffff,
- /* key: 0x6fac */ 0xffff,
- /* key: 0x6fad */ 0xffff,
- /* key: 0x6fae */ 0xc875,
- /* key: 0x6faf */ 0xc876,
- /* key: 0x6fb0 */ 0xc877,
- /* key: 0x6fb1 */ 0x4543,
- /* key: 0x6fb2 */ 0xffff,
- /* key: 0x6fb3 */ 0x5f34,
- /* key: 0x6fb4 */ 0xffff,
- /* key: 0x6fb5 */ 0xc878,
- /* key: 0x6fb6 */ 0xc879,
- /* key: 0x6fb7 */ 0xffff,
- /* key: 0x6fb8 */ 0xffff,
- /* key: 0x6fb9 */ 0x5f38,
- /* key: 0x6fba */ 0xffff,
- /* key: 0x6fbb */ 0xffff,
- /* key: 0x6fbc */ 0xc87a,
- /* key: 0x6fbd */ 0xffff,
- /* key: 0x6fbe */ 0xffff,
- /* key: 0x6fbf */ 0xffff,
- /* key: 0x6fc0 */ 0x3763,
- /* key: 0x6fc1 */ 0x4279,
- /* key: 0x6fc2 */ 0x5f32,
- /* key: 0x6fc3 */ 0x473b,
- /* key: 0x6fc4 */ 0xffff,
- /* key: 0x6fc5 */ 0xc87b,
- /* key: 0x6fc6 */ 0x5f39,
- /* key: 0x6fc7 */ 0xc87c,
- /* key: 0x6fc8 */ 0xc87d,
- /* key: 0x6fc9 */ 0xffff,
- /* key: 0x6fca */ 0xc87e,
- /* key: 0x6fcb */ 0xffff,
- /* key: 0x6fcc */ 0xffff,
- /* key: 0x6fcd */ 0xffff,
- /* key: 0x6fce */ 0xffff,
- /* key: 0x6fcf */ 0xffff,
- /* key: 0x6fd0 */ 0xffff,
- /* key: 0x6fd1 */ 0xffff,
- /* key: 0x6fd2 */ 0xffff,
- /* key: 0x6fd3 */ 0xffff,
- /* key: 0x6fd4 */ 0x5f3e,
- /* key: 0x6fd5 */ 0x5f3c,
- /* key: 0x6fd6 */ 0xffff,
- /* key: 0x6fd7 */ 0xffff,
- /* key: 0x6fd8 */ 0x5f3f,
- /* key: 0x6fd9 */ 0xffff,
- /* key: 0x6fda */ 0xc921,
- /* key: 0x6fdb */ 0x5f42,
- /* key: 0x6fdc */ 0xffff,
- /* key: 0x6fdd */ 0xffff,
- /* key: 0x6fde */ 0xc922,
- /* key: 0x6fdf */ 0x5f3b,
- /* key: 0x6fe0 */ 0x396a,
- /* key: 0x6fe1 */ 0x4728,
- /* key: 0x6fe2 */ 0xffff,
- /* key: 0x6fe3 */ 0xffff,
- /* key: 0x6fe4 */ 0x5e39,
- /* key: 0x6fe5 */ 0xffff,
- /* key: 0x6fe6 */ 0xffff,
- /* key: 0x6fe7 */ 0xffff,
- /* key: 0x6fe8 */ 0xc923,
- /* key: 0x6fe9 */ 0xc924,
- /* key: 0x6fea */ 0xffff,
- /* key: 0x6feb */ 0x4d74,
- /* key: 0x6fec */ 0x5f3d,
- /* key: 0x6fed */ 0xffff,
- /* key: 0x6fee */ 0x5f41,
- /* key: 0x6fef */ 0x4275,
- /* key: 0x6ff0 */ 0xc925,
- /* key: 0x6ff1 */ 0x5f40,
- /* key: 0x6ff2 */ 0xffff,
- /* key: 0x6ff3 */ 0x5f2b,
- /* key: 0x6ff4 */ 0xffff,
- /* key: 0x6ff5 */ 0xc926,
- /* key: 0x6ff6 */ 0x6f69,
- /* key: 0x6ff7 */ 0xffff,
- /* key: 0x6ff8 */ 0xffff,
- /* key: 0x6ff9 */ 0xc927,
- /* key: 0x6ffa */ 0x5f45,
- /* key: 0x6ffb */ 0xffff,
- /* key: 0x6ffc */ 0xc928,
- /* key: 0x6ffd */ 0xc929,
- /* key: 0x6ffe */ 0x5f49,
- /* key: 0x6fff */ 0xffff,
- /* branch: 0x70XX */ 10864,
- /* branch: 0x71XX */ 11136,
- /* branch: 0x72XX */ 11408,
- /* branch: 0x73XX */ 11680,
- /* branch: 0x74XX */ 11952,
- /* branch: 0x75XX */ 12224,
- /* branch: 0x76XX */ 12496,
- /* branch: 0x77XX */ 12768,
- /* branch: 0x78XX */ 13040,
- /* branch: 0x79XX */ 13312,
- /* branch: 0x7aXX */ 13584,
- /* branch: 0x7bXX */ 13856,
- /* branch: 0x7cXX */ 14128,
- /* branch: 0x7dXX */ 14400,
- /* branch: 0x7eXX */ 14672,
- /* branch: 0x7fXX */ 14848,
- /* branch: 0x700X */ 10880,
- /* branch: 0x701X */ 10896,
- /* branch: 0x702X */ 10912,
- /* branch: 0x703X */ 10928,
- /* branch: 0x704X */ 10944,
- /* branch: 0x705X */ 10960,
- /* branch: 0x706X */ 10976,
- /* branch: 0x707X */ 10992,
- /* branch: 0x708X */ 11008,
- /* branch: 0x709X */ 11024,
- /* branch: 0x70aX */ 11040,
- /* branch: 0x70bX */ 11056,
- /* branch: 0x70cX */ 11072,
- /* branch: 0x70dX */ 11088,
- /* branch: 0x70eX */ 11104,
- /* branch: 0x70fX */ 11120,
- /* key: 0x7000 */ 0xc92a,
- /* key: 0x7001 */ 0x5f47,
- /* key: 0x7002 */ 0xffff,
- /* key: 0x7003 */ 0xffff,
- /* key: 0x7004 */ 0xffff,
- /* key: 0x7005 */ 0xc92b,
- /* key: 0x7006 */ 0xc92c,
- /* key: 0x7007 */ 0xc92d,
- /* key: 0x7008 */ 0xffff,
- /* key: 0x7009 */ 0x5f43,
- /* key: 0x700a */ 0xffff,
- /* key: 0x700b */ 0x5f44,
- /* key: 0x700c */ 0xffff,
- /* key: 0x700d */ 0xc92e,
- /* key: 0x700e */ 0xffff,
- /* key: 0x700f */ 0x5f48,
- /* key: 0x7010 */ 0xffff,
- /* key: 0x7011 */ 0x5f46,
- /* key: 0x7012 */ 0xffff,
- /* key: 0x7013 */ 0xffff,
- /* key: 0x7014 */ 0xffff,
- /* key: 0x7015 */ 0x494e,
- /* key: 0x7016 */ 0xffff,
- /* key: 0x7017 */ 0xc92f,
- /* key: 0x7018 */ 0x5f4e,
- /* key: 0x7019 */ 0xffff,
- /* key: 0x701a */ 0x5f4b,
- /* key: 0x701b */ 0x5f4a,
- /* key: 0x701c */ 0xffff,
- /* key: 0x701d */ 0x5f4d,
- /* key: 0x701e */ 0x4654,
- /* key: 0x701f */ 0x5f4f,
- /* key: 0x7020 */ 0xc930,
- /* key: 0x7021 */ 0xffff,
- /* key: 0x7022 */ 0xffff,
- /* key: 0x7023 */ 0xc931,
- /* key: 0x7024 */ 0xffff,
- /* key: 0x7025 */ 0xffff,
- /* key: 0x7026 */ 0x4375,
- /* key: 0x7027 */ 0x426d,
- /* key: 0x7028 */ 0xffff,
- /* key: 0x7029 */ 0xffff,
- /* key: 0x702a */ 0xffff,
- /* key: 0x702b */ 0xffff,
- /* key: 0x702c */ 0x4025,
- /* key: 0x702d */ 0xffff,
- /* key: 0x702e */ 0xffff,
- /* key: 0x702f */ 0xc932,
- /* key: 0x7030 */ 0x5f50,
- /* key: 0x7031 */ 0xffff,
- /* key: 0x7032 */ 0x5f52,
- /* key: 0x7033 */ 0xffff,
- /* key: 0x7034 */ 0xc933,
- /* key: 0x7035 */ 0xffff,
- /* key: 0x7036 */ 0xffff,
- /* key: 0x7037 */ 0xc934,
- /* key: 0x7038 */ 0xffff,
- /* key: 0x7039 */ 0xc935,
- /* key: 0x703a */ 0xffff,
- /* key: 0x703b */ 0xffff,
- /* key: 0x703c */ 0xc936,
- /* key: 0x703d */ 0xffff,
- /* key: 0x703e */ 0x5f51,
- /* key: 0x703f */ 0xffff,
- /* key: 0x7040 */ 0xffff,
- /* key: 0x7041 */ 0xffff,
- /* key: 0x7042 */ 0xffff,
- /* key: 0x7043 */ 0xc937,
- /* key: 0x7044 */ 0xc938,
- /* key: 0x7045 */ 0xffff,
- /* key: 0x7046 */ 0xffff,
- /* key: 0x7047 */ 0xffff,
- /* key: 0x7048 */ 0xc939,
- /* key: 0x7049 */ 0xc93a,
- /* key: 0x704a */ 0xc93b,
- /* key: 0x704b */ 0xc93c,
- /* key: 0x704c */ 0x5e75,
- /* key: 0x704d */ 0xffff,
- /* key: 0x704e */ 0xc941,
- /* key: 0x704f */ 0xffff,
- /* key: 0x7050 */ 0xffff,
- /* key: 0x7051 */ 0x5f53,
- /* key: 0x7052 */ 0xffff,
- /* key: 0x7053 */ 0xffff,
- /* key: 0x7054 */ 0xc93d,
- /* key: 0x7055 */ 0xc93e,
- /* key: 0x7056 */ 0xffff,
- /* key: 0x7057 */ 0xffff,
- /* key: 0x7058 */ 0x4667,
- /* key: 0x7059 */ 0xffff,
- /* key: 0x705a */ 0xffff,
- /* key: 0x705b */ 0xffff,
- /* key: 0x705c */ 0xffff,
- /* key: 0x705d */ 0xc93f,
- /* key: 0x705e */ 0xc940,
- /* key: 0x705f */ 0xffff,
- /* key: 0x7060 */ 0xffff,
- /* key: 0x7061 */ 0xffff,
- /* key: 0x7062 */ 0xffff,
- /* key: 0x7063 */ 0x5f54,
- /* key: 0x7064 */ 0xc942,
- /* key: 0x7065 */ 0xc943,
- /* key: 0x7066 */ 0xffff,
- /* key: 0x7067 */ 0xffff,
- /* key: 0x7068 */ 0xffff,
- /* key: 0x7069 */ 0xffff,
- /* key: 0x706a */ 0xffff,
- /* key: 0x706b */ 0x3250,
- /* key: 0x706c */ 0xc944,
- /* key: 0x706d */ 0xffff,
- /* key: 0x706e */ 0xc945,
- /* key: 0x706f */ 0x4574,
- /* key: 0x7070 */ 0x3325,
- /* key: 0x7071 */ 0xffff,
- /* key: 0x7072 */ 0xffff,
- /* key: 0x7073 */ 0xffff,
- /* key: 0x7074 */ 0xffff,
- /* key: 0x7075 */ 0xc946,
- /* key: 0x7076 */ 0xc947,
- /* key: 0x7077 */ 0xffff,
- /* key: 0x7078 */ 0x3564,
- /* key: 0x7079 */ 0xffff,
- /* key: 0x707a */ 0xffff,
- /* key: 0x707b */ 0xffff,
- /* key: 0x707c */ 0x3c5e,
- /* key: 0x707d */ 0x3a52,
- /* key: 0x707e */ 0xc948,
- /* key: 0x707f */ 0xffff,
- /* key: 0x7080 */ 0xffff,
- /* key: 0x7081 */ 0xc949,
- /* key: 0x7082 */ 0xffff,
- /* key: 0x7083 */ 0xffff,
- /* key: 0x7084 */ 0xffff,
- /* key: 0x7085 */ 0xc94a,
- /* key: 0x7086 */ 0xc94b,
- /* key: 0x7087 */ 0xffff,
- /* key: 0x7088 */ 0xffff,
- /* key: 0x7089 */ 0x4f27,
- /* key: 0x708a */ 0x3f66,
- /* key: 0x708b */ 0xffff,
- /* key: 0x708c */ 0xffff,
- /* key: 0x708d */ 0xffff,
- /* key: 0x708e */ 0x316a,
- /* key: 0x708f */ 0xffff,
- /* key: 0x7090 */ 0xffff,
- /* key: 0x7091 */ 0xffff,
- /* key: 0x7092 */ 0x5f56,
- /* key: 0x7093 */ 0xffff,
- /* key: 0x7094 */ 0xc94c,
- /* key: 0x7095 */ 0xc94d,
- /* key: 0x7096 */ 0xc94e,
- /* key: 0x7097 */ 0xc94f,
- /* key: 0x7098 */ 0xc950,
- /* key: 0x7099 */ 0x5f55,
- /* key: 0x709a */ 0xffff,
- /* key: 0x709b */ 0xc951,
- /* key: 0x709c */ 0xffff,
- /* key: 0x709d */ 0xffff,
- /* key: 0x709e */ 0xffff,
- /* key: 0x709f */ 0xffff,
- /* key: 0x70a0 */ 0xffff,
- /* key: 0x70a1 */ 0xffff,
- /* key: 0x70a2 */ 0xffff,
- /* key: 0x70a3 */ 0xffff,
- /* key: 0x70a4 */ 0xc952,
- /* key: 0x70a5 */ 0xffff,
- /* key: 0x70a6 */ 0xffff,
- /* key: 0x70a7 */ 0xffff,
- /* key: 0x70a8 */ 0xffff,
- /* key: 0x70a9 */ 0xffff,
- /* key: 0x70aa */ 0xffff,
- /* key: 0x70ab */ 0xc953,
- /* key: 0x70ac */ 0x5f59,
- /* key: 0x70ad */ 0x433a,
- /* key: 0x70ae */ 0x5f5c,
- /* key: 0x70af */ 0x5f57,
- /* key: 0x70b0 */ 0xc954,
- /* key: 0x70b1 */ 0xc955,
- /* key: 0x70b2 */ 0xffff,
- /* key: 0x70b3 */ 0x5f5b,
- /* key: 0x70b4 */ 0xc956,
- /* key: 0x70b5 */ 0xffff,
- /* key: 0x70b6 */ 0xffff,
- /* key: 0x70b7 */ 0xc957,
- /* key: 0x70b8 */ 0x5f5a,
- /* key: 0x70b9 */ 0x4540,
- /* key: 0x70ba */ 0x3059,
- /* key: 0x70bb */ 0xffff,
- /* key: 0x70bc */ 0xffff,
- /* key: 0x70bd */ 0xffff,
- /* key: 0x70be */ 0xffff,
- /* key: 0x70bf */ 0xffff,
- /* key: 0x70c0 */ 0xffff,
- /* key: 0x70c1 */ 0xffff,
- /* key: 0x70c2 */ 0xffff,
- /* key: 0x70c3 */ 0xffff,
- /* key: 0x70c4 */ 0xffff,
- /* key: 0x70c5 */ 0xffff,
- /* key: 0x70c6 */ 0xffff,
- /* key: 0x70c7 */ 0xffff,
- /* key: 0x70c8 */ 0x4e75,
- /* key: 0x70c9 */ 0xffff,
- /* key: 0x70ca */ 0xc958,
- /* key: 0x70cb */ 0x5f5e,
- /* key: 0x70cc */ 0xffff,
- /* key: 0x70cd */ 0xffff,
- /* key: 0x70ce */ 0xffff,
- /* key: 0x70cf */ 0x3128,
- /* key: 0x70d0 */ 0xffff,
- /* key: 0x70d1 */ 0xc959,
- /* key: 0x70d2 */ 0xffff,
- /* key: 0x70d3 */ 0xc95a,
- /* key: 0x70d4 */ 0xc95b,
- /* key: 0x70d5 */ 0xc95c,
- /* key: 0x70d6 */ 0xc95d,
- /* key: 0x70d7 */ 0xffff,
- /* key: 0x70d8 */ 0xc95e,
- /* key: 0x70d9 */ 0x5f60,
- /* key: 0x70da */ 0xffff,
- /* key: 0x70db */ 0xffff,
- /* key: 0x70dc */ 0xc95f,
- /* key: 0x70dd */ 0x5f5f,
- /* key: 0x70de */ 0xffff,
- /* key: 0x70df */ 0x5f5d,
- /* key: 0x70e0 */ 0xffff,
- /* key: 0x70e1 */ 0xffff,
- /* key: 0x70e2 */ 0xffff,
- /* key: 0x70e3 */ 0xffff,
- /* key: 0x70e4 */ 0xc960,
- /* key: 0x70e5 */ 0xffff,
- /* key: 0x70e6 */ 0xffff,
- /* key: 0x70e7 */ 0xffff,
- /* key: 0x70e8 */ 0xffff,
- /* key: 0x70e9 */ 0xffff,
- /* key: 0x70ea */ 0xffff,
- /* key: 0x70eb */ 0xffff,
- /* key: 0x70ec */ 0xffff,
- /* key: 0x70ed */ 0xffff,
- /* key: 0x70ee */ 0xffff,
- /* key: 0x70ef */ 0xffff,
- /* key: 0x70f0 */ 0xffff,
- /* key: 0x70f1 */ 0x5f58,
- /* key: 0x70f2 */ 0xffff,
- /* key: 0x70f3 */ 0xffff,
- /* key: 0x70f4 */ 0xffff,
- /* key: 0x70f5 */ 0xffff,
- /* key: 0x70f6 */ 0xffff,
- /* key: 0x70f7 */ 0xffff,
- /* key: 0x70f8 */ 0xffff,
- /* key: 0x70f9 */ 0x4b23,
- /* key: 0x70fa */ 0xc961,
- /* key: 0x70fb */ 0xffff,
- /* key: 0x70fc */ 0xffff,
- /* key: 0x70fd */ 0x5f62,
- /* key: 0x70fe */ 0xffff,
- /* key: 0x70ff */ 0xffff,
- /* branch: 0x710X */ 11152,
- /* branch: 0x711X */ 11168,
- /* branch: 0x712X */ 11184,
- /* branch: 0x713X */ 11200,
- /* branch: 0x714X */ 11216,
- /* branch: 0x715X */ 11232,
- /* branch: 0x716X */ 11248,
- /* branch: 0x717X */ 11264,
- /* branch: 0x718X */ 11280,
- /* branch: 0x719X */ 11296,
- /* branch: 0x71aX */ 11312,
- /* branch: 0x71bX */ 11328,
- /* branch: 0x71cX */ 11344,
- /* branch: 0x71dX */ 11360,
- /* branch: 0x71eX */ 11376,
- /* branch: 0x71fX */ 11392,
- /* key: 0x7100 */ 0xffff,
- /* key: 0x7101 */ 0xffff,
- /* key: 0x7102 */ 0xffff,
- /* key: 0x7103 */ 0xc962,
- /* key: 0x7104 */ 0xc963,
- /* key: 0x7105 */ 0xc964,
- /* key: 0x7106 */ 0xc965,
- /* key: 0x7107 */ 0xc966,
- /* key: 0x7108 */ 0xffff,
- /* key: 0x7109 */ 0x5f61,
- /* key: 0x710a */ 0xffff,
- /* key: 0x710b */ 0xc967,
- /* key: 0x710c */ 0xc968,
- /* key: 0x710d */ 0xffff,
- /* key: 0x710e */ 0xffff,
- /* key: 0x710f */ 0xc969,
- /* key: 0x7110 */ 0xffff,
- /* key: 0x7111 */ 0xffff,
- /* key: 0x7112 */ 0xffff,
- /* key: 0x7113 */ 0xffff,
- /* key: 0x7114 */ 0x316b,
- /* key: 0x7115 */ 0xffff,
- /* key: 0x7116 */ 0xffff,
- /* key: 0x7117 */ 0xffff,
- /* key: 0x7118 */ 0xffff,
- /* key: 0x7119 */ 0x5f64,
- /* key: 0x711a */ 0x4a32,
- /* key: 0x711b */ 0xffff,
- /* key: 0x711c */ 0x5f63,
- /* key: 0x711d */ 0xffff,
- /* key: 0x711e */ 0xc96a,
- /* key: 0x711f */ 0xffff,
- /* key: 0x7120 */ 0xc96b,
- /* key: 0x7121 */ 0x4c35,
- /* key: 0x7122 */ 0xffff,
- /* key: 0x7123 */ 0xffff,
- /* key: 0x7124 */ 0xffff,
- /* key: 0x7125 */ 0xffff,
- /* key: 0x7126 */ 0x3e47,
- /* key: 0x7127 */ 0xffff,
- /* key: 0x7128 */ 0xffff,
- /* key: 0x7129 */ 0xffff,
- /* key: 0x712a */ 0xffff,
- /* key: 0x712b */ 0xc96c,
- /* key: 0x712c */ 0xffff,
- /* key: 0x712d */ 0xc96d,
- /* key: 0x712e */ 0xffff,
- /* key: 0x712f */ 0xc96e,
- /* key: 0x7130 */ 0xc96f,
- /* key: 0x7131 */ 0xc970,
- /* key: 0x7132 */ 0xffff,
- /* key: 0x7133 */ 0xffff,
- /* key: 0x7134 */ 0xffff,
- /* key: 0x7135 */ 0xffff,
- /* key: 0x7136 */ 0x4133,
- /* key: 0x7137 */ 0xffff,
- /* key: 0x7138 */ 0xc971,
- /* key: 0x7139 */ 0xffff,
- /* key: 0x713a */ 0xffff,
- /* key: 0x713b */ 0xffff,
- /* key: 0x713c */ 0x3e46,
- /* key: 0x713d */ 0xffff,
- /* key: 0x713e */ 0xffff,
- /* key: 0x713f */ 0xffff,
- /* key: 0x7140 */ 0xffff,
- /* key: 0x7141 */ 0xc972,
- /* key: 0x7142 */ 0xffff,
- /* key: 0x7143 */ 0xffff,
- /* key: 0x7144 */ 0xffff,
- /* key: 0x7145 */ 0xc973,
- /* key: 0x7146 */ 0xc974,
- /* key: 0x7147 */ 0xc975,
- /* key: 0x7148 */ 0xffff,
- /* key: 0x7149 */ 0x4e7b,
- /* key: 0x714a */ 0xc976,
- /* key: 0x714b */ 0xc977,
- /* key: 0x714c */ 0x5f6a,
- /* key: 0x714d */ 0xffff,
- /* key: 0x714e */ 0x4079,
- /* key: 0x714f */ 0xffff,
- /* key: 0x7150 */ 0xc978,
- /* key: 0x7151 */ 0xffff,
- /* key: 0x7152 */ 0xc979,
- /* key: 0x7153 */ 0xffff,
- /* key: 0x7154 */ 0xffff,
- /* key: 0x7155 */ 0x5f66,
- /* key: 0x7156 */ 0x5f6b,
- /* key: 0x7157 */ 0xc97a,
- /* key: 0x7158 */ 0xffff,
- /* key: 0x7159 */ 0x316c,
- /* key: 0x715a */ 0xc97b,
- /* key: 0x715b */ 0xffff,
- /* key: 0x715c */ 0xc97c,
- /* key: 0x715d */ 0xffff,
- /* key: 0x715e */ 0xc97d,
- /* key: 0x715f */ 0xffff,
- /* key: 0x7160 */ 0xc97e,
- /* key: 0x7161 */ 0xffff,
- /* key: 0x7162 */ 0x5f69,
- /* key: 0x7163 */ 0xffff,
- /* key: 0x7164 */ 0x4761,
- /* key: 0x7165 */ 0x5f65,
- /* key: 0x7166 */ 0x5f68,
- /* key: 0x7167 */ 0x3e48,
- /* key: 0x7168 */ 0xca21,
- /* key: 0x7169 */ 0x4851,
- /* key: 0x716a */ 0xffff,
- /* key: 0x716b */ 0xffff,
- /* key: 0x716c */ 0x5f6c,
- /* key: 0x716d */ 0xffff,
- /* key: 0x716e */ 0x3c51,
- /* key: 0x716f */ 0xffff,
- /* key: 0x7170 */ 0xffff,
- /* key: 0x7171 */ 0xffff,
- /* key: 0x7172 */ 0xffff,
- /* key: 0x7173 */ 0xffff,
- /* key: 0x7174 */ 0xffff,
- /* key: 0x7175 */ 0xffff,
- /* key: 0x7176 */ 0xffff,
- /* key: 0x7177 */ 0xffff,
- /* key: 0x7178 */ 0xffff,
- /* key: 0x7179 */ 0xca22,
- /* key: 0x717a */ 0xffff,
- /* key: 0x717b */ 0xffff,
- /* key: 0x717c */ 0xffff,
- /* key: 0x717d */ 0x407a,
- /* key: 0x717e */ 0xffff,
- /* key: 0x717f */ 0xffff,
- /* key: 0x7180 */ 0xca23,
- /* key: 0x7181 */ 0xffff,
- /* key: 0x7182 */ 0xffff,
- /* key: 0x7183 */ 0xffff,
- /* key: 0x7184 */ 0x5f6f,
- /* key: 0x7185 */ 0xca24,
- /* key: 0x7186 */ 0xffff,
- /* key: 0x7187 */ 0xca25,
- /* key: 0x7188 */ 0x5f67,
- /* key: 0x7189 */ 0xffff,
- /* key: 0x718a */ 0x3727,
- /* key: 0x718b */ 0xffff,
- /* key: 0x718c */ 0xca26,
- /* key: 0x718d */ 0xffff,
- /* key: 0x718e */ 0xffff,
- /* key: 0x718f */ 0x5f6d,
- /* key: 0x7190 */ 0xffff,
- /* key: 0x7191 */ 0xffff,
- /* key: 0x7192 */ 0xca27,
- /* key: 0x7193 */ 0xffff,
- /* key: 0x7194 */ 0x4d50,
- /* key: 0x7195 */ 0x5f70,
- /* key: 0x7196 */ 0xffff,
- /* key: 0x7197 */ 0xffff,
- /* key: 0x7198 */ 0xffff,
- /* key: 0x7199 */ 0x7426,
- /* key: 0x719a */ 0xca28,
- /* key: 0x719b */ 0xca29,
- /* key: 0x719c */ 0xffff,
- /* key: 0x719d */ 0xffff,
- /* key: 0x719e */ 0xffff,
- /* key: 0x719f */ 0x3d4f,
- /* key: 0x71a0 */ 0xca2a,
- /* key: 0x71a1 */ 0xffff,
- /* key: 0x71a2 */ 0xca2b,
- /* key: 0x71a3 */ 0xffff,
- /* key: 0x71a4 */ 0xffff,
- /* key: 0x71a5 */ 0xffff,
- /* key: 0x71a6 */ 0xffff,
- /* key: 0x71a7 */ 0xffff,
- /* key: 0x71a8 */ 0x5f71,
- /* key: 0x71a9 */ 0xffff,
- /* key: 0x71aa */ 0xffff,
- /* key: 0x71ab */ 0xffff,
- /* key: 0x71ac */ 0x5f72,
- /* key: 0x71ad */ 0xffff,
- /* key: 0x71ae */ 0xffff,
- /* key: 0x71af */ 0xca2c,
- /* key: 0x71b0 */ 0xca2d,
- /* key: 0x71b1 */ 0x472e,
- /* key: 0x71b2 */ 0xca2e,
- /* key: 0x71b3 */ 0xca2f,
- /* key: 0x71b4 */ 0xffff,
- /* key: 0x71b5 */ 0xffff,
- /* key: 0x71b6 */ 0xffff,
- /* key: 0x71b7 */ 0xffff,
- /* key: 0x71b8 */ 0xffff,
- /* key: 0x71b9 */ 0x5f74,
- /* key: 0x71ba */ 0xca30,
- /* key: 0x71bb */ 0xffff,
- /* key: 0x71bc */ 0xffff,
- /* key: 0x71bd */ 0xffff,
- /* key: 0x71be */ 0x5f75,
- /* key: 0x71bf */ 0xca31,
- /* key: 0x71c0 */ 0xca32,
- /* key: 0x71c1 */ 0xca33,
- /* key: 0x71c2 */ 0xffff,
- /* key: 0x71c3 */ 0x4733,
- /* key: 0x71c4 */ 0xca34,
- /* key: 0x71c5 */ 0xffff,
- /* key: 0x71c6 */ 0xffff,
- /* key: 0x71c7 */ 0xffff,
- /* key: 0x71c8 */ 0x4575,
- /* key: 0x71c9 */ 0x5f77,
- /* key: 0x71ca */ 0xffff,
- /* key: 0x71cb */ 0xca35,
- /* key: 0x71cc */ 0xca36,
- /* key: 0x71cd */ 0xffff,
- /* key: 0x71ce */ 0x5f79,
- /* key: 0x71cf */ 0xffff,
- /* key: 0x71d0 */ 0x4e55,
- /* key: 0x71d1 */ 0xffff,
- /* key: 0x71d2 */ 0x5f76,
- /* key: 0x71d3 */ 0xca37,
- /* key: 0x71d4 */ 0x5f78,
- /* key: 0x71d5 */ 0x316d,
- /* key: 0x71d6 */ 0xca38,
- /* key: 0x71d7 */ 0x5f73,
- /* key: 0x71d8 */ 0xffff,
- /* key: 0x71d9 */ 0xca39,
- /* key: 0x71da */ 0xca3a,
- /* key: 0x71db */ 0xffff,
- /* key: 0x71dc */ 0xca3b,
- /* key: 0x71dd */ 0xffff,
- /* key: 0x71de */ 0xffff,
- /* key: 0x71df */ 0x535b,
- /* key: 0x71e0 */ 0x5f7a,
- /* key: 0x71e1 */ 0xffff,
- /* key: 0x71e2 */ 0xffff,
- /* key: 0x71e3 */ 0xffff,
- /* key: 0x71e4 */ 0xffff,
- /* key: 0x71e5 */ 0x4167,
- /* key: 0x71e6 */ 0x3b38,
- /* key: 0x71e7 */ 0x5f7c,
- /* key: 0x71e8 */ 0xffff,
- /* key: 0x71e9 */ 0xffff,
- /* key: 0x71ea */ 0xffff,
- /* key: 0x71eb */ 0xffff,
- /* key: 0x71ec */ 0x5f7b,
- /* key: 0x71ed */ 0x3f24,
- /* key: 0x71ee */ 0x5259,
- /* key: 0x71ef */ 0xffff,
- /* key: 0x71f0 */ 0xffff,
- /* key: 0x71f1 */ 0xffff,
- /* key: 0x71f2 */ 0xffff,
- /* key: 0x71f3 */ 0xffff,
- /* key: 0x71f4 */ 0xffff,
- /* key: 0x71f5 */ 0x5f7d,
- /* key: 0x71f6 */ 0xffff,
- /* key: 0x71f7 */ 0xffff,
- /* key: 0x71f8 */ 0xca3c,
- /* key: 0x71f9 */ 0x6021,
- /* key: 0x71fa */ 0xffff,
- /* key: 0x71fb */ 0x5f6e,
- /* key: 0x71fc */ 0x5f7e,
- /* key: 0x71fd */ 0xffff,
- /* key: 0x71fe */ 0xca3d,
- /* key: 0x71ff */ 0x6022,
- /* branch: 0x720X */ 11424,
- /* branch: 0x721X */ 11440,
- /* branch: 0x722X */ 11456,
- /* branch: 0x723X */ 11472,
- /* branch: 0x724X */ 11488,
- /* branch: 0x725X */ 11504,
- /* branch: 0x726X */ 11520,
- /* branch: 0x727X */ 11536,
- /* branch: 0x728X */ 11552,
- /* branch: 0x729X */ 11568,
- /* branch: 0x72aX */ 11584,
- /* branch: 0x72bX */ 11600,
- /* branch: 0x72cX */ 11616,
- /* branch: 0x72dX */ 11632,
- /* branch: 0x72eX */ 11648,
- /* branch: 0x72fX */ 11664,
- /* key: 0x7200 */ 0xca3e,
- /* key: 0x7201 */ 0xffff,
- /* key: 0x7202 */ 0xffff,
- /* key: 0x7203 */ 0xffff,
- /* key: 0x7204 */ 0xffff,
- /* key: 0x7205 */ 0xffff,
- /* key: 0x7206 */ 0x477a,
- /* key: 0x7207 */ 0xca3f,
- /* key: 0x7208 */ 0xca40,
- /* key: 0x7209 */ 0xca41,
- /* key: 0x720a */ 0xffff,
- /* key: 0x720b */ 0xffff,
- /* key: 0x720c */ 0xffff,
- /* key: 0x720d */ 0x6023,
- /* key: 0x720e */ 0xffff,
- /* key: 0x720f */ 0xffff,
- /* key: 0x7210 */ 0x6024,
- /* key: 0x7211 */ 0xffff,
- /* key: 0x7212 */ 0xffff,
- /* key: 0x7213 */ 0xca42,
- /* key: 0x7214 */ 0xffff,
- /* key: 0x7215 */ 0xffff,
- /* key: 0x7216 */ 0xffff,
- /* key: 0x7217 */ 0xca43,
- /* key: 0x7218 */ 0xffff,
- /* key: 0x7219 */ 0xffff,
- /* key: 0x721a */ 0xca44,
- /* key: 0x721b */ 0x6025,
- /* key: 0x721c */ 0xffff,
- /* key: 0x721d */ 0xca45,
- /* key: 0x721e */ 0xffff,
- /* key: 0x721f */ 0xca46,
- /* key: 0x7220 */ 0xffff,
- /* key: 0x7221 */ 0xffff,
- /* key: 0x7222 */ 0xffff,
- /* key: 0x7223 */ 0xffff,
- /* key: 0x7224 */ 0xca47,
- /* key: 0x7225 */ 0xffff,
- /* key: 0x7226 */ 0xffff,
- /* key: 0x7227 */ 0xffff,
- /* key: 0x7228 */ 0x6026,
- /* key: 0x7229 */ 0xffff,
- /* key: 0x722a */ 0x445e,
- /* key: 0x722b */ 0xca48,
- /* key: 0x722c */ 0x6028,
- /* key: 0x722d */ 0x6027,
- /* key: 0x722e */ 0xffff,
- /* key: 0x722f */ 0xca49,
- /* key: 0x7230 */ 0x6029,
- /* key: 0x7231 */ 0xffff,
- /* key: 0x7232 */ 0x602a,
- /* key: 0x7233 */ 0xffff,
- /* key: 0x7234 */ 0xca4a,
- /* key: 0x7235 */ 0x3c5f,
- /* key: 0x7236 */ 0x4963,
- /* key: 0x7237 */ 0xffff,
- /* key: 0x7238 */ 0xca4b,
- /* key: 0x7239 */ 0xca4c,
- /* key: 0x723a */ 0x4c6c,
- /* key: 0x723b */ 0x602b,
- /* key: 0x723c */ 0x602c,
- /* key: 0x723d */ 0x4156,
- /* key: 0x723e */ 0x3c24,
- /* key: 0x723f */ 0x602d,
- /* key: 0x7240 */ 0x602e,
- /* key: 0x7241 */ 0xca4d,
- /* key: 0x7242 */ 0xca4e,
- /* key: 0x7243 */ 0xca4f,
- /* key: 0x7244 */ 0xffff,
- /* key: 0x7245 */ 0xca50,
- /* key: 0x7246 */ 0x602f,
- /* key: 0x7247 */ 0x4a52,
- /* key: 0x7248 */ 0x4847,
- /* key: 0x7249 */ 0xffff,
- /* key: 0x724a */ 0xffff,
- /* key: 0x724b */ 0x6030,
- /* key: 0x724c */ 0x4757,
- /* key: 0x724d */ 0xffff,
- /* key: 0x724e */ 0xca51,
- /* key: 0x724f */ 0xca52,
- /* key: 0x7250 */ 0xca53,
- /* key: 0x7251 */ 0xffff,
- /* key: 0x7252 */ 0x442d,
- /* key: 0x7253 */ 0xca54,
- /* key: 0x7254 */ 0xffff,
- /* key: 0x7255 */ 0xca55,
- /* key: 0x7256 */ 0xca56,
- /* key: 0x7257 */ 0xffff,
- /* key: 0x7258 */ 0x6031,
- /* key: 0x7259 */ 0x3267,
- /* key: 0x725a */ 0xca57,
- /* key: 0x725b */ 0x356d,
- /* key: 0x725c */ 0xca58,
- /* key: 0x725d */ 0x4c46,
- /* key: 0x725e */ 0xca59,
- /* key: 0x725f */ 0x4c36,
- /* key: 0x7260 */ 0xca5a,
- /* key: 0x7261 */ 0x3234,
- /* key: 0x7262 */ 0x4f34,
- /* key: 0x7263 */ 0xca5b,
- /* key: 0x7264 */ 0xffff,
- /* key: 0x7265 */ 0xffff,
- /* key: 0x7266 */ 0xffff,
- /* key: 0x7267 */ 0x4b52,
- /* key: 0x7268 */ 0xca5c,
- /* key: 0x7269 */ 0x4a2a,
- /* key: 0x726a */ 0xffff,
- /* key: 0x726b */ 0xca5d,
- /* key: 0x726c */ 0xffff,
- /* key: 0x726d */ 0xffff,
- /* key: 0x726e */ 0xca5e,
- /* key: 0x726f */ 0xca5f,
- /* key: 0x7270 */ 0xffff,
- /* key: 0x7271 */ 0xca60,
- /* key: 0x7272 */ 0x4037,
- /* key: 0x7273 */ 0xffff,
- /* key: 0x7274 */ 0x6032,
- /* key: 0x7275 */ 0xffff,
- /* key: 0x7276 */ 0xffff,
- /* key: 0x7277 */ 0xca61,
- /* key: 0x7278 */ 0xca62,
- /* key: 0x7279 */ 0x4643,
- /* key: 0x727a */ 0xffff,
- /* key: 0x727b */ 0xca63,
- /* key: 0x727c */ 0xca64,
- /* key: 0x727d */ 0x3823,
- /* key: 0x727e */ 0x6033,
- /* key: 0x727f */ 0xca65,
- /* key: 0x7280 */ 0x3a54,
- /* key: 0x7281 */ 0x6035,
- /* key: 0x7282 */ 0x6034,
- /* key: 0x7283 */ 0xffff,
- /* key: 0x7284 */ 0xca66,
- /* key: 0x7285 */ 0xffff,
- /* key: 0x7286 */ 0xffff,
- /* key: 0x7287 */ 0x6036,
- /* key: 0x7288 */ 0xffff,
- /* key: 0x7289 */ 0xca67,
- /* key: 0x728a */ 0xffff,
- /* key: 0x728b */ 0xffff,
- /* key: 0x728c */ 0xffff,
- /* key: 0x728d */ 0xca68,
- /* key: 0x728e */ 0xca69,
- /* key: 0x728f */ 0xffff,
- /* key: 0x7290 */ 0xffff,
- /* key: 0x7291 */ 0xffff,
- /* key: 0x7292 */ 0x6037,
- /* key: 0x7293 */ 0xca6a,
- /* key: 0x7294 */ 0xffff,
- /* key: 0x7295 */ 0xffff,
- /* key: 0x7296 */ 0x6038,
- /* key: 0x7297 */ 0xffff,
- /* key: 0x7298 */ 0xffff,
- /* key: 0x7299 */ 0xffff,
- /* key: 0x729a */ 0xffff,
- /* key: 0x729b */ 0xca6b,
- /* key: 0x729c */ 0xffff,
- /* key: 0x729d */ 0xffff,
- /* key: 0x729e */ 0xffff,
- /* key: 0x729f */ 0xffff,
- /* key: 0x72a0 */ 0x353e,
- /* key: 0x72a1 */ 0xffff,
- /* key: 0x72a2 */ 0x6039,
- /* key: 0x72a3 */ 0xffff,
- /* key: 0x72a4 */ 0xffff,
- /* key: 0x72a5 */ 0xffff,
- /* key: 0x72a6 */ 0xffff,
- /* key: 0x72a7 */ 0x603a,
- /* key: 0x72a8 */ 0xca6c,
- /* key: 0x72a9 */ 0xffff,
- /* key: 0x72aa */ 0xffff,
- /* key: 0x72ab */ 0xffff,
- /* key: 0x72ac */ 0x3824,
- /* key: 0x72ad */ 0xca6d,
- /* key: 0x72ae */ 0xca6e,
- /* key: 0x72af */ 0x4848,
- /* key: 0x72b0 */ 0xffff,
- /* key: 0x72b1 */ 0xca6f,
- /* key: 0x72b2 */ 0x603c,
- /* key: 0x72b3 */ 0xffff,
- /* key: 0x72b4 */ 0xca70,
- /* key: 0x72b5 */ 0xffff,
- /* key: 0x72b6 */ 0x3e75,
- /* key: 0x72b7 */ 0xffff,
- /* key: 0x72b8 */ 0xffff,
- /* key: 0x72b9 */ 0x603b,
- /* key: 0x72ba */ 0xffff,
- /* key: 0x72bb */ 0xffff,
- /* key: 0x72bc */ 0xffff,
- /* key: 0x72bd */ 0xffff,
- /* key: 0x72be */ 0xca71,
- /* key: 0x72bf */ 0xffff,
- /* key: 0x72c0 */ 0xffff,
- /* key: 0x72c1 */ 0xca72,
- /* key: 0x72c2 */ 0x3638,
- /* key: 0x72c3 */ 0x603d,
- /* key: 0x72c4 */ 0x603f,
- /* key: 0x72c5 */ 0xffff,
- /* key: 0x72c6 */ 0x603e,
- /* key: 0x72c7 */ 0xca73,
- /* key: 0x72c8 */ 0xffff,
- /* key: 0x72c9 */ 0xca74,
- /* key: 0x72ca */ 0xffff,
- /* key: 0x72cb */ 0xffff,
- /* key: 0x72cc */ 0xca75,
- /* key: 0x72cd */ 0xffff,
- /* key: 0x72ce */ 0x6040,
- /* key: 0x72cf */ 0xffff,
- /* key: 0x72d0 */ 0x3851,
- /* key: 0x72d1 */ 0xffff,
- /* key: 0x72d2 */ 0x6041,
- /* key: 0x72d3 */ 0xffff,
- /* key: 0x72d4 */ 0xffff,
- /* key: 0x72d5 */ 0xca76,
- /* key: 0x72d6 */ 0xca77,
- /* key: 0x72d7 */ 0x3669,
- /* key: 0x72d8 */ 0xca78,
- /* key: 0x72d9 */ 0x4140,
- /* key: 0x72da */ 0xffff,
- /* key: 0x72db */ 0x397d,
- /* key: 0x72dc */ 0xffff,
- /* key: 0x72dd */ 0xffff,
- /* key: 0x72de */ 0xffff,
- /* key: 0x72df */ 0xca79,
- /* key: 0x72e0 */ 0x6043,
- /* key: 0x72e1 */ 0x6044,
- /* key: 0x72e2 */ 0x6042,
- /* key: 0x72e3 */ 0xffff,
- /* key: 0x72e4 */ 0xffff,
- /* key: 0x72e5 */ 0xca7a,
- /* key: 0x72e6 */ 0xffff,
- /* key: 0x72e7 */ 0xffff,
- /* key: 0x72e8 */ 0xffff,
- /* key: 0x72e9 */ 0x3c6d,
- /* key: 0x72ea */ 0xffff,
- /* key: 0x72eb */ 0xffff,
- /* key: 0x72ec */ 0x4648,
- /* key: 0x72ed */ 0x3639,
- /* key: 0x72ee */ 0xffff,
- /* key: 0x72ef */ 0xffff,
- /* key: 0x72f0 */ 0xffff,
- /* key: 0x72f1 */ 0xffff,
- /* key: 0x72f2 */ 0xffff,
- /* key: 0x72f3 */ 0xca7b,
- /* key: 0x72f4 */ 0xca7c,
- /* key: 0x72f5 */ 0xffff,
- /* key: 0x72f6 */ 0xffff,
- /* key: 0x72f7 */ 0x6046,
- /* key: 0x72f8 */ 0x432c,
- /* key: 0x72f9 */ 0x6045,
- /* key: 0x72fa */ 0xca7d,
- /* key: 0x72fb */ 0xca7e,
- /* key: 0x72fc */ 0x4f35,
- /* key: 0x72fd */ 0x4762,
- /* key: 0x72fe */ 0xcb21,
- /* key: 0x72ff */ 0xffff,
- /* branch: 0x730X */ 11696,
- /* branch: 0x731X */ 11712,
- /* branch: 0x732X */ 11728,
- /* branch: 0x733X */ 11744,
- /* branch: 0x734X */ 11760,
- /* branch: 0x735X */ 11776,
- /* branch: 0x736X */ 11792,
- /* branch: 0x737X */ 11808,
- /* branch: 0x738X */ 11824,
- /* branch: 0x739X */ 11840,
- /* branch: 0x73aX */ 11856,
- /* branch: 0x73bX */ 11872,
- /* branch: 0x73cX */ 11888,
- /* branch: 0x73dX */ 11904,
- /* branch: 0x73eX */ 11920,
- /* branch: 0x73fX */ 11936,
- /* key: 0x7300 */ 0xffff,
- /* key: 0x7301 */ 0xffff,
- /* key: 0x7302 */ 0xcb22,
- /* key: 0x7303 */ 0xffff,
- /* key: 0x7304 */ 0xcb23,
- /* key: 0x7305 */ 0xcb24,
- /* key: 0x7306 */ 0xffff,
- /* key: 0x7307 */ 0xcb25,
- /* key: 0x7308 */ 0xffff,
- /* key: 0x7309 */ 0xffff,
- /* key: 0x730a */ 0x6049,
- /* key: 0x730b */ 0xcb26,
- /* key: 0x730c */ 0xffff,
- /* key: 0x730d */ 0xcb27,
- /* key: 0x730e */ 0xffff,
- /* key: 0x730f */ 0xffff,
- /* key: 0x7310 */ 0xffff,
- /* key: 0x7311 */ 0xffff,
- /* key: 0x7312 */ 0xcb28,
- /* key: 0x7313 */ 0xcb29,
- /* key: 0x7314 */ 0xffff,
- /* key: 0x7315 */ 0xffff,
- /* key: 0x7316 */ 0x604b,
- /* key: 0x7317 */ 0x6048,
- /* key: 0x7318 */ 0xcb2a,
- /* key: 0x7319 */ 0xcb2b,
- /* key: 0x731a */ 0xffff,
- /* key: 0x731b */ 0x4c54,
- /* key: 0x731c */ 0x604a,
- /* key: 0x731d */ 0x604c,
- /* key: 0x731e */ 0xcb2c,
- /* key: 0x731f */ 0x4e44,
- /* key: 0x7320 */ 0xffff,
- /* key: 0x7321 */ 0xffff,
- /* key: 0x7322 */ 0xcb2d,
- /* key: 0x7323 */ 0xffff,
- /* key: 0x7324 */ 0xcb2e,
- /* key: 0x7325 */ 0x6050,
- /* key: 0x7326 */ 0xffff,
- /* key: 0x7327 */ 0xcb2f,
- /* key: 0x7328 */ 0xcb30,
- /* key: 0x7329 */ 0x604f,
- /* key: 0x732a */ 0x4376,
- /* key: 0x732b */ 0x472d,
- /* key: 0x732c */ 0xcb31,
- /* key: 0x732d */ 0xffff,
- /* key: 0x732e */ 0x3825,
- /* key: 0x732f */ 0x604e,
- /* key: 0x7330 */ 0xffff,
- /* key: 0x7331 */ 0xcb32,
- /* key: 0x7332 */ 0xcb33,
- /* key: 0x7333 */ 0xffff,
- /* key: 0x7334 */ 0x604d,
- /* key: 0x7335 */ 0xcb34,
- /* key: 0x7336 */ 0x4d31,
- /* key: 0x7337 */ 0x4d32,
- /* key: 0x7338 */ 0xffff,
- /* key: 0x7339 */ 0xffff,
- /* key: 0x733a */ 0xcb35,
- /* key: 0x733b */ 0xcb36,
- /* key: 0x733c */ 0xffff,
- /* key: 0x733d */ 0xcb37,
- /* key: 0x733e */ 0x6051,
- /* key: 0x733f */ 0x316e,
- /* key: 0x7340 */ 0xffff,
- /* key: 0x7341 */ 0xffff,
- /* key: 0x7342 */ 0xffff,
- /* key: 0x7343 */ 0xcb38,
- /* key: 0x7344 */ 0x3976,
- /* key: 0x7345 */ 0x3b62,
- /* key: 0x7346 */ 0xffff,
- /* key: 0x7347 */ 0xffff,
- /* key: 0x7348 */ 0xffff,
- /* key: 0x7349 */ 0xffff,
- /* key: 0x734a */ 0xffff,
- /* key: 0x734b */ 0xffff,
- /* key: 0x734c */ 0xffff,
- /* key: 0x734d */ 0xcb39,
- /* key: 0x734e */ 0x6052,
- /* key: 0x734f */ 0x6053,
- /* key: 0x7350 */ 0xcb3a,
- /* key: 0x7351 */ 0xffff,
- /* key: 0x7352 */ 0xcb3b,
- /* key: 0x7353 */ 0xffff,
- /* key: 0x7354 */ 0xffff,
- /* key: 0x7355 */ 0xffff,
- /* key: 0x7356 */ 0xcb3c,
- /* key: 0x7357 */ 0x6055,
- /* key: 0x7358 */ 0xcb3d,
- /* key: 0x7359 */ 0xffff,
- /* key: 0x735a */ 0xffff,
- /* key: 0x735b */ 0xffff,
- /* key: 0x735c */ 0xffff,
- /* key: 0x735d */ 0xcb3e,
- /* key: 0x735e */ 0xcb3f,
- /* key: 0x735f */ 0xcb40,
- /* key: 0x7360 */ 0xcb41,
- /* key: 0x7361 */ 0xffff,
- /* key: 0x7362 */ 0xffff,
- /* key: 0x7363 */ 0x3d43,
- /* key: 0x7364 */ 0xffff,
- /* key: 0x7365 */ 0xffff,
- /* key: 0x7366 */ 0xcb42,
- /* key: 0x7367 */ 0xcb43,
- /* key: 0x7368 */ 0x6057,
- /* key: 0x7369 */ 0xcb44,
- /* key: 0x736a */ 0x6056,
- /* key: 0x736b */ 0xcb45,
- /* key: 0x736c */ 0xcb46,
- /* key: 0x736d */ 0xffff,
- /* key: 0x736e */ 0xcb47,
- /* key: 0x736f */ 0xcb48,
- /* key: 0x7370 */ 0x6058,
- /* key: 0x7371 */ 0xcb49,
- /* key: 0x7372 */ 0x334d,
- /* key: 0x7373 */ 0xffff,
- /* key: 0x7374 */ 0xffff,
- /* key: 0x7375 */ 0x605a,
- /* key: 0x7376 */ 0xffff,
- /* key: 0x7377 */ 0xcb4a,
- /* key: 0x7378 */ 0x6059,
- /* key: 0x7379 */ 0xcb4b,
- /* key: 0x737a */ 0x605c,
- /* key: 0x737b */ 0x605b,
- /* key: 0x737c */ 0xcb4c,
- /* key: 0x737d */ 0xffff,
- /* key: 0x737e */ 0xffff,
- /* key: 0x737f */ 0xffff,
- /* key: 0x7380 */ 0xcb4d,
- /* key: 0x7381 */ 0xcb4e,
- /* key: 0x7382 */ 0xffff,
- /* key: 0x7383 */ 0xcb4f,
- /* key: 0x7384 */ 0x383c,
- /* key: 0x7385 */ 0xcb50,
- /* key: 0x7386 */ 0xcb51,
- /* key: 0x7387 */ 0x4e28,
- /* key: 0x7388 */ 0xffff,
- /* key: 0x7389 */ 0x364c,
- /* key: 0x738a */ 0xffff,
- /* key: 0x738b */ 0x3226,
- /* key: 0x738c */ 0xffff,
- /* key: 0x738d */ 0xffff,
- /* key: 0x738e */ 0xcb52,
- /* key: 0x738f */ 0xffff,
- /* key: 0x7390 */ 0xcb53,
- /* key: 0x7391 */ 0xffff,
- /* key: 0x7392 */ 0xffff,
- /* key: 0x7393 */ 0xcb54,
- /* key: 0x7394 */ 0xffff,
- /* key: 0x7395 */ 0xcb55,
- /* key: 0x7396 */ 0x366a,
- /* key: 0x7397 */ 0xcb56,
- /* key: 0x7398 */ 0xcb57,
- /* key: 0x7399 */ 0xffff,
- /* key: 0x739a */ 0xffff,
- /* key: 0x739b */ 0xffff,
- /* key: 0x739c */ 0xcb58,
- /* key: 0x739d */ 0xffff,
- /* key: 0x739e */ 0xcb59,
- /* key: 0x739f */ 0xcb5a,
- /* key: 0x73a0 */ 0xcb5b,
- /* key: 0x73a1 */ 0xffff,
- /* key: 0x73a2 */ 0xcb5c,
- /* key: 0x73a3 */ 0xffff,
- /* key: 0x73a4 */ 0xffff,
- /* key: 0x73a5 */ 0xcb5d,
- /* key: 0x73a6 */ 0xcb5e,
- /* key: 0x73a7 */ 0xffff,
- /* key: 0x73a8 */ 0xffff,
- /* key: 0x73a9 */ 0x3461,
- /* key: 0x73aa */ 0xcb5f,
- /* key: 0x73ab */ 0xcb60,
- /* key: 0x73ac */ 0xffff,
- /* key: 0x73ad */ 0xcb61,
- /* key: 0x73ae */ 0xffff,
- /* key: 0x73af */ 0xffff,
- /* key: 0x73b0 */ 0xffff,
- /* key: 0x73b1 */ 0xffff,
- /* key: 0x73b2 */ 0x4e68,
- /* key: 0x73b3 */ 0x605e,
- /* key: 0x73b4 */ 0xffff,
- /* key: 0x73b5 */ 0xcb62,
- /* key: 0x73b6 */ 0xffff,
- /* key: 0x73b7 */ 0xcb63,
- /* key: 0x73b8 */ 0xffff,
- /* key: 0x73b9 */ 0xcb64,
- /* key: 0x73ba */ 0xffff,
- /* key: 0x73bb */ 0x6060,
- /* key: 0x73bc */ 0xcb65,
- /* key: 0x73bd */ 0xcb66,
- /* key: 0x73be */ 0xffff,
- /* key: 0x73bf */ 0xcb67,
- /* key: 0x73c0 */ 0x6061,
- /* key: 0x73c1 */ 0xffff,
- /* key: 0x73c2 */ 0x3251,
- /* key: 0x73c3 */ 0xffff,
- /* key: 0x73c4 */ 0xffff,
- /* key: 0x73c5 */ 0xcb68,
- /* key: 0x73c6 */ 0xcb69,
- /* key: 0x73c7 */ 0xffff,
- /* key: 0x73c8 */ 0x605d,
- /* key: 0x73c9 */ 0xcb6a,
- /* key: 0x73ca */ 0x3b39,
- /* key: 0x73cb */ 0xcb6b,
- /* key: 0x73cc */ 0xcb6c,
- /* key: 0x73cd */ 0x4441,
- /* key: 0x73ce */ 0x605f,
- /* key: 0x73cf */ 0xcb6d,
- /* key: 0x73d0 */ 0xffff,
- /* key: 0x73d1 */ 0xffff,
- /* key: 0x73d2 */ 0xcb6e,
- /* key: 0x73d3 */ 0xcb6f,
- /* key: 0x73d4 */ 0xffff,
- /* key: 0x73d5 */ 0xffff,
- /* key: 0x73d6 */ 0xcb70,
- /* key: 0x73d7 */ 0xffff,
- /* key: 0x73d8 */ 0xffff,
- /* key: 0x73d9 */ 0xcb71,
- /* key: 0x73da */ 0xffff,
- /* key: 0x73db */ 0xffff,
- /* key: 0x73dc */ 0xffff,
- /* key: 0x73dd */ 0xcb72,
- /* key: 0x73de */ 0x6064,
- /* key: 0x73df */ 0xffff,
- /* key: 0x73e0 */ 0x3c6e,
- /* key: 0x73e1 */ 0xcb73,
- /* key: 0x73e2 */ 0xffff,
- /* key: 0x73e3 */ 0xcb74,
- /* key: 0x73e4 */ 0xffff,
- /* key: 0x73e5 */ 0x6062,
- /* key: 0x73e6 */ 0xcb75,
- /* key: 0x73e7 */ 0xcb76,
- /* key: 0x73e8 */ 0xffff,
- /* key: 0x73e9 */ 0xcb77,
- /* key: 0x73ea */ 0x373e,
- /* key: 0x73eb */ 0xffff,
- /* key: 0x73ec */ 0xffff,
- /* key: 0x73ed */ 0x4849,
- /* key: 0x73ee */ 0x6063,
- /* key: 0x73ef */ 0xffff,
- /* key: 0x73f0 */ 0xffff,
- /* key: 0x73f1 */ 0x607e,
- /* key: 0x73f2 */ 0xffff,
- /* key: 0x73f3 */ 0xffff,
- /* key: 0x73f4 */ 0xcb78,
- /* key: 0x73f5 */ 0xcb79,
- /* key: 0x73f6 */ 0xffff,
- /* key: 0x73f7 */ 0xcb7a,
- /* key: 0x73f8 */ 0x6069,
- /* key: 0x73f9 */ 0xcb7b,
- /* key: 0x73fa */ 0xcb7c,
- /* key: 0x73fb */ 0xcb7d,
- /* key: 0x73fc */ 0xffff,
- /* key: 0x73fd */ 0xcb7e,
- /* key: 0x73fe */ 0x383d,
- /* key: 0x73ff */ 0xcc21,
- /* branch: 0x740X */ 11968,
- /* branch: 0x741X */ 11984,
- /* branch: 0x742X */ 12000,
- /* branch: 0x743X */ 12016,
- /* branch: 0x744X */ 12032,
- /* branch: 0x745X */ 12048,
- /* branch: 0x746X */ 12064,
- /* branch: 0x747X */ 12080,
- /* branch: 0x748X */ 12096,
- /* branch: 0x749X */ 12112,
- /* branch: 0x74aX */ 12128,
- /* branch: 0x74bX */ 12144,
- /* branch: 0x74cX */ 12160,
- /* branch: 0x74dX */ 12176,
- /* branch: 0x74eX */ 12192,
- /* branch: 0x74fX */ 12208,
- /* key: 0x7400 */ 0xcc22,
- /* key: 0x7401 */ 0xcc23,
- /* key: 0x7402 */ 0xffff,
- /* key: 0x7403 */ 0x3565,
- /* key: 0x7404 */ 0xcc24,
- /* key: 0x7405 */ 0x6066,
- /* key: 0x7406 */ 0x4d7d,
- /* key: 0x7407 */ 0xcc25,
- /* key: 0x7408 */ 0xffff,
- /* key: 0x7409 */ 0x4e30,
- /* key: 0x740a */ 0xcc26,
- /* key: 0x740b */ 0xffff,
- /* key: 0x740c */ 0xffff,
- /* key: 0x740d */ 0xffff,
- /* key: 0x740e */ 0xffff,
- /* key: 0x740f */ 0xffff,
- /* key: 0x7410 */ 0xffff,
- /* key: 0x7411 */ 0xcc27,
- /* key: 0x7412 */ 0xffff,
- /* key: 0x7413 */ 0xffff,
- /* key: 0x7414 */ 0xffff,
- /* key: 0x7415 */ 0xffff,
- /* key: 0x7416 */ 0xffff,
- /* key: 0x7417 */ 0xffff,
- /* key: 0x7418 */ 0xffff,
- /* key: 0x7419 */ 0xffff,
- /* key: 0x741a */ 0xcc28,
- /* key: 0x741b */ 0xcc29,
- /* key: 0x741c */ 0xffff,
- /* key: 0x741d */ 0xffff,
- /* key: 0x741e */ 0xffff,
- /* key: 0x741f */ 0xffff,
- /* key: 0x7420 */ 0xffff,
- /* key: 0x7421 */ 0xffff,
- /* key: 0x7422 */ 0x4276,
- /* key: 0x7423 */ 0xffff,
- /* key: 0x7424 */ 0xcc2a,
- /* key: 0x7425 */ 0x6068,
- /* key: 0x7426 */ 0xcc2b,
- /* key: 0x7427 */ 0xffff,
- /* key: 0x7428 */ 0xcc2c,
- /* key: 0x7429 */ 0xcc2d,
- /* key: 0x742a */ 0xcc2e,
- /* key: 0x742b */ 0xcc2f,
- /* key: 0x742c */ 0xcc30,
- /* key: 0x742d */ 0xcc31,
- /* key: 0x742e */ 0xcc32,
- /* key: 0x742f */ 0xcc33,
- /* key: 0x7430 */ 0xcc34,
- /* key: 0x7431 */ 0xcc35,
- /* key: 0x7432 */ 0x606a,
- /* key: 0x7433 */ 0x4e56,
- /* key: 0x7434 */ 0x3657,
- /* key: 0x7435 */ 0x487c,
- /* key: 0x7436 */ 0x474a,
- /* key: 0x7437 */ 0xffff,
- /* key: 0x7438 */ 0xffff,
- /* key: 0x7439 */ 0xcc36,
- /* key: 0x743a */ 0x606b,
- /* key: 0x743b */ 0xffff,
- /* key: 0x743c */ 0xffff,
- /* key: 0x743d */ 0xffff,
- /* key: 0x743e */ 0xffff,
- /* key: 0x743f */ 0x606d,
- /* key: 0x7440 */ 0xcc37,
- /* key: 0x7441 */ 0x6070,
- /* key: 0x7442 */ 0xffff,
- /* key: 0x7443 */ 0xcc38,
- /* key: 0x7444 */ 0xcc39,
- /* key: 0x7445 */ 0xffff,
- /* key: 0x7446 */ 0xcc3a,
- /* key: 0x7447 */ 0xcc3b,
- /* key: 0x7448 */ 0xffff,
- /* key: 0x7449 */ 0xffff,
- /* key: 0x744a */ 0xffff,
- /* key: 0x744b */ 0xcc3c,
- /* key: 0x744c */ 0xffff,
- /* key: 0x744d */ 0xcc3d,
- /* key: 0x744e */ 0xffff,
- /* key: 0x744f */ 0xffff,
- /* key: 0x7450 */ 0xffff,
- /* key: 0x7451 */ 0xcc3e,
- /* key: 0x7452 */ 0xcc3f,
- /* key: 0x7453 */ 0xffff,
- /* key: 0x7454 */ 0xffff,
- /* key: 0x7455 */ 0x606c,
- /* key: 0x7456 */ 0xffff,
- /* key: 0x7457 */ 0xcc40,
- /* key: 0x7458 */ 0xffff,
- /* key: 0x7459 */ 0x606f,
- /* key: 0x745a */ 0x386a,
- /* key: 0x745b */ 0x314d,
- /* key: 0x745c */ 0x6071,
- /* key: 0x745d */ 0xcc41,
- /* key: 0x745e */ 0x3f70,
- /* key: 0x745f */ 0x606e,
- /* key: 0x7460 */ 0x4e5c,
- /* key: 0x7461 */ 0xffff,
- /* key: 0x7462 */ 0xcc42,
- /* key: 0x7463 */ 0x6074,
- /* key: 0x7464 */ 0x7424,
- /* key: 0x7465 */ 0xffff,
- /* key: 0x7466 */ 0xcc43,
- /* key: 0x7467 */ 0xcc44,
- /* key: 0x7468 */ 0xcc45,
- /* key: 0x7469 */ 0x6072,
- /* key: 0x746a */ 0x6075,
- /* key: 0x746b */ 0xcc46,
- /* key: 0x746c */ 0xffff,
- /* key: 0x746d */ 0xcc47,
- /* key: 0x746e */ 0xcc48,
- /* key: 0x746f */ 0x6067,
- /* key: 0x7470 */ 0x6073,
- /* key: 0x7471 */ 0xcc49,
- /* key: 0x7472 */ 0xcc4a,
- /* key: 0x7473 */ 0x3a3c,
- /* key: 0x7474 */ 0xffff,
- /* key: 0x7475 */ 0xffff,
- /* key: 0x7476 */ 0x6076,
- /* key: 0x7477 */ 0xffff,
- /* key: 0x7478 */ 0xffff,
- /* key: 0x7479 */ 0xffff,
- /* key: 0x747a */ 0xffff,
- /* key: 0x747b */ 0xffff,
- /* key: 0x747c */ 0xffff,
- /* key: 0x747d */ 0xffff,
- /* key: 0x747e */ 0x6077,
- /* key: 0x747f */ 0xffff,
- /* key: 0x7480 */ 0xcc4b,
- /* key: 0x7481 */ 0xcc4c,
- /* key: 0x7482 */ 0xffff,
- /* key: 0x7483 */ 0x4d7e,
- /* key: 0x7484 */ 0xffff,
- /* key: 0x7485 */ 0xcc4d,
- /* key: 0x7486 */ 0xcc4e,
- /* key: 0x7487 */ 0xcc4f,
- /* key: 0x7488 */ 0xffff,
- /* key: 0x7489 */ 0xcc50,
- /* key: 0x748a */ 0xffff,
- /* key: 0x748b */ 0x6078,
- /* key: 0x748c */ 0xffff,
- /* key: 0x748d */ 0xffff,
- /* key: 0x748e */ 0xffff,
- /* key: 0x748f */ 0xcc51,
- /* key: 0x7490 */ 0xcc52,
- /* key: 0x7491 */ 0xcc53,
- /* key: 0x7492 */ 0xcc54,
- /* key: 0x7493 */ 0xffff,
- /* key: 0x7494 */ 0xffff,
- /* key: 0x7495 */ 0xffff,
- /* key: 0x7496 */ 0xffff,
- /* key: 0x7497 */ 0xffff,
- /* key: 0x7498 */ 0xcc55,
- /* key: 0x7499 */ 0xcc56,
- /* key: 0x749a */ 0xcc57,
- /* key: 0x749b */ 0xffff,
- /* key: 0x749c */ 0xcc58,
- /* key: 0x749d */ 0xffff,
- /* key: 0x749e */ 0x6079,
- /* key: 0x749f */ 0xcc59,
- /* key: 0x74a0 */ 0xcc5a,
- /* key: 0x74a1 */ 0xcc5b,
- /* key: 0x74a2 */ 0x6065,
- /* key: 0x74a3 */ 0xcc5c,
- /* key: 0x74a4 */ 0xffff,
- /* key: 0x74a5 */ 0xffff,
- /* key: 0x74a6 */ 0xcc5d,
- /* key: 0x74a7 */ 0x607a,
- /* key: 0x74a8 */ 0xcc5e,
- /* key: 0x74a9 */ 0xcc5f,
- /* key: 0x74aa */ 0xcc60,
- /* key: 0x74ab */ 0xcc61,
- /* key: 0x74ac */ 0xffff,
- /* key: 0x74ad */ 0xffff,
- /* key: 0x74ae */ 0xcc62,
- /* key: 0x74af */ 0xcc63,
- /* key: 0x74b0 */ 0x3444,
- /* key: 0x74b1 */ 0xcc64,
- /* key: 0x74b2 */ 0xcc65,
- /* key: 0x74b3 */ 0xffff,
- /* key: 0x74b4 */ 0xffff,
- /* key: 0x74b5 */ 0xcc66,
- /* key: 0x74b6 */ 0xffff,
- /* key: 0x74b7 */ 0xffff,
- /* key: 0x74b8 */ 0xffff,
- /* key: 0x74b9 */ 0xcc67,
- /* key: 0x74ba */ 0xffff,
- /* key: 0x74bb */ 0xcc68,
- /* key: 0x74bc */ 0xffff,
- /* key: 0x74bd */ 0x3c25,
- /* key: 0x74be */ 0xffff,
- /* key: 0x74bf */ 0xcc69,
- /* key: 0x74c0 */ 0xffff,
- /* key: 0x74c1 */ 0xffff,
- /* key: 0x74c2 */ 0xffff,
- /* key: 0x74c3 */ 0xffff,
- /* key: 0x74c4 */ 0xffff,
- /* key: 0x74c5 */ 0xffff,
- /* key: 0x74c6 */ 0xffff,
- /* key: 0x74c7 */ 0xffff,
- /* key: 0x74c8 */ 0xcc6a,
- /* key: 0x74c9 */ 0xcc6b,
- /* key: 0x74ca */ 0x607b,
- /* key: 0x74cb */ 0xffff,
- /* key: 0x74cc */ 0xcc6c,
- /* key: 0x74cd */ 0xffff,
- /* key: 0x74ce */ 0xffff,
- /* key: 0x74cf */ 0x607c,
- /* key: 0x74d0 */ 0xcc6d,
- /* key: 0x74d1 */ 0xffff,
- /* key: 0x74d2 */ 0xffff,
- /* key: 0x74d3 */ 0xcc6e,
- /* key: 0x74d4 */ 0x607d,
- /* key: 0x74d5 */ 0xffff,
- /* key: 0x74d6 */ 0xffff,
- /* key: 0x74d7 */ 0xffff,
- /* key: 0x74d8 */ 0xcc6f,
- /* key: 0x74d9 */ 0xffff,
- /* key: 0x74da */ 0xcc70,
- /* key: 0x74db */ 0xcc71,
- /* key: 0x74dc */ 0x313b,
- /* key: 0x74dd */ 0xffff,
- /* key: 0x74de */ 0xcc72,
- /* key: 0x74df */ 0xcc73,
- /* key: 0x74e0 */ 0x6121,
- /* key: 0x74e1 */ 0xffff,
- /* key: 0x74e2 */ 0x493b,
- /* key: 0x74e3 */ 0x6122,
- /* key: 0x74e4 */ 0xcc74,
- /* key: 0x74e5 */ 0xffff,
- /* key: 0x74e6 */ 0x3424,
- /* key: 0x74e7 */ 0x6123,
- /* key: 0x74e8 */ 0xcc75,
- /* key: 0x74e9 */ 0x6124,
- /* key: 0x74ea */ 0xcc76,
- /* key: 0x74eb */ 0xcc77,
- /* key: 0x74ec */ 0xffff,
- /* key: 0x74ed */ 0xffff,
- /* key: 0x74ee */ 0x6125,
- /* key: 0x74ef */ 0xcc78,
- /* key: 0x74f0 */ 0x6127,
- /* key: 0x74f1 */ 0x6128,
- /* key: 0x74f2 */ 0x6126,
- /* key: 0x74f3 */ 0xffff,
- /* key: 0x74f4 */ 0xcc79,
- /* key: 0x74f5 */ 0xffff,
- /* key: 0x74f6 */ 0x4953,
- /* key: 0x74f7 */ 0x612a,
- /* key: 0x74f8 */ 0x6129,
- /* key: 0x74f9 */ 0xffff,
- /* key: 0x74fa */ 0xcc7a,
- /* key: 0x74fb */ 0xcc7b,
- /* key: 0x74fc */ 0xcc7c,
- /* key: 0x74fd */ 0xffff,
- /* key: 0x74fe */ 0xffff,
- /* key: 0x74ff */ 0xcc7d,
- /* branch: 0x750X */ 12240,
- /* branch: 0x751X */ 12256,
- /* branch: 0x752X */ 12272,
- /* branch: 0x753X */ 12288,
- /* branch: 0x754X */ 12304,
- /* branch: 0x755X */ 12320,
- /* branch: 0x756X */ 12336,
- /* branch: 0x757X */ 12352,
- /* branch: 0x758X */ 12368,
- /* branch: 0x759X */ 12384,
- /* branch: 0x75aX */ 12400,
- /* branch: 0x75bX */ 12416,
- /* branch: 0x75cX */ 12432,
- /* branch: 0x75dX */ 12448,
- /* branch: 0x75eX */ 12464,
- /* branch: 0x75fX */ 12480,
- /* key: 0x7500 */ 0xffff,
- /* key: 0x7501 */ 0xffff,
- /* key: 0x7502 */ 0xffff,
- /* key: 0x7503 */ 0x612c,
- /* key: 0x7504 */ 0x612b,
- /* key: 0x7505 */ 0x612d,
- /* key: 0x7506 */ 0xcc7e,
- /* key: 0x7507 */ 0xffff,
- /* key: 0x7508 */ 0xffff,
- /* key: 0x7509 */ 0xffff,
- /* key: 0x750a */ 0xffff,
- /* key: 0x750b */ 0xffff,
- /* key: 0x750c */ 0x612e,
- /* key: 0x750d */ 0x6130,
- /* key: 0x750e */ 0x612f,
- /* key: 0x750f */ 0xffff,
- /* key: 0x7510 */ 0xffff,
- /* key: 0x7511 */ 0x3979,
- /* key: 0x7512 */ 0xcd21,
- /* key: 0x7513 */ 0x6132,
- /* key: 0x7514 */ 0xffff,
- /* key: 0x7515 */ 0x6131,
- /* key: 0x7516 */ 0xcd22,
- /* key: 0x7517 */ 0xcd23,
- /* key: 0x7518 */ 0x3445,
- /* key: 0x7519 */ 0xffff,
- /* key: 0x751a */ 0x3f53,
- /* key: 0x751b */ 0xffff,
- /* key: 0x751c */ 0x453c,
- /* key: 0x751d */ 0xffff,
- /* key: 0x751e */ 0x6133,
- /* key: 0x751f */ 0x4038,
- /* key: 0x7520 */ 0xcd24,
- /* key: 0x7521 */ 0xcd25,
- /* key: 0x7522 */ 0xffff,
- /* key: 0x7523 */ 0x3b3a,
- /* key: 0x7524 */ 0xcd26,
- /* key: 0x7525 */ 0x3179,
- /* key: 0x7526 */ 0x6134,
- /* key: 0x7527 */ 0xcd27,
- /* key: 0x7528 */ 0x4d51,
- /* key: 0x7529 */ 0xcd28,
- /* key: 0x752a */ 0xcd29,
- /* key: 0x752b */ 0x4a63,
- /* key: 0x752c */ 0x6135,
- /* key: 0x752d */ 0xffff,
- /* key: 0x752e */ 0xffff,
- /* key: 0x752f */ 0xcd2a,
- /* key: 0x7530 */ 0x4544,
- /* key: 0x7531 */ 0x4d33,
- /* key: 0x7532 */ 0x3943,
- /* key: 0x7533 */ 0x3f3d,
- /* key: 0x7534 */ 0xffff,
- /* key: 0x7535 */ 0xffff,
- /* key: 0x7536 */ 0xcd2b,
- /* key: 0x7537 */ 0x434b,
- /* key: 0x7538 */ 0x5234,
- /* key: 0x7539 */ 0xcd2c,
- /* key: 0x753a */ 0x442e,
- /* key: 0x753b */ 0x3268,
- /* key: 0x753c */ 0x6136,
- /* key: 0x753d */ 0xcd2d,
- /* key: 0x753e */ 0xcd2e,
- /* key: 0x753f */ 0xcd2f,
- /* key: 0x7540 */ 0xcd30,
- /* key: 0x7541 */ 0xffff,
- /* key: 0x7542 */ 0xffff,
- /* key: 0x7543 */ 0xcd31,
- /* key: 0x7544 */ 0x6137,
- /* key: 0x7545 */ 0xffff,
- /* key: 0x7546 */ 0x613c,
- /* key: 0x7547 */ 0xcd32,
- /* key: 0x7548 */ 0xcd33,
- /* key: 0x7549 */ 0x613a,
- /* key: 0x754a */ 0x6139,
- /* key: 0x754b */ 0x5a42,
- /* key: 0x754c */ 0x3326,
- /* key: 0x754d */ 0x6138,
- /* key: 0x754e */ 0xcd34,
- /* key: 0x754f */ 0x305a,
- /* key: 0x7550 */ 0xcd35,
- /* key: 0x7551 */ 0x482a,
- /* key: 0x7552 */ 0xcd36,
- /* key: 0x7553 */ 0xffff,
- /* key: 0x7554 */ 0x484a,
- /* key: 0x7555 */ 0xffff,
- /* key: 0x7556 */ 0xffff,
- /* key: 0x7557 */ 0xcd37,
- /* key: 0x7558 */ 0xffff,
- /* key: 0x7559 */ 0x4e31,
- /* key: 0x755a */ 0x613d,
- /* key: 0x755b */ 0x613b,
- /* key: 0x755c */ 0x435c,
- /* key: 0x755d */ 0x4026,
- /* key: 0x755e */ 0xcd38,
- /* key: 0x755f */ 0xcd39,
- /* key: 0x7560 */ 0x482b,
- /* key: 0x7561 */ 0xcd3a,
- /* key: 0x7562 */ 0x492d,
- /* key: 0x7563 */ 0xffff,
- /* key: 0x7564 */ 0x613f,
- /* key: 0x7565 */ 0x4e2c,
- /* key: 0x7566 */ 0x374d,
- /* key: 0x7567 */ 0x6140,
- /* key: 0x7568 */ 0xffff,
- /* key: 0x7569 */ 0x613e,
- /* key: 0x756a */ 0x4856,
- /* key: 0x756b */ 0x6141,
- /* key: 0x756c */ 0xffff,
- /* key: 0x756d */ 0x6142,
- /* key: 0x756e */ 0xffff,
- /* key: 0x756f */ 0xcd3b,
- /* key: 0x7570 */ 0x305b,
- /* key: 0x7571 */ 0xcd3c,
- /* key: 0x7572 */ 0xffff,
- /* key: 0x7573 */ 0x3e76,
- /* key: 0x7574 */ 0x6147,
- /* key: 0x7575 */ 0xffff,
- /* key: 0x7576 */ 0x6144,
- /* key: 0x7577 */ 0x466d,
- /* key: 0x7578 */ 0x6143,
- /* key: 0x7579 */ 0xcd3d,
- /* key: 0x757a */ 0xcd3e,
- /* key: 0x757b */ 0xcd3f,
- /* key: 0x757c */ 0xcd40,
- /* key: 0x757d */ 0xcd41,
- /* key: 0x757e */ 0xcd42,
- /* key: 0x757f */ 0x3526,
- /* key: 0x7580 */ 0xffff,
- /* key: 0x7581 */ 0xcd43,
- /* key: 0x7582 */ 0x614a,
- /* key: 0x7583 */ 0xffff,
- /* key: 0x7584 */ 0xffff,
- /* key: 0x7585 */ 0xcd44,
- /* key: 0x7586 */ 0x6145,
- /* key: 0x7587 */ 0x6146,
- /* key: 0x7588 */ 0xffff,
- /* key: 0x7589 */ 0x6149,
- /* key: 0x758a */ 0x6148,
- /* key: 0x758b */ 0x4925,
- /* key: 0x758c */ 0xffff,
- /* key: 0x758d */ 0xffff,
- /* key: 0x758e */ 0x4142,
- /* key: 0x758f */ 0x4141,
- /* key: 0x7590 */ 0xcd45,
- /* key: 0x7591 */ 0x353f,
- /* key: 0x7592 */ 0xcd46,
- /* key: 0x7593 */ 0xcd47,
- /* key: 0x7594 */ 0x614b,
- /* key: 0x7595 */ 0xcd48,
- /* key: 0x7596 */ 0xffff,
- /* key: 0x7597 */ 0xffff,
- /* key: 0x7598 */ 0xffff,
- /* key: 0x7599 */ 0xcd49,
- /* key: 0x759a */ 0x614c,
- /* key: 0x759b */ 0xffff,
- /* key: 0x759c */ 0xcd4a,
- /* key: 0x759d */ 0x614d,
- /* key: 0x759e */ 0xffff,
- /* key: 0x759f */ 0xffff,
- /* key: 0x75a0 */ 0xffff,
- /* key: 0x75a1 */ 0xffff,
- /* key: 0x75a2 */ 0xcd4b,
- /* key: 0x75a3 */ 0x614f,
- /* key: 0x75a4 */ 0xcd4c,
- /* key: 0x75a5 */ 0x614e,
- /* key: 0x75a6 */ 0xffff,
- /* key: 0x75a7 */ 0xffff,
- /* key: 0x75a8 */ 0xffff,
- /* key: 0x75a9 */ 0xffff,
- /* key: 0x75aa */ 0xffff,
- /* key: 0x75ab */ 0x3156,
- /* key: 0x75ac */ 0xffff,
- /* key: 0x75ad */ 0xffff,
- /* key: 0x75ae */ 0xffff,
- /* key: 0x75af */ 0xffff,
- /* key: 0x75b0 */ 0xffff,
- /* key: 0x75b1 */ 0x6157,
- /* key: 0x75b2 */ 0x4868,
- /* key: 0x75b3 */ 0x6151,
- /* key: 0x75b4 */ 0xcd4d,
- /* key: 0x75b5 */ 0x6153,
- /* key: 0x75b6 */ 0xffff,
- /* key: 0x75b7 */ 0xffff,
- /* key: 0x75b8 */ 0x6155,
- /* key: 0x75b9 */ 0x3f3e,
- /* key: 0x75ba */ 0xcd4e,
- /* key: 0x75bb */ 0xffff,
- /* key: 0x75bc */ 0x6156,
- /* key: 0x75bd */ 0x6154,
- /* key: 0x75be */ 0x3c40,
- /* key: 0x75bf */ 0xcd4f,
- /* key: 0x75c0 */ 0xcd50,
- /* key: 0x75c1 */ 0xcd51,
- /* key: 0x75c2 */ 0x6150,
- /* key: 0x75c3 */ 0x6152,
- /* key: 0x75c4 */ 0xcd52,
- /* key: 0x75c5 */ 0x4942,
- /* key: 0x75c6 */ 0xcd53,
- /* key: 0x75c7 */ 0x3e49,
- /* key: 0x75c8 */ 0xffff,
- /* key: 0x75c9 */ 0xffff,
- /* key: 0x75ca */ 0x6159,
- /* key: 0x75cb */ 0xffff,
- /* key: 0x75cc */ 0xcd54,
- /* key: 0x75cd */ 0x6158,
- /* key: 0x75ce */ 0xcd55,
- /* key: 0x75cf */ 0xcd56,
- /* key: 0x75d0 */ 0xffff,
- /* key: 0x75d1 */ 0xffff,
- /* key: 0x75d2 */ 0x615a,
- /* key: 0x75d3 */ 0xffff,
- /* key: 0x75d4 */ 0x3c26,
- /* key: 0x75d5 */ 0x3a2f,
- /* key: 0x75d6 */ 0xffff,
- /* key: 0x75d7 */ 0xcd57,
- /* key: 0x75d8 */ 0x4577,
- /* key: 0x75d9 */ 0x615b,
- /* key: 0x75da */ 0xffff,
- /* key: 0x75db */ 0x444b,
- /* key: 0x75dc */ 0xcd58,
- /* key: 0x75dd */ 0xffff,
- /* key: 0x75de */ 0x615d,
- /* key: 0x75df */ 0xcd59,
- /* key: 0x75e0 */ 0xcd5a,
- /* key: 0x75e1 */ 0xcd5b,
- /* key: 0x75e2 */ 0x4e21,
- /* key: 0x75e3 */ 0x615c,
- /* key: 0x75e4 */ 0xcd5c,
- /* key: 0x75e5 */ 0xffff,
- /* key: 0x75e6 */ 0xffff,
- /* key: 0x75e7 */ 0xcd5d,
- /* key: 0x75e8 */ 0xffff,
- /* key: 0x75e9 */ 0x4169,
- /* key: 0x75ea */ 0xffff,
- /* key: 0x75eb */ 0xffff,
- /* key: 0x75ec */ 0xcd5e,
- /* key: 0x75ed */ 0xffff,
- /* key: 0x75ee */ 0xcd5f,
- /* key: 0x75ef */ 0xcd60,
- /* key: 0x75f0 */ 0x6162,
- /* key: 0x75f1 */ 0xcd61,
- /* key: 0x75f2 */ 0x6164,
- /* key: 0x75f3 */ 0x6165,
- /* key: 0x75f4 */ 0x4354,
- /* key: 0x75f5 */ 0xffff,
- /* key: 0x75f6 */ 0xffff,
- /* key: 0x75f7 */ 0xffff,
- /* key: 0x75f8 */ 0xffff,
- /* key: 0x75f9 */ 0xcd62,
- /* key: 0x75fa */ 0x6163,
- /* key: 0x75fb */ 0xffff,
- /* key: 0x75fc */ 0x6160,
- /* key: 0x75fd */ 0xffff,
- /* key: 0x75fe */ 0x615e,
- /* key: 0x75ff */ 0x615f,
- /* branch: 0x760X */ 12512,
- /* branch: 0x761X */ 12528,
- /* branch: 0x762X */ 12544,
- /* branch: 0x763X */ 12560,
- /* branch: 0x764X */ 12576,
- /* branch: 0x765X */ 12592,
- /* branch: 0x766X */ 12608,
- /* branch: 0x767X */ 12624,
- /* branch: 0x768X */ 12640,
- /* branch: 0x769X */ 12656,
- /* branch: 0x76aX */ 12672,
- /* branch: 0x76bX */ 12688,
- /* branch: 0x76cX */ 12704,
- /* branch: 0x76dX */ 12720,
- /* branch: 0x76eX */ 12736,
- /* branch: 0x76fX */ 12752,
- /* key: 0x7600 */ 0xcd63,
- /* key: 0x7601 */ 0x6161,
- /* key: 0x7602 */ 0xcd64,
- /* key: 0x7603 */ 0xcd65,
- /* key: 0x7604 */ 0xcd66,
- /* key: 0x7605 */ 0xffff,
- /* key: 0x7606 */ 0xffff,
- /* key: 0x7607 */ 0xcd67,
- /* key: 0x7608 */ 0xcd68,
- /* key: 0x7609 */ 0x6168,
- /* key: 0x760a */ 0xcd69,
- /* key: 0x760b */ 0x6166,
- /* key: 0x760c */ 0xcd6a,
- /* key: 0x760d */ 0x6167,
- /* key: 0x760e */ 0xffff,
- /* key: 0x760f */ 0xcd6b,
- /* key: 0x7610 */ 0xffff,
- /* key: 0x7611 */ 0xffff,
- /* key: 0x7612 */ 0xcd6c,
- /* key: 0x7613 */ 0xcd6d,
- /* key: 0x7614 */ 0xffff,
- /* key: 0x7615 */ 0xcd6e,
- /* key: 0x7616 */ 0xcd6f,
- /* key: 0x7617 */ 0xffff,
- /* key: 0x7618 */ 0xffff,
- /* key: 0x7619 */ 0xcd70,
- /* key: 0x761a */ 0xffff,
- /* key: 0x761b */ 0xcd71,
- /* key: 0x761c */ 0xcd72,
- /* key: 0x761d */ 0xcd73,
- /* key: 0x761e */ 0xcd74,
- /* key: 0x761f */ 0x6169,
- /* key: 0x7620 */ 0x616b,
- /* key: 0x7621 */ 0x616c,
- /* key: 0x7622 */ 0x616d,
- /* key: 0x7623 */ 0xcd75,
- /* key: 0x7624 */ 0x616e,
- /* key: 0x7625 */ 0xcd76,
- /* key: 0x7626 */ 0xcd77,
- /* key: 0x7627 */ 0x616a,
- /* key: 0x7628 */ 0xffff,
- /* key: 0x7629 */ 0xcd78,
- /* key: 0x762a */ 0xffff,
- /* key: 0x762b */ 0xffff,
- /* key: 0x762c */ 0xffff,
- /* key: 0x762d */ 0xcd79,
- /* key: 0x762e */ 0xffff,
- /* key: 0x762f */ 0xffff,
- /* key: 0x7630 */ 0x6170,
- /* key: 0x7631 */ 0xffff,
- /* key: 0x7632 */ 0xcd7a,
- /* key: 0x7633 */ 0xcd7b,
- /* key: 0x7634 */ 0x616f,
- /* key: 0x7635 */ 0xcd7c,
- /* key: 0x7636 */ 0xffff,
- /* key: 0x7637 */ 0xffff,
- /* key: 0x7638 */ 0xcd7d,
- /* key: 0x7639 */ 0xcd7e,
- /* key: 0x763a */ 0xce21,
- /* key: 0x763b */ 0x6171,
- /* key: 0x763c */ 0xce22,
- /* key: 0x763d */ 0xffff,
- /* key: 0x763e */ 0xffff,
- /* key: 0x763f */ 0xffff,
- /* key: 0x7640 */ 0xce24,
- /* key: 0x7641 */ 0xce25,
- /* key: 0x7642 */ 0x4e45,
- /* key: 0x7643 */ 0xce26,
- /* key: 0x7644 */ 0xce27,
- /* key: 0x7645 */ 0xce28,
- /* key: 0x7646 */ 0x6174,
- /* key: 0x7647 */ 0x6172,
- /* key: 0x7648 */ 0x6173,
- /* key: 0x7649 */ 0xce29,
- /* key: 0x764a */ 0xce23,
- /* key: 0x764b */ 0xce2a,
- /* key: 0x764c */ 0x3462,
- /* key: 0x764d */ 0xffff,
- /* key: 0x764e */ 0xffff,
- /* key: 0x764f */ 0xffff,
- /* key: 0x7650 */ 0xffff,
- /* key: 0x7651 */ 0xffff,
- /* key: 0x7652 */ 0x4c7e,
- /* key: 0x7653 */ 0xffff,
- /* key: 0x7654 */ 0xffff,
- /* key: 0x7655 */ 0xce2b,
- /* key: 0x7656 */ 0x4a4a,
- /* key: 0x7657 */ 0xffff,
- /* key: 0x7658 */ 0x6176,
- /* key: 0x7659 */ 0xce2c,
- /* key: 0x765a */ 0xffff,
- /* key: 0x765b */ 0xffff,
- /* key: 0x765c */ 0x6175,
- /* key: 0x765d */ 0xffff,
- /* key: 0x765e */ 0xffff,
- /* key: 0x765f */ 0xce2d,
- /* key: 0x7660 */ 0xffff,
- /* key: 0x7661 */ 0x6177,
- /* key: 0x7662 */ 0x6178,
- /* key: 0x7663 */ 0xffff,
- /* key: 0x7664 */ 0xce2e,
- /* key: 0x7665 */ 0xce2f,
- /* key: 0x7666 */ 0xffff,
- /* key: 0x7667 */ 0x617c,
- /* key: 0x7668 */ 0x6179,
- /* key: 0x7669 */ 0x617a,
- /* key: 0x766a */ 0x617b,
- /* key: 0x766b */ 0xffff,
- /* key: 0x766c */ 0x617d,
- /* key: 0x766d */ 0xce30,
- /* key: 0x766e */ 0xce31,
- /* key: 0x766f */ 0xce32,
- /* key: 0x7670 */ 0x617e,
- /* key: 0x7671 */ 0xce33,
- /* key: 0x7672 */ 0x6221,
- /* key: 0x7673 */ 0xffff,
- /* key: 0x7674 */ 0xce34,
- /* key: 0x7675 */ 0xffff,
- /* key: 0x7676 */ 0x6222,
- /* key: 0x7677 */ 0xffff,
- /* key: 0x7678 */ 0x6223,
- /* key: 0x7679 */ 0xffff,
- /* key: 0x767a */ 0x482f,
- /* key: 0x767b */ 0x4550,
- /* key: 0x767c */ 0x6224,
- /* key: 0x767d */ 0x4772,
- /* key: 0x767e */ 0x4934,
- /* key: 0x767f */ 0xffff,
- /* key: 0x7680 */ 0x6225,
- /* key: 0x7681 */ 0xce35,
- /* key: 0x7682 */ 0xffff,
- /* key: 0x7683 */ 0x6226,
- /* key: 0x7684 */ 0x452a,
- /* key: 0x7685 */ 0xce36,
- /* key: 0x7686 */ 0x3327,
- /* key: 0x7687 */ 0x3944,
- /* key: 0x7688 */ 0x6227,
- /* key: 0x7689 */ 0xffff,
- /* key: 0x768a */ 0xffff,
- /* key: 0x768b */ 0x6228,
- /* key: 0x768c */ 0xce37,
- /* key: 0x768d */ 0xce38,
- /* key: 0x768e */ 0x6229,
- /* key: 0x768f */ 0xffff,
- /* key: 0x7690 */ 0x3b29,
- /* key: 0x7691 */ 0xffff,
- /* key: 0x7692 */ 0xffff,
- /* key: 0x7693 */ 0x622b,
- /* key: 0x7694 */ 0xffff,
- /* key: 0x7695 */ 0xce39,
- /* key: 0x7696 */ 0x622a,
- /* key: 0x7697 */ 0xffff,
- /* key: 0x7698 */ 0xffff,
- /* key: 0x7699 */ 0x622c,
- /* key: 0x769a */ 0x622d,
- /* key: 0x769b */ 0xce3a,
- /* key: 0x769c */ 0xce3b,
- /* key: 0x769d */ 0xce3c,
- /* key: 0x769e */ 0xffff,
- /* key: 0x769f */ 0xce3d,
- /* key: 0x76a0 */ 0xce3e,
- /* key: 0x76a1 */ 0xffff,
- /* key: 0x76a2 */ 0xce3f,
- /* key: 0x76a3 */ 0xce40,
- /* key: 0x76a4 */ 0xce41,
- /* key: 0x76a5 */ 0xce42,
- /* key: 0x76a6 */ 0xce43,
- /* key: 0x76a7 */ 0xce44,
- /* key: 0x76a8 */ 0xce45,
- /* key: 0x76a9 */ 0xffff,
- /* key: 0x76aa */ 0xce46,
- /* key: 0x76ab */ 0xffff,
- /* key: 0x76ac */ 0xffff,
- /* key: 0x76ad */ 0xce47,
- /* key: 0x76ae */ 0x4869,
- /* key: 0x76af */ 0xffff,
- /* key: 0x76b0 */ 0x622e,
- /* key: 0x76b1 */ 0xffff,
- /* key: 0x76b2 */ 0xffff,
- /* key: 0x76b3 */ 0xffff,
- /* key: 0x76b4 */ 0x622f,
- /* key: 0x76b5 */ 0xffff,
- /* key: 0x76b6 */ 0xffff,
- /* key: 0x76b7 */ 0x7369,
- /* key: 0x76b8 */ 0x6230,
- /* key: 0x76b9 */ 0x6231,
- /* key: 0x76ba */ 0x6232,
- /* key: 0x76bb */ 0xffff,
- /* key: 0x76bc */ 0xffff,
- /* key: 0x76bd */ 0xce48,
- /* key: 0x76be */ 0xffff,
- /* key: 0x76bf */ 0x3b2e,
- /* key: 0x76c0 */ 0xffff,
- /* key: 0x76c1 */ 0xce49,
- /* key: 0x76c2 */ 0x6233,
- /* key: 0x76c3 */ 0x4756,
- /* key: 0x76c4 */ 0xffff,
- /* key: 0x76c5 */ 0xce4a,
- /* key: 0x76c6 */ 0x4b5f,
- /* key: 0x76c7 */ 0xffff,
- /* key: 0x76c8 */ 0x314e,
- /* key: 0x76c9 */ 0xce4b,
- /* key: 0x76ca */ 0x3157,
- /* key: 0x76cb */ 0xce4c,
- /* key: 0x76cc */ 0xce4d,
- /* key: 0x76cd */ 0x6234,
- /* key: 0x76ce */ 0xce4e,
- /* key: 0x76cf */ 0xffff,
- /* key: 0x76d0 */ 0xffff,
- /* key: 0x76d1 */ 0xffff,
- /* key: 0x76d2 */ 0x6236,
- /* key: 0x76d3 */ 0xffff,
- /* key: 0x76d4 */ 0xce4f,
- /* key: 0x76d5 */ 0xffff,
- /* key: 0x76d6 */ 0x6235,
- /* key: 0x76d7 */ 0x4570,
- /* key: 0x76d8 */ 0xffff,
- /* key: 0x76d9 */ 0xce50,
- /* key: 0x76da */ 0xffff,
- /* key: 0x76db */ 0x4039,
- /* key: 0x76dc */ 0x5d39,
- /* key: 0x76dd */ 0xffff,
- /* key: 0x76de */ 0x6237,
- /* key: 0x76df */ 0x4c41,
- /* key: 0x76e0 */ 0xce51,
- /* key: 0x76e1 */ 0x6238,
- /* key: 0x76e2 */ 0xffff,
- /* key: 0x76e3 */ 0x3446,
- /* key: 0x76e4 */ 0x4857,
- /* key: 0x76e5 */ 0x6239,
- /* key: 0x76e6 */ 0xce52,
- /* key: 0x76e7 */ 0x623a,
- /* key: 0x76e8 */ 0xce53,
- /* key: 0x76e9 */ 0xffff,
- /* key: 0x76ea */ 0x623b,
- /* key: 0x76eb */ 0xffff,
- /* key: 0x76ec */ 0xce54,
- /* key: 0x76ed */ 0xffff,
- /* key: 0x76ee */ 0x4c5c,
- /* key: 0x76ef */ 0xffff,
- /* key: 0x76f0 */ 0xce55,
- /* key: 0x76f1 */ 0xce56,
- /* key: 0x76f2 */ 0x4c55,
- /* key: 0x76f3 */ 0xffff,
- /* key: 0x76f4 */ 0x443e,
- /* key: 0x76f5 */ 0xffff,
- /* key: 0x76f6 */ 0xce57,
- /* key: 0x76f7 */ 0xffff,
- /* key: 0x76f8 */ 0x416a,
- /* key: 0x76f9 */ 0xce58,
- /* key: 0x76fa */ 0xffff,
- /* key: 0x76fb */ 0x623d,
- /* key: 0x76fc */ 0xce59,
- /* key: 0x76fd */ 0xffff,
- /* key: 0x76fe */ 0x3d62,
- /* key: 0x76ff */ 0xffff,
- /* branch: 0x770X */ 12784,
- /* branch: 0x771X */ 12800,
- /* branch: 0x772X */ 12816,
- /* branch: 0x773X */ 12832,
- /* branch: 0x774X */ 12848,
- /* branch: 0x775X */ 12864,
- /* branch: 0x776X */ 12880,
- /* branch: 0x777X */ 12896,
- /* branch: 0x778X */ 12912,
- /* branch: 0x779X */ 12928,
- /* branch: 0x77aX */ 12944,
- /* branch: 0x77bX */ 12960,
- /* branch: 0x77cX */ 12976,
- /* branch: 0x77dX */ 12992,
- /* branch: 0x77eX */ 13008,
- /* branch: 0x77fX */ 13024,
- /* key: 0x7700 */ 0xce5a,
- /* key: 0x7701 */ 0x3e4a,
- /* key: 0x7702 */ 0xffff,
- /* key: 0x7703 */ 0xffff,
- /* key: 0x7704 */ 0x6240,
- /* key: 0x7705 */ 0xffff,
- /* key: 0x7706 */ 0xce5b,
- /* key: 0x7707 */ 0x623f,
- /* key: 0x7708 */ 0x623e,
- /* key: 0x7709 */ 0x487d,
- /* key: 0x770a */ 0xce5c,
- /* key: 0x770b */ 0x3447,
- /* key: 0x770c */ 0x3829,
- /* key: 0x770d */ 0xffff,
- /* key: 0x770e */ 0xce5d,
- /* key: 0x770f */ 0xffff,
- /* key: 0x7710 */ 0xffff,
- /* key: 0x7711 */ 0xffff,
- /* key: 0x7712 */ 0xce5e,
- /* key: 0x7713 */ 0xffff,
- /* key: 0x7714 */ 0xce5f,
- /* key: 0x7715 */ 0xce60,
- /* key: 0x7716 */ 0xffff,
- /* key: 0x7717 */ 0xce61,
- /* key: 0x7718 */ 0xffff,
- /* key: 0x7719 */ 0xce62,
- /* key: 0x771a */ 0xce63,
- /* key: 0x771b */ 0x6246,
- /* key: 0x771c */ 0xce64,
- /* key: 0x771d */ 0xffff,
- /* key: 0x771e */ 0x6243,
- /* key: 0x771f */ 0x3f3f,
- /* key: 0x7720 */ 0x4c32,
- /* key: 0x7721 */ 0xffff,
- /* key: 0x7722 */ 0xce65,
- /* key: 0x7723 */ 0xffff,
- /* key: 0x7724 */ 0x6242,
- /* key: 0x7725 */ 0x6244,
- /* key: 0x7726 */ 0x6245,
- /* key: 0x7727 */ 0xffff,
- /* key: 0x7728 */ 0xce66,
- /* key: 0x7729 */ 0x6241,
- /* key: 0x772a */ 0xffff,
- /* key: 0x772b */ 0xffff,
- /* key: 0x772c */ 0xffff,
- /* key: 0x772d */ 0xce67,
- /* key: 0x772e */ 0xce68,
- /* key: 0x772f */ 0xce69,
- /* key: 0x7730 */ 0xffff,
- /* key: 0x7731 */ 0xffff,
- /* key: 0x7732 */ 0xffff,
- /* key: 0x7733 */ 0xffff,
- /* key: 0x7734 */ 0xce6a,
- /* key: 0x7735 */ 0xce6b,
- /* key: 0x7736 */ 0xce6c,
- /* key: 0x7737 */ 0x6247,
- /* key: 0x7738 */ 0x6248,
- /* key: 0x7739 */ 0xce6d,
- /* key: 0x773a */ 0x442f,
- /* key: 0x773b */ 0xffff,
- /* key: 0x773c */ 0x3463,
- /* key: 0x773d */ 0xce6e,
- /* key: 0x773e */ 0xce6f,
- /* key: 0x773f */ 0xffff,
- /* key: 0x7740 */ 0x4365,
- /* key: 0x7741 */ 0xffff,
- /* key: 0x7742 */ 0xce70,
- /* key: 0x7743 */ 0xffff,
- /* key: 0x7744 */ 0xffff,
- /* key: 0x7745 */ 0xce71,
- /* key: 0x7746 */ 0xce72,
- /* key: 0x7747 */ 0x6249,
- /* key: 0x7748 */ 0xffff,
- /* key: 0x7749 */ 0xffff,
- /* key: 0x774a */ 0xce73,
- /* key: 0x774b */ 0xffff,
- /* key: 0x774c */ 0xffff,
- /* key: 0x774d */ 0xce74,
- /* key: 0x774e */ 0xce75,
- /* key: 0x774f */ 0xce76,
- /* key: 0x7750 */ 0xffff,
- /* key: 0x7751 */ 0xffff,
- /* key: 0x7752 */ 0xce77,
- /* key: 0x7753 */ 0xffff,
- /* key: 0x7754 */ 0xffff,
- /* key: 0x7755 */ 0xffff,
- /* key: 0x7756 */ 0xce78,
- /* key: 0x7757 */ 0xce79,
- /* key: 0x7758 */ 0xffff,
- /* key: 0x7759 */ 0xffff,
- /* key: 0x775a */ 0x624a,
- /* key: 0x775b */ 0x624d,
- /* key: 0x775c */ 0xce7a,
- /* key: 0x775d */ 0xffff,
- /* key: 0x775e */ 0xce7b,
- /* key: 0x775f */ 0xce7c,
- /* key: 0x7760 */ 0xce7d,
- /* key: 0x7761 */ 0x3f67,
- /* key: 0x7762 */ 0xce7e,
- /* key: 0x7763 */ 0x4644,
- /* key: 0x7764 */ 0xcf21,
- /* key: 0x7765 */ 0x624e,
- /* key: 0x7766 */ 0x4b53,
- /* key: 0x7767 */ 0xcf22,
- /* key: 0x7768 */ 0x624b,
- /* key: 0x7769 */ 0xffff,
- /* key: 0x776a */ 0xcf23,
- /* key: 0x776b */ 0x624c,
- /* key: 0x776c */ 0xcf24,
- /* key: 0x776d */ 0xffff,
- /* key: 0x776e */ 0xffff,
- /* key: 0x776f */ 0xffff,
- /* key: 0x7770 */ 0xcf25,
- /* key: 0x7771 */ 0xffff,
- /* key: 0x7772 */ 0xcf26,
- /* key: 0x7773 */ 0xcf27,
- /* key: 0x7774 */ 0xcf28,
- /* key: 0x7775 */ 0xffff,
- /* key: 0x7776 */ 0xffff,
- /* key: 0x7777 */ 0xffff,
- /* key: 0x7778 */ 0xffff,
- /* key: 0x7779 */ 0x6251,
- /* key: 0x777a */ 0xcf29,
- /* key: 0x777b */ 0xffff,
- /* key: 0x777c */ 0xffff,
- /* key: 0x777d */ 0xcf2a,
- /* key: 0x777e */ 0x6250,
- /* key: 0x777f */ 0x624f,
- /* key: 0x7780 */ 0xcf2b,
- /* key: 0x7781 */ 0xffff,
- /* key: 0x7782 */ 0xffff,
- /* key: 0x7783 */ 0xffff,
- /* key: 0x7784 */ 0xcf2c,
- /* key: 0x7785 */ 0xffff,
- /* key: 0x7786 */ 0xffff,
- /* key: 0x7787 */ 0xffff,
- /* key: 0x7788 */ 0xffff,
- /* key: 0x7789 */ 0xffff,
- /* key: 0x778a */ 0xffff,
- /* key: 0x778b */ 0x6253,
- /* key: 0x778c */ 0xcf2d,
- /* key: 0x778d */ 0xcf2e,
- /* key: 0x778e */ 0x6252,
- /* key: 0x778f */ 0xffff,
- /* key: 0x7790 */ 0xffff,
- /* key: 0x7791 */ 0x6254,
- /* key: 0x7792 */ 0xffff,
- /* key: 0x7793 */ 0xffff,
- /* key: 0x7794 */ 0xcf2f,
- /* key: 0x7795 */ 0xcf30,
- /* key: 0x7796 */ 0xcf31,
- /* key: 0x7797 */ 0xffff,
- /* key: 0x7798 */ 0xffff,
- /* key: 0x7799 */ 0xffff,
- /* key: 0x779a */ 0xcf32,
- /* key: 0x779b */ 0xffff,
- /* key: 0x779c */ 0xffff,
- /* key: 0x779d */ 0xffff,
- /* key: 0x779e */ 0x6256,
- /* key: 0x779f */ 0xcf33,
- /* key: 0x77a0 */ 0x6255,
- /* key: 0x77a1 */ 0xffff,
- /* key: 0x77a2 */ 0xcf34,
- /* key: 0x77a3 */ 0xffff,
- /* key: 0x77a4 */ 0xffff,
- /* key: 0x77a5 */ 0x4a4d,
- /* key: 0x77a6 */ 0xffff,
- /* key: 0x77a7 */ 0xcf35,
- /* key: 0x77a8 */ 0xffff,
- /* key: 0x77a9 */ 0xffff,
- /* key: 0x77aa */ 0xcf36,
- /* key: 0x77ab */ 0xffff,
- /* key: 0x77ac */ 0x3d56,
- /* key: 0x77ad */ 0x4e46,
- /* key: 0x77ae */ 0xcf37,
- /* key: 0x77af */ 0xcf38,
- /* key: 0x77b0 */ 0x6257,
- /* key: 0x77b1 */ 0xcf39,
- /* key: 0x77b2 */ 0xffff,
- /* key: 0x77b3 */ 0x4637,
- /* key: 0x77b4 */ 0xffff,
- /* key: 0x77b5 */ 0xcf3a,
- /* key: 0x77b6 */ 0x6258,
- /* key: 0x77b7 */ 0xffff,
- /* key: 0x77b8 */ 0xffff,
- /* key: 0x77b9 */ 0x6259,
- /* key: 0x77ba */ 0xffff,
- /* key: 0x77bb */ 0x625d,
- /* key: 0x77bc */ 0x625b,
- /* key: 0x77bd */ 0x625c,
- /* key: 0x77be */ 0xcf3b,
- /* key: 0x77bf */ 0x625a,
- /* key: 0x77c0 */ 0xffff,
- /* key: 0x77c1 */ 0xffff,
- /* key: 0x77c2 */ 0xffff,
- /* key: 0x77c3 */ 0xcf3c,
- /* key: 0x77c4 */ 0xffff,
- /* key: 0x77c5 */ 0xffff,
- /* key: 0x77c6 */ 0xffff,
- /* key: 0x77c7 */ 0x625e,
- /* key: 0x77c8 */ 0xffff,
- /* key: 0x77c9 */ 0xcf3d,
- /* key: 0x77ca */ 0xffff,
- /* key: 0x77cb */ 0xffff,
- /* key: 0x77cc */ 0xffff,
- /* key: 0x77cd */ 0x625f,
- /* key: 0x77ce */ 0xffff,
- /* key: 0x77cf */ 0xffff,
- /* key: 0x77d0 */ 0xffff,
- /* key: 0x77d1 */ 0xcf3e,
- /* key: 0x77d2 */ 0xcf3f,
- /* key: 0x77d3 */ 0xffff,
- /* key: 0x77d4 */ 0xffff,
- /* key: 0x77d5 */ 0xcf40,
- /* key: 0x77d6 */ 0xffff,
- /* key: 0x77d7 */ 0x6260,
- /* key: 0x77d8 */ 0xffff,
- /* key: 0x77d9 */ 0xcf41,
- /* key: 0x77da */ 0x6261,
- /* key: 0x77db */ 0x4c37,
- /* key: 0x77dc */ 0x6262,
- /* key: 0x77dd */ 0xffff,
- /* key: 0x77de */ 0xcf42,
- /* key: 0x77df */ 0xcf43,
- /* key: 0x77e0 */ 0xcf44,
- /* key: 0x77e1 */ 0xffff,
- /* key: 0x77e2 */ 0x4c70,
- /* key: 0x77e3 */ 0x6263,
- /* key: 0x77e4 */ 0xcf45,
- /* key: 0x77e5 */ 0x434e,
- /* key: 0x77e6 */ 0xcf46,
- /* key: 0x77e7 */ 0x476a,
- /* key: 0x77e8 */ 0xffff,
- /* key: 0x77e9 */ 0x366b,
- /* key: 0x77ea */ 0xcf47,
- /* key: 0x77eb */ 0xffff,
- /* key: 0x77ec */ 0xcf48,
- /* key: 0x77ed */ 0x433b,
- /* key: 0x77ee */ 0x6264,
- /* key: 0x77ef */ 0x363a,
- /* key: 0x77f0 */ 0xcf49,
- /* key: 0x77f1 */ 0xcf4a,
- /* key: 0x77f2 */ 0xffff,
- /* key: 0x77f3 */ 0x4050,
- /* key: 0x77f4 */ 0xcf4b,
- /* key: 0x77f5 */ 0xffff,
- /* key: 0x77f6 */ 0xffff,
- /* key: 0x77f7 */ 0xffff,
- /* key: 0x77f8 */ 0xcf4c,
- /* key: 0x77f9 */ 0xffff,
- /* key: 0x77fa */ 0xffff,
- /* key: 0x77fb */ 0xcf4d,
- /* key: 0x77fc */ 0x6265,
- /* key: 0x77fd */ 0xffff,
- /* key: 0x77fe */ 0xffff,
- /* key: 0x77ff */ 0xffff,
- /* branch: 0x780X */ 13056,
- /* branch: 0x781X */ 13072,
- /* branch: 0x782X */ 13088,
- /* branch: 0x783X */ 13104,
- /* branch: 0x784X */ 13120,
- /* branch: 0x785X */ 13136,
- /* branch: 0x786X */ 13152,
- /* branch: 0x787X */ 13168,
- /* branch: 0x788X */ 13184,
- /* branch: 0x789X */ 13200,
- /* branch: 0x78aX */ 13216,
- /* branch: 0x78bX */ 13232,
- /* branch: 0x78cX */ 13248,
- /* branch: 0x78dX */ 13264,
- /* branch: 0x78eX */ 13280,
- /* branch: 0x78fX */ 13296,
- /* key: 0x7800 */ 0xffff,
- /* key: 0x7801 */ 0xffff,
- /* key: 0x7802 */ 0x3a3d,
- /* key: 0x7803 */ 0xffff,
- /* key: 0x7804 */ 0xffff,
- /* key: 0x7805 */ 0xcf4e,
- /* key: 0x7806 */ 0xcf4f,
- /* key: 0x7807 */ 0xffff,
- /* key: 0x7808 */ 0xffff,
- /* key: 0x7809 */ 0xcf50,
- /* key: 0x780a */ 0xffff,
- /* key: 0x780b */ 0xffff,
- /* key: 0x780c */ 0x6266,
- /* key: 0x780d */ 0xcf51,
- /* key: 0x780e */ 0xcf52,
- /* key: 0x780f */ 0xffff,
- /* key: 0x7810 */ 0xffff,
- /* key: 0x7811 */ 0xcf53,
- /* key: 0x7812 */ 0x6267,
- /* key: 0x7813 */ 0xffff,
- /* key: 0x7814 */ 0x3826,
- /* key: 0x7815 */ 0x3a55,
- /* key: 0x7816 */ 0xffff,
- /* key: 0x7817 */ 0xffff,
- /* key: 0x7818 */ 0xffff,
- /* key: 0x7819 */ 0xffff,
- /* key: 0x781a */ 0xffff,
- /* key: 0x781b */ 0xffff,
- /* key: 0x781c */ 0xffff,
- /* key: 0x781d */ 0xcf54,
- /* key: 0x781e */ 0xffff,
- /* key: 0x781f */ 0xffff,
- /* key: 0x7820 */ 0x6269,
- /* key: 0x7821 */ 0xcf55,
- /* key: 0x7822 */ 0xcf56,
- /* key: 0x7823 */ 0xcf57,
- /* key: 0x7824 */ 0xffff,
- /* key: 0x7825 */ 0x4556,
- /* key: 0x7826 */ 0x3a56,
- /* key: 0x7827 */ 0x354e,
- /* key: 0x7828 */ 0xffff,
- /* key: 0x7829 */ 0xffff,
- /* key: 0x782a */ 0xffff,
- /* key: 0x782b */ 0xffff,
- /* key: 0x782c */ 0xffff,
- /* key: 0x782d */ 0xcf58,
- /* key: 0x782e */ 0xcf59,
- /* key: 0x782f */ 0xffff,
- /* key: 0x7830 */ 0xcf5a,
- /* key: 0x7831 */ 0xffff,
- /* key: 0x7832 */ 0x4b24,
- /* key: 0x7833 */ 0xffff,
- /* key: 0x7834 */ 0x474b,
- /* key: 0x7835 */ 0xcf5b,
- /* key: 0x7836 */ 0xffff,
- /* key: 0x7837 */ 0xcf5c,
- /* key: 0x7838 */ 0xffff,
- /* key: 0x7839 */ 0xffff,
- /* key: 0x783a */ 0x4557,
- /* key: 0x783b */ 0xffff,
- /* key: 0x783c */ 0xffff,
- /* key: 0x783d */ 0xffff,
- /* key: 0x783e */ 0xffff,
- /* key: 0x783f */ 0x395c,
- /* key: 0x7840 */ 0xffff,
- /* key: 0x7841 */ 0xffff,
- /* key: 0x7842 */ 0xffff,
- /* key: 0x7843 */ 0xcf5d,
- /* key: 0x7844 */ 0xcf5e,
- /* key: 0x7845 */ 0x626b,
- /* key: 0x7846 */ 0xffff,
- /* key: 0x7847 */ 0xcf5f,
- /* key: 0x7848 */ 0xcf60,
- /* key: 0x7849 */ 0xffff,
- /* key: 0x784a */ 0xffff,
- /* key: 0x784b */ 0xffff,
- /* key: 0x784c */ 0xcf61,
- /* key: 0x784d */ 0xffff,
- /* key: 0x784e */ 0xcf62,
- /* key: 0x784f */ 0xffff,
- /* key: 0x7850 */ 0xffff,
- /* key: 0x7851 */ 0xffff,
- /* key: 0x7852 */ 0xcf63,
- /* key: 0x7853 */ 0xffff,
- /* key: 0x7854 */ 0xffff,
- /* key: 0x7855 */ 0xffff,
- /* key: 0x7856 */ 0xffff,
- /* key: 0x7857 */ 0xffff,
- /* key: 0x7858 */ 0xffff,
- /* key: 0x7859 */ 0xffff,
- /* key: 0x785a */ 0xffff,
- /* key: 0x785b */ 0xffff,
- /* key: 0x785c */ 0xcf64,
- /* key: 0x785d */ 0x3e4b,
- /* key: 0x785e */ 0xcf65,
- /* key: 0x785f */ 0xffff,
- /* key: 0x7860 */ 0xcf66,
- /* key: 0x7861 */ 0xcf67,
- /* key: 0x7862 */ 0xffff,
- /* key: 0x7863 */ 0xcf68,
- /* key: 0x7864 */ 0xcf69,
- /* key: 0x7865 */ 0xffff,
- /* key: 0x7866 */ 0xffff,
- /* key: 0x7867 */ 0xffff,
- /* key: 0x7868 */ 0xcf6a,
- /* key: 0x7869 */ 0xffff,
- /* key: 0x786a */ 0xcf6b,
- /* key: 0x786b */ 0x4e32,
- /* key: 0x786c */ 0x3945,
- /* key: 0x786d */ 0xffff,
- /* key: 0x786e */ 0xcf6c,
- /* key: 0x786f */ 0x3827,
- /* key: 0x7870 */ 0xffff,
- /* key: 0x7871 */ 0xffff,
- /* key: 0x7872 */ 0x4823,
- /* key: 0x7873 */ 0xffff,
- /* key: 0x7874 */ 0x626d,
- /* key: 0x7875 */ 0xffff,
- /* key: 0x7876 */ 0xffff,
- /* key: 0x7877 */ 0xffff,
- /* key: 0x7878 */ 0xffff,
- /* key: 0x7879 */ 0xffff,
- /* key: 0x787a */ 0xcf6d,
- /* key: 0x787b */ 0xffff,
- /* key: 0x787c */ 0x626f,
- /* key: 0x787d */ 0xffff,
- /* key: 0x787e */ 0xcf6e,
- /* key: 0x787f */ 0xffff,
- /* key: 0x7880 */ 0xffff,
- /* key: 0x7881 */ 0x386b,
- /* key: 0x7882 */ 0xffff,
- /* key: 0x7883 */ 0xffff,
- /* key: 0x7884 */ 0xffff,
- /* key: 0x7885 */ 0xffff,
- /* key: 0x7886 */ 0x626e,
- /* key: 0x7887 */ 0x4476,
- /* key: 0x7888 */ 0xffff,
- /* key: 0x7889 */ 0xffff,
- /* key: 0x788a */ 0xcf6f,
- /* key: 0x788b */ 0xffff,
- /* key: 0x788c */ 0x6271,
- /* key: 0x788d */ 0x3337,
- /* key: 0x788e */ 0x626c,
- /* key: 0x788f */ 0xcf70,
- /* key: 0x7890 */ 0xffff,
- /* key: 0x7891 */ 0x486a,
- /* key: 0x7892 */ 0xffff,
- /* key: 0x7893 */ 0x3130,
- /* key: 0x7894 */ 0xcf71,
- /* key: 0x7895 */ 0x3a6c,
- /* key: 0x7896 */ 0xffff,
- /* key: 0x7897 */ 0x4f52,
- /* key: 0x7898 */ 0xcf72,
- /* key: 0x7899 */ 0xffff,
- /* key: 0x789a */ 0x6270,
- /* key: 0x789b */ 0xffff,
- /* key: 0x789c */ 0xffff,
- /* key: 0x789d */ 0xcf74,
- /* key: 0x789e */ 0xcf75,
- /* key: 0x789f */ 0xcf76,
- /* key: 0x78a0 */ 0xffff,
- /* key: 0x78a1 */ 0xcf73,
- /* key: 0x78a2 */ 0xffff,
- /* key: 0x78a3 */ 0x6272,
- /* key: 0x78a4 */ 0xcf77,
- /* key: 0x78a5 */ 0xffff,
- /* key: 0x78a6 */ 0xffff,
- /* key: 0x78a7 */ 0x4a4b,
- /* key: 0x78a8 */ 0xcf78,
- /* key: 0x78a9 */ 0x4059,
- /* key: 0x78aa */ 0x6274,
- /* key: 0x78ab */ 0xffff,
- /* key: 0x78ac */ 0xcf79,
- /* key: 0x78ad */ 0xcf7a,
- /* key: 0x78ae */ 0xffff,
- /* key: 0x78af */ 0x6275,
- /* key: 0x78b0 */ 0xcf7b,
- /* key: 0x78b1 */ 0xcf7c,
- /* key: 0x78b2 */ 0xcf7d,
- /* key: 0x78b3 */ 0xcf7e,
- /* key: 0x78b4 */ 0xffff,
- /* key: 0x78b5 */ 0x6273,
- /* key: 0x78b6 */ 0xffff,
- /* key: 0x78b7 */ 0xffff,
- /* key: 0x78b8 */ 0xffff,
- /* key: 0x78b9 */ 0xffff,
- /* key: 0x78ba */ 0x334e,
- /* key: 0x78bb */ 0xd021,
- /* key: 0x78bc */ 0x627b,
- /* key: 0x78bd */ 0xd022,
- /* key: 0x78be */ 0x627a,
- /* key: 0x78bf */ 0xd023,
- /* key: 0x78c0 */ 0xffff,
- /* key: 0x78c1 */ 0x3c27,
- /* key: 0x78c2 */ 0xffff,
- /* key: 0x78c3 */ 0xffff,
- /* key: 0x78c4 */ 0xffff,
- /* key: 0x78c5 */ 0x627c,
- /* key: 0x78c6 */ 0x6277,
- /* key: 0x78c7 */ 0xd024,
- /* key: 0x78c8 */ 0xd025,
- /* key: 0x78c9 */ 0xd026,
- /* key: 0x78ca */ 0x627d,
- /* key: 0x78cb */ 0x6278,
- /* key: 0x78cc */ 0xd027,
- /* key: 0x78cd */ 0xffff,
- /* key: 0x78ce */ 0xd028,
- /* key: 0x78cf */ 0xffff,
- /* key: 0x78d0 */ 0x4858,
- /* key: 0x78d1 */ 0x6276,
- /* key: 0x78d2 */ 0xd029,
- /* key: 0x78d3 */ 0xd02a,
- /* key: 0x78d4 */ 0x6279,
- /* key: 0x78d5 */ 0xd02b,
- /* key: 0x78d6 */ 0xd02c,
- /* key: 0x78d7 */ 0xffff,
- /* key: 0x78d8 */ 0xffff,
- /* key: 0x78d9 */ 0xffff,
- /* key: 0x78da */ 0x6322,
- /* key: 0x78db */ 0xd02e,
- /* key: 0x78dc */ 0xffff,
- /* key: 0x78dd */ 0xffff,
- /* key: 0x78de */ 0xffff,
- /* key: 0x78df */ 0xd02f,
- /* key: 0x78e0 */ 0xd030,
- /* key: 0x78e1 */ 0xd031,
- /* key: 0x78e2 */ 0xffff,
- /* key: 0x78e3 */ 0xffff,
- /* key: 0x78e4 */ 0xd02d,
- /* key: 0x78e5 */ 0xffff,
- /* key: 0x78e6 */ 0xd032,
- /* key: 0x78e7 */ 0x6321,
- /* key: 0x78e8 */ 0x4b61,
- /* key: 0x78e9 */ 0xffff,
- /* key: 0x78ea */ 0xd033,
- /* key: 0x78eb */ 0xffff,
- /* key: 0x78ec */ 0x627e,
- /* key: 0x78ed */ 0xffff,
- /* key: 0x78ee */ 0xffff,
- /* key: 0x78ef */ 0x306b,
- /* key: 0x78f0 */ 0xffff,
- /* key: 0x78f1 */ 0xffff,
- /* key: 0x78f2 */ 0xd034,
- /* key: 0x78f3 */ 0xd035,
- /* key: 0x78f4 */ 0x6324,
- /* key: 0x78f5 */ 0xffff,
- /* key: 0x78f6 */ 0xd037,
- /* key: 0x78f7 */ 0xd038,
- /* key: 0x78f8 */ 0xffff,
- /* key: 0x78f9 */ 0xffff,
- /* key: 0x78fa */ 0xd039,
- /* key: 0x78fb */ 0xd03a,
- /* key: 0x78fc */ 0xffff,
- /* key: 0x78fd */ 0x6323,
- /* key: 0x78fe */ 0xffff,
- /* key: 0x78ff */ 0xd03b,
- /* branch: 0x790X */ 13328,
- /* branch: 0x791X */ 13344,
- /* branch: 0x792X */ 13360,
- /* branch: 0x793X */ 13376,
- /* branch: 0x794X */ 13392,
- /* branch: 0x795X */ 13408,
- /* branch: 0x796X */ 13424,
- /* branch: 0x797X */ 13440,
- /* branch: 0x798X */ 13456,
- /* branch: 0x799X */ 13472,
- /* branch: 0x79aX */ 13488,
- /* branch: 0x79bX */ 13504,
- /* branch: 0x79cX */ 13520,
- /* branch: 0x79dX */ 13536,
- /* branch: 0x79eX */ 13552,
- /* branch: 0x79fX */ 13568,
- /* key: 0x7900 */ 0xd036,
- /* key: 0x7901 */ 0x3e4c,
- /* key: 0x7902 */ 0xffff,
- /* key: 0x7903 */ 0xffff,
- /* key: 0x7904 */ 0xffff,
- /* key: 0x7905 */ 0xffff,
- /* key: 0x7906 */ 0xd03c,
- /* key: 0x7907 */ 0x6325,
- /* key: 0x7908 */ 0xffff,
- /* key: 0x7909 */ 0xffff,
- /* key: 0x790a */ 0xffff,
- /* key: 0x790b */ 0xffff,
- /* key: 0x790c */ 0xd03d,
- /* key: 0x790d */ 0xffff,
- /* key: 0x790e */ 0x4143,
- /* key: 0x790f */ 0xffff,
- /* key: 0x7910 */ 0xd03e,
- /* key: 0x7911 */ 0x6327,
- /* key: 0x7912 */ 0x6326,
- /* key: 0x7913 */ 0xffff,
- /* key: 0x7914 */ 0xffff,
- /* key: 0x7915 */ 0xffff,
- /* key: 0x7916 */ 0xffff,
- /* key: 0x7917 */ 0xffff,
- /* key: 0x7918 */ 0xffff,
- /* key: 0x7919 */ 0x6328,
- /* key: 0x791a */ 0xd03f,
- /* key: 0x791b */ 0xffff,
- /* key: 0x791c */ 0xd040,
- /* key: 0x791d */ 0xffff,
- /* key: 0x791e */ 0xd041,
- /* key: 0x791f */ 0xd042,
- /* key: 0x7920 */ 0xd043,
- /* key: 0x7921 */ 0xffff,
- /* key: 0x7922 */ 0xffff,
- /* key: 0x7923 */ 0xffff,
- /* key: 0x7924 */ 0xffff,
- /* key: 0x7925 */ 0xd044,
- /* key: 0x7926 */ 0x6268,
- /* key: 0x7927 */ 0xd045,
- /* key: 0x7928 */ 0xffff,
- /* key: 0x7929 */ 0xd046,
- /* key: 0x792a */ 0x626a,
- /* key: 0x792b */ 0x632a,
- /* key: 0x792c */ 0x6329,
- /* key: 0x792d */ 0xd047,
- /* key: 0x792e */ 0xffff,
- /* key: 0x792f */ 0xffff,
- /* key: 0x7930 */ 0xffff,
- /* key: 0x7931 */ 0xd048,
- /* key: 0x7932 */ 0xffff,
- /* key: 0x7933 */ 0xffff,
- /* key: 0x7934 */ 0xd049,
- /* key: 0x7935 */ 0xd04a,
- /* key: 0x7936 */ 0xffff,
- /* key: 0x7937 */ 0xffff,
- /* key: 0x7938 */ 0xffff,
- /* key: 0x7939 */ 0xffff,
- /* key: 0x793a */ 0x3c28,
- /* key: 0x793b */ 0xd04b,
- /* key: 0x793c */ 0x4e69,
- /* key: 0x793d */ 0xd04c,
- /* key: 0x793e */ 0x3c52,
- /* key: 0x793f */ 0xd04d,
- /* key: 0x7940 */ 0x632b,
- /* key: 0x7941 */ 0x3737,
- /* key: 0x7942 */ 0xffff,
- /* key: 0x7943 */ 0xffff,
- /* key: 0x7944 */ 0xd04e,
- /* key: 0x7945 */ 0xd04f,
- /* key: 0x7946 */ 0xd050,
- /* key: 0x7947 */ 0x3540,
- /* key: 0x7948 */ 0x3527,
- /* key: 0x7949 */ 0x3b63,
- /* key: 0x794a */ 0xd051,
- /* key: 0x794b */ 0xd052,
- /* key: 0x794c */ 0xffff,
- /* key: 0x794d */ 0xffff,
- /* key: 0x794e */ 0xffff,
- /* key: 0x794f */ 0xd053,
- /* key: 0x7950 */ 0x4d34,
- /* key: 0x7951 */ 0xd054,
- /* key: 0x7952 */ 0xffff,
- /* key: 0x7953 */ 0x6331,
- /* key: 0x7954 */ 0xd055,
- /* key: 0x7955 */ 0x6330,
- /* key: 0x7956 */ 0x4144,
- /* key: 0x7957 */ 0x632d,
- /* key: 0x7958 */ 0xd056,
- /* key: 0x7959 */ 0xffff,
- /* key: 0x795a */ 0x632f,
- /* key: 0x795b */ 0xd057,
- /* key: 0x795c */ 0xd058,
- /* key: 0x795d */ 0x3d4b,
- /* key: 0x795e */ 0x3f40,
- /* key: 0x795f */ 0x632e,
- /* key: 0x7960 */ 0x632c,
- /* key: 0x7961 */ 0xffff,
- /* key: 0x7962 */ 0x472a,
- /* key: 0x7963 */ 0xffff,
- /* key: 0x7964 */ 0xffff,
- /* key: 0x7965 */ 0x3e4d,
- /* key: 0x7966 */ 0xffff,
- /* key: 0x7967 */ 0xd059,
- /* key: 0x7968 */ 0x493c,
- /* key: 0x7969 */ 0xd05a,
- /* key: 0x796a */ 0xffff,
- /* key: 0x796b */ 0xd05b,
- /* key: 0x796c */ 0xffff,
- /* key: 0x796d */ 0x3a57,
- /* key: 0x796e */ 0xffff,
- /* key: 0x796f */ 0xffff,
- /* key: 0x7970 */ 0xffff,
- /* key: 0x7971 */ 0xffff,
- /* key: 0x7972 */ 0xd05c,
- /* key: 0x7973 */ 0xffff,
- /* key: 0x7974 */ 0xffff,
- /* key: 0x7975 */ 0xffff,
- /* key: 0x7976 */ 0xffff,
- /* key: 0x7977 */ 0x4578,
- /* key: 0x7978 */ 0xffff,
- /* key: 0x7979 */ 0xd05d,
- /* key: 0x797a */ 0x6332,
- /* key: 0x797b */ 0xd05e,
- /* key: 0x797c */ 0xd05f,
- /* key: 0x797d */ 0xffff,
- /* key: 0x797e */ 0xd060,
- /* key: 0x797f */ 0x6333,
- /* key: 0x7980 */ 0x6349,
- /* key: 0x7981 */ 0x3658,
- /* key: 0x7982 */ 0xffff,
- /* key: 0x7983 */ 0xffff,
- /* key: 0x7984 */ 0x4f3d,
- /* key: 0x7985 */ 0x4135,
- /* key: 0x7986 */ 0xffff,
- /* key: 0x7987 */ 0xffff,
- /* key: 0x7988 */ 0xffff,
- /* key: 0x7989 */ 0xffff,
- /* key: 0x798a */ 0x6334,
- /* key: 0x798b */ 0xd061,
- /* key: 0x798c */ 0xd062,
- /* key: 0x798d */ 0x3252,
- /* key: 0x798e */ 0x4477,
- /* key: 0x798f */ 0x4a21,
- /* key: 0x7990 */ 0xffff,
- /* key: 0x7991 */ 0xd063,
- /* key: 0x7992 */ 0xffff,
- /* key: 0x7993 */ 0xd064,
- /* key: 0x7994 */ 0xd065,
- /* key: 0x7995 */ 0xd066,
- /* key: 0x7996 */ 0xd067,
- /* key: 0x7997 */ 0xffff,
- /* key: 0x7998 */ 0xd068,
- /* key: 0x7999 */ 0xffff,
- /* key: 0x799a */ 0xffff,
- /* key: 0x799b */ 0xd069,
- /* key: 0x799c */ 0xd06a,
- /* key: 0x799d */ 0x6335,
- /* key: 0x799e */ 0xffff,
- /* key: 0x799f */ 0xffff,
- /* key: 0x79a0 */ 0xffff,
- /* key: 0x79a1 */ 0xd06b,
- /* key: 0x79a2 */ 0xffff,
- /* key: 0x79a3 */ 0xffff,
- /* key: 0x79a4 */ 0xffff,
- /* key: 0x79a5 */ 0xffff,
- /* key: 0x79a6 */ 0x357a,
- /* key: 0x79a7 */ 0x6336,
- /* key: 0x79a8 */ 0xd06c,
- /* key: 0x79a9 */ 0xd06d,
- /* key: 0x79aa */ 0x6338,
- /* key: 0x79ab */ 0xd06e,
- /* key: 0x79ac */ 0xffff,
- /* key: 0x79ad */ 0xffff,
- /* key: 0x79ae */ 0x6339,
- /* key: 0x79af */ 0xd06f,
- /* key: 0x79b0 */ 0x4729,
- /* key: 0x79b1 */ 0xd070,
- /* key: 0x79b2 */ 0xffff,
- /* key: 0x79b3 */ 0x633a,
- /* key: 0x79b4 */ 0xd071,
- /* key: 0x79b5 */ 0xffff,
- /* key: 0x79b6 */ 0xffff,
- /* key: 0x79b7 */ 0xffff,
- /* key: 0x79b8 */ 0xd072,
- /* key: 0x79b9 */ 0x633b,
- /* key: 0x79ba */ 0x633c,
- /* key: 0x79bb */ 0xd073,
- /* key: 0x79bc */ 0xffff,
- /* key: 0x79bd */ 0x3659,
- /* key: 0x79be */ 0x3253,
- /* key: 0x79bf */ 0x4645,
- /* key: 0x79c0 */ 0x3d28,
- /* key: 0x79c1 */ 0x3b64,
- /* key: 0x79c2 */ 0xd074,
- /* key: 0x79c3 */ 0xffff,
- /* key: 0x79c4 */ 0xd075,
- /* key: 0x79c5 */ 0xffff,
- /* key: 0x79c6 */ 0xffff,
- /* key: 0x79c7 */ 0xd076,
- /* key: 0x79c8 */ 0xd077,
- /* key: 0x79c9 */ 0x633d,
- /* key: 0x79ca */ 0xd078,
- /* key: 0x79cb */ 0x3d29,
- /* key: 0x79cc */ 0xffff,
- /* key: 0x79cd */ 0xffff,
- /* key: 0x79ce */ 0xffff,
- /* key: 0x79cf */ 0xd079,
- /* key: 0x79d0 */ 0xffff,
- /* key: 0x79d1 */ 0x324a,
- /* key: 0x79d2 */ 0x4943,
- /* key: 0x79d3 */ 0xffff,
- /* key: 0x79d4 */ 0xd07a,
- /* key: 0x79d5 */ 0x633e,
- /* key: 0x79d6 */ 0xd07b,
- /* key: 0x79d7 */ 0xffff,
- /* key: 0x79d8 */ 0x486b,
- /* key: 0x79d9 */ 0xffff,
- /* key: 0x79da */ 0xd07c,
- /* key: 0x79db */ 0xffff,
- /* key: 0x79dc */ 0xffff,
- /* key: 0x79dd */ 0xd07d,
- /* key: 0x79de */ 0xd07e,
- /* key: 0x79df */ 0x4145,
- /* key: 0x79e0 */ 0xd121,
- /* key: 0x79e1 */ 0x6341,
- /* key: 0x79e2 */ 0xd122,
- /* key: 0x79e3 */ 0x6342,
- /* key: 0x79e4 */ 0x4769,
- /* key: 0x79e5 */ 0xd123,
- /* key: 0x79e6 */ 0x3f41,
- /* key: 0x79e7 */ 0x633f,
- /* key: 0x79e8 */ 0xffff,
- /* key: 0x79e9 */ 0x4361,
- /* key: 0x79ea */ 0xd124,
- /* key: 0x79eb */ 0xd125,
- /* key: 0x79ec */ 0x6340,
- /* key: 0x79ed */ 0xd126,
- /* key: 0x79ee */ 0xffff,
- /* key: 0x79ef */ 0xffff,
- /* key: 0x79f0 */ 0x3e4e,
- /* key: 0x79f1 */ 0xd127,
- /* key: 0x79f2 */ 0xffff,
- /* key: 0x79f3 */ 0xffff,
- /* key: 0x79f4 */ 0xffff,
- /* key: 0x79f5 */ 0xffff,
- /* key: 0x79f6 */ 0xffff,
- /* key: 0x79f7 */ 0xffff,
- /* key: 0x79f8 */ 0xd128,
- /* key: 0x79f9 */ 0xffff,
- /* key: 0x79fa */ 0xffff,
- /* key: 0x79fb */ 0x305c,
- /* key: 0x79fc */ 0xd129,
- /* key: 0x79fd */ 0xffff,
- /* key: 0x79fe */ 0xffff,
- /* key: 0x79ff */ 0xffff,
- /* branch: 0x7a0X */ 13600,
- /* branch: 0x7a1X */ 13616,
- /* branch: 0x7a2X */ 13632,
- /* branch: 0x7a3X */ 13648,
- /* branch: 0x7a4X */ 13664,
- /* branch: 0x7a5X */ 13680,
- /* branch: 0x7a6X */ 13696,
- /* branch: 0x7a7X */ 13712,
- /* branch: 0x7a8X */ 13728,
- /* branch: 0x7a9X */ 13744,
- /* branch: 0x7aaX */ 13760,
- /* branch: 0x7abX */ 13776,
- /* branch: 0x7acX */ 13792,
- /* branch: 0x7adX */ 13808,
- /* branch: 0x7aeX */ 13824,
- /* branch: 0x7afX */ 13840,
- /* key: 0x7a00 */ 0x3529,
- /* key: 0x7a01 */ 0xffff,
- /* key: 0x7a02 */ 0xd12a,
- /* key: 0x7a03 */ 0xd12b,
- /* key: 0x7a04 */ 0xffff,
- /* key: 0x7a05 */ 0xffff,
- /* key: 0x7a06 */ 0xffff,
- /* key: 0x7a07 */ 0xd12c,
- /* key: 0x7a08 */ 0x6343,
- /* key: 0x7a09 */ 0xd12d,
- /* key: 0x7a0a */ 0xd12e,
- /* key: 0x7a0b */ 0x4478,
- /* key: 0x7a0c */ 0xd12f,
- /* key: 0x7a0d */ 0x6344,
- /* key: 0x7a0e */ 0x4047,
- /* key: 0x7a0f */ 0xffff,
- /* key: 0x7a10 */ 0xffff,
- /* key: 0x7a11 */ 0xd130,
- /* key: 0x7a12 */ 0xffff,
- /* key: 0x7a13 */ 0xffff,
- /* key: 0x7a14 */ 0x4c2d,
- /* key: 0x7a15 */ 0xd131,
- /* key: 0x7a16 */ 0xffff,
- /* key: 0x7a17 */ 0x4923,
- /* key: 0x7a18 */ 0x6345,
- /* key: 0x7a19 */ 0x6346,
- /* key: 0x7a1a */ 0x4355,
- /* key: 0x7a1b */ 0xd132,
- /* key: 0x7a1c */ 0x4e47,
- /* key: 0x7a1d */ 0xffff,
- /* key: 0x7a1e */ 0xd133,
- /* key: 0x7a1f */ 0x6348,
- /* key: 0x7a20 */ 0x6347,
- /* key: 0x7a21 */ 0xd134,
- /* key: 0x7a22 */ 0xffff,
- /* key: 0x7a23 */ 0xffff,
- /* key: 0x7a24 */ 0xffff,
- /* key: 0x7a25 */ 0xffff,
- /* key: 0x7a26 */ 0xffff,
- /* key: 0x7a27 */ 0xd135,
- /* key: 0x7a28 */ 0xffff,
- /* key: 0x7a29 */ 0xffff,
- /* key: 0x7a2a */ 0xffff,
- /* key: 0x7a2b */ 0xd136,
- /* key: 0x7a2c */ 0xffff,
- /* key: 0x7a2d */ 0xd137,
- /* key: 0x7a2e */ 0x3c6f,
- /* key: 0x7a2f */ 0xd138,
- /* key: 0x7a30 */ 0xd139,
- /* key: 0x7a31 */ 0x634a,
- /* key: 0x7a32 */ 0x3070,
- /* key: 0x7a33 */ 0xffff,
- /* key: 0x7a34 */ 0xd13a,
- /* key: 0x7a35 */ 0xd13b,
- /* key: 0x7a36 */ 0xffff,
- /* key: 0x7a37 */ 0x634d,
- /* key: 0x7a38 */ 0xd13c,
- /* key: 0x7a39 */ 0xd13d,
- /* key: 0x7a3a */ 0xd13e,
- /* key: 0x7a3b */ 0x634b,
- /* key: 0x7a3c */ 0x3254,
- /* key: 0x7a3d */ 0x374e,
- /* key: 0x7a3e */ 0x634c,
- /* key: 0x7a3f */ 0x3946,
- /* key: 0x7a40 */ 0x3972,
- /* key: 0x7a41 */ 0xffff,
- /* key: 0x7a42 */ 0x4a66,
- /* key: 0x7a43 */ 0x634e,
- /* key: 0x7a44 */ 0xd13f,
- /* key: 0x7a45 */ 0xd140,
- /* key: 0x7a46 */ 0x4b54,
- /* key: 0x7a47 */ 0xd141,
- /* key: 0x7a48 */ 0xd142,
- /* key: 0x7a49 */ 0x6350,
- /* key: 0x7a4a */ 0xffff,
- /* key: 0x7a4b */ 0xffff,
- /* key: 0x7a4c */ 0xd143,
- /* key: 0x7a4d */ 0x4051,
- /* key: 0x7a4e */ 0x314f,
- /* key: 0x7a4f */ 0x323a,
- /* key: 0x7a50 */ 0x302c,
- /* key: 0x7a51 */ 0xffff,
- /* key: 0x7a52 */ 0xffff,
- /* key: 0x7a53 */ 0xffff,
- /* key: 0x7a54 */ 0xffff,
- /* key: 0x7a55 */ 0xd144,
- /* key: 0x7a56 */ 0xd145,
- /* key: 0x7a57 */ 0x634f,
- /* key: 0x7a58 */ 0xffff,
- /* key: 0x7a59 */ 0xd146,
- /* key: 0x7a5a */ 0xffff,
- /* key: 0x7a5b */ 0xffff,
- /* key: 0x7a5c */ 0xd147,
- /* key: 0x7a5d */ 0xd148,
- /* key: 0x7a5e */ 0xffff,
- /* key: 0x7a5f */ 0xd149,
- /* key: 0x7a60 */ 0xd14a,
- /* key: 0x7a61 */ 0x6351,
- /* key: 0x7a62 */ 0x6352,
- /* key: 0x7a63 */ 0x3e77,
- /* key: 0x7a64 */ 0xffff,
- /* key: 0x7a65 */ 0xd14b,
- /* key: 0x7a66 */ 0xffff,
- /* key: 0x7a67 */ 0xd14c,
- /* key: 0x7a68 */ 0xffff,
- /* key: 0x7a69 */ 0x6353,
- /* key: 0x7a6a */ 0xd14d,
- /* key: 0x7a6b */ 0x334f,
- /* key: 0x7a6c */ 0xffff,
- /* key: 0x7a6d */ 0xd14e,
- /* key: 0x7a6e */ 0xffff,
- /* key: 0x7a6f */ 0xffff,
- /* key: 0x7a70 */ 0x6355,
- /* key: 0x7a71 */ 0xffff,
- /* key: 0x7a72 */ 0xffff,
- /* key: 0x7a73 */ 0xffff,
- /* key: 0x7a74 */ 0x376a,
- /* key: 0x7a75 */ 0xd14f,
- /* key: 0x7a76 */ 0x3566,
- /* key: 0x7a77 */ 0xffff,
- /* key: 0x7a78 */ 0xd150,
- /* key: 0x7a79 */ 0x6356,
- /* key: 0x7a7a */ 0x3675,
- /* key: 0x7a7b */ 0xffff,
- /* key: 0x7a7c */ 0xffff,
- /* key: 0x7a7d */ 0x6357,
- /* key: 0x7a7e */ 0xd151,
- /* key: 0x7a7f */ 0x407c,
- /* key: 0x7a80 */ 0xd152,
- /* key: 0x7a81 */ 0x464d,
- /* key: 0x7a82 */ 0xd153,
- /* key: 0x7a83 */ 0x4060,
- /* key: 0x7a84 */ 0x3a75,
- /* key: 0x7a85 */ 0xd154,
- /* key: 0x7a86 */ 0xd155,
- /* key: 0x7a87 */ 0xffff,
- /* key: 0x7a88 */ 0x6358,
- /* key: 0x7a89 */ 0xffff,
- /* key: 0x7a8a */ 0xd156,
- /* key: 0x7a8b */ 0xd157,
- /* key: 0x7a8c */ 0xffff,
- /* key: 0x7a8d */ 0xffff,
- /* key: 0x7a8e */ 0xffff,
- /* key: 0x7a8f */ 0xffff,
- /* key: 0x7a90 */ 0xd158,
- /* key: 0x7a91 */ 0xd159,
- /* key: 0x7a92 */ 0x4362,
- /* key: 0x7a93 */ 0x416b,
- /* key: 0x7a94 */ 0xd15a,
- /* key: 0x7a95 */ 0x635a,
- /* key: 0x7a96 */ 0x635c,
- /* key: 0x7a97 */ 0x6359,
- /* key: 0x7a98 */ 0x635b,
- /* key: 0x7a99 */ 0xffff,
- /* key: 0x7a9a */ 0xffff,
- /* key: 0x7a9b */ 0xffff,
- /* key: 0x7a9c */ 0xffff,
- /* key: 0x7a9d */ 0xffff,
- /* key: 0x7a9e */ 0xd15b,
- /* key: 0x7a9f */ 0x3722,
- /* key: 0x7aa0 */ 0xd15c,
- /* key: 0x7aa1 */ 0xffff,
- /* key: 0x7aa2 */ 0xffff,
- /* key: 0x7aa3 */ 0xd15d,
- /* key: 0x7aa4 */ 0xffff,
- /* key: 0x7aa5 */ 0xffff,
- /* key: 0x7aa6 */ 0xffff,
- /* key: 0x7aa7 */ 0xffff,
- /* key: 0x7aa8 */ 0xffff,
- /* key: 0x7aa9 */ 0x635d,
- /* key: 0x7aaa */ 0x3726,
- /* key: 0x7aab */ 0xffff,
- /* key: 0x7aac */ 0xd15e,
- /* key: 0x7aad */ 0xffff,
- /* key: 0x7aae */ 0x3567,
- /* key: 0x7aaf */ 0x4d52,
- /* key: 0x7ab0 */ 0x635f,
- /* key: 0x7ab1 */ 0xffff,
- /* key: 0x7ab2 */ 0xffff,
- /* key: 0x7ab3 */ 0xd15f,
- /* key: 0x7ab4 */ 0xffff,
- /* key: 0x7ab5 */ 0xd160,
- /* key: 0x7ab6 */ 0x6360,
- /* key: 0x7ab7 */ 0xffff,
- /* key: 0x7ab8 */ 0xffff,
- /* key: 0x7ab9 */ 0xd161,
- /* key: 0x7aba */ 0x312e,
- /* key: 0x7abb */ 0xd162,
- /* key: 0x7abc */ 0xd163,
- /* key: 0x7abd */ 0xffff,
- /* key: 0x7abe */ 0xffff,
- /* key: 0x7abf */ 0x6363,
- /* key: 0x7ac0 */ 0xffff,
- /* key: 0x7ac1 */ 0xffff,
- /* key: 0x7ac2 */ 0xffff,
- /* key: 0x7ac3 */ 0x3376,
- /* key: 0x7ac4 */ 0x6362,
- /* key: 0x7ac5 */ 0x6361,
- /* key: 0x7ac6 */ 0xd164,
- /* key: 0x7ac7 */ 0x6365,
- /* key: 0x7ac8 */ 0x635e,
- /* key: 0x7ac9 */ 0xd165,
- /* key: 0x7aca */ 0x6366,
- /* key: 0x7acb */ 0x4e29,
- /* key: 0x7acc */ 0xd166,
- /* key: 0x7acd */ 0x6367,
- /* key: 0x7ace */ 0xd167,
- /* key: 0x7acf */ 0x6368,
- /* key: 0x7ad0 */ 0xffff,
- /* key: 0x7ad1 */ 0xd168,
- /* key: 0x7ad2 */ 0x5474,
- /* key: 0x7ad3 */ 0x636a,
- /* key: 0x7ad4 */ 0xffff,
- /* key: 0x7ad5 */ 0x6369,
- /* key: 0x7ad6 */ 0xffff,
- /* key: 0x7ad7 */ 0xffff,
- /* key: 0x7ad8 */ 0xffff,
- /* key: 0x7ad9 */ 0x636b,
- /* key: 0x7ada */ 0x636c,
- /* key: 0x7adb */ 0xd169,
- /* key: 0x7adc */ 0x4e35,
- /* key: 0x7add */ 0x636d,
- /* key: 0x7ade */ 0xffff,
- /* key: 0x7adf */ 0x706f,
- /* key: 0x7ae0 */ 0x3e4f,
- /* key: 0x7ae1 */ 0x636e,
- /* key: 0x7ae2 */ 0x636f,
- /* key: 0x7ae3 */ 0x3d57,
- /* key: 0x7ae4 */ 0xffff,
- /* key: 0x7ae5 */ 0x4638,
- /* key: 0x7ae6 */ 0x6370,
- /* key: 0x7ae7 */ 0xffff,
- /* key: 0x7ae8 */ 0xd16a,
- /* key: 0x7ae9 */ 0xd16b,
- /* key: 0x7aea */ 0x4328,
- /* key: 0x7aeb */ 0xd16c,
- /* key: 0x7aec */ 0xd16d,
- /* key: 0x7aed */ 0x6371,
- /* key: 0x7aee */ 0xffff,
- /* key: 0x7aef */ 0x433c,
- /* key: 0x7af0 */ 0x6372,
- /* key: 0x7af1 */ 0xd16e,
- /* key: 0x7af2 */ 0xffff,
- /* key: 0x7af3 */ 0xffff,
- /* key: 0x7af4 */ 0xd16f,
- /* key: 0x7af5 */ 0xffff,
- /* key: 0x7af6 */ 0x3625,
- /* key: 0x7af7 */ 0xffff,
- /* key: 0x7af8 */ 0x513f,
- /* key: 0x7af9 */ 0x435d,
- /* key: 0x7afa */ 0x3c33,
- /* key: 0x7afb */ 0xd170,
- /* key: 0x7afc */ 0xffff,
- /* key: 0x7afd */ 0xd171,
- /* key: 0x7afe */ 0xd172,
- /* key: 0x7aff */ 0x3448,
- /* branch: 0x7b0X */ 13872,
- /* branch: 0x7b1X */ 13888,
- /* branch: 0x7b2X */ 13904,
- /* branch: 0x7b3X */ 13920,
- /* branch: 0x7b4X */ 13936,
- /* branch: 0x7b5X */ 13952,
- /* branch: 0x7b6X */ 13968,
- /* branch: 0x7b7X */ 13984,
- /* branch: 0x7b8X */ 14000,
- /* branch: 0x7b9X */ 14016,
- /* branch: 0x7baX */ 14032,
- /* branch: 0x7bbX */ 14048,
- /* branch: 0x7bcX */ 14064,
- /* branch: 0x7bdX */ 14080,
- /* branch: 0x7beX */ 14096,
- /* branch: 0x7bfX */ 14112,
- /* key: 0x7b00 */ 0xffff,
- /* key: 0x7b01 */ 0xffff,
- /* key: 0x7b02 */ 0x6373,
- /* key: 0x7b03 */ 0xffff,
- /* key: 0x7b04 */ 0x6422,
- /* key: 0x7b05 */ 0xffff,
- /* key: 0x7b06 */ 0x6376,
- /* key: 0x7b07 */ 0xd173,
- /* key: 0x7b08 */ 0x3568,
- /* key: 0x7b09 */ 0xffff,
- /* key: 0x7b0a */ 0x6375,
- /* key: 0x7b0b */ 0x6424,
- /* key: 0x7b0c */ 0xffff,
- /* key: 0x7b0d */ 0xffff,
- /* key: 0x7b0e */ 0xffff,
- /* key: 0x7b0f */ 0x6374,
- /* key: 0x7b10 */ 0xffff,
- /* key: 0x7b11 */ 0x3e50,
- /* key: 0x7b12 */ 0xffff,
- /* key: 0x7b13 */ 0xffff,
- /* key: 0x7b14 */ 0xd174,
- /* key: 0x7b15 */ 0xffff,
- /* key: 0x7b16 */ 0xffff,
- /* key: 0x7b17 */ 0xffff,
- /* key: 0x7b18 */ 0x6378,
- /* key: 0x7b19 */ 0x6379,
- /* key: 0x7b1a */ 0xffff,
- /* key: 0x7b1b */ 0x452b,
- /* key: 0x7b1c */ 0xffff,
- /* key: 0x7b1d */ 0xffff,
- /* key: 0x7b1e */ 0x637a,
- /* key: 0x7b1f */ 0xd175,
- /* key: 0x7b20 */ 0x335e,
- /* key: 0x7b21 */ 0xffff,
- /* key: 0x7b22 */ 0xffff,
- /* key: 0x7b23 */ 0xd176,
- /* key: 0x7b24 */ 0xffff,
- /* key: 0x7b25 */ 0x3f5a,
- /* key: 0x7b26 */ 0x4964,
- /* key: 0x7b27 */ 0xd177,
- /* key: 0x7b28 */ 0x637c,
- /* key: 0x7b29 */ 0xd178,
- /* key: 0x7b2a */ 0xd179,
- /* key: 0x7b2b */ 0xd17a,
- /* key: 0x7b2c */ 0x4268,
- /* key: 0x7b2d */ 0xd17b,
- /* key: 0x7b2e */ 0xd17c,
- /* key: 0x7b2f */ 0xd17d,
- /* key: 0x7b30 */ 0xd17e,
- /* key: 0x7b31 */ 0xd221,
- /* key: 0x7b32 */ 0xffff,
- /* key: 0x7b33 */ 0x6377,
- /* key: 0x7b34 */ 0xd222,
- /* key: 0x7b35 */ 0x637b,
- /* key: 0x7b36 */ 0x637d,
- /* key: 0x7b37 */ 0xffff,
- /* key: 0x7b38 */ 0xffff,
- /* key: 0x7b39 */ 0x3a7b,
- /* key: 0x7b3a */ 0xffff,
- /* key: 0x7b3b */ 0xffff,
- /* key: 0x7b3c */ 0xffff,
- /* key: 0x7b3d */ 0xd223,
- /* key: 0x7b3e */ 0xffff,
- /* key: 0x7b3f */ 0xd224,
- /* key: 0x7b40 */ 0xd225,
- /* key: 0x7b41 */ 0xd226,
- /* key: 0x7b42 */ 0xffff,
- /* key: 0x7b43 */ 0xffff,
- /* key: 0x7b44 */ 0xffff,
- /* key: 0x7b45 */ 0x6426,
- /* key: 0x7b46 */ 0x492e,
- /* key: 0x7b47 */ 0xd227,
- /* key: 0x7b48 */ 0x4826,
- /* key: 0x7b49 */ 0x4579,
- /* key: 0x7b4a */ 0xffff,
- /* key: 0x7b4b */ 0x365a,
- /* key: 0x7b4c */ 0x6425,
- /* key: 0x7b4d */ 0x6423,
- /* key: 0x7b4e */ 0xd228,
- /* key: 0x7b4f */ 0x4835,
- /* key: 0x7b50 */ 0x637e,
- /* key: 0x7b51 */ 0x435e,
- /* key: 0x7b52 */ 0x457b,
- /* key: 0x7b53 */ 0xffff,
- /* key: 0x7b54 */ 0x457a,
- /* key: 0x7b55 */ 0xd229,
- /* key: 0x7b56 */ 0x3a76,
- /* key: 0x7b57 */ 0xffff,
- /* key: 0x7b58 */ 0xffff,
- /* key: 0x7b59 */ 0xffff,
- /* key: 0x7b5a */ 0xffff,
- /* key: 0x7b5b */ 0xffff,
- /* key: 0x7b5c */ 0xffff,
- /* key: 0x7b5d */ 0x6438,
- /* key: 0x7b5e */ 0xffff,
- /* key: 0x7b5f */ 0xffff,
- /* key: 0x7b60 */ 0xd22a,
- /* key: 0x7b61 */ 0xffff,
- /* key: 0x7b62 */ 0xffff,
- /* key: 0x7b63 */ 0xffff,
- /* key: 0x7b64 */ 0xd22b,
- /* key: 0x7b65 */ 0x6428,
- /* key: 0x7b66 */ 0xd22c,
- /* key: 0x7b67 */ 0x642a,
- /* key: 0x7b68 */ 0xffff,
- /* key: 0x7b69 */ 0xd22d,
- /* key: 0x7b6a */ 0xd22e,
- /* key: 0x7b6b */ 0xffff,
- /* key: 0x7b6c */ 0x642d,
- /* key: 0x7b6d */ 0xd22f,
- /* key: 0x7b6e */ 0x642e,
- /* key: 0x7b6f */ 0xd230,
- /* key: 0x7b70 */ 0x642b,
- /* key: 0x7b71 */ 0x642c,
- /* key: 0x7b72 */ 0xd231,
- /* key: 0x7b73 */ 0xd232,
- /* key: 0x7b74 */ 0x6429,
- /* key: 0x7b75 */ 0x6427,
- /* key: 0x7b76 */ 0xffff,
- /* key: 0x7b77 */ 0xd233,
- /* key: 0x7b78 */ 0xffff,
- /* key: 0x7b79 */ 0xffff,
- /* key: 0x7b7a */ 0x6421,
- /* key: 0x7b7b */ 0xffff,
- /* key: 0x7b7c */ 0xffff,
- /* key: 0x7b7d */ 0xffff,
- /* key: 0x7b7e */ 0xffff,
- /* key: 0x7b7f */ 0xffff,
- /* key: 0x7b80 */ 0xffff,
- /* key: 0x7b81 */ 0xffff,
- /* key: 0x7b82 */ 0xffff,
- /* key: 0x7b83 */ 0xffff,
- /* key: 0x7b84 */ 0xd234,
- /* key: 0x7b85 */ 0xffff,
- /* key: 0x7b86 */ 0x4a4f,
- /* key: 0x7b87 */ 0x3255,
- /* key: 0x7b88 */ 0xffff,
- /* key: 0x7b89 */ 0xd235,
- /* key: 0x7b8a */ 0xffff,
- /* key: 0x7b8b */ 0x6435,
- /* key: 0x7b8c */ 0xffff,
- /* key: 0x7b8d */ 0x6432,
- /* key: 0x7b8e */ 0xd236,
- /* key: 0x7b8f */ 0x6437,
- /* key: 0x7b90 */ 0xd237,
- /* key: 0x7b91 */ 0xd238,
- /* key: 0x7b92 */ 0x6436,
- /* key: 0x7b93 */ 0xffff,
- /* key: 0x7b94 */ 0x4773,
- /* key: 0x7b95 */ 0x4c27,
- /* key: 0x7b96 */ 0xd239,
- /* key: 0x7b97 */ 0x3b3b,
- /* key: 0x7b98 */ 0x6430,
- /* key: 0x7b99 */ 0x6439,
- /* key: 0x7b9a */ 0x6434,
- /* key: 0x7b9b */ 0xd23a,
- /* key: 0x7b9c */ 0x6433,
- /* key: 0x7b9d */ 0x642f,
- /* key: 0x7b9e */ 0xd23b,
- /* key: 0x7b9f */ 0x6431,
- /* key: 0x7ba0 */ 0xd23c,
- /* key: 0x7ba1 */ 0x3449,
- /* key: 0x7ba2 */ 0xffff,
- /* key: 0x7ba3 */ 0xffff,
- /* key: 0x7ba4 */ 0xffff,
- /* key: 0x7ba5 */ 0xd23d,
- /* key: 0x7ba6 */ 0xffff,
- /* key: 0x7ba7 */ 0xffff,
- /* key: 0x7ba8 */ 0xffff,
- /* key: 0x7ba9 */ 0xffff,
- /* key: 0x7baa */ 0x433d,
- /* key: 0x7bab */ 0xffff,
- /* key: 0x7bac */ 0xd23e,
- /* key: 0x7bad */ 0x407d,
- /* key: 0x7bae */ 0xffff,
- /* key: 0x7baf */ 0xd23f,
- /* key: 0x7bb0 */ 0xd240,
- /* key: 0x7bb1 */ 0x4822,
- /* key: 0x7bb2 */ 0xd241,
- /* key: 0x7bb3 */ 0xffff,
- /* key: 0x7bb4 */ 0x643e,
- /* key: 0x7bb5 */ 0xd242,
- /* key: 0x7bb6 */ 0xd243,
- /* key: 0x7bb7 */ 0xffff,
- /* key: 0x7bb8 */ 0x4824,
- /* key: 0x7bb9 */ 0xffff,
- /* key: 0x7bba */ 0xd244,
- /* key: 0x7bbb */ 0xd245,
- /* key: 0x7bbc */ 0xd246,
- /* key: 0x7bbd */ 0xd247,
- /* key: 0x7bbe */ 0xffff,
- /* key: 0x7bbf */ 0xffff,
- /* key: 0x7bc0 */ 0x4061,
- /* key: 0x7bc1 */ 0x643b,
- /* key: 0x7bc2 */ 0xd248,
- /* key: 0x7bc3 */ 0xffff,
- /* key: 0x7bc4 */ 0x484f,
- /* key: 0x7bc5 */ 0xd249,
- /* key: 0x7bc6 */ 0x643f,
- /* key: 0x7bc7 */ 0x4a53,
- /* key: 0x7bc8 */ 0xd24a,
- /* key: 0x7bc9 */ 0x435b,
- /* key: 0x7bca */ 0xd24b,
- /* key: 0x7bcb */ 0x643a,
- /* key: 0x7bcc */ 0x643c,
- /* key: 0x7bcd */ 0xffff,
- /* key: 0x7bce */ 0xffff,
- /* key: 0x7bcf */ 0x643d,
- /* key: 0x7bd0 */ 0xffff,
- /* key: 0x7bd1 */ 0xffff,
- /* key: 0x7bd2 */ 0xffff,
- /* key: 0x7bd3 */ 0xffff,
- /* key: 0x7bd4 */ 0xd24c,
- /* key: 0x7bd5 */ 0xffff,
- /* key: 0x7bd6 */ 0xd24d,
- /* key: 0x7bd7 */ 0xd24e,
- /* key: 0x7bd8 */ 0xffff,
- /* key: 0x7bd9 */ 0xd24f,
- /* key: 0x7bda */ 0xd250,
- /* key: 0x7bdb */ 0xd251,
- /* key: 0x7bdc */ 0xffff,
- /* key: 0x7bdd */ 0x6440,
- /* key: 0x7bde */ 0xffff,
- /* key: 0x7bdf */ 0xffff,
- /* key: 0x7be0 */ 0x3c44,
- /* key: 0x7be1 */ 0xffff,
- /* key: 0x7be2 */ 0xffff,
- /* key: 0x7be3 */ 0xffff,
- /* key: 0x7be4 */ 0x4646,
- /* key: 0x7be5 */ 0x6445,
- /* key: 0x7be6 */ 0x6444,
- /* key: 0x7be7 */ 0xffff,
- /* key: 0x7be8 */ 0xd252,
- /* key: 0x7be9 */ 0x6441,
- /* key: 0x7bea */ 0xd253,
- /* key: 0x7beb */ 0xffff,
- /* key: 0x7bec */ 0xffff,
- /* key: 0x7bed */ 0x4f36,
- /* key: 0x7bee */ 0xffff,
- /* key: 0x7bef */ 0xffff,
- /* key: 0x7bf0 */ 0xffff,
- /* key: 0x7bf1 */ 0xffff,
- /* key: 0x7bf2 */ 0xd254,
- /* key: 0x7bf3 */ 0x644a,
- /* key: 0x7bf4 */ 0xd255,
- /* key: 0x7bf5 */ 0xd256,
- /* key: 0x7bf6 */ 0x644e,
- /* key: 0x7bf7 */ 0x644b,
- /* key: 0x7bf8 */ 0xd257,
- /* key: 0x7bf9 */ 0xd258,
- /* key: 0x7bfa */ 0xd259,
- /* key: 0x7bfb */ 0xffff,
- /* key: 0x7bfc */ 0xd25a,
- /* key: 0x7bfd */ 0xffff,
- /* key: 0x7bfe */ 0xd25b,
- /* key: 0x7bff */ 0xffff,
- /* branch: 0x7c0X */ 14144,
- /* branch: 0x7c1X */ 14160,
- /* branch: 0x7c2X */ 14176,
- /* branch: 0x7c3X */ 14192,
- /* branch: 0x7c4X */ 14208,
- /* branch: 0x7c5X */ 14224,
- /* branch: 0x7c6X */ 14240,
- /* branch: 0x7c7X */ 14256,
- /* branch: 0x7c8X */ 14272,
- /* branch: 0x7c9X */ 14288,
- /* branch: 0x7caX */ 14304,
- /* branch: 0x7cbX */ 14320,
- /* branch: 0x7ccX */ 14336,
- /* branch: 0x7cdX */ 14352,
- /* branch: 0x7ceX */ 14368,
- /* branch: 0x7cfX */ 14384,
- /* key: 0x7c00 */ 0x6447,
- /* key: 0x7c01 */ 0xd25c,
- /* key: 0x7c02 */ 0xd25d,
- /* key: 0x7c03 */ 0xd25e,
- /* key: 0x7c04 */ 0xd25f,
- /* key: 0x7c05 */ 0xffff,
- /* key: 0x7c06 */ 0xd260,
- /* key: 0x7c07 */ 0x6448,
- /* key: 0x7c08 */ 0xffff,
- /* key: 0x7c09 */ 0xd261,
- /* key: 0x7c0a */ 0xffff,
- /* key: 0x7c0b */ 0xd262,
- /* key: 0x7c0c */ 0xd263,
- /* key: 0x7c0d */ 0x644d,
- /* key: 0x7c0e */ 0xd264,
- /* key: 0x7c0f */ 0xd265,
- /* key: 0x7c10 */ 0xffff,
- /* key: 0x7c11 */ 0x6442,
- /* key: 0x7c12 */ 0x5255,
- /* key: 0x7c13 */ 0x6449,
- /* key: 0x7c14 */ 0x6443,
- /* key: 0x7c15 */ 0xffff,
- /* key: 0x7c16 */ 0xffff,
- /* key: 0x7c17 */ 0x644c,
- /* key: 0x7c18 */ 0xffff,
- /* key: 0x7c19 */ 0xd266,
- /* key: 0x7c1a */ 0xffff,
- /* key: 0x7c1b */ 0xd267,
- /* key: 0x7c1c */ 0xffff,
- /* key: 0x7c1d */ 0xffff,
- /* key: 0x7c1e */ 0xffff,
- /* key: 0x7c1f */ 0x6452,
- /* key: 0x7c20 */ 0xd268,
- /* key: 0x7c21 */ 0x344a,
- /* key: 0x7c22 */ 0xffff,
- /* key: 0x7c23 */ 0x644f,
- /* key: 0x7c24 */ 0xffff,
- /* key: 0x7c25 */ 0xd269,
- /* key: 0x7c26 */ 0xd26a,
- /* key: 0x7c27 */ 0x6450,
- /* key: 0x7c28 */ 0xd26b,
- /* key: 0x7c29 */ 0xffff,
- /* key: 0x7c2a */ 0x6451,
- /* key: 0x7c2b */ 0x6454,
- /* key: 0x7c2c */ 0xd26c,
- /* key: 0x7c2d */ 0xffff,
- /* key: 0x7c2e */ 0xffff,
- /* key: 0x7c2f */ 0xffff,
- /* key: 0x7c30 */ 0xffff,
- /* key: 0x7c31 */ 0xd26d,
- /* key: 0x7c32 */ 0xffff,
- /* key: 0x7c33 */ 0xd26e,
- /* key: 0x7c34 */ 0xd26f,
- /* key: 0x7c35 */ 0xffff,
- /* key: 0x7c36 */ 0xd270,
- /* key: 0x7c37 */ 0x6453,
- /* key: 0x7c38 */ 0x4876,
- /* key: 0x7c39 */ 0xd271,
- /* key: 0x7c3a */ 0xd272,
- /* key: 0x7c3b */ 0xffff,
- /* key: 0x7c3c */ 0xffff,
- /* key: 0x7c3d */ 0x6455,
- /* key: 0x7c3e */ 0x4e7c,
- /* key: 0x7c3f */ 0x4a6d,
- /* key: 0x7c40 */ 0x645a,
- /* key: 0x7c41 */ 0xffff,
- /* key: 0x7c42 */ 0xffff,
- /* key: 0x7c43 */ 0x6457,
- /* key: 0x7c44 */ 0xffff,
- /* key: 0x7c45 */ 0xffff,
- /* key: 0x7c46 */ 0xd273,
- /* key: 0x7c47 */ 0xffff,
- /* key: 0x7c48 */ 0xffff,
- /* key: 0x7c49 */ 0xffff,
- /* key: 0x7c4a */ 0xd274,
- /* key: 0x7c4b */ 0xffff,
- /* key: 0x7c4c */ 0x6456,
- /* key: 0x7c4d */ 0x4052,
- /* key: 0x7c4e */ 0xffff,
- /* key: 0x7c4f */ 0x6459,
- /* key: 0x7c50 */ 0x645b,
- /* key: 0x7c51 */ 0xd276,
- /* key: 0x7c52 */ 0xd277,
- /* key: 0x7c53 */ 0xd278,
- /* key: 0x7c54 */ 0x6458,
- /* key: 0x7c55 */ 0xd275,
- /* key: 0x7c56 */ 0x645f,
- /* key: 0x7c57 */ 0xffff,
- /* key: 0x7c58 */ 0x645c,
- /* key: 0x7c59 */ 0xd279,
- /* key: 0x7c5a */ 0xd27a,
- /* key: 0x7c5b */ 0xd27b,
- /* key: 0x7c5c */ 0xd27c,
- /* key: 0x7c5d */ 0xd27d,
- /* key: 0x7c5e */ 0xd27e,
- /* key: 0x7c5f */ 0x645d,
- /* key: 0x7c60 */ 0x6446,
- /* key: 0x7c61 */ 0xd321,
- /* key: 0x7c62 */ 0xffff,
- /* key: 0x7c63 */ 0xd322,
- /* key: 0x7c64 */ 0x645e,
- /* key: 0x7c65 */ 0x6460,
- /* key: 0x7c66 */ 0xffff,
- /* key: 0x7c67 */ 0xd323,
- /* key: 0x7c68 */ 0xffff,
- /* key: 0x7c69 */ 0xd324,
- /* key: 0x7c6a */ 0xffff,
- /* key: 0x7c6b */ 0xffff,
- /* key: 0x7c6c */ 0x6461,
- /* key: 0x7c6d */ 0xd325,
- /* key: 0x7c6e */ 0xd326,
- /* key: 0x7c6f */ 0xffff,
- /* key: 0x7c70 */ 0xd327,
- /* key: 0x7c71 */ 0xffff,
- /* key: 0x7c72 */ 0xd328,
- /* key: 0x7c73 */ 0x4a46,
- /* key: 0x7c74 */ 0xffff,
- /* key: 0x7c75 */ 0x6462,
- /* key: 0x7c76 */ 0xffff,
- /* key: 0x7c77 */ 0xffff,
- /* key: 0x7c78 */ 0xffff,
- /* key: 0x7c79 */ 0xd329,
- /* key: 0x7c7a */ 0xffff,
- /* key: 0x7c7b */ 0xffff,
- /* key: 0x7c7c */ 0xd32a,
- /* key: 0x7c7d */ 0xd32b,
- /* key: 0x7c7e */ 0x4c62,
- /* key: 0x7c7f */ 0xffff,
- /* key: 0x7c80 */ 0xffff,
- /* key: 0x7c81 */ 0x364e,
- /* key: 0x7c82 */ 0x3729,
- /* key: 0x7c83 */ 0x6463,
- /* key: 0x7c84 */ 0xffff,
- /* key: 0x7c85 */ 0xffff,
- /* key: 0x7c86 */ 0xd32c,
- /* key: 0x7c87 */ 0xd32d,
- /* key: 0x7c88 */ 0xffff,
- /* key: 0x7c89 */ 0x4a34,
- /* key: 0x7c8a */ 0xffff,
- /* key: 0x7c8b */ 0x3f68,
- /* key: 0x7c8c */ 0xffff,
- /* key: 0x7c8d */ 0x4c30,
- /* key: 0x7c8e */ 0xffff,
- /* key: 0x7c8f */ 0xd32e,
- /* key: 0x7c90 */ 0x6464,
- /* key: 0x7c91 */ 0xffff,
- /* key: 0x7c92 */ 0x4e33,
- /* key: 0x7c93 */ 0xffff,
- /* key: 0x7c94 */ 0xd32f,
- /* key: 0x7c95 */ 0x4774,
- /* key: 0x7c96 */ 0xffff,
- /* key: 0x7c97 */ 0x4146,
- /* key: 0x7c98 */ 0x4734,
- /* key: 0x7c99 */ 0xffff,
- /* key: 0x7c9a */ 0xffff,
- /* key: 0x7c9b */ 0x3d4d,
- /* key: 0x7c9c */ 0xffff,
- /* key: 0x7c9d */ 0xffff,
- /* key: 0x7c9e */ 0xd330,
- /* key: 0x7c9f */ 0x3040,
- /* key: 0x7ca0 */ 0xd331,
- /* key: 0x7ca1 */ 0x6469,
- /* key: 0x7ca2 */ 0x6467,
- /* key: 0x7ca3 */ 0xffff,
- /* key: 0x7ca4 */ 0x6465,
- /* key: 0x7ca5 */ 0x3421,
- /* key: 0x7ca6 */ 0xd332,
- /* key: 0x7ca7 */ 0x3e51,
- /* key: 0x7ca8 */ 0x646a,
- /* key: 0x7ca9 */ 0xffff,
- /* key: 0x7caa */ 0xffff,
- /* key: 0x7cab */ 0x6468,
- /* key: 0x7cac */ 0xffff,
- /* key: 0x7cad */ 0x6466,
- /* key: 0x7cae */ 0x646e,
- /* key: 0x7caf */ 0xffff,
- /* key: 0x7cb0 */ 0xd333,
- /* key: 0x7cb1 */ 0x646d,
- /* key: 0x7cb2 */ 0x646c,
- /* key: 0x7cb3 */ 0x646b,
- /* key: 0x7cb4 */ 0xffff,
- /* key: 0x7cb5 */ 0xffff,
- /* key: 0x7cb6 */ 0xd334,
- /* key: 0x7cb7 */ 0xd335,
- /* key: 0x7cb8 */ 0xffff,
- /* key: 0x7cb9 */ 0x646f,
- /* key: 0x7cba */ 0xd336,
- /* key: 0x7cbb */ 0xd337,
- /* key: 0x7cbc */ 0xd338,
- /* key: 0x7cbd */ 0x6470,
- /* key: 0x7cbe */ 0x403a,
- /* key: 0x7cbf */ 0xd339,
- /* key: 0x7cc0 */ 0x6471,
- /* key: 0x7cc1 */ 0xffff,
- /* key: 0x7cc2 */ 0x6473,
- /* key: 0x7cc3 */ 0xffff,
- /* key: 0x7cc4 */ 0xd33a,
- /* key: 0x7cc5 */ 0x6472,
- /* key: 0x7cc6 */ 0xffff,
- /* key: 0x7cc7 */ 0xd33b,
- /* key: 0x7cc8 */ 0xd33c,
- /* key: 0x7cc9 */ 0xd33d,
- /* key: 0x7cca */ 0x3852,
- /* key: 0x7ccb */ 0xffff,
- /* key: 0x7ccc */ 0xffff,
- /* key: 0x7ccd */ 0xd33e,
- /* key: 0x7cce */ 0x4138,
- /* key: 0x7ccf */ 0xd33f,
- /* key: 0x7cd0 */ 0xffff,
- /* key: 0x7cd1 */ 0xffff,
- /* key: 0x7cd2 */ 0x6475,
- /* key: 0x7cd3 */ 0xd340,
- /* key: 0x7cd4 */ 0xd341,
- /* key: 0x7cd5 */ 0xd342,
- /* key: 0x7cd6 */ 0x457c,
- /* key: 0x7cd7 */ 0xd343,
- /* key: 0x7cd8 */ 0x6474,
- /* key: 0x7cd9 */ 0xd344,
- /* key: 0x7cda */ 0xd345,
- /* key: 0x7cdb */ 0xffff,
- /* key: 0x7cdc */ 0x6476,
- /* key: 0x7cdd */ 0xd346,
- /* key: 0x7cde */ 0x4a35,
- /* key: 0x7cdf */ 0x416c,
- /* key: 0x7ce0 */ 0x3947,
- /* key: 0x7ce1 */ 0xffff,
- /* key: 0x7ce2 */ 0x6477,
- /* key: 0x7ce3 */ 0xffff,
- /* key: 0x7ce4 */ 0xffff,
- /* key: 0x7ce5 */ 0xffff,
- /* key: 0x7ce6 */ 0xd347,
- /* key: 0x7ce7 */ 0x4e48,
- /* key: 0x7ce8 */ 0xffff,
- /* key: 0x7ce9 */ 0xd348,
- /* key: 0x7cea */ 0xffff,
- /* key: 0x7ceb */ 0xd349,
- /* key: 0x7cec */ 0xffff,
- /* key: 0x7ced */ 0xffff,
- /* key: 0x7cee */ 0xffff,
- /* key: 0x7cef */ 0x6479,
- /* key: 0x7cf0 */ 0xffff,
- /* key: 0x7cf1 */ 0xffff,
- /* key: 0x7cf2 */ 0x647a,
- /* key: 0x7cf3 */ 0xffff,
- /* key: 0x7cf4 */ 0x647b,
- /* key: 0x7cf5 */ 0xd34a,
- /* key: 0x7cf6 */ 0x647c,
- /* key: 0x7cf7 */ 0xffff,
- /* key: 0x7cf8 */ 0x3b65,
- /* key: 0x7cf9 */ 0xffff,
- /* key: 0x7cfa */ 0x647d,
- /* key: 0x7cfb */ 0x374f,
- /* key: 0x7cfc */ 0xffff,
- /* key: 0x7cfd */ 0xffff,
- /* key: 0x7cfe */ 0x356a,
- /* key: 0x7cff */ 0xffff,
- /* branch: 0x7d0X */ 14416,
- /* branch: 0x7d1X */ 14432,
- /* branch: 0x7d2X */ 14448,
- /* branch: 0x7d3X */ 14464,
- /* branch: 0x7d4X */ 14480,
- /* branch: 0x7d5X */ 14496,
- /* branch: 0x7d6X */ 14512,
- /* branch: 0x7d7X */ 14528,
- /* branch: 0x7d8X */ 14544,
- /* branch: 0x7d9X */ 14560,
- /* branch: 0x7daX */ 14576,
- /* branch: 0x7dbX */ 14592,
- /* branch: 0x7dcX */ 14608,
- /* branch: 0x7ddX */ 14624,
- /* branch: 0x7deX */ 14640,
- /* branch: 0x7dfX */ 14656,
- /* key: 0x7d00 */ 0x352a,
- /* key: 0x7d01 */ 0xffff,
- /* key: 0x7d02 */ 0x6521,
- /* key: 0x7d03 */ 0xd34b,
- /* key: 0x7d04 */ 0x4c73,
- /* key: 0x7d05 */ 0x3948,
- /* key: 0x7d06 */ 0x647e,
- /* key: 0x7d07 */ 0xd34c,
- /* key: 0x7d08 */ 0xd34d,
- /* key: 0x7d09 */ 0xd34e,
- /* key: 0x7d0a */ 0x6524,
- /* key: 0x7d0b */ 0x4c66,
- /* key: 0x7d0c */ 0xffff,
- /* key: 0x7d0d */ 0x473c,
- /* key: 0x7d0e */ 0xffff,
- /* key: 0x7d0f */ 0xd34f,
- /* key: 0x7d10 */ 0x4933,
- /* key: 0x7d11 */ 0xd350,
- /* key: 0x7d12 */ 0xd351,
- /* key: 0x7d13 */ 0xd352,
- /* key: 0x7d14 */ 0x3d63,
- /* key: 0x7d15 */ 0x6523,
- /* key: 0x7d16 */ 0xd353,
- /* key: 0x7d17 */ 0x3c53,
- /* key: 0x7d18 */ 0x3949,
- /* key: 0x7d19 */ 0x3b66,
- /* key: 0x7d1a */ 0x3569,
- /* key: 0x7d1b */ 0x4a36,
- /* key: 0x7d1c */ 0x6522,
- /* key: 0x7d1d */ 0xd354,
- /* key: 0x7d1e */ 0xd355,
- /* key: 0x7d1f */ 0xffff,
- /* key: 0x7d20 */ 0x4147,
- /* key: 0x7d21 */ 0x4b42,
- /* key: 0x7d22 */ 0x3a77,
- /* key: 0x7d23 */ 0xd356,
- /* key: 0x7d24 */ 0xffff,
- /* key: 0x7d25 */ 0xffff,
- /* key: 0x7d26 */ 0xd357,
- /* key: 0x7d27 */ 0xffff,
- /* key: 0x7d28 */ 0xffff,
- /* key: 0x7d29 */ 0xffff,
- /* key: 0x7d2a */ 0xd358,
- /* key: 0x7d2b */ 0x3b67,
- /* key: 0x7d2c */ 0x445d,
- /* key: 0x7d2d */ 0xd359,
- /* key: 0x7d2e */ 0x6527,
- /* key: 0x7d2f */ 0x4e5f,
- /* key: 0x7d30 */ 0x3a59,
- /* key: 0x7d31 */ 0xd35a,
- /* key: 0x7d32 */ 0x6528,
- /* key: 0x7d33 */ 0x3f42,
- /* key: 0x7d34 */ 0xffff,
- /* key: 0x7d35 */ 0x652a,
- /* key: 0x7d36 */ 0xffff,
- /* key: 0x7d37 */ 0xffff,
- /* key: 0x7d38 */ 0xffff,
- /* key: 0x7d39 */ 0x3e52,
- /* key: 0x7d3a */ 0x3a30,
- /* key: 0x7d3b */ 0xffff,
- /* key: 0x7d3c */ 0xd35b,
- /* key: 0x7d3d */ 0xd35c,
- /* key: 0x7d3e */ 0xd35d,
- /* key: 0x7d3f */ 0x6529,
- /* key: 0x7d40 */ 0xd35e,
- /* key: 0x7d41 */ 0xd35f,
- /* key: 0x7d42 */ 0x3d2a,
- /* key: 0x7d43 */ 0x383e,
- /* key: 0x7d44 */ 0x4148,
- /* key: 0x7d45 */ 0x6525,
- /* key: 0x7d46 */ 0x652b,
- /* key: 0x7d47 */ 0xd360,
- /* key: 0x7d48 */ 0xd361,
- /* key: 0x7d49 */ 0xffff,
- /* key: 0x7d4a */ 0xffff,
- /* key: 0x7d4b */ 0x6526,
- /* key: 0x7d4c */ 0x3750,
- /* key: 0x7d4d */ 0xd362,
- /* key: 0x7d4e */ 0x652e,
- /* key: 0x7d4f */ 0x6532,
- /* key: 0x7d50 */ 0x376b,
- /* key: 0x7d51 */ 0xd363,
- /* key: 0x7d52 */ 0xffff,
- /* key: 0x7d53 */ 0xd364,
- /* key: 0x7d54 */ 0xffff,
- /* key: 0x7d55 */ 0xffff,
- /* key: 0x7d56 */ 0x652d,
- /* key: 0x7d57 */ 0xd365,
- /* key: 0x7d58 */ 0xffff,
- /* key: 0x7d59 */ 0xd366,
- /* key: 0x7d5a */ 0xd367,
- /* key: 0x7d5b */ 0x6536,
- /* key: 0x7d5c */ 0xd368,
- /* key: 0x7d5d */ 0xd369,
- /* key: 0x7d5e */ 0x394a,
- /* key: 0x7d5f */ 0xffff,
- /* key: 0x7d60 */ 0xffff,
- /* key: 0x7d61 */ 0x4d6d,
- /* key: 0x7d62 */ 0x303c,
- /* key: 0x7d63 */ 0x6533,
- /* key: 0x7d64 */ 0xffff,
- /* key: 0x7d65 */ 0xd36a,
- /* key: 0x7d66 */ 0x356b,
- /* key: 0x7d67 */ 0xd36b,
- /* key: 0x7d68 */ 0x6530,
- /* key: 0x7d69 */ 0xffff,
- /* key: 0x7d6a */ 0xd36c,
- /* key: 0x7d6b */ 0xffff,
- /* key: 0x7d6c */ 0xffff,
- /* key: 0x7d6d */ 0xffff,
- /* key: 0x7d6e */ 0x6531,
- /* key: 0x7d6f */ 0xffff,
- /* key: 0x7d70 */ 0xd36d,
- /* key: 0x7d71 */ 0x457d,
- /* key: 0x7d72 */ 0x652f,
- /* key: 0x7d73 */ 0x652c,
- /* key: 0x7d74 */ 0xffff,
- /* key: 0x7d75 */ 0x3328,
- /* key: 0x7d76 */ 0x4064,
- /* key: 0x7d77 */ 0xffff,
- /* key: 0x7d78 */ 0xd36e,
- /* key: 0x7d79 */ 0x3828,
- /* key: 0x7d7a */ 0xd36f,
- /* key: 0x7d7b */ 0xd370,
- /* key: 0x7d7c */ 0xffff,
- /* key: 0x7d7d */ 0x6538,
- /* key: 0x7d7e */ 0xffff,
- /* key: 0x7d7f */ 0xd371,
- /* key: 0x7d80 */ 0xffff,
- /* key: 0x7d81 */ 0xd372,
- /* key: 0x7d82 */ 0xd373,
- /* key: 0x7d83 */ 0xd374,
- /* key: 0x7d84 */ 0xffff,
- /* key: 0x7d85 */ 0xd375,
- /* key: 0x7d86 */ 0xd376,
- /* key: 0x7d87 */ 0xffff,
- /* key: 0x7d88 */ 0xd377,
- /* key: 0x7d89 */ 0x6535,
- /* key: 0x7d8a */ 0xffff,
- /* key: 0x7d8b */ 0xd378,
- /* key: 0x7d8c */ 0xd379,
- /* key: 0x7d8d */ 0xd37a,
- /* key: 0x7d8e */ 0xffff,
- /* key: 0x7d8f */ 0x6537,
- /* key: 0x7d90 */ 0xffff,
- /* key: 0x7d91 */ 0xd37b,
- /* key: 0x7d92 */ 0xffff,
- /* key: 0x7d93 */ 0x6534,
- /* key: 0x7d94 */ 0xffff,
- /* key: 0x7d95 */ 0xffff,
- /* key: 0x7d96 */ 0xd37c,
- /* key: 0x7d97 */ 0xd37d,
- /* key: 0x7d98 */ 0xffff,
- /* key: 0x7d99 */ 0x3751,
- /* key: 0x7d9a */ 0x4233,
- /* key: 0x7d9b */ 0x6539,
- /* key: 0x7d9c */ 0x416e,
- /* key: 0x7d9d */ 0xd37e,
- /* key: 0x7d9e */ 0xd421,
- /* key: 0x7d9f */ 0x6546,
- /* key: 0x7da0 */ 0xffff,
- /* key: 0x7da1 */ 0xffff,
- /* key: 0x7da2 */ 0x6542,
- /* key: 0x7da3 */ 0x653c,
- /* key: 0x7da4 */ 0xffff,
- /* key: 0x7da5 */ 0xffff,
- /* key: 0x7da6 */ 0xd422,
- /* key: 0x7da7 */ 0xd423,
- /* key: 0x7da8 */ 0xffff,
- /* key: 0x7da9 */ 0xffff,
- /* key: 0x7daa */ 0xd424,
- /* key: 0x7dab */ 0x6540,
- /* key: 0x7dac */ 0x3c7a,
- /* key: 0x7dad */ 0x305d,
- /* key: 0x7dae */ 0x653b,
- /* key: 0x7daf */ 0x6543,
- /* key: 0x7db0 */ 0x6547,
- /* key: 0x7db1 */ 0x394b,
- /* key: 0x7db2 */ 0x4c56,
- /* key: 0x7db3 */ 0xd425,
- /* key: 0x7db4 */ 0x4456,
- /* key: 0x7db5 */ 0x653d,
- /* key: 0x7db6 */ 0xd426,
- /* key: 0x7db7 */ 0xd427,
- /* key: 0x7db8 */ 0x6545,
- /* key: 0x7db9 */ 0xd428,
- /* key: 0x7dba */ 0x653a,
- /* key: 0x7dbb */ 0x433e,
- /* key: 0x7dbc */ 0xffff,
- /* key: 0x7dbd */ 0x653f,
- /* key: 0x7dbe */ 0x303d,
- /* key: 0x7dbf */ 0x4c4a,
- /* key: 0x7dc0 */ 0xffff,
- /* key: 0x7dc1 */ 0xffff,
- /* key: 0x7dc2 */ 0xd429,
- /* key: 0x7dc3 */ 0xd42a,
- /* key: 0x7dc4 */ 0xd42b,
- /* key: 0x7dc5 */ 0xd42c,
- /* key: 0x7dc6 */ 0xd42d,
- /* key: 0x7dc7 */ 0x653e,
- /* key: 0x7dc8 */ 0xffff,
- /* key: 0x7dc9 */ 0xffff,
- /* key: 0x7dca */ 0x365b,
- /* key: 0x7dcb */ 0x486c,
- /* key: 0x7dcc */ 0xd42e,
- /* key: 0x7dcd */ 0xd42f,
- /* key: 0x7dce */ 0xd430,
- /* key: 0x7dcf */ 0x416d,
- /* key: 0x7dd0 */ 0xffff,
- /* key: 0x7dd1 */ 0x4e50,
- /* key: 0x7dd2 */ 0x3d6f,
- /* key: 0x7dd3 */ 0xffff,
- /* key: 0x7dd4 */ 0xffff,
- /* key: 0x7dd5 */ 0x656e,
- /* key: 0x7dd6 */ 0xffff,
- /* key: 0x7dd7 */ 0xd431,
- /* key: 0x7dd8 */ 0x6548,
- /* key: 0x7dd9 */ 0xd432,
- /* key: 0x7dda */ 0x407e,
- /* key: 0x7ddb */ 0xffff,
- /* key: 0x7ddc */ 0x6544,
- /* key: 0x7ddd */ 0x6549,
- /* key: 0x7dde */ 0x654b,
- /* key: 0x7ddf */ 0xffff,
- /* key: 0x7de0 */ 0x4479,
- /* key: 0x7de1 */ 0x654e,
- /* key: 0x7de2 */ 0xd434,
- /* key: 0x7de3 */ 0xffff,
- /* key: 0x7de4 */ 0x654a,
- /* key: 0x7de5 */ 0xd435,
- /* key: 0x7de6 */ 0xd436,
- /* key: 0x7de7 */ 0xffff,
- /* key: 0x7de8 */ 0x4a54,
- /* key: 0x7de9 */ 0x344b,
- /* key: 0x7dea */ 0xd437,
- /* key: 0x7deb */ 0xd438,
- /* key: 0x7dec */ 0x4c4b,
- /* key: 0x7ded */ 0xd439,
- /* key: 0x7dee */ 0xffff,
- /* key: 0x7def */ 0x305e,
- /* key: 0x7df0 */ 0xffff,
- /* key: 0x7df1 */ 0xd43a,
- /* key: 0x7df2 */ 0x654d,
- /* key: 0x7df3 */ 0xffff,
- /* key: 0x7df4 */ 0x4e7d,
- /* key: 0x7df5 */ 0xd43b,
- /* key: 0x7df6 */ 0xd43c,
- /* key: 0x7df7 */ 0xffff,
- /* key: 0x7df8 */ 0xffff,
- /* key: 0x7df9 */ 0xd43d,
- /* key: 0x7dfa */ 0xd43e,
- /* key: 0x7dfb */ 0x654c,
- /* key: 0x7dfc */ 0xffff,
- /* key: 0x7dfd */ 0xffff,
- /* key: 0x7dfe */ 0xffff,
- /* key: 0x7dff */ 0xffff,
- /* branch: 0x7e0X */ 14688,
- /* branch: 0x7e1X */ 14704,
- /* branch: 0x7e2X */ 14720,
- /* branch: 0x7e3X */ 14736,
- /* branch: 0x7e4X */ 14752,
- /* branch: 0x7e5X */ 14768,
- /* branch: 0x7e6X */ 14784,
- /* branch: 0x7e7X */ 14800,
- /* branch: 0x7e8X */ 14816,
- /* branch: 0x7e9X */ 14832,
- /* branch: 0x7eaX */ 0,
- /* branch: 0x7ebX */ 0,
- /* branch: 0x7ecX */ 0,
- /* branch: 0x7edX */ 0,
- /* branch: 0x7eeX */ 0,
- /* branch: 0x7efX */ 0,
- /* key: 0x7e00 */ 0xd433,
- /* key: 0x7e01 */ 0x316f,
- /* key: 0x7e02 */ 0xffff,
- /* key: 0x7e03 */ 0xffff,
- /* key: 0x7e04 */ 0x466c,
- /* key: 0x7e05 */ 0x654f,
- /* key: 0x7e06 */ 0xffff,
- /* key: 0x7e07 */ 0xffff,
- /* key: 0x7e08 */ 0xd43f,
- /* key: 0x7e09 */ 0x6556,
- /* key: 0x7e0a */ 0x6550,
- /* key: 0x7e0b */ 0x6557,
- /* key: 0x7e0c */ 0xffff,
- /* key: 0x7e0d */ 0xffff,
- /* key: 0x7e0e */ 0xffff,
- /* key: 0x7e0f */ 0xffff,
- /* key: 0x7e10 */ 0xd440,
- /* key: 0x7e11 */ 0xd441,
- /* key: 0x7e12 */ 0x6553,
- /* key: 0x7e13 */ 0xffff,
- /* key: 0x7e14 */ 0xffff,
- /* key: 0x7e15 */ 0xd442,
- /* key: 0x7e16 */ 0xffff,
- /* key: 0x7e17 */ 0xd443,
- /* key: 0x7e18 */ 0xffff,
- /* key: 0x7e19 */ 0xffff,
- /* key: 0x7e1a */ 0xffff,
- /* key: 0x7e1b */ 0x477b,
- /* key: 0x7e1c */ 0xd444,
- /* key: 0x7e1d */ 0xd445,
- /* key: 0x7e1e */ 0x3c4a,
- /* key: 0x7e1f */ 0x6555,
- /* key: 0x7e20 */ 0xd446,
- /* key: 0x7e21 */ 0x6552,
- /* key: 0x7e22 */ 0x6558,
- /* key: 0x7e23 */ 0x6551,
- /* key: 0x7e24 */ 0xffff,
- /* key: 0x7e25 */ 0xffff,
- /* key: 0x7e26 */ 0x3d44,
- /* key: 0x7e27 */ 0xd447,
- /* key: 0x7e28 */ 0xd448,
- /* key: 0x7e29 */ 0xffff,
- /* key: 0x7e2a */ 0xffff,
- /* key: 0x7e2b */ 0x4b25,
- /* key: 0x7e2c */ 0xd449,
- /* key: 0x7e2d */ 0xd44a,
- /* key: 0x7e2e */ 0x3d4c,
- /* key: 0x7e2f */ 0xd44b,
- /* key: 0x7e30 */ 0xffff,
- /* key: 0x7e31 */ 0x6554,
- /* key: 0x7e32 */ 0x6560,
- /* key: 0x7e33 */ 0xd44c,
- /* key: 0x7e34 */ 0xffff,
- /* key: 0x7e35 */ 0x655c,
- /* key: 0x7e36 */ 0xd44d,
- /* key: 0x7e37 */ 0x655f,
- /* key: 0x7e38 */ 0xffff,
- /* key: 0x7e39 */ 0x655d,
- /* key: 0x7e3a */ 0x6561,
- /* key: 0x7e3b */ 0x655b,
- /* key: 0x7e3c */ 0xffff,
- /* key: 0x7e3d */ 0x6541,
- /* key: 0x7e3e */ 0x4053,
- /* key: 0x7e3f */ 0xd44e,
- /* key: 0x7e40 */ 0xffff,
- /* key: 0x7e41 */ 0x484b,
- /* key: 0x7e42 */ 0xffff,
- /* key: 0x7e43 */ 0x655e,
- /* key: 0x7e44 */ 0xd44f,
- /* key: 0x7e45 */ 0xd450,
- /* key: 0x7e46 */ 0x6559,
- /* key: 0x7e47 */ 0xd451,
- /* key: 0x7e48 */ 0xffff,
- /* key: 0x7e49 */ 0xffff,
- /* key: 0x7e4a */ 0x4121,
- /* key: 0x7e4b */ 0x3752,
- /* key: 0x7e4c */ 0xffff,
- /* key: 0x7e4d */ 0x3d2b,
- /* key: 0x7e4e */ 0xd452,
- /* key: 0x7e4f */ 0xffff,
- /* key: 0x7e50 */ 0xd453,
- /* key: 0x7e51 */ 0xffff,
- /* key: 0x7e52 */ 0xd454,
- /* key: 0x7e53 */ 0xffff,
- /* key: 0x7e54 */ 0x3f25,
- /* key: 0x7e55 */ 0x4136,
- /* key: 0x7e56 */ 0x6564,
- /* key: 0x7e57 */ 0xffff,
- /* key: 0x7e58 */ 0xd455,
- /* key: 0x7e59 */ 0x6566,
- /* key: 0x7e5a */ 0x6567,
- /* key: 0x7e5b */ 0xffff,
- /* key: 0x7e5c */ 0xffff,
- /* key: 0x7e5d */ 0x6563,
- /* key: 0x7e5e */ 0x6565,
- /* key: 0x7e5f */ 0xd456,
- /* key: 0x7e60 */ 0xffff,
- /* key: 0x7e61 */ 0xd457,
- /* key: 0x7e62 */ 0xd458,
- /* key: 0x7e63 */ 0xffff,
- /* key: 0x7e64 */ 0xffff,
- /* key: 0x7e65 */ 0xd459,
- /* key: 0x7e66 */ 0x655a,
- /* key: 0x7e67 */ 0x6562,
- /* key: 0x7e68 */ 0xffff,
- /* key: 0x7e69 */ 0x656a,
- /* key: 0x7e6a */ 0x6569,
- /* key: 0x7e6b */ 0xd45a,
- /* key: 0x7e6c */ 0xffff,
- /* key: 0x7e6d */ 0x4b7a,
- /* key: 0x7e6e */ 0xd45b,
- /* key: 0x7e6f */ 0xd45c,
- /* key: 0x7e70 */ 0x372b,
- /* key: 0x7e71 */ 0xffff,
- /* key: 0x7e72 */ 0xffff,
- /* key: 0x7e73 */ 0xd45d,
- /* key: 0x7e74 */ 0xffff,
- /* key: 0x7e75 */ 0xffff,
- /* key: 0x7e76 */ 0xffff,
- /* key: 0x7e77 */ 0xffff,
- /* key: 0x7e78 */ 0xd45e,
- /* key: 0x7e79 */ 0x6568,
- /* key: 0x7e7a */ 0xffff,
- /* key: 0x7e7b */ 0x656c,
- /* key: 0x7e7c */ 0x656b,
- /* key: 0x7e7d */ 0x656f,
- /* key: 0x7e7e */ 0xd45f,
- /* key: 0x7e7f */ 0x6571,
- /* key: 0x7e80 */ 0xffff,
- /* key: 0x7e81 */ 0xd460,
- /* key: 0x7e82 */ 0x3b3c,
- /* key: 0x7e83 */ 0x656d,
- /* key: 0x7e84 */ 0xffff,
- /* key: 0x7e85 */ 0xffff,
- /* key: 0x7e86 */ 0xd461,
- /* key: 0x7e87 */ 0xd462,
- /* key: 0x7e88 */ 0x6572,
- /* key: 0x7e89 */ 0x6573,
- /* key: 0x7e8a */ 0xd463,
- /* key: 0x7e8b */ 0xffff,
- /* key: 0x7e8c */ 0x6574,
- /* key: 0x7e8d */ 0xd464,
- /* key: 0x7e8e */ 0x657a,
- /* key: 0x7e8f */ 0x453b,
- /* key: 0x7e90 */ 0x6576,
- /* key: 0x7e91 */ 0xd465,
- /* key: 0x7e92 */ 0x6575,
- /* key: 0x7e93 */ 0x6577,
- /* key: 0x7e94 */ 0x6578,
- /* key: 0x7e95 */ 0xd466,
- /* key: 0x7e96 */ 0x6579,
- /* key: 0x7e97 */ 0xffff,
- /* key: 0x7e98 */ 0xd467,
- /* key: 0x7e99 */ 0xffff,
- /* key: 0x7e9a */ 0xd468,
- /* key: 0x7e9b */ 0x657b,
- /* key: 0x7e9c */ 0x657c,
- /* key: 0x7e9d */ 0xd469,
- /* key: 0x7e9e */ 0xd46a,
- /* key: 0x7e9f */ 0xffff,
- /* branch: 0x7f0X */ 0,
- /* branch: 0x7f1X */ 0,
- /* branch: 0x7f2X */ 0,
- /* branch: 0x7f3X */ 14864,
- /* branch: 0x7f4X */ 14880,
- /* branch: 0x7f5X */ 14896,
- /* branch: 0x7f6X */ 14912,
- /* branch: 0x7f7X */ 14928,
- /* branch: 0x7f8X */ 14944,
- /* branch: 0x7f9X */ 14960,
- /* branch: 0x7faX */ 14976,
- /* branch: 0x7fbX */ 14992,
- /* branch: 0x7fcX */ 15008,
- /* branch: 0x7fdX */ 15024,
- /* branch: 0x7feX */ 15040,
- /* branch: 0x7ffX */ 15056,
- /* key: 0x7f30 */ 0xffff,
- /* key: 0x7f31 */ 0xffff,
- /* key: 0x7f32 */ 0xffff,
- /* key: 0x7f33 */ 0xffff,
- /* key: 0x7f34 */ 0xffff,
- /* key: 0x7f35 */ 0xffff,
- /* key: 0x7f36 */ 0x344c,
- /* key: 0x7f37 */ 0xffff,
- /* key: 0x7f38 */ 0x657d,
- /* key: 0x7f39 */ 0xffff,
- /* key: 0x7f3a */ 0x657e,
- /* key: 0x7f3b */ 0xd46c,
- /* key: 0x7f3c */ 0xd46b,
- /* key: 0x7f3d */ 0xd46d,
- /* key: 0x7f3e */ 0xd46e,
- /* key: 0x7f3f */ 0xd46f,
- /* key: 0x7f40 */ 0xffff,
- /* key: 0x7f41 */ 0xffff,
- /* key: 0x7f42 */ 0xffff,
- /* key: 0x7f43 */ 0xd470,
- /* key: 0x7f44 */ 0xd471,
- /* key: 0x7f45 */ 0x6621,
- /* key: 0x7f46 */ 0xffff,
- /* key: 0x7f47 */ 0xd472,
- /* key: 0x7f48 */ 0xffff,
- /* key: 0x7f49 */ 0xffff,
- /* key: 0x7f4a */ 0xffff,
- /* key: 0x7f4b */ 0xffff,
- /* key: 0x7f4c */ 0x6622,
- /* key: 0x7f4d */ 0x6623,
- /* key: 0x7f4e */ 0x6624,
- /* key: 0x7f4f */ 0xd473,
- /* key: 0x7f50 */ 0x6625,
- /* key: 0x7f51 */ 0x6626,
- /* key: 0x7f52 */ 0xd474,
- /* key: 0x7f53 */ 0xd475,
- /* key: 0x7f54 */ 0x6628,
- /* key: 0x7f55 */ 0x6627,
- /* key: 0x7f56 */ 0xffff,
- /* key: 0x7f57 */ 0xffff,
- /* key: 0x7f58 */ 0x6629,
- /* key: 0x7f59 */ 0xffff,
- /* key: 0x7f5a */ 0xffff,
- /* key: 0x7f5b */ 0xd476,
- /* key: 0x7f5c */ 0xd477,
- /* key: 0x7f5d */ 0xd478,
- /* key: 0x7f5e */ 0xffff,
- /* key: 0x7f5f */ 0x662a,
- /* key: 0x7f60 */ 0x662b,
- /* key: 0x7f61 */ 0xd479,
- /* key: 0x7f62 */ 0xffff,
- /* key: 0x7f63 */ 0xd47a,
- /* key: 0x7f64 */ 0xd47b,
- /* key: 0x7f65 */ 0xd47c,
- /* key: 0x7f66 */ 0xd47d,
- /* key: 0x7f67 */ 0x662e,
- /* key: 0x7f68 */ 0x662c,
- /* key: 0x7f69 */ 0x662d,
- /* key: 0x7f6a */ 0x3a61,
- /* key: 0x7f6b */ 0x3753,
- /* key: 0x7f6c */ 0xffff,
- /* key: 0x7f6d */ 0xd47e,
- /* key: 0x7f6e */ 0x4356,
- /* key: 0x7f6f */ 0xffff,
- /* key: 0x7f70 */ 0x4833,
- /* key: 0x7f71 */ 0xd521,
- /* key: 0x7f72 */ 0x3d70,
- /* key: 0x7f73 */ 0xffff,
- /* key: 0x7f74 */ 0xffff,
- /* key: 0x7f75 */ 0x474d,
- /* key: 0x7f76 */ 0xffff,
- /* key: 0x7f77 */ 0x486d,
- /* key: 0x7f78 */ 0x662f,
- /* key: 0x7f79 */ 0x586d,
- /* key: 0x7f7a */ 0xffff,
- /* key: 0x7f7b */ 0xffff,
- /* key: 0x7f7c */ 0xffff,
- /* key: 0x7f7d */ 0xd522,
- /* key: 0x7f7e */ 0xd523,
- /* key: 0x7f7f */ 0xd524,
- /* key: 0x7f80 */ 0xd525,
- /* key: 0x7f81 */ 0xffff,
- /* key: 0x7f82 */ 0x6630,
- /* key: 0x7f83 */ 0x6632,
- /* key: 0x7f84 */ 0xffff,
- /* key: 0x7f85 */ 0x4d65,
- /* key: 0x7f86 */ 0x6631,
- /* key: 0x7f87 */ 0x6634,
- /* key: 0x7f88 */ 0x6633,
- /* key: 0x7f89 */ 0xffff,
- /* key: 0x7f8a */ 0x4d53,
- /* key: 0x7f8b */ 0xd526,
- /* key: 0x7f8c */ 0x6635,
- /* key: 0x7f8d */ 0xd527,
- /* key: 0x7f8e */ 0x487e,
- /* key: 0x7f8f */ 0xd528,
- /* key: 0x7f90 */ 0xd529,
- /* key: 0x7f91 */ 0xd52a,
- /* key: 0x7f92 */ 0xffff,
- /* key: 0x7f93 */ 0xffff,
- /* key: 0x7f94 */ 0x6636,
- /* key: 0x7f95 */ 0xffff,
- /* key: 0x7f96 */ 0xd52b,
- /* key: 0x7f97 */ 0xd52c,
- /* key: 0x7f98 */ 0xffff,
- /* key: 0x7f99 */ 0xffff,
- /* key: 0x7f9a */ 0x6639,
- /* key: 0x7f9b */ 0xffff,
- /* key: 0x7f9c */ 0xd52d,
- /* key: 0x7f9d */ 0x6638,
- /* key: 0x7f9e */ 0x6637,
- /* key: 0x7f9f */ 0xffff,
- /* key: 0x7fa0 */ 0xffff,
- /* key: 0x7fa1 */ 0xd52e,
- /* key: 0x7fa2 */ 0xd52f,
- /* key: 0x7fa3 */ 0x663a,
- /* key: 0x7fa4 */ 0x3732,
- /* key: 0x7fa5 */ 0xffff,
- /* key: 0x7fa6 */ 0xd530,
- /* key: 0x7fa7 */ 0xffff,
- /* key: 0x7fa8 */ 0x4122,
- /* key: 0x7fa9 */ 0x3541,
- /* key: 0x7faa */ 0xd531,
- /* key: 0x7fab */ 0xffff,
- /* key: 0x7fac */ 0xffff,
- /* key: 0x7fad */ 0xd532,
- /* key: 0x7fae */ 0x663e,
- /* key: 0x7faf */ 0x663b,
- /* key: 0x7fb0 */ 0xffff,
- /* key: 0x7fb1 */ 0xffff,
- /* key: 0x7fb2 */ 0x663c,
- /* key: 0x7fb3 */ 0xffff,
- /* key: 0x7fb4 */ 0xd533,
- /* key: 0x7fb5 */ 0xffff,
- /* key: 0x7fb6 */ 0x663f,
- /* key: 0x7fb7 */ 0xffff,
- /* key: 0x7fb8 */ 0x6640,
- /* key: 0x7fb9 */ 0x663d,
- /* key: 0x7fba */ 0xffff,
- /* key: 0x7fbb */ 0xffff,
- /* key: 0x7fbc */ 0xd534,
- /* key: 0x7fbd */ 0x3129,
- /* key: 0x7fbe */ 0xffff,
- /* key: 0x7fbf */ 0xd535,
- /* key: 0x7fc0 */ 0xd536,
- /* key: 0x7fc1 */ 0x3227,
- /* key: 0x7fc2 */ 0xffff,
- /* key: 0x7fc3 */ 0xd537,
- /* key: 0x7fc4 */ 0xffff,
- /* key: 0x7fc5 */ 0x6642,
- /* key: 0x7fc6 */ 0x6643,
- /* key: 0x7fc7 */ 0xffff,
- /* key: 0x7fc8 */ 0xd538,
- /* key: 0x7fc9 */ 0xffff,
- /* key: 0x7fca */ 0x6644,
- /* key: 0x7fcb */ 0xffff,
- /* key: 0x7fcc */ 0x4d62,
- /* key: 0x7fcd */ 0xffff,
- /* key: 0x7fce */ 0xd539,
- /* key: 0x7fcf */ 0xd53a,
- /* key: 0x7fd0 */ 0xffff,
- /* key: 0x7fd1 */ 0xffff,
- /* key: 0x7fd2 */ 0x3d2c,
- /* key: 0x7fd3 */ 0xffff,
- /* key: 0x7fd4 */ 0x6646,
- /* key: 0x7fd5 */ 0x6645,
- /* key: 0x7fd6 */ 0xffff,
- /* key: 0x7fd7 */ 0xffff,
- /* key: 0x7fd8 */ 0xffff,
- /* key: 0x7fd9 */ 0xffff,
- /* key: 0x7fda */ 0xffff,
- /* key: 0x7fdb */ 0xd53b,
- /* key: 0x7fdc */ 0xffff,
- /* key: 0x7fdd */ 0xffff,
- /* key: 0x7fde */ 0xffff,
- /* key: 0x7fdf */ 0xd53c,
- /* key: 0x7fe0 */ 0x3f69,
- /* key: 0x7fe1 */ 0x6647,
- /* key: 0x7fe2 */ 0xffff,
- /* key: 0x7fe3 */ 0xd53d,
- /* key: 0x7fe4 */ 0xffff,
- /* key: 0x7fe5 */ 0xd53e,
- /* key: 0x7fe6 */ 0x6648,
- /* key: 0x7fe7 */ 0xffff,
- /* key: 0x7fe8 */ 0xd53f,
- /* key: 0x7fe9 */ 0x6649,
- /* key: 0x7fea */ 0xffff,
- /* key: 0x7feb */ 0x3465,
- /* key: 0x7fec */ 0xd540,
- /* key: 0x7fed */ 0xffff,
- /* key: 0x7fee */ 0xd541,
- /* key: 0x7fef */ 0xd542,
- /* key: 0x7ff0 */ 0x344d,
- /* key: 0x7ff1 */ 0xffff,
- /* key: 0x7ff2 */ 0xd543,
- /* key: 0x7ff3 */ 0x664a,
- /* key: 0x7ff4 */ 0xffff,
- /* key: 0x7ff5 */ 0xffff,
- /* key: 0x7ff6 */ 0xffff,
- /* key: 0x7ff7 */ 0xffff,
- /* key: 0x7ff8 */ 0xffff,
- /* key: 0x7ff9 */ 0x664b,
- /* key: 0x7ffa */ 0xd544,
- /* key: 0x7ffb */ 0x4b5d,
- /* key: 0x7ffc */ 0x4d63,
- /* key: 0x7ffd */ 0xd545,
- /* key: 0x7ffe */ 0xd546,
- /* key: 0x7fff */ 0xd547,
- /* branch: 0x80XX */ 15088,
- /* branch: 0x81XX */ 15360,
- /* branch: 0x82XX */ 15632,
- /* branch: 0x83XX */ 15904,
- /* branch: 0x84XX */ 16160,
- /* branch: 0x85XX */ 16432,
- /* branch: 0x86XX */ 16704,
- /* branch: 0x87XX */ 16976,
- /* branch: 0x88XX */ 17248,
- /* branch: 0x89XX */ 17520,
- /* branch: 0x8aXX */ 17792,
- /* branch: 0x8bXX */ 18064,
- /* branch: 0x8cXX */ 18240,
- /* branch: 0x8dXX */ 18464,
- /* branch: 0x8eXX */ 18672,
- /* branch: 0x8fXX */ 18944,
- /* branch: 0x800X */ 15104,
- /* branch: 0x801X */ 15120,
- /* branch: 0x802X */ 15136,
- /* branch: 0x803X */ 15152,
- /* branch: 0x804X */ 15168,
- /* branch: 0x805X */ 15184,
- /* branch: 0x806X */ 15200,
- /* branch: 0x807X */ 15216,
- /* branch: 0x808X */ 15232,
- /* branch: 0x809X */ 15248,
- /* branch: 0x80aX */ 15264,
- /* branch: 0x80bX */ 15280,
- /* branch: 0x80cX */ 15296,
- /* branch: 0x80dX */ 15312,
- /* branch: 0x80eX */ 15328,
- /* branch: 0x80fX */ 15344,
- /* key: 0x8000 */ 0x4d54,
- /* key: 0x8001 */ 0x4f37,
- /* key: 0x8002 */ 0xffff,
- /* key: 0x8003 */ 0x394d,
- /* key: 0x8004 */ 0x664e,
- /* key: 0x8005 */ 0x3c54,
- /* key: 0x8006 */ 0x664d,
- /* key: 0x8007 */ 0xd548,
- /* key: 0x8008 */ 0xd549,
- /* key: 0x8009 */ 0xffff,
- /* key: 0x800a */ 0xd54a,
- /* key: 0x800b */ 0x664f,
- /* key: 0x800c */ 0x3c29,
- /* key: 0x800d */ 0xd54b,
- /* key: 0x800e */ 0xd54c,
- /* key: 0x800f */ 0xd54d,
- /* key: 0x8010 */ 0x4251,
- /* key: 0x8011 */ 0xd54e,
- /* key: 0x8012 */ 0x6650,
- /* key: 0x8013 */ 0xd54f,
- /* key: 0x8014 */ 0xd550,
- /* key: 0x8015 */ 0x394c,
- /* key: 0x8016 */ 0xd551,
- /* key: 0x8017 */ 0x4c57,
- /* key: 0x8018 */ 0x6651,
- /* key: 0x8019 */ 0x6652,
- /* key: 0x801a */ 0xffff,
- /* key: 0x801b */ 0xffff,
- /* key: 0x801c */ 0x6653,
- /* key: 0x801d */ 0xd552,
- /* key: 0x801e */ 0xd553,
- /* key: 0x801f */ 0xd554,
- /* key: 0x8020 */ 0xd555,
- /* key: 0x8021 */ 0x6654,
- /* key: 0x8022 */ 0xffff,
- /* key: 0x8023 */ 0xffff,
- /* key: 0x8024 */ 0xd556,
- /* key: 0x8025 */ 0xffff,
- /* key: 0x8026 */ 0xd557,
- /* key: 0x8027 */ 0xffff,
- /* key: 0x8028 */ 0x6655,
- /* key: 0x8029 */ 0xffff,
- /* key: 0x802a */ 0xffff,
- /* key: 0x802b */ 0xffff,
- /* key: 0x802c */ 0xd558,
- /* key: 0x802d */ 0xffff,
- /* key: 0x802e */ 0xd559,
- /* key: 0x802f */ 0xffff,
- /* key: 0x8030 */ 0xd55a,
- /* key: 0x8031 */ 0xffff,
- /* key: 0x8032 */ 0xffff,
- /* key: 0x8033 */ 0x3c2a,
- /* key: 0x8034 */ 0xd55b,
- /* key: 0x8035 */ 0xd55c,
- /* key: 0x8036 */ 0x4c6d,
- /* key: 0x8037 */ 0xd55d,
- /* key: 0x8038 */ 0xffff,
- /* key: 0x8039 */ 0xd55e,
- /* key: 0x803a */ 0xd55f,
- /* key: 0x803b */ 0x6657,
- /* key: 0x803c */ 0xd560,
- /* key: 0x803d */ 0x433f,
- /* key: 0x803e */ 0xd561,
- /* key: 0x803f */ 0x6656,
- /* key: 0x8040 */ 0xd562,
- /* key: 0x8041 */ 0xffff,
- /* key: 0x8042 */ 0xffff,
- /* key: 0x8043 */ 0xffff,
- /* key: 0x8044 */ 0xd563,
- /* key: 0x8045 */ 0xffff,
- /* key: 0x8046 */ 0x6659,
- /* key: 0x8047 */ 0xffff,
- /* key: 0x8048 */ 0xffff,
- /* key: 0x8049 */ 0xffff,
- /* key: 0x804a */ 0x6658,
- /* key: 0x804b */ 0xffff,
- /* key: 0x804c */ 0xffff,
- /* key: 0x804d */ 0xffff,
- /* key: 0x804e */ 0xffff,
- /* key: 0x804f */ 0xffff,
- /* key: 0x8050 */ 0xffff,
- /* key: 0x8051 */ 0xffff,
- /* key: 0x8052 */ 0x665a,
- /* key: 0x8053 */ 0xffff,
- /* key: 0x8054 */ 0xffff,
- /* key: 0x8055 */ 0xffff,
- /* key: 0x8056 */ 0x403b,
- /* key: 0x8057 */ 0xffff,
- /* key: 0x8058 */ 0x665b,
- /* key: 0x8059 */ 0xffff,
- /* key: 0x805a */ 0x665c,
- /* key: 0x805b */ 0xffff,
- /* key: 0x805c */ 0xffff,
- /* key: 0x805d */ 0xffff,
- /* key: 0x805e */ 0x4a39,
- /* key: 0x805f */ 0x665d,
- /* key: 0x8060 */ 0xd564,
- /* key: 0x8061 */ 0x416f,
- /* key: 0x8062 */ 0x665e,
- /* key: 0x8063 */ 0xffff,
- /* key: 0x8064 */ 0xd565,
- /* key: 0x8065 */ 0xffff,
- /* key: 0x8066 */ 0xd566,
- /* key: 0x8067 */ 0xffff,
- /* key: 0x8068 */ 0x665f,
- /* key: 0x8069 */ 0xffff,
- /* key: 0x806a */ 0xffff,
- /* key: 0x806b */ 0xffff,
- /* key: 0x806c */ 0xffff,
- /* key: 0x806d */ 0xd567,
- /* key: 0x806e */ 0xffff,
- /* key: 0x806f */ 0x4e7e,
- /* key: 0x8070 */ 0x6662,
- /* key: 0x8071 */ 0xd568,
- /* key: 0x8072 */ 0x6661,
- /* key: 0x8073 */ 0x6660,
- /* key: 0x8074 */ 0x4430,
- /* key: 0x8075 */ 0xd569,
- /* key: 0x8076 */ 0x6663,
- /* key: 0x8077 */ 0x3f26,
- /* key: 0x8078 */ 0xffff,
- /* key: 0x8079 */ 0x6664,
- /* key: 0x807a */ 0xffff,
- /* key: 0x807b */ 0xffff,
- /* key: 0x807c */ 0xffff,
- /* key: 0x807d */ 0x6665,
- /* key: 0x807e */ 0x4f38,
- /* key: 0x807f */ 0x6666,
- /* key: 0x8080 */ 0xffff,
- /* key: 0x8081 */ 0xd56a,
- /* key: 0x8082 */ 0xffff,
- /* key: 0x8083 */ 0xffff,
- /* key: 0x8084 */ 0x6667,
- /* key: 0x8085 */ 0x6669,
- /* key: 0x8086 */ 0x6668,
- /* key: 0x8087 */ 0x4825,
- /* key: 0x8088 */ 0xd56b,
- /* key: 0x8089 */ 0x4679,
- /* key: 0x808a */ 0xffff,
- /* key: 0x808b */ 0x4f3e,
- /* key: 0x808c */ 0x4829,
- /* key: 0x808d */ 0xffff,
- /* key: 0x808e */ 0xd56c,
- /* key: 0x808f */ 0xffff,
- /* key: 0x8090 */ 0xffff,
- /* key: 0x8091 */ 0xffff,
- /* key: 0x8092 */ 0xffff,
- /* key: 0x8093 */ 0x666b,
- /* key: 0x8094 */ 0xffff,
- /* key: 0x8095 */ 0xffff,
- /* key: 0x8096 */ 0x3e53,
- /* key: 0x8097 */ 0xffff,
- /* key: 0x8098 */ 0x492a,
- /* key: 0x8099 */ 0xffff,
- /* key: 0x809a */ 0x666c,
- /* key: 0x809b */ 0x666a,
- /* key: 0x809c */ 0xd56d,
- /* key: 0x809d */ 0x344e,
- /* key: 0x809e */ 0xd56e,
- /* key: 0x809f */ 0xffff,
- /* key: 0x80a0 */ 0xffff,
- /* key: 0x80a1 */ 0x3854,
- /* key: 0x80a2 */ 0x3b68,
- /* key: 0x80a3 */ 0xffff,
- /* key: 0x80a4 */ 0xffff,
- /* key: 0x80a5 */ 0x486e,
- /* key: 0x80a6 */ 0xd56f,
- /* key: 0x80a7 */ 0xd570,
- /* key: 0x80a8 */ 0xffff,
- /* key: 0x80a9 */ 0x382a,
- /* key: 0x80aa */ 0x4b43,
- /* key: 0x80ab */ 0xd571,
- /* key: 0x80ac */ 0x666f,
- /* key: 0x80ad */ 0x666d,
- /* key: 0x80ae */ 0xffff,
- /* key: 0x80af */ 0x394e,
- /* key: 0x80b0 */ 0xffff,
- /* key: 0x80b1 */ 0x394f,
- /* key: 0x80b2 */ 0x3069,
- /* key: 0x80b3 */ 0xffff,
- /* key: 0x80b4 */ 0x3a68,
- /* key: 0x80b5 */ 0xffff,
- /* key: 0x80b6 */ 0xffff,
- /* key: 0x80b7 */ 0xffff,
- /* key: 0x80b8 */ 0xd572,
- /* key: 0x80b9 */ 0xd573,
- /* key: 0x80ba */ 0x4759,
- /* key: 0x80bb */ 0xffff,
- /* key: 0x80bc */ 0xffff,
- /* key: 0x80bd */ 0xffff,
- /* key: 0x80be */ 0xffff,
- /* key: 0x80bf */ 0xffff,
- /* key: 0x80c0 */ 0xffff,
- /* key: 0x80c1 */ 0xffff,
- /* key: 0x80c2 */ 0xffff,
- /* key: 0x80c3 */ 0x305f,
- /* key: 0x80c4 */ 0x6674,
- /* key: 0x80c5 */ 0xffff,
- /* key: 0x80c6 */ 0x4340,
- /* key: 0x80c7 */ 0xffff,
- /* key: 0x80c8 */ 0xd574,
- /* key: 0x80c9 */ 0xffff,
- /* key: 0x80ca */ 0xffff,
- /* key: 0x80cb */ 0xffff,
- /* key: 0x80cc */ 0x4758,
- /* key: 0x80cd */ 0xd575,
- /* key: 0x80ce */ 0x425b,
- /* key: 0x80cf */ 0xd576,
- /* key: 0x80d0 */ 0xffff,
- /* key: 0x80d1 */ 0xffff,
- /* key: 0x80d2 */ 0xd577,
- /* key: 0x80d3 */ 0xffff,
- /* key: 0x80d4 */ 0xd578,
- /* key: 0x80d5 */ 0xd579,
- /* key: 0x80d6 */ 0x6676,
- /* key: 0x80d7 */ 0xd57a,
- /* key: 0x80d8 */ 0xd57b,
- /* key: 0x80d9 */ 0x6672,
- /* key: 0x80da */ 0x6675,
- /* key: 0x80db */ 0x6670,
- /* key: 0x80dc */ 0xffff,
- /* key: 0x80dd */ 0x6673,
- /* key: 0x80de */ 0x4b26,
- /* key: 0x80df */ 0xffff,
- /* key: 0x80e0 */ 0xd57c,
- /* key: 0x80e1 */ 0x3855,
- /* key: 0x80e2 */ 0xffff,
- /* key: 0x80e3 */ 0xffff,
- /* key: 0x80e4 */ 0x307d,
- /* key: 0x80e5 */ 0x6671,
- /* key: 0x80e6 */ 0xffff,
- /* key: 0x80e7 */ 0xffff,
- /* key: 0x80e8 */ 0xffff,
- /* key: 0x80e9 */ 0xffff,
- /* key: 0x80ea */ 0xffff,
- /* key: 0x80eb */ 0xffff,
- /* key: 0x80ec */ 0xffff,
- /* key: 0x80ed */ 0xd57d,
- /* key: 0x80ee */ 0xd57e,
- /* key: 0x80ef */ 0x6678,
- /* key: 0x80f0 */ 0xd621,
- /* key: 0x80f1 */ 0x6679,
- /* key: 0x80f2 */ 0xd622,
- /* key: 0x80f3 */ 0xd623,
- /* key: 0x80f4 */ 0x4639,
- /* key: 0x80f5 */ 0xffff,
- /* key: 0x80f6 */ 0xd624,
- /* key: 0x80f7 */ 0xffff,
- /* key: 0x80f8 */ 0x363b,
- /* key: 0x80f9 */ 0xd625,
- /* key: 0x80fa */ 0xd626,
- /* key: 0x80fb */ 0xffff,
- /* key: 0x80fc */ 0x6726,
- /* key: 0x80fd */ 0x473d,
- /* key: 0x80fe */ 0xd627,
- /* key: 0x80ff */ 0xffff,
- /* branch: 0x810X */ 15376,
- /* branch: 0x811X */ 15392,
- /* branch: 0x812X */ 15408,
- /* branch: 0x813X */ 15424,
- /* branch: 0x814X */ 15440,
- /* branch: 0x815X */ 15456,
- /* branch: 0x816X */ 15472,
- /* branch: 0x817X */ 15488,
- /* branch: 0x818X */ 15504,
- /* branch: 0x819X */ 15520,
- /* branch: 0x81aX */ 15536,
- /* branch: 0x81bX */ 15552,
- /* branch: 0x81cX */ 15568,
- /* branch: 0x81dX */ 15584,
- /* branch: 0x81eX */ 15600,
- /* branch: 0x81fX */ 15616,
- /* key: 0x8100 */ 0xffff,
- /* key: 0x8101 */ 0xffff,
- /* key: 0x8102 */ 0x3b69,
- /* key: 0x8103 */ 0xd628,
- /* key: 0x8104 */ 0xffff,
- /* key: 0x8105 */ 0x363c,
- /* key: 0x8106 */ 0x4048,
- /* key: 0x8107 */ 0x4f46,
- /* key: 0x8108 */ 0x4c2e,
- /* key: 0x8109 */ 0x6677,
- /* key: 0x810a */ 0x4054,
- /* key: 0x810b */ 0xd629,
- /* key: 0x810c */ 0xffff,
- /* key: 0x810d */ 0xffff,
- /* key: 0x810e */ 0xffff,
- /* key: 0x810f */ 0xffff,
- /* key: 0x8110 */ 0xffff,
- /* key: 0x8111 */ 0xffff,
- /* key: 0x8112 */ 0xffff,
- /* key: 0x8113 */ 0xffff,
- /* key: 0x8114 */ 0xffff,
- /* key: 0x8115 */ 0xffff,
- /* key: 0x8116 */ 0xd62a,
- /* key: 0x8117 */ 0xd62b,
- /* key: 0x8118 */ 0xd62c,
- /* key: 0x8119 */ 0xffff,
- /* key: 0x811a */ 0x3553,
- /* key: 0x811b */ 0x667a,
- /* key: 0x811c */ 0xd62d,
- /* key: 0x811d */ 0xffff,
- /* key: 0x811e */ 0xd62e,
- /* key: 0x811f */ 0xffff,
- /* key: 0x8120 */ 0xd62f,
- /* key: 0x8121 */ 0xffff,
- /* key: 0x8122 */ 0xffff,
- /* key: 0x8123 */ 0x667c,
- /* key: 0x8124 */ 0xd630,
- /* key: 0x8125 */ 0xffff,
- /* key: 0x8126 */ 0xffff,
- /* key: 0x8127 */ 0xd631,
- /* key: 0x8128 */ 0xffff,
- /* key: 0x8129 */ 0x667b,
- /* key: 0x812a */ 0xffff,
- /* key: 0x812b */ 0xffff,
- /* key: 0x812c */ 0xd632,
- /* key: 0x812d */ 0xffff,
- /* key: 0x812e */ 0xffff,
- /* key: 0x812f */ 0x667d,
- /* key: 0x8130 */ 0xd633,
- /* key: 0x8131 */ 0x4326,
- /* key: 0x8132 */ 0xffff,
- /* key: 0x8133 */ 0x473e,
- /* key: 0x8134 */ 0xffff,
- /* key: 0x8135 */ 0xd634,
- /* key: 0x8136 */ 0xffff,
- /* key: 0x8137 */ 0xffff,
- /* key: 0x8138 */ 0xffff,
- /* key: 0x8139 */ 0x4431,
- /* key: 0x813a */ 0xd635,
- /* key: 0x813b */ 0xffff,
- /* key: 0x813c */ 0xd636,
- /* key: 0x813d */ 0xffff,
- /* key: 0x813e */ 0x6723,
- /* key: 0x813f */ 0xffff,
- /* key: 0x8140 */ 0xffff,
- /* key: 0x8141 */ 0xffff,
- /* key: 0x8142 */ 0xffff,
- /* key: 0x8143 */ 0xffff,
- /* key: 0x8144 */ 0xffff,
- /* key: 0x8145 */ 0xd637,
- /* key: 0x8146 */ 0x6722,
- /* key: 0x8147 */ 0xd638,
- /* key: 0x8148 */ 0xffff,
- /* key: 0x8149 */ 0xffff,
- /* key: 0x814a */ 0xd639,
- /* key: 0x814b */ 0x667e,
- /* key: 0x814c */ 0xd63a,
- /* key: 0x814d */ 0xffff,
- /* key: 0x814e */ 0x3f55,
- /* key: 0x814f */ 0xffff,
- /* key: 0x8150 */ 0x4965,
- /* key: 0x8151 */ 0x6725,
- /* key: 0x8152 */ 0xd63b,
- /* key: 0x8153 */ 0x6724,
- /* key: 0x8154 */ 0x3950,
- /* key: 0x8155 */ 0x4f53,
- /* key: 0x8156 */ 0xffff,
- /* key: 0x8157 */ 0xd63c,
- /* key: 0x8158 */ 0xffff,
- /* key: 0x8159 */ 0xffff,
- /* key: 0x815a */ 0xffff,
- /* key: 0x815b */ 0xffff,
- /* key: 0x815c */ 0xffff,
- /* key: 0x815d */ 0xffff,
- /* key: 0x815e */ 0xffff,
- /* key: 0x815f */ 0x6735,
- /* key: 0x8160 */ 0xd63d,
- /* key: 0x8161 */ 0xd63e,
- /* key: 0x8162 */ 0xffff,
- /* key: 0x8163 */ 0xffff,
- /* key: 0x8164 */ 0xffff,
- /* key: 0x8165 */ 0x6729,
- /* key: 0x8166 */ 0x672a,
- /* key: 0x8167 */ 0xd63f,
- /* key: 0x8168 */ 0xd640,
- /* key: 0x8169 */ 0xd641,
- /* key: 0x816a */ 0xffff,
- /* key: 0x816b */ 0x3c70,
- /* key: 0x816c */ 0xffff,
- /* key: 0x816d */ 0xd642,
- /* key: 0x816e */ 0x6728,
- /* key: 0x816f */ 0xd643,
- /* key: 0x8170 */ 0x3978,
- /* key: 0x8171 */ 0x6727,
- /* key: 0x8172 */ 0xffff,
- /* key: 0x8173 */ 0xffff,
- /* key: 0x8174 */ 0x672b,
- /* key: 0x8175 */ 0xffff,
- /* key: 0x8176 */ 0xffff,
- /* key: 0x8177 */ 0xd644,
- /* key: 0x8178 */ 0x4432,
- /* key: 0x8179 */ 0x4a22,
- /* key: 0x817a */ 0x4123,
- /* key: 0x817b */ 0xffff,
- /* key: 0x817c */ 0xffff,
- /* key: 0x817d */ 0xffff,
- /* key: 0x817e */ 0xffff,
- /* key: 0x817f */ 0x425c,
- /* key: 0x8180 */ 0x672f,
- /* key: 0x8181 */ 0xd645,
- /* key: 0x8182 */ 0x6730,
- /* key: 0x8183 */ 0x672c,
- /* key: 0x8184 */ 0xd647,
- /* key: 0x8185 */ 0xd648,
- /* key: 0x8186 */ 0xd649,
- /* key: 0x8187 */ 0xffff,
- /* key: 0x8188 */ 0x672d,
- /* key: 0x8189 */ 0xffff,
- /* key: 0x818a */ 0x672e,
- /* key: 0x818b */ 0xd64a,
- /* key: 0x818c */ 0xffff,
- /* key: 0x818d */ 0xffff,
- /* key: 0x818e */ 0xd64b,
- /* key: 0x818f */ 0x3951,
- /* key: 0x8190 */ 0xd646,
- /* key: 0x8191 */ 0xffff,
- /* key: 0x8192 */ 0xffff,
- /* key: 0x8193 */ 0x6736,
- /* key: 0x8194 */ 0xffff,
- /* key: 0x8195 */ 0x6732,
- /* key: 0x8196 */ 0xd64c,
- /* key: 0x8197 */ 0xffff,
- /* key: 0x8198 */ 0xd64d,
- /* key: 0x8199 */ 0xffff,
- /* key: 0x819a */ 0x4966,
- /* key: 0x819b */ 0xd64e,
- /* key: 0x819c */ 0x4b6c,
- /* key: 0x819d */ 0x4928,
- /* key: 0x819e */ 0xd64f,
- /* key: 0x819f */ 0xffff,
- /* key: 0x81a0 */ 0x6731,
- /* key: 0x81a1 */ 0xffff,
- /* key: 0x81a2 */ 0xd650,
- /* key: 0x81a3 */ 0x6734,
- /* key: 0x81a4 */ 0x6733,
- /* key: 0x81a5 */ 0xffff,
- /* key: 0x81a6 */ 0xffff,
- /* key: 0x81a7 */ 0xffff,
- /* key: 0x81a8 */ 0x4b44,
- /* key: 0x81a9 */ 0x6737,
- /* key: 0x81aa */ 0xffff,
- /* key: 0x81ab */ 0xffff,
- /* key: 0x81ac */ 0xffff,
- /* key: 0x81ad */ 0xffff,
- /* key: 0x81ae */ 0xd651,
- /* key: 0x81af */ 0xffff,
- /* key: 0x81b0 */ 0x6738,
- /* key: 0x81b1 */ 0xffff,
- /* key: 0x81b2 */ 0xd652,
- /* key: 0x81b3 */ 0x4137,
- /* key: 0x81b4 */ 0xd653,
- /* key: 0x81b5 */ 0x6739,
- /* key: 0x81b6 */ 0xffff,
- /* key: 0x81b7 */ 0xffff,
- /* key: 0x81b8 */ 0x673b,
- /* key: 0x81b9 */ 0xffff,
- /* key: 0x81ba */ 0x673f,
- /* key: 0x81bb */ 0xd654,
- /* key: 0x81bc */ 0xffff,
- /* key: 0x81bd */ 0x673c,
- /* key: 0x81be */ 0x673a,
- /* key: 0x81bf */ 0x473f,
- /* key: 0x81c0 */ 0x673d,
- /* key: 0x81c1 */ 0xffff,
- /* key: 0x81c2 */ 0x673e,
- /* key: 0x81c3 */ 0xd656,
- /* key: 0x81c4 */ 0xffff,
- /* key: 0x81c5 */ 0xd657,
- /* key: 0x81c6 */ 0x3232,
- /* key: 0x81c7 */ 0xffff,
- /* key: 0x81c8 */ 0x6745,
- /* key: 0x81c9 */ 0x6740,
- /* key: 0x81ca */ 0xd658,
- /* key: 0x81cb */ 0xd655,
- /* key: 0x81cc */ 0xffff,
- /* key: 0x81cd */ 0x6741,
- /* key: 0x81ce */ 0xd659,
- /* key: 0x81cf */ 0xd65a,
- /* key: 0x81d0 */ 0xffff,
- /* key: 0x81d1 */ 0x6742,
- /* key: 0x81d2 */ 0xffff,
- /* key: 0x81d3 */ 0x4221,
- /* key: 0x81d4 */ 0xffff,
- /* key: 0x81d5 */ 0xd65b,
- /* key: 0x81d6 */ 0xffff,
- /* key: 0x81d7 */ 0xd65c,
- /* key: 0x81d8 */ 0x6744,
- /* key: 0x81d9 */ 0x6743,
- /* key: 0x81da */ 0x6746,
- /* key: 0x81db */ 0xd65d,
- /* key: 0x81dc */ 0xffff,
- /* key: 0x81dd */ 0xd65e,
- /* key: 0x81de */ 0xd65f,
- /* key: 0x81df */ 0x6747,
- /* key: 0x81e0 */ 0x6748,
- /* key: 0x81e1 */ 0xd660,
- /* key: 0x81e2 */ 0xffff,
- /* key: 0x81e3 */ 0x3f43,
- /* key: 0x81e4 */ 0xd661,
- /* key: 0x81e5 */ 0x3269,
- /* key: 0x81e6 */ 0xffff,
- /* key: 0x81e7 */ 0x6749,
- /* key: 0x81e8 */ 0x4e57,
- /* key: 0x81e9 */ 0xffff,
- /* key: 0x81ea */ 0x3c2b,
- /* key: 0x81eb */ 0xd662,
- /* key: 0x81ec */ 0xd663,
- /* key: 0x81ed */ 0x3d2d,
- /* key: 0x81ee */ 0xffff,
- /* key: 0x81ef */ 0xffff,
- /* key: 0x81f0 */ 0xd664,
- /* key: 0x81f1 */ 0xd665,
- /* key: 0x81f2 */ 0xd666,
- /* key: 0x81f3 */ 0x3b6a,
- /* key: 0x81f4 */ 0x4357,
- /* key: 0x81f5 */ 0xd667,
- /* key: 0x81f6 */ 0xd668,
- /* key: 0x81f7 */ 0xffff,
- /* key: 0x81f8 */ 0xd669,
- /* key: 0x81f9 */ 0xd66a,
- /* key: 0x81fa */ 0x674a,
- /* key: 0x81fb */ 0x674b,
- /* key: 0x81fc */ 0x3131,
- /* key: 0x81fd */ 0xd66b,
- /* key: 0x81fe */ 0x674c,
- /* key: 0x81ff */ 0xd66c,
- /* branch: 0x820X */ 15648,
- /* branch: 0x821X */ 15664,
- /* branch: 0x822X */ 15680,
- /* branch: 0x823X */ 15696,
- /* branch: 0x824X */ 15712,
- /* branch: 0x825X */ 15728,
- /* branch: 0x826X */ 15744,
- /* branch: 0x827X */ 15760,
- /* branch: 0x828X */ 15776,
- /* branch: 0x829X */ 15792,
- /* branch: 0x82aX */ 15808,
- /* branch: 0x82bX */ 15824,
- /* branch: 0x82cX */ 15840,
- /* branch: 0x82dX */ 15856,
- /* branch: 0x82eX */ 15872,
- /* branch: 0x82fX */ 15888,
- /* key: 0x8200 */ 0xd66d,
- /* key: 0x8201 */ 0x674d,
- /* key: 0x8202 */ 0x674e,
- /* key: 0x8203 */ 0xd66e,
- /* key: 0x8204 */ 0xffff,
- /* key: 0x8205 */ 0x674f,
- /* key: 0x8206 */ 0xffff,
- /* key: 0x8207 */ 0x6750,
- /* key: 0x8208 */ 0x363d,
- /* key: 0x8209 */ 0x5a2a,
- /* key: 0x820a */ 0x6751,
- /* key: 0x820b */ 0xffff,
- /* key: 0x820c */ 0x4065,
- /* key: 0x820d */ 0x6752,
- /* key: 0x820e */ 0x3c4b,
- /* key: 0x820f */ 0xd66f,
- /* key: 0x8210 */ 0x6753,
- /* key: 0x8211 */ 0xffff,
- /* key: 0x8212 */ 0x5030,
- /* key: 0x8213 */ 0xd670,
- /* key: 0x8214 */ 0xd671,
- /* key: 0x8215 */ 0xffff,
- /* key: 0x8216 */ 0x6754,
- /* key: 0x8217 */ 0x4a5e,
- /* key: 0x8218 */ 0x345c,
- /* key: 0x8219 */ 0xd672,
- /* key: 0x821a */ 0xd673,
- /* key: 0x821b */ 0x4124,
- /* key: 0x821c */ 0x3d58,
- /* key: 0x821d */ 0xd674,
- /* key: 0x821e */ 0x4971,
- /* key: 0x821f */ 0x3d2e,
- /* key: 0x8220 */ 0xffff,
- /* key: 0x8221 */ 0xd675,
- /* key: 0x8222 */ 0xd676,
- /* key: 0x8223 */ 0xffff,
- /* key: 0x8224 */ 0xffff,
- /* key: 0x8225 */ 0xffff,
- /* key: 0x8226 */ 0xffff,
- /* key: 0x8227 */ 0xffff,
- /* key: 0x8228 */ 0xd677,
- /* key: 0x8229 */ 0x6755,
- /* key: 0x822a */ 0x3952,
- /* key: 0x822b */ 0x6756,
- /* key: 0x822c */ 0x484c,
- /* key: 0x822d */ 0xffff,
- /* key: 0x822e */ 0x6764,
- /* key: 0x822f */ 0xffff,
- /* key: 0x8230 */ 0xffff,
- /* key: 0x8231 */ 0xffff,
- /* key: 0x8232 */ 0xd678,
- /* key: 0x8233 */ 0x6758,
- /* key: 0x8234 */ 0xd679,
- /* key: 0x8235 */ 0x4249,
- /* key: 0x8236 */ 0x4775,
- /* key: 0x8237 */ 0x383f,
- /* key: 0x8238 */ 0x6757,
- /* key: 0x8239 */ 0x4125,
- /* key: 0x823a */ 0xd67a,
- /* key: 0x823b */ 0xffff,
- /* key: 0x823c */ 0xffff,
- /* key: 0x823d */ 0xffff,
- /* key: 0x823e */ 0xffff,
- /* key: 0x823f */ 0xffff,
- /* key: 0x8240 */ 0x6759,
- /* key: 0x8241 */ 0xffff,
- /* key: 0x8242 */ 0xffff,
- /* key: 0x8243 */ 0xd67b,
- /* key: 0x8244 */ 0xd67c,
- /* key: 0x8245 */ 0xd67d,
- /* key: 0x8246 */ 0xd67e,
- /* key: 0x8247 */ 0x447a,
- /* key: 0x8248 */ 0xffff,
- /* key: 0x8249 */ 0xffff,
- /* key: 0x824a */ 0xffff,
- /* key: 0x824b */ 0xd721,
- /* key: 0x824c */ 0xffff,
- /* key: 0x824d */ 0xffff,
- /* key: 0x824e */ 0xd722,
- /* key: 0x824f */ 0xd723,
- /* key: 0x8250 */ 0xffff,
- /* key: 0x8251 */ 0xd724,
- /* key: 0x8252 */ 0xffff,
- /* key: 0x8253 */ 0xffff,
- /* key: 0x8254 */ 0xffff,
- /* key: 0x8255 */ 0xffff,
- /* key: 0x8256 */ 0xd725,
- /* key: 0x8257 */ 0xffff,
- /* key: 0x8258 */ 0x675b,
- /* key: 0x8259 */ 0x675a,
- /* key: 0x825a */ 0x675d,
- /* key: 0x825b */ 0xffff,
- /* key: 0x825c */ 0xd726,
- /* key: 0x825d */ 0x675c,
- /* key: 0x825e */ 0xffff,
- /* key: 0x825f */ 0x675e,
- /* key: 0x8260 */ 0xd727,
- /* key: 0x8261 */ 0xffff,
- /* key: 0x8262 */ 0x6760,
- /* key: 0x8263 */ 0xd728,
- /* key: 0x8264 */ 0x675f,
- /* key: 0x8265 */ 0xffff,
- /* key: 0x8266 */ 0x344f,
- /* key: 0x8267 */ 0xd729,
- /* key: 0x8268 */ 0x6761,
- /* key: 0x8269 */ 0xffff,
- /* key: 0x826a */ 0x6762,
- /* key: 0x826b */ 0x6763,
- /* key: 0x826c */ 0xffff,
- /* key: 0x826d */ 0xd72a,
- /* key: 0x826e */ 0x3a31,
- /* key: 0x826f */ 0x4e49,
- /* key: 0x8270 */ 0xffff,
- /* key: 0x8271 */ 0x6765,
- /* key: 0x8272 */ 0x3f27,
- /* key: 0x8273 */ 0xffff,
- /* key: 0x8274 */ 0xd72b,
- /* key: 0x8275 */ 0xffff,
- /* key: 0x8276 */ 0x3170,
- /* key: 0x8277 */ 0x6766,
- /* key: 0x8278 */ 0x6767,
- /* key: 0x8279 */ 0xffff,
- /* key: 0x827a */ 0xffff,
- /* key: 0x827b */ 0xd72c,
- /* key: 0x827c */ 0xffff,
- /* key: 0x827d */ 0xd72d,
- /* key: 0x827e */ 0x6768,
- /* key: 0x827f */ 0xd72e,
- /* key: 0x8280 */ 0xd72f,
- /* key: 0x8281 */ 0xd730,
- /* key: 0x8282 */ 0xffff,
- /* key: 0x8283 */ 0xd731,
- /* key: 0x8284 */ 0xd732,
- /* key: 0x8285 */ 0xffff,
- /* key: 0x8286 */ 0xffff,
- /* key: 0x8287 */ 0xd733,
- /* key: 0x8288 */ 0xffff,
- /* key: 0x8289 */ 0xd734,
- /* key: 0x828a */ 0xd735,
- /* key: 0x828b */ 0x3072,
- /* key: 0x828c */ 0xffff,
- /* key: 0x828d */ 0x6769,
- /* key: 0x828e */ 0xd736,
- /* key: 0x828f */ 0xffff,
- /* key: 0x8290 */ 0xffff,
- /* key: 0x8291 */ 0xd737,
- /* key: 0x8292 */ 0x676a,
- /* key: 0x8293 */ 0xffff,
- /* key: 0x8294 */ 0xd738,
- /* key: 0x8295 */ 0xffff,
- /* key: 0x8296 */ 0xd739,
- /* key: 0x8297 */ 0xffff,
- /* key: 0x8298 */ 0xd73a,
- /* key: 0x8299 */ 0x4967,
- /* key: 0x829a */ 0xd73b,
- /* key: 0x829b */ 0xd73c,
- /* key: 0x829c */ 0xffff,
- /* key: 0x829d */ 0x3c47,
- /* key: 0x829e */ 0xffff,
- /* key: 0x829f */ 0x676c,
- /* key: 0x82a0 */ 0xd73d,
- /* key: 0x82a1 */ 0xd73e,
- /* key: 0x82a2 */ 0xffff,
- /* key: 0x82a3 */ 0xd73f,
- /* key: 0x82a4 */ 0xd740,
- /* key: 0x82a5 */ 0x3329,
- /* key: 0x82a6 */ 0x3032,
- /* key: 0x82a7 */ 0xd741,
- /* key: 0x82a8 */ 0xd742,
- /* key: 0x82a9 */ 0xd743,
- /* key: 0x82aa */ 0xd744,
- /* key: 0x82ab */ 0x676b,
- /* key: 0x82ac */ 0x676e,
- /* key: 0x82ad */ 0x474e,
- /* key: 0x82ae */ 0xd745,
- /* key: 0x82af */ 0x3f44,
- /* key: 0x82b0 */ 0xd746,
- /* key: 0x82b1 */ 0x3256,
- /* key: 0x82b2 */ 0xd747,
- /* key: 0x82b3 */ 0x4b27,
- /* key: 0x82b4 */ 0xd748,
- /* key: 0x82b5 */ 0xffff,
- /* key: 0x82b6 */ 0xffff,
- /* key: 0x82b7 */ 0xd749,
- /* key: 0x82b8 */ 0x375d,
- /* key: 0x82b9 */ 0x365c,
- /* key: 0x82ba */ 0xd74a,
- /* key: 0x82bb */ 0x676d,
- /* key: 0x82bc */ 0xd74b,
- /* key: 0x82bd */ 0x326a,
- /* key: 0x82be */ 0xd74c,
- /* key: 0x82bf */ 0xd74d,
- /* key: 0x82c0 */ 0xffff,
- /* key: 0x82c1 */ 0xffff,
- /* key: 0x82c2 */ 0xffff,
- /* key: 0x82c3 */ 0xffff,
- /* key: 0x82c4 */ 0xffff,
- /* key: 0x82c5 */ 0x3423,
- /* key: 0x82c6 */ 0xd74e,
- /* key: 0x82c7 */ 0xffff,
- /* key: 0x82c8 */ 0xffff,
- /* key: 0x82c9 */ 0xffff,
- /* key: 0x82ca */ 0xffff,
- /* key: 0x82cb */ 0xffff,
- /* key: 0x82cc */ 0xffff,
- /* key: 0x82cd */ 0xffff,
- /* key: 0x82ce */ 0xffff,
- /* key: 0x82cf */ 0xffff,
- /* key: 0x82d0 */ 0xd74f,
- /* key: 0x82d1 */ 0x3171,
- /* key: 0x82d2 */ 0x6772,
- /* key: 0x82d3 */ 0x4e6a,
- /* key: 0x82d4 */ 0x425d,
- /* key: 0x82d5 */ 0xd750,
- /* key: 0x82d6 */ 0xffff,
- /* key: 0x82d7 */ 0x4944,
- /* key: 0x82d8 */ 0xffff,
- /* key: 0x82d9 */ 0x677e,
- /* key: 0x82da */ 0xd751,
- /* key: 0x82db */ 0x3257,
- /* key: 0x82dc */ 0x677c,
- /* key: 0x82dd */ 0xffff,
- /* key: 0x82de */ 0x677a,
- /* key: 0x82df */ 0x6771,
- /* key: 0x82e0 */ 0xd752,
- /* key: 0x82e1 */ 0x676f,
- /* key: 0x82e2 */ 0xd753,
- /* key: 0x82e3 */ 0x6770,
- /* key: 0x82e4 */ 0xd754,
- /* key: 0x82e5 */ 0x3c63,
- /* key: 0x82e6 */ 0x366c,
- /* key: 0x82e7 */ 0x4377,
- /* key: 0x82e8 */ 0xd755,
- /* key: 0x82e9 */ 0xffff,
- /* key: 0x82ea */ 0xd756,
- /* key: 0x82eb */ 0x4651,
- /* key: 0x82ec */ 0xffff,
- /* key: 0x82ed */ 0xd757,
- /* key: 0x82ee */ 0xffff,
- /* key: 0x82ef */ 0xd758,
- /* key: 0x82f0 */ 0xffff,
- /* key: 0x82f1 */ 0x3151,
- /* key: 0x82f2 */ 0xffff,
- /* key: 0x82f3 */ 0x6774,
- /* key: 0x82f4 */ 0x6773,
- /* key: 0x82f5 */ 0xffff,
- /* key: 0x82f6 */ 0xd759,
- /* key: 0x82f7 */ 0xd75a,
- /* key: 0x82f8 */ 0xffff,
- /* key: 0x82f9 */ 0x6779,
- /* key: 0x82fa */ 0x6775,
- /* key: 0x82fb */ 0x6778,
- /* key: 0x82fc */ 0xffff,
- /* key: 0x82fd */ 0xd75b,
- /* key: 0x82fe */ 0xd75c,
- /* key: 0x82ff */ 0xffff,
- /* branch: 0x830X */ 15920,
- /* branch: 0x831X */ 15936,
- /* branch: 0x832X */ 15952,
- /* branch: 0x833X */ 15968,
- /* branch: 0x834X */ 15984,
- /* branch: 0x835X */ 16000,
- /* branch: 0x836X */ 0,
- /* branch: 0x837X */ 16016,
- /* branch: 0x838X */ 16032,
- /* branch: 0x839X */ 16048,
- /* branch: 0x83aX */ 16064,
- /* branch: 0x83bX */ 16080,
- /* branch: 0x83cX */ 16096,
- /* branch: 0x83dX */ 16112,
- /* branch: 0x83eX */ 16128,
- /* branch: 0x83fX */ 16144,
- /* key: 0x8300 */ 0xd75d,
- /* key: 0x8301 */ 0xd75e,
- /* key: 0x8302 */ 0x4c50,
- /* key: 0x8303 */ 0x6777,
- /* key: 0x8304 */ 0x3258,
- /* key: 0x8305 */ 0x337d,
- /* key: 0x8306 */ 0x677b,
- /* key: 0x8307 */ 0xd75f,
- /* key: 0x8308 */ 0xd760,
- /* key: 0x8309 */ 0x677d,
- /* key: 0x830a */ 0xd761,
- /* key: 0x830b */ 0xd762,
- /* key: 0x830c */ 0xffff,
- /* key: 0x830d */ 0xffff,
- /* key: 0x830e */ 0x3754,
- /* key: 0x830f */ 0xffff,
- /* key: 0x8310 */ 0xffff,
- /* key: 0x8311 */ 0xffff,
- /* key: 0x8312 */ 0xffff,
- /* key: 0x8313 */ 0xffff,
- /* key: 0x8314 */ 0xffff,
- /* key: 0x8315 */ 0xffff,
- /* key: 0x8316 */ 0x6823,
- /* key: 0x8317 */ 0x682c,
- /* key: 0x8318 */ 0x682d,
- /* key: 0x8319 */ 0xffff,
- /* key: 0x831a */ 0xffff,
- /* key: 0x831b */ 0xd764,
- /* key: 0x831c */ 0x302b,
- /* key: 0x831d */ 0xd765,
- /* key: 0x831e */ 0xd766,
- /* key: 0x831f */ 0xd767,
- /* key: 0x8320 */ 0xffff,
- /* key: 0x8321 */ 0xd768,
- /* key: 0x8322 */ 0xd769,
- /* key: 0x8323 */ 0x6834,
- /* key: 0x8324 */ 0xffff,
- /* key: 0x8325 */ 0xffff,
- /* key: 0x8326 */ 0xffff,
- /* key: 0x8327 */ 0xffff,
- /* key: 0x8328 */ 0x3071,
- /* key: 0x8329 */ 0xffff,
- /* key: 0x832a */ 0xffff,
- /* key: 0x832b */ 0x682b,
- /* key: 0x832c */ 0xd76a,
- /* key: 0x832d */ 0xd76b,
- /* key: 0x832e */ 0xd76c,
- /* key: 0x832f */ 0x682a,
- /* key: 0x8330 */ 0xd76d,
- /* key: 0x8331 */ 0x6825,
- /* key: 0x8332 */ 0x6824,
- /* key: 0x8333 */ 0xd76e,
- /* key: 0x8334 */ 0x6822,
- /* key: 0x8335 */ 0x6821,
- /* key: 0x8336 */ 0x4363,
- /* key: 0x8337 */ 0xd76f,
- /* key: 0x8338 */ 0x427b,
- /* key: 0x8339 */ 0x6827,
- /* key: 0x833a */ 0xd770,
- /* key: 0x833b */ 0xffff,
- /* key: 0x833c */ 0xd771,
- /* key: 0x833d */ 0xd772,
- /* key: 0x833e */ 0xffff,
- /* key: 0x833f */ 0xffff,
- /* key: 0x8340 */ 0x6826,
- /* key: 0x8341 */ 0xffff,
- /* key: 0x8342 */ 0xd773,
- /* key: 0x8343 */ 0xd774,
- /* key: 0x8344 */ 0xd775,
- /* key: 0x8345 */ 0x6829,
- /* key: 0x8346 */ 0xffff,
- /* key: 0x8347 */ 0xd776,
- /* key: 0x8348 */ 0xffff,
- /* key: 0x8349 */ 0x4170,
- /* key: 0x834a */ 0x3755,
- /* key: 0x834b */ 0xffff,
- /* key: 0x834c */ 0xffff,
- /* key: 0x834d */ 0xd777,
- /* key: 0x834e */ 0xd778,
- /* key: 0x834f */ 0x3141,
- /* key: 0x8350 */ 0x6828,
- /* key: 0x8351 */ 0xd779,
- /* key: 0x8352 */ 0x3953,
- /* key: 0x8353 */ 0xd83e,
- /* key: 0x8354 */ 0xd763,
- /* key: 0x8355 */ 0xd77a,
- /* key: 0x8356 */ 0xd77b,
- /* key: 0x8357 */ 0xd77c,
- /* key: 0x8358 */ 0x4171,
- /* key: 0x8359 */ 0xffff,
- /* key: 0x835a */ 0xffff,
- /* key: 0x835b */ 0xffff,
- /* key: 0x835c */ 0xffff,
- /* key: 0x835d */ 0xffff,
- /* key: 0x835e */ 0xffff,
- /* key: 0x835f */ 0xffff,
- /* key: 0x8370 */ 0xd77d,
- /* key: 0x8371 */ 0xffff,
- /* key: 0x8372 */ 0xffff,
- /* key: 0x8373 */ 0x683a,
- /* key: 0x8374 */ 0xffff,
- /* key: 0x8375 */ 0x683b,
- /* key: 0x8376 */ 0xffff,
- /* key: 0x8377 */ 0x3259,
- /* key: 0x8378 */ 0xd77e,
- /* key: 0x8379 */ 0xffff,
- /* key: 0x837a */ 0xffff,
- /* key: 0x837b */ 0x322e,
- /* key: 0x837c */ 0x6838,
- /* key: 0x837d */ 0xd821,
- /* key: 0x837e */ 0xffff,
- /* key: 0x837f */ 0xd822,
- /* key: 0x8380 */ 0xd823,
- /* key: 0x8381 */ 0xffff,
- /* key: 0x8382 */ 0xd824,
- /* key: 0x8383 */ 0xffff,
- /* key: 0x8384 */ 0xd825,
- /* key: 0x8385 */ 0x682e,
- /* key: 0x8386 */ 0xd826,
- /* key: 0x8387 */ 0x6836,
- /* key: 0x8388 */ 0xffff,
- /* key: 0x8389 */ 0x683d,
- /* key: 0x838a */ 0x6837,
- /* key: 0x838b */ 0xffff,
- /* key: 0x838c */ 0xffff,
- /* key: 0x838d */ 0xd827,
- /* key: 0x838e */ 0x6835,
- /* key: 0x838f */ 0xffff,
- /* key: 0x8390 */ 0xffff,
- /* key: 0x8391 */ 0xffff,
- /* key: 0x8392 */ 0xd828,
- /* key: 0x8393 */ 0x6776,
- /* key: 0x8394 */ 0xd829,
- /* key: 0x8395 */ 0xd82a,
- /* key: 0x8396 */ 0x6833,
- /* key: 0x8397 */ 0xffff,
- /* key: 0x8398 */ 0xd82b,
- /* key: 0x8399 */ 0xd82c,
- /* key: 0x839a */ 0x682f,
- /* key: 0x839b */ 0xd82d,
- /* key: 0x839c */ 0xd82e,
- /* key: 0x839d */ 0xd82f,
- /* key: 0x839e */ 0x3450,
- /* key: 0x839f */ 0x6831,
- /* key: 0x83a0 */ 0x683c,
- /* key: 0x83a1 */ 0xffff,
- /* key: 0x83a2 */ 0x6832,
- /* key: 0x83a3 */ 0xffff,
- /* key: 0x83a4 */ 0xffff,
- /* key: 0x83a5 */ 0xffff,
- /* key: 0x83a6 */ 0xd830,
- /* key: 0x83a7 */ 0xd831,
- /* key: 0x83a8 */ 0x683e,
- /* key: 0x83a9 */ 0xd832,
- /* key: 0x83aa */ 0x6830,
- /* key: 0x83ab */ 0x477c,
- /* key: 0x83ac */ 0xd833,
- /* key: 0x83ad */ 0xd84c,
- /* key: 0x83ae */ 0xffff,
- /* key: 0x83af */ 0xffff,
- /* key: 0x83b0 */ 0xffff,
- /* key: 0x83b1 */ 0x4d69,
- /* key: 0x83b2 */ 0xffff,
- /* key: 0x83b3 */ 0xffff,
- /* key: 0x83b4 */ 0xffff,
- /* key: 0x83b5 */ 0x6839,
- /* key: 0x83b6 */ 0xffff,
- /* key: 0x83b7 */ 0xffff,
- /* key: 0x83b8 */ 0xffff,
- /* key: 0x83b9 */ 0xffff,
- /* key: 0x83ba */ 0xffff,
- /* key: 0x83bb */ 0xffff,
- /* key: 0x83bc */ 0xffff,
- /* key: 0x83bd */ 0x684f,
- /* key: 0x83be */ 0xd834,
- /* key: 0x83bf */ 0xd835,
- /* key: 0x83c0 */ 0xd836,
- /* key: 0x83c1 */ 0x6847,
- /* key: 0x83c2 */ 0xffff,
- /* key: 0x83c3 */ 0xffff,
- /* key: 0x83c4 */ 0xffff,
- /* key: 0x83c5 */ 0x3f7b,
- /* key: 0x83c6 */ 0xffff,
- /* key: 0x83c7 */ 0xd837,
- /* key: 0x83c8 */ 0xffff,
- /* key: 0x83c9 */ 0xd838,
- /* key: 0x83ca */ 0x3546,
- /* key: 0x83cb */ 0xffff,
- /* key: 0x83cc */ 0x365d,
- /* key: 0x83cd */ 0xffff,
- /* key: 0x83ce */ 0x6842,
- /* key: 0x83cf */ 0xd839,
- /* key: 0x83d0 */ 0xd83a,
- /* key: 0x83d1 */ 0xd83b,
- /* key: 0x83d2 */ 0xffff,
- /* key: 0x83d3 */ 0x325b,
- /* key: 0x83d4 */ 0xd83c,
- /* key: 0x83d5 */ 0xffff,
- /* key: 0x83d6 */ 0x3e54,
- /* key: 0x83d7 */ 0xffff,
- /* key: 0x83d8 */ 0x6845,
- /* key: 0x83d9 */ 0xffff,
- /* key: 0x83da */ 0xffff,
- /* key: 0x83db */ 0xffff,
- /* key: 0x83dc */ 0x3a5a,
- /* key: 0x83dd */ 0xd83d,
- /* key: 0x83de */ 0xffff,
- /* key: 0x83df */ 0x4551,
- /* key: 0x83e0 */ 0x684a,
- /* key: 0x83e1 */ 0xffff,
- /* key: 0x83e2 */ 0xffff,
- /* key: 0x83e3 */ 0xffff,
- /* key: 0x83e4 */ 0xffff,
- /* key: 0x83e5 */ 0xffff,
- /* key: 0x83e6 */ 0xffff,
- /* key: 0x83e7 */ 0xffff,
- /* key: 0x83e8 */ 0xd83f,
- /* key: 0x83e9 */ 0x4a6e,
- /* key: 0x83ea */ 0xd840,
- /* key: 0x83eb */ 0x6841,
- /* key: 0x83ec */ 0xffff,
- /* key: 0x83ed */ 0xffff,
- /* key: 0x83ee */ 0xffff,
- /* key: 0x83ef */ 0x325a,
- /* key: 0x83f0 */ 0x3856,
- /* key: 0x83f1 */ 0x4929,
- /* key: 0x83f2 */ 0x684b,
- /* key: 0x83f3 */ 0xffff,
- /* key: 0x83f4 */ 0x683f,
- /* key: 0x83f5 */ 0xffff,
- /* key: 0x83f6 */ 0xd841,
- /* key: 0x83f7 */ 0x6848,
- /* key: 0x83f8 */ 0xd842,
- /* key: 0x83f9 */ 0xd843,
- /* key: 0x83fa */ 0xffff,
- /* key: 0x83fb */ 0x6852,
- /* key: 0x83fc */ 0xd844,
- /* key: 0x83fd */ 0x6843,
- /* key: 0x83fe */ 0xffff,
- /* key: 0x83ff */ 0xffff,
- /* branch: 0x840X */ 16176,
- /* branch: 0x841X */ 16192,
- /* branch: 0x842X */ 16208,
- /* branch: 0x843X */ 16224,
- /* branch: 0x844X */ 16240,
- /* branch: 0x845X */ 16256,
- /* branch: 0x846X */ 16272,
- /* branch: 0x847X */ 16288,
- /* branch: 0x848X */ 16304,
- /* branch: 0x849X */ 16320,
- /* branch: 0x84aX */ 16336,
- /* branch: 0x84bX */ 16352,
- /* branch: 0x84cX */ 16368,
- /* branch: 0x84dX */ 16384,
- /* branch: 0x84eX */ 16400,
- /* branch: 0x84fX */ 16416,
- /* key: 0x8400 */ 0xffff,
- /* key: 0x8401 */ 0xd845,
- /* key: 0x8402 */ 0xffff,
- /* key: 0x8403 */ 0x6844,
- /* key: 0x8404 */ 0x463a,
- /* key: 0x8405 */ 0xffff,
- /* key: 0x8406 */ 0xd846,
- /* key: 0x8407 */ 0x6849,
- /* key: 0x8408 */ 0xffff,
- /* key: 0x8409 */ 0xffff,
- /* key: 0x840a */ 0xd847,
- /* key: 0x840b */ 0x6846,
- /* key: 0x840c */ 0x4b28,
- /* key: 0x840d */ 0x684c,
- /* key: 0x840e */ 0x3060,
- /* key: 0x840f */ 0xd848,
- /* key: 0x8410 */ 0xffff,
- /* key: 0x8411 */ 0xd849,
- /* key: 0x8412 */ 0xffff,
- /* key: 0x8413 */ 0x6840,
- /* key: 0x8414 */ 0xffff,
- /* key: 0x8415 */ 0xd84a,
- /* key: 0x8416 */ 0xffff,
- /* key: 0x8417 */ 0xffff,
- /* key: 0x8418 */ 0xffff,
- /* key: 0x8419 */ 0xd84b,
- /* key: 0x841a */ 0xffff,
- /* key: 0x841b */ 0xffff,
- /* key: 0x841c */ 0xffff,
- /* key: 0x841d */ 0xffff,
- /* key: 0x841e */ 0xffff,
- /* key: 0x841f */ 0xffff,
- /* key: 0x8420 */ 0x684e,
- /* key: 0x8421 */ 0xffff,
- /* key: 0x8422 */ 0x684d,
- /* key: 0x8423 */ 0xffff,
- /* key: 0x8424 */ 0xffff,
- /* key: 0x8425 */ 0xffff,
- /* key: 0x8426 */ 0xffff,
- /* key: 0x8427 */ 0xffff,
- /* key: 0x8428 */ 0xffff,
- /* key: 0x8429 */ 0x476b,
- /* key: 0x842a */ 0x6854,
- /* key: 0x842b */ 0xffff,
- /* key: 0x842c */ 0x685f,
- /* key: 0x842d */ 0xffff,
- /* key: 0x842e */ 0xffff,
- /* key: 0x842f */ 0xd84d,
- /* key: 0x8430 */ 0xffff,
- /* key: 0x8431 */ 0x337e,
- /* key: 0x8432 */ 0xffff,
- /* key: 0x8433 */ 0xffff,
- /* key: 0x8434 */ 0xffff,
- /* key: 0x8435 */ 0x6862,
- /* key: 0x8436 */ 0xffff,
- /* key: 0x8437 */ 0xffff,
- /* key: 0x8438 */ 0x6850,
- /* key: 0x8439 */ 0xd84e,
- /* key: 0x843a */ 0xffff,
- /* key: 0x843b */ 0xffff,
- /* key: 0x843c */ 0x6855,
- /* key: 0x843d */ 0x4d6e,
- /* key: 0x843e */ 0xffff,
- /* key: 0x843f */ 0xffff,
- /* key: 0x8440 */ 0xffff,
- /* key: 0x8441 */ 0xffff,
- /* key: 0x8442 */ 0xffff,
- /* key: 0x8443 */ 0xffff,
- /* key: 0x8444 */ 0xffff,
- /* key: 0x8445 */ 0xd84f,
- /* key: 0x8446 */ 0x685e,
- /* key: 0x8447 */ 0xd850,
- /* key: 0x8448 */ 0xd851,
- /* key: 0x8449 */ 0x4d55,
- /* key: 0x844a */ 0xd852,
- /* key: 0x844b */ 0xffff,
- /* key: 0x844c */ 0xffff,
- /* key: 0x844d */ 0xd853,
- /* key: 0x844e */ 0x4e2a,
- /* key: 0x844f */ 0xd854,
- /* key: 0x8450 */ 0xffff,
- /* key: 0x8451 */ 0xd855,
- /* key: 0x8452 */ 0xd856,
- /* key: 0x8453 */ 0xffff,
- /* key: 0x8454 */ 0xffff,
- /* key: 0x8455 */ 0xffff,
- /* key: 0x8456 */ 0xd857,
- /* key: 0x8457 */ 0x4378,
- /* key: 0x8458 */ 0xd858,
- /* key: 0x8459 */ 0xd859,
- /* key: 0x845a */ 0xd85a,
- /* key: 0x845b */ 0x336b,
- /* key: 0x845c */ 0xd85b,
- /* key: 0x845d */ 0xffff,
- /* key: 0x845e */ 0xffff,
- /* key: 0x845f */ 0xffff,
- /* key: 0x8460 */ 0xd85c,
- /* key: 0x8461 */ 0x4972,
- /* key: 0x8462 */ 0x6864,
- /* key: 0x8463 */ 0x4621,
- /* key: 0x8464 */ 0xd85d,
- /* key: 0x8465 */ 0xd85e,
- /* key: 0x8466 */ 0x3031,
- /* key: 0x8467 */ 0xd85f,
- /* key: 0x8468 */ 0xffff,
- /* key: 0x8469 */ 0x685d,
- /* key: 0x846a */ 0xd860,
- /* key: 0x846b */ 0x6859,
- /* key: 0x846c */ 0x4172,
- /* key: 0x846d */ 0x6853,
- /* key: 0x846e */ 0x685b,
- /* key: 0x846f */ 0x6860,
- /* key: 0x8470 */ 0xd861,
- /* key: 0x8471 */ 0x472c,
- /* key: 0x8472 */ 0xffff,
- /* key: 0x8473 */ 0xd862,
- /* key: 0x8474 */ 0xd863,
- /* key: 0x8475 */ 0x302a,
- /* key: 0x8476 */ 0xd864,
- /* key: 0x8477 */ 0x6858,
- /* key: 0x8478 */ 0xd865,
- /* key: 0x8479 */ 0x6861,
- /* key: 0x847a */ 0x4978,
- /* key: 0x847b */ 0xffff,
- /* key: 0x847c */ 0xd866,
- /* key: 0x847d */ 0xd867,
- /* key: 0x847e */ 0xffff,
- /* key: 0x847f */ 0xffff,
- /* key: 0x8480 */ 0xffff,
- /* key: 0x8481 */ 0xd868,
- /* key: 0x8482 */ 0x685c,
- /* key: 0x8483 */ 0xffff,
- /* key: 0x8484 */ 0x6857,
- /* key: 0x8485 */ 0xd869,
- /* key: 0x8486 */ 0xffff,
- /* key: 0x8487 */ 0xffff,
- /* key: 0x8488 */ 0xffff,
- /* key: 0x8489 */ 0xffff,
- /* key: 0x848a */ 0xffff,
- /* key: 0x848b */ 0x3e55,
- /* key: 0x848c */ 0xffff,
- /* key: 0x848d */ 0xffff,
- /* key: 0x848e */ 0xffff,
- /* key: 0x848f */ 0xffff,
- /* key: 0x8490 */ 0x3d2f,
- /* key: 0x8491 */ 0xffff,
- /* key: 0x8492 */ 0xd86a,
- /* key: 0x8493 */ 0xd86b,
- /* key: 0x8494 */ 0x3c2c,
- /* key: 0x8495 */ 0xd86c,
- /* key: 0x8496 */ 0xffff,
- /* key: 0x8497 */ 0xffff,
- /* key: 0x8498 */ 0xffff,
- /* key: 0x8499 */ 0x4c58,
- /* key: 0x849a */ 0xffff,
- /* key: 0x849b */ 0xffff,
- /* key: 0x849c */ 0x4947,
- /* key: 0x849d */ 0xffff,
- /* key: 0x849e */ 0xd86d,
- /* key: 0x849f */ 0x6867,
- /* key: 0x84a0 */ 0xffff,
- /* key: 0x84a1 */ 0x6870,
- /* key: 0x84a2 */ 0xffff,
- /* key: 0x84a3 */ 0xffff,
- /* key: 0x84a4 */ 0xffff,
- /* key: 0x84a5 */ 0xffff,
- /* key: 0x84a6 */ 0xd86e,
- /* key: 0x84a7 */ 0xffff,
- /* key: 0x84a8 */ 0xd86f,
- /* key: 0x84a9 */ 0xd870,
- /* key: 0x84aa */ 0xd871,
- /* key: 0x84ab */ 0xffff,
- /* key: 0x84ac */ 0xffff,
- /* key: 0x84ad */ 0x685a,
- /* key: 0x84ae */ 0xffff,
- /* key: 0x84af */ 0xd872,
- /* key: 0x84b0 */ 0xffff,
- /* key: 0x84b1 */ 0xd873,
- /* key: 0x84b2 */ 0x3377,
- /* key: 0x84b3 */ 0xffff,
- /* key: 0x84b4 */ 0xd874,
- /* key: 0x84b5 */ 0xffff,
- /* key: 0x84b6 */ 0xffff,
- /* key: 0x84b7 */ 0xffff,
- /* key: 0x84b8 */ 0x3e78,
- /* key: 0x84b9 */ 0x6865,
- /* key: 0x84ba */ 0xd875,
- /* key: 0x84bb */ 0x686a,
- /* key: 0x84bc */ 0x4173,
- /* key: 0x84bd */ 0xd876,
- /* key: 0x84be */ 0xd877,
- /* key: 0x84bf */ 0x6866,
- /* key: 0x84c0 */ 0xd878,
- /* key: 0x84c1 */ 0x686d,
- /* key: 0x84c2 */ 0xd879,
- /* key: 0x84c3 */ 0xffff,
- /* key: 0x84c4 */ 0x435f,
- /* key: 0x84c5 */ 0xffff,
- /* key: 0x84c6 */ 0x686e,
- /* key: 0x84c7 */ 0xd87a,
- /* key: 0x84c8 */ 0xd87b,
- /* key: 0x84c9 */ 0x4d56,
- /* key: 0x84ca */ 0x6863,
- /* key: 0x84cb */ 0x3338,
- /* key: 0x84cc */ 0xd87c,
- /* key: 0x84cd */ 0x6869,
- /* key: 0x84ce */ 0xffff,
- /* key: 0x84cf */ 0xd87d,
- /* key: 0x84d0 */ 0x686c,
- /* key: 0x84d1 */ 0x4c2c,
- /* key: 0x84d2 */ 0xffff,
- /* key: 0x84d3 */ 0xd87e,
- /* key: 0x84d4 */ 0xffff,
- /* key: 0x84d5 */ 0xffff,
- /* key: 0x84d6 */ 0x686f,
- /* key: 0x84d7 */ 0xffff,
- /* key: 0x84d8 */ 0xffff,
- /* key: 0x84d9 */ 0x6868,
- /* key: 0x84da */ 0x686b,
- /* key: 0x84db */ 0xffff,
- /* key: 0x84dc */ 0xd921,
- /* key: 0x84dd */ 0xffff,
- /* key: 0x84de */ 0xffff,
- /* key: 0x84df */ 0xffff,
- /* key: 0x84e0 */ 0xffff,
- /* key: 0x84e1 */ 0xffff,
- /* key: 0x84e2 */ 0xffff,
- /* key: 0x84e3 */ 0xffff,
- /* key: 0x84e4 */ 0xffff,
- /* key: 0x84e5 */ 0xffff,
- /* key: 0x84e6 */ 0xffff,
- /* key: 0x84e7 */ 0xd922,
- /* key: 0x84e8 */ 0xffff,
- /* key: 0x84e9 */ 0xffff,
- /* key: 0x84ea */ 0xd923,
- /* key: 0x84eb */ 0xffff,
- /* key: 0x84ec */ 0x4b29,
- /* key: 0x84ed */ 0xffff,
- /* key: 0x84ee */ 0x4f21,
- /* key: 0x84ef */ 0xd924,
- /* key: 0x84f0 */ 0xd925,
- /* key: 0x84f1 */ 0xd926,
- /* key: 0x84f2 */ 0xd927,
- /* key: 0x84f3 */ 0xffff,
- /* key: 0x84f4 */ 0x6873,
- /* key: 0x84f5 */ 0xffff,
- /* key: 0x84f6 */ 0xffff,
- /* key: 0x84f7 */ 0xd928,
- /* key: 0x84f8 */ 0xffff,
- /* key: 0x84f9 */ 0xffff,
- /* key: 0x84fa */ 0xd92a,
- /* key: 0x84fb */ 0xd92b,
- /* key: 0x84fc */ 0x687a,
- /* key: 0x84fd */ 0xd92c,
- /* key: 0x84fe */ 0xffff,
- /* key: 0x84ff */ 0x6872,
- /* branch: 0x850X */ 16448,
- /* branch: 0x851X */ 16464,
- /* branch: 0x852X */ 16480,
- /* branch: 0x853X */ 16496,
- /* branch: 0x854X */ 16512,
- /* branch: 0x855X */ 16528,
- /* branch: 0x856X */ 16544,
- /* branch: 0x857X */ 16560,
- /* branch: 0x858X */ 16576,
- /* branch: 0x859X */ 16592,
- /* branch: 0x85aX */ 16608,
- /* branch: 0x85bX */ 16624,
- /* branch: 0x85cX */ 16640,
- /* branch: 0x85dX */ 16656,
- /* branch: 0x85eX */ 16672,
- /* branch: 0x85fX */ 16688,
- /* key: 0x8500 */ 0x3c43,
- /* key: 0x8501 */ 0xffff,
- /* key: 0x8502 */ 0xd92d,
- /* key: 0x8503 */ 0xd92e,
- /* key: 0x8504 */ 0xffff,
- /* key: 0x8505 */ 0xffff,
- /* key: 0x8506 */ 0x6851,
- /* key: 0x8507 */ 0xd92f,
- /* key: 0x8508 */ 0xffff,
- /* key: 0x8509 */ 0xffff,
- /* key: 0x850a */ 0xffff,
- /* key: 0x850b */ 0xffff,
- /* key: 0x850c */ 0xd930,
- /* key: 0x850d */ 0xffff,
- /* key: 0x850e */ 0xd931,
- /* key: 0x850f */ 0xffff,
- /* key: 0x8510 */ 0xd932,
- /* key: 0x8511 */ 0x4a4e,
- /* key: 0x8512 */ 0xffff,
- /* key: 0x8513 */ 0x4c22,
- /* key: 0x8514 */ 0x6879,
- /* key: 0x8515 */ 0x6878,
- /* key: 0x8516 */ 0xffff,
- /* key: 0x8517 */ 0x6874,
- /* key: 0x8518 */ 0x6875,
- /* key: 0x8519 */ 0xffff,
- /* key: 0x851a */ 0x3136,
- /* key: 0x851b */ 0xffff,
- /* key: 0x851c */ 0xd933,
- /* key: 0x851d */ 0xffff,
- /* key: 0x851e */ 0xd934,
- /* key: 0x851f */ 0x6877,
- /* key: 0x8520 */ 0xffff,
- /* key: 0x8521 */ 0x6871,
- /* key: 0x8522 */ 0xd935,
- /* key: 0x8523 */ 0xd936,
- /* key: 0x8524 */ 0xd937,
- /* key: 0x8525 */ 0xd938,
- /* key: 0x8526 */ 0x4455,
- /* key: 0x8527 */ 0xd939,
- /* key: 0x8528 */ 0xffff,
- /* key: 0x8529 */ 0xffff,
- /* key: 0x852a */ 0xd93a,
- /* key: 0x852b */ 0xd93b,
- /* key: 0x852c */ 0x6876,
- /* key: 0x852d */ 0x307e,
- /* key: 0x852e */ 0xffff,
- /* key: 0x852f */ 0xd93c,
- /* key: 0x8530 */ 0xffff,
- /* key: 0x8531 */ 0xffff,
- /* key: 0x8532 */ 0xd929,
- /* key: 0x8533 */ 0xd93d,
- /* key: 0x8534 */ 0xd93e,
- /* key: 0x8535 */ 0x4222,
- /* key: 0x8536 */ 0xd93f,
- /* key: 0x8537 */ 0xffff,
- /* key: 0x8538 */ 0xffff,
- /* key: 0x8539 */ 0xffff,
- /* key: 0x853a */ 0xffff,
- /* key: 0x853b */ 0xffff,
- /* key: 0x853c */ 0xffff,
- /* key: 0x853d */ 0x4a43,
- /* key: 0x853e */ 0xffff,
- /* key: 0x853f */ 0xd940,
- /* key: 0x8540 */ 0x687b,
- /* key: 0x8541 */ 0x6921,
- /* key: 0x8542 */ 0xffff,
- /* key: 0x8543 */ 0x4859,
- /* key: 0x8544 */ 0xffff,
- /* key: 0x8545 */ 0xffff,
- /* key: 0x8546 */ 0xd941,
- /* key: 0x8547 */ 0xffff,
- /* key: 0x8548 */ 0x687e,
- /* key: 0x8549 */ 0x3e56,
- /* key: 0x854a */ 0x3c49,
- /* key: 0x854b */ 0x6923,
- /* key: 0x854c */ 0xffff,
- /* key: 0x854d */ 0xffff,
- /* key: 0x854e */ 0x363e,
- /* key: 0x854f */ 0xd942,
- /* key: 0x8550 */ 0xd943,
- /* key: 0x8551 */ 0xd944,
- /* key: 0x8552 */ 0xd945,
- /* key: 0x8553 */ 0xd946,
- /* key: 0x8554 */ 0xffff,
- /* key: 0x8555 */ 0x6924,
- /* key: 0x8556 */ 0xd947,
- /* key: 0x8557 */ 0x4979,
- /* key: 0x8558 */ 0x687d,
- /* key: 0x8559 */ 0xd948,
- /* key: 0x855a */ 0x6856,
- /* key: 0x855b */ 0xffff,
- /* key: 0x855c */ 0xd949,
- /* key: 0x855d */ 0xd94a,
- /* key: 0x855e */ 0xd94b,
- /* key: 0x855f */ 0xd94c,
- /* key: 0x8560 */ 0xd94d,
- /* key: 0x8561 */ 0xd94e,
- /* key: 0x8562 */ 0xd94f,
- /* key: 0x8563 */ 0x687c,
- /* key: 0x8564 */ 0xd950,
- /* key: 0x8565 */ 0xffff,
- /* key: 0x8566 */ 0xffff,
- /* key: 0x8567 */ 0xffff,
- /* key: 0x8568 */ 0x4f4f,
- /* key: 0x8569 */ 0x4622,
- /* key: 0x856a */ 0x4973,
- /* key: 0x856b */ 0xd951,
- /* key: 0x856c */ 0xffff,
- /* key: 0x856d */ 0x692b,
- /* key: 0x856e */ 0xffff,
- /* key: 0x856f */ 0xd952,
- /* key: 0x8570 */ 0xffff,
- /* key: 0x8571 */ 0xffff,
- /* key: 0x8572 */ 0xffff,
- /* key: 0x8573 */ 0xffff,
- /* key: 0x8574 */ 0xffff,
- /* key: 0x8575 */ 0xffff,
- /* key: 0x8576 */ 0xffff,
- /* key: 0x8577 */ 0x6931,
- /* key: 0x8578 */ 0xffff,
- /* key: 0x8579 */ 0xd953,
- /* key: 0x857a */ 0xd954,
- /* key: 0x857b */ 0xd955,
- /* key: 0x857c */ 0xffff,
- /* key: 0x857d */ 0xd956,
- /* key: 0x857e */ 0x6932,
- /* key: 0x857f */ 0xd957,
- /* key: 0x8580 */ 0x6925,
- /* key: 0x8581 */ 0xd958,
- /* key: 0x8582 */ 0xffff,
- /* key: 0x8583 */ 0xffff,
- /* key: 0x8584 */ 0x4776,
- /* key: 0x8585 */ 0xd959,
- /* key: 0x8586 */ 0xd95a,
- /* key: 0x8587 */ 0x692f,
- /* key: 0x8588 */ 0x6927,
- /* key: 0x8589 */ 0xd95b,
- /* key: 0x858a */ 0x6929,
- /* key: 0x858b */ 0xd95c,
- /* key: 0x858c */ 0xd95d,
- /* key: 0x858d */ 0xffff,
- /* key: 0x858e */ 0xffff,
- /* key: 0x858f */ 0xd95e,
- /* key: 0x8590 */ 0x6933,
- /* key: 0x8591 */ 0x6928,
- /* key: 0x8592 */ 0xffff,
- /* key: 0x8593 */ 0xd95f,
- /* key: 0x8594 */ 0x692c,
- /* key: 0x8595 */ 0xffff,
- /* key: 0x8596 */ 0xffff,
- /* key: 0x8597 */ 0x3172,
- /* key: 0x8598 */ 0xd960,
- /* key: 0x8599 */ 0x4665,
- /* key: 0x859a */ 0xffff,
- /* key: 0x859b */ 0x692d,
- /* key: 0x859c */ 0x6930,
- /* key: 0x859d */ 0xd961,
- /* key: 0x859e */ 0xffff,
- /* key: 0x859f */ 0xd962,
- /* key: 0x85a0 */ 0xd963,
- /* key: 0x85a1 */ 0xffff,
- /* key: 0x85a2 */ 0xd964,
- /* key: 0x85a3 */ 0xffff,
- /* key: 0x85a4 */ 0x6926,
- /* key: 0x85a5 */ 0xd965,
- /* key: 0x85a6 */ 0x4126,
- /* key: 0x85a7 */ 0xd966,
- /* key: 0x85a8 */ 0x692a,
- /* key: 0x85a9 */ 0x3b27,
- /* key: 0x85aa */ 0x3f45,
- /* key: 0x85ab */ 0x3730,
- /* key: 0x85ac */ 0x4c74,
- /* key: 0x85ad */ 0xd974,
- /* key: 0x85ae */ 0x4c79,
- /* key: 0x85af */ 0x3d72,
- /* key: 0x85b0 */ 0xffff,
- /* key: 0x85b1 */ 0xffff,
- /* key: 0x85b2 */ 0xffff,
- /* key: 0x85b3 */ 0xffff,
- /* key: 0x85b4 */ 0xd967,
- /* key: 0x85b5 */ 0xffff,
- /* key: 0x85b6 */ 0xd968,
- /* key: 0x85b7 */ 0xd969,
- /* key: 0x85b8 */ 0xd96a,
- /* key: 0x85b9 */ 0x6937,
- /* key: 0x85ba */ 0x6935,
- /* key: 0x85bb */ 0xffff,
- /* key: 0x85bc */ 0xd96b,
- /* key: 0x85bd */ 0xd96c,
- /* key: 0x85be */ 0xd96d,
- /* key: 0x85bf */ 0xd96e,
- /* key: 0x85c0 */ 0xffff,
- /* key: 0x85c1 */ 0x4f4e,
- /* key: 0x85c2 */ 0xd96f,
- /* key: 0x85c3 */ 0xffff,
- /* key: 0x85c4 */ 0xffff,
- /* key: 0x85c5 */ 0xffff,
- /* key: 0x85c6 */ 0xffff,
- /* key: 0x85c7 */ 0xd970,
- /* key: 0x85c8 */ 0xffff,
- /* key: 0x85c9 */ 0x6934,
- /* key: 0x85ca */ 0xd971,
- /* key: 0x85cb */ 0xd972,
- /* key: 0x85cc */ 0xffff,
- /* key: 0x85cd */ 0x4d75,
- /* key: 0x85ce */ 0xd973,
- /* key: 0x85cf */ 0x6936,
- /* key: 0x85d0 */ 0x6938,
- /* key: 0x85d1 */ 0xffff,
- /* key: 0x85d2 */ 0xffff,
- /* key: 0x85d3 */ 0xffff,
- /* key: 0x85d4 */ 0xffff,
- /* key: 0x85d5 */ 0x6939,
- /* key: 0x85d6 */ 0xffff,
- /* key: 0x85d7 */ 0xffff,
- /* key: 0x85d8 */ 0xd975,
- /* key: 0x85d9 */ 0xffff,
- /* key: 0x85da */ 0xd976,
- /* key: 0x85db */ 0xffff,
- /* key: 0x85dc */ 0x693c,
- /* key: 0x85dd */ 0x693a,
- /* key: 0x85de */ 0xffff,
- /* key: 0x85df */ 0xd977,
- /* key: 0x85e0 */ 0xd978,
- /* key: 0x85e1 */ 0xffff,
- /* key: 0x85e2 */ 0xffff,
- /* key: 0x85e3 */ 0xffff,
- /* key: 0x85e4 */ 0x4623,
- /* key: 0x85e5 */ 0x693b,
- /* key: 0x85e6 */ 0xd979,
- /* key: 0x85e7 */ 0xffff,
- /* key: 0x85e8 */ 0xd97a,
- /* key: 0x85e9 */ 0x484d,
- /* key: 0x85ea */ 0x692e,
- /* key: 0x85eb */ 0xffff,
- /* key: 0x85ec */ 0xffff,
- /* key: 0x85ed */ 0xd97b,
- /* key: 0x85ee */ 0xffff,
- /* key: 0x85ef */ 0xffff,
- /* key: 0x85f0 */ 0xffff,
- /* key: 0x85f1 */ 0xffff,
- /* key: 0x85f2 */ 0xffff,
- /* key: 0x85f3 */ 0xd97c,
- /* key: 0x85f4 */ 0xffff,
- /* key: 0x85f5 */ 0xffff,
- /* key: 0x85f6 */ 0xd97d,
- /* key: 0x85f7 */ 0x3d73,
- /* key: 0x85f8 */ 0xffff,
- /* key: 0x85f9 */ 0x693d,
- /* key: 0x85fa */ 0x6942,
- /* key: 0x85fb */ 0x4174,
- /* key: 0x85fc */ 0xd97e,
- /* key: 0x85fd */ 0xffff,
- /* key: 0x85fe */ 0x6941,
- /* key: 0x85ff */ 0xda21,
- /* branch: 0x860X */ 16720,
- /* branch: 0x861X */ 16736,
- /* branch: 0x862X */ 16752,
- /* branch: 0x863X */ 16768,
- /* branch: 0x864X */ 16784,
- /* branch: 0x865X */ 16800,
- /* branch: 0x866X */ 16816,
- /* branch: 0x867X */ 16832,
- /* branch: 0x868X */ 16848,
- /* branch: 0x869X */ 16864,
- /* branch: 0x86aX */ 16880,
- /* branch: 0x86bX */ 16896,
- /* branch: 0x86cX */ 16912,
- /* branch: 0x86dX */ 16928,
- /* branch: 0x86eX */ 16944,
- /* branch: 0x86fX */ 16960,
- /* key: 0x8600 */ 0xda22,
- /* key: 0x8601 */ 0xffff,
- /* key: 0x8602 */ 0x6922,
- /* key: 0x8603 */ 0xffff,
- /* key: 0x8604 */ 0xda23,
- /* key: 0x8605 */ 0xda24,
- /* key: 0x8606 */ 0x6943,
- /* key: 0x8607 */ 0x4149,
- /* key: 0x8608 */ 0xffff,
- /* key: 0x8609 */ 0xffff,
- /* key: 0x860a */ 0x693e,
- /* key: 0x860b */ 0x6940,
- /* key: 0x860c */ 0xffff,
- /* key: 0x860d */ 0xda25,
- /* key: 0x860e */ 0xda26,
- /* key: 0x860f */ 0xffff,
- /* key: 0x8610 */ 0xda27,
- /* key: 0x8611 */ 0xda28,
- /* key: 0x8612 */ 0xda29,
- /* key: 0x8613 */ 0x693f,
- /* key: 0x8614 */ 0xffff,
- /* key: 0x8615 */ 0xffff,
- /* key: 0x8616 */ 0x5d31,
- /* key: 0x8617 */ 0x5d22,
- /* key: 0x8618 */ 0xda2a,
- /* key: 0x8619 */ 0xda2b,
- /* key: 0x861a */ 0x6945,
- /* key: 0x861b */ 0xda2c,
- /* key: 0x861c */ 0xffff,
- /* key: 0x861d */ 0xffff,
- /* key: 0x861e */ 0xda2d,
- /* key: 0x861f */ 0xffff,
- /* key: 0x8620 */ 0xffff,
- /* key: 0x8621 */ 0xda2e,
- /* key: 0x8622 */ 0x6944,
- /* key: 0x8623 */ 0xffff,
- /* key: 0x8624 */ 0xffff,
- /* key: 0x8625 */ 0xffff,
- /* key: 0x8626 */ 0xffff,
- /* key: 0x8627 */ 0xda2f,
- /* key: 0x8628 */ 0xffff,
- /* key: 0x8629 */ 0xda30,
- /* key: 0x862a */ 0xffff,
- /* key: 0x862b */ 0xffff,
- /* key: 0x862c */ 0xffff,
- /* key: 0x862d */ 0x4d76,
- /* key: 0x862e */ 0xffff,
- /* key: 0x862f */ 0x623c,
- /* key: 0x8630 */ 0x6946,
- /* key: 0x8631 */ 0xffff,
- /* key: 0x8632 */ 0xffff,
- /* key: 0x8633 */ 0xffff,
- /* key: 0x8634 */ 0xffff,
- /* key: 0x8635 */ 0xffff,
- /* key: 0x8636 */ 0xda31,
- /* key: 0x8637 */ 0xffff,
- /* key: 0x8638 */ 0xda32,
- /* key: 0x8639 */ 0xffff,
- /* key: 0x863a */ 0xda33,
- /* key: 0x863b */ 0xffff,
- /* key: 0x863c */ 0xda34,
- /* key: 0x863d */ 0xda35,
- /* key: 0x863e */ 0xffff,
- /* key: 0x863f */ 0x6947,
- /* key: 0x8640 */ 0xda36,
- /* key: 0x8641 */ 0xb866,
- /* key: 0x8642 */ 0xda37,
- /* key: 0x8643 */ 0xffff,
- /* key: 0x8644 */ 0xffff,
- /* key: 0x8645 */ 0xffff,
- /* key: 0x8646 */ 0xda38,
- /* key: 0x8647 */ 0xffff,
- /* key: 0x8648 */ 0xffff,
- /* key: 0x8649 */ 0xffff,
- /* key: 0x864a */ 0xffff,
- /* key: 0x864b */ 0xffff,
- /* key: 0x864c */ 0xffff,
- /* key: 0x864d */ 0x6948,
- /* key: 0x864e */ 0x3857,
- /* key: 0x864f */ 0xffff,
- /* key: 0x8650 */ 0x3554,
- /* key: 0x8651 */ 0xffff,
- /* key: 0x8652 */ 0xda39,
- /* key: 0x8653 */ 0xda3a,
- /* key: 0x8654 */ 0x694a,
- /* key: 0x8655 */ 0x515d,
- /* key: 0x8656 */ 0xda3b,
- /* key: 0x8657 */ 0xda3c,
- /* key: 0x8658 */ 0xda3d,
- /* key: 0x8659 */ 0xda3e,
- /* key: 0x865a */ 0x3575,
- /* key: 0x865b */ 0xffff,
- /* key: 0x865c */ 0x4e3a,
- /* key: 0x865d */ 0xda3f,
- /* key: 0x865e */ 0x3673,
- /* key: 0x865f */ 0x694b,
- /* key: 0x8660 */ 0xda40,
- /* key: 0x8661 */ 0xda41,
- /* key: 0x8662 */ 0xda42,
- /* key: 0x8663 */ 0xda43,
- /* key: 0x8664 */ 0xda44,
- /* key: 0x8665 */ 0xffff,
- /* key: 0x8666 */ 0xffff,
- /* key: 0x8667 */ 0x694c,
- /* key: 0x8668 */ 0xffff,
- /* key: 0x8669 */ 0xda45,
- /* key: 0x866a */ 0xffff,
- /* key: 0x866b */ 0x436e,
- /* key: 0x866c */ 0xda46,
- /* key: 0x866d */ 0xffff,
- /* key: 0x866e */ 0xffff,
- /* key: 0x866f */ 0xda47,
- /* key: 0x8670 */ 0xffff,
- /* key: 0x8671 */ 0x694d,
- /* key: 0x8672 */ 0xffff,
- /* key: 0x8673 */ 0xffff,
- /* key: 0x8674 */ 0xffff,
- /* key: 0x8675 */ 0xda48,
- /* key: 0x8676 */ 0xda49,
- /* key: 0x8677 */ 0xda4a,
- /* key: 0x8678 */ 0xffff,
- /* key: 0x8679 */ 0x467a,
- /* key: 0x867a */ 0xda4b,
- /* key: 0x867b */ 0x303a,
- /* key: 0x867c */ 0xffff,
- /* key: 0x867d */ 0xffff,
- /* key: 0x867e */ 0xffff,
- /* key: 0x867f */ 0xffff,
- /* key: 0x8680 */ 0xffff,
- /* key: 0x8681 */ 0xffff,
- /* key: 0x8682 */ 0xffff,
- /* key: 0x8683 */ 0xffff,
- /* key: 0x8684 */ 0xffff,
- /* key: 0x8685 */ 0xffff,
- /* key: 0x8686 */ 0xffff,
- /* key: 0x8687 */ 0xffff,
- /* key: 0x8688 */ 0xda6d,
- /* key: 0x8689 */ 0xffff,
- /* key: 0x868a */ 0x3263,
- /* key: 0x868b */ 0x6952,
- /* key: 0x868c */ 0x6953,
- /* key: 0x868d */ 0xda4c,
- /* key: 0x868e */ 0xffff,
- /* key: 0x868f */ 0xffff,
- /* key: 0x8690 */ 0xffff,
- /* key: 0x8691 */ 0xda4d,
- /* key: 0x8692 */ 0xffff,
- /* key: 0x8693 */ 0x694e,
- /* key: 0x8694 */ 0xffff,
- /* key: 0x8695 */ 0x3b3d,
- /* key: 0x8696 */ 0xda4e,
- /* key: 0x8697 */ 0xffff,
- /* key: 0x8698 */ 0xda4f,
- /* key: 0x8699 */ 0xffff,
- /* key: 0x869a */ 0xda50,
- /* key: 0x869b */ 0xffff,
- /* key: 0x869c */ 0xda51,
- /* key: 0x869d */ 0xffff,
- /* key: 0x869e */ 0xffff,
- /* key: 0x869f */ 0xffff,
- /* key: 0x86a0 */ 0xffff,
- /* key: 0x86a1 */ 0xda52,
- /* key: 0x86a2 */ 0xffff,
- /* key: 0x86a3 */ 0x694f,
- /* key: 0x86a4 */ 0x4742,
- /* key: 0x86a5 */ 0xffff,
- /* key: 0x86a6 */ 0xda53,
- /* key: 0x86a7 */ 0xda54,
- /* key: 0x86a8 */ 0xda55,
- /* key: 0x86a9 */ 0x6950,
- /* key: 0x86aa */ 0x6951,
- /* key: 0x86ab */ 0x695b,
- /* key: 0x86ac */ 0xffff,
- /* key: 0x86ad */ 0xda56,
- /* key: 0x86ae */ 0xffff,
- /* key: 0x86af */ 0x6955,
- /* key: 0x86b0 */ 0x6958,
- /* key: 0x86b1 */ 0xda57,
- /* key: 0x86b2 */ 0xffff,
- /* key: 0x86b3 */ 0xda58,
- /* key: 0x86b4 */ 0xda59,
- /* key: 0x86b5 */ 0xda5a,
- /* key: 0x86b6 */ 0x6954,
- /* key: 0x86b7 */ 0xda5b,
- /* key: 0x86b8 */ 0xda5c,
- /* key: 0x86b9 */ 0xda5d,
- /* key: 0x86ba */ 0xffff,
- /* key: 0x86bb */ 0xffff,
- /* key: 0x86bc */ 0xffff,
- /* key: 0x86bd */ 0xffff,
- /* key: 0x86be */ 0xffff,
- /* key: 0x86bf */ 0xda5e,
- /* key: 0x86c0 */ 0xda5f,
- /* key: 0x86c1 */ 0xda60,
- /* key: 0x86c2 */ 0xffff,
- /* key: 0x86c3 */ 0xda61,
- /* key: 0x86c4 */ 0x6956,
- /* key: 0x86c5 */ 0xda62,
- /* key: 0x86c6 */ 0x6957,
- /* key: 0x86c7 */ 0x3c58,
- /* key: 0x86c8 */ 0xffff,
- /* key: 0x86c9 */ 0x6959,
- /* key: 0x86ca */ 0xffff,
- /* key: 0x86cb */ 0x4341,
- /* key: 0x86cc */ 0xffff,
- /* key: 0x86cd */ 0x3756,
- /* key: 0x86ce */ 0x3342,
- /* key: 0x86cf */ 0xffff,
- /* key: 0x86d0 */ 0xffff,
- /* key: 0x86d1 */ 0xda63,
- /* key: 0x86d2 */ 0xda64,
- /* key: 0x86d3 */ 0xffff,
- /* key: 0x86d4 */ 0x695c,
- /* key: 0x86d5 */ 0xda65,
- /* key: 0x86d6 */ 0xffff,
- /* key: 0x86d7 */ 0xda66,
- /* key: 0x86d8 */ 0xffff,
- /* key: 0x86d9 */ 0x333f,
- /* key: 0x86da */ 0xda67,
- /* key: 0x86db */ 0x6961,
- /* key: 0x86dc */ 0xda68,
- /* key: 0x86dd */ 0xffff,
- /* key: 0x86de */ 0x695d,
- /* key: 0x86df */ 0x6960,
- /* key: 0x86e0 */ 0xda69,
- /* key: 0x86e1 */ 0xffff,
- /* key: 0x86e2 */ 0xffff,
- /* key: 0x86e3 */ 0xda6a,
- /* key: 0x86e4 */ 0x483a,
- /* key: 0x86e5 */ 0xda6b,
- /* key: 0x86e6 */ 0xffff,
- /* key: 0x86e7 */ 0xda6c,
- /* key: 0x86e8 */ 0xffff,
- /* key: 0x86e9 */ 0x695e,
- /* key: 0x86ea */ 0xffff,
- /* key: 0x86eb */ 0xffff,
- /* key: 0x86ec */ 0x695f,
- /* key: 0x86ed */ 0x4948,
- /* key: 0x86ee */ 0x485a,
- /* key: 0x86ef */ 0x6962,
- /* key: 0x86f0 */ 0xffff,
- /* key: 0x86f1 */ 0xffff,
- /* key: 0x86f2 */ 0xffff,
- /* key: 0x86f3 */ 0xffff,
- /* key: 0x86f4 */ 0xffff,
- /* key: 0x86f5 */ 0xffff,
- /* key: 0x86f6 */ 0xffff,
- /* key: 0x86f7 */ 0xffff,
- /* key: 0x86f8 */ 0x427d,
- /* key: 0x86f9 */ 0x696c,
- /* key: 0x86fa */ 0xda6e,
- /* key: 0x86fb */ 0x6968,
- /* key: 0x86fc */ 0xda6f,
- /* key: 0x86fd */ 0xda70,
- /* key: 0x86fe */ 0x326b,
- /* key: 0x86ff */ 0xffff,
- /* branch: 0x870X */ 16992,
- /* branch: 0x871X */ 17008,
- /* branch: 0x872X */ 17024,
- /* branch: 0x873X */ 17040,
- /* branch: 0x874X */ 17056,
- /* branch: 0x875X */ 17072,
- /* branch: 0x876X */ 17088,
- /* branch: 0x877X */ 17104,
- /* branch: 0x878X */ 17120,
- /* branch: 0x879X */ 17136,
- /* branch: 0x87aX */ 17152,
- /* branch: 0x87bX */ 17168,
- /* branch: 0x87cX */ 17184,
- /* branch: 0x87dX */ 17200,
- /* branch: 0x87eX */ 17216,
- /* branch: 0x87fX */ 17232,
- /* key: 0x8700 */ 0x6966,
- /* key: 0x8701 */ 0xffff,
- /* key: 0x8702 */ 0x4b2a,
- /* key: 0x8703 */ 0x6967,
- /* key: 0x8704 */ 0xda71,
- /* key: 0x8705 */ 0xda72,
- /* key: 0x8706 */ 0x6964,
- /* key: 0x8707 */ 0xda73,
- /* key: 0x8708 */ 0x6965,
- /* key: 0x8709 */ 0x696a,
- /* key: 0x870a */ 0x696d,
- /* key: 0x870b */ 0xda74,
- /* key: 0x870c */ 0xffff,
- /* key: 0x870d */ 0x696b,
- /* key: 0x870e */ 0xda75,
- /* key: 0x870f */ 0xda76,
- /* key: 0x8710 */ 0xda77,
- /* key: 0x8711 */ 0x6969,
- /* key: 0x8712 */ 0x6963,
- /* key: 0x8713 */ 0xda78,
- /* key: 0x8714 */ 0xda79,
- /* key: 0x8715 */ 0xffff,
- /* key: 0x8716 */ 0xffff,
- /* key: 0x8717 */ 0xffff,
- /* key: 0x8718 */ 0x4358,
- /* key: 0x8719 */ 0xda7a,
- /* key: 0x871a */ 0x6974,
- /* key: 0x871b */ 0xffff,
- /* key: 0x871c */ 0x4c2a,
- /* key: 0x871d */ 0xffff,
- /* key: 0x871e */ 0xda7b,
- /* key: 0x871f */ 0xda7c,
- /* key: 0x8720 */ 0xffff,
- /* key: 0x8721 */ 0xda7d,
- /* key: 0x8722 */ 0xffff,
- /* key: 0x8723 */ 0xda7e,
- /* key: 0x8724 */ 0xffff,
- /* key: 0x8725 */ 0x6972,
- /* key: 0x8726 */ 0xffff,
- /* key: 0x8727 */ 0xffff,
- /* key: 0x8728 */ 0xdb21,
- /* key: 0x8729 */ 0x6973,
- /* key: 0x872a */ 0xffff,
- /* key: 0x872b */ 0xffff,
- /* key: 0x872c */ 0xffff,
- /* key: 0x872d */ 0xffff,
- /* key: 0x872e */ 0xdb22,
- /* key: 0x872f */ 0xdb23,
- /* key: 0x8730 */ 0xffff,
- /* key: 0x8731 */ 0xdb24,
- /* key: 0x8732 */ 0xdb25,
- /* key: 0x8733 */ 0xffff,
- /* key: 0x8734 */ 0x696e,
- /* key: 0x8735 */ 0xffff,
- /* key: 0x8736 */ 0xffff,
- /* key: 0x8737 */ 0x6970,
- /* key: 0x8738 */ 0xffff,
- /* key: 0x8739 */ 0xdb26,
- /* key: 0x873a */ 0xdb27,
- /* key: 0x873b */ 0x6971,
- /* key: 0x873c */ 0xdb28,
- /* key: 0x873d */ 0xdb29,
- /* key: 0x873e */ 0xdb2a,
- /* key: 0x873f */ 0x696f,
- /* key: 0x8740 */ 0xdb2b,
- /* key: 0x8741 */ 0xffff,
- /* key: 0x8742 */ 0xffff,
- /* key: 0x8743 */ 0xdb2c,
- /* key: 0x8744 */ 0xffff,
- /* key: 0x8745 */ 0xdb2d,
- /* key: 0x8746 */ 0xffff,
- /* key: 0x8747 */ 0xffff,
- /* key: 0x8748 */ 0xffff,
- /* key: 0x8749 */ 0x4066,
- /* key: 0x874a */ 0xffff,
- /* key: 0x874b */ 0x4f39,
- /* key: 0x874c */ 0x6978,
- /* key: 0x874d */ 0xdb2e,
- /* key: 0x874e */ 0x6979,
- /* key: 0x874f */ 0xffff,
- /* key: 0x8750 */ 0xffff,
- /* key: 0x8751 */ 0xffff,
- /* key: 0x8752 */ 0xffff,
- /* key: 0x8753 */ 0x6a21,
- /* key: 0x8754 */ 0xffff,
- /* key: 0x8755 */ 0x3f2a,
- /* key: 0x8756 */ 0xffff,
- /* key: 0x8757 */ 0x697b,
- /* key: 0x8758 */ 0xdb2f,
- /* key: 0x8759 */ 0x697e,
- /* key: 0x875a */ 0xffff,
- /* key: 0x875b */ 0xffff,
- /* key: 0x875c */ 0xffff,
- /* key: 0x875d */ 0xdb30,
- /* key: 0x875e */ 0xffff,
- /* key: 0x875f */ 0x6976,
- /* key: 0x8760 */ 0x6975,
- /* key: 0x8761 */ 0xdb31,
- /* key: 0x8762 */ 0xffff,
- /* key: 0x8763 */ 0x6a22,
- /* key: 0x8764 */ 0xdb32,
- /* key: 0x8765 */ 0xdb33,
- /* key: 0x8766 */ 0x325c,
- /* key: 0x8767 */ 0xffff,
- /* key: 0x8768 */ 0x697c,
- /* key: 0x8769 */ 0xffff,
- /* key: 0x876a */ 0x6a23,
- /* key: 0x876b */ 0xffff,
- /* key: 0x876c */ 0xffff,
- /* key: 0x876d */ 0xffff,
- /* key: 0x876e */ 0x697d,
- /* key: 0x876f */ 0xdb34,
- /* key: 0x8770 */ 0xffff,
- /* key: 0x8771 */ 0xdb35,
- /* key: 0x8772 */ 0xdb36,
- /* key: 0x8773 */ 0xffff,
- /* key: 0x8774 */ 0x697a,
- /* key: 0x8775 */ 0xffff,
- /* key: 0x8776 */ 0x4433,
- /* key: 0x8777 */ 0xffff,
- /* key: 0x8778 */ 0x6977,
- /* key: 0x8779 */ 0xffff,
- /* key: 0x877a */ 0xffff,
- /* key: 0x877b */ 0xdb37,
- /* key: 0x877c */ 0xffff,
- /* key: 0x877d */ 0xffff,
- /* key: 0x877e */ 0xffff,
- /* key: 0x877f */ 0x4768,
- /* key: 0x8780 */ 0xffff,
- /* key: 0x8781 */ 0xffff,
- /* key: 0x8782 */ 0x6a27,
- /* key: 0x8783 */ 0xdb38,
- /* key: 0x8784 */ 0xdb39,
- /* key: 0x8785 */ 0xdb3a,
- /* key: 0x8786 */ 0xdb3b,
- /* key: 0x8787 */ 0xdb3c,
- /* key: 0x8788 */ 0xdb3d,
- /* key: 0x8789 */ 0xdb3e,
- /* key: 0x878a */ 0xffff,
- /* key: 0x878b */ 0xdb3f,
- /* key: 0x878c */ 0xdb40,
- /* key: 0x878d */ 0x4d3b,
- /* key: 0x878e */ 0xffff,
- /* key: 0x878f */ 0xffff,
- /* key: 0x8790 */ 0xdb41,
- /* key: 0x8791 */ 0xffff,
- /* key: 0x8792 */ 0xffff,
- /* key: 0x8793 */ 0xdb42,
- /* key: 0x8794 */ 0xffff,
- /* key: 0x8795 */ 0xdb43,
- /* key: 0x8796 */ 0xffff,
- /* key: 0x8797 */ 0xdb44,
- /* key: 0x8798 */ 0xdb45,
- /* key: 0x8799 */ 0xdb46,
- /* key: 0x879a */ 0xffff,
- /* key: 0x879b */ 0xffff,
- /* key: 0x879c */ 0xffff,
- /* key: 0x879d */ 0xffff,
- /* key: 0x879e */ 0xdb47,
- /* key: 0x879f */ 0x6a26,
- /* key: 0x87a0 */ 0xdb48,
- /* key: 0x87a1 */ 0xffff,
- /* key: 0x87a2 */ 0x6a25,
- /* key: 0x87a3 */ 0xdb49,
- /* key: 0x87a4 */ 0xffff,
- /* key: 0x87a5 */ 0xffff,
- /* key: 0x87a6 */ 0xffff,
- /* key: 0x87a7 */ 0xdb4a,
- /* key: 0x87a8 */ 0xffff,
- /* key: 0x87a9 */ 0xffff,
- /* key: 0x87aa */ 0xffff,
- /* key: 0x87ab */ 0x6a2e,
- /* key: 0x87ac */ 0xdb4b,
- /* key: 0x87ad */ 0xdb4c,
- /* key: 0x87ae */ 0xdb4d,
- /* key: 0x87af */ 0x6a28,
- /* key: 0x87b0 */ 0xffff,
- /* key: 0x87b1 */ 0xdb4e,
- /* key: 0x87b2 */ 0xffff,
- /* key: 0x87b3 */ 0x6a30,
- /* key: 0x87b4 */ 0xffff,
- /* key: 0x87b5 */ 0xdb4f,
- /* key: 0x87b6 */ 0xffff,
- /* key: 0x87b7 */ 0xffff,
- /* key: 0x87b8 */ 0xffff,
- /* key: 0x87b9 */ 0xffff,
- /* key: 0x87ba */ 0x4d66,
- /* key: 0x87bb */ 0x6a33,
- /* key: 0x87bc */ 0xffff,
- /* key: 0x87bd */ 0x6a2a,
- /* key: 0x87be */ 0xdb50,
- /* key: 0x87bf */ 0xdb51,
- /* key: 0x87c0 */ 0x6a2b,
- /* key: 0x87c1 */ 0xdb52,
- /* key: 0x87c2 */ 0xffff,
- /* key: 0x87c3 */ 0xffff,
- /* key: 0x87c4 */ 0x6a2f,
- /* key: 0x87c5 */ 0xffff,
- /* key: 0x87c6 */ 0x6a32,
- /* key: 0x87c7 */ 0x6a31,
- /* key: 0x87c8 */ 0xdb53,
- /* key: 0x87c9 */ 0xdb54,
- /* key: 0x87ca */ 0xdb55,
- /* key: 0x87cb */ 0x6a29,
- /* key: 0x87cc */ 0xffff,
- /* key: 0x87cd */ 0xffff,
- /* key: 0x87ce */ 0xdb56,
- /* key: 0x87cf */ 0xffff,
- /* key: 0x87d0 */ 0x6a2c,
- /* key: 0x87d1 */ 0xffff,
- /* key: 0x87d2 */ 0x6a3d,
- /* key: 0x87d3 */ 0xffff,
- /* key: 0x87d4 */ 0xffff,
- /* key: 0x87d5 */ 0xdb57,
- /* key: 0x87d6 */ 0xdb58,
- /* key: 0x87d7 */ 0xffff,
- /* key: 0x87d8 */ 0xffff,
- /* key: 0x87d9 */ 0xdb59,
- /* key: 0x87da */ 0xdb5a,
- /* key: 0x87db */ 0xffff,
- /* key: 0x87dc */ 0xdb5b,
- /* key: 0x87dd */ 0xffff,
- /* key: 0x87de */ 0xffff,
- /* key: 0x87df */ 0xdb5c,
- /* key: 0x87e0 */ 0x6a36,
- /* key: 0x87e1 */ 0xffff,
- /* key: 0x87e2 */ 0xdb5d,
- /* key: 0x87e3 */ 0xdb5e,
- /* key: 0x87e4 */ 0xdb5f,
- /* key: 0x87e5 */ 0xffff,
- /* key: 0x87e6 */ 0xffff,
- /* key: 0x87e7 */ 0xffff,
- /* key: 0x87e8 */ 0xffff,
- /* key: 0x87e9 */ 0xffff,
- /* key: 0x87ea */ 0xdb60,
- /* key: 0x87eb */ 0xdb61,
- /* key: 0x87ec */ 0xffff,
- /* key: 0x87ed */ 0xdb62,
- /* key: 0x87ee */ 0xffff,
- /* key: 0x87ef */ 0x6a34,
- /* key: 0x87f0 */ 0xffff,
- /* key: 0x87f1 */ 0xdb63,
- /* key: 0x87f2 */ 0x6a35,
- /* key: 0x87f3 */ 0xdb64,
- /* key: 0x87f4 */ 0xffff,
- /* key: 0x87f5 */ 0xffff,
- /* key: 0x87f6 */ 0x6a3a,
- /* key: 0x87f7 */ 0x6a3b,
- /* key: 0x87f8 */ 0xdb65,
- /* key: 0x87f9 */ 0x332a,
- /* key: 0x87fa */ 0xdb66,
- /* key: 0x87fb */ 0x3542,
- /* key: 0x87fc */ 0xffff,
- /* key: 0x87fd */ 0xffff,
- /* key: 0x87fe */ 0x6a39,
- /* key: 0x87ff */ 0xdb67,
- /* branch: 0x880X */ 17264,
- /* branch: 0x881X */ 17280,
- /* branch: 0x882X */ 17296,
- /* branch: 0x883X */ 17312,
- /* branch: 0x884X */ 17328,
- /* branch: 0x885X */ 17344,
- /* branch: 0x886X */ 17360,
- /* branch: 0x887X */ 17376,
- /* branch: 0x888X */ 17392,
- /* branch: 0x889X */ 17408,
- /* branch: 0x88aX */ 17424,
- /* branch: 0x88bX */ 17440,
- /* branch: 0x88cX */ 17456,
- /* branch: 0x88dX */ 17472,
- /* branch: 0x88eX */ 17488,
- /* branch: 0x88fX */ 17504,
- /* key: 0x8800 */ 0xffff,
- /* key: 0x8801 */ 0xdb68,
- /* key: 0x8802 */ 0xffff,
- /* key: 0x8803 */ 0xdb69,
- /* key: 0x8804 */ 0xffff,
- /* key: 0x8805 */ 0x6a24,
- /* key: 0x8806 */ 0xdb6a,
- /* key: 0x8807 */ 0xffff,
- /* key: 0x8808 */ 0xffff,
- /* key: 0x8809 */ 0xdb6b,
- /* key: 0x880a */ 0xdb6c,
- /* key: 0x880b */ 0xdb6d,
- /* key: 0x880c */ 0xffff,
- /* key: 0x880d */ 0x6a38,
- /* key: 0x880e */ 0x6a3c,
- /* key: 0x880f */ 0x6a37,
- /* key: 0x8810 */ 0xdb6e,
- /* key: 0x8811 */ 0x6a3e,
- /* key: 0x8812 */ 0xdb70,
- /* key: 0x8813 */ 0xdb71,
- /* key: 0x8814 */ 0xdb72,
- /* key: 0x8815 */ 0x6a40,
- /* key: 0x8816 */ 0x6a3f,
- /* key: 0x8817 */ 0xffff,
- /* key: 0x8818 */ 0xdb73,
- /* key: 0x8819 */ 0xdb6f,
- /* key: 0x881a */ 0xdb74,
- /* key: 0x881b */ 0xdb75,
- /* key: 0x881c */ 0xdb76,
- /* key: 0x881d */ 0xffff,
- /* key: 0x881e */ 0xdb77,
- /* key: 0x881f */ 0xdb78,
- /* key: 0x8820 */ 0xffff,
- /* key: 0x8821 */ 0x6a42,
- /* key: 0x8822 */ 0x6a41,
- /* key: 0x8823 */ 0x695a,
- /* key: 0x8824 */ 0xffff,
- /* key: 0x8825 */ 0xffff,
- /* key: 0x8826 */ 0xffff,
- /* key: 0x8827 */ 0x6a46,
- /* key: 0x8828 */ 0xdb79,
- /* key: 0x8829 */ 0xffff,
- /* key: 0x882a */ 0xffff,
- /* key: 0x882b */ 0xffff,
- /* key: 0x882c */ 0xffff,
- /* key: 0x882d */ 0xdb7a,
- /* key: 0x882e */ 0xdb7b,
- /* key: 0x882f */ 0xffff,
- /* key: 0x8830 */ 0xdb7c,
- /* key: 0x8831 */ 0x6a43,
- /* key: 0x8832 */ 0xdb7d,
- /* key: 0x8833 */ 0xffff,
- /* key: 0x8834 */ 0xffff,
- /* key: 0x8835 */ 0xdb7e,
- /* key: 0x8836 */ 0x6a44,
- /* key: 0x8837 */ 0xffff,
- /* key: 0x8838 */ 0xffff,
- /* key: 0x8839 */ 0x6a45,
- /* key: 0x883a */ 0xdc21,
- /* key: 0x883b */ 0x6a47,
- /* key: 0x883c */ 0xdc22,
- /* key: 0x883d */ 0xffff,
- /* key: 0x883e */ 0xffff,
- /* key: 0x883f */ 0xffff,
- /* key: 0x8840 */ 0x376c,
- /* key: 0x8841 */ 0xdc23,
- /* key: 0x8842 */ 0x6a49,
- /* key: 0x8843 */ 0xdc24,
- /* key: 0x8844 */ 0x6a48,
- /* key: 0x8845 */ 0xdc25,
- /* key: 0x8846 */ 0x3d30,
- /* key: 0x8847 */ 0xffff,
- /* key: 0x8848 */ 0xdc26,
- /* key: 0x8849 */ 0xdc27,
- /* key: 0x884a */ 0xdc28,
- /* key: 0x884b */ 0xdc29,
- /* key: 0x884c */ 0x3954,
- /* key: 0x884d */ 0x5e27,
- /* key: 0x884e */ 0xdc2a,
- /* key: 0x884f */ 0xffff,
- /* key: 0x8850 */ 0xffff,
- /* key: 0x8851 */ 0xdc2b,
- /* key: 0x8852 */ 0x6a4a,
- /* key: 0x8853 */ 0x3d51,
- /* key: 0x8854 */ 0xffff,
- /* key: 0x8855 */ 0xdc2c,
- /* key: 0x8856 */ 0xdc2d,
- /* key: 0x8857 */ 0x3339,
- /* key: 0x8858 */ 0xdc2e,
- /* key: 0x8859 */ 0x6a4b,
- /* key: 0x885a */ 0xdc2f,
- /* key: 0x885b */ 0x3152,
- /* key: 0x885c */ 0xdc30,
- /* key: 0x885d */ 0x3e57,
- /* key: 0x885e */ 0x6a4c,
- /* key: 0x885f */ 0xdc31,
- /* key: 0x8860 */ 0xdc32,
- /* key: 0x8861 */ 0x3955,
- /* key: 0x8862 */ 0x6a4d,
- /* key: 0x8863 */ 0x3061,
- /* key: 0x8864 */ 0xdc33,
- /* key: 0x8865 */ 0xffff,
- /* key: 0x8866 */ 0xffff,
- /* key: 0x8867 */ 0xffff,
- /* key: 0x8868 */ 0x493d,
- /* key: 0x8869 */ 0xdc34,
- /* key: 0x886a */ 0xffff,
- /* key: 0x886b */ 0x6a4e,
- /* key: 0x886c */ 0xffff,
- /* key: 0x886d */ 0xffff,
- /* key: 0x886e */ 0xffff,
- /* key: 0x886f */ 0xffff,
- /* key: 0x8870 */ 0x3f6a,
- /* key: 0x8871 */ 0xdc35,
- /* key: 0x8872 */ 0x6a55,
- /* key: 0x8873 */ 0xffff,
- /* key: 0x8874 */ 0xffff,
- /* key: 0x8875 */ 0x6a52,
- /* key: 0x8876 */ 0xffff,
- /* key: 0x8877 */ 0x436f,
- /* key: 0x8878 */ 0xffff,
- /* key: 0x8879 */ 0xdc36,
- /* key: 0x887a */ 0xffff,
- /* key: 0x887b */ 0xdc37,
- /* key: 0x887c */ 0xffff,
- /* key: 0x887d */ 0x6a53,
- /* key: 0x887e */ 0x6a50,
- /* key: 0x887f */ 0x365e,
- /* key: 0x8880 */ 0xdc38,
- /* key: 0x8881 */ 0x6a4f,
- /* key: 0x8882 */ 0x6a56,
- /* key: 0x8883 */ 0xffff,
- /* key: 0x8884 */ 0xffff,
- /* key: 0x8885 */ 0xffff,
- /* key: 0x8886 */ 0xffff,
- /* key: 0x8887 */ 0xffff,
- /* key: 0x8888 */ 0x3736,
- /* key: 0x8889 */ 0xffff,
- /* key: 0x888a */ 0xffff,
- /* key: 0x888b */ 0x425e,
- /* key: 0x888c */ 0xffff,
- /* key: 0x888d */ 0x6a5c,
- /* key: 0x888e */ 0xffff,
- /* key: 0x888f */ 0xffff,
- /* key: 0x8890 */ 0xffff,
- /* key: 0x8891 */ 0xffff,
- /* key: 0x8892 */ 0x6a58,
- /* key: 0x8893 */ 0xffff,
- /* key: 0x8894 */ 0xffff,
- /* key: 0x8895 */ 0xffff,
- /* key: 0x8896 */ 0x4235,
- /* key: 0x8897 */ 0x6a57,
- /* key: 0x8898 */ 0xdc39,
- /* key: 0x8899 */ 0x6a5a,
- /* key: 0x889a */ 0xdc3a,
- /* key: 0x889b */ 0xdc3b,
- /* key: 0x889c */ 0xdc3c,
- /* key: 0x889d */ 0xffff,
- /* key: 0x889e */ 0x6a51,
- /* key: 0x889f */ 0xdc3d,
- /* key: 0x88a0 */ 0xdc3e,
- /* key: 0x88a1 */ 0xffff,
- /* key: 0x88a2 */ 0x6a5b,
- /* key: 0x88a3 */ 0xffff,
- /* key: 0x88a4 */ 0x6a5d,
- /* key: 0x88a5 */ 0xffff,
- /* key: 0x88a6 */ 0xffff,
- /* key: 0x88a7 */ 0xffff,
- /* key: 0x88a8 */ 0xdc3f,
- /* key: 0x88a9 */ 0xffff,
- /* key: 0x88aa */ 0xdc40,
- /* key: 0x88ab */ 0x486f,
- /* key: 0x88ac */ 0xffff,
- /* key: 0x88ad */ 0xffff,
- /* key: 0x88ae */ 0x6a59,
- /* key: 0x88af */ 0xffff,
- /* key: 0x88b0 */ 0x6a5e,
- /* key: 0x88b1 */ 0x6a60,
- /* key: 0x88b2 */ 0xffff,
- /* key: 0x88b3 */ 0xffff,
- /* key: 0x88b4 */ 0x3853,
- /* key: 0x88b5 */ 0x6a54,
- /* key: 0x88b6 */ 0xffff,
- /* key: 0x88b7 */ 0x3041,
- /* key: 0x88b8 */ 0xffff,
- /* key: 0x88b9 */ 0xffff,
- /* key: 0x88ba */ 0xdc41,
- /* key: 0x88bb */ 0xffff,
- /* key: 0x88bc */ 0xffff,
- /* key: 0x88bd */ 0xdc42,
- /* key: 0x88be */ 0xdc43,
- /* key: 0x88bf */ 0x6a5f,
- /* key: 0x88c0 */ 0xdc44,
- /* key: 0x88c1 */ 0x3a5b,
- /* key: 0x88c2 */ 0x4e76,
- /* key: 0x88c3 */ 0x6a61,
- /* key: 0x88c4 */ 0x6a62,
- /* key: 0x88c5 */ 0x4175,
- /* key: 0x88c6 */ 0xffff,
- /* key: 0x88c7 */ 0xffff,
- /* key: 0x88c8 */ 0xffff,
- /* key: 0x88c9 */ 0xffff,
- /* key: 0x88ca */ 0xdc45,
- /* key: 0x88cb */ 0xdc46,
- /* key: 0x88cc */ 0xdc47,
- /* key: 0x88cd */ 0xdc48,
- /* key: 0x88ce */ 0xdc49,
- /* key: 0x88cf */ 0x4e22,
- /* key: 0x88d0 */ 0xffff,
- /* key: 0x88d1 */ 0xdc4a,
- /* key: 0x88d2 */ 0xdc4b,
- /* key: 0x88d3 */ 0xdc4c,
- /* key: 0x88d4 */ 0x6a63,
- /* key: 0x88d5 */ 0x4d35,
- /* key: 0x88d6 */ 0xffff,
- /* key: 0x88d7 */ 0xffff,
- /* key: 0x88d8 */ 0x6a64,
- /* key: 0x88d9 */ 0x6a65,
- /* key: 0x88da */ 0xffff,
- /* key: 0x88db */ 0xdc4d,
- /* key: 0x88dc */ 0x4a64,
- /* key: 0x88dd */ 0x6a66,
- /* key: 0x88de */ 0xdc4e,
- /* key: 0x88df */ 0x3a40,
- /* key: 0x88e0 */ 0xffff,
- /* key: 0x88e1 */ 0x4e23,
- /* key: 0x88e2 */ 0xffff,
- /* key: 0x88e3 */ 0xffff,
- /* key: 0x88e4 */ 0xffff,
- /* key: 0x88e5 */ 0xffff,
- /* key: 0x88e6 */ 0xffff,
- /* key: 0x88e7 */ 0xdc4f,
- /* key: 0x88e8 */ 0x6a6b,
- /* key: 0x88e9 */ 0xffff,
- /* key: 0x88ea */ 0xffff,
- /* key: 0x88eb */ 0xffff,
- /* key: 0x88ec */ 0xffff,
- /* key: 0x88ed */ 0xffff,
- /* key: 0x88ee */ 0xffff,
- /* key: 0x88ef */ 0xdc50,
- /* key: 0x88f0 */ 0xdc51,
- /* key: 0x88f1 */ 0xdc52,
- /* key: 0x88f2 */ 0x6a6c,
- /* key: 0x88f3 */ 0x3e58,
- /* key: 0x88f4 */ 0x6a6a,
- /* key: 0x88f5 */ 0xdc53,
- /* key: 0x88f6 */ 0xffff,
- /* key: 0x88f7 */ 0xdc54,
- /* key: 0x88f8 */ 0x4d67,
- /* key: 0x88f9 */ 0x6a67,
- /* key: 0x88fa */ 0xffff,
- /* key: 0x88fb */ 0xffff,
- /* key: 0x88fc */ 0x6a69,
- /* key: 0x88fd */ 0x403d,
- /* key: 0x88fe */ 0x3f7e,
- /* key: 0x88ff */ 0xffff,
- /* branch: 0x890X */ 17536,
- /* branch: 0x891X */ 17552,
- /* branch: 0x892X */ 17568,
- /* branch: 0x893X */ 17584,
- /* branch: 0x894X */ 17600,
- /* branch: 0x895X */ 17616,
- /* branch: 0x896X */ 17632,
- /* branch: 0x897X */ 17648,
- /* branch: 0x898X */ 17664,
- /* branch: 0x899X */ 17680,
- /* branch: 0x89aX */ 17696,
- /* branch: 0x89bX */ 17712,
- /* branch: 0x89cX */ 17728,
- /* branch: 0x89dX */ 17744,
- /* branch: 0x89eX */ 17760,
- /* branch: 0x89fX */ 17776,
- /* key: 0x8900 */ 0xffff,
- /* key: 0x8901 */ 0xdc55,
- /* key: 0x8902 */ 0x6a68,
- /* key: 0x8903 */ 0xffff,
- /* key: 0x8904 */ 0x6a6d,
- /* key: 0x8905 */ 0xffff,
- /* key: 0x8906 */ 0xdc56,
- /* key: 0x8907 */ 0x4a23,
- /* key: 0x8908 */ 0xffff,
- /* key: 0x8909 */ 0xffff,
- /* key: 0x890a */ 0x6a6f,
- /* key: 0x890b */ 0xffff,
- /* key: 0x890c */ 0x6a6e,
- /* key: 0x890d */ 0xdc57,
- /* key: 0x890e */ 0xdc58,
- /* key: 0x890f */ 0xdc59,
- /* key: 0x8910 */ 0x336c,
- /* key: 0x8911 */ 0xffff,
- /* key: 0x8912 */ 0x4b2b,
- /* key: 0x8913 */ 0x6a70,
- /* key: 0x8914 */ 0xffff,
- /* key: 0x8915 */ 0xdc5a,
- /* key: 0x8916 */ 0xdc5b,
- /* key: 0x8917 */ 0xffff,
- /* key: 0x8918 */ 0xdc5c,
- /* key: 0x8919 */ 0xdc5d,
- /* key: 0x891a */ 0xdc5e,
- /* key: 0x891b */ 0xffff,
- /* key: 0x891c */ 0xdc5f,
- /* key: 0x891d */ 0x6a7c,
- /* key: 0x891e */ 0x6a72,
- /* key: 0x891f */ 0xffff,
- /* key: 0x8920 */ 0xdc60,
- /* key: 0x8921 */ 0xffff,
- /* key: 0x8922 */ 0xffff,
- /* key: 0x8923 */ 0xffff,
- /* key: 0x8924 */ 0xffff,
- /* key: 0x8925 */ 0x6a73,
- /* key: 0x8926 */ 0xdc61,
- /* key: 0x8927 */ 0xdc62,
- /* key: 0x8928 */ 0xdc63,
- /* key: 0x8929 */ 0xffff,
- /* key: 0x892a */ 0x6a74,
- /* key: 0x892b */ 0x6a75,
- /* key: 0x892c */ 0xffff,
- /* key: 0x892d */ 0xffff,
- /* key: 0x892e */ 0xffff,
- /* key: 0x892f */ 0xffff,
- /* key: 0x8930 */ 0xdc64,
- /* key: 0x8931 */ 0xdc65,
- /* key: 0x8932 */ 0xdc66,
- /* key: 0x8933 */ 0xffff,
- /* key: 0x8934 */ 0xffff,
- /* key: 0x8935 */ 0xdc67,
- /* key: 0x8936 */ 0x6a79,
- /* key: 0x8937 */ 0xffff,
- /* key: 0x8938 */ 0x6a7a,
- /* key: 0x8939 */ 0xdc68,
- /* key: 0x893a */ 0xdc69,
- /* key: 0x893b */ 0x6a78,
- /* key: 0x893c */ 0xffff,
- /* key: 0x893d */ 0xffff,
- /* key: 0x893e */ 0xdc6a,
- /* key: 0x893f */ 0xffff,
- /* key: 0x8940 */ 0xdc6b,
- /* key: 0x8941 */ 0x6a76,
- /* key: 0x8942 */ 0xdc6c,
- /* key: 0x8943 */ 0x6a71,
- /* key: 0x8944 */ 0x6a77,
- /* key: 0x8945 */ 0xdc6d,
- /* key: 0x8946 */ 0xdc6e,
- /* key: 0x8947 */ 0xffff,
- /* key: 0x8948 */ 0xffff,
- /* key: 0x8949 */ 0xdc6f,
- /* key: 0x894a */ 0xffff,
- /* key: 0x894b */ 0xffff,
- /* key: 0x894c */ 0x6a7b,
- /* key: 0x894d */ 0x7037,
- /* key: 0x894e */ 0xffff,
- /* key: 0x894f */ 0xdc70,
- /* key: 0x8950 */ 0xffff,
- /* key: 0x8951 */ 0xffff,
- /* key: 0x8952 */ 0xdc71,
- /* key: 0x8953 */ 0xffff,
- /* key: 0x8954 */ 0xffff,
- /* key: 0x8955 */ 0xffff,
- /* key: 0x8956 */ 0x3228,
- /* key: 0x8957 */ 0xdc72,
- /* key: 0x8958 */ 0xffff,
- /* key: 0x8959 */ 0xffff,
- /* key: 0x895a */ 0xdc73,
- /* key: 0x895b */ 0xdc74,
- /* key: 0x895c */ 0xdc75,
- /* key: 0x895d */ 0xffff,
- /* key: 0x895e */ 0x6a7e,
- /* key: 0x895f */ 0x365f,
- /* key: 0x8960 */ 0x6a7d,
- /* key: 0x8961 */ 0xdc76,
- /* key: 0x8962 */ 0xdc77,
- /* key: 0x8963 */ 0xdc78,
- /* key: 0x8964 */ 0x6b22,
- /* key: 0x8965 */ 0xffff,
- /* key: 0x8966 */ 0x6b21,
- /* key: 0x8967 */ 0xffff,
- /* key: 0x8968 */ 0xffff,
- /* key: 0x8969 */ 0xffff,
- /* key: 0x896a */ 0x6b24,
- /* key: 0x896b */ 0xdc79,
- /* key: 0x896c */ 0xffff,
- /* key: 0x896d */ 0x6b23,
- /* key: 0x896e */ 0xdc7a,
- /* key: 0x896f */ 0x6b25,
- /* key: 0x8970 */ 0xdc7b,
- /* key: 0x8971 */ 0xffff,
- /* key: 0x8972 */ 0x3d31,
- /* key: 0x8973 */ 0xdc7c,
- /* key: 0x8974 */ 0x6b26,
- /* key: 0x8975 */ 0xdc7d,
- /* key: 0x8976 */ 0xffff,
- /* key: 0x8977 */ 0x6b27,
- /* key: 0x8978 */ 0xffff,
- /* key: 0x8979 */ 0xffff,
- /* key: 0x897a */ 0xdc7e,
- /* key: 0x897b */ 0xdd21,
- /* key: 0x897c */ 0xdd22,
- /* key: 0x897d */ 0xdd23,
- /* key: 0x897e */ 0x6b28,
- /* key: 0x897f */ 0x403e,
- /* key: 0x8980 */ 0xffff,
- /* key: 0x8981 */ 0x4d57,
- /* key: 0x8982 */ 0xffff,
- /* key: 0x8983 */ 0x6b29,
- /* key: 0x8984 */ 0xffff,
- /* key: 0x8985 */ 0xffff,
- /* key: 0x8986 */ 0x4a24,
- /* key: 0x8987 */ 0x4746,
- /* key: 0x8988 */ 0x6b2a,
- /* key: 0x8989 */ 0xdd24,
- /* key: 0x898a */ 0x6b2b,
- /* key: 0x898b */ 0x382b,
- /* key: 0x898c */ 0xffff,
- /* key: 0x898d */ 0xdd25,
- /* key: 0x898e */ 0xffff,
- /* key: 0x898f */ 0x352c,
- /* key: 0x8990 */ 0xdd26,
- /* key: 0x8991 */ 0xffff,
- /* key: 0x8992 */ 0xffff,
- /* key: 0x8993 */ 0x6b2c,
- /* key: 0x8994 */ 0xdd27,
- /* key: 0x8995 */ 0xdd28,
- /* key: 0x8996 */ 0x3b6b,
- /* key: 0x8997 */ 0x4741,
- /* key: 0x8998 */ 0x6b2d,
- /* key: 0x8999 */ 0xffff,
- /* key: 0x899a */ 0x3350,
- /* key: 0x899b */ 0xdd29,
- /* key: 0x899c */ 0xdd2a,
- /* key: 0x899d */ 0xffff,
- /* key: 0x899e */ 0xffff,
- /* key: 0x899f */ 0xdd2b,
- /* key: 0x89a0 */ 0xdd2c,
- /* key: 0x89a1 */ 0x6b2e,
- /* key: 0x89a2 */ 0xffff,
- /* key: 0x89a3 */ 0xffff,
- /* key: 0x89a4 */ 0xffff,
- /* key: 0x89a5 */ 0xdd2d,
- /* key: 0x89a6 */ 0x6b30,
- /* key: 0x89a7 */ 0x4d77,
- /* key: 0x89a8 */ 0xffff,
- /* key: 0x89a9 */ 0x6b2f,
- /* key: 0x89aa */ 0x3f46,
- /* key: 0x89ab */ 0xffff,
- /* key: 0x89ac */ 0x6b31,
- /* key: 0x89ad */ 0xffff,
- /* key: 0x89ae */ 0xffff,
- /* key: 0x89af */ 0x6b32,
- /* key: 0x89b0 */ 0xdd2e,
- /* key: 0x89b1 */ 0xffff,
- /* key: 0x89b2 */ 0x6b33,
- /* key: 0x89b3 */ 0x3451,
- /* key: 0x89b4 */ 0xdd2f,
- /* key: 0x89b5 */ 0xdd30,
- /* key: 0x89b6 */ 0xdd31,
- /* key: 0x89b7 */ 0xdd32,
- /* key: 0x89b8 */ 0xffff,
- /* key: 0x89b9 */ 0xffff,
- /* key: 0x89ba */ 0x6b34,
- /* key: 0x89bb */ 0xffff,
- /* key: 0x89bc */ 0xdd33,
- /* key: 0x89bd */ 0x6b35,
- /* key: 0x89be */ 0xffff,
- /* key: 0x89bf */ 0x6b36,
- /* key: 0x89c0 */ 0x6b37,
- /* key: 0x89c1 */ 0xffff,
- /* key: 0x89c2 */ 0xffff,
- /* key: 0x89c3 */ 0xffff,
- /* key: 0x89c4 */ 0xffff,
- /* key: 0x89c5 */ 0xffff,
- /* key: 0x89c6 */ 0xffff,
- /* key: 0x89c7 */ 0xffff,
- /* key: 0x89c8 */ 0xffff,
- /* key: 0x89c9 */ 0xffff,
- /* key: 0x89ca */ 0xffff,
- /* key: 0x89cb */ 0xffff,
- /* key: 0x89cc */ 0xffff,
- /* key: 0x89cd */ 0xffff,
- /* key: 0x89ce */ 0xffff,
- /* key: 0x89cf */ 0xffff,
- /* key: 0x89d0 */ 0xffff,
- /* key: 0x89d1 */ 0xffff,
- /* key: 0x89d2 */ 0x3351,
- /* key: 0x89d3 */ 0xffff,
- /* key: 0x89d4 */ 0xdd34,
- /* key: 0x89d5 */ 0xdd35,
- /* key: 0x89d6 */ 0xdd36,
- /* key: 0x89d7 */ 0xdd37,
- /* key: 0x89d8 */ 0xdd38,
- /* key: 0x89d9 */ 0xffff,
- /* key: 0x89da */ 0x6b38,
- /* key: 0x89db */ 0xffff,
- /* key: 0x89dc */ 0x6b39,
- /* key: 0x89dd */ 0x6b3a,
- /* key: 0x89de */ 0xffff,
- /* key: 0x89df */ 0xffff,
- /* key: 0x89e0 */ 0xffff,
- /* key: 0x89e1 */ 0xffff,
- /* key: 0x89e2 */ 0xffff,
- /* key: 0x89e3 */ 0x3272,
- /* key: 0x89e4 */ 0xffff,
- /* key: 0x89e5 */ 0xdd39,
- /* key: 0x89e6 */ 0x3f28,
- /* key: 0x89e7 */ 0x6b3b,
- /* key: 0x89e8 */ 0xffff,
- /* key: 0x89e9 */ 0xdd3a,
- /* key: 0x89ea */ 0xffff,
- /* key: 0x89eb */ 0xdd3b,
- /* key: 0x89ec */ 0xffff,
- /* key: 0x89ed */ 0xdd3c,
- /* key: 0x89ee */ 0xffff,
- /* key: 0x89ef */ 0xffff,
- /* key: 0x89f0 */ 0xffff,
- /* key: 0x89f1 */ 0xdd3d,
- /* key: 0x89f2 */ 0xffff,
- /* key: 0x89f3 */ 0xdd3e,
- /* key: 0x89f4 */ 0x6b3c,
- /* key: 0x89f5 */ 0xffff,
- /* key: 0x89f6 */ 0xdd3f,
- /* key: 0x89f7 */ 0xffff,
- /* key: 0x89f8 */ 0x6b3d,
- /* key: 0x89f9 */ 0xdd40,
- /* key: 0x89fa */ 0xffff,
- /* key: 0x89fb */ 0xffff,
- /* key: 0x89fc */ 0xffff,
- /* key: 0x89fd */ 0xdd41,
- /* key: 0x89fe */ 0xffff,
- /* key: 0x89ff */ 0xdd42,
- /* branch: 0x8a0X */ 17808,
- /* branch: 0x8a1X */ 17824,
- /* branch: 0x8a2X */ 17840,
- /* branch: 0x8a3X */ 17856,
- /* branch: 0x8a4X */ 17872,
- /* branch: 0x8a5X */ 17888,
- /* branch: 0x8a6X */ 17904,
- /* branch: 0x8a7X */ 17920,
- /* branch: 0x8a8X */ 17936,
- /* branch: 0x8a9X */ 17952,
- /* branch: 0x8aaX */ 17968,
- /* branch: 0x8abX */ 17984,
- /* branch: 0x8acX */ 18000,
- /* branch: 0x8adX */ 18016,
- /* branch: 0x8aeX */ 18032,
- /* branch: 0x8afX */ 18048,
- /* key: 0x8a00 */ 0x3840,
- /* key: 0x8a01 */ 0xffff,
- /* key: 0x8a02 */ 0x447b,
- /* key: 0x8a03 */ 0x6b3e,
- /* key: 0x8a04 */ 0xdd43,
- /* key: 0x8a05 */ 0xdd44,
- /* key: 0x8a06 */ 0xffff,
- /* key: 0x8a07 */ 0xdd45,
- /* key: 0x8a08 */ 0x3757,
- /* key: 0x8a09 */ 0xffff,
- /* key: 0x8a0a */ 0x3f56,
- /* key: 0x8a0b */ 0xffff,
- /* key: 0x8a0c */ 0x6b41,
- /* key: 0x8a0d */ 0xffff,
- /* key: 0x8a0e */ 0x4624,
- /* key: 0x8a0f */ 0xdd46,
- /* key: 0x8a10 */ 0x6b40,
- /* key: 0x8a11 */ 0xdd47,
- /* key: 0x8a12 */ 0xdd48,
- /* key: 0x8a13 */ 0x3731,
- /* key: 0x8a14 */ 0xdd49,
- /* key: 0x8a15 */ 0xdd4a,
- /* key: 0x8a16 */ 0x6b3f,
- /* key: 0x8a17 */ 0x4277,
- /* key: 0x8a18 */ 0x352d,
- /* key: 0x8a19 */ 0xffff,
- /* key: 0x8a1a */ 0xffff,
- /* key: 0x8a1b */ 0x6b42,
- /* key: 0x8a1c */ 0xffff,
- /* key: 0x8a1d */ 0x6b43,
- /* key: 0x8a1e */ 0xdd4b,
- /* key: 0x8a1f */ 0x3e59,
- /* key: 0x8a20 */ 0xdd4c,
- /* key: 0x8a21 */ 0xffff,
- /* key: 0x8a22 */ 0xdd4d,
- /* key: 0x8a23 */ 0x376d,
- /* key: 0x8a24 */ 0xdd4e,
- /* key: 0x8a25 */ 0x6b44,
- /* key: 0x8a26 */ 0xdd4f,
- /* key: 0x8a27 */ 0xffff,
- /* key: 0x8a28 */ 0xffff,
- /* key: 0x8a29 */ 0xffff,
- /* key: 0x8a2a */ 0x4b2c,
- /* key: 0x8a2b */ 0xdd50,
- /* key: 0x8a2c */ 0xdd51,
- /* key: 0x8a2d */ 0x405f,
- /* key: 0x8a2e */ 0xffff,
- /* key: 0x8a2f */ 0xdd52,
- /* key: 0x8a30 */ 0xffff,
- /* key: 0x8a31 */ 0x3576,
- /* key: 0x8a32 */ 0xffff,
- /* key: 0x8a33 */ 0x4c75,
- /* key: 0x8a34 */ 0x414a,
- /* key: 0x8a35 */ 0xdd53,
- /* key: 0x8a36 */ 0x6b45,
- /* key: 0x8a37 */ 0xdd54,
- /* key: 0x8a38 */ 0xffff,
- /* key: 0x8a39 */ 0xffff,
- /* key: 0x8a3a */ 0x3f47,
- /* key: 0x8a3b */ 0x4370,
- /* key: 0x8a3c */ 0x3e5a,
- /* key: 0x8a3d */ 0xdd55,
- /* key: 0x8a3e */ 0xdd56,
- /* key: 0x8a3f */ 0xffff,
- /* key: 0x8a40 */ 0xdd57,
- /* key: 0x8a41 */ 0x6b46,
- /* key: 0x8a42 */ 0xffff,
- /* key: 0x8a43 */ 0xdd58,
- /* key: 0x8a44 */ 0xffff,
- /* key: 0x8a45 */ 0xdd59,
- /* key: 0x8a46 */ 0x6b49,
- /* key: 0x8a47 */ 0xdd5a,
- /* key: 0x8a48 */ 0x6b4a,
- /* key: 0x8a49 */ 0xdd5b,
- /* key: 0x8a4a */ 0xffff,
- /* key: 0x8a4b */ 0xffff,
- /* key: 0x8a4c */ 0xffff,
- /* key: 0x8a4d */ 0xdd5c,
- /* key: 0x8a4e */ 0xdd5d,
- /* key: 0x8a4f */ 0xffff,
- /* key: 0x8a50 */ 0x3a3e,
- /* key: 0x8a51 */ 0x4242,
- /* key: 0x8a52 */ 0x6b48,
- /* key: 0x8a53 */ 0xdd5e,
- /* key: 0x8a54 */ 0x3e5b,
- /* key: 0x8a55 */ 0x493e,
- /* key: 0x8a56 */ 0xdd5f,
- /* key: 0x8a57 */ 0xdd60,
- /* key: 0x8a58 */ 0xdd61,
- /* key: 0x8a59 */ 0xffff,
- /* key: 0x8a5a */ 0xffff,
- /* key: 0x8a5b */ 0x6b47,
- /* key: 0x8a5c */ 0xdd62,
- /* key: 0x8a5d */ 0xdd63,
- /* key: 0x8a5e */ 0x3b6c,
- /* key: 0x8a5f */ 0xffff,
- /* key: 0x8a60 */ 0x3153,
- /* key: 0x8a61 */ 0xdd64,
- /* key: 0x8a62 */ 0x6b4e,
- /* key: 0x8a63 */ 0x3758,
- /* key: 0x8a64 */ 0xffff,
- /* key: 0x8a65 */ 0xdd65,
- /* key: 0x8a66 */ 0x3b6e,
- /* key: 0x8a67 */ 0xdd66,
- /* key: 0x8a68 */ 0xffff,
- /* key: 0x8a69 */ 0x3b6d,
- /* key: 0x8a6a */ 0xffff,
- /* key: 0x8a6b */ 0x4f4d,
- /* key: 0x8a6c */ 0x6b4d,
- /* key: 0x8a6d */ 0x6b4c,
- /* key: 0x8a6e */ 0x4127,
- /* key: 0x8a6f */ 0xffff,
- /* key: 0x8a70 */ 0x354d,
- /* key: 0x8a71 */ 0x4f43,
- /* key: 0x8a72 */ 0x333a,
- /* key: 0x8a73 */ 0x3e5c,
- /* key: 0x8a74 */ 0xffff,
- /* key: 0x8a75 */ 0xdd67,
- /* key: 0x8a76 */ 0xdd68,
- /* key: 0x8a77 */ 0xdd69,
- /* key: 0x8a78 */ 0xffff,
- /* key: 0x8a79 */ 0xdd6a,
- /* key: 0x8a7a */ 0xdd6b,
- /* key: 0x8a7b */ 0xdd6c,
- /* key: 0x8a7c */ 0x6b4b,
- /* key: 0x8a7d */ 0xffff,
- /* key: 0x8a7e */ 0xdd6d,
- /* key: 0x8a7f */ 0xdd6e,
- /* key: 0x8a80 */ 0xdd6f,
- /* key: 0x8a81 */ 0xffff,
- /* key: 0x8a82 */ 0x6b50,
- /* key: 0x8a83 */ 0xdd70,
- /* key: 0x8a84 */ 0x6b51,
- /* key: 0x8a85 */ 0x6b4f,
- /* key: 0x8a86 */ 0xdd71,
- /* key: 0x8a87 */ 0x3858,
- /* key: 0x8a88 */ 0xffff,
- /* key: 0x8a89 */ 0x4d40,
- /* key: 0x8a8a */ 0xffff,
- /* key: 0x8a8b */ 0xdd72,
- /* key: 0x8a8c */ 0x3b6f,
- /* key: 0x8a8d */ 0x4727,
- /* key: 0x8a8e */ 0xffff,
- /* key: 0x8a8f */ 0xdd73,
- /* key: 0x8a90 */ 0xdd74,
- /* key: 0x8a91 */ 0x6b54,
- /* key: 0x8a92 */ 0xdd75,
- /* key: 0x8a93 */ 0x4040,
- /* key: 0x8a94 */ 0xffff,
- /* key: 0x8a95 */ 0x4342,
- /* key: 0x8a96 */ 0xdd76,
- /* key: 0x8a97 */ 0xdd77,
- /* key: 0x8a98 */ 0x4d36,
- /* key: 0x8a99 */ 0xdd78,
- /* key: 0x8a9a */ 0x6b57,
- /* key: 0x8a9b */ 0xffff,
- /* key: 0x8a9c */ 0xffff,
- /* key: 0x8a9d */ 0xffff,
- /* key: 0x8a9e */ 0x386c,
- /* key: 0x8a9f */ 0xdd79,
- /* key: 0x8aa0 */ 0x403f,
- /* key: 0x8aa1 */ 0x6b53,
- /* key: 0x8aa2 */ 0xffff,
- /* key: 0x8aa3 */ 0x6b58,
- /* key: 0x8aa4 */ 0x386d,
- /* key: 0x8aa5 */ 0x6b55,
- /* key: 0x8aa6 */ 0x6b56,
- /* key: 0x8aa7 */ 0xdd7a,
- /* key: 0x8aa8 */ 0x6b52,
- /* key: 0x8aa9 */ 0xdd7b,
- /* key: 0x8aaa */ 0xffff,
- /* key: 0x8aab */ 0xffff,
- /* key: 0x8aac */ 0x4062,
- /* key: 0x8aad */ 0x4649,
- /* key: 0x8aae */ 0xdd7c,
- /* key: 0x8aaf */ 0xdd7d,
- /* key: 0x8ab0 */ 0x432f,
- /* key: 0x8ab1 */ 0xffff,
- /* key: 0x8ab2 */ 0x325d,
- /* key: 0x8ab3 */ 0xdd7e,
- /* key: 0x8ab4 */ 0xffff,
- /* key: 0x8ab5 */ 0xffff,
- /* key: 0x8ab6 */ 0xde21,
- /* key: 0x8ab7 */ 0xde22,
- /* key: 0x8ab8 */ 0xffff,
- /* key: 0x8ab9 */ 0x4870,
- /* key: 0x8aba */ 0xffff,
- /* key: 0x8abb */ 0xde23,
- /* key: 0x8abc */ 0x3543,
- /* key: 0x8abd */ 0xffff,
- /* key: 0x8abe */ 0xde24,
- /* key: 0x8abf */ 0x4434,
- /* key: 0x8ac0 */ 0xffff,
- /* key: 0x8ac1 */ 0xffff,
- /* key: 0x8ac2 */ 0x6b5b,
- /* key: 0x8ac3 */ 0xde25,
- /* key: 0x8ac4 */ 0x6b59,
- /* key: 0x8ac5 */ 0xffff,
- /* key: 0x8ac6 */ 0xde26,
- /* key: 0x8ac7 */ 0x434c,
- /* key: 0x8ac8 */ 0xde27,
- /* key: 0x8ac9 */ 0xde28,
- /* key: 0x8aca */ 0xde29,
- /* key: 0x8acb */ 0x4041,
- /* key: 0x8acc */ 0x3452,
- /* key: 0x8acd */ 0x6b5a,
- /* key: 0x8ace */ 0xffff,
- /* key: 0x8acf */ 0x3f5b,
- /* key: 0x8ad0 */ 0xffff,
- /* key: 0x8ad1 */ 0xde2a,
- /* key: 0x8ad2 */ 0x4e4a,
- /* key: 0x8ad3 */ 0xde2b,
- /* key: 0x8ad4 */ 0xde2c,
- /* key: 0x8ad5 */ 0xde2d,
- /* key: 0x8ad6 */ 0x4f40,
- /* key: 0x8ad7 */ 0xde2e,
- /* key: 0x8ad8 */ 0xffff,
- /* key: 0x8ad9 */ 0xffff,
- /* key: 0x8ada */ 0x6b5c,
- /* key: 0x8adb */ 0x6b67,
- /* key: 0x8adc */ 0x4435,
- /* key: 0x8add */ 0xde2f,
- /* key: 0x8ade */ 0x6b66,
- /* key: 0x8adf */ 0xde30,
- /* key: 0x8ae0 */ 0x6b63,
- /* key: 0x8ae1 */ 0x6b6b,
- /* key: 0x8ae2 */ 0x6b64,
- /* key: 0x8ae3 */ 0xffff,
- /* key: 0x8ae4 */ 0x6b60,
- /* key: 0x8ae5 */ 0xffff,
- /* key: 0x8ae6 */ 0x447c,
- /* key: 0x8ae7 */ 0x6b5f,
- /* key: 0x8ae8 */ 0xffff,
- /* key: 0x8ae9 */ 0xffff,
- /* key: 0x8aea */ 0xffff,
- /* key: 0x8aeb */ 0x6b5d,
- /* key: 0x8aec */ 0xde31,
- /* key: 0x8aed */ 0x4d21,
- /* key: 0x8aee */ 0x3b70,
- /* key: 0x8aef */ 0xffff,
- /* key: 0x8af0 */ 0xde32,
- /* key: 0x8af1 */ 0x6b61,
- /* key: 0x8af2 */ 0xffff,
- /* key: 0x8af3 */ 0x6b5e,
- /* key: 0x8af4 */ 0xde33,
- /* key: 0x8af5 */ 0xde34,
- /* key: 0x8af6 */ 0xde35,
- /* key: 0x8af7 */ 0x6b65,
- /* key: 0x8af8 */ 0x3d74,
- /* key: 0x8af9 */ 0xffff,
- /* key: 0x8afa */ 0x3841,
- /* key: 0x8afb */ 0xffff,
- /* key: 0x8afc */ 0xde36,
- /* key: 0x8afd */ 0xffff,
- /* key: 0x8afe */ 0x427a,
- /* key: 0x8aff */ 0xde37,
- /* branch: 0x8b0X */ 18080,
- /* branch: 0x8b1X */ 18096,
- /* branch: 0x8b2X */ 18112,
- /* branch: 0x8b3X */ 18128,
- /* branch: 0x8b4X */ 18144,
- /* branch: 0x8b5X */ 18160,
- /* branch: 0x8b6X */ 18176,
- /* branch: 0x8b7X */ 18192,
- /* branch: 0x8b8X */ 18208,
- /* branch: 0x8b9X */ 18224,
- /* branch: 0x8baX */ 0,
- /* branch: 0x8bbX */ 0,
- /* branch: 0x8bcX */ 0,
- /* branch: 0x8bdX */ 0,
- /* branch: 0x8beX */ 0,
- /* branch: 0x8bfX */ 0,
- /* key: 0x8b00 */ 0x4b45,
- /* key: 0x8b01 */ 0x315a,
- /* key: 0x8b02 */ 0x3062,
- /* key: 0x8b03 */ 0xffff,
- /* key: 0x8b04 */ 0x4625,
- /* key: 0x8b05 */ 0xde38,
- /* key: 0x8b06 */ 0xde39,
- /* key: 0x8b07 */ 0x6b69,
- /* key: 0x8b08 */ 0xffff,
- /* key: 0x8b09 */ 0xffff,
- /* key: 0x8b0a */ 0xde3f,
- /* key: 0x8b0b */ 0xde3a,
- /* key: 0x8b0c */ 0x6b68,
- /* key: 0x8b0d */ 0xffff,
- /* key: 0x8b0e */ 0x4666,
- /* key: 0x8b0f */ 0xffff,
- /* key: 0x8b10 */ 0x6b6d,
- /* key: 0x8b11 */ 0xde3b,
- /* key: 0x8b12 */ 0xffff,
- /* key: 0x8b13 */ 0xffff,
- /* key: 0x8b14 */ 0x6b62,
- /* key: 0x8b15 */ 0xffff,
- /* key: 0x8b16 */ 0x6b6c,
- /* key: 0x8b17 */ 0x6b6e,
- /* key: 0x8b18 */ 0xffff,
- /* key: 0x8b19 */ 0x382c,
- /* key: 0x8b1a */ 0x6b6a,
- /* key: 0x8b1b */ 0x3956,
- /* key: 0x8b1c */ 0xde3c,
- /* key: 0x8b1d */ 0x3c55,
- /* key: 0x8b1e */ 0xde3d,
- /* key: 0x8b1f */ 0xde3e,
- /* key: 0x8b20 */ 0x6b6f,
- /* key: 0x8b21 */ 0x4d58,
- /* key: 0x8b22 */ 0xffff,
- /* key: 0x8b23 */ 0xffff,
- /* key: 0x8b24 */ 0xffff,
- /* key: 0x8b25 */ 0xffff,
- /* key: 0x8b26 */ 0x6b72,
- /* key: 0x8b27 */ 0xffff,
- /* key: 0x8b28 */ 0x6b75,
- /* key: 0x8b29 */ 0xffff,
- /* key: 0x8b2a */ 0xffff,
- /* key: 0x8b2b */ 0x6b73,
- /* key: 0x8b2c */ 0x4935,
- /* key: 0x8b2d */ 0xde40,
- /* key: 0x8b2e */ 0xffff,
- /* key: 0x8b2f */ 0xffff,
- /* key: 0x8b30 */ 0xde41,
- /* key: 0x8b31 */ 0xffff,
- /* key: 0x8b32 */ 0xffff,
- /* key: 0x8b33 */ 0x6b70,
- /* key: 0x8b34 */ 0xffff,
- /* key: 0x8b35 */ 0xffff,
- /* key: 0x8b36 */ 0xffff,
- /* key: 0x8b37 */ 0xde42,
- /* key: 0x8b38 */ 0xffff,
- /* key: 0x8b39 */ 0x3660,
- /* key: 0x8b3a */ 0xffff,
- /* key: 0x8b3b */ 0xffff,
- /* key: 0x8b3c */ 0xde43,
- /* key: 0x8b3d */ 0xffff,
- /* key: 0x8b3e */ 0x6b74,
- /* key: 0x8b3f */ 0xffff,
- /* key: 0x8b40 */ 0xffff,
- /* key: 0x8b41 */ 0x6b76,
- /* key: 0x8b42 */ 0xde44,
- /* key: 0x8b43 */ 0xde45,
- /* key: 0x8b44 */ 0xde46,
- /* key: 0x8b45 */ 0xde47,
- /* key: 0x8b46 */ 0xde48,
- /* key: 0x8b47 */ 0xffff,
- /* key: 0x8b48 */ 0xde49,
- /* key: 0x8b49 */ 0x6b7a,
- /* key: 0x8b4a */ 0xffff,
- /* key: 0x8b4b */ 0xffff,
- /* key: 0x8b4c */ 0x6b77,
- /* key: 0x8b4d */ 0xde4e,
- /* key: 0x8b4e */ 0x6b79,
- /* key: 0x8b4f */ 0x6b78,
- /* key: 0x8b50 */ 0xffff,
- /* key: 0x8b51 */ 0xffff,
- /* key: 0x8b52 */ 0xde4a,
- /* key: 0x8b53 */ 0xde4b,
- /* key: 0x8b54 */ 0xde4c,
- /* key: 0x8b55 */ 0xffff,
- /* key: 0x8b56 */ 0x6b7b,
- /* key: 0x8b57 */ 0xffff,
- /* key: 0x8b58 */ 0x3c31,
- /* key: 0x8b59 */ 0xde4d,
- /* key: 0x8b5a */ 0x6b7d,
- /* key: 0x8b5b */ 0x6b7c,
- /* key: 0x8b5c */ 0x4968,
- /* key: 0x8b5d */ 0xffff,
- /* key: 0x8b5e */ 0xde4f,
- /* key: 0x8b5f */ 0x6c21,
- /* key: 0x8b60 */ 0xffff,
- /* key: 0x8b61 */ 0xffff,
- /* key: 0x8b62 */ 0xffff,
- /* key: 0x8b63 */ 0xde50,
- /* key: 0x8b64 */ 0xffff,
- /* key: 0x8b65 */ 0xffff,
- /* key: 0x8b66 */ 0x3759,
- /* key: 0x8b67 */ 0xffff,
- /* key: 0x8b68 */ 0xffff,
- /* key: 0x8b69 */ 0xffff,
- /* key: 0x8b6a */ 0xffff,
- /* key: 0x8b6b */ 0x6b7e,
- /* key: 0x8b6c */ 0x6c22,
- /* key: 0x8b6d */ 0xde51,
- /* key: 0x8b6e */ 0xffff,
- /* key: 0x8b6f */ 0x6c23,
- /* key: 0x8b70 */ 0x3544,
- /* key: 0x8b71 */ 0x6641,
- /* key: 0x8b72 */ 0x3e79,
- /* key: 0x8b73 */ 0xffff,
- /* key: 0x8b74 */ 0x6c24,
- /* key: 0x8b75 */ 0xffff,
- /* key: 0x8b76 */ 0xde52,
- /* key: 0x8b77 */ 0x386e,
- /* key: 0x8b78 */ 0xde53,
- /* key: 0x8b79 */ 0xde54,
- /* key: 0x8b7a */ 0xffff,
- /* key: 0x8b7b */ 0xffff,
- /* key: 0x8b7c */ 0xde55,
- /* key: 0x8b7d */ 0x6c25,
- /* key: 0x8b7e */ 0xde56,
- /* key: 0x8b7f */ 0xffff,
- /* key: 0x8b80 */ 0x6c26,
- /* key: 0x8b81 */ 0xde57,
- /* key: 0x8b82 */ 0xffff,
- /* key: 0x8b83 */ 0x3b3e,
- /* key: 0x8b84 */ 0xde58,
- /* key: 0x8b85 */ 0xde59,
- /* key: 0x8b86 */ 0xffff,
- /* key: 0x8b87 */ 0xffff,
- /* key: 0x8b88 */ 0xffff,
- /* key: 0x8b89 */ 0xffff,
- /* key: 0x8b8a */ 0x5a4e,
- /* key: 0x8b8b */ 0xde5a,
- /* key: 0x8b8c */ 0x6c27,
- /* key: 0x8b8d */ 0xde5b,
- /* key: 0x8b8e */ 0x6c28,
- /* key: 0x8b8f */ 0xde5c,
- /* key: 0x8b90 */ 0x3d32,
- /* key: 0x8b91 */ 0xffff,
- /* key: 0x8b92 */ 0x6c29,
- /* key: 0x8b93 */ 0x6c2a,
- /* key: 0x8b94 */ 0xde5d,
- /* key: 0x8b95 */ 0xde5e,
- /* key: 0x8b96 */ 0x6c2b,
- /* key: 0x8b97 */ 0xffff,
- /* key: 0x8b98 */ 0xffff,
- /* key: 0x8b99 */ 0x6c2c,
- /* key: 0x8b9a */ 0x6c2d,
- /* key: 0x8b9b */ 0xffff,
- /* key: 0x8b9c */ 0xde5f,
- /* key: 0x8b9d */ 0xffff,
- /* key: 0x8b9e */ 0xde60,
- /* key: 0x8b9f */ 0xde61,
- /* branch: 0x8c0X */ 0,
- /* branch: 0x8c1X */ 0,
- /* branch: 0x8c2X */ 0,
- /* branch: 0x8c3X */ 18256,
- /* branch: 0x8c4X */ 18272,
- /* branch: 0x8c5X */ 18288,
- /* branch: 0x8c6X */ 18304,
- /* branch: 0x8c7X */ 18320,
- /* branch: 0x8c8X */ 18336,
- /* branch: 0x8c9X */ 18352,
- /* branch: 0x8caX */ 18368,
- /* branch: 0x8cbX */ 18384,
- /* branch: 0x8ccX */ 18400,
- /* branch: 0x8cdX */ 18416,
- /* branch: 0x8ceX */ 18432,
- /* branch: 0x8cfX */ 18448,
- /* key: 0x8c30 */ 0xffff,
- /* key: 0x8c31 */ 0xffff,
- /* key: 0x8c32 */ 0xffff,
- /* key: 0x8c33 */ 0xffff,
- /* key: 0x8c34 */ 0xffff,
- /* key: 0x8c35 */ 0xffff,
- /* key: 0x8c36 */ 0xffff,
- /* key: 0x8c37 */ 0x432b,
- /* key: 0x8c38 */ 0xde62,
- /* key: 0x8c39 */ 0xde63,
- /* key: 0x8c3a */ 0x6c2e,
- /* key: 0x8c3b */ 0xffff,
- /* key: 0x8c3c */ 0xffff,
- /* key: 0x8c3d */ 0xde64,
- /* key: 0x8c3e */ 0xde65,
- /* key: 0x8c3f */ 0x6c30,
- /* key: 0x8c40 */ 0xffff,
- /* key: 0x8c41 */ 0x6c2f,
- /* key: 0x8c42 */ 0xffff,
- /* key: 0x8c43 */ 0xffff,
- /* key: 0x8c44 */ 0xffff,
- /* key: 0x8c45 */ 0xde66,
- /* key: 0x8c46 */ 0x4626,
- /* key: 0x8c47 */ 0xde67,
- /* key: 0x8c48 */ 0x6c31,
- /* key: 0x8c49 */ 0xde68,
- /* key: 0x8c4a */ 0x4b2d,
- /* key: 0x8c4b */ 0xde69,
- /* key: 0x8c4c */ 0x6c32,
- /* key: 0x8c4d */ 0xffff,
- /* key: 0x8c4e */ 0x6c33,
- /* key: 0x8c4f */ 0xde6a,
- /* key: 0x8c50 */ 0x6c34,
- /* key: 0x8c51 */ 0xde6b,
- /* key: 0x8c52 */ 0xffff,
- /* key: 0x8c53 */ 0xde6c,
- /* key: 0x8c54 */ 0xde6d,
- /* key: 0x8c55 */ 0x6c35,
- /* key: 0x8c56 */ 0xffff,
- /* key: 0x8c57 */ 0xde6e,
- /* key: 0x8c58 */ 0xde6f,
- /* key: 0x8c59 */ 0xde72,
- /* key: 0x8c5a */ 0x465a,
- /* key: 0x8c5b */ 0xde70,
- /* key: 0x8c5c */ 0xffff,
- /* key: 0x8c5d */ 0xde71,
- /* key: 0x8c5e */ 0xffff,
- /* key: 0x8c5f */ 0xffff,
- /* key: 0x8c60 */ 0xffff,
- /* key: 0x8c61 */ 0x3e5d,
- /* key: 0x8c62 */ 0x6c36,
- /* key: 0x8c63 */ 0xde73,
- /* key: 0x8c64 */ 0xde74,
- /* key: 0x8c65 */ 0xffff,
- /* key: 0x8c66 */ 0xde75,
- /* key: 0x8c67 */ 0xffff,
- /* key: 0x8c68 */ 0xde76,
- /* key: 0x8c69 */ 0xde77,
- /* key: 0x8c6a */ 0x396b,
- /* key: 0x8c6b */ 0x502e,
- /* key: 0x8c6c */ 0x6c37,
- /* key: 0x8c6d */ 0xde78,
- /* key: 0x8c6e */ 0xffff,
- /* key: 0x8c6f */ 0xffff,
- /* key: 0x8c70 */ 0xffff,
- /* key: 0x8c71 */ 0xffff,
- /* key: 0x8c72 */ 0xffff,
- /* key: 0x8c73 */ 0xde79,
- /* key: 0x8c74 */ 0xffff,
- /* key: 0x8c75 */ 0xde7a,
- /* key: 0x8c76 */ 0xde7b,
- /* key: 0x8c77 */ 0xffff,
- /* key: 0x8c78 */ 0x6c38,
- /* key: 0x8c79 */ 0x493f,
- /* key: 0x8c7a */ 0x6c39,
- /* key: 0x8c7b */ 0xde7c,
- /* key: 0x8c7c */ 0x6c41,
- /* key: 0x8c7d */ 0xffff,
- /* key: 0x8c7e */ 0xde7d,
- /* key: 0x8c7f */ 0xffff,
- /* key: 0x8c80 */ 0xffff,
- /* key: 0x8c81 */ 0xffff,
- /* key: 0x8c82 */ 0x6c3a,
- /* key: 0x8c83 */ 0xffff,
- /* key: 0x8c84 */ 0xffff,
- /* key: 0x8c85 */ 0x6c3c,
- /* key: 0x8c86 */ 0xde7e,
- /* key: 0x8c87 */ 0xdf21,
- /* key: 0x8c88 */ 0xffff,
- /* key: 0x8c89 */ 0x6c3b,
- /* key: 0x8c8a */ 0x6c3d,
- /* key: 0x8c8b */ 0xdf22,
- /* key: 0x8c8c */ 0x4b46,
- /* key: 0x8c8d */ 0x6c3e,
- /* key: 0x8c8e */ 0x6c3f,
- /* key: 0x8c8f */ 0xffff,
- /* key: 0x8c90 */ 0xdf23,
- /* key: 0x8c91 */ 0xffff,
- /* key: 0x8c92 */ 0xdf24,
- /* key: 0x8c93 */ 0xdf25,
- /* key: 0x8c94 */ 0x6c40,
- /* key: 0x8c95 */ 0xffff,
- /* key: 0x8c96 */ 0xffff,
- /* key: 0x8c97 */ 0xffff,
- /* key: 0x8c98 */ 0x6c42,
- /* key: 0x8c99 */ 0xdf26,
- /* key: 0x8c9a */ 0xffff,
- /* key: 0x8c9b */ 0xdf27,
- /* key: 0x8c9c */ 0xdf28,
- /* key: 0x8c9d */ 0x332d,
- /* key: 0x8c9e */ 0x4467,
- /* key: 0x8c9f */ 0xffff,
- /* key: 0x8ca0 */ 0x4969,
- /* key: 0x8ca1 */ 0x3a62,
- /* key: 0x8ca2 */ 0x3957,
- /* key: 0x8ca3 */ 0xffff,
- /* key: 0x8ca4 */ 0xdf29,
- /* key: 0x8ca5 */ 0xffff,
- /* key: 0x8ca6 */ 0xffff,
- /* key: 0x8ca7 */ 0x494f,
- /* key: 0x8ca8 */ 0x325f,
- /* key: 0x8ca9 */ 0x484e,
- /* key: 0x8caa */ 0x6c45,
- /* key: 0x8cab */ 0x3453,
- /* key: 0x8cac */ 0x4055,
- /* key: 0x8cad */ 0x6c44,
- /* key: 0x8cae */ 0x6c49,
- /* key: 0x8caf */ 0x4379,
- /* key: 0x8cb0 */ 0x4c63,
- /* key: 0x8cb1 */ 0xffff,
- /* key: 0x8cb2 */ 0x6c47,
- /* key: 0x8cb3 */ 0x6c48,
- /* key: 0x8cb4 */ 0x352e,
- /* key: 0x8cb5 */ 0xffff,
- /* key: 0x8cb6 */ 0x6c4a,
- /* key: 0x8cb7 */ 0x4763,
- /* key: 0x8cb8 */ 0x425f,
- /* key: 0x8cb9 */ 0xdf2a,
- /* key: 0x8cba */ 0xdf2b,
- /* key: 0x8cbb */ 0x4871,
- /* key: 0x8cbc */ 0x453d,
- /* key: 0x8cbd */ 0x6c46,
- /* key: 0x8cbe */ 0xffff,
- /* key: 0x8cbf */ 0x4b47,
- /* key: 0x8cc0 */ 0x326c,
- /* key: 0x8cc1 */ 0x6c4c,
- /* key: 0x8cc2 */ 0x4f28,
- /* key: 0x8cc3 */ 0x4442,
- /* key: 0x8cc4 */ 0x4f45,
- /* key: 0x8cc5 */ 0xdf2c,
- /* key: 0x8cc6 */ 0xdf2d,
- /* key: 0x8cc7 */ 0x3b71,
- /* key: 0x8cc8 */ 0x6c4b,
- /* key: 0x8cc9 */ 0xdf2e,
- /* key: 0x8cca */ 0x4231,
- /* key: 0x8ccb */ 0xdf2f,
- /* key: 0x8ccc */ 0xffff,
- /* key: 0x8ccd */ 0x6c5c,
- /* key: 0x8cce */ 0x4128,
- /* key: 0x8ccf */ 0xdf30,
- /* key: 0x8cd0 */ 0xffff,
- /* key: 0x8cd1 */ 0x4678,
- /* key: 0x8cd2 */ 0xffff,
- /* key: 0x8cd3 */ 0x4950,
- /* key: 0x8cd4 */ 0xffff,
- /* key: 0x8cd5 */ 0xdf32,
- /* key: 0x8cd6 */ 0xdf31,
- /* key: 0x8cd7 */ 0xffff,
- /* key: 0x8cd8 */ 0xffff,
- /* key: 0x8cd9 */ 0xdf33,
- /* key: 0x8cda */ 0x6c4f,
- /* key: 0x8cdb */ 0x3b3f,
- /* key: 0x8cdc */ 0x3b72,
- /* key: 0x8cdd */ 0xdf34,
- /* key: 0x8cde */ 0x3e5e,
- /* key: 0x8cdf */ 0xffff,
- /* key: 0x8ce0 */ 0x4765,
- /* key: 0x8ce1 */ 0xdf35,
- /* key: 0x8ce2 */ 0x382d,
- /* key: 0x8ce3 */ 0x6c4e,
- /* key: 0x8ce4 */ 0x6c4d,
- /* key: 0x8ce5 */ 0xffff,
- /* key: 0x8ce6 */ 0x496a,
- /* key: 0x8ce7 */ 0xffff,
- /* key: 0x8ce8 */ 0xdf36,
- /* key: 0x8ce9 */ 0xffff,
- /* key: 0x8cea */ 0x3c41,
- /* key: 0x8ceb */ 0xffff,
- /* key: 0x8cec */ 0xdf37,
- /* key: 0x8ced */ 0x4552,
- /* key: 0x8cee */ 0xffff,
- /* key: 0x8cef */ 0xdf38,
- /* key: 0x8cf0 */ 0xdf39,
- /* key: 0x8cf1 */ 0xffff,
- /* key: 0x8cf2 */ 0xdf3a,
- /* key: 0x8cf3 */ 0xffff,
- /* key: 0x8cf4 */ 0xffff,
- /* key: 0x8cf5 */ 0xdf3b,
- /* key: 0x8cf6 */ 0xffff,
- /* key: 0x8cf7 */ 0xdf3c,
- /* key: 0x8cf8 */ 0xdf3d,
- /* key: 0x8cf9 */ 0xffff,
- /* key: 0x8cfa */ 0x6c51,
- /* key: 0x8cfb */ 0x6c52,
- /* key: 0x8cfc */ 0x3958,
- /* key: 0x8cfd */ 0x6c50,
- /* key: 0x8cfe */ 0xdf3e,
- /* key: 0x8cff */ 0xdf3f,
- /* branch: 0x8d0X */ 18480,
- /* branch: 0x8d1X */ 18496,
- /* branch: 0x8d2X */ 0,
- /* branch: 0x8d3X */ 0,
- /* branch: 0x8d4X */ 0,
- /* branch: 0x8d5X */ 0,
- /* branch: 0x8d6X */ 18512,
- /* branch: 0x8d7X */ 18528,
- /* branch: 0x8d8X */ 18544,
- /* branch: 0x8d9X */ 18560,
- /* branch: 0x8daX */ 18576,
- /* branch: 0x8dbX */ 18592,
- /* branch: 0x8dcX */ 18608,
- /* branch: 0x8ddX */ 18624,
- /* branch: 0x8deX */ 18640,
- /* branch: 0x8dfX */ 18656,
- /* key: 0x8d00 */ 0xffff,
- /* key: 0x8d01 */ 0xdf40,
- /* key: 0x8d02 */ 0xffff,
- /* key: 0x8d03 */ 0xdf41,
- /* key: 0x8d04 */ 0x6c53,
- /* key: 0x8d05 */ 0x6c54,
- /* key: 0x8d06 */ 0xffff,
- /* key: 0x8d07 */ 0x6c56,
- /* key: 0x8d08 */ 0x4223,
- /* key: 0x8d09 */ 0xdf42,
- /* key: 0x8d0a */ 0x6c55,
- /* key: 0x8d0b */ 0x3466,
- /* key: 0x8d0c */ 0xffff,
- /* key: 0x8d0d */ 0x6c58,
- /* key: 0x8d0e */ 0xffff,
- /* key: 0x8d0f */ 0x6c57,
- /* key: 0x8d10 */ 0x6c59,
- /* key: 0x8d11 */ 0xffff,
- /* key: 0x8d12 */ 0xdf43,
- /* key: 0x8d13 */ 0x6c5b,
- /* key: 0x8d14 */ 0x6c5d,
- /* key: 0x8d15 */ 0xffff,
- /* key: 0x8d16 */ 0x6c5e,
- /* key: 0x8d17 */ 0xdf44,
- /* key: 0x8d18 */ 0xffff,
- /* key: 0x8d19 */ 0xffff,
- /* key: 0x8d1a */ 0xffff,
- /* key: 0x8d1b */ 0xdf45,
- /* key: 0x8d1c */ 0xffff,
- /* key: 0x8d1d */ 0xffff,
- /* key: 0x8d1e */ 0xffff,
- /* key: 0x8d1f */ 0xffff,
- /* key: 0x8d60 */ 0xffff,
- /* key: 0x8d61 */ 0xffff,
- /* key: 0x8d62 */ 0xffff,
- /* key: 0x8d63 */ 0xffff,
- /* key: 0x8d64 */ 0x4056,
- /* key: 0x8d65 */ 0xdf46,
- /* key: 0x8d66 */ 0x3c4f,
- /* key: 0x8d67 */ 0x6c5f,
- /* key: 0x8d68 */ 0xffff,
- /* key: 0x8d69 */ 0xdf47,
- /* key: 0x8d6a */ 0xffff,
- /* key: 0x8d6b */ 0x3352,
- /* key: 0x8d6c */ 0xdf48,
- /* key: 0x8d6d */ 0x6c60,
- /* key: 0x8d6e */ 0xdf49,
- /* key: 0x8d6f */ 0xffff,
- /* key: 0x8d70 */ 0x4176,
- /* key: 0x8d71 */ 0x6c61,
- /* key: 0x8d72 */ 0xffff,
- /* key: 0x8d73 */ 0x6c62,
- /* key: 0x8d74 */ 0x496b,
- /* key: 0x8d75 */ 0xffff,
- /* key: 0x8d76 */ 0xffff,
- /* key: 0x8d77 */ 0x352f,
- /* key: 0x8d78 */ 0xffff,
- /* key: 0x8d79 */ 0xffff,
- /* key: 0x8d7a */ 0xffff,
- /* key: 0x8d7b */ 0xffff,
- /* key: 0x8d7c */ 0xffff,
- /* key: 0x8d7d */ 0xffff,
- /* key: 0x8d7e */ 0xffff,
- /* key: 0x8d7f */ 0xdf4a,
- /* key: 0x8d80 */ 0xffff,
- /* key: 0x8d81 */ 0x6c63,
- /* key: 0x8d82 */ 0xdf4b,
- /* key: 0x8d83 */ 0xffff,
- /* key: 0x8d84 */ 0xdf4c,
- /* key: 0x8d85 */ 0x4436,
- /* key: 0x8d86 */ 0xffff,
- /* key: 0x8d87 */ 0xffff,
- /* key: 0x8d88 */ 0xdf4d,
- /* key: 0x8d89 */ 0xffff,
- /* key: 0x8d8a */ 0x315b,
- /* key: 0x8d8b */ 0xffff,
- /* key: 0x8d8c */ 0xffff,
- /* key: 0x8d8d */ 0xdf4e,
- /* key: 0x8d8e */ 0xffff,
- /* key: 0x8d8f */ 0xffff,
- /* key: 0x8d90 */ 0xdf4f,
- /* key: 0x8d91 */ 0xdf50,
- /* key: 0x8d92 */ 0xffff,
- /* key: 0x8d93 */ 0xffff,
- /* key: 0x8d94 */ 0xffff,
- /* key: 0x8d95 */ 0xdf51,
- /* key: 0x8d96 */ 0xffff,
- /* key: 0x8d97 */ 0xffff,
- /* key: 0x8d98 */ 0xffff,
- /* key: 0x8d99 */ 0x6c64,
- /* key: 0x8d9a */ 0xffff,
- /* key: 0x8d9b */ 0xffff,
- /* key: 0x8d9c */ 0xffff,
- /* key: 0x8d9d */ 0xffff,
- /* key: 0x8d9e */ 0xdf52,
- /* key: 0x8d9f */ 0xdf53,
- /* key: 0x8da0 */ 0xdf54,
- /* key: 0x8da1 */ 0xffff,
- /* key: 0x8da2 */ 0xffff,
- /* key: 0x8da3 */ 0x3c71,
- /* key: 0x8da4 */ 0xffff,
- /* key: 0x8da5 */ 0xffff,
- /* key: 0x8da6 */ 0xdf55,
- /* key: 0x8da7 */ 0xffff,
- /* key: 0x8da8 */ 0x3f76,
- /* key: 0x8da9 */ 0xffff,
- /* key: 0x8daa */ 0xffff,
- /* key: 0x8dab */ 0xdf56,
- /* key: 0x8dac */ 0xdf57,
- /* key: 0x8dad */ 0xffff,
- /* key: 0x8dae */ 0xffff,
- /* key: 0x8daf */ 0xdf58,
- /* key: 0x8db0 */ 0xffff,
- /* key: 0x8db1 */ 0xffff,
- /* key: 0x8db2 */ 0xdf59,
- /* key: 0x8db3 */ 0x422d,
- /* key: 0x8db4 */ 0xffff,
- /* key: 0x8db5 */ 0xdf5a,
- /* key: 0x8db6 */ 0xffff,
- /* key: 0x8db7 */ 0xdf5b,
- /* key: 0x8db8 */ 0xffff,
- /* key: 0x8db9 */ 0xdf5c,
- /* key: 0x8dba */ 0x6c67,
- /* key: 0x8dbb */ 0xdf5d,
- /* key: 0x8dbc */ 0xdf6f,
- /* key: 0x8dbd */ 0xffff,
- /* key: 0x8dbe */ 0x6c66,
- /* key: 0x8dbf */ 0xffff,
- /* key: 0x8dc0 */ 0xdf5e,
- /* key: 0x8dc1 */ 0xffff,
- /* key: 0x8dc2 */ 0x6c65,
- /* key: 0x8dc3 */ 0xffff,
- /* key: 0x8dc4 */ 0xffff,
- /* key: 0x8dc5 */ 0xdf5f,
- /* key: 0x8dc6 */ 0xdf60,
- /* key: 0x8dc7 */ 0xdf61,
- /* key: 0x8dc8 */ 0xdf62,
- /* key: 0x8dc9 */ 0xffff,
- /* key: 0x8dca */ 0xdf63,
- /* key: 0x8dcb */ 0x6c6d,
- /* key: 0x8dcc */ 0x6c6b,
- /* key: 0x8dcd */ 0xffff,
- /* key: 0x8dce */ 0xdf64,
- /* key: 0x8dcf */ 0x6c68,
- /* key: 0x8dd0 */ 0xffff,
- /* key: 0x8dd1 */ 0xdf65,
- /* key: 0x8dd2 */ 0xffff,
- /* key: 0x8dd3 */ 0xffff,
- /* key: 0x8dd4 */ 0xdf66,
- /* key: 0x8dd5 */ 0xdf67,
- /* key: 0x8dd6 */ 0x6c6a,
- /* key: 0x8dd7 */ 0xdf68,
- /* key: 0x8dd8 */ 0xffff,
- /* key: 0x8dd9 */ 0xdf69,
- /* key: 0x8dda */ 0x6c69,
- /* key: 0x8ddb */ 0x6c6c,
- /* key: 0x8ddc */ 0xffff,
- /* key: 0x8ddd */ 0x3577,
- /* key: 0x8dde */ 0xffff,
- /* key: 0x8ddf */ 0x6c70,
- /* key: 0x8de0 */ 0xffff,
- /* key: 0x8de1 */ 0x4057,
- /* key: 0x8de2 */ 0xffff,
- /* key: 0x8de3 */ 0x6c71,
- /* key: 0x8de4 */ 0xdf6a,
- /* key: 0x8de5 */ 0xdf6b,
- /* key: 0x8de6 */ 0xffff,
- /* key: 0x8de7 */ 0xdf6c,
- /* key: 0x8de8 */ 0x3859,
- /* key: 0x8de9 */ 0xffff,
- /* key: 0x8dea */ 0x6c6e,
- /* key: 0x8deb */ 0x6c6f,
- /* key: 0x8dec */ 0xdf6d,
- /* key: 0x8ded */ 0xffff,
- /* key: 0x8dee */ 0xffff,
- /* key: 0x8def */ 0x4f29,
- /* key: 0x8df0 */ 0xdf6e,
- /* key: 0x8df1 */ 0xdf70,
- /* key: 0x8df2 */ 0xdf71,
- /* key: 0x8df3 */ 0x4437,
- /* key: 0x8df4 */ 0xdf72,
- /* key: 0x8df5 */ 0x4129,
- /* key: 0x8df6 */ 0xffff,
- /* key: 0x8df7 */ 0xffff,
- /* key: 0x8df8 */ 0xffff,
- /* key: 0x8df9 */ 0xffff,
- /* key: 0x8dfa */ 0xffff,
- /* key: 0x8dfb */ 0xffff,
- /* key: 0x8dfc */ 0x6c72,
- /* key: 0x8dfd */ 0xdf73,
- /* key: 0x8dfe */ 0xffff,
- /* key: 0x8dff */ 0x6c75,
- /* branch: 0x8e0X */ 18688,
- /* branch: 0x8e1X */ 18704,
- /* branch: 0x8e2X */ 18720,
- /* branch: 0x8e3X */ 18736,
- /* branch: 0x8e4X */ 18752,
- /* branch: 0x8e5X */ 18768,
- /* branch: 0x8e6X */ 18784,
- /* branch: 0x8e7X */ 18800,
- /* branch: 0x8e8X */ 18816,
- /* branch: 0x8e9X */ 18832,
- /* branch: 0x8eaX */ 18848,
- /* branch: 0x8ebX */ 18864,
- /* branch: 0x8ecX */ 18880,
- /* branch: 0x8edX */ 18896,
- /* branch: 0x8eeX */ 18912,
- /* branch: 0x8efX */ 18928,
- /* key: 0x8e00 */ 0xffff,
- /* key: 0x8e01 */ 0xdf74,
- /* key: 0x8e02 */ 0xffff,
- /* key: 0x8e03 */ 0xffff,
- /* key: 0x8e04 */ 0xdf75,
- /* key: 0x8e05 */ 0xdf76,
- /* key: 0x8e06 */ 0xdf77,
- /* key: 0x8e07 */ 0xffff,
- /* key: 0x8e08 */ 0x6c73,
- /* key: 0x8e09 */ 0x6c74,
- /* key: 0x8e0a */ 0x4d59,
- /* key: 0x8e0b */ 0xdf78,
- /* key: 0x8e0c */ 0xffff,
- /* key: 0x8e0d */ 0xffff,
- /* key: 0x8e0e */ 0xffff,
- /* key: 0x8e0f */ 0x4627,
- /* key: 0x8e10 */ 0x6c78,
- /* key: 0x8e11 */ 0xdf79,
- /* key: 0x8e12 */ 0xffff,
- /* key: 0x8e13 */ 0xffff,
- /* key: 0x8e14 */ 0xdf7a,
- /* key: 0x8e15 */ 0xffff,
- /* key: 0x8e16 */ 0xdf7b,
- /* key: 0x8e17 */ 0xffff,
- /* key: 0x8e18 */ 0xffff,
- /* key: 0x8e19 */ 0xffff,
- /* key: 0x8e1a */ 0xffff,
- /* key: 0x8e1b */ 0xffff,
- /* key: 0x8e1c */ 0xffff,
- /* key: 0x8e1d */ 0x6c76,
- /* key: 0x8e1e */ 0x6c77,
- /* key: 0x8e1f */ 0x6c79,
- /* key: 0x8e20 */ 0xdf7c,
- /* key: 0x8e21 */ 0xdf7d,
- /* key: 0x8e22 */ 0xdf7e,
- /* key: 0x8e23 */ 0xe021,
- /* key: 0x8e24 */ 0xffff,
- /* key: 0x8e25 */ 0xffff,
- /* key: 0x8e26 */ 0xe022,
- /* key: 0x8e27 */ 0xe023,
- /* key: 0x8e28 */ 0xffff,
- /* key: 0x8e29 */ 0xffff,
- /* key: 0x8e2a */ 0x6d29,
- /* key: 0x8e2b */ 0xffff,
- /* key: 0x8e2c */ 0xffff,
- /* key: 0x8e2d */ 0xffff,
- /* key: 0x8e2e */ 0xffff,
- /* key: 0x8e2f */ 0xffff,
- /* key: 0x8e30 */ 0x6c7c,
- /* key: 0x8e31 */ 0xe024,
- /* key: 0x8e32 */ 0xffff,
- /* key: 0x8e33 */ 0xe025,
- /* key: 0x8e34 */ 0x6c7d,
- /* key: 0x8e35 */ 0x6c7b,
- /* key: 0x8e36 */ 0xe026,
- /* key: 0x8e37 */ 0xe027,
- /* key: 0x8e38 */ 0xe028,
- /* key: 0x8e39 */ 0xe029,
- /* key: 0x8e3a */ 0xffff,
- /* key: 0x8e3b */ 0xffff,
- /* key: 0x8e3c */ 0xffff,
- /* key: 0x8e3d */ 0xe02a,
- /* key: 0x8e3e */ 0xffff,
- /* key: 0x8e3f */ 0xffff,
- /* key: 0x8e40 */ 0xe02b,
- /* key: 0x8e41 */ 0xe02c,
- /* key: 0x8e42 */ 0x6c7a,
- /* key: 0x8e43 */ 0xffff,
- /* key: 0x8e44 */ 0x447d,
- /* key: 0x8e45 */ 0xffff,
- /* key: 0x8e46 */ 0xffff,
- /* key: 0x8e47 */ 0x6d21,
- /* key: 0x8e48 */ 0x6d25,
- /* key: 0x8e49 */ 0x6d22,
- /* key: 0x8e4a */ 0x6c7e,
- /* key: 0x8e4b */ 0xe02d,
- /* key: 0x8e4c */ 0x6d23,
- /* key: 0x8e4d */ 0xe02e,
- /* key: 0x8e4e */ 0xe02f,
- /* key: 0x8e4f */ 0xe030,
- /* key: 0x8e50 */ 0x6d24,
- /* key: 0x8e51 */ 0xffff,
- /* key: 0x8e52 */ 0xffff,
- /* key: 0x8e53 */ 0xffff,
- /* key: 0x8e54 */ 0xe031,
- /* key: 0x8e55 */ 0x6d2b,
- /* key: 0x8e56 */ 0xffff,
- /* key: 0x8e57 */ 0xffff,
- /* key: 0x8e58 */ 0xffff,
- /* key: 0x8e59 */ 0x6d26,
- /* key: 0x8e5a */ 0xffff,
- /* key: 0x8e5b */ 0xe032,
- /* key: 0x8e5c */ 0xe033,
- /* key: 0x8e5d */ 0xe034,
- /* key: 0x8e5e */ 0xe035,
- /* key: 0x8e5f */ 0x4058,
- /* key: 0x8e60 */ 0x6d28,
- /* key: 0x8e61 */ 0xe036,
- /* key: 0x8e62 */ 0xe037,
- /* key: 0x8e63 */ 0x6d2a,
- /* key: 0x8e64 */ 0x6d27,
- /* key: 0x8e65 */ 0xffff,
- /* key: 0x8e66 */ 0xffff,
- /* key: 0x8e67 */ 0xffff,
- /* key: 0x8e68 */ 0xffff,
- /* key: 0x8e69 */ 0xe038,
- /* key: 0x8e6a */ 0xffff,
- /* key: 0x8e6b */ 0xffff,
- /* key: 0x8e6c */ 0xe039,
- /* key: 0x8e6d */ 0xe03a,
- /* key: 0x8e6e */ 0xffff,
- /* key: 0x8e6f */ 0xe03b,
- /* key: 0x8e70 */ 0xe03c,
- /* key: 0x8e71 */ 0xe03d,
- /* key: 0x8e72 */ 0x6d2d,
- /* key: 0x8e73 */ 0xffff,
- /* key: 0x8e74 */ 0x3d33,
- /* key: 0x8e75 */ 0xffff,
- /* key: 0x8e76 */ 0x6d2c,
- /* key: 0x8e77 */ 0xffff,
- /* key: 0x8e78 */ 0xffff,
- /* key: 0x8e79 */ 0xe03e,
- /* key: 0x8e7a */ 0xe03f,
- /* key: 0x8e7b */ 0xe040,
- /* key: 0x8e7c */ 0x6d2e,
- /* key: 0x8e7d */ 0xffff,
- /* key: 0x8e7e */ 0xffff,
- /* key: 0x8e7f */ 0xffff,
- /* key: 0x8e80 */ 0xffff,
- /* key: 0x8e81 */ 0x6d2f,
- /* key: 0x8e82 */ 0xe041,
- /* key: 0x8e83 */ 0xe042,
- /* key: 0x8e84 */ 0x6d32,
- /* key: 0x8e85 */ 0x6d31,
- /* key: 0x8e86 */ 0xffff,
- /* key: 0x8e87 */ 0x6d30,
- /* key: 0x8e88 */ 0xffff,
- /* key: 0x8e89 */ 0xe043,
- /* key: 0x8e8a */ 0x6d34,
- /* key: 0x8e8b */ 0x6d33,
- /* key: 0x8e8c */ 0xffff,
- /* key: 0x8e8d */ 0x4c76,
- /* key: 0x8e8e */ 0xffff,
- /* key: 0x8e8f */ 0xffff,
- /* key: 0x8e90 */ 0xe044,
- /* key: 0x8e91 */ 0x6d36,
- /* key: 0x8e92 */ 0xe045,
- /* key: 0x8e93 */ 0x6d35,
- /* key: 0x8e94 */ 0x6d37,
- /* key: 0x8e95 */ 0xe046,
- /* key: 0x8e96 */ 0xffff,
- /* key: 0x8e97 */ 0xffff,
- /* key: 0x8e98 */ 0xffff,
- /* key: 0x8e99 */ 0x6d38,
- /* key: 0x8e9a */ 0xe047,
- /* key: 0x8e9b */ 0xe048,
- /* key: 0x8e9c */ 0xffff,
- /* key: 0x8e9d */ 0xe049,
- /* key: 0x8e9e */ 0xe04a,
- /* key: 0x8e9f */ 0xffff,
- /* key: 0x8ea0 */ 0xffff,
- /* key: 0x8ea1 */ 0x6d3a,
- /* key: 0x8ea2 */ 0xe04b,
- /* key: 0x8ea3 */ 0xffff,
- /* key: 0x8ea4 */ 0xffff,
- /* key: 0x8ea5 */ 0xffff,
- /* key: 0x8ea6 */ 0xffff,
- /* key: 0x8ea7 */ 0xe04c,
- /* key: 0x8ea8 */ 0xffff,
- /* key: 0x8ea9 */ 0xe04d,
- /* key: 0x8eaa */ 0x6d39,
- /* key: 0x8eab */ 0x3f48,
- /* key: 0x8eac */ 0x6d3b,
- /* key: 0x8ead */ 0xe04e,
- /* key: 0x8eae */ 0xe04f,
- /* key: 0x8eaf */ 0x366d,
- /* key: 0x8eb0 */ 0x6d3c,
- /* key: 0x8eb1 */ 0x6d3e,
- /* key: 0x8eb2 */ 0xffff,
- /* key: 0x8eb3 */ 0xe050,
- /* key: 0x8eb4 */ 0xffff,
- /* key: 0x8eb5 */ 0xe051,
- /* key: 0x8eb6 */ 0xffff,
- /* key: 0x8eb7 */ 0xffff,
- /* key: 0x8eb8 */ 0xffff,
- /* key: 0x8eb9 */ 0xffff,
- /* key: 0x8eba */ 0xe052,
- /* key: 0x8ebb */ 0xe053,
- /* key: 0x8ebc */ 0xffff,
- /* key: 0x8ebd */ 0xffff,
- /* key: 0x8ebe */ 0x6d3f,
- /* key: 0x8ebf */ 0xffff,
- /* key: 0x8ec0 */ 0xe054,
- /* key: 0x8ec1 */ 0xe055,
- /* key: 0x8ec2 */ 0xffff,
- /* key: 0x8ec3 */ 0xe056,
- /* key: 0x8ec4 */ 0xe057,
- /* key: 0x8ec5 */ 0x6d40,
- /* key: 0x8ec6 */ 0x6d3d,
- /* key: 0x8ec7 */ 0xe058,
- /* key: 0x8ec8 */ 0x6d41,
- /* key: 0x8ec9 */ 0xffff,
- /* key: 0x8eca */ 0x3c56,
- /* key: 0x8ecb */ 0x6d42,
- /* key: 0x8ecc */ 0x3530,
- /* key: 0x8ecd */ 0x3733,
- /* key: 0x8ece */ 0xffff,
- /* key: 0x8ecf */ 0xe059,
- /* key: 0x8ed0 */ 0xffff,
- /* key: 0x8ed1 */ 0xe05a,
- /* key: 0x8ed2 */ 0x382e,
- /* key: 0x8ed3 */ 0xffff,
- /* key: 0x8ed4 */ 0xe05b,
- /* key: 0x8ed5 */ 0xffff,
- /* key: 0x8ed6 */ 0xffff,
- /* key: 0x8ed7 */ 0xffff,
- /* key: 0x8ed8 */ 0xffff,
- /* key: 0x8ed9 */ 0xffff,
- /* key: 0x8eda */ 0xffff,
- /* key: 0x8edb */ 0x6d43,
- /* key: 0x8edc */ 0xe05c,
- /* key: 0x8edd */ 0xffff,
- /* key: 0x8ede */ 0xffff,
- /* key: 0x8edf */ 0x4670,
- /* key: 0x8ee0 */ 0xffff,
- /* key: 0x8ee1 */ 0xffff,
- /* key: 0x8ee2 */ 0x453e,
- /* key: 0x8ee3 */ 0x6d44,
- /* key: 0x8ee4 */ 0xffff,
- /* key: 0x8ee5 */ 0xffff,
- /* key: 0x8ee6 */ 0xffff,
- /* key: 0x8ee7 */ 0xffff,
- /* key: 0x8ee8 */ 0xe05d,
- /* key: 0x8ee9 */ 0xffff,
- /* key: 0x8eea */ 0xffff,
- /* key: 0x8eeb */ 0x6d47,
- /* key: 0x8eec */ 0xffff,
- /* key: 0x8eed */ 0xe064,
- /* key: 0x8eee */ 0xe05e,
- /* key: 0x8eef */ 0xffff,
- /* key: 0x8ef0 */ 0xe05f,
- /* key: 0x8ef1 */ 0xe060,
- /* key: 0x8ef2 */ 0xffff,
- /* key: 0x8ef3 */ 0xffff,
- /* key: 0x8ef4 */ 0xffff,
- /* key: 0x8ef5 */ 0xffff,
- /* key: 0x8ef6 */ 0xffff,
- /* key: 0x8ef7 */ 0xe061,
- /* key: 0x8ef8 */ 0x3c34,
- /* key: 0x8ef9 */ 0xe062,
- /* key: 0x8efa */ 0xe063,
- /* key: 0x8efb */ 0x6d46,
- /* key: 0x8efc */ 0x6d45,
- /* key: 0x8efd */ 0x375a,
- /* key: 0x8efe */ 0x6d48,
- /* key: 0x8eff */ 0xffff,
- /* branch: 0x8f0X */ 18960,
- /* branch: 0x8f1X */ 18976,
- /* branch: 0x8f2X */ 18992,
- /* branch: 0x8f3X */ 19008,
- /* branch: 0x8f4X */ 19024,
- /* branch: 0x8f5X */ 19040,
- /* branch: 0x8f6X */ 19056,
- /* branch: 0x8f7X */ 0,
- /* branch: 0x8f8X */ 0,
- /* branch: 0x8f9X */ 19072,
- /* branch: 0x8faX */ 19088,
- /* branch: 0x8fbX */ 19104,
- /* branch: 0x8fcX */ 19120,
- /* branch: 0x8fdX */ 19136,
- /* branch: 0x8feX */ 19152,
- /* branch: 0x8ffX */ 19168,
- /* key: 0x8f00 */ 0xe065,
- /* key: 0x8f01 */ 0xffff,
- /* key: 0x8f02 */ 0xe066,
- /* key: 0x8f03 */ 0x3353,
- /* key: 0x8f04 */ 0xffff,
- /* key: 0x8f05 */ 0x6d4a,
- /* key: 0x8f06 */ 0xffff,
- /* key: 0x8f07 */ 0xe067,
- /* key: 0x8f08 */ 0xe068,
- /* key: 0x8f09 */ 0x3a5c,
- /* key: 0x8f0a */ 0x6d49,
- /* key: 0x8f0b */ 0xffff,
- /* key: 0x8f0c */ 0x6d52,
- /* key: 0x8f0d */ 0xffff,
- /* key: 0x8f0e */ 0xffff,
- /* key: 0x8f0f */ 0xe069,
- /* key: 0x8f10 */ 0xe06a,
- /* key: 0x8f11 */ 0xffff,
- /* key: 0x8f12 */ 0x6d4c,
- /* key: 0x8f13 */ 0x6d4e,
- /* key: 0x8f14 */ 0x4a65,
- /* key: 0x8f15 */ 0x6d4b,
- /* key: 0x8f16 */ 0xe06b,
- /* key: 0x8f17 */ 0xe06c,
- /* key: 0x8f18 */ 0xe06d,
- /* key: 0x8f19 */ 0x6d4d,
- /* key: 0x8f1a */ 0xffff,
- /* key: 0x8f1b */ 0x6d51,
- /* key: 0x8f1c */ 0x6d4f,
- /* key: 0x8f1d */ 0x3531,
- /* key: 0x8f1e */ 0xe06e,
- /* key: 0x8f1f */ 0x6d50,
- /* key: 0x8f20 */ 0xe06f,
- /* key: 0x8f21 */ 0xe070,
- /* key: 0x8f22 */ 0xffff,
- /* key: 0x8f23 */ 0xe071,
- /* key: 0x8f24 */ 0xffff,
- /* key: 0x8f25 */ 0xe072,
- /* key: 0x8f26 */ 0x6d53,
- /* key: 0x8f27 */ 0xe073,
- /* key: 0x8f28 */ 0xe074,
- /* key: 0x8f29 */ 0x475a,
- /* key: 0x8f2a */ 0x4e58,
- /* key: 0x8f2b */ 0xffff,
- /* key: 0x8f2c */ 0xe075,
- /* key: 0x8f2d */ 0xe076,
- /* key: 0x8f2e */ 0xe077,
- /* key: 0x8f2f */ 0x3d34,
- /* key: 0x8f30 */ 0xffff,
- /* key: 0x8f31 */ 0xffff,
- /* key: 0x8f32 */ 0xffff,
- /* key: 0x8f33 */ 0x6d54,
- /* key: 0x8f34 */ 0xe078,
- /* key: 0x8f35 */ 0xe079,
- /* key: 0x8f36 */ 0xe07a,
- /* key: 0x8f37 */ 0xe07b,
- /* key: 0x8f38 */ 0x4d22,
- /* key: 0x8f39 */ 0x6d56,
- /* key: 0x8f3a */ 0xe07c,
- /* key: 0x8f3b */ 0x6d55,
- /* key: 0x8f3c */ 0xffff,
- /* key: 0x8f3d */ 0xffff,
- /* key: 0x8f3e */ 0x6d59,
- /* key: 0x8f3f */ 0x4d41,
- /* key: 0x8f40 */ 0xe07d,
- /* key: 0x8f41 */ 0xe07e,
- /* key: 0x8f42 */ 0x6d58,
- /* key: 0x8f43 */ 0xe121,
- /* key: 0x8f44 */ 0x336d,
- /* key: 0x8f45 */ 0x6d57,
- /* key: 0x8f46 */ 0x6d5c,
- /* key: 0x8f47 */ 0xe122,
- /* key: 0x8f48 */ 0xffff,
- /* key: 0x8f49 */ 0x6d5b,
- /* key: 0x8f4a */ 0xffff,
- /* key: 0x8f4b */ 0xffff,
- /* key: 0x8f4c */ 0x6d5a,
- /* key: 0x8f4d */ 0x4532,
- /* key: 0x8f4e */ 0x6d5d,
- /* key: 0x8f4f */ 0xe123,
- /* key: 0x8f50 */ 0xffff,
- /* key: 0x8f51 */ 0xe124,
- /* key: 0x8f52 */ 0xe125,
- /* key: 0x8f53 */ 0xe126,
- /* key: 0x8f54 */ 0xe127,
- /* key: 0x8f55 */ 0xe128,
- /* key: 0x8f56 */ 0xffff,
- /* key: 0x8f57 */ 0x6d5e,
- /* key: 0x8f58 */ 0xe129,
- /* key: 0x8f59 */ 0xffff,
- /* key: 0x8f5a */ 0xffff,
- /* key: 0x8f5b */ 0xffff,
- /* key: 0x8f5c */ 0x6d5f,
- /* key: 0x8f5d */ 0xe12a,
- /* key: 0x8f5e */ 0xe12b,
- /* key: 0x8f5f */ 0x396c,
- /* key: 0x8f60 */ 0xffff,
- /* key: 0x8f61 */ 0x3725,
- /* key: 0x8f62 */ 0x6d60,
- /* key: 0x8f63 */ 0x6d61,
- /* key: 0x8f64 */ 0x6d62,
- /* key: 0x8f65 */ 0xe12c,
- /* key: 0x8f66 */ 0xffff,
- /* key: 0x8f67 */ 0xffff,
- /* key: 0x8f68 */ 0xffff,
- /* key: 0x8f69 */ 0xffff,
- /* key: 0x8f6a */ 0xffff,
- /* key: 0x8f6b */ 0xffff,
- /* key: 0x8f6c */ 0xffff,
- /* key: 0x8f6d */ 0xffff,
- /* key: 0x8f6e */ 0xffff,
- /* key: 0x8f6f */ 0xffff,
- /* key: 0x8f90 */ 0xffff,
- /* key: 0x8f91 */ 0xffff,
- /* key: 0x8f92 */ 0xffff,
- /* key: 0x8f93 */ 0xffff,
- /* key: 0x8f94 */ 0xffff,
- /* key: 0x8f95 */ 0xffff,
- /* key: 0x8f96 */ 0xffff,
- /* key: 0x8f97 */ 0xffff,
- /* key: 0x8f98 */ 0xffff,
- /* key: 0x8f99 */ 0xffff,
- /* key: 0x8f9a */ 0xffff,
- /* key: 0x8f9b */ 0x3f49,
- /* key: 0x8f9c */ 0x6d63,
- /* key: 0x8f9d */ 0xe12d,
- /* key: 0x8f9e */ 0x3c2d,
- /* key: 0x8f9f */ 0x6d64,
- /* key: 0x8fa0 */ 0xe12e,
- /* key: 0x8fa1 */ 0xe12f,
- /* key: 0x8fa2 */ 0xffff,
- /* key: 0x8fa3 */ 0x6d65,
- /* key: 0x8fa4 */ 0xe130,
- /* key: 0x8fa5 */ 0xe131,
- /* key: 0x8fa6 */ 0xe132,
- /* key: 0x8fa7 */ 0x5221,
- /* key: 0x8fa8 */ 0x517e,
- /* key: 0x8fa9 */ 0xffff,
- /* key: 0x8faa */ 0xffff,
- /* key: 0x8fab */ 0xffff,
- /* key: 0x8fac */ 0xffff,
- /* key: 0x8fad */ 0x6d66,
- /* key: 0x8fae */ 0x6570,
- /* key: 0x8faf */ 0x6d67,
- /* key: 0x8fb0 */ 0x4324,
- /* key: 0x8fb1 */ 0x3f2b,
- /* key: 0x8fb2 */ 0x4740,
- /* key: 0x8fb3 */ 0xffff,
- /* key: 0x8fb4 */ 0xffff,
- /* key: 0x8fb5 */ 0xe133,
- /* key: 0x8fb6 */ 0xe134,
- /* key: 0x8fb7 */ 0x6d68,
- /* key: 0x8fb8 */ 0xe135,
- /* key: 0x8fb9 */ 0xffff,
- /* key: 0x8fba */ 0x4a55,
- /* key: 0x8fbb */ 0x4454,
- /* key: 0x8fbc */ 0x397e,
- /* key: 0x8fbd */ 0xffff,
- /* key: 0x8fbe */ 0xe136,
- /* key: 0x8fbf */ 0x4329,
- /* key: 0x8fc0 */ 0xe137,
- /* key: 0x8fc1 */ 0xe138,
- /* key: 0x8fc2 */ 0x312a,
- /* key: 0x8fc3 */ 0xffff,
- /* key: 0x8fc4 */ 0x4b78,
- /* key: 0x8fc5 */ 0x3f57,
- /* key: 0x8fc6 */ 0xe139,
- /* key: 0x8fc7 */ 0xffff,
- /* key: 0x8fc8 */ 0xffff,
- /* key: 0x8fc9 */ 0xffff,
- /* key: 0x8fca */ 0xe13a,
- /* key: 0x8fcb */ 0xe13b,
- /* key: 0x8fcc */ 0xffff,
- /* key: 0x8fcd */ 0xe13c,
- /* key: 0x8fce */ 0x375e,
- /* key: 0x8fcf */ 0xffff,
- /* key: 0x8fd0 */ 0xe13d,
- /* key: 0x8fd1 */ 0x3661,
- /* key: 0x8fd2 */ 0xe13e,
- /* key: 0x8fd3 */ 0xe13f,
- /* key: 0x8fd4 */ 0x4a56,
- /* key: 0x8fd5 */ 0xe140,
- /* key: 0x8fd6 */ 0xffff,
- /* key: 0x8fd7 */ 0xffff,
- /* key: 0x8fd8 */ 0xffff,
- /* key: 0x8fd9 */ 0xffff,
- /* key: 0x8fda */ 0x6d69,
- /* key: 0x8fdb */ 0xffff,
- /* key: 0x8fdc */ 0xffff,
- /* key: 0x8fdd */ 0xffff,
- /* key: 0x8fde */ 0xffff,
- /* key: 0x8fdf */ 0xffff,
- /* key: 0x8fe0 */ 0xe141,
- /* key: 0x8fe1 */ 0xffff,
- /* key: 0x8fe2 */ 0x6d6b,
- /* key: 0x8fe3 */ 0xe142,
- /* key: 0x8fe4 */ 0xe143,
- /* key: 0x8fe5 */ 0x6d6a,
- /* key: 0x8fe6 */ 0x3260,
- /* key: 0x8fe7 */ 0xffff,
- /* key: 0x8fe8 */ 0xe144,
- /* key: 0x8fe9 */ 0x4676,
- /* key: 0x8fea */ 0x6d6c,
- /* key: 0x8feb */ 0x4777,
- /* key: 0x8fec */ 0xffff,
- /* key: 0x8fed */ 0x4533,
- /* key: 0x8fee */ 0xe145,
- /* key: 0x8fef */ 0x6d6d,
- /* key: 0x8ff0 */ 0x3d52,
- /* key: 0x8ff1 */ 0xe146,
- /* key: 0x8ff2 */ 0xffff,
- /* key: 0x8ff3 */ 0xffff,
- /* key: 0x8ff4 */ 0x6d6f,
- /* key: 0x8ff5 */ 0xe147,
- /* key: 0x8ff6 */ 0xe148,
- /* key: 0x8ff7 */ 0x4c42,
- /* key: 0x8ff8 */ 0x6d7e,
- /* key: 0x8ff9 */ 0x6d71,
- /* key: 0x8ffa */ 0x6d72,
- /* key: 0x8ffb */ 0xe149,
- /* key: 0x8ffc */ 0xffff,
- /* key: 0x8ffd */ 0x4449,
- /* key: 0x8ffe */ 0xe14a,
- /* key: 0x8fff */ 0xffff,
- /* branch: 0x90XX */ 19200,
- /* branch: 0x91XX */ 19472,
- /* branch: 0x92XX */ 19744,
- /* branch: 0x93XX */ 20016,
- /* branch: 0x94XX */ 20288,
- /* branch: 0x95XX */ 20448,
- /* branch: 0x96XX */ 20592,
- /* branch: 0x97XX */ 20848,
- /* branch: 0x98XX */ 21120,
- /* branch: 0x99XX */ 21360,
- /* branch: 0x9aXX */ 21600,
- /* branch: 0x9bXX */ 21824,
- /* branch: 0x9cXX */ 22096,
- /* branch: 0x9dXX */ 22272,
- /* branch: 0x9eXX */ 22544,
- /* branch: 0x9fXX */ 22736,
- /* branch: 0x900X */ 19216,
- /* branch: 0x901X */ 19232,
- /* branch: 0x902X */ 19248,
- /* branch: 0x903X */ 19264,
- /* branch: 0x904X */ 19280,
- /* branch: 0x905X */ 19296,
- /* branch: 0x906X */ 19312,
- /* branch: 0x907X */ 19328,
- /* branch: 0x908X */ 19344,
- /* branch: 0x909X */ 19360,
- /* branch: 0x90aX */ 19376,
- /* branch: 0x90bX */ 19392,
- /* branch: 0x90cX */ 19408,
- /* branch: 0x90dX */ 19424,
- /* branch: 0x90eX */ 19440,
- /* branch: 0x90fX */ 19456,
- /* key: 0x9000 */ 0x4260,
- /* key: 0x9001 */ 0x4177,
- /* key: 0x9002 */ 0xe14b,
- /* key: 0x9003 */ 0x4628,
- /* key: 0x9004 */ 0xe14c,
- /* key: 0x9005 */ 0x6d70,
- /* key: 0x9006 */ 0x3555,
- /* key: 0x9007 */ 0xffff,
- /* key: 0x9008 */ 0xe14d,
- /* key: 0x9009 */ 0xffff,
- /* key: 0x900a */ 0xffff,
- /* key: 0x900b */ 0x6d79,
- /* key: 0x900c */ 0xe14e,
- /* key: 0x900d */ 0x6d76,
- /* key: 0x900e */ 0x6e25,
- /* key: 0x900f */ 0x4629,
- /* key: 0x9010 */ 0x4360,
- /* key: 0x9011 */ 0x6d73,
- /* key: 0x9012 */ 0xffff,
- /* key: 0x9013 */ 0x447e,
- /* key: 0x9014 */ 0x4553,
- /* key: 0x9015 */ 0x6d74,
- /* key: 0x9016 */ 0x6d78,
- /* key: 0x9017 */ 0x3f60,
- /* key: 0x9018 */ 0xe14f,
- /* key: 0x9019 */ 0x4767,
- /* key: 0x901a */ 0x444c,
- /* key: 0x901b */ 0xe150,
- /* key: 0x901c */ 0xffff,
- /* key: 0x901d */ 0x4042,
- /* key: 0x901e */ 0x6d77,
- /* key: 0x901f */ 0x422e,
- /* key: 0x9020 */ 0x4224,
- /* key: 0x9021 */ 0x6d75,
- /* key: 0x9022 */ 0x3029,
- /* key: 0x9023 */ 0x4f22,
- /* key: 0x9024 */ 0xffff,
- /* key: 0x9025 */ 0xffff,
- /* key: 0x9026 */ 0xffff,
- /* key: 0x9027 */ 0x6d7a,
- /* key: 0x9028 */ 0xe151,
- /* key: 0x9029 */ 0xe152,
- /* key: 0x902a */ 0xe154,
- /* key: 0x902b */ 0xffff,
- /* key: 0x902c */ 0xe155,
- /* key: 0x902d */ 0xe156,
- /* key: 0x902e */ 0x4261,
- /* key: 0x902f */ 0xe153,
- /* key: 0x9030 */ 0xffff,
- /* key: 0x9031 */ 0x3d35,
- /* key: 0x9032 */ 0x3f4a,
- /* key: 0x9033 */ 0xe157,
- /* key: 0x9034 */ 0xe158,
- /* key: 0x9035 */ 0x6d7c,
- /* key: 0x9036 */ 0x6d7b,
- /* key: 0x9037 */ 0xe159,
- /* key: 0x9038 */ 0x306f,
- /* key: 0x9039 */ 0x6d7d,
- /* key: 0x903a */ 0xffff,
- /* key: 0x903b */ 0xffff,
- /* key: 0x903c */ 0x492f,
- /* key: 0x903d */ 0xffff,
- /* key: 0x903e */ 0x6e27,
- /* key: 0x903f */ 0xe15a,
- /* key: 0x9040 */ 0xffff,
- /* key: 0x9041 */ 0x465b,
- /* key: 0x9042 */ 0x3f6b,
- /* key: 0x9043 */ 0xe15b,
- /* key: 0x9044 */ 0xe15c,
- /* key: 0x9045 */ 0x4359,
- /* key: 0x9046 */ 0xffff,
- /* key: 0x9047 */ 0x3678,
- /* key: 0x9048 */ 0xffff,
- /* key: 0x9049 */ 0x6e26,
- /* key: 0x904a */ 0x4d37,
- /* key: 0x904b */ 0x313f,
- /* key: 0x904c */ 0xe15d,
- /* key: 0x904d */ 0x4a57,
- /* key: 0x904e */ 0x3261,
- /* key: 0x904f */ 0x6e21,
- /* key: 0x9050 */ 0x6e22,
- /* key: 0x9051 */ 0x6e23,
- /* key: 0x9052 */ 0x6e24,
- /* key: 0x9053 */ 0x463b,
- /* key: 0x9054 */ 0x4323,
- /* key: 0x9055 */ 0x3063,
- /* key: 0x9056 */ 0x6e28,
- /* key: 0x9057 */ 0xffff,
- /* key: 0x9058 */ 0x6e29,
- /* key: 0x9059 */ 0x7423,
- /* key: 0x905a */ 0xffff,
- /* key: 0x905b */ 0xe15e,
- /* key: 0x905c */ 0x423d,
- /* key: 0x905d */ 0xe15f,
- /* key: 0x905e */ 0x6e2a,
- /* key: 0x905f */ 0xffff,
- /* key: 0x9060 */ 0x3173,
- /* key: 0x9061 */ 0x414c,
- /* key: 0x9062 */ 0xe160,
- /* key: 0x9063 */ 0x382f,
- /* key: 0x9064 */ 0xffff,
- /* key: 0x9065 */ 0x4d5a,
- /* key: 0x9066 */ 0xe161,
- /* key: 0x9067 */ 0xe162,
- /* key: 0x9068 */ 0x6e2b,
- /* key: 0x9069 */ 0x452c,
- /* key: 0x906a */ 0xffff,
- /* key: 0x906b */ 0xffff,
- /* key: 0x906c */ 0xe163,
- /* key: 0x906d */ 0x4178,
- /* key: 0x906e */ 0x3c57,
- /* key: 0x906f */ 0x6e2c,
- /* key: 0x9070 */ 0xe164,
- /* key: 0x9071 */ 0xffff,
- /* key: 0x9072 */ 0x6e2f,
- /* key: 0x9073 */ 0xffff,
- /* key: 0x9074 */ 0xe165,
- /* key: 0x9075 */ 0x3d65,
- /* key: 0x9076 */ 0x6e2d,
- /* key: 0x9077 */ 0x412b,
- /* key: 0x9078 */ 0x412a,
- /* key: 0x9079 */ 0xe166,
- /* key: 0x907a */ 0x3064,
- /* key: 0x907b */ 0xffff,
- /* key: 0x907c */ 0x4e4b,
- /* key: 0x907d */ 0x6e31,
- /* key: 0x907e */ 0xffff,
- /* key: 0x907f */ 0x4872,
- /* key: 0x9080 */ 0x6e33,
- /* key: 0x9081 */ 0x6e32,
- /* key: 0x9082 */ 0x6e30,
- /* key: 0x9083 */ 0x6364,
- /* key: 0x9084 */ 0x3454,
- /* key: 0x9085 */ 0xe167,
- /* key: 0x9086 */ 0xffff,
- /* key: 0x9087 */ 0x6d6e,
- /* key: 0x9088 */ 0xe168,
- /* key: 0x9089 */ 0x6e35,
- /* key: 0x908a */ 0x6e34,
- /* key: 0x908b */ 0xe169,
- /* key: 0x908c */ 0xe16a,
- /* key: 0x908d */ 0xffff,
- /* key: 0x908e */ 0xe16b,
- /* key: 0x908f */ 0x6e36,
- /* key: 0x9090 */ 0xe16c,
- /* key: 0x9091 */ 0x4d38,
- /* key: 0x9092 */ 0xffff,
- /* key: 0x9093 */ 0xffff,
- /* key: 0x9094 */ 0xffff,
- /* key: 0x9095 */ 0xe16d,
- /* key: 0x9096 */ 0xffff,
- /* key: 0x9097 */ 0xe16e,
- /* key: 0x9098 */ 0xe16f,
- /* key: 0x9099 */ 0xe170,
- /* key: 0x909a */ 0xffff,
- /* key: 0x909b */ 0xe171,
- /* key: 0x909c */ 0xffff,
- /* key: 0x909d */ 0xffff,
- /* key: 0x909e */ 0xffff,
- /* key: 0x909f */ 0xffff,
- /* key: 0x90a0 */ 0xe172,
- /* key: 0x90a1 */ 0xe173,
- /* key: 0x90a2 */ 0xe174,
- /* key: 0x90a3 */ 0x4661,
- /* key: 0x90a4 */ 0xffff,
- /* key: 0x90a5 */ 0xe175,
- /* key: 0x90a6 */ 0x4b2e,
- /* key: 0x90a7 */ 0xffff,
- /* key: 0x90a8 */ 0x6e37,
- /* key: 0x90a9 */ 0xffff,
- /* key: 0x90aa */ 0x3c59,
- /* key: 0x90ab */ 0xffff,
- /* key: 0x90ac */ 0xffff,
- /* key: 0x90ad */ 0xffff,
- /* key: 0x90ae */ 0xffff,
- /* key: 0x90af */ 0x6e38,
- /* key: 0x90b0 */ 0xe176,
- /* key: 0x90b1 */ 0x6e39,
- /* key: 0x90b2 */ 0xe177,
- /* key: 0x90b3 */ 0xe178,
- /* key: 0x90b4 */ 0xe179,
- /* key: 0x90b5 */ 0x6e3a,
- /* key: 0x90b6 */ 0xe17a,
- /* key: 0x90b7 */ 0xffff,
- /* key: 0x90b8 */ 0x4521,
- /* key: 0x90b9 */ 0xffff,
- /* key: 0x90ba */ 0xffff,
- /* key: 0x90bb */ 0xffff,
- /* key: 0x90bc */ 0xffff,
- /* key: 0x90bd */ 0xe17b,
- /* key: 0x90be */ 0xe17d,
- /* key: 0x90bf */ 0xffff,
- /* key: 0x90c0 */ 0xffff,
- /* key: 0x90c1 */ 0x306a,
- /* key: 0x90c2 */ 0xffff,
- /* key: 0x90c3 */ 0xe17e,
- /* key: 0x90c4 */ 0xe221,
- /* key: 0x90c5 */ 0xe222,
- /* key: 0x90c6 */ 0xffff,
- /* key: 0x90c7 */ 0xe223,
- /* key: 0x90c8 */ 0xe224,
- /* key: 0x90c9 */ 0xffff,
- /* key: 0x90ca */ 0x3959,
- /* key: 0x90cb */ 0xffff,
- /* key: 0x90cc */ 0xe17c,
- /* key: 0x90cd */ 0xffff,
- /* key: 0x90ce */ 0x4f3a,
- /* key: 0x90cf */ 0xffff,
- /* key: 0x90d0 */ 0xffff,
- /* key: 0x90d1 */ 0xffff,
- /* key: 0x90d2 */ 0xe22d,
- /* key: 0x90d3 */ 0xffff,
- /* key: 0x90d4 */ 0xffff,
- /* key: 0x90d5 */ 0xe225,
- /* key: 0x90d6 */ 0xffff,
- /* key: 0x90d7 */ 0xe226,
- /* key: 0x90d8 */ 0xe227,
- /* key: 0x90d9 */ 0xe228,
- /* key: 0x90da */ 0xffff,
- /* key: 0x90db */ 0x6e3e,
- /* key: 0x90dc */ 0xe229,
- /* key: 0x90dd */ 0xe22a,
- /* key: 0x90de */ 0xffff,
- /* key: 0x90df */ 0xe22b,
- /* key: 0x90e0 */ 0xffff,
- /* key: 0x90e1 */ 0x3734,
- /* key: 0x90e2 */ 0x6e3b,
- /* key: 0x90e3 */ 0xffff,
- /* key: 0x90e4 */ 0x6e3c,
- /* key: 0x90e5 */ 0xe22c,
- /* key: 0x90e6 */ 0xffff,
- /* key: 0x90e7 */ 0xffff,
- /* key: 0x90e8 */ 0x4974,
- /* key: 0x90e9 */ 0xffff,
- /* key: 0x90ea */ 0xffff,
- /* key: 0x90eb */ 0xe22f,
- /* key: 0x90ec */ 0xffff,
- /* key: 0x90ed */ 0x3354,
- /* key: 0x90ee */ 0xffff,
- /* key: 0x90ef */ 0xe230,
- /* key: 0x90f0 */ 0xe231,
- /* key: 0x90f1 */ 0xffff,
- /* key: 0x90f2 */ 0xffff,
- /* key: 0x90f3 */ 0xffff,
- /* key: 0x90f4 */ 0xe232,
- /* key: 0x90f5 */ 0x4d39,
- /* key: 0x90f6 */ 0xe22e,
- /* key: 0x90f7 */ 0x363f,
- /* key: 0x90f8 */ 0xffff,
- /* key: 0x90f9 */ 0xffff,
- /* key: 0x90fa */ 0xffff,
- /* key: 0x90fb */ 0xffff,
- /* key: 0x90fc */ 0xffff,
- /* key: 0x90fd */ 0x4554,
- /* key: 0x90fe */ 0xe233,
- /* key: 0x90ff */ 0xe234,
- /* branch: 0x910X */ 19488,
- /* branch: 0x911X */ 19504,
- /* branch: 0x912X */ 19520,
- /* branch: 0x913X */ 19536,
- /* branch: 0x914X */ 19552,
- /* branch: 0x915X */ 19568,
- /* branch: 0x916X */ 19584,
- /* branch: 0x917X */ 19600,
- /* branch: 0x918X */ 19616,
- /* branch: 0x919X */ 19632,
- /* branch: 0x91aX */ 19648,
- /* branch: 0x91bX */ 19664,
- /* branch: 0x91cX */ 19680,
- /* branch: 0x91dX */ 19696,
- /* branch: 0x91eX */ 19712,
- /* branch: 0x91fX */ 19728,
- /* key: 0x9100 */ 0xe235,
- /* key: 0x9101 */ 0xffff,
- /* key: 0x9102 */ 0x6e3f,
- /* key: 0x9103 */ 0xffff,
- /* key: 0x9104 */ 0xe236,
- /* key: 0x9105 */ 0xe237,
- /* key: 0x9106 */ 0xe238,
- /* key: 0x9107 */ 0xffff,
- /* key: 0x9108 */ 0xe239,
- /* key: 0x9109 */ 0xffff,
- /* key: 0x910a */ 0xffff,
- /* key: 0x910b */ 0xffff,
- /* key: 0x910c */ 0xffff,
- /* key: 0x910d */ 0xe23a,
- /* key: 0x910e */ 0xffff,
- /* key: 0x910f */ 0xffff,
- /* key: 0x9110 */ 0xe23b,
- /* key: 0x9111 */ 0xffff,
- /* key: 0x9112 */ 0x6e40,
- /* key: 0x9113 */ 0xffff,
- /* key: 0x9114 */ 0xe23c,
- /* key: 0x9115 */ 0xffff,
- /* key: 0x9116 */ 0xe23d,
- /* key: 0x9117 */ 0xe23e,
- /* key: 0x9118 */ 0xe23f,
- /* key: 0x9119 */ 0x6e41,
- /* key: 0x911a */ 0xe240,
- /* key: 0x911b */ 0xffff,
- /* key: 0x911c */ 0xe241,
- /* key: 0x911d */ 0xffff,
- /* key: 0x911e */ 0xe242,
- /* key: 0x911f */ 0xffff,
- /* key: 0x9120 */ 0xe243,
- /* key: 0x9121 */ 0xffff,
- /* key: 0x9122 */ 0xe245,
- /* key: 0x9123 */ 0xe246,
- /* key: 0x9124 */ 0xffff,
- /* key: 0x9125 */ 0xe244,
- /* key: 0x9126 */ 0xffff,
- /* key: 0x9127 */ 0xe247,
- /* key: 0x9128 */ 0xffff,
- /* key: 0x9129 */ 0xe248,
- /* key: 0x912a */ 0xffff,
- /* key: 0x912b */ 0xffff,
- /* key: 0x912c */ 0xffff,
- /* key: 0x912d */ 0x4522,
- /* key: 0x912e */ 0xe249,
- /* key: 0x912f */ 0xe24a,
- /* key: 0x9130 */ 0x6e43,
- /* key: 0x9131 */ 0xe24b,
- /* key: 0x9132 */ 0x6e42,
- /* key: 0x9133 */ 0xffff,
- /* key: 0x9134 */ 0xe24c,
- /* key: 0x9135 */ 0xffff,
- /* key: 0x9136 */ 0xe24d,
- /* key: 0x9137 */ 0xe24e,
- /* key: 0x9138 */ 0xffff,
- /* key: 0x9139 */ 0xe24f,
- /* key: 0x913a */ 0xe250,
- /* key: 0x913b */ 0xffff,
- /* key: 0x913c */ 0xe251,
- /* key: 0x913d */ 0xe252,
- /* key: 0x913e */ 0xffff,
- /* key: 0x913f */ 0xffff,
- /* key: 0x9140 */ 0xffff,
- /* key: 0x9141 */ 0xffff,
- /* key: 0x9142 */ 0xffff,
- /* key: 0x9143 */ 0xe253,
- /* key: 0x9144 */ 0xffff,
- /* key: 0x9145 */ 0xffff,
- /* key: 0x9146 */ 0xffff,
- /* key: 0x9147 */ 0xe254,
- /* key: 0x9148 */ 0xe255,
- /* key: 0x9149 */ 0x4653,
- /* key: 0x914a */ 0x6e44,
- /* key: 0x914b */ 0x3d36,
- /* key: 0x914c */ 0x3c60,
- /* key: 0x914d */ 0x475b,
- /* key: 0x914e */ 0x4371,
- /* key: 0x914f */ 0xe256,
- /* key: 0x9150 */ 0xffff,
- /* key: 0x9151 */ 0xffff,
- /* key: 0x9152 */ 0x3c72,
- /* key: 0x9153 */ 0xe257,
- /* key: 0x9154 */ 0x3f6c,
- /* key: 0x9155 */ 0xffff,
- /* key: 0x9156 */ 0x6e45,
- /* key: 0x9157 */ 0xe258,
- /* key: 0x9158 */ 0x6e46,
- /* key: 0x9159 */ 0xe259,
- /* key: 0x915a */ 0xe25a,
- /* key: 0x915b */ 0xe25b,
- /* key: 0x915c */ 0xffff,
- /* key: 0x915d */ 0xffff,
- /* key: 0x915e */ 0xffff,
- /* key: 0x915f */ 0xffff,
- /* key: 0x9160 */ 0xffff,
- /* key: 0x9161 */ 0xe25c,
- /* key: 0x9162 */ 0x3f5d,
- /* key: 0x9163 */ 0x6e47,
- /* key: 0x9164 */ 0xe25d,
- /* key: 0x9165 */ 0x6e48,
- /* key: 0x9166 */ 0xffff,
- /* key: 0x9167 */ 0xe25e,
- /* key: 0x9168 */ 0xffff,
- /* key: 0x9169 */ 0x6e49,
- /* key: 0x916a */ 0x4d6f,
- /* key: 0x916b */ 0xffff,
- /* key: 0x916c */ 0x3d37,
- /* key: 0x916d */ 0xe25f,
- /* key: 0x916e */ 0xffff,
- /* key: 0x916f */ 0xffff,
- /* key: 0x9170 */ 0xffff,
- /* key: 0x9171 */ 0xffff,
- /* key: 0x9172 */ 0x6e4b,
- /* key: 0x9173 */ 0x6e4a,
- /* key: 0x9174 */ 0xe260,
- /* key: 0x9175 */ 0x395a,
- /* key: 0x9176 */ 0xffff,
- /* key: 0x9177 */ 0x3973,
- /* key: 0x9178 */ 0x3b40,
- /* key: 0x9179 */ 0xe261,
- /* key: 0x917a */ 0xe262,
- /* key: 0x917b */ 0xe263,
- /* key: 0x917c */ 0xffff,
- /* key: 0x917d */ 0xffff,
- /* key: 0x917e */ 0xffff,
- /* key: 0x917f */ 0xffff,
- /* key: 0x9180 */ 0xffff,
- /* key: 0x9181 */ 0xe264,
- /* key: 0x9182 */ 0x6e4e,
- /* key: 0x9183 */ 0xe265,
- /* key: 0x9184 */ 0xffff,
- /* key: 0x9185 */ 0xe266,
- /* key: 0x9186 */ 0xe267,
- /* key: 0x9187 */ 0x3d66,
- /* key: 0x9188 */ 0xffff,
- /* key: 0x9189 */ 0x6e4d,
- /* key: 0x918a */ 0xe268,
- /* key: 0x918b */ 0x6e4c,
- /* key: 0x918c */ 0xffff,
- /* key: 0x918d */ 0x4269,
- /* key: 0x918e */ 0xe269,
- /* key: 0x918f */ 0xffff,
- /* key: 0x9190 */ 0x386f,
- /* key: 0x9191 */ 0xe26a,
- /* key: 0x9192 */ 0x4043,
- /* key: 0x9193 */ 0xe26b,
- /* key: 0x9194 */ 0xe26c,
- /* key: 0x9195 */ 0xe26d,
- /* key: 0x9196 */ 0xffff,
- /* key: 0x9197 */ 0x4830,
- /* key: 0x9198 */ 0xe26e,
- /* key: 0x9199 */ 0xffff,
- /* key: 0x919a */ 0xffff,
- /* key: 0x919b */ 0xffff,
- /* key: 0x919c */ 0x3d39,
- /* key: 0x919d */ 0xffff,
- /* key: 0x919e */ 0xe26f,
- /* key: 0x919f */ 0xffff,
- /* key: 0x91a0 */ 0xffff,
- /* key: 0x91a1 */ 0xe270,
- /* key: 0x91a2 */ 0x6e4f,
- /* key: 0x91a3 */ 0xffff,
- /* key: 0x91a4 */ 0x3e5f,
- /* key: 0x91a5 */ 0xffff,
- /* key: 0x91a6 */ 0xe271,
- /* key: 0x91a7 */ 0xffff,
- /* key: 0x91a8 */ 0xe272,
- /* key: 0x91a9 */ 0xffff,
- /* key: 0x91aa */ 0x6e52,
- /* key: 0x91ab */ 0x6e50,
- /* key: 0x91ac */ 0xe273,
- /* key: 0x91ad */ 0xe274,
- /* key: 0x91ae */ 0xe275,
- /* key: 0x91af */ 0x6e51,
- /* key: 0x91b0 */ 0xe276,
- /* key: 0x91b1 */ 0xe277,
- /* key: 0x91b2 */ 0xe278,
- /* key: 0x91b3 */ 0xe279,
- /* key: 0x91b4 */ 0x6e54,
- /* key: 0x91b5 */ 0x6e53,
- /* key: 0x91b6 */ 0xe27a,
- /* key: 0x91b7 */ 0xffff,
- /* key: 0x91b8 */ 0x3e7a,
- /* key: 0x91b9 */ 0xffff,
- /* key: 0x91ba */ 0x6e55,
- /* key: 0x91bb */ 0xe27b,
- /* key: 0x91bc */ 0xe27c,
- /* key: 0x91bd */ 0xe27d,
- /* key: 0x91be */ 0xffff,
- /* key: 0x91bf */ 0xe27e,
- /* key: 0x91c0 */ 0x6e56,
- /* key: 0x91c1 */ 0x6e57,
- /* key: 0x91c2 */ 0xe321,
- /* key: 0x91c3 */ 0xe322,
- /* key: 0x91c4 */ 0xffff,
- /* key: 0x91c5 */ 0xe323,
- /* key: 0x91c6 */ 0x4850,
- /* key: 0x91c7 */ 0x3a53,
- /* key: 0x91c8 */ 0x3c61,
- /* key: 0x91c9 */ 0x6e58,
- /* key: 0x91ca */ 0xffff,
- /* key: 0x91cb */ 0x6e59,
- /* key: 0x91cc */ 0x4e24,
- /* key: 0x91cd */ 0x3d45,
- /* key: 0x91ce */ 0x4c6e,
- /* key: 0x91cf */ 0x4e4c,
- /* key: 0x91d0 */ 0x6e5a,
- /* key: 0x91d1 */ 0x3662,
- /* key: 0x91d2 */ 0xffff,
- /* key: 0x91d3 */ 0xe324,
- /* key: 0x91d4 */ 0xe325,
- /* key: 0x91d5 */ 0xffff,
- /* key: 0x91d6 */ 0x6e5b,
- /* key: 0x91d7 */ 0xe326,
- /* key: 0x91d8 */ 0x4523,
- /* key: 0x91d9 */ 0xe327,
- /* key: 0x91da */ 0xe328,
- /* key: 0x91db */ 0x6e5e,
- /* key: 0x91dc */ 0x3378,
- /* key: 0x91dd */ 0x3f4b,
- /* key: 0x91de */ 0xe329,
- /* key: 0x91df */ 0x6e5c,
- /* key: 0x91e0 */ 0xffff,
- /* key: 0x91e1 */ 0x6e5d,
- /* key: 0x91e2 */ 0xffff,
- /* key: 0x91e3 */ 0x4460,
- /* key: 0x91e4 */ 0xe32a,
- /* key: 0x91e5 */ 0xe32b,
- /* key: 0x91e6 */ 0x4b55,
- /* key: 0x91e7 */ 0x367c,
- /* key: 0x91e8 */ 0xffff,
- /* key: 0x91e9 */ 0xe32c,
- /* key: 0x91ea */ 0xe32d,
- /* key: 0x91eb */ 0xffff,
- /* key: 0x91ec */ 0xe32e,
- /* key: 0x91ed */ 0xe32f,
- /* key: 0x91ee */ 0xe330,
- /* key: 0x91ef */ 0xe331,
- /* key: 0x91f0 */ 0xe332,
- /* key: 0x91f1 */ 0xe333,
- /* key: 0x91f2 */ 0xffff,
- /* key: 0x91f3 */ 0xffff,
- /* key: 0x91f4 */ 0xffff,
- /* key: 0x91f5 */ 0x6e60,
- /* key: 0x91f6 */ 0x6e61,
- /* key: 0x91f7 */ 0xe334,
- /* key: 0x91f8 */ 0xffff,
- /* key: 0x91f9 */ 0xe335,
- /* key: 0x91fa */ 0xffff,
- /* key: 0x91fb */ 0xe336,
- /* key: 0x91fc */ 0x6e5f,
- /* key: 0x91fd */ 0xe337,
- /* key: 0x91fe */ 0xffff,
- /* key: 0x91ff */ 0x6e63,
- /* branch: 0x920X */ 19760,
- /* branch: 0x921X */ 19776,
- /* branch: 0x922X */ 19792,
- /* branch: 0x923X */ 19808,
- /* branch: 0x924X */ 19824,
- /* branch: 0x925X */ 19840,
- /* branch: 0x926X */ 19856,
- /* branch: 0x927X */ 19872,
- /* branch: 0x928X */ 19888,
- /* branch: 0x929X */ 19904,
- /* branch: 0x92aX */ 19920,
- /* branch: 0x92bX */ 19936,
- /* branch: 0x92cX */ 19952,
- /* branch: 0x92dX */ 19968,
- /* branch: 0x92eX */ 19984,
- /* branch: 0x92fX */ 20000,
- /* key: 0x9200 */ 0xe338,
- /* key: 0x9201 */ 0xe339,
- /* key: 0x9202 */ 0xffff,
- /* key: 0x9203 */ 0xffff,
- /* key: 0x9204 */ 0xe33a,
- /* key: 0x9205 */ 0xe33b,
- /* key: 0x9206 */ 0xe33c,
- /* key: 0x9207 */ 0xe33d,
- /* key: 0x9208 */ 0xffff,
- /* key: 0x9209 */ 0xe33e,
- /* key: 0x920a */ 0xe33f,
- /* key: 0x920b */ 0xffff,
- /* key: 0x920c */ 0xe340,
- /* key: 0x920d */ 0x465f,
- /* key: 0x920e */ 0x3343,
- /* key: 0x920f */ 0xffff,
- /* key: 0x9210 */ 0xe341,
- /* key: 0x9211 */ 0x6e67,
- /* key: 0x9212 */ 0xe342,
- /* key: 0x9213 */ 0xe343,
- /* key: 0x9214 */ 0x6e64,
- /* key: 0x9215 */ 0x6e66,
- /* key: 0x9216 */ 0xe344,
- /* key: 0x9217 */ 0xffff,
- /* key: 0x9218 */ 0xe345,
- /* key: 0x9219 */ 0xffff,
- /* key: 0x921a */ 0xffff,
- /* key: 0x921b */ 0xffff,
- /* key: 0x921c */ 0xe346,
- /* key: 0x921d */ 0xe347,
- /* key: 0x921e */ 0x6e62,
- /* key: 0x921f */ 0xffff,
- /* key: 0x9220 */ 0xffff,
- /* key: 0x9221 */ 0xffff,
- /* key: 0x9222 */ 0xffff,
- /* key: 0x9223 */ 0xe348,
- /* key: 0x9224 */ 0xe349,
- /* key: 0x9225 */ 0xe34a,
- /* key: 0x9226 */ 0xe34b,
- /* key: 0x9227 */ 0xffff,
- /* key: 0x9228 */ 0xe34c,
- /* key: 0x9229 */ 0x6f4f,
- /* key: 0x922a */ 0xffff,
- /* key: 0x922b */ 0xffff,
- /* key: 0x922c */ 0x6e65,
- /* key: 0x922d */ 0xffff,
- /* key: 0x922e */ 0xe34d,
- /* key: 0x922f */ 0xe34e,
- /* key: 0x9230 */ 0xe34f,
- /* key: 0x9231 */ 0xffff,
- /* key: 0x9232 */ 0xffff,
- /* key: 0x9233 */ 0xe350,
- /* key: 0x9234 */ 0x4e6b,
- /* key: 0x9235 */ 0xe351,
- /* key: 0x9236 */ 0xe352,
- /* key: 0x9237 */ 0x385a,
- /* key: 0x9238 */ 0xe353,
- /* key: 0x9239 */ 0xe354,
- /* key: 0x923a */ 0xe355,
- /* key: 0x923b */ 0xffff,
- /* key: 0x923c */ 0xe356,
- /* key: 0x923d */ 0xffff,
- /* key: 0x923e */ 0xe357,
- /* key: 0x923f */ 0x6e6f,
- /* key: 0x9240 */ 0xe358,
- /* key: 0x9241 */ 0xffff,
- /* key: 0x9242 */ 0xe359,
- /* key: 0x9243 */ 0xe35a,
- /* key: 0x9244 */ 0x4534,
- /* key: 0x9245 */ 0x6e6a,
- /* key: 0x9246 */ 0xe35b,
- /* key: 0x9247 */ 0xe35c,
- /* key: 0x9248 */ 0x6e6d,
- /* key: 0x9249 */ 0x6e6b,
- /* key: 0x924a */ 0xe35d,
- /* key: 0x924b */ 0x6e70,
- /* key: 0x924c */ 0xffff,
- /* key: 0x924d */ 0xe35e,
- /* key: 0x924e */ 0xe35f,
- /* key: 0x924f */ 0xe360,
- /* key: 0x9250 */ 0x6e71,
- /* key: 0x9251 */ 0xe361,
- /* key: 0x9252 */ 0xffff,
- /* key: 0x9253 */ 0xffff,
- /* key: 0x9254 */ 0xffff,
- /* key: 0x9255 */ 0xffff,
- /* key: 0x9256 */ 0xffff,
- /* key: 0x9257 */ 0x6e69,
- /* key: 0x9258 */ 0xe362,
- /* key: 0x9259 */ 0xe363,
- /* key: 0x925a */ 0x6e76,
- /* key: 0x925b */ 0x3174,
- /* key: 0x925c */ 0xe364,
- /* key: 0x925d */ 0xe365,
- /* key: 0x925e */ 0x6e68,
- /* key: 0x925f */ 0xffff,
- /* key: 0x9260 */ 0xe366,
- /* key: 0x9261 */ 0xe367,
- /* key: 0x9262 */ 0x482d,
- /* key: 0x9263 */ 0xffff,
- /* key: 0x9264 */ 0x6e6c,
- /* key: 0x9265 */ 0xe368,
- /* key: 0x9266 */ 0x3e60,
- /* key: 0x9267 */ 0xe369,
- /* key: 0x9268 */ 0xe36a,
- /* key: 0x9269 */ 0xe36b,
- /* key: 0x926a */ 0xffff,
- /* key: 0x926b */ 0xffff,
- /* key: 0x926c */ 0xffff,
- /* key: 0x926d */ 0xffff,
- /* key: 0x926e */ 0xe36c,
- /* key: 0x926f */ 0xe36d,
- /* key: 0x9270 */ 0xe36e,
- /* key: 0x9271 */ 0x395b,
- /* key: 0x9272 */ 0xffff,
- /* key: 0x9273 */ 0xffff,
- /* key: 0x9274 */ 0xffff,
- /* key: 0x9275 */ 0xe36f,
- /* key: 0x9276 */ 0xe370,
- /* key: 0x9277 */ 0xe371,
- /* key: 0x9278 */ 0xe372,
- /* key: 0x9279 */ 0xe373,
- /* key: 0x927a */ 0xffff,
- /* key: 0x927b */ 0xe374,
- /* key: 0x927c */ 0xe375,
- /* key: 0x927d */ 0xe376,
- /* key: 0x927e */ 0x4b48,
- /* key: 0x927f */ 0xe377,
- /* key: 0x9280 */ 0x3664,
- /* key: 0x9281 */ 0xffff,
- /* key: 0x9282 */ 0xffff,
- /* key: 0x9283 */ 0x3d46,
- /* key: 0x9284 */ 0xffff,
- /* key: 0x9285 */ 0x463c,
- /* key: 0x9286 */ 0xffff,
- /* key: 0x9287 */ 0xffff,
- /* key: 0x9288 */ 0xe378,
- /* key: 0x9289 */ 0xe379,
- /* key: 0x928a */ 0xe37a,
- /* key: 0x928b */ 0xffff,
- /* key: 0x928c */ 0xffff,
- /* key: 0x928d */ 0xe37b,
- /* key: 0x928e */ 0xe37c,
- /* key: 0x928f */ 0xffff,
- /* key: 0x9290 */ 0xffff,
- /* key: 0x9291 */ 0x412d,
- /* key: 0x9292 */ 0xe37d,
- /* key: 0x9293 */ 0x6e74,
- /* key: 0x9294 */ 0xffff,
- /* key: 0x9295 */ 0x6e6e,
- /* key: 0x9296 */ 0x6e73,
- /* key: 0x9297 */ 0xe37e,
- /* key: 0x9298 */ 0x4c43,
- /* key: 0x9299 */ 0xe421,
- /* key: 0x929a */ 0x4438,
- /* key: 0x929b */ 0x6e75,
- /* key: 0x929c */ 0x6e72,
- /* key: 0x929d */ 0xffff,
- /* key: 0x929e */ 0xffff,
- /* key: 0x929f */ 0xe422,
- /* key: 0x92a0 */ 0xe423,
- /* key: 0x92a1 */ 0xffff,
- /* key: 0x92a2 */ 0xffff,
- /* key: 0x92a3 */ 0xffff,
- /* key: 0x92a4 */ 0xe424,
- /* key: 0x92a5 */ 0xe425,
- /* key: 0x92a6 */ 0xffff,
- /* key: 0x92a7 */ 0xe426,
- /* key: 0x92a8 */ 0xe427,
- /* key: 0x92a9 */ 0xffff,
- /* key: 0x92aa */ 0xffff,
- /* key: 0x92ab */ 0xe428,
- /* key: 0x92ac */ 0xffff,
- /* key: 0x92ad */ 0x412c,
- /* key: 0x92ae */ 0xffff,
- /* key: 0x92af */ 0xe429,
- /* key: 0x92b0 */ 0xffff,
- /* key: 0x92b1 */ 0xffff,
- /* key: 0x92b2 */ 0xe42a,
- /* key: 0x92b3 */ 0xffff,
- /* key: 0x92b4 */ 0xffff,
- /* key: 0x92b5 */ 0xffff,
- /* key: 0x92b6 */ 0xe42b,
- /* key: 0x92b7 */ 0x6e79,
- /* key: 0x92b8 */ 0xe42c,
- /* key: 0x92b9 */ 0x6e78,
- /* key: 0x92ba */ 0xe42d,
- /* key: 0x92bb */ 0xe42e,
- /* key: 0x92bc */ 0xe42f,
- /* key: 0x92bd */ 0xe430,
- /* key: 0x92be */ 0xffff,
- /* key: 0x92bf */ 0xe431,
- /* key: 0x92c0 */ 0xe432,
- /* key: 0x92c1 */ 0xe433,
- /* key: 0x92c2 */ 0xe434,
- /* key: 0x92c3 */ 0xe435,
- /* key: 0x92c4 */ 0xffff,
- /* key: 0x92c5 */ 0xe436,
- /* key: 0x92c6 */ 0xe437,
- /* key: 0x92c7 */ 0xe438,
- /* key: 0x92c8 */ 0xe439,
- /* key: 0x92c9 */ 0xffff,
- /* key: 0x92ca */ 0xffff,
- /* key: 0x92cb */ 0xe43a,
- /* key: 0x92cc */ 0xe43b,
- /* key: 0x92cd */ 0xe43c,
- /* key: 0x92ce */ 0xe43d,
- /* key: 0x92cf */ 0x6e77,
- /* key: 0x92d0 */ 0xe43e,
- /* key: 0x92d1 */ 0xffff,
- /* key: 0x92d2 */ 0x4b2f,
- /* key: 0x92d3 */ 0xe43f,
- /* key: 0x92d4 */ 0xffff,
- /* key: 0x92d5 */ 0xe440,
- /* key: 0x92d6 */ 0xffff,
- /* key: 0x92d7 */ 0xe441,
- /* key: 0x92d8 */ 0xe442,
- /* key: 0x92d9 */ 0xe443,
- /* key: 0x92da */ 0xffff,
- /* key: 0x92db */ 0xffff,
- /* key: 0x92dc */ 0xe444,
- /* key: 0x92dd */ 0xe445,
- /* key: 0x92de */ 0xffff,
- /* key: 0x92df */ 0xe446,
- /* key: 0x92e0 */ 0xe447,
- /* key: 0x92e1 */ 0xe448,
- /* key: 0x92e2 */ 0xffff,
- /* key: 0x92e3 */ 0xe449,
- /* key: 0x92e4 */ 0x3d7b,
- /* key: 0x92e5 */ 0xe44a,
- /* key: 0x92e6 */ 0xffff,
- /* key: 0x92e7 */ 0xe44b,
- /* key: 0x92e8 */ 0xe44c,
- /* key: 0x92e9 */ 0x6e7a,
- /* key: 0x92ea */ 0x4a5f,
- /* key: 0x92eb */ 0xffff,
- /* key: 0x92ec */ 0xe44d,
- /* key: 0x92ed */ 0x3154,
- /* key: 0x92ee */ 0xe44e,
- /* key: 0x92ef */ 0xffff,
- /* key: 0x92f0 */ 0xe44f,
- /* key: 0x92f1 */ 0xffff,
- /* key: 0x92f2 */ 0x4946,
- /* key: 0x92f3 */ 0x4372,
- /* key: 0x92f4 */ 0xffff,
- /* key: 0x92f5 */ 0xffff,
- /* key: 0x92f6 */ 0xffff,
- /* key: 0x92f7 */ 0xffff,
- /* key: 0x92f8 */ 0x3578,
- /* key: 0x92f9 */ 0xe450,
- /* key: 0x92fa */ 0x6e7c,
- /* key: 0x92fb */ 0xe451,
- /* key: 0x92fc */ 0x395d,
- /* key: 0x92fd */ 0xffff,
- /* key: 0x92fe */ 0xffff,
- /* key: 0x92ff */ 0xe452,
- /* branch: 0x930X */ 20032,
- /* branch: 0x931X */ 20048,
- /* branch: 0x932X */ 20064,
- /* branch: 0x933X */ 20080,
- /* branch: 0x934X */ 20096,
- /* branch: 0x935X */ 20112,
- /* branch: 0x936X */ 20128,
- /* branch: 0x937X */ 20144,
- /* branch: 0x938X */ 20160,
- /* branch: 0x939X */ 20176,
- /* branch: 0x93aX */ 20192,
- /* branch: 0x93bX */ 20208,
- /* branch: 0x93cX */ 20224,
- /* branch: 0x93dX */ 20240,
- /* branch: 0x93eX */ 20256,
- /* branch: 0x93fX */ 20272,
- /* key: 0x9300 */ 0xe453,
- /* key: 0x9301 */ 0xffff,
- /* key: 0x9302 */ 0xe454,
- /* key: 0x9303 */ 0xffff,
- /* key: 0x9304 */ 0xffff,
- /* key: 0x9305 */ 0xffff,
- /* key: 0x9306 */ 0x3b2c,
- /* key: 0x9307 */ 0xffff,
- /* key: 0x9308 */ 0xe455,
- /* key: 0x9309 */ 0xffff,
- /* key: 0x930a */ 0xffff,
- /* key: 0x930b */ 0xffff,
- /* key: 0x930c */ 0xffff,
- /* key: 0x930d */ 0xe456,
- /* key: 0x930e */ 0xffff,
- /* key: 0x930f */ 0x6e7b,
- /* key: 0x9310 */ 0x3f6d,
- /* key: 0x9311 */ 0xe457,
- /* key: 0x9312 */ 0xffff,
- /* key: 0x9313 */ 0xffff,
- /* key: 0x9314 */ 0xe458,
- /* key: 0x9315 */ 0xe459,
- /* key: 0x9316 */ 0xffff,
- /* key: 0x9317 */ 0xffff,
- /* key: 0x9318 */ 0x3f6e,
- /* key: 0x9319 */ 0x6f21,
- /* key: 0x931a */ 0x6f23,
- /* key: 0x931b */ 0xffff,
- /* key: 0x931c */ 0xe45a,
- /* key: 0x931d */ 0xe45b,
- /* key: 0x931e */ 0xe45c,
- /* key: 0x931f */ 0xe45d,
- /* key: 0x9320 */ 0x3e7b,
- /* key: 0x9321 */ 0xe45e,
- /* key: 0x9322 */ 0x6f22,
- /* key: 0x9323 */ 0x6f24,
- /* key: 0x9324 */ 0xe45f,
- /* key: 0x9325 */ 0xe460,
- /* key: 0x9326 */ 0x3653,
- /* key: 0x9327 */ 0xe461,
- /* key: 0x9328 */ 0x4945,
- /* key: 0x9329 */ 0xe462,
- /* key: 0x932a */ 0xe463,
- /* key: 0x932b */ 0x3c62,
- /* key: 0x932c */ 0x4f23,
- /* key: 0x932d */ 0xffff,
- /* key: 0x932e */ 0x6e7e,
- /* key: 0x932f */ 0x3a78,
- /* key: 0x9330 */ 0xffff,
- /* key: 0x9331 */ 0xffff,
- /* key: 0x9332 */ 0x4f3f,
- /* key: 0x9333 */ 0xe464,
- /* key: 0x9334 */ 0xe465,
- /* key: 0x9335 */ 0x6f26,
- /* key: 0x9336 */ 0xe466,
- /* key: 0x9337 */ 0xe467,
- /* key: 0x9338 */ 0xffff,
- /* key: 0x9339 */ 0xffff,
- /* key: 0x933a */ 0x6f25,
- /* key: 0x933b */ 0x6f27,
- /* key: 0x933c */ 0xffff,
- /* key: 0x933d */ 0xffff,
- /* key: 0x933e */ 0xffff,
- /* key: 0x933f */ 0xffff,
- /* key: 0x9340 */ 0xffff,
- /* key: 0x9341 */ 0xffff,
- /* key: 0x9342 */ 0xffff,
- /* key: 0x9343 */ 0xffff,
- /* key: 0x9344 */ 0x6e7d,
- /* key: 0x9345 */ 0xffff,
- /* key: 0x9346 */ 0xffff,
- /* key: 0x9347 */ 0xe468,
- /* key: 0x9348 */ 0xe469,
- /* key: 0x9349 */ 0xe46a,
- /* key: 0x934a */ 0xffff,
- /* key: 0x934b */ 0x4669,
- /* key: 0x934c */ 0xffff,
- /* key: 0x934d */ 0x4555,
- /* key: 0x934e */ 0xffff,
- /* key: 0x934f */ 0xffff,
- /* key: 0x9350 */ 0xe46b,
- /* key: 0x9351 */ 0xe46c,
- /* key: 0x9352 */ 0xe46d,
- /* key: 0x9353 */ 0xffff,
- /* key: 0x9354 */ 0x4457,
- /* key: 0x9355 */ 0xe46e,
- /* key: 0x9356 */ 0x6f2c,
- /* key: 0x9357 */ 0xe46f,
- /* key: 0x9358 */ 0xe470,
- /* key: 0x9359 */ 0xffff,
- /* key: 0x935a */ 0xe471,
- /* key: 0x935b */ 0x4343,
- /* key: 0x935c */ 0x6f28,
- /* key: 0x935d */ 0xffff,
- /* key: 0x935e */ 0xe472,
- /* key: 0x935f */ 0xffff,
- /* key: 0x9360 */ 0x6f29,
- /* key: 0x9361 */ 0xffff,
- /* key: 0x9362 */ 0xffff,
- /* key: 0x9363 */ 0xffff,
- /* key: 0x9364 */ 0xe473,
- /* key: 0x9365 */ 0xe474,
- /* key: 0x9366 */ 0xffff,
- /* key: 0x9367 */ 0xe475,
- /* key: 0x9368 */ 0xffff,
- /* key: 0x9369 */ 0xe476,
- /* key: 0x936a */ 0xe477,
- /* key: 0x936b */ 0xffff,
- /* key: 0x936c */ 0x372d,
- /* key: 0x936d */ 0xe478,
- /* key: 0x936e */ 0x6f2b,
- /* key: 0x936f */ 0xe479,
- /* key: 0x9370 */ 0xe47a,
- /* key: 0x9371 */ 0xe47b,
- /* key: 0x9372 */ 0xffff,
- /* key: 0x9373 */ 0xe47c,
- /* key: 0x9374 */ 0xe47d,
- /* key: 0x9375 */ 0x3830,
- /* key: 0x9376 */ 0xe47e,
- /* key: 0x9377 */ 0xffff,
- /* key: 0x9378 */ 0xffff,
- /* key: 0x9379 */ 0xffff,
- /* key: 0x937a */ 0xe521,
- /* key: 0x937b */ 0xffff,
- /* key: 0x937c */ 0x6f2a,
- /* key: 0x937d */ 0xe522,
- /* key: 0x937e */ 0x3e61,
- /* key: 0x937f */ 0xe523,
- /* key: 0x9380 */ 0xe524,
- /* key: 0x9381 */ 0xe525,
- /* key: 0x9382 */ 0xe526,
- /* key: 0x9383 */ 0xffff,
- /* key: 0x9384 */ 0xffff,
- /* key: 0x9385 */ 0xffff,
- /* key: 0x9386 */ 0xffff,
- /* key: 0x9387 */ 0xffff,
- /* key: 0x9388 */ 0xe527,
- /* key: 0x9389 */ 0xffff,
- /* key: 0x938a */ 0xe528,
- /* key: 0x938b */ 0xe529,
- /* key: 0x938c */ 0x3379,
- /* key: 0x938d */ 0xe52a,
- /* key: 0x938e */ 0xffff,
- /* key: 0x938f */ 0xe52b,
- /* key: 0x9390 */ 0xffff,
- /* key: 0x9391 */ 0xffff,
- /* key: 0x9392 */ 0xe52c,
- /* key: 0x9393 */ 0xffff,
- /* key: 0x9394 */ 0x6f30,
- /* key: 0x9395 */ 0xe52d,
- /* key: 0x9396 */ 0x3a3f,
- /* key: 0x9397 */ 0x4179,
- /* key: 0x9398 */ 0xe52e,
- /* key: 0x9399 */ 0xffff,
- /* key: 0x939a */ 0x444a,
- /* key: 0x939b */ 0xe52f,
- /* key: 0x939c */ 0xffff,
- /* key: 0x939d */ 0xffff,
- /* key: 0x939e */ 0xe530,
- /* key: 0x939f */ 0xffff,
- /* key: 0x93a0 */ 0xffff,
- /* key: 0x93a1 */ 0xe531,
- /* key: 0x93a2 */ 0xffff,
- /* key: 0x93a3 */ 0xe532,
- /* key: 0x93a4 */ 0xe533,
- /* key: 0x93a5 */ 0xffff,
- /* key: 0x93a6 */ 0xe534,
- /* key: 0x93a7 */ 0x333b,
- /* key: 0x93a8 */ 0xe535,
- /* key: 0x93a9 */ 0xe53b,
- /* key: 0x93aa */ 0xffff,
- /* key: 0x93ab */ 0xe536,
- /* key: 0x93ac */ 0x6f2e,
- /* key: 0x93ad */ 0x6f2f,
- /* key: 0x93ae */ 0x4443,
- /* key: 0x93af */ 0xffff,
- /* key: 0x93b0 */ 0x6f2d,
- /* key: 0x93b1 */ 0xffff,
- /* key: 0x93b2 */ 0xffff,
- /* key: 0x93b3 */ 0xffff,
- /* key: 0x93b4 */ 0xe537,
- /* key: 0x93b5 */ 0xe538,
- /* key: 0x93b6 */ 0xe539,
- /* key: 0x93b7 */ 0xffff,
- /* key: 0x93b8 */ 0xffff,
- /* key: 0x93b9 */ 0x6f31,
- /* key: 0x93ba */ 0xe53a,
- /* key: 0x93bb */ 0xffff,
- /* key: 0x93bc */ 0xffff,
- /* key: 0x93bd */ 0xffff,
- /* key: 0x93be */ 0xffff,
- /* key: 0x93bf */ 0xffff,
- /* key: 0x93c0 */ 0xffff,
- /* key: 0x93c1 */ 0xe53c,
- /* key: 0x93c2 */ 0xffff,
- /* key: 0x93c3 */ 0x6f37,
- /* key: 0x93c4 */ 0xe53d,
- /* key: 0x93c5 */ 0xe53e,
- /* key: 0x93c6 */ 0xe53f,
- /* key: 0x93c7 */ 0xe540,
- /* key: 0x93c8 */ 0x6f3a,
- /* key: 0x93c9 */ 0xe541,
- /* key: 0x93ca */ 0xe542,
- /* key: 0x93cb */ 0xe543,
- /* key: 0x93cc */ 0xe544,
- /* key: 0x93cd */ 0xe545,
- /* key: 0x93ce */ 0xffff,
- /* key: 0x93cf */ 0xffff,
- /* key: 0x93d0 */ 0x6f39,
- /* key: 0x93d1 */ 0x452d,
- /* key: 0x93d2 */ 0xffff,
- /* key: 0x93d3 */ 0xe546,
- /* key: 0x93d4 */ 0xffff,
- /* key: 0x93d5 */ 0xffff,
- /* key: 0x93d6 */ 0x6f32,
- /* key: 0x93d7 */ 0x6f33,
- /* key: 0x93d8 */ 0x6f36,
- /* key: 0x93d9 */ 0xe547,
- /* key: 0x93da */ 0xffff,
- /* key: 0x93db */ 0xffff,
- /* key: 0x93dc */ 0xe548,
- /* key: 0x93dd */ 0x6f38,
- /* key: 0x93de */ 0xe549,
- /* key: 0x93df */ 0xe54a,
- /* key: 0x93e0 */ 0xffff,
- /* key: 0x93e1 */ 0x3640,
- /* key: 0x93e2 */ 0xe54b,
- /* key: 0x93e3 */ 0xffff,
- /* key: 0x93e4 */ 0x6f3b,
- /* key: 0x93e5 */ 0x6f35,
- /* key: 0x93e6 */ 0xe54c,
- /* key: 0x93e7 */ 0xe54d,
- /* key: 0x93e8 */ 0x6f34,
- /* key: 0x93e9 */ 0xffff,
- /* key: 0x93ea */ 0xffff,
- /* key: 0x93eb */ 0xffff,
- /* key: 0x93ec */ 0xffff,
- /* key: 0x93ed */ 0xffff,
- /* key: 0x93ee */ 0xffff,
- /* key: 0x93ef */ 0xffff,
- /* key: 0x93f0 */ 0xffff,
- /* key: 0x93f1 */ 0xffff,
- /* key: 0x93f2 */ 0xffff,
- /* key: 0x93f3 */ 0xffff,
- /* key: 0x93f4 */ 0xffff,
- /* key: 0x93f5 */ 0xffff,
- /* key: 0x93f6 */ 0xffff,
- /* key: 0x93f7 */ 0xe54f,
- /* key: 0x93f8 */ 0xe550,
- /* key: 0x93f9 */ 0xe54e,
- /* key: 0x93fa */ 0xe551,
- /* key: 0x93fb */ 0xe552,
- /* key: 0x93fc */ 0xffff,
- /* key: 0x93fd */ 0xe553,
- /* key: 0x93fe */ 0xffff,
- /* key: 0x93ff */ 0xffff,
- /* branch: 0x940X */ 20304,
- /* branch: 0x941X */ 20320,
- /* branch: 0x942X */ 20336,
- /* branch: 0x943X */ 20352,
- /* branch: 0x944X */ 20368,
- /* branch: 0x945X */ 20384,
- /* branch: 0x946X */ 20400,
- /* branch: 0x947X */ 20416,
- /* branch: 0x948X */ 20432,
- /* branch: 0x949X */ 0,
- /* branch: 0x94aX */ 0,
- /* branch: 0x94bX */ 0,
- /* branch: 0x94cX */ 0,
- /* branch: 0x94dX */ 0,
- /* branch: 0x94eX */ 0,
- /* branch: 0x94fX */ 0,
- /* key: 0x9400 */ 0xffff,
- /* key: 0x9401 */ 0xe554,
- /* key: 0x9402 */ 0xe555,
- /* key: 0x9403 */ 0x6f3f,
- /* key: 0x9404 */ 0xe556,
- /* key: 0x9405 */ 0xffff,
- /* key: 0x9406 */ 0xffff,
- /* key: 0x9407 */ 0x6f40,
- /* key: 0x9408 */ 0xe557,
- /* key: 0x9409 */ 0xe558,
- /* key: 0x940a */ 0xffff,
- /* key: 0x940b */ 0xffff,
- /* key: 0x940c */ 0xffff,
- /* key: 0x940d */ 0xe559,
- /* key: 0x940e */ 0xe55a,
- /* key: 0x940f */ 0xe55b,
- /* key: 0x9410 */ 0x6f41,
- /* key: 0x9411 */ 0xffff,
- /* key: 0x9412 */ 0xffff,
- /* key: 0x9413 */ 0x6f3e,
- /* key: 0x9414 */ 0x6f3d,
- /* key: 0x9415 */ 0xe55c,
- /* key: 0x9416 */ 0xe55d,
- /* key: 0x9417 */ 0xe55e,
- /* key: 0x9418 */ 0x3e62,
- /* key: 0x9419 */ 0x462a,
- /* key: 0x941a */ 0x6f3c,
- /* key: 0x941b */ 0xffff,
- /* key: 0x941c */ 0xffff,
- /* key: 0x941d */ 0xffff,
- /* key: 0x941e */ 0xffff,
- /* key: 0x941f */ 0xe55f,
- /* key: 0x9420 */ 0xffff,
- /* key: 0x9421 */ 0x6f45,
- /* key: 0x9422 */ 0xffff,
- /* key: 0x9423 */ 0xffff,
- /* key: 0x9424 */ 0xffff,
- /* key: 0x9425 */ 0xffff,
- /* key: 0x9426 */ 0xffff,
- /* key: 0x9427 */ 0xffff,
- /* key: 0x9428 */ 0xffff,
- /* key: 0x9429 */ 0xffff,
- /* key: 0x942a */ 0xffff,
- /* key: 0x942b */ 0x6f43,
- /* key: 0x942c */ 0xffff,
- /* key: 0x942d */ 0xffff,
- /* key: 0x942e */ 0xe560,
- /* key: 0x942f */ 0xe561,
- /* key: 0x9430 */ 0xffff,
- /* key: 0x9431 */ 0xe562,
- /* key: 0x9432 */ 0xe563,
- /* key: 0x9433 */ 0xe564,
- /* key: 0x9434 */ 0xe565,
- /* key: 0x9435 */ 0x6f44,
- /* key: 0x9436 */ 0x6f42,
- /* key: 0x9437 */ 0xffff,
- /* key: 0x9438 */ 0x4278,
- /* key: 0x9439 */ 0xffff,
- /* key: 0x943a */ 0x6f46,
- /* key: 0x943b */ 0xe566,
- /* key: 0x943c */ 0xffff,
- /* key: 0x943d */ 0xe568,
- /* key: 0x943e */ 0xffff,
- /* key: 0x943f */ 0xe567,
- /* key: 0x9440 */ 0xffff,
- /* key: 0x9441 */ 0x6f47,
- /* key: 0x9442 */ 0xffff,
- /* key: 0x9443 */ 0xe569,
- /* key: 0x9444 */ 0x6f49,
- /* key: 0x9445 */ 0xe56a,
- /* key: 0x9446 */ 0xffff,
- /* key: 0x9447 */ 0xffff,
- /* key: 0x9448 */ 0xe56b,
- /* key: 0x9449 */ 0xffff,
- /* key: 0x944a */ 0xe56c,
- /* key: 0x944b */ 0xffff,
- /* key: 0x944c */ 0xe56d,
- /* key: 0x944d */ 0xffff,
- /* key: 0x944e */ 0xffff,
- /* key: 0x944f */ 0xffff,
- /* key: 0x9450 */ 0xffff,
- /* key: 0x9451 */ 0x3455,
- /* key: 0x9452 */ 0x6f48,
- /* key: 0x9453 */ 0x4c7a,
- /* key: 0x9454 */ 0xffff,
- /* key: 0x9455 */ 0xe56e,
- /* key: 0x9456 */ 0xffff,
- /* key: 0x9457 */ 0xffff,
- /* key: 0x9458 */ 0xffff,
- /* key: 0x9459 */ 0xe56f,
- /* key: 0x945a */ 0x6f54,
- /* key: 0x945b */ 0x6f4a,
- /* key: 0x945c */ 0xe570,
- /* key: 0x945d */ 0xffff,
- /* key: 0x945e */ 0x6f4d,
- /* key: 0x945f */ 0xe571,
- /* key: 0x9460 */ 0x6f4b,
- /* key: 0x9461 */ 0xe572,
- /* key: 0x9462 */ 0x6f4c,
- /* key: 0x9463 */ 0xe573,
- /* key: 0x9464 */ 0xffff,
- /* key: 0x9465 */ 0xffff,
- /* key: 0x9466 */ 0xffff,
- /* key: 0x9467 */ 0xffff,
- /* key: 0x9468 */ 0xe574,
- /* key: 0x9469 */ 0xffff,
- /* key: 0x946a */ 0x6f4e,
- /* key: 0x946b */ 0xe575,
- /* key: 0x946c */ 0xffff,
- /* key: 0x946d */ 0xe576,
- /* key: 0x946e */ 0xe577,
- /* key: 0x946f */ 0xe578,
- /* key: 0x9470 */ 0x6f50,
- /* key: 0x9471 */ 0xe579,
- /* key: 0x9472 */ 0xe57a,
- /* key: 0x9473 */ 0xffff,
- /* key: 0x9474 */ 0xffff,
- /* key: 0x9475 */ 0x6f51,
- /* key: 0x9476 */ 0xffff,
- /* key: 0x9477 */ 0x6f52,
- /* key: 0x9478 */ 0xffff,
- /* key: 0x9479 */ 0xffff,
- /* key: 0x947a */ 0xffff,
- /* key: 0x947b */ 0xffff,
- /* key: 0x947c */ 0x6f55,
- /* key: 0x947d */ 0x6f53,
- /* key: 0x947e */ 0x6f56,
- /* key: 0x947f */ 0x6f58,
- /* key: 0x9480 */ 0xffff,
- /* key: 0x9481 */ 0x6f57,
- /* key: 0x9482 */ 0xffff,
- /* key: 0x9483 */ 0xe57c,
- /* key: 0x9484 */ 0xe57b,
- /* key: 0x9485 */ 0xffff,
- /* key: 0x9486 */ 0xffff,
- /* key: 0x9487 */ 0xffff,
- /* key: 0x9488 */ 0xffff,
- /* key: 0x9489 */ 0xffff,
- /* key: 0x948a */ 0xffff,
- /* key: 0x948b */ 0xffff,
- /* key: 0x948c */ 0xffff,
- /* key: 0x948d */ 0xffff,
- /* key: 0x948e */ 0xffff,
- /* key: 0x948f */ 0xffff,
- /* branch: 0x950X */ 0,
- /* branch: 0x951X */ 0,
- /* branch: 0x952X */ 0,
- /* branch: 0x953X */ 0,
- /* branch: 0x954X */ 0,
- /* branch: 0x955X */ 0,
- /* branch: 0x956X */ 0,
- /* branch: 0x957X */ 20464,
- /* branch: 0x958X */ 20480,
- /* branch: 0x959X */ 20496,
- /* branch: 0x95aX */ 20512,
- /* branch: 0x95bX */ 20528,
- /* branch: 0x95cX */ 20544,
- /* branch: 0x95dX */ 20560,
- /* branch: 0x95eX */ 20576,
- /* branch: 0x95fX */ 0,
- /* key: 0x9570 */ 0xffff,
- /* key: 0x9571 */ 0xffff,
- /* key: 0x9572 */ 0xffff,
- /* key: 0x9573 */ 0xffff,
- /* key: 0x9574 */ 0xffff,
- /* key: 0x9575 */ 0xffff,
- /* key: 0x9576 */ 0xffff,
- /* key: 0x9577 */ 0x4439,
- /* key: 0x9578 */ 0xe57d,
- /* key: 0x9579 */ 0xe57e,
- /* key: 0x957a */ 0xffff,
- /* key: 0x957b */ 0xffff,
- /* key: 0x957c */ 0xffff,
- /* key: 0x957d */ 0xffff,
- /* key: 0x957e */ 0xe621,
- /* key: 0x957f */ 0xffff,
- /* key: 0x9580 */ 0x4c67,
- /* key: 0x9581 */ 0xffff,
- /* key: 0x9582 */ 0x6f59,
- /* key: 0x9583 */ 0x412e,
- /* key: 0x9584 */ 0xe622,
- /* key: 0x9585 */ 0xffff,
- /* key: 0x9586 */ 0xffff,
- /* key: 0x9587 */ 0x6f5a,
- /* key: 0x9588 */ 0xe623,
- /* key: 0x9589 */ 0x4a44,
- /* key: 0x958a */ 0x6f5b,
- /* key: 0x958b */ 0x332b,
- /* key: 0x958c */ 0xe624,
- /* key: 0x958d */ 0xe625,
- /* key: 0x958e */ 0xe626,
- /* key: 0x958f */ 0x313c,
- /* key: 0x9590 */ 0xffff,
- /* key: 0x9591 */ 0x3457,
- /* key: 0x9592 */ 0xffff,
- /* key: 0x9593 */ 0x3456,
- /* key: 0x9594 */ 0x6f5c,
- /* key: 0x9595 */ 0xffff,
- /* key: 0x9596 */ 0x6f5d,
- /* key: 0x9597 */ 0xffff,
- /* key: 0x9598 */ 0x6f5e,
- /* key: 0x9599 */ 0x6f5f,
- /* key: 0x959a */ 0xffff,
- /* key: 0x959b */ 0xffff,
- /* key: 0x959c */ 0xffff,
- /* key: 0x959d */ 0xe627,
- /* key: 0x959e */ 0xe628,
- /* key: 0x959f */ 0xe629,
- /* key: 0x95a0 */ 0x6f60,
- /* key: 0x95a1 */ 0xe62a,
- /* key: 0x95a2 */ 0x3458,
- /* key: 0x95a3 */ 0x3355,
- /* key: 0x95a4 */ 0x395e,
- /* key: 0x95a5 */ 0x4836,
- /* key: 0x95a6 */ 0xe62b,
- /* key: 0x95a7 */ 0x6f62,
- /* key: 0x95a8 */ 0x6f61,
- /* key: 0x95a9 */ 0xe62c,
- /* key: 0x95aa */ 0xffff,
- /* key: 0x95ab */ 0xe62d,
- /* key: 0x95ac */ 0xe62e,
- /* key: 0x95ad */ 0x6f63,
- /* key: 0x95ae */ 0xffff,
- /* key: 0x95af */ 0xffff,
- /* key: 0x95b0 */ 0xffff,
- /* key: 0x95b1 */ 0xffff,
- /* key: 0x95b2 */ 0x315c,
- /* key: 0x95b3 */ 0xffff,
- /* key: 0x95b4 */ 0xe62f,
- /* key: 0x95b5 */ 0xffff,
- /* key: 0x95b6 */ 0xe630,
- /* key: 0x95b7 */ 0xffff,
- /* key: 0x95b8 */ 0xffff,
- /* key: 0x95b9 */ 0x6f66,
- /* key: 0x95ba */ 0xe631,
- /* key: 0x95bb */ 0x6f65,
- /* key: 0x95bc */ 0x6f64,
- /* key: 0x95bd */ 0xe632,
- /* key: 0x95be */ 0x6f67,
- /* key: 0x95bf */ 0xe633,
- /* key: 0x95c0 */ 0xffff,
- /* key: 0x95c1 */ 0xffff,
- /* key: 0x95c2 */ 0xffff,
- /* key: 0x95c3 */ 0x6f6a,
- /* key: 0x95c4 */ 0xffff,
- /* key: 0x95c5 */ 0xffff,
- /* key: 0x95c6 */ 0xe634,
- /* key: 0x95c7 */ 0x3047,
- /* key: 0x95c8 */ 0xe635,
- /* key: 0x95c9 */ 0xe636,
- /* key: 0x95ca */ 0x6f68,
- /* key: 0x95cb */ 0xe637,
- /* key: 0x95cc */ 0x6f6c,
- /* key: 0x95cd */ 0x6f6b,
- /* key: 0x95ce */ 0xffff,
- /* key: 0x95cf */ 0xffff,
- /* key: 0x95d0 */ 0xe638,
- /* key: 0x95d1 */ 0xe639,
- /* key: 0x95d2 */ 0xe63a,
- /* key: 0x95d3 */ 0xe63b,
- /* key: 0x95d4 */ 0x6f6e,
- /* key: 0x95d5 */ 0x6f6d,
- /* key: 0x95d6 */ 0x6f6f,
- /* key: 0x95d7 */ 0xffff,
- /* key: 0x95d8 */ 0x462e,
- /* key: 0x95d9 */ 0xe63c,
- /* key: 0x95da */ 0xe63d,
- /* key: 0x95db */ 0xffff,
- /* key: 0x95dc */ 0x6f70,
- /* key: 0x95dd */ 0xe63e,
- /* key: 0x95de */ 0xe63f,
- /* key: 0x95df */ 0xe640,
- /* key: 0x95e0 */ 0xe641,
- /* key: 0x95e1 */ 0x6f71,
- /* key: 0x95e2 */ 0x6f73,
- /* key: 0x95e3 */ 0xffff,
- /* key: 0x95e4 */ 0xe642,
- /* key: 0x95e5 */ 0x6f72,
- /* key: 0x95e6 */ 0xe643,
- /* key: 0x95e7 */ 0xffff,
- /* key: 0x95e8 */ 0xffff,
- /* key: 0x95e9 */ 0xffff,
- /* key: 0x95ea */ 0xffff,
- /* key: 0x95eb */ 0xffff,
- /* key: 0x95ec */ 0xffff,
- /* key: 0x95ed */ 0xffff,
- /* key: 0x95ee */ 0xffff,
- /* key: 0x95ef */ 0xffff,
- /* branch: 0x960X */ 0,
- /* branch: 0x961X */ 20608,
- /* branch: 0x962X */ 20624,
- /* branch: 0x963X */ 20640,
- /* branch: 0x964X */ 20656,
- /* branch: 0x965X */ 20672,
- /* branch: 0x966X */ 20688,
- /* branch: 0x967X */ 20704,
- /* branch: 0x968X */ 20720,
- /* branch: 0x969X */ 20736,
- /* branch: 0x96aX */ 20752,
- /* branch: 0x96bX */ 20768,
- /* branch: 0x96cX */ 20784,
- /* branch: 0x96dX */ 20800,
- /* branch: 0x96eX */ 20816,
- /* branch: 0x96fX */ 20832,
- /* key: 0x9610 */ 0xffff,
- /* key: 0x9611 */ 0xffff,
- /* key: 0x9612 */ 0xffff,
- /* key: 0x9613 */ 0xffff,
- /* key: 0x9614 */ 0xffff,
- /* key: 0x9615 */ 0xffff,
- /* key: 0x9616 */ 0xffff,
- /* key: 0x9617 */ 0xffff,
- /* key: 0x9618 */ 0xffff,
- /* key: 0x9619 */ 0xffff,
- /* key: 0x961a */ 0xffff,
- /* key: 0x961b */ 0xffff,
- /* key: 0x961c */ 0x496c,
- /* key: 0x961d */ 0xe644,
- /* key: 0x961e */ 0xe645,
- /* key: 0x961f */ 0xffff,
- /* key: 0x9620 */ 0xffff,
- /* key: 0x9621 */ 0x6f74,
- /* key: 0x9622 */ 0xe646,
- /* key: 0x9623 */ 0xffff,
- /* key: 0x9624 */ 0xe647,
- /* key: 0x9625 */ 0xe648,
- /* key: 0x9626 */ 0xe649,
- /* key: 0x9627 */ 0xffff,
- /* key: 0x9628 */ 0x6f75,
- /* key: 0x9629 */ 0xffff,
- /* key: 0x962a */ 0x3a65,
- /* key: 0x962b */ 0xffff,
- /* key: 0x962c */ 0xe64a,
- /* key: 0x962d */ 0xffff,
- /* key: 0x962e */ 0x6f76,
- /* key: 0x962f */ 0x6f77,
- /* key: 0x9630 */ 0xffff,
- /* key: 0x9631 */ 0xe64b,
- /* key: 0x9632 */ 0x4b49,
- /* key: 0x9633 */ 0xe64c,
- /* key: 0x9634 */ 0xffff,
- /* key: 0x9635 */ 0xffff,
- /* key: 0x9636 */ 0xffff,
- /* key: 0x9637 */ 0xe64d,
- /* key: 0x9638 */ 0xe64e,
- /* key: 0x9639 */ 0xe64f,
- /* key: 0x963a */ 0xe650,
- /* key: 0x963b */ 0x414b,
- /* key: 0x963c */ 0xe651,
- /* key: 0x963d */ 0xe652,
- /* key: 0x963e */ 0xffff,
- /* key: 0x963f */ 0x3024,
- /* key: 0x9640 */ 0x424b,
- /* key: 0x9641 */ 0xe653,
- /* key: 0x9642 */ 0x6f78,
- /* key: 0x9643 */ 0xffff,
- /* key: 0x9644 */ 0x496d,
- /* key: 0x9645 */ 0xffff,
- /* key: 0x9646 */ 0xffff,
- /* key: 0x9647 */ 0xffff,
- /* key: 0x9648 */ 0xffff,
- /* key: 0x9649 */ 0xffff,
- /* key: 0x964a */ 0xffff,
- /* key: 0x964b */ 0x6f7b,
- /* key: 0x964c */ 0x6f79,
- /* key: 0x964d */ 0x395f,
- /* key: 0x964e */ 0xffff,
- /* key: 0x964f */ 0x6f7a,
- /* key: 0x9650 */ 0x3842,
- /* key: 0x9651 */ 0xffff,
- /* key: 0x9652 */ 0xe654,
- /* key: 0x9653 */ 0xffff,
- /* key: 0x9654 */ 0xe655,
- /* key: 0x9655 */ 0xffff,
- /* key: 0x9656 */ 0xe656,
- /* key: 0x9657 */ 0xe657,
- /* key: 0x9658 */ 0xe658,
- /* key: 0x9659 */ 0xffff,
- /* key: 0x965a */ 0xffff,
- /* key: 0x965b */ 0x4a45,
- /* key: 0x965c */ 0x6f7d,
- /* key: 0x965d */ 0x7021,
- /* key: 0x965e */ 0x6f7e,
- /* key: 0x965f */ 0x7022,
- /* key: 0x9660 */ 0xffff,
- /* key: 0x9661 */ 0xe659,
- /* key: 0x9662 */ 0x3121,
- /* key: 0x9663 */ 0x3f58,
- /* key: 0x9664 */ 0x3d7c,
- /* key: 0x9665 */ 0x3459,
- /* key: 0x9666 */ 0x7023,
- /* key: 0x9667 */ 0xffff,
- /* key: 0x9668 */ 0xffff,
- /* key: 0x9669 */ 0xffff,
- /* key: 0x966a */ 0x4766,
- /* key: 0x966b */ 0xffff,
- /* key: 0x966c */ 0x7025,
- /* key: 0x966d */ 0xffff,
- /* key: 0x966e */ 0xe65a,
- /* key: 0x966f */ 0xffff,
- /* key: 0x9670 */ 0x3122,
- /* key: 0x9671 */ 0xffff,
- /* key: 0x9672 */ 0x7024,
- /* key: 0x9673 */ 0x4444,
- /* key: 0x9674 */ 0xe65b,
- /* key: 0x9675 */ 0x4e4d,
- /* key: 0x9676 */ 0x462b,
- /* key: 0x9677 */ 0x6f7c,
- /* key: 0x9678 */ 0x4e26,
- /* key: 0x9679 */ 0xffff,
- /* key: 0x967a */ 0x3831,
- /* key: 0x967b */ 0xe65c,
- /* key: 0x967c */ 0xe65d,
- /* key: 0x967d */ 0x4d5b,
- /* key: 0x967e */ 0xe65e,
- /* key: 0x967f */ 0xe65f,
- /* key: 0x9680 */ 0xffff,
- /* key: 0x9681 */ 0xe660,
- /* key: 0x9682 */ 0xe661,
- /* key: 0x9683 */ 0xe662,
- /* key: 0x9684 */ 0xe663,
- /* key: 0x9685 */ 0x3679,
- /* key: 0x9686 */ 0x4e34,
- /* key: 0x9687 */ 0xffff,
- /* key: 0x9688 */ 0x3728,
- /* key: 0x9689 */ 0xe664,
- /* key: 0x968a */ 0x4262,
- /* key: 0x968b */ 0x6721,
- /* key: 0x968c */ 0xffff,
- /* key: 0x968d */ 0x7026,
- /* key: 0x968e */ 0x332c,
- /* key: 0x968f */ 0x3f6f,
- /* key: 0x9690 */ 0xffff,
- /* key: 0x9691 */ 0xe665,
- /* key: 0x9692 */ 0xffff,
- /* key: 0x9693 */ 0xffff,
- /* key: 0x9694 */ 0x3356,
- /* key: 0x9695 */ 0x7028,
- /* key: 0x9696 */ 0xe666,
- /* key: 0x9697 */ 0x7029,
- /* key: 0x9698 */ 0x7027,
- /* key: 0x9699 */ 0x3764,
- /* key: 0x969a */ 0xe667,
- /* key: 0x969b */ 0x3a5d,
- /* key: 0x969c */ 0x3e63,
- /* key: 0x969d */ 0xe668,
- /* key: 0x969e */ 0xffff,
- /* key: 0x969f */ 0xe669,
- /* key: 0x96a0 */ 0x3123,
- /* key: 0x96a1 */ 0xffff,
- /* key: 0x96a2 */ 0xffff,
- /* key: 0x96a3 */ 0x4e59,
- /* key: 0x96a4 */ 0xe66a,
- /* key: 0x96a5 */ 0xe66b,
- /* key: 0x96a6 */ 0xe66c,
- /* key: 0x96a7 */ 0x702b,
- /* key: 0x96a8 */ 0x6e2e,
- /* key: 0x96a9 */ 0xe66d,
- /* key: 0x96aa */ 0x702a,
- /* key: 0x96ab */ 0xffff,
- /* key: 0x96ac */ 0xffff,
- /* key: 0x96ad */ 0xffff,
- /* key: 0x96ae */ 0xe66e,
- /* key: 0x96af */ 0xe66f,
- /* key: 0x96b0 */ 0x702e,
- /* key: 0x96b1 */ 0x702c,
- /* key: 0x96b2 */ 0x702d,
- /* key: 0x96b3 */ 0xe670,
- /* key: 0x96b4 */ 0x702f,
- /* key: 0x96b5 */ 0xffff,
- /* key: 0x96b6 */ 0x7030,
- /* key: 0x96b7 */ 0x4e6c,
- /* key: 0x96b8 */ 0x7031,
- /* key: 0x96b9 */ 0x7032,
- /* key: 0x96ba */ 0xe671,
- /* key: 0x96bb */ 0x4049,
- /* key: 0x96bc */ 0x483b,
- /* key: 0x96bd */ 0xffff,
- /* key: 0x96be */ 0xffff,
- /* key: 0x96bf */ 0xffff,
- /* key: 0x96c0 */ 0x3f7d,
- /* key: 0x96c1 */ 0x3467,
- /* key: 0x96c2 */ 0xffff,
- /* key: 0x96c3 */ 0xffff,
- /* key: 0x96c4 */ 0x4d3a,
- /* key: 0x96c5 */ 0x326d,
- /* key: 0x96c6 */ 0x3d38,
- /* key: 0x96c7 */ 0x385b,
- /* key: 0x96c8 */ 0xffff,
- /* key: 0x96c9 */ 0x7035,
- /* key: 0x96ca */ 0xe672,
- /* key: 0x96cb */ 0x7034,
- /* key: 0x96cc */ 0x3b73,
- /* key: 0x96cd */ 0x7036,
- /* key: 0x96ce */ 0x7033,
- /* key: 0x96cf */ 0xffff,
- /* key: 0x96d0 */ 0xffff,
- /* key: 0x96d1 */ 0x3b28,
- /* key: 0x96d2 */ 0xe673,
- /* key: 0x96d3 */ 0xffff,
- /* key: 0x96d4 */ 0xffff,
- /* key: 0x96d5 */ 0x703a,
- /* key: 0x96d6 */ 0x6a2d,
- /* key: 0x96d7 */ 0xffff,
- /* key: 0x96d8 */ 0xe675,
- /* key: 0x96d9 */ 0x5256,
- /* key: 0x96da */ 0xe676,
- /* key: 0x96db */ 0x3f77,
- /* key: 0x96dc */ 0x7038,
- /* key: 0x96dd */ 0xe677,
- /* key: 0x96de */ 0xe678,
- /* key: 0x96df */ 0xe679,
- /* key: 0x96e0 */ 0xffff,
- /* key: 0x96e1 */ 0xffff,
- /* key: 0x96e2 */ 0x4e25,
- /* key: 0x96e3 */ 0x4671,
- /* key: 0x96e4 */ 0xffff,
- /* key: 0x96e5 */ 0xffff,
- /* key: 0x96e6 */ 0xffff,
- /* key: 0x96e7 */ 0xffff,
- /* key: 0x96e8 */ 0x312b,
- /* key: 0x96e9 */ 0xe67a,
- /* key: 0x96ea */ 0x4063,
- /* key: 0x96eb */ 0x3c36,
- /* key: 0x96ec */ 0xffff,
- /* key: 0x96ed */ 0xffff,
- /* key: 0x96ee */ 0xffff,
- /* key: 0x96ef */ 0xe67b,
- /* key: 0x96f0 */ 0x4a37,
- /* key: 0x96f1 */ 0xe67c,
- /* key: 0x96f2 */ 0x3140,
- /* key: 0x96f3 */ 0xffff,
- /* key: 0x96f4 */ 0xffff,
- /* key: 0x96f5 */ 0xffff,
- /* key: 0x96f6 */ 0x4e6d,
- /* key: 0x96f7 */ 0x4d6b,
- /* key: 0x96f8 */ 0xffff,
- /* key: 0x96f9 */ 0x703b,
- /* key: 0x96fa */ 0xe67d,
- /* key: 0x96fb */ 0x4545,
- /* key: 0x96fc */ 0xffff,
- /* key: 0x96fd */ 0xffff,
- /* key: 0x96fe */ 0xffff,
- /* key: 0x96ff */ 0xffff,
- /* branch: 0x970X */ 20864,
- /* branch: 0x971X */ 20880,
- /* branch: 0x972X */ 20896,
- /* branch: 0x973X */ 20912,
- /* branch: 0x974X */ 20928,
- /* branch: 0x975X */ 20944,
- /* branch: 0x976X */ 20960,
- /* branch: 0x977X */ 20976,
- /* branch: 0x978X */ 20992,
- /* branch: 0x979X */ 21008,
- /* branch: 0x97aX */ 21024,
- /* branch: 0x97bX */ 21040,
- /* branch: 0x97cX */ 21056,
- /* branch: 0x97dX */ 21072,
- /* branch: 0x97eX */ 21088,
- /* branch: 0x97fX */ 21104,
- /* key: 0x9700 */ 0x3c7b,
- /* key: 0x9701 */ 0xffff,
- /* key: 0x9702 */ 0xe67e,
- /* key: 0x9703 */ 0xe721,
- /* key: 0x9704 */ 0x703c,
- /* key: 0x9705 */ 0xe722,
- /* key: 0x9706 */ 0x703d,
- /* key: 0x9707 */ 0x3f4c,
- /* key: 0x9708 */ 0x703e,
- /* key: 0x9709 */ 0xe723,
- /* key: 0x970a */ 0x4e6e,
- /* key: 0x970b */ 0xffff,
- /* key: 0x970c */ 0xffff,
- /* key: 0x970d */ 0x7039,
- /* key: 0x970e */ 0x7040,
- /* key: 0x970f */ 0x7042,
- /* key: 0x9710 */ 0xffff,
- /* key: 0x9711 */ 0x7041,
- /* key: 0x9712 */ 0xffff,
- /* key: 0x9713 */ 0x703f,
- /* key: 0x9714 */ 0xffff,
- /* key: 0x9715 */ 0xffff,
- /* key: 0x9716 */ 0x7043,
- /* key: 0x9717 */ 0xffff,
- /* key: 0x9718 */ 0xffff,
- /* key: 0x9719 */ 0x7044,
- /* key: 0x971a */ 0xe724,
- /* key: 0x971b */ 0xe725,
- /* key: 0x971c */ 0x417a,
- /* key: 0x971d */ 0xe726,
- /* key: 0x971e */ 0x3262,
- /* key: 0x971f */ 0xffff,
- /* key: 0x9720 */ 0xffff,
- /* key: 0x9721 */ 0xe727,
- /* key: 0x9722 */ 0xe728,
- /* key: 0x9723 */ 0xe729,
- /* key: 0x9724 */ 0x7045,
- /* key: 0x9725 */ 0xffff,
- /* key: 0x9726 */ 0xffff,
- /* key: 0x9727 */ 0x4c38,
- /* key: 0x9728 */ 0xe72a,
- /* key: 0x9729 */ 0xffff,
- /* key: 0x972a */ 0x7046,
- /* key: 0x972b */ 0xffff,
- /* key: 0x972c */ 0xffff,
- /* key: 0x972d */ 0xffff,
- /* key: 0x972e */ 0xffff,
- /* key: 0x972f */ 0xffff,
- /* key: 0x9730 */ 0x7047,
- /* key: 0x9731 */ 0xe72b,
- /* key: 0x9732 */ 0x4f2a,
- /* key: 0x9733 */ 0xe72c,
- /* key: 0x9734 */ 0xffff,
- /* key: 0x9735 */ 0xffff,
- /* key: 0x9736 */ 0xffff,
- /* key: 0x9737 */ 0xffff,
- /* key: 0x9738 */ 0x5b31,
- /* key: 0x9739 */ 0x7048,
- /* key: 0x973a */ 0xffff,
- /* key: 0x973b */ 0xffff,
- /* key: 0x973c */ 0xffff,
- /* key: 0x973d */ 0x7049,
- /* key: 0x973e */ 0x704a,
- /* key: 0x973f */ 0xffff,
- /* key: 0x9740 */ 0xffff,
- /* key: 0x9741 */ 0xe72d,
- /* key: 0x9742 */ 0x704e,
- /* key: 0x9743 */ 0xe72e,
- /* key: 0x9744 */ 0x704b,
- /* key: 0x9745 */ 0xffff,
- /* key: 0x9746 */ 0x704c,
- /* key: 0x9747 */ 0xffff,
- /* key: 0x9748 */ 0x704d,
- /* key: 0x9749 */ 0x704f,
- /* key: 0x974a */ 0xe72f,
- /* key: 0x974b */ 0xffff,
- /* key: 0x974c */ 0xffff,
- /* key: 0x974d */ 0xffff,
- /* key: 0x974e */ 0xe730,
- /* key: 0x974f */ 0xe731,
- /* key: 0x9750 */ 0xffff,
- /* key: 0x9751 */ 0xffff,
- /* key: 0x9752 */ 0x4044,
- /* key: 0x9753 */ 0xffff,
- /* key: 0x9754 */ 0xffff,
- /* key: 0x9755 */ 0xe732,
- /* key: 0x9756 */ 0x4c77,
- /* key: 0x9757 */ 0xe733,
- /* key: 0x9758 */ 0xe734,
- /* key: 0x9759 */ 0x4045,
- /* key: 0x975a */ 0xe735,
- /* key: 0x975b */ 0xe736,
- /* key: 0x975c */ 0x7050,
- /* key: 0x975d */ 0xffff,
- /* key: 0x975e */ 0x4873,
- /* key: 0x975f */ 0xffff,
- /* key: 0x9760 */ 0x7051,
- /* key: 0x9761 */ 0x7353,
- /* key: 0x9762 */ 0x4c4c,
- /* key: 0x9763 */ 0xe737,
- /* key: 0x9764 */ 0x7052,
- /* key: 0x9765 */ 0xffff,
- /* key: 0x9766 */ 0x7053,
- /* key: 0x9767 */ 0xe738,
- /* key: 0x9768 */ 0x7054,
- /* key: 0x9769 */ 0x3357,
- /* key: 0x976a */ 0xe739,
- /* key: 0x976b */ 0x7056,
- /* key: 0x976c */ 0xffff,
- /* key: 0x976d */ 0x3f59,
- /* key: 0x976e */ 0xe73a,
- /* key: 0x976f */ 0xffff,
- /* key: 0x9770 */ 0xffff,
- /* key: 0x9771 */ 0x7057,
- /* key: 0x9772 */ 0xffff,
- /* key: 0x9773 */ 0xe73b,
- /* key: 0x9774 */ 0x3724,
- /* key: 0x9775 */ 0xffff,
- /* key: 0x9776 */ 0xe73c,
- /* key: 0x9777 */ 0xe73d,
- /* key: 0x9778 */ 0xe73e,
- /* key: 0x9779 */ 0x7058,
- /* key: 0x977a */ 0x705c,
- /* key: 0x977b */ 0xe73f,
- /* key: 0x977c */ 0x705a,
- /* key: 0x977d */ 0xe740,
- /* key: 0x977e */ 0xffff,
- /* key: 0x977f */ 0xe741,
- /* key: 0x9780 */ 0xe742,
- /* key: 0x9781 */ 0x705b,
- /* key: 0x9782 */ 0xffff,
- /* key: 0x9783 */ 0xffff,
- /* key: 0x9784 */ 0x3373,
- /* key: 0x9785 */ 0x7059,
- /* key: 0x9786 */ 0x705d,
- /* key: 0x9787 */ 0xffff,
- /* key: 0x9788 */ 0xffff,
- /* key: 0x9789 */ 0xe743,
- /* key: 0x978a */ 0xffff,
- /* key: 0x978b */ 0x705e,
- /* key: 0x978c */ 0xffff,
- /* key: 0x978d */ 0x3048,
- /* key: 0x978e */ 0xffff,
- /* key: 0x978f */ 0x705f,
- /* key: 0x9790 */ 0x7060,
- /* key: 0x9791 */ 0xffff,
- /* key: 0x9792 */ 0xffff,
- /* key: 0x9793 */ 0xffff,
- /* key: 0x9794 */ 0xffff,
- /* key: 0x9795 */ 0xe744,
- /* key: 0x9796 */ 0xe745,
- /* key: 0x9797 */ 0xe746,
- /* key: 0x9798 */ 0x3e64,
- /* key: 0x9799 */ 0xe747,
- /* key: 0x979a */ 0xe748,
- /* key: 0x979b */ 0xffff,
- /* key: 0x979c */ 0x7061,
- /* key: 0x979d */ 0xffff,
- /* key: 0x979e */ 0xe749,
- /* key: 0x979f */ 0xe74a,
- /* key: 0x97a0 */ 0x3547,
- /* key: 0x97a1 */ 0xffff,
- /* key: 0x97a2 */ 0xe74b,
- /* key: 0x97a3 */ 0x7064,
- /* key: 0x97a4 */ 0xffff,
- /* key: 0x97a5 */ 0xffff,
- /* key: 0x97a6 */ 0x7063,
- /* key: 0x97a7 */ 0xffff,
- /* key: 0x97a8 */ 0x7062,
- /* key: 0x97a9 */ 0xffff,
- /* key: 0x97aa */ 0xffff,
- /* key: 0x97ab */ 0x6b71,
- /* key: 0x97ac */ 0xe74c,
- /* key: 0x97ad */ 0x4a5c,
- /* key: 0x97ae */ 0xe74d,
- /* key: 0x97af */ 0xffff,
- /* key: 0x97b0 */ 0xffff,
- /* key: 0x97b1 */ 0xe74e,
- /* key: 0x97b2 */ 0xe74f,
- /* key: 0x97b3 */ 0x7065,
- /* key: 0x97b4 */ 0x7066,
- /* key: 0x97b5 */ 0xe750,
- /* key: 0x97b6 */ 0xe751,
- /* key: 0x97b7 */ 0xffff,
- /* key: 0x97b8 */ 0xe752,
- /* key: 0x97b9 */ 0xe753,
- /* key: 0x97ba */ 0xe754,
- /* key: 0x97bb */ 0xffff,
- /* key: 0x97bc */ 0xe755,
- /* key: 0x97bd */ 0xffff,
- /* key: 0x97be */ 0xe756,
- /* key: 0x97bf */ 0xe757,
- /* key: 0x97c0 */ 0xffff,
- /* key: 0x97c1 */ 0xe758,
- /* key: 0x97c2 */ 0xffff,
- /* key: 0x97c3 */ 0x7067,
- /* key: 0x97c4 */ 0xe759,
- /* key: 0x97c5 */ 0xe75a,
- /* key: 0x97c6 */ 0x7068,
- /* key: 0x97c7 */ 0xe75b,
- /* key: 0x97c8 */ 0x7069,
- /* key: 0x97c9 */ 0xe75c,
- /* key: 0x97ca */ 0xe75d,
- /* key: 0x97cb */ 0x706a,
- /* key: 0x97cc */ 0xe75e,
- /* key: 0x97cd */ 0xe75f,
- /* key: 0x97ce */ 0xe760,
- /* key: 0x97cf */ 0xffff,
- /* key: 0x97d0 */ 0xe761,
- /* key: 0x97d1 */ 0xe762,
- /* key: 0x97d2 */ 0xffff,
- /* key: 0x97d3 */ 0x345a,
- /* key: 0x97d4 */ 0xe763,
- /* key: 0x97d5 */ 0xffff,
- /* key: 0x97d6 */ 0xffff,
- /* key: 0x97d7 */ 0xe764,
- /* key: 0x97d8 */ 0xe765,
- /* key: 0x97d9 */ 0xe766,
- /* key: 0x97da */ 0xffff,
- /* key: 0x97db */ 0xe76a,
- /* key: 0x97dc */ 0x706b,
- /* key: 0x97dd */ 0xe767,
- /* key: 0x97de */ 0xe768,
- /* key: 0x97df */ 0xffff,
- /* key: 0x97e0 */ 0xe769,
- /* key: 0x97e1 */ 0xe76b,
- /* key: 0x97e2 */ 0xffff,
- /* key: 0x97e3 */ 0xffff,
- /* key: 0x97e4 */ 0xe76c,
- /* key: 0x97e5 */ 0xffff,
- /* key: 0x97e6 */ 0xffff,
- /* key: 0x97e7 */ 0xffff,
- /* key: 0x97e8 */ 0xffff,
- /* key: 0x97e9 */ 0xffff,
- /* key: 0x97ea */ 0xffff,
- /* key: 0x97eb */ 0xffff,
- /* key: 0x97ec */ 0xffff,
- /* key: 0x97ed */ 0x706c,
- /* key: 0x97ee */ 0x4723,
- /* key: 0x97ef */ 0xe76d,
- /* key: 0x97f0 */ 0xffff,
- /* key: 0x97f1 */ 0xe76e,
- /* key: 0x97f2 */ 0x706e,
- /* key: 0x97f3 */ 0x323b,
- /* key: 0x97f4 */ 0xe76f,
- /* key: 0x97f5 */ 0x7071,
- /* key: 0x97f6 */ 0x7070,
- /* key: 0x97f7 */ 0xe770,
- /* key: 0x97f8 */ 0xe771,
- /* key: 0x97f9 */ 0xffff,
- /* key: 0x97fa */ 0xe772,
- /* key: 0x97fb */ 0x3124,
- /* key: 0x97fc */ 0xffff,
- /* key: 0x97fd */ 0xffff,
- /* key: 0x97fe */ 0xffff,
- /* key: 0x97ff */ 0x3641,
- /* branch: 0x980X */ 21136,
- /* branch: 0x981X */ 21152,
- /* branch: 0x982X */ 21168,
- /* branch: 0x983X */ 21184,
- /* branch: 0x984X */ 21200,
- /* branch: 0x985X */ 21216,
- /* branch: 0x986X */ 21232,
- /* branch: 0x987X */ 21248,
- /* branch: 0x988X */ 0,
- /* branch: 0x989X */ 0,
- /* branch: 0x98aX */ 21264,
- /* branch: 0x98bX */ 21280,
- /* branch: 0x98cX */ 21296,
- /* branch: 0x98dX */ 21312,
- /* branch: 0x98eX */ 21328,
- /* branch: 0x98fX */ 21344,
- /* key: 0x9800 */ 0xffff,
- /* key: 0x9801 */ 0x4a47,
- /* key: 0x9802 */ 0x443a,
- /* key: 0x9803 */ 0x3a22,
- /* key: 0x9804 */ 0xffff,
- /* key: 0x9805 */ 0x3960,
- /* key: 0x9806 */ 0x3d67,
- /* key: 0x9807 */ 0xe773,
- /* key: 0x9808 */ 0x3f5c,
- /* key: 0x9809 */ 0xffff,
- /* key: 0x980a */ 0xe774,
- /* key: 0x980b */ 0xffff,
- /* key: 0x980c */ 0x7073,
- /* key: 0x980d */ 0xe776,
- /* key: 0x980e */ 0xe777,
- /* key: 0x980f */ 0x7072,
- /* key: 0x9810 */ 0x4d42,
- /* key: 0x9811 */ 0x3468,
- /* key: 0x9812 */ 0x4852,
- /* key: 0x9813 */ 0x465c,
- /* key: 0x9814 */ 0xe778,
- /* key: 0x9815 */ 0xffff,
- /* key: 0x9816 */ 0xe779,
- /* key: 0x9817 */ 0x3f7c,
- /* key: 0x9818 */ 0x4e4e,
- /* key: 0x9819 */ 0xe775,
- /* key: 0x981a */ 0x375b,
- /* key: 0x981b */ 0xffff,
- /* key: 0x981c */ 0xe77a,
- /* key: 0x981d */ 0xffff,
- /* key: 0x981e */ 0xe77b,
- /* key: 0x981f */ 0xffff,
- /* key: 0x9820 */ 0xe77c,
- /* key: 0x9821 */ 0x7076,
- /* key: 0x9822 */ 0xffff,
- /* key: 0x9823 */ 0xe77d,
- /* key: 0x9824 */ 0x7075,
- /* key: 0x9825 */ 0xe828,
- /* key: 0x9826 */ 0xe77e,
- /* key: 0x9827 */ 0xffff,
- /* key: 0x9828 */ 0xffff,
- /* key: 0x9829 */ 0xffff,
- /* key: 0x982a */ 0xffff,
- /* key: 0x982b */ 0xe821,
- /* key: 0x982c */ 0x4b4b,
- /* key: 0x982d */ 0x462c,
- /* key: 0x982e */ 0xe822,
- /* key: 0x982f */ 0xe823,
- /* key: 0x9830 */ 0xe824,
- /* key: 0x9831 */ 0xffff,
- /* key: 0x9832 */ 0xe825,
- /* key: 0x9833 */ 0xe826,
- /* key: 0x9834 */ 0x3150,
- /* key: 0x9835 */ 0xe827,
- /* key: 0x9836 */ 0xffff,
- /* key: 0x9837 */ 0x7077,
- /* key: 0x9838 */ 0x7074,
- /* key: 0x9839 */ 0xffff,
- /* key: 0x983a */ 0xffff,
- /* key: 0x983b */ 0x4951,
- /* key: 0x983c */ 0x4d6a,
- /* key: 0x983d */ 0x7078,
- /* key: 0x983e */ 0xe829,
- /* key: 0x983f */ 0xffff,
- /* key: 0x9840 */ 0xffff,
- /* key: 0x9841 */ 0xffff,
- /* key: 0x9842 */ 0xffff,
- /* key: 0x9843 */ 0xffff,
- /* key: 0x9844 */ 0xe82a,
- /* key: 0x9845 */ 0xffff,
- /* key: 0x9846 */ 0x7079,
- /* key: 0x9847 */ 0xe82b,
- /* key: 0x9848 */ 0xffff,
- /* key: 0x9849 */ 0xffff,
- /* key: 0x984a */ 0xe82c,
- /* key: 0x984b */ 0x707b,
- /* key: 0x984c */ 0x426a,
- /* key: 0x984d */ 0x335b,
- /* key: 0x984e */ 0x335c,
- /* key: 0x984f */ 0x707a,
- /* key: 0x9850 */ 0xffff,
- /* key: 0x9851 */ 0xe82d,
- /* key: 0x9852 */ 0xe82e,
- /* key: 0x9853 */ 0xe82f,
- /* key: 0x9854 */ 0x3469,
- /* key: 0x9855 */ 0x3832,
- /* key: 0x9856 */ 0xe830,
- /* key: 0x9857 */ 0xe831,
- /* key: 0x9858 */ 0x346a,
- /* key: 0x9859 */ 0xe832,
- /* key: 0x985a */ 0xe833,
- /* key: 0x985b */ 0x453f,
- /* key: 0x985c */ 0xffff,
- /* key: 0x985d */ 0xffff,
- /* key: 0x985e */ 0x4e60,
- /* key: 0x985f */ 0xffff,
- /* key: 0x9860 */ 0xffff,
- /* key: 0x9861 */ 0xffff,
- /* key: 0x9862 */ 0xe834,
- /* key: 0x9863 */ 0xe835,
- /* key: 0x9864 */ 0xffff,
- /* key: 0x9865 */ 0xe836,
- /* key: 0x9866 */ 0xe837,
- /* key: 0x9867 */ 0x385c,
- /* key: 0x9868 */ 0xffff,
- /* key: 0x9869 */ 0xffff,
- /* key: 0x986a */ 0xe838,
- /* key: 0x986b */ 0x707c,
- /* key: 0x986c */ 0xe839,
- /* key: 0x986d */ 0xffff,
- /* key: 0x986e */ 0xffff,
- /* key: 0x986f */ 0x707d,
- /* key: 0x9870 */ 0x707e,
- /* key: 0x9871 */ 0x7121,
- /* key: 0x9872 */ 0xffff,
- /* key: 0x9873 */ 0x7123,
- /* key: 0x9874 */ 0x7122,
- /* key: 0x9875 */ 0xffff,
- /* key: 0x9876 */ 0xffff,
- /* key: 0x9877 */ 0xffff,
- /* key: 0x9878 */ 0xffff,
- /* key: 0x9879 */ 0xffff,
- /* key: 0x987a */ 0xffff,
- /* key: 0x987b */ 0xffff,
- /* key: 0x987c */ 0xffff,
- /* key: 0x987d */ 0xffff,
- /* key: 0x987e */ 0xffff,
- /* key: 0x987f */ 0xffff,
- /* key: 0x98a0 */ 0xffff,
- /* key: 0x98a1 */ 0xffff,
- /* key: 0x98a2 */ 0xffff,
- /* key: 0x98a3 */ 0xffff,
- /* key: 0x98a4 */ 0xffff,
- /* key: 0x98a5 */ 0xffff,
- /* key: 0x98a6 */ 0xffff,
- /* key: 0x98a7 */ 0xffff,
- /* key: 0x98a8 */ 0x4977,
- /* key: 0x98a9 */ 0xffff,
- /* key: 0x98aa */ 0x7124,
- /* key: 0x98ab */ 0xe83a,
- /* key: 0x98ac */ 0xffff,
- /* key: 0x98ad */ 0xe83b,
- /* key: 0x98ae */ 0xe83c,
- /* key: 0x98af */ 0x7125,
- /* key: 0x98b0 */ 0xe83d,
- /* key: 0x98b1 */ 0x7126,
- /* key: 0x98b2 */ 0xffff,
- /* key: 0x98b3 */ 0xffff,
- /* key: 0x98b4 */ 0xe83e,
- /* key: 0x98b5 */ 0xffff,
- /* key: 0x98b6 */ 0x7127,
- /* key: 0x98b7 */ 0xe83f,
- /* key: 0x98b8 */ 0xe840,
- /* key: 0x98b9 */ 0xffff,
- /* key: 0x98ba */ 0xe841,
- /* key: 0x98bb */ 0xe842,
- /* key: 0x98bc */ 0xffff,
- /* key: 0x98bd */ 0xffff,
- /* key: 0x98be */ 0xffff,
- /* key: 0x98bf */ 0xe843,
- /* key: 0x98c0 */ 0xffff,
- /* key: 0x98c1 */ 0xffff,
- /* key: 0x98c2 */ 0xe844,
- /* key: 0x98c3 */ 0x7129,
- /* key: 0x98c4 */ 0x7128,
- /* key: 0x98c5 */ 0xe845,
- /* key: 0x98c6 */ 0x712a,
- /* key: 0x98c7 */ 0xffff,
- /* key: 0x98c8 */ 0xe846,
- /* key: 0x98c9 */ 0xffff,
- /* key: 0x98ca */ 0xffff,
- /* key: 0x98cb */ 0xffff,
- /* key: 0x98cc */ 0xe847,
- /* key: 0x98cd */ 0xffff,
- /* key: 0x98ce */ 0xffff,
- /* key: 0x98cf */ 0xffff,
- /* key: 0x98d0 */ 0xffff,
- /* key: 0x98d1 */ 0xffff,
- /* key: 0x98d2 */ 0xffff,
- /* key: 0x98d3 */ 0xffff,
- /* key: 0x98d4 */ 0xffff,
- /* key: 0x98d5 */ 0xffff,
- /* key: 0x98d6 */ 0xffff,
- /* key: 0x98d7 */ 0xffff,
- /* key: 0x98d8 */ 0xffff,
- /* key: 0x98d9 */ 0xffff,
- /* key: 0x98da */ 0xffff,
- /* key: 0x98db */ 0x4874,
- /* key: 0x98dc */ 0x664c,
- /* key: 0x98dd */ 0xffff,
- /* key: 0x98de */ 0xffff,
- /* key: 0x98df */ 0x3f29,
- /* key: 0x98e0 */ 0xffff,
- /* key: 0x98e1 */ 0xe848,
- /* key: 0x98e2 */ 0x3532,
- /* key: 0x98e3 */ 0xe849,
- /* key: 0x98e4 */ 0xffff,
- /* key: 0x98e5 */ 0xe84a,
- /* key: 0x98e6 */ 0xe84b,
- /* key: 0x98e7 */ 0xe84c,
- /* key: 0x98e8 */ 0xffff,
- /* key: 0x98e9 */ 0x712b,
- /* key: 0x98ea */ 0xe84d,
- /* key: 0x98eb */ 0x712c,
- /* key: 0x98ec */ 0xffff,
- /* key: 0x98ed */ 0x522c,
- /* key: 0x98ee */ 0x5d3b,
- /* key: 0x98ef */ 0x4853,
- /* key: 0x98f0 */ 0xffff,
- /* key: 0x98f1 */ 0xffff,
- /* key: 0x98f2 */ 0x307b,
- /* key: 0x98f3 */ 0xe84e,
- /* key: 0x98f4 */ 0x303b,
- /* key: 0x98f5 */ 0xffff,
- /* key: 0x98f6 */ 0xe84f,
- /* key: 0x98f7 */ 0xffff,
- /* key: 0x98f8 */ 0xffff,
- /* key: 0x98f9 */ 0xffff,
- /* key: 0x98fa */ 0xffff,
- /* key: 0x98fb */ 0xffff,
- /* key: 0x98fc */ 0x3b74,
- /* key: 0x98fd */ 0x4b30,
- /* key: 0x98fe */ 0x3e7e,
- /* key: 0x98ff */ 0xffff,
- /* branch: 0x990X */ 21376,
- /* branch: 0x991X */ 21392,
- /* branch: 0x992X */ 21408,
- /* branch: 0x993X */ 21424,
- /* branch: 0x994X */ 21440,
- /* branch: 0x995X */ 21456,
- /* branch: 0x996X */ 21472,
- /* branch: 0x997X */ 0,
- /* branch: 0x998X */ 0,
- /* branch: 0x999X */ 21488,
- /* branch: 0x99aX */ 21504,
- /* branch: 0x99bX */ 21520,
- /* branch: 0x99cX */ 21536,
- /* branch: 0x99dX */ 21552,
- /* branch: 0x99eX */ 21568,
- /* branch: 0x99fX */ 21584,
- /* key: 0x9900 */ 0xffff,
- /* key: 0x9901 */ 0xffff,
- /* key: 0x9902 */ 0xe850,
- /* key: 0x9903 */ 0x712d,
- /* key: 0x9904 */ 0xffff,
- /* key: 0x9905 */ 0x4c5f,
- /* key: 0x9906 */ 0xffff,
- /* key: 0x9907 */ 0xe851,
- /* key: 0x9908 */ 0xe852,
- /* key: 0x9909 */ 0x712e,
- /* key: 0x990a */ 0x4d5c,
- /* key: 0x990b */ 0xffff,
- /* key: 0x990c */ 0x3142,
- /* key: 0x990d */ 0xffff,
- /* key: 0x990e */ 0xffff,
- /* key: 0x990f */ 0xffff,
- /* key: 0x9910 */ 0x3b41,
- /* key: 0x9911 */ 0xe853,
- /* key: 0x9912 */ 0x712f,
- /* key: 0x9913 */ 0x326e,
- /* key: 0x9914 */ 0x7130,
- /* key: 0x9915 */ 0xe854,
- /* key: 0x9916 */ 0xe855,
- /* key: 0x9917 */ 0xe856,
- /* key: 0x9918 */ 0x7131,
- /* key: 0x9919 */ 0xffff,
- /* key: 0x991a */ 0xe857,
- /* key: 0x991b */ 0xe858,
- /* key: 0x991c */ 0xe859,
- /* key: 0x991d */ 0x7133,
- /* key: 0x991e */ 0x7134,
- /* key: 0x991f */ 0xe85a,
- /* key: 0x9920 */ 0x7136,
- /* key: 0x9921 */ 0x7132,
- /* key: 0x9922 */ 0xe85b,
- /* key: 0x9923 */ 0xffff,
- /* key: 0x9924 */ 0x7135,
- /* key: 0x9925 */ 0xffff,
- /* key: 0x9926 */ 0xe85c,
- /* key: 0x9927 */ 0xe85d,
- /* key: 0x9928 */ 0x345b,
- /* key: 0x9929 */ 0xffff,
- /* key: 0x992a */ 0xffff,
- /* key: 0x992b */ 0xe85e,
- /* key: 0x992c */ 0x7137,
- /* key: 0x992d */ 0xffff,
- /* key: 0x992e */ 0x7138,
- /* key: 0x992f */ 0xffff,
- /* key: 0x9930 */ 0xffff,
- /* key: 0x9931 */ 0xe85f,
- /* key: 0x9932 */ 0xe860,
- /* key: 0x9933 */ 0xe861,
- /* key: 0x9934 */ 0xe862,
- /* key: 0x9935 */ 0xe863,
- /* key: 0x9936 */ 0xffff,
- /* key: 0x9937 */ 0xffff,
- /* key: 0x9938 */ 0xffff,
- /* key: 0x9939 */ 0xe864,
- /* key: 0x993a */ 0xe865,
- /* key: 0x993b */ 0xe866,
- /* key: 0x993c */ 0xe867,
- /* key: 0x993d */ 0x7139,
- /* key: 0x993e */ 0x713a,
- /* key: 0x993f */ 0xffff,
- /* key: 0x9940 */ 0xe868,
- /* key: 0x9941 */ 0xe869,
- /* key: 0x9942 */ 0x713b,
- /* key: 0x9943 */ 0xffff,
- /* key: 0x9944 */ 0xffff,
- /* key: 0x9945 */ 0x713d,
- /* key: 0x9946 */ 0xe86a,
- /* key: 0x9947 */ 0xe86b,
- /* key: 0x9948 */ 0xe86c,
- /* key: 0x9949 */ 0x713c,
- /* key: 0x994a */ 0xffff,
- /* key: 0x994b */ 0x713f,
- /* key: 0x994c */ 0x7142,
- /* key: 0x994d */ 0xe86d,
- /* key: 0x994e */ 0xe86e,
- /* key: 0x994f */ 0xffff,
- /* key: 0x9950 */ 0x713e,
- /* key: 0x9951 */ 0x7140,
- /* key: 0x9952 */ 0x7141,
- /* key: 0x9953 */ 0xffff,
- /* key: 0x9954 */ 0xe86f,
- /* key: 0x9955 */ 0x7143,
- /* key: 0x9956 */ 0xffff,
- /* key: 0x9957 */ 0x3642,
- /* key: 0x9958 */ 0xe870,
- /* key: 0x9959 */ 0xe871,
- /* key: 0x995a */ 0xffff,
- /* key: 0x995b */ 0xe872,
- /* key: 0x995c */ 0xe873,
- /* key: 0x995d */ 0xffff,
- /* key: 0x995e */ 0xe874,
- /* key: 0x995f */ 0xe875,
- /* key: 0x9960 */ 0xe876,
- /* key: 0x9961 */ 0xffff,
- /* key: 0x9962 */ 0xffff,
- /* key: 0x9963 */ 0xffff,
- /* key: 0x9964 */ 0xffff,
- /* key: 0x9965 */ 0xffff,
- /* key: 0x9966 */ 0xffff,
- /* key: 0x9967 */ 0xffff,
- /* key: 0x9968 */ 0xffff,
- /* key: 0x9969 */ 0xffff,
- /* key: 0x996a */ 0xffff,
- /* key: 0x996b */ 0xffff,
- /* key: 0x996c */ 0xffff,
- /* key: 0x996d */ 0xffff,
- /* key: 0x996e */ 0xffff,
- /* key: 0x996f */ 0xffff,
- /* key: 0x9990 */ 0xffff,
- /* key: 0x9991 */ 0xffff,
- /* key: 0x9992 */ 0xffff,
- /* key: 0x9993 */ 0xffff,
- /* key: 0x9994 */ 0xffff,
- /* key: 0x9995 */ 0xffff,
- /* key: 0x9996 */ 0x3c73,
- /* key: 0x9997 */ 0x7144,
- /* key: 0x9998 */ 0x7145,
- /* key: 0x9999 */ 0x3961,
- /* key: 0x999a */ 0xffff,
- /* key: 0x999b */ 0xe877,
- /* key: 0x999c */ 0xffff,
- /* key: 0x999d */ 0xe878,
- /* key: 0x999e */ 0xffff,
- /* key: 0x999f */ 0xe879,
- /* key: 0x99a0 */ 0xffff,
- /* key: 0x99a1 */ 0xffff,
- /* key: 0x99a2 */ 0xffff,
- /* key: 0x99a3 */ 0xffff,
- /* key: 0x99a4 */ 0xffff,
- /* key: 0x99a5 */ 0x7146,
- /* key: 0x99a6 */ 0xe87a,
- /* key: 0x99a7 */ 0xffff,
- /* key: 0x99a8 */ 0x333e,
- /* key: 0x99a9 */ 0xffff,
- /* key: 0x99aa */ 0xffff,
- /* key: 0x99ab */ 0xffff,
- /* key: 0x99ac */ 0x474f,
- /* key: 0x99ad */ 0x7147,
- /* key: 0x99ae */ 0x7148,
- /* key: 0x99af */ 0xffff,
- /* key: 0x99b0 */ 0xe87b,
- /* key: 0x99b1 */ 0xe87c,
- /* key: 0x99b2 */ 0xe87d,
- /* key: 0x99b3 */ 0x435a,
- /* key: 0x99b4 */ 0x466b,
- /* key: 0x99b5 */ 0xe87e,
- /* key: 0x99b6 */ 0xffff,
- /* key: 0x99b7 */ 0xffff,
- /* key: 0x99b8 */ 0xffff,
- /* key: 0x99b9 */ 0xe921,
- /* key: 0x99ba */ 0xe922,
- /* key: 0x99bb */ 0xffff,
- /* key: 0x99bc */ 0x7149,
- /* key: 0x99bd */ 0xe923,
- /* key: 0x99be */ 0xffff,
- /* key: 0x99bf */ 0xe924,
- /* key: 0x99c0 */ 0xffff,
- /* key: 0x99c1 */ 0x477d,
- /* key: 0x99c2 */ 0xffff,
- /* key: 0x99c3 */ 0xe925,
- /* key: 0x99c4 */ 0x424c,
- /* key: 0x99c5 */ 0x3158,
- /* key: 0x99c6 */ 0x366e,
- /* key: 0x99c7 */ 0xffff,
- /* key: 0x99c8 */ 0x366f,
- /* key: 0x99c9 */ 0xe926,
- /* key: 0x99ca */ 0xffff,
- /* key: 0x99cb */ 0xffff,
- /* key: 0x99cc */ 0xffff,
- /* key: 0x99cd */ 0xffff,
- /* key: 0x99ce */ 0xffff,
- /* key: 0x99cf */ 0xffff,
- /* key: 0x99d0 */ 0x4373,
- /* key: 0x99d1 */ 0x714e,
- /* key: 0x99d2 */ 0x3670,
- /* key: 0x99d3 */ 0xe927,
- /* key: 0x99d4 */ 0xe928,
- /* key: 0x99d5 */ 0x326f,
- /* key: 0x99d6 */ 0xffff,
- /* key: 0x99d7 */ 0xffff,
- /* key: 0x99d8 */ 0x714d,
- /* key: 0x99d9 */ 0xe929,
- /* key: 0x99da */ 0xe92a,
- /* key: 0x99db */ 0x714b,
- /* key: 0x99dc */ 0xe92b,
- /* key: 0x99dd */ 0x714c,
- /* key: 0x99de */ 0xe92c,
- /* key: 0x99df */ 0x714a,
- /* key: 0x99e0 */ 0xffff,
- /* key: 0x99e1 */ 0xffff,
- /* key: 0x99e2 */ 0x7158,
- /* key: 0x99e3 */ 0xffff,
- /* key: 0x99e4 */ 0xffff,
- /* key: 0x99e5 */ 0xffff,
- /* key: 0x99e6 */ 0xffff,
- /* key: 0x99e7 */ 0xe92d,
- /* key: 0x99e8 */ 0xffff,
- /* key: 0x99e9 */ 0xffff,
- /* key: 0x99ea */ 0xe92e,
- /* key: 0x99eb */ 0xe92f,
- /* key: 0x99ec */ 0xe930,
- /* key: 0x99ed */ 0x714f,
- /* key: 0x99ee */ 0x7150,
- /* key: 0x99ef */ 0xffff,
- /* key: 0x99f0 */ 0xe931,
- /* key: 0x99f1 */ 0x7151,
- /* key: 0x99f2 */ 0x7152,
- /* key: 0x99f3 */ 0xffff,
- /* key: 0x99f4 */ 0xe932,
- /* key: 0x99f5 */ 0xe933,
- /* key: 0x99f6 */ 0xffff,
- /* key: 0x99f7 */ 0xffff,
- /* key: 0x99f8 */ 0x7154,
- /* key: 0x99f9 */ 0xe934,
- /* key: 0x99fa */ 0xffff,
- /* key: 0x99fb */ 0x7153,
- /* key: 0x99fc */ 0xffff,
- /* key: 0x99fd */ 0xe935,
- /* key: 0x99fe */ 0xe936,
- /* key: 0x99ff */ 0x3d59,
- /* branch: 0x9a0X */ 21616,
- /* branch: 0x9a1X */ 21632,
- /* branch: 0x9a2X */ 21648,
- /* branch: 0x9a3X */ 21664,
- /* branch: 0x9a4X */ 21680,
- /* branch: 0x9a5X */ 21696,
- /* branch: 0x9a6X */ 21712,
- /* branch: 0x9a7X */ 0,
- /* branch: 0x9a8X */ 0,
- /* branch: 0x9a9X */ 0,
- /* branch: 0x9aaX */ 21728,
- /* branch: 0x9abX */ 21744,
- /* branch: 0x9acX */ 21760,
- /* branch: 0x9adX */ 21776,
- /* branch: 0x9aeX */ 21792,
- /* branch: 0x9afX */ 21808,
- /* key: 0x9a00 */ 0xffff,
- /* key: 0x9a01 */ 0x7155,
- /* key: 0x9a02 */ 0xe937,
- /* key: 0x9a03 */ 0xe938,
- /* key: 0x9a04 */ 0xe939,
- /* key: 0x9a05 */ 0x7157,
- /* key: 0x9a06 */ 0xffff,
- /* key: 0x9a07 */ 0xffff,
- /* key: 0x9a08 */ 0xffff,
- /* key: 0x9a09 */ 0xffff,
- /* key: 0x9a0a */ 0xffff,
- /* key: 0x9a0b */ 0xe93a,
- /* key: 0x9a0c */ 0xe93b,
- /* key: 0x9a0d */ 0xffff,
- /* key: 0x9a0e */ 0x3533,
- /* key: 0x9a0f */ 0x7156,
- /* key: 0x9a10 */ 0xe93c,
- /* key: 0x9a11 */ 0xe93d,
- /* key: 0x9a12 */ 0x417b,
- /* key: 0x9a13 */ 0x3833,
- /* key: 0x9a14 */ 0xffff,
- /* key: 0x9a15 */ 0xffff,
- /* key: 0x9a16 */ 0xe93e,
- /* key: 0x9a17 */ 0xffff,
- /* key: 0x9a18 */ 0xffff,
- /* key: 0x9a19 */ 0x7159,
- /* key: 0x9a1a */ 0xffff,
- /* key: 0x9a1b */ 0xffff,
- /* key: 0x9a1c */ 0xffff,
- /* key: 0x9a1d */ 0xffff,
- /* key: 0x9a1e */ 0xe93f,
- /* key: 0x9a1f */ 0xffff,
- /* key: 0x9a20 */ 0xe940,
- /* key: 0x9a21 */ 0xffff,
- /* key: 0x9a22 */ 0xe941,
- /* key: 0x9a23 */ 0xe942,
- /* key: 0x9a24 */ 0xe943,
- /* key: 0x9a25 */ 0xffff,
- /* key: 0x9a26 */ 0xffff,
- /* key: 0x9a27 */ 0xe944,
- /* key: 0x9a28 */ 0x424d,
- /* key: 0x9a29 */ 0xffff,
- /* key: 0x9a2a */ 0xffff,
- /* key: 0x9a2b */ 0x715a,
- /* key: 0x9a2c */ 0xffff,
- /* key: 0x9a2d */ 0xe945,
- /* key: 0x9a2e */ 0xe946,
- /* key: 0x9a2f */ 0xffff,
- /* key: 0x9a30 */ 0x462d,
- /* key: 0x9a31 */ 0xffff,
- /* key: 0x9a32 */ 0xffff,
- /* key: 0x9a33 */ 0xe947,
- /* key: 0x9a34 */ 0xffff,
- /* key: 0x9a35 */ 0xe948,
- /* key: 0x9a36 */ 0xe949,
- /* key: 0x9a37 */ 0x715b,
- /* key: 0x9a38 */ 0xe94a,
- /* key: 0x9a39 */ 0xffff,
- /* key: 0x9a3a */ 0xffff,
- /* key: 0x9a3b */ 0xffff,
- /* key: 0x9a3c */ 0xffff,
- /* key: 0x9a3d */ 0xffff,
- /* key: 0x9a3e */ 0x7160,
- /* key: 0x9a3f */ 0xffff,
- /* key: 0x9a40 */ 0x715e,
- /* key: 0x9a41 */ 0xe94c,
- /* key: 0x9a42 */ 0x715d,
- /* key: 0x9a43 */ 0x715f,
- /* key: 0x9a44 */ 0xe94d,
- /* key: 0x9a45 */ 0x715c,
- /* key: 0x9a46 */ 0xffff,
- /* key: 0x9a47 */ 0xe94b,
- /* key: 0x9a48 */ 0xffff,
- /* key: 0x9a49 */ 0xffff,
- /* key: 0x9a4a */ 0xe94e,
- /* key: 0x9a4b */ 0xe94f,
- /* key: 0x9a4c */ 0xe950,
- /* key: 0x9a4d */ 0x7162,
- /* key: 0x9a4e */ 0xe951,
- /* key: 0x9a4f */ 0xffff,
- /* key: 0x9a50 */ 0xffff,
- /* key: 0x9a51 */ 0xe952,
- /* key: 0x9a52 */ 0xffff,
- /* key: 0x9a53 */ 0xffff,
- /* key: 0x9a54 */ 0xe953,
- /* key: 0x9a55 */ 0x7161,
- /* key: 0x9a56 */ 0xe954,
- /* key: 0x9a57 */ 0x7164,
- /* key: 0x9a58 */ 0xffff,
- /* key: 0x9a59 */ 0xffff,
- /* key: 0x9a5a */ 0x3643,
- /* key: 0x9a5b */ 0x7163,
- /* key: 0x9a5c */ 0xffff,
- /* key: 0x9a5d */ 0xe955,
- /* key: 0x9a5e */ 0xffff,
- /* key: 0x9a5f */ 0x7165,
- /* key: 0x9a60 */ 0xffff,
- /* key: 0x9a61 */ 0xffff,
- /* key: 0x9a62 */ 0x7166,
- /* key: 0x9a63 */ 0xffff,
- /* key: 0x9a64 */ 0x7168,
- /* key: 0x9a65 */ 0x7167,
- /* key: 0x9a66 */ 0xffff,
- /* key: 0x9a67 */ 0xffff,
- /* key: 0x9a68 */ 0xffff,
- /* key: 0x9a69 */ 0x7169,
- /* key: 0x9a6a */ 0x716b,
- /* key: 0x9a6b */ 0x716a,
- /* key: 0x9a6c */ 0xffff,
- /* key: 0x9a6d */ 0xffff,
- /* key: 0x9a6e */ 0xffff,
- /* key: 0x9a6f */ 0xffff,
- /* key: 0x9aa0 */ 0xffff,
- /* key: 0x9aa1 */ 0xffff,
- /* key: 0x9aa2 */ 0xffff,
- /* key: 0x9aa3 */ 0xffff,
- /* key: 0x9aa4 */ 0xffff,
- /* key: 0x9aa5 */ 0xffff,
- /* key: 0x9aa6 */ 0xffff,
- /* key: 0x9aa7 */ 0xffff,
- /* key: 0x9aa8 */ 0x397c,
- /* key: 0x9aa9 */ 0xffff,
- /* key: 0x9aaa */ 0xe956,
- /* key: 0x9aab */ 0xffff,
- /* key: 0x9aac */ 0xe957,
- /* key: 0x9aad */ 0x716c,
- /* key: 0x9aae */ 0xe958,
- /* key: 0x9aaf */ 0xe959,
- /* key: 0x9ab0 */ 0x716d,
- /* key: 0x9ab1 */ 0xffff,
- /* key: 0x9ab2 */ 0xe95a,
- /* key: 0x9ab3 */ 0xffff,
- /* key: 0x9ab4 */ 0xe95b,
- /* key: 0x9ab5 */ 0xe95c,
- /* key: 0x9ab6 */ 0xe95d,
- /* key: 0x9ab7 */ 0xffff,
- /* key: 0x9ab8 */ 0x333c,
- /* key: 0x9ab9 */ 0xe95e,
- /* key: 0x9aba */ 0xffff,
- /* key: 0x9abb */ 0xe95f,
- /* key: 0x9abc */ 0x716e,
- /* key: 0x9abd */ 0xffff,
- /* key: 0x9abe */ 0xe960,
- /* key: 0x9abf */ 0xe961,
- /* key: 0x9ac0 */ 0x716f,
- /* key: 0x9ac1 */ 0xe962,
- /* key: 0x9ac2 */ 0xffff,
- /* key: 0x9ac3 */ 0xe963,
- /* key: 0x9ac4 */ 0x3f71,
- /* key: 0x9ac5 */ 0xffff,
- /* key: 0x9ac6 */ 0xe964,
- /* key: 0x9ac7 */ 0xffff,
- /* key: 0x9ac8 */ 0xe965,
- /* key: 0x9ac9 */ 0xffff,
- /* key: 0x9aca */ 0xffff,
- /* key: 0x9acb */ 0xffff,
- /* key: 0x9acc */ 0xffff,
- /* key: 0x9acd */ 0xffff,
- /* key: 0x9ace */ 0xe966,
- /* key: 0x9acf */ 0x7170,
- /* key: 0x9ad0 */ 0xe967,
- /* key: 0x9ad1 */ 0x7171,
- /* key: 0x9ad2 */ 0xe968,
- /* key: 0x9ad3 */ 0x7172,
- /* key: 0x9ad4 */ 0x7173,
- /* key: 0x9ad5 */ 0xe969,
- /* key: 0x9ad6 */ 0xe96a,
- /* key: 0x9ad7 */ 0xe96b,
- /* key: 0x9ad8 */ 0x3962,
- /* key: 0x9ad9 */ 0xffff,
- /* key: 0x9ada */ 0xffff,
- /* key: 0x9adb */ 0xe96c,
- /* key: 0x9adc */ 0xe96d,
- /* key: 0x9add */ 0xffff,
- /* key: 0x9ade */ 0x7174,
- /* key: 0x9adf */ 0x7175,
- /* key: 0x9ae0 */ 0xe96e,
- /* key: 0x9ae1 */ 0xffff,
- /* key: 0x9ae2 */ 0x7176,
- /* key: 0x9ae3 */ 0x7177,
- /* key: 0x9ae4 */ 0xe96f,
- /* key: 0x9ae5 */ 0xe970,
- /* key: 0x9ae6 */ 0x7178,
- /* key: 0x9ae7 */ 0xe971,
- /* key: 0x9ae8 */ 0xffff,
- /* key: 0x9ae9 */ 0xe972,
- /* key: 0x9aea */ 0x4831,
- /* key: 0x9aeb */ 0x717a,
- /* key: 0x9aec */ 0xe973,
- /* key: 0x9aed */ 0x4926,
- /* key: 0x9aee */ 0x717b,
- /* key: 0x9aef */ 0x7179,
- /* key: 0x9af0 */ 0xffff,
- /* key: 0x9af1 */ 0x717d,
- /* key: 0x9af2 */ 0xe974,
- /* key: 0x9af3 */ 0xe975,
- /* key: 0x9af4 */ 0x717c,
- /* key: 0x9af5 */ 0xe976,
- /* key: 0x9af6 */ 0xffff,
- /* key: 0x9af7 */ 0x717e,
- /* key: 0x9af8 */ 0xffff,
- /* key: 0x9af9 */ 0xe977,
- /* key: 0x9afa */ 0xe978,
- /* key: 0x9afb */ 0x7221,
- /* key: 0x9afc */ 0xffff,
- /* key: 0x9afd */ 0xe979,
- /* key: 0x9afe */ 0xffff,
- /* key: 0x9aff */ 0xe97a,
- /* branch: 0x9b0X */ 21840,
- /* branch: 0x9b1X */ 21856,
- /* branch: 0x9b2X */ 21872,
- /* branch: 0x9b3X */ 21888,
- /* branch: 0x9b4X */ 21904,
- /* branch: 0x9b5X */ 21920,
- /* branch: 0x9b6X */ 21936,
- /* branch: 0x9b7X */ 21952,
- /* branch: 0x9b8X */ 21968,
- /* branch: 0x9b9X */ 21984,
- /* branch: 0x9baX */ 22000,
- /* branch: 0x9bbX */ 22016,
- /* branch: 0x9bcX */ 22032,
- /* branch: 0x9bdX */ 22048,
- /* branch: 0x9beX */ 22064,
- /* branch: 0x9bfX */ 22080,
- /* key: 0x9b00 */ 0xe97b,
- /* key: 0x9b01 */ 0xe97c,
- /* key: 0x9b02 */ 0xe97d,
- /* key: 0x9b03 */ 0xe97e,
- /* key: 0x9b04 */ 0xea21,
- /* key: 0x9b05 */ 0xea22,
- /* key: 0x9b06 */ 0x7222,
- /* key: 0x9b07 */ 0xffff,
- /* key: 0x9b08 */ 0xea23,
- /* key: 0x9b09 */ 0xea24,
- /* key: 0x9b0a */ 0xffff,
- /* key: 0x9b0b */ 0xea25,
- /* key: 0x9b0c */ 0xea26,
- /* key: 0x9b0d */ 0xea27,
- /* key: 0x9b0e */ 0xea28,
- /* key: 0x9b0f */ 0xffff,
- /* key: 0x9b10 */ 0xea29,
- /* key: 0x9b11 */ 0xffff,
- /* key: 0x9b12 */ 0xea2a,
- /* key: 0x9b13 */ 0xffff,
- /* key: 0x9b14 */ 0xffff,
- /* key: 0x9b15 */ 0xffff,
- /* key: 0x9b16 */ 0xea2b,
- /* key: 0x9b17 */ 0xffff,
- /* key: 0x9b18 */ 0x7223,
- /* key: 0x9b19 */ 0xea2c,
- /* key: 0x9b1a */ 0x7224,
- /* key: 0x9b1b */ 0xea2d,
- /* key: 0x9b1c */ 0xea2e,
- /* key: 0x9b1d */ 0xffff,
- /* key: 0x9b1e */ 0xffff,
- /* key: 0x9b1f */ 0x7225,
- /* key: 0x9b20 */ 0xea2f,
- /* key: 0x9b21 */ 0xffff,
- /* key: 0x9b22 */ 0x7226,
- /* key: 0x9b23 */ 0x7227,
- /* key: 0x9b24 */ 0xffff,
- /* key: 0x9b25 */ 0x7228,
- /* key: 0x9b26 */ 0xea30,
- /* key: 0x9b27 */ 0x7229,
- /* key: 0x9b28 */ 0x722a,
- /* key: 0x9b29 */ 0x722b,
- /* key: 0x9b2a */ 0x722c,
- /* key: 0x9b2b */ 0xea31,
- /* key: 0x9b2c */ 0xffff,
- /* key: 0x9b2d */ 0xea32,
- /* key: 0x9b2e */ 0x722d,
- /* key: 0x9b2f */ 0x722e,
- /* key: 0x9b30 */ 0xffff,
- /* key: 0x9b31 */ 0x5d35,
- /* key: 0x9b32 */ 0x722f,
- /* key: 0x9b33 */ 0xea33,
- /* key: 0x9b34 */ 0xea34,
- /* key: 0x9b35 */ 0xea35,
- /* key: 0x9b36 */ 0xffff,
- /* key: 0x9b37 */ 0xea36,
- /* key: 0x9b38 */ 0xffff,
- /* key: 0x9b39 */ 0xea37,
- /* key: 0x9b3a */ 0xea38,
- /* key: 0x9b3b */ 0x6478,
- /* key: 0x9b3c */ 0x3534,
- /* key: 0x9b3d */ 0xea39,
- /* key: 0x9b3e */ 0xffff,
- /* key: 0x9b3f */ 0xffff,
- /* key: 0x9b40 */ 0xffff,
- /* key: 0x9b41 */ 0x3321,
- /* key: 0x9b42 */ 0x3a32,
- /* key: 0x9b43 */ 0x7231,
- /* key: 0x9b44 */ 0x7230,
- /* key: 0x9b45 */ 0x4c25,
- /* key: 0x9b46 */ 0xffff,
- /* key: 0x9b47 */ 0xffff,
- /* key: 0x9b48 */ 0xea3a,
- /* key: 0x9b49 */ 0xffff,
- /* key: 0x9b4a */ 0xffff,
- /* key: 0x9b4b */ 0xea3b,
- /* key: 0x9b4c */ 0xea3c,
- /* key: 0x9b4d */ 0x7233,
- /* key: 0x9b4e */ 0x7234,
- /* key: 0x9b4f */ 0x7232,
- /* key: 0x9b50 */ 0xffff,
- /* key: 0x9b51 */ 0x7235,
- /* key: 0x9b52 */ 0xffff,
- /* key: 0x9b53 */ 0xffff,
- /* key: 0x9b54 */ 0x4b62,
- /* key: 0x9b55 */ 0xea3d,
- /* key: 0x9b56 */ 0xea3e,
- /* key: 0x9b57 */ 0xea3f,
- /* key: 0x9b58 */ 0x7236,
- /* key: 0x9b59 */ 0xffff,
- /* key: 0x9b5a */ 0x357b,
- /* key: 0x9b5b */ 0xea40,
- /* key: 0x9b5c */ 0xffff,
- /* key: 0x9b5d */ 0xffff,
- /* key: 0x9b5e */ 0xea41,
- /* key: 0x9b5f */ 0xffff,
- /* key: 0x9b60 */ 0xffff,
- /* key: 0x9b61 */ 0xea42,
- /* key: 0x9b62 */ 0xffff,
- /* key: 0x9b63 */ 0xea43,
- /* key: 0x9b64 */ 0xffff,
- /* key: 0x9b65 */ 0xea44,
- /* key: 0x9b66 */ 0xea45,
- /* key: 0x9b67 */ 0xffff,
- /* key: 0x9b68 */ 0xea46,
- /* key: 0x9b69 */ 0xffff,
- /* key: 0x9b6a */ 0xea47,
- /* key: 0x9b6b */ 0xea48,
- /* key: 0x9b6c */ 0xea49,
- /* key: 0x9b6d */ 0xea4a,
- /* key: 0x9b6e */ 0xea4b,
- /* key: 0x9b6f */ 0x4f25,
- /* key: 0x9b70 */ 0xffff,
- /* key: 0x9b71 */ 0xffff,
- /* key: 0x9b72 */ 0xffff,
- /* key: 0x9b73 */ 0xea4c,
- /* key: 0x9b74 */ 0x7237,
- /* key: 0x9b75 */ 0xea4d,
- /* key: 0x9b76 */ 0xffff,
- /* key: 0x9b77 */ 0xea4e,
- /* key: 0x9b78 */ 0xea4f,
- /* key: 0x9b79 */ 0xea50,
- /* key: 0x9b7a */ 0xffff,
- /* key: 0x9b7b */ 0xffff,
- /* key: 0x9b7c */ 0xffff,
- /* key: 0x9b7d */ 0xffff,
- /* key: 0x9b7e */ 0xffff,
- /* key: 0x9b7f */ 0xea51,
- /* key: 0x9b80 */ 0xea52,
- /* key: 0x9b81 */ 0xffff,
- /* key: 0x9b82 */ 0xffff,
- /* key: 0x9b83 */ 0x7239,
- /* key: 0x9b84 */ 0xea53,
- /* key: 0x9b85 */ 0xea54,
- /* key: 0x9b86 */ 0xea55,
- /* key: 0x9b87 */ 0xea56,
- /* key: 0x9b88 */ 0xffff,
- /* key: 0x9b89 */ 0xea57,
- /* key: 0x9b8a */ 0xea58,
- /* key: 0x9b8b */ 0xea59,
- /* key: 0x9b8c */ 0xffff,
- /* key: 0x9b8d */ 0xea5a,
- /* key: 0x9b8e */ 0x303e,
- /* key: 0x9b8f */ 0xea5b,
- /* key: 0x9b90 */ 0xea5c,
- /* key: 0x9b91 */ 0x723a,
- /* key: 0x9b92 */ 0x4a2b,
- /* key: 0x9b93 */ 0x7238,
- /* key: 0x9b94 */ 0xea5d,
- /* key: 0x9b95 */ 0xffff,
- /* key: 0x9b96 */ 0x723b,
- /* key: 0x9b97 */ 0x723c,
- /* key: 0x9b98 */ 0xffff,
- /* key: 0x9b99 */ 0xffff,
- /* key: 0x9b9a */ 0xea5e,
- /* key: 0x9b9b */ 0xffff,
- /* key: 0x9b9c */ 0xffff,
- /* key: 0x9b9d */ 0xea5f,
- /* key: 0x9b9e */ 0xea60,
- /* key: 0x9b9f */ 0x723d,
- /* key: 0x9ba0 */ 0x723e,
- /* key: 0x9ba1 */ 0xffff,
- /* key: 0x9ba2 */ 0xffff,
- /* key: 0x9ba3 */ 0xffff,
- /* key: 0x9ba4 */ 0xffff,
- /* key: 0x9ba5 */ 0xffff,
- /* key: 0x9ba6 */ 0xea61,
- /* key: 0x9ba7 */ 0xea62,
- /* key: 0x9ba8 */ 0x723f,
- /* key: 0x9ba9 */ 0xea63,
- /* key: 0x9baa */ 0x4b6e,
- /* key: 0x9bab */ 0x3b2d,
- /* key: 0x9bac */ 0xea64,
- /* key: 0x9bad */ 0x3a7a,
- /* key: 0x9bae */ 0x412f,
- /* key: 0x9baf */ 0xffff,
- /* key: 0x9bb0 */ 0xea65,
- /* key: 0x9bb1 */ 0xea66,
- /* key: 0x9bb2 */ 0xea67,
- /* key: 0x9bb3 */ 0xffff,
- /* key: 0x9bb4 */ 0x7240,
- /* key: 0x9bb5 */ 0xffff,
- /* key: 0x9bb6 */ 0xffff,
- /* key: 0x9bb7 */ 0xea68,
- /* key: 0x9bb8 */ 0xea69,
- /* key: 0x9bb9 */ 0x7243,
- /* key: 0x9bba */ 0xffff,
- /* key: 0x9bbb */ 0xea6a,
- /* key: 0x9bbc */ 0xea6b,
- /* key: 0x9bbd */ 0xffff,
- /* key: 0x9bbe */ 0xea6c,
- /* key: 0x9bbf */ 0xea6d,
- /* key: 0x9bc0 */ 0x7241,
- /* key: 0x9bc1 */ 0xea6e,
- /* key: 0x9bc2 */ 0xffff,
- /* key: 0x9bc3 */ 0xffff,
- /* key: 0x9bc4 */ 0xffff,
- /* key: 0x9bc5 */ 0xffff,
- /* key: 0x9bc6 */ 0x7244,
- /* key: 0x9bc7 */ 0xea6f,
- /* key: 0x9bc8 */ 0xea70,
- /* key: 0x9bc9 */ 0x3871,
- /* key: 0x9bca */ 0x7242,
- /* key: 0x9bcb */ 0xffff,
- /* key: 0x9bcc */ 0xffff,
- /* key: 0x9bcd */ 0xffff,
- /* key: 0x9bce */ 0xea71,
- /* key: 0x9bcf */ 0x7245,
- /* key: 0x9bd0 */ 0xea72,
- /* key: 0x9bd1 */ 0x7246,
- /* key: 0x9bd2 */ 0x7247,
- /* key: 0x9bd3 */ 0xffff,
- /* key: 0x9bd4 */ 0x724b,
- /* key: 0x9bd5 */ 0xffff,
- /* key: 0x9bd6 */ 0x3b2a,
- /* key: 0x9bd7 */ 0xea73,
- /* key: 0x9bd8 */ 0xea74,
- /* key: 0x9bd9 */ 0xffff,
- /* key: 0x9bda */ 0xffff,
- /* key: 0x9bdb */ 0x4264,
- /* key: 0x9bdc */ 0xffff,
- /* key: 0x9bdd */ 0xea75,
- /* key: 0x9bde */ 0xffff,
- /* key: 0x9bdf */ 0xea76,
- /* key: 0x9be0 */ 0xffff,
- /* key: 0x9be1 */ 0x724c,
- /* key: 0x9be2 */ 0x7249,
- /* key: 0x9be3 */ 0x7248,
- /* key: 0x9be4 */ 0x724a,
- /* key: 0x9be5 */ 0xea77,
- /* key: 0x9be6 */ 0xffff,
- /* key: 0x9be7 */ 0xea78,
- /* key: 0x9be8 */ 0x375f,
- /* key: 0x9be9 */ 0xffff,
- /* key: 0x9bea */ 0xea79,
- /* key: 0x9beb */ 0xea7a,
- /* key: 0x9bec */ 0xffff,
- /* key: 0x9bed */ 0xffff,
- /* key: 0x9bee */ 0xffff,
- /* key: 0x9bef */ 0xea7b,
- /* key: 0x9bf0 */ 0x7250,
- /* key: 0x9bf1 */ 0x724f,
- /* key: 0x9bf2 */ 0x724e,
- /* key: 0x9bf3 */ 0xea7c,
- /* key: 0x9bf4 */ 0xffff,
- /* key: 0x9bf5 */ 0x3033,
- /* key: 0x9bf6 */ 0xffff,
- /* key: 0x9bf7 */ 0xea7d,
- /* key: 0x9bf8 */ 0xea7e,
- /* key: 0x9bf9 */ 0xeb21,
- /* key: 0x9bfa */ 0xeb22,
- /* key: 0x9bfb */ 0xffff,
- /* key: 0x9bfc */ 0xffff,
- /* key: 0x9bfd */ 0xeb23,
- /* key: 0x9bfe */ 0xffff,
- /* key: 0x9bff */ 0xeb24,
- /* branch: 0x9c0X */ 22112,
- /* branch: 0x9c1X */ 22128,
- /* branch: 0x9c2X */ 22144,
- /* branch: 0x9c3X */ 22160,
- /* branch: 0x9c4X */ 22176,
- /* branch: 0x9c5X */ 22192,
- /* branch: 0x9c6X */ 22208,
- /* branch: 0x9c7X */ 22224,
- /* branch: 0x9c8X */ 0,
- /* branch: 0x9c9X */ 0,
- /* branch: 0x9caX */ 0,
- /* branch: 0x9cbX */ 0,
- /* branch: 0x9ccX */ 0,
- /* branch: 0x9cdX */ 0,
- /* branch: 0x9ceX */ 22240,
- /* branch: 0x9cfX */ 22256,
- /* key: 0x9c00 */ 0xeb25,
- /* key: 0x9c01 */ 0xffff,
- /* key: 0x9c02 */ 0xeb26,
- /* key: 0x9c03 */ 0xffff,
- /* key: 0x9c04 */ 0x725a,
- /* key: 0x9c05 */ 0xffff,
- /* key: 0x9c06 */ 0x7256,
- /* key: 0x9c07 */ 0xffff,
- /* key: 0x9c08 */ 0x7257,
- /* key: 0x9c09 */ 0x7253,
- /* key: 0x9c0a */ 0x7259,
- /* key: 0x9c0b */ 0xeb27,
- /* key: 0x9c0c */ 0x7255,
- /* key: 0x9c0d */ 0x3362,
- /* key: 0x9c0e */ 0xffff,
- /* key: 0x9c0f */ 0xeb28,
- /* key: 0x9c10 */ 0x4f4c,
- /* key: 0x9c11 */ 0xeb29,
- /* key: 0x9c12 */ 0x7258,
- /* key: 0x9c13 */ 0x7254,
- /* key: 0x9c14 */ 0x7252,
- /* key: 0x9c15 */ 0x7251,
- /* key: 0x9c16 */ 0xeb2a,
- /* key: 0x9c17 */ 0xffff,
- /* key: 0x9c18 */ 0xeb2b,
- /* key: 0x9c19 */ 0xeb2c,
- /* key: 0x9c1a */ 0xeb2d,
- /* key: 0x9c1b */ 0x725c,
- /* key: 0x9c1c */ 0xeb2e,
- /* key: 0x9c1d */ 0xffff,
- /* key: 0x9c1e */ 0xeb2f,
- /* key: 0x9c1f */ 0xffff,
- /* key: 0x9c20 */ 0xffff,
- /* key: 0x9c21 */ 0x725f,
- /* key: 0x9c22 */ 0xeb30,
- /* key: 0x9c23 */ 0xeb31,
- /* key: 0x9c24 */ 0x725e,
- /* key: 0x9c25 */ 0x725d,
- /* key: 0x9c26 */ 0xeb32,
- /* key: 0x9c27 */ 0xeb33,
- /* key: 0x9c28 */ 0xeb34,
- /* key: 0x9c29 */ 0xeb35,
- /* key: 0x9c2a */ 0xeb36,
- /* key: 0x9c2b */ 0xffff,
- /* key: 0x9c2c */ 0xffff,
- /* key: 0x9c2d */ 0x4949,
- /* key: 0x9c2e */ 0x725b,
- /* key: 0x9c2f */ 0x3073,
- /* key: 0x9c30 */ 0x7260,
- /* key: 0x9c31 */ 0xeb37,
- /* key: 0x9c32 */ 0x7262,
- /* key: 0x9c33 */ 0xffff,
- /* key: 0x9c34 */ 0xffff,
- /* key: 0x9c35 */ 0xeb38,
- /* key: 0x9c36 */ 0xeb39,
- /* key: 0x9c37 */ 0xeb3a,
- /* key: 0x9c38 */ 0xffff,
- /* key: 0x9c39 */ 0x336f,
- /* key: 0x9c3a */ 0x724d,
- /* key: 0x9c3b */ 0x3137,
- /* key: 0x9c3c */ 0xffff,
- /* key: 0x9c3d */ 0xeb3b,
- /* key: 0x9c3e */ 0x7264,
- /* key: 0x9c3f */ 0xffff,
- /* key: 0x9c40 */ 0xffff,
- /* key: 0x9c41 */ 0xeb3c,
- /* key: 0x9c42 */ 0xffff,
- /* key: 0x9c43 */ 0xeb3d,
- /* key: 0x9c44 */ 0xeb3e,
- /* key: 0x9c45 */ 0xeb3f,
- /* key: 0x9c46 */ 0x7263,
- /* key: 0x9c47 */ 0x7261,
- /* key: 0x9c48 */ 0x432d,
- /* key: 0x9c49 */ 0xeb40,
- /* key: 0x9c4a */ 0xeb41,
- /* key: 0x9c4b */ 0xffff,
- /* key: 0x9c4c */ 0xffff,
- /* key: 0x9c4d */ 0xffff,
- /* key: 0x9c4e */ 0xeb42,
- /* key: 0x9c4f */ 0xeb43,
- /* key: 0x9c50 */ 0xeb44,
- /* key: 0x9c51 */ 0xffff,
- /* key: 0x9c52 */ 0x4b70,
- /* key: 0x9c53 */ 0xeb45,
- /* key: 0x9c54 */ 0xeb46,
- /* key: 0x9c55 */ 0xffff,
- /* key: 0x9c56 */ 0xeb47,
- /* key: 0x9c57 */ 0x4e5a,
- /* key: 0x9c58 */ 0xeb48,
- /* key: 0x9c59 */ 0xffff,
- /* key: 0x9c5a */ 0x7265,
- /* key: 0x9c5b */ 0xeb49,
- /* key: 0x9c5c */ 0xeb50,
- /* key: 0x9c5d */ 0xeb4a,
- /* key: 0x9c5e */ 0xeb4b,
- /* key: 0x9c5f */ 0xeb4c,
- /* key: 0x9c60 */ 0x7266,
- /* key: 0x9c61 */ 0xffff,
- /* key: 0x9c62 */ 0xffff,
- /* key: 0x9c63 */ 0xeb4d,
- /* key: 0x9c64 */ 0xffff,
- /* key: 0x9c65 */ 0xffff,
- /* key: 0x9c66 */ 0xffff,
- /* key: 0x9c67 */ 0x7267,
- /* key: 0x9c68 */ 0xeb52,
- /* key: 0x9c69 */ 0xeb4e,
- /* key: 0x9c6a */ 0xeb4f,
- /* key: 0x9c6b */ 0xeb51,
- /* key: 0x9c6c */ 0xffff,
- /* key: 0x9c6d */ 0xffff,
- /* key: 0x9c6e */ 0xeb53,
- /* key: 0x9c6f */ 0xffff,
- /* key: 0x9c70 */ 0xeb54,
- /* key: 0x9c71 */ 0xffff,
- /* key: 0x9c72 */ 0xeb55,
- /* key: 0x9c73 */ 0xffff,
- /* key: 0x9c74 */ 0xffff,
- /* key: 0x9c75 */ 0xeb56,
- /* key: 0x9c76 */ 0x7268,
- /* key: 0x9c77 */ 0xeb57,
- /* key: 0x9c78 */ 0x7269,
- /* key: 0x9c79 */ 0xffff,
- /* key: 0x9c7a */ 0xffff,
- /* key: 0x9c7b */ 0xeb58,
- /* key: 0x9c7c */ 0xffff,
- /* key: 0x9c7d */ 0xffff,
- /* key: 0x9c7e */ 0xffff,
- /* key: 0x9c7f */ 0xffff,
- /* key: 0x9ce0 */ 0xffff,
- /* key: 0x9ce1 */ 0xffff,
- /* key: 0x9ce2 */ 0xffff,
- /* key: 0x9ce3 */ 0xffff,
- /* key: 0x9ce4 */ 0xffff,
- /* key: 0x9ce5 */ 0x443b,
- /* key: 0x9ce6 */ 0xeb59,
- /* key: 0x9ce7 */ 0x726a,
- /* key: 0x9ce8 */ 0xffff,
- /* key: 0x9ce9 */ 0x4837,
- /* key: 0x9cea */ 0xffff,
- /* key: 0x9ceb */ 0x726f,
- /* key: 0x9cec */ 0x726b,
- /* key: 0x9ced */ 0xffff,
- /* key: 0x9cee */ 0xffff,
- /* key: 0x9cef */ 0xffff,
- /* key: 0x9cf0 */ 0x726c,
- /* key: 0x9cf1 */ 0xffff,
- /* key: 0x9cf2 */ 0xeb5a,
- /* key: 0x9cf3 */ 0x4b31,
- /* key: 0x9cf4 */ 0x4c44,
- /* key: 0x9cf5 */ 0xffff,
- /* key: 0x9cf6 */ 0x4650,
- /* key: 0x9cf7 */ 0xeb5b,
- /* key: 0x9cf8 */ 0xffff,
- /* key: 0x9cf9 */ 0xeb5c,
- /* key: 0x9cfa */ 0xffff,
- /* key: 0x9cfb */ 0xffff,
- /* key: 0x9cfc */ 0xffff,
- /* key: 0x9cfd */ 0xffff,
- /* key: 0x9cfe */ 0xffff,
- /* key: 0x9cff */ 0xffff,
- /* branch: 0x9d0X */ 22288,
- /* branch: 0x9d1X */ 22304,
- /* branch: 0x9d2X */ 22320,
- /* branch: 0x9d3X */ 22336,
- /* branch: 0x9d4X */ 22352,
- /* branch: 0x9d5X */ 22368,
- /* branch: 0x9d6X */ 22384,
- /* branch: 0x9d7X */ 22400,
- /* branch: 0x9d8X */ 22416,
- /* branch: 0x9d9X */ 22432,
- /* branch: 0x9daX */ 22448,
- /* branch: 0x9dbX */ 22464,
- /* branch: 0x9dcX */ 22480,
- /* branch: 0x9ddX */ 22496,
- /* branch: 0x9deX */ 22512,
- /* branch: 0x9dfX */ 22528,
- /* key: 0x9d00 */ 0xffff,
- /* key: 0x9d01 */ 0xffff,
- /* key: 0x9d02 */ 0xeb5e,
- /* key: 0x9d03 */ 0x7270,
- /* key: 0x9d04 */ 0xffff,
- /* key: 0x9d05 */ 0xffff,
- /* key: 0x9d06 */ 0x7271,
- /* key: 0x9d07 */ 0x463e,
- /* key: 0x9d08 */ 0x726e,
- /* key: 0x9d09 */ 0x726d,
- /* key: 0x9d0a */ 0xffff,
- /* key: 0x9d0b */ 0xeb5d,
- /* key: 0x9d0c */ 0xffff,
- /* key: 0x9d0d */ 0xffff,
- /* key: 0x9d0e */ 0x322a,
- /* key: 0x9d0f */ 0xffff,
- /* key: 0x9d10 */ 0xffff,
- /* key: 0x9d11 */ 0xeb5f,
- /* key: 0x9d12 */ 0x7279,
- /* key: 0x9d13 */ 0xffff,
- /* key: 0x9d14 */ 0xffff,
- /* key: 0x9d15 */ 0x7278,
- /* key: 0x9d16 */ 0xffff,
- /* key: 0x9d17 */ 0xeb60,
- /* key: 0x9d18 */ 0xeb61,
- /* key: 0x9d19 */ 0xffff,
- /* key: 0x9d1a */ 0xffff,
- /* key: 0x9d1b */ 0x3175,
- /* key: 0x9d1c */ 0xeb62,
- /* key: 0x9d1d */ 0xeb63,
- /* key: 0x9d1e */ 0xeb64,
- /* key: 0x9d1f */ 0x7276,
- /* key: 0x9d20 */ 0xffff,
- /* key: 0x9d21 */ 0xffff,
- /* key: 0x9d22 */ 0xffff,
- /* key: 0x9d23 */ 0x7275,
- /* key: 0x9d24 */ 0xffff,
- /* key: 0x9d25 */ 0xffff,
- /* key: 0x9d26 */ 0x7273,
- /* key: 0x9d27 */ 0xffff,
- /* key: 0x9d28 */ 0x337b,
- /* key: 0x9d29 */ 0xffff,
- /* key: 0x9d2a */ 0x7272,
- /* key: 0x9d2b */ 0x3c32,
- /* key: 0x9d2c */ 0x3229,
- /* key: 0x9d2d */ 0xffff,
- /* key: 0x9d2e */ 0xffff,
- /* key: 0x9d2f */ 0xeb65,
- /* key: 0x9d30 */ 0xeb66,
- /* key: 0x9d31 */ 0xffff,
- /* key: 0x9d32 */ 0xeb67,
- /* key: 0x9d33 */ 0xeb68,
- /* key: 0x9d34 */ 0xeb69,
- /* key: 0x9d35 */ 0xffff,
- /* key: 0x9d36 */ 0xffff,
- /* key: 0x9d37 */ 0xffff,
- /* key: 0x9d38 */ 0xffff,
- /* key: 0x9d39 */ 0xffff,
- /* key: 0x9d3a */ 0xeb6a,
- /* key: 0x9d3b */ 0x3963,
- /* key: 0x9d3c */ 0xeb6b,
- /* key: 0x9d3d */ 0xeb6d,
- /* key: 0x9d3e */ 0x727c,
- /* key: 0x9d3f */ 0x727b,
- /* key: 0x9d40 */ 0xffff,
- /* key: 0x9d41 */ 0x727a,
- /* key: 0x9d42 */ 0xeb6e,
- /* key: 0x9d43 */ 0xeb6f,
- /* key: 0x9d44 */ 0x7277,
- /* key: 0x9d45 */ 0xeb6c,
- /* key: 0x9d46 */ 0x727d,
- /* key: 0x9d47 */ 0xeb70,
- /* key: 0x9d48 */ 0x727e,
- /* key: 0x9d49 */ 0xffff,
- /* key: 0x9d4a */ 0xeb71,
- /* key: 0x9d4b */ 0xffff,
- /* key: 0x9d4c */ 0xffff,
- /* key: 0x9d4d */ 0xffff,
- /* key: 0x9d4e */ 0xffff,
- /* key: 0x9d4f */ 0xffff,
- /* key: 0x9d50 */ 0x7325,
- /* key: 0x9d51 */ 0x7324,
- /* key: 0x9d52 */ 0xffff,
- /* key: 0x9d53 */ 0xeb72,
- /* key: 0x9d54 */ 0xeb73,
- /* key: 0x9d55 */ 0xffff,
- /* key: 0x9d56 */ 0xffff,
- /* key: 0x9d57 */ 0xffff,
- /* key: 0x9d58 */ 0xffff,
- /* key: 0x9d59 */ 0x7326,
- /* key: 0x9d5a */ 0xffff,
- /* key: 0x9d5b */ 0xffff,
- /* key: 0x9d5c */ 0x312d,
- /* key: 0x9d5d */ 0x7321,
- /* key: 0x9d5e */ 0x7322,
- /* key: 0x9d5f */ 0xeb74,
- /* key: 0x9d60 */ 0x3974,
- /* key: 0x9d61 */ 0x4c39,
- /* key: 0x9d62 */ 0xeb76,
- /* key: 0x9d63 */ 0xeb75,
- /* key: 0x9d64 */ 0x7323,
- /* key: 0x9d65 */ 0xeb77,
- /* key: 0x9d66 */ 0xffff,
- /* key: 0x9d67 */ 0xffff,
- /* key: 0x9d68 */ 0xffff,
- /* key: 0x9d69 */ 0xeb78,
- /* key: 0x9d6a */ 0xeb79,
- /* key: 0x9d6b */ 0xeb7a,
- /* key: 0x9d6c */ 0x4b32,
- /* key: 0x9d6d */ 0xffff,
- /* key: 0x9d6e */ 0xffff,
- /* key: 0x9d6f */ 0x732b,
- /* key: 0x9d70 */ 0xeb7b,
- /* key: 0x9d71 */ 0xffff,
- /* key: 0x9d72 */ 0x7327,
- /* key: 0x9d73 */ 0xffff,
- /* key: 0x9d74 */ 0xffff,
- /* key: 0x9d75 */ 0xffff,
- /* key: 0x9d76 */ 0xeb7c,
- /* key: 0x9d77 */ 0xeb7d,
- /* key: 0x9d78 */ 0xffff,
- /* key: 0x9d79 */ 0xffff,
- /* key: 0x9d7a */ 0x732c,
- /* key: 0x9d7b */ 0xeb7e,
- /* key: 0x9d7c */ 0xec21,
- /* key: 0x9d7d */ 0xffff,
- /* key: 0x9d7e */ 0xec22,
- /* key: 0x9d7f */ 0xffff,
- /* key: 0x9d80 */ 0xffff,
- /* key: 0x9d81 */ 0xffff,
- /* key: 0x9d82 */ 0xffff,
- /* key: 0x9d83 */ 0xec23,
- /* key: 0x9d84 */ 0xec24,
- /* key: 0x9d85 */ 0xffff,
- /* key: 0x9d86 */ 0xec25,
- /* key: 0x9d87 */ 0x7329,
- /* key: 0x9d88 */ 0xffff,
- /* key: 0x9d89 */ 0x7328,
- /* key: 0x9d8a */ 0xec26,
- /* key: 0x9d8b */ 0xffff,
- /* key: 0x9d8c */ 0xffff,
- /* key: 0x9d8d */ 0xec27,
- /* key: 0x9d8e */ 0xec28,
- /* key: 0x9d8f */ 0x375c,
- /* key: 0x9d90 */ 0xffff,
- /* key: 0x9d91 */ 0xffff,
- /* key: 0x9d92 */ 0xec29,
- /* key: 0x9d93 */ 0xec2a,
- /* key: 0x9d94 */ 0xffff,
- /* key: 0x9d95 */ 0xec2b,
- /* key: 0x9d96 */ 0xec2c,
- /* key: 0x9d97 */ 0xec2d,
- /* key: 0x9d98 */ 0xec2e,
- /* key: 0x9d99 */ 0xffff,
- /* key: 0x9d9a */ 0x732d,
- /* key: 0x9d9b */ 0xffff,
- /* key: 0x9d9c */ 0xffff,
- /* key: 0x9d9d */ 0xffff,
- /* key: 0x9d9e */ 0xffff,
- /* key: 0x9d9f */ 0xffff,
- /* key: 0x9da0 */ 0xffff,
- /* key: 0x9da1 */ 0xec2f,
- /* key: 0x9da2 */ 0xffff,
- /* key: 0x9da3 */ 0xffff,
- /* key: 0x9da4 */ 0x732e,
- /* key: 0x9da5 */ 0xffff,
- /* key: 0x9da6 */ 0xffff,
- /* key: 0x9da7 */ 0xffff,
- /* key: 0x9da8 */ 0xffff,
- /* key: 0x9da9 */ 0x732f,
- /* key: 0x9daa */ 0xec30,
- /* key: 0x9dab */ 0x732a,
- /* key: 0x9dac */ 0xec31,
- /* key: 0x9dad */ 0xffff,
- /* key: 0x9dae */ 0xec32,
- /* key: 0x9daf */ 0x7274,
- /* key: 0x9db0 */ 0xffff,
- /* key: 0x9db1 */ 0xec33,
- /* key: 0x9db2 */ 0x7330,
- /* key: 0x9db3 */ 0xffff,
- /* key: 0x9db4 */ 0x4461,
- /* key: 0x9db5 */ 0xec34,
- /* key: 0x9db6 */ 0xffff,
- /* key: 0x9db7 */ 0xffff,
- /* key: 0x9db8 */ 0x7334,
- /* key: 0x9db9 */ 0xec35,
- /* key: 0x9dba */ 0x7335,
- /* key: 0x9dbb */ 0x7333,
- /* key: 0x9dbc */ 0xec36,
- /* key: 0x9dbd */ 0xffff,
- /* key: 0x9dbe */ 0xffff,
- /* key: 0x9dbf */ 0xec37,
- /* key: 0x9dc0 */ 0xffff,
- /* key: 0x9dc1 */ 0x7332,
- /* key: 0x9dc2 */ 0x7338,
- /* key: 0x9dc3 */ 0xec38,
- /* key: 0x9dc4 */ 0x7331,
- /* key: 0x9dc5 */ 0xffff,
- /* key: 0x9dc6 */ 0x7336,
- /* key: 0x9dc7 */ 0xec39,
- /* key: 0x9dc8 */ 0xffff,
- /* key: 0x9dc9 */ 0xec3a,
- /* key: 0x9dca */ 0xec3b,
- /* key: 0x9dcb */ 0xffff,
- /* key: 0x9dcc */ 0xffff,
- /* key: 0x9dcd */ 0xffff,
- /* key: 0x9dce */ 0xffff,
- /* key: 0x9dcf */ 0x7337,
- /* key: 0x9dd0 */ 0xffff,
- /* key: 0x9dd1 */ 0xffff,
- /* key: 0x9dd2 */ 0xffff,
- /* key: 0x9dd3 */ 0x733a,
- /* key: 0x9dd4 */ 0xec3c,
- /* key: 0x9dd5 */ 0xec3d,
- /* key: 0x9dd6 */ 0xec3e,
- /* key: 0x9dd7 */ 0xec3f,
- /* key: 0x9dd8 */ 0xffff,
- /* key: 0x9dd9 */ 0x7339,
- /* key: 0x9dda */ 0xec40,
- /* key: 0x9ddb */ 0xffff,
- /* key: 0x9ddc */ 0xffff,
- /* key: 0x9ddd */ 0xffff,
- /* key: 0x9dde */ 0xec41,
- /* key: 0x9ddf */ 0xec42,
- /* key: 0x9de0 */ 0xec43,
- /* key: 0x9de1 */ 0xffff,
- /* key: 0x9de2 */ 0xffff,
- /* key: 0x9de3 */ 0xffff,
- /* key: 0x9de4 */ 0xffff,
- /* key: 0x9de5 */ 0xec44,
- /* key: 0x9de6 */ 0x733c,
- /* key: 0x9de7 */ 0xec45,
- /* key: 0x9de8 */ 0xffff,
- /* key: 0x9de9 */ 0xec46,
- /* key: 0x9dea */ 0xffff,
- /* key: 0x9deb */ 0xec47,
- /* key: 0x9dec */ 0xffff,
- /* key: 0x9ded */ 0x733d,
- /* key: 0x9dee */ 0xec48,
- /* key: 0x9def */ 0x733e,
- /* key: 0x9df0 */ 0xec49,
- /* key: 0x9df1 */ 0xffff,
- /* key: 0x9df2 */ 0x4f49,
- /* key: 0x9df3 */ 0xec4a,
- /* key: 0x9df4 */ 0xec4b,
- /* key: 0x9df5 */ 0xffff,
- /* key: 0x9df6 */ 0xffff,
- /* key: 0x9df7 */ 0xffff,
- /* key: 0x9df8 */ 0x733b,
- /* key: 0x9df9 */ 0x426b,
- /* key: 0x9dfa */ 0x3a6d,
- /* key: 0x9dfb */ 0xffff,
- /* key: 0x9dfc */ 0xffff,
- /* key: 0x9dfd */ 0x733f,
- /* key: 0x9dfe */ 0xec4c,
- /* key: 0x9dff */ 0xffff,
- /* branch: 0x9e0X */ 22560,
- /* branch: 0x9e1X */ 22576,
- /* branch: 0x9e2X */ 0,
- /* branch: 0x9e3X */ 0,
- /* branch: 0x9e4X */ 0,
- /* branch: 0x9e5X */ 0,
- /* branch: 0x9e6X */ 0,
- /* branch: 0x9e7X */ 22592,
- /* branch: 0x9e8X */ 22608,
- /* branch: 0x9e9X */ 22624,
- /* branch: 0x9eaX */ 22640,
- /* branch: 0x9ebX */ 22656,
- /* branch: 0x9ecX */ 22672,
- /* branch: 0x9edX */ 22688,
- /* branch: 0x9eeX */ 22704,
- /* branch: 0x9efX */ 22720,
- /* key: 0x9e00 */ 0xffff,
- /* key: 0x9e01 */ 0xffff,
- /* key: 0x9e02 */ 0xec4e,
- /* key: 0x9e03 */ 0xffff,
- /* key: 0x9e04 */ 0xffff,
- /* key: 0x9e05 */ 0xffff,
- /* key: 0x9e06 */ 0xffff,
- /* key: 0x9e07 */ 0xec4f,
- /* key: 0x9e08 */ 0xffff,
- /* key: 0x9e09 */ 0xffff,
- /* key: 0x9e0a */ 0xec4d,
- /* key: 0x9e0b */ 0xffff,
- /* key: 0x9e0c */ 0xffff,
- /* key: 0x9e0d */ 0xffff,
- /* key: 0x9e0e */ 0xec50,
- /* key: 0x9e0f */ 0xffff,
- /* key: 0x9e10 */ 0xec51,
- /* key: 0x9e11 */ 0xec52,
- /* key: 0x9e12 */ 0xec53,
- /* key: 0x9e13 */ 0xffff,
- /* key: 0x9e14 */ 0xffff,
- /* key: 0x9e15 */ 0xec54,
- /* key: 0x9e16 */ 0xec55,
- /* key: 0x9e17 */ 0xffff,
- /* key: 0x9e18 */ 0xffff,
- /* key: 0x9e19 */ 0xec56,
- /* key: 0x9e1a */ 0x7340,
- /* key: 0x9e1b */ 0x7341,
- /* key: 0x9e1c */ 0xec57,
- /* key: 0x9e1d */ 0xec58,
- /* key: 0x9e1e */ 0x7342,
- /* key: 0x9e1f */ 0xffff,
- /* key: 0x9e70 */ 0xffff,
- /* key: 0x9e71 */ 0xffff,
- /* key: 0x9e72 */ 0xffff,
- /* key: 0x9e73 */ 0xffff,
- /* key: 0x9e74 */ 0xffff,
- /* key: 0x9e75 */ 0x7343,
- /* key: 0x9e76 */ 0xffff,
- /* key: 0x9e77 */ 0xffff,
- /* key: 0x9e78 */ 0x3834,
- /* key: 0x9e79 */ 0x7344,
- /* key: 0x9e7a */ 0xec59,
- /* key: 0x9e7b */ 0xec5a,
- /* key: 0x9e7c */ 0xec5b,
- /* key: 0x9e7d */ 0x7345,
- /* key: 0x9e7e */ 0xffff,
- /* key: 0x9e7f */ 0x3c2f,
- /* key: 0x9e80 */ 0xec5c,
- /* key: 0x9e81 */ 0x7346,
- /* key: 0x9e82 */ 0xec5d,
- /* key: 0x9e83 */ 0xec5e,
- /* key: 0x9e84 */ 0xec5f,
- /* key: 0x9e85 */ 0xec60,
- /* key: 0x9e86 */ 0xffff,
- /* key: 0x9e87 */ 0xec61,
- /* key: 0x9e88 */ 0x7347,
- /* key: 0x9e89 */ 0xffff,
- /* key: 0x9e8a */ 0xffff,
- /* key: 0x9e8b */ 0x7348,
- /* key: 0x9e8c */ 0x7349,
- /* key: 0x9e8d */ 0xffff,
- /* key: 0x9e8e */ 0xec62,
- /* key: 0x9e8f */ 0xec63,
- /* key: 0x9e90 */ 0xffff,
- /* key: 0x9e91 */ 0x734c,
- /* key: 0x9e92 */ 0x734a,
- /* key: 0x9e93 */ 0x4f3c,
- /* key: 0x9e94 */ 0xffff,
- /* key: 0x9e95 */ 0x734b,
- /* key: 0x9e96 */ 0xec64,
- /* key: 0x9e97 */ 0x4e6f,
- /* key: 0x9e98 */ 0xec65,
- /* key: 0x9e99 */ 0xffff,
- /* key: 0x9e9a */ 0xffff,
- /* key: 0x9e9b */ 0xec66,
- /* key: 0x9e9c */ 0xffff,
- /* key: 0x9e9d */ 0x734d,
- /* key: 0x9e9e */ 0xec67,
- /* key: 0x9e9f */ 0x4e5b,
- /* key: 0x9ea0 */ 0xffff,
- /* key: 0x9ea1 */ 0xffff,
- /* key: 0x9ea2 */ 0xffff,
- /* key: 0x9ea3 */ 0xffff,
- /* key: 0x9ea4 */ 0xec68,
- /* key: 0x9ea5 */ 0x734e,
- /* key: 0x9ea6 */ 0x477e,
- /* key: 0x9ea7 */ 0xffff,
- /* key: 0x9ea8 */ 0xec69,
- /* key: 0x9ea9 */ 0x734f,
- /* key: 0x9eaa */ 0x7351,
- /* key: 0x9eab */ 0xffff,
- /* key: 0x9eac */ 0xec6a,
- /* key: 0x9ead */ 0x7352,
- /* key: 0x9eae */ 0xec6b,
- /* key: 0x9eaf */ 0xec6c,
- /* key: 0x9eb0 */ 0xec6d,
- /* key: 0x9eb1 */ 0xffff,
- /* key: 0x9eb2 */ 0xffff,
- /* key: 0x9eb3 */ 0xec6e,
- /* key: 0x9eb4 */ 0xec6f,
- /* key: 0x9eb5 */ 0xec70,
- /* key: 0x9eb6 */ 0xffff,
- /* key: 0x9eb7 */ 0xffff,
- /* key: 0x9eb8 */ 0x7350,
- /* key: 0x9eb9 */ 0x396d,
- /* key: 0x9eba */ 0x4c4d,
- /* key: 0x9ebb */ 0x4b63,
- /* key: 0x9ebc */ 0x5677,
- /* key: 0x9ebd */ 0xffff,
- /* key: 0x9ebe */ 0x5d60,
- /* key: 0x9ebf */ 0x4b7b,
- /* key: 0x9ec0 */ 0xffff,
- /* key: 0x9ec1 */ 0xffff,
- /* key: 0x9ec2 */ 0xffff,
- /* key: 0x9ec3 */ 0xffff,
- /* key: 0x9ec4 */ 0x322b,
- /* key: 0x9ec5 */ 0xffff,
- /* key: 0x9ec6 */ 0xec71,
- /* key: 0x9ec7 */ 0xffff,
- /* key: 0x9ec8 */ 0xec72,
- /* key: 0x9ec9 */ 0xffff,
- /* key: 0x9eca */ 0xffff,
- /* key: 0x9ecb */ 0xec73,
- /* key: 0x9ecc */ 0x7354,
- /* key: 0x9ecd */ 0x3550,
- /* key: 0x9ece */ 0x7355,
- /* key: 0x9ecf */ 0x7356,
- /* key: 0x9ed0 */ 0x7357,
- /* key: 0x9ed1 */ 0xffff,
- /* key: 0x9ed2 */ 0x3975,
- /* key: 0x9ed3 */ 0xffff,
- /* key: 0x9ed4 */ 0x7358,
- /* key: 0x9ed5 */ 0xec74,
- /* key: 0x9ed6 */ 0xffff,
- /* key: 0x9ed7 */ 0xffff,
- /* key: 0x9ed8 */ 0x6054,
- /* key: 0x9ed9 */ 0x4c5b,
- /* key: 0x9eda */ 0xffff,
- /* key: 0x9edb */ 0x4263,
- /* key: 0x9edc */ 0x7359,
- /* key: 0x9edd */ 0x735b,
- /* key: 0x9ede */ 0x735a,
- /* key: 0x9edf */ 0xec75,
- /* key: 0x9ee0 */ 0x735c,
- /* key: 0x9ee1 */ 0xffff,
- /* key: 0x9ee2 */ 0xffff,
- /* key: 0x9ee3 */ 0xffff,
- /* key: 0x9ee4 */ 0xec76,
- /* key: 0x9ee5 */ 0x735d,
- /* key: 0x9ee6 */ 0xffff,
- /* key: 0x9ee7 */ 0xec77,
- /* key: 0x9ee8 */ 0x735e,
- /* key: 0x9ee9 */ 0xffff,
- /* key: 0x9eea */ 0xffff,
- /* key: 0x9eeb */ 0xffff,
- /* key: 0x9eec */ 0xec78,
- /* key: 0x9eed */ 0xec79,
- /* key: 0x9eee */ 0xec7a,
- /* key: 0x9eef */ 0x735f,
- /* key: 0x9ef0 */ 0xec7b,
- /* key: 0x9ef1 */ 0xec7c,
- /* key: 0x9ef2 */ 0xec7d,
- /* key: 0x9ef3 */ 0xffff,
- /* key: 0x9ef4 */ 0x7360,
- /* key: 0x9ef5 */ 0xec7e,
- /* key: 0x9ef6 */ 0x7361,
- /* key: 0x9ef7 */ 0x7362,
- /* key: 0x9ef8 */ 0xed21,
- /* key: 0x9ef9 */ 0x7363,
- /* key: 0x9efa */ 0xffff,
- /* key: 0x9efb */ 0x7364,
- /* key: 0x9efc */ 0x7365,
- /* key: 0x9efd */ 0x7366,
- /* key: 0x9efe */ 0xffff,
- /* key: 0x9eff */ 0xed22,
- /* branch: 0x9f0X */ 22752,
- /* branch: 0x9f1X */ 22768,
- /* branch: 0x9f2X */ 22784,
- /* branch: 0x9f3X */ 22800,
- /* branch: 0x9f4X */ 22816,
- /* branch: 0x9f5X */ 22832,
- /* branch: 0x9f6X */ 22848,
- /* branch: 0x9f7X */ 22864,
- /* branch: 0x9f8X */ 22880,
- /* branch: 0x9f9X */ 22896,
- /* branch: 0x9faX */ 22912,
- /* branch: 0x9fbX */ 0,
- /* branch: 0x9fcX */ 0,
- /* branch: 0x9fdX */ 0,
- /* branch: 0x9feX */ 0,
- /* branch: 0x9ffX */ 0,
- /* key: 0x9f00 */ 0xffff,
- /* key: 0x9f01 */ 0xffff,
- /* key: 0x9f02 */ 0xed23,
- /* key: 0x9f03 */ 0xed24,
- /* key: 0x9f04 */ 0xffff,
- /* key: 0x9f05 */ 0xffff,
- /* key: 0x9f06 */ 0xffff,
- /* key: 0x9f07 */ 0x7367,
- /* key: 0x9f08 */ 0x7368,
- /* key: 0x9f09 */ 0xed25,
- /* key: 0x9f0a */ 0xffff,
- /* key: 0x9f0b */ 0xffff,
- /* key: 0x9f0c */ 0xffff,
- /* key: 0x9f0d */ 0xffff,
- /* key: 0x9f0e */ 0x4524,
- /* key: 0x9f0f */ 0xed26,
- /* key: 0x9f10 */ 0xed27,
- /* key: 0x9f11 */ 0xed28,
- /* key: 0x9f12 */ 0xed29,
- /* key: 0x9f13 */ 0x385d,
- /* key: 0x9f14 */ 0xed2a,
- /* key: 0x9f15 */ 0x736a,
- /* key: 0x9f16 */ 0xed2b,
- /* key: 0x9f17 */ 0xed2c,
- /* key: 0x9f18 */ 0xffff,
- /* key: 0x9f19 */ 0xed2d,
- /* key: 0x9f1a */ 0xed2e,
- /* key: 0x9f1b */ 0xed2f,
- /* key: 0x9f1c */ 0xffff,
- /* key: 0x9f1d */ 0xffff,
- /* key: 0x9f1e */ 0xffff,
- /* key: 0x9f1f */ 0xed30,
- /* key: 0x9f20 */ 0x414d,
- /* key: 0x9f21 */ 0x736b,
- /* key: 0x9f22 */ 0xed31,
- /* key: 0x9f23 */ 0xffff,
- /* key: 0x9f24 */ 0xffff,
- /* key: 0x9f25 */ 0xffff,
- /* key: 0x9f26 */ 0xed32,
- /* key: 0x9f27 */ 0xffff,
- /* key: 0x9f28 */ 0xffff,
- /* key: 0x9f29 */ 0xffff,
- /* key: 0x9f2a */ 0xed33,
- /* key: 0x9f2b */ 0xed34,
- /* key: 0x9f2c */ 0x736c,
- /* key: 0x9f2d */ 0xffff,
- /* key: 0x9f2e */ 0xffff,
- /* key: 0x9f2f */ 0xed35,
- /* key: 0x9f30 */ 0xffff,
- /* key: 0x9f31 */ 0xed36,
- /* key: 0x9f32 */ 0xed37,
- /* key: 0x9f33 */ 0xffff,
- /* key: 0x9f34 */ 0xed38,
- /* key: 0x9f35 */ 0xffff,
- /* key: 0x9f36 */ 0xffff,
- /* key: 0x9f37 */ 0xed39,
- /* key: 0x9f38 */ 0xffff,
- /* key: 0x9f39 */ 0xed3a,
- /* key: 0x9f3a */ 0xed3b,
- /* key: 0x9f3b */ 0x4921,
- /* key: 0x9f3c */ 0xed3c,
- /* key: 0x9f3d */ 0xed3d,
- /* key: 0x9f3e */ 0x736d,
- /* key: 0x9f3f */ 0xed3e,
- /* key: 0x9f40 */ 0xffff,
- /* key: 0x9f41 */ 0xed3f,
- /* key: 0x9f42 */ 0xffff,
- /* key: 0x9f43 */ 0xed40,
- /* key: 0x9f44 */ 0xed41,
- /* key: 0x9f45 */ 0xed42,
- /* key: 0x9f46 */ 0xed43,
- /* key: 0x9f47 */ 0xed44,
- /* key: 0x9f48 */ 0xffff,
- /* key: 0x9f49 */ 0xffff,
- /* key: 0x9f4a */ 0x736e,
- /* key: 0x9f4b */ 0x6337,
- /* key: 0x9f4c */ 0xffff,
- /* key: 0x9f4d */ 0xffff,
- /* key: 0x9f4e */ 0x6c5a,
- /* key: 0x9f4f */ 0x706d,
- /* key: 0x9f50 */ 0xffff,
- /* key: 0x9f51 */ 0xffff,
- /* key: 0x9f52 */ 0x736f,
- /* key: 0x9f53 */ 0xed45,
- /* key: 0x9f54 */ 0x7370,
- /* key: 0x9f55 */ 0xed46,
- /* key: 0x9f56 */ 0xed47,
- /* key: 0x9f57 */ 0xed48,
- /* key: 0x9f58 */ 0xed49,
- /* key: 0x9f59 */ 0xffff,
- /* key: 0x9f5a */ 0xed4a,
- /* key: 0x9f5b */ 0xffff,
- /* key: 0x9f5c */ 0xffff,
- /* key: 0x9f5d */ 0xed4b,
- /* key: 0x9f5e */ 0xed4c,
- /* key: 0x9f5f */ 0x7372,
- /* key: 0x9f60 */ 0x7373,
- /* key: 0x9f61 */ 0x7374,
- /* key: 0x9f62 */ 0x4e70,
- /* key: 0x9f63 */ 0x7371,
- /* key: 0x9f64 */ 0xffff,
- /* key: 0x9f65 */ 0xffff,
- /* key: 0x9f66 */ 0x7375,
- /* key: 0x9f67 */ 0x7376,
- /* key: 0x9f68 */ 0xed4d,
- /* key: 0x9f69 */ 0xed4e,
- /* key: 0x9f6a */ 0x7378,
- /* key: 0x9f6b */ 0xffff,
- /* key: 0x9f6c */ 0x7377,
- /* key: 0x9f6d */ 0xed4f,
- /* key: 0x9f6e */ 0xed50,
- /* key: 0x9f6f */ 0xed51,
- /* key: 0x9f70 */ 0xed52,
- /* key: 0x9f71 */ 0xed53,
- /* key: 0x9f72 */ 0x737a,
- /* key: 0x9f73 */ 0xed54,
- /* key: 0x9f74 */ 0xffff,
- /* key: 0x9f75 */ 0xed55,
- /* key: 0x9f76 */ 0x737b,
- /* key: 0x9f77 */ 0x7379,
- /* key: 0x9f78 */ 0xffff,
- /* key: 0x9f79 */ 0xffff,
- /* key: 0x9f7a */ 0xed56,
- /* key: 0x9f7b */ 0xffff,
- /* key: 0x9f7c */ 0xffff,
- /* key: 0x9f7d */ 0xed57,
- /* key: 0x9f7e */ 0xffff,
- /* key: 0x9f7f */ 0xffff,
- /* key: 0x9f80 */ 0xffff,
- /* key: 0x9f81 */ 0xffff,
- /* key: 0x9f82 */ 0xffff,
- /* key: 0x9f83 */ 0xffff,
- /* key: 0x9f84 */ 0xffff,
- /* key: 0x9f85 */ 0xffff,
- /* key: 0x9f86 */ 0xffff,
- /* key: 0x9f87 */ 0xffff,
- /* key: 0x9f88 */ 0xffff,
- /* key: 0x9f89 */ 0xffff,
- /* key: 0x9f8a */ 0xffff,
- /* key: 0x9f8b */ 0xffff,
- /* key: 0x9f8c */ 0xffff,
- /* key: 0x9f8d */ 0x4e36,
- /* key: 0x9f8e */ 0xffff,
- /* key: 0x9f8f */ 0xed58,
- /* key: 0x9f90 */ 0xed59,
- /* key: 0x9f91 */ 0xed5a,
- /* key: 0x9f92 */ 0xed5b,
- /* key: 0x9f93 */ 0xffff,
- /* key: 0x9f94 */ 0xed5c,
- /* key: 0x9f95 */ 0x737c,
- /* key: 0x9f96 */ 0xed5d,
- /* key: 0x9f97 */ 0xed5e,
- /* key: 0x9f98 */ 0xffff,
- /* key: 0x9f99 */ 0xffff,
- /* key: 0x9f9a */ 0xffff,
- /* key: 0x9f9b */ 0xffff,
- /* key: 0x9f9c */ 0x737d,
- /* key: 0x9f9d */ 0x6354,
- /* key: 0x9f9e */ 0xed5f,
- /* key: 0x9f9f */ 0xffff,
- /* key: 0x9fa0 */ 0x737e,
- /* key: 0x9fa1 */ 0xed60,
- /* key: 0x9fa2 */ 0xed61,
- /* key: 0x9fa3 */ 0xed62,
- /* key: 0x9fa4 */ 0xffff,
- /* key: 0x9fa5 */ 0xed63,
- /* key: 0x9fa6 */ 0xffff,
- /* key: 0x9fa7 */ 0xffff,
- /* key: 0x9fa8 */ 0xffff,
- /* key: 0x9fa9 */ 0xffff,
- /* key: 0x9faa */ 0xffff,
- /* key: 0x9fab */ 0xffff,
- /* key: 0x9fac */ 0xffff,
- /* key: 0x9fad */ 0xffff,
- /* key: 0x9fae */ 0xffff,
- /* key: 0x9faf */ 0xffff,
- /* branch: 0xf0XX */ 0,
- /* branch: 0xf1XX */ 0,
- /* branch: 0xf2XX */ 0,
- /* branch: 0xf3XX */ 0,
- /* branch: 0xf4XX */ 0,
- /* branch: 0xf5XX */ 0,
- /* branch: 0xf6XX */ 0,
- /* branch: 0xf7XX */ 0,
- /* branch: 0xf8XX */ 0,
- /* branch: 0xf9XX */ 0,
- /* branch: 0xfaXX */ 0,
- /* branch: 0xfbXX */ 0,
- /* branch: 0xfcXX */ 0,
- /* branch: 0xfdXX */ 0,
- /* branch: 0xfeXX */ 0,
- /* branch: 0xffXX */ 22944,
- /* branch: 0xff0X */ 22960,
- /* branch: 0xff1X */ 22976,
- /* branch: 0xff2X */ 22992,
- /* branch: 0xff3X */ 23008,
- /* branch: 0xff4X */ 23024,
- /* branch: 0xff5X */ 23040,
- /* branch: 0xff6X */ 23056,
- /* branch: 0xff7X */ 23072,
- /* branch: 0xff8X */ 23088,
- /* branch: 0xff9X */ 23104,
- /* branch: 0xffaX */ 0,
- /* branch: 0xffbX */ 0,
- /* branch: 0xffcX */ 0,
- /* branch: 0xffdX */ 0,
- /* branch: 0xffeX */ 23120,
- /* branch: 0xfffX */ 0,
- /* key: 0xff00 */ 0xffff,
- /* key: 0xff01 */ 0x212a,
- /* key: 0xff02 */ 0xffff,
- /* key: 0xff03 */ 0x2174,
- /* key: 0xff04 */ 0x2170,
- /* key: 0xff05 */ 0x2173,
- /* key: 0xff06 */ 0x2175,
- /* key: 0xff07 */ 0xffff,
- /* key: 0xff08 */ 0x214a,
- /* key: 0xff09 */ 0x214b,
- /* key: 0xff0a */ 0x2176,
- /* key: 0xff0b */ 0x215c,
- /* key: 0xff0c */ 0x2124,
- /* key: 0xff0d */ 0xffff,
- /* key: 0xff0e */ 0x2125,
- /* key: 0xff0f */ 0x213f,
- /* key: 0xff10 */ 0x2330,
- /* key: 0xff11 */ 0x2331,
- /* key: 0xff12 */ 0x2332,
- /* key: 0xff13 */ 0x2333,
- /* key: 0xff14 */ 0x2334,
- /* key: 0xff15 */ 0x2335,
- /* key: 0xff16 */ 0x2336,
- /* key: 0xff17 */ 0x2337,
- /* key: 0xff18 */ 0x2338,
- /* key: 0xff19 */ 0x2339,
- /* key: 0xff1a */ 0x2127,
- /* key: 0xff1b */ 0x2128,
- /* key: 0xff1c */ 0x2163,
- /* key: 0xff1d */ 0x2161,
- /* key: 0xff1e */ 0x2164,
- /* key: 0xff1f */ 0x2129,
- /* key: 0xff20 */ 0x2177,
- /* key: 0xff21 */ 0x2341,
- /* key: 0xff22 */ 0x2342,
- /* key: 0xff23 */ 0x2343,
- /* key: 0xff24 */ 0x2344,
- /* key: 0xff25 */ 0x2345,
- /* key: 0xff26 */ 0x2346,
- /* key: 0xff27 */ 0x2347,
- /* key: 0xff28 */ 0x2348,
- /* key: 0xff29 */ 0x2349,
- /* key: 0xff2a */ 0x234a,
- /* key: 0xff2b */ 0x234b,
- /* key: 0xff2c */ 0x234c,
- /* key: 0xff2d */ 0x234d,
- /* key: 0xff2e */ 0x234e,
- /* key: 0xff2f */ 0x234f,
- /* key: 0xff30 */ 0x2350,
- /* key: 0xff31 */ 0x2351,
- /* key: 0xff32 */ 0x2352,
- /* key: 0xff33 */ 0x2353,
- /* key: 0xff34 */ 0x2354,
- /* key: 0xff35 */ 0x2355,
- /* key: 0xff36 */ 0x2356,
- /* key: 0xff37 */ 0x2357,
- /* key: 0xff38 */ 0x2358,
- /* key: 0xff39 */ 0x2359,
- /* key: 0xff3a */ 0x235a,
- /* key: 0xff3b */ 0x214e,
- /* key: 0xff3c */ 0xffff,
- /* key: 0xff3d */ 0x214f,
- /* key: 0xff3e */ 0x2130,
- /* key: 0xff3f */ 0x2132,
- /* key: 0xff40 */ 0x212e,
- /* key: 0xff41 */ 0x2361,
- /* key: 0xff42 */ 0x2362,
- /* key: 0xff43 */ 0x2363,
- /* key: 0xff44 */ 0x2364,
- /* key: 0xff45 */ 0x2365,
- /* key: 0xff46 */ 0x2366,
- /* key: 0xff47 */ 0x2367,
- /* key: 0xff48 */ 0x2368,
- /* key: 0xff49 */ 0x2369,
- /* key: 0xff4a */ 0x236a,
- /* key: 0xff4b */ 0x236b,
- /* key: 0xff4c */ 0x236c,
- /* key: 0xff4d */ 0x236d,
- /* key: 0xff4e */ 0x236e,
- /* key: 0xff4f */ 0x236f,
- /* key: 0xff50 */ 0x2370,
- /* key: 0xff51 */ 0x2371,
- /* key: 0xff52 */ 0x2372,
- /* key: 0xff53 */ 0x2373,
- /* key: 0xff54 */ 0x2374,
- /* key: 0xff55 */ 0x2375,
- /* key: 0xff56 */ 0x2376,
- /* key: 0xff57 */ 0x2377,
- /* key: 0xff58 */ 0x2378,
- /* key: 0xff59 */ 0x2379,
- /* key: 0xff5a */ 0x237a,
- /* key: 0xff5b */ 0x2150,
- /* key: 0xff5c */ 0x2143,
- /* key: 0xff5d */ 0x2151,
- /* key: 0xff5e */ 0xffff,
- /* key: 0xff5f */ 0xffff,
- /* key: 0xff60 */ 0xffff,
- /* key: 0xff61 */ 0xa1,
- /* key: 0xff62 */ 0xa2,
- /* key: 0xff63 */ 0xa3,
- /* key: 0xff64 */ 0xa4,
- /* key: 0xff65 */ 0xa5,
- /* key: 0xff66 */ 0xa6,
- /* key: 0xff67 */ 0xa7,
- /* key: 0xff68 */ 0xa8,
- /* key: 0xff69 */ 0xa9,
- /* key: 0xff6a */ 0xaa,
- /* key: 0xff6b */ 0xab,
- /* key: 0xff6c */ 0xac,
- /* key: 0xff6d */ 0xad,
- /* key: 0xff6e */ 0xae,
- /* key: 0xff6f */ 0xaf,
- /* key: 0xff70 */ 0xb0,
- /* key: 0xff71 */ 0xb1,
- /* key: 0xff72 */ 0xb2,
- /* key: 0xff73 */ 0xb3,
- /* key: 0xff74 */ 0xb4,
- /* key: 0xff75 */ 0xb5,
- /* key: 0xff76 */ 0xb6,
- /* key: 0xff77 */ 0xb7,
- /* key: 0xff78 */ 0xb8,
- /* key: 0xff79 */ 0xb9,
- /* key: 0xff7a */ 0xba,
- /* key: 0xff7b */ 0xbb,
- /* key: 0xff7c */ 0xbc,
- /* key: 0xff7d */ 0xbd,
- /* key: 0xff7e */ 0xbe,
- /* key: 0xff7f */ 0xbf,
- /* key: 0xff80 */ 0xc0,
- /* key: 0xff81 */ 0xc1,
- /* key: 0xff82 */ 0xc2,
- /* key: 0xff83 */ 0xc3,
- /* key: 0xff84 */ 0xc4,
- /* key: 0xff85 */ 0xc5,
- /* key: 0xff86 */ 0xc6,
- /* key: 0xff87 */ 0xc7,
- /* key: 0xff88 */ 0xc8,
- /* key: 0xff89 */ 0xc9,
- /* key: 0xff8a */ 0xca,
- /* key: 0xff8b */ 0xcb,
- /* key: 0xff8c */ 0xcc,
- /* key: 0xff8d */ 0xcd,
- /* key: 0xff8e */ 0xce,
- /* key: 0xff8f */ 0xcf,
- /* key: 0xff90 */ 0xd0,
- /* key: 0xff91 */ 0xd1,
- /* key: 0xff92 */ 0xd2,
- /* key: 0xff93 */ 0xd3,
- /* key: 0xff94 */ 0xd4,
- /* key: 0xff95 */ 0xd5,
- /* key: 0xff96 */ 0xd6,
- /* key: 0xff97 */ 0xd7,
- /* key: 0xff98 */ 0xd8,
- /* key: 0xff99 */ 0xd9,
- /* key: 0xff9a */ 0xda,
- /* key: 0xff9b */ 0xdb,
- /* key: 0xff9c */ 0xdc,
- /* key: 0xff9d */ 0xdd,
- /* key: 0xff9e */ 0xde,
- /* key: 0xff9f */ 0xdf,
- /* key: 0xffe0 */ 0xffff,
- /* key: 0xffe1 */ 0xffff,
- /* key: 0xffe2 */ 0xffff,
- /* key: 0xffe3 */ 0x2131,
- /* key: 0xffe4 */ 0xffff,
- /* key: 0xffe5 */ 0x216f,
- /* key: 0xffe6 */ 0xffff,
- /* key: 0xffe7 */ 0xffff,
- /* key: 0xffe8 */ 0xffff,
- /* key: 0xffe9 */ 0xffff,
- /* key: 0xffea */ 0xffff,
- /* key: 0xffeb */ 0xffff,
- /* key: 0xffec */ 0xffff,
- /* key: 0xffed */ 0xffff,
- /* key: 0xffee */ 0xffff,
- /* key: 0xffef */ 0xffff,
-};
diff --git a/libjava/gnu/gcj/convert/gen-from-JIS.c b/libjava/gnu/gcj/convert/gen-from-JIS.c
deleted file mode 100644
index d4cca14..0000000
--- a/libjava/gnu/gcj/convert/gen-from-JIS.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright (C) 1999, 2008  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "make-trie.h"
-
-struct chval
-{
-  unsigned char b1;            /* 1st byte */
-  unsigned char b2;            /* 2nd byte */
-  unsigned short uc;  /* unicode value */
-};
-
-#define MAP(B1, B2, C) { B1, B2, C },
-
-struct chval chtab_0201[] = {
-#include "JIS0201.h"
-  { 255, 255, 0}
-};
-
-struct chval chtab_0208[] = {
-#include "JIS0208.h"
-  { 255, 255, 0}
-};
-
-struct chval chtab_0212[] = {
-#include "JIS0212.h"
-  { 255, 255, 0}
-};
-#undef MAP
-
-struct chval sorted[] = {
-#define MAP(B1, B2, C) { B1, B2, C },
-#include "JIS0208.h"
-#undef MAP
-#define MAP(B1, B2, C) { 0x80|B1, B2, C },
-#include "JIS0212.h"
-#undef MAP
-};
-
-struct chval *chtab;
-
-int
-compare (void *p1, void *p2)
-{
-  struct chval *c1 = (struct chval *) p1;
-  struct chval *c2 = (struct chval *) p2;
-  return (int) c1->uc - (int) c2->uc;
-}
-
-int
-main(int argc, char** argv)
-{
-  FILE *out = stdout;
-  int min1 = 256, max1 = 0, min2 = 256, max2 = 0, count = 0;
-  int low1_uc = 0xFFFF, high1_uc = 0;
-  int low2_uc = 0xFFFF, high2_uc = 0;
-  int i;  int row, col;
-  if (argc < 2)
-    {
-      fprintf (stderr, "missing argument!\n");
-      exit (-1);
-    }
-  if (strcmp (argv[1], "JIS0208") == 0)
-    chtab = chtab_0208;
-  else if (strcmp (argv[1], "JIS0212") == 0)
-    chtab = chtab_0212;
-  else if (strcmp (argv[1], "toJIS") == 0)
-    {
-      int i;
-      for (i = 0;  chtab_0201[i].b1 != 255;  i++)
-	{
-	  enter(chtab_0201[i].uc, chtab_0201[i].b2);
-	}
-      for (i = 0;  i < 0x20;  i++)
-	{
-	  enter (i, i);
-	}
-      enter (127, 127);
-      for (i = 0;  chtab_0208[i].b1 != 255;  i++)
-	{
-	  enter(chtab_0208[i].uc,
-		(chtab_0208[i].b1 << 8) | chtab_0208[i].b2);
-	}
-      for (i = 0;  chtab_0212[i].b1 != 255;  i++)
-	{
-	  enter(chtab_0212[i].uc,
-		0x8000 | (chtab_0212[i].b1 << 8) | chtab_0212[i].b2);
-	}
-      print_table ("Unicode_to_JIS", stdout);
-      exit(0);
-    }
-  else
-    {
-      fprintf (stderr, "bad argument!");
-      exit (-1);
-    }
-  for (i = 0;  chtab[i].b1 != 255; i++)
-    {
-      if (chtab[i].b1 < min1) min1 = chtab[i].b1;
-      if (chtab[i].b2 < min2) min2 = chtab[i].b2;
-      if (chtab[i].b1 > max1) max1 = chtab[i].b1;
-      if (chtab[i].b2 > max2) max2 = chtab[i].b2;
-      count++;
-    }
-  fprintf(stderr, "1st byte ranges from %d to %d.\n", min1, max1);
-  fprintf(stderr, "2nd byte ranges from %d to %d.\n", min2, max2);
-
-  fprintf(out,"/* This file is automatically generated from %s.TXT. */\n",
-	  argv[1]);
-  fprintf(out,"#pragma GCC java_exceptions\n");
-  fprintf(out, "unsigned short %s_to_Unicode[%d][%d] = {\n",
-	  argv[1], max1 - min1 + 1,  max2 - min2 + 1);
-  i = 0;
-  for (row = min1;  row <= max1;  row++)
-    {
-      fprintf(out, "/* 1st byte: %d */ { ", row);
-      if (row < chtab[i].b1)
-	{
-	  fprintf(out, "0 }, /* unused row */\n");
-	}
-      else if (row > chtab[i].b1)
-	{
-	  fprintf (stderr, "error - char table out of order!\n");
-	  exit (-1);
-	}
-      else
-	{
-	  fprintf(out, "\n");
-	  for (col = min2;  col <= max2;  col++)
-	    {
-	      if (row == chtab[i].b1 && col == chtab[i].b2)
-		{
-		  int uc = chtab[i].uc;
-		  if (uc < 0x2000)
-		    {
-		      if (uc > high1_uc)
-			high1_uc = uc;
-		      if (uc < low1_uc)
-			low1_uc = uc;
-		    }
-		  else
-		    {
-		      if (uc > high2_uc)
-			high2_uc = uc;
-		      if (uc < low2_uc)
-			low2_uc = uc;
-		    }
-		  fprintf (out, "  /* 2nd byte: %d */ 0x%04x",
-			   chtab[i].b2, uc);
-		  i++;
-		}
-	      else if (row < chtab[i].b1
-		  || (row == chtab[i].b1 && col < chtab[i].b2))
-		{
-		  fprintf (out, "  0");
-		}
-	      else
-		{
-		  fprintf (stderr, "error - char table out of order!\n");
-		  exit (-1);
-		}
-	      if (col != max2)
-		fprintf (out, ",\n");
-	    }
-	  fprintf(out, row == max1 ? "}\n" : "},\n");
-	}
-    }
-  fprintf(out, "};\n");
-  fprintf(stderr, "total number of characters is %d.\n", count);
-  fprintf(stderr, "Range is 0x%04x-0x%04x and 0x%04x-0x%04x.\n",
-	  low1_uc, high1_uc, low2_uc, high2_uc);
-  return 0;
-}
diff --git a/libjava/gnu/gcj/convert/make-trie.c b/libjava/gnu/gcj/convert/make-trie.c
deleted file mode 100644
index fe2d789..0000000
--- a/libjava/gnu/gcj/convert/make-trie.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "make-trie.h"
-
-typedef struct trie_node
-{
-  int key;
-  int level;
-  int position;
-  union
-  {
-    int value;
-    struct trie_node *node;
-  } u[16];
-} trie_node;
-
-trie_node *
-make_node ()
-{
-  trie_node *node = (trie_node *) malloc (sizeof(trie_node));
-  if (node == NULL)
-    abort();
-  return node;
-}
-
-trie_node *
-make_leaf_node ()
-{
-  trie_node *node = make_node ();
-  int i = 16;
-  while (--i >= 0)
-    node->u[i].value = -1;
-  return node;
-}
-
-trie_node *
-make_branch_node ()
-{
-  trie_node *node = make_node ();
-  int i = 16;
-  while (--i >= 0)
-    node->u[i].node = NULL;
-  return node;
-}
-
-
-trie_node *table = NULL;
-
-void
-enter (int key, int value)
-{
-  trie_node **ptr = &table;
-  int shift = 12;
-  for (; shift > 0;  shift -= 4)
-    {
-      if (*ptr == NULL)
-	{
-	  *ptr = make_branch_node ();
-	  (*ptr)->key = key & (0xFFFF << (shift + 4));
-	  (*ptr)->level = shift / 4;
-	}
-      ptr = &(*ptr)->u[(key >> shift) & 0xF].node;
-    }
-  if (*ptr == NULL)
-    {
-      *ptr = make_leaf_node ();
-      (*ptr)->key = key & 0xFFF0;
-      (*ptr)->level = 0;
-    }
-  if ((*ptr)->u[key & 0xF].value != -1
-      && (*ptr)->u[key & 0xF].value != value)
-    fprintf(stderr, "duplicate value for key: %d, %d!\n", key, value);
-  (*ptr)->u[key & 0xF].value = value;
-}
-
-int assigned = 0;
-
-void
-assign (trie_node *node, int level)
-{
-  int i;
-  if (node == NULL)
-    return;
-  if (node->level != level)
-    abort();
-  node->position = assigned;
-  assigned++;
-  if (level == 0)
-    return;
-  for (i = 0;  i < 16;  i++)
-    {
-      assign (node->u[i].node, level-1);
-    }
-}
-
-int next_node_index_toprint = 0;
-
-void
-print (trie_node *node, int index, int level, FILE *out)
-{
-  int i;
-  if (node->key != index || node->level != level)
-    abort();
-  if (level == 0) /* leaf node */
-    {
-      for (i = 0;  i < 16;  i++)
-	{
-	  int node_index = index | (i << (level * 4));
-	  if (node_index < next_node_index_toprint)
-	    abort();
-	  if (node->u[i].value == -1)
-	    fprintf (out, " /* key: 0x%x */ 0xffff,\n", node_index);
-	  else
-	    fprintf (out, " /* key: 0x%x */ 0x%x,\n",
-		     node_index, node->u[i].value);
-	  next_node_index_toprint = node_index + 1;
-	}
-    }
-  else
-    {
-      for (i = 0;  i < 16;  i++)
-	{
-	  int node_index = index | (i << (level * 4));
-	  fprintf (out, " /* branch: 0x%0*x%.*s */ ",
-		  4 - level, node_index  >> ( 4 * level),
-		  level, "XXXX");
-	  if (node->u[i].node == NULL)
-	    fprintf (out, "0,\n");
-	  else
-	    fprintf (out, "%d,\n", 16 * node->u[i].node->position);
-	}
-
-      for (i = 0;  i < 16;  i++)
-	{
-	  int node_index = index | (i << (level * 4));
-	  if (node->u[i].node != NULL)
-	    print (node->u[i].node, node_index, level-1, out);
-	}
-    }
-}
-
-void
-print_table (char *name, FILE *out)
-{
-  assign (table, 3);
-
-  fprintf(out, "/* This file is automatically generated. */\n");
-  fprintf(out, "unsigned short %s[] = {\n", name);
-  print (table, 0x0000, 3, out);
-  fprintf(out, "};\n");
-}
-
-#if 0
-int
-main (int argc, char **argv)
-{
-  int count = 0;
-  for (;;)
-    {
-      int key, value;
-      int i = scanf (" 0x%x 0x%x", &key, &value);
-      if (i < 2)
-	break;
-      count++;
-      enter (key, value);
-    }
-  return 0;
-}
-#endif
diff --git a/libjava/gnu/gcj/convert/make-trie.h b/libjava/gnu/gcj/convert/make-trie.h
deleted file mode 100644
index bbe20a5..0000000
--- a/libjava/gnu/gcj/convert/make-trie.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright (C) 2008  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <stddef.h>
-
-extern void print_table (char *name, FILE *out);
-
-extern void enter (int key, int value);
diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc
deleted file mode 100644
index 8042ba8..0000000
--- a/libjava/gnu/gcj/convert/natIconv.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// natIconv.cc -- Java side of iconv() reader.
-
-/* Copyright (C) 2000, 2001, 2003, 2006, 2011  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Tom Tromey <tromey@redhat.com>.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#include <gnu/gcj/convert/Input_iconv.h>
-#include <gnu/gcj/convert/Output_iconv.h>
-#include <java/io/CharConversionException.h>
-#include <java/io/UnsupportedEncodingException.h>
-
-#include <errno.h>
-
-#ifdef HAVE_ICONV
-#include <iconv.h>
-
-template<typename T>
-static inline size_t
-iconv_adapter (size_t (*iconv_f) (iconv_t, T, size_t *, char **, size_t *),
-	       iconv_t handle, char **inbuf, size_t *inavail,
-	       char **outbuf, size_t *outavail)
-{
-  return (*iconv_f) (handle, (T) inbuf, inavail, outbuf, outavail);
-}
-
-#endif
-
-void
-gnu::gcj::convert::Input_iconv::init (jstring encoding)
-{
-#ifdef HAVE_ICONV
-  jsize len = _Jv_GetStringUTFLength (encoding);
-  char buffer[len + 1];
-  _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
-  buffer[len] = '\0';
-
-  iconv_t h = iconv_open ("UCS-2", buffer);
-  if (h == (iconv_t) -1)
-    throw new ::java::io::UnsupportedEncodingException (encoding);
-
-  JvAssert (h != NULL);
-  handle = reinterpret_cast<gnu::gcj::RawData *> (h);
-#else /* HAVE_ICONV */
-  // If no iconv, just throw an exception.
-  throw new ::java::io::UnsupportedEncodingException (encoding);
-#endif /* HAVE_ICONV */
-}
-
-void
-gnu::gcj::convert::Input_iconv::finalize (void)
-{
-#ifdef HAVE_ICONV
-  if (handle != NULL)
-    {
-      iconv_close ((iconv_t) handle);
-      handle = NULL;
-    }
-#endif /* HAVE_ICONV */
-}
-
-jint
-gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
-				      jint outpos, jint count)
-{
-#ifdef HAVE_ICONV
-  jbyte *bytes = elements (inbuffer);
-  jchar *out = elements (outbuffer);
-  size_t inavail = inlength - inpos;
-  size_t old_in = inavail;
-  size_t outavail = count * sizeof (jchar);
-  size_t old_out = outavail;
-
-  char *inbuf = (char *) &bytes[inpos];
-  char *outbuf = (char *) &out[outpos];
-
-  size_t r = iconv_adapter (iconv, (iconv_t) handle,
-			    &inbuf, &inavail,
-			    &outbuf, &outavail);
-
-  if (r == (size_t) -1)
-    {
-      // If we see EINVAL then there is an incomplete sequence at the
-      // end of the input buffer.  If we see E2BIG then we ran out of
-      // space in the output buffer.  However, in both these cases
-      // some conversion might have taken place.  So we fall through
-      // to the normal case.
-      if (errno != EINVAL && errno != E2BIG)
-	throw new ::java::io::CharConversionException ();
-    }
-
-  if (iconv_byte_swap)
-    {
-      size_t max = (old_out - outavail) / sizeof (jchar);
-      for (size_t i = 0; i < max; ++i)
-	{
-	  // Byte swap.
-	  jchar c = (((out[outpos + i] & 0xff) << 8)
-		     | ((out[outpos + i] >> 8) & 0xff));
-	  outbuf[i] = c;
-	}
-    }
-
-  inpos += old_in - inavail;
-  return (old_out - outavail) / sizeof (jchar);
-#else /* HAVE_ICONV */
-  return -1;
-#endif /* HAVE_ICONV */
-}
-
-void
-gnu::gcj::convert::Input_iconv::done ()
-{
-#ifdef HAVE_ICONV
-  // 50 bytes should be enough for any reset sequence.
-  size_t avail = 50;
-  char tmp[avail];
-  char *p = tmp;
-  // Calling iconv() with a NULL INBUF pointer will cause iconv() to
-  // switch to its initial state.  We don't care about the output that
-  // might be generated in that situation.
-  iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
-  BytesToUnicode::done ();
-#else /* HAVE_ICONV */
-  // If no iconv, do nothing
-#endif /* HAVE_ICONV */
-}
-
-void
-gnu::gcj::convert::Output_iconv::init (jstring encoding)
-{
-#ifdef HAVE_ICONV
-  jsize len = _Jv_GetStringUTFLength (encoding);
-  char buffer[len + 1];
-  _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
-  buffer[len] = '\0';
-
-  iconv_t h = iconv_open (buffer, "UCS-2");
-  if (h == (iconv_t) -1)
-    throw new ::java::io::UnsupportedEncodingException (encoding);
-
-  JvAssert (h != NULL);
-  handle = reinterpret_cast<gnu::gcj::RawData *> (h);
-#else /* HAVE_ICONV */
-  // If no iconv, just throw an exception.
-  throw new ::java::io::UnsupportedEncodingException (encoding);
-#endif /* HAVE_ICONV */
-}
-
-void
-gnu::gcj::convert::Output_iconv::finalize (void)
-{
-#ifdef HAVE_ICONV
-  if (handle != NULL)
-    {
-      iconv_close ((iconv_t) handle);
-      handle = NULL;
-    }
-#endif /* HAVE_ICONV */
-}
-
-jint
-gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer,
-					jint inpos, jint inlength)
-{
-#ifdef HAVE_ICONV
-  jchar *chars = elements (inbuffer);
-  jbyte *out = elements (buf);
-  jchar *temp_buffer = NULL;
-
-  size_t inavail = inlength * sizeof (jchar);
-  size_t old_in = inavail;
-
-  size_t outavail = buf->length - count;
-  size_t old_out = outavail;
-
-  char *inbuf = (char *) &chars[inpos];
-  char *outbuf = (char *) &out[count];
-
-  if (iconv_byte_swap)
-    {
-      // Ugly performance penalty -- don't use losing systems!
-      temp_buffer = (jchar *) _Jv_Malloc (inlength * sizeof (jchar));
-      for (int i = 0; i < inlength; ++i)
-	{
-	  // Byte swap.
-	  jchar c = (((chars[inpos + i] & 0xff) << 8)
-		     | ((chars[inpos + i] >> 8) & 0xff));
-	  temp_buffer[i] = c;
-	}
-      inbuf = (char *) temp_buffer;
-    }
-
-  size_t loop_old_in = old_in;
-  while (1)
-    {
-      size_t r = iconv_adapter (iconv, (iconv_t) handle,
-				&inbuf, &inavail,
-				&outbuf, &outavail);
-      if (r == (size_t) -1)
-	{
-	  if (errno == EINVAL)
-	    {
-	      // Incomplete byte sequence at the end of the input
-	      // buffer.  This shouldn't be able to happen here.
-	      break;
-	    }
-	  else if (errno == E2BIG)
-	    {
-	      // Output buffer is too small.
-	      break;
-	    }
-	  else if (errno == EILSEQ || inavail == loop_old_in)
-	    {
-	      // Untranslatable sequence.  Since glibc 2.1.3 doesn't
-	      // properly set errno, we also assume that this is what
-	      // is happening if no conversions took place.  (This can
-	      // be a bogus assumption if in fact the output buffer is
-	      // too small.)  We skip the first character and try
-	      // again.
-	      inavail -= 2;
-	      if (inavail == 0)
-		break;
-	      loop_old_in -= 2;
-	      inbuf += 2;
-	    }
-	}
-      else
-	break;
-    }
-
-  if (temp_buffer != NULL)
-    _Jv_Free (temp_buffer);
-
-  count += old_out - outavail;
-  return (old_in - inavail) / sizeof (jchar);
-#else /* HAVE_ICONV */
-  return -1;
-#endif /* HAVE_ICONV */
-}
-
-jboolean
-gnu::gcj::convert::IOConverter::iconv_init (void)
-{
-  // Some versions of iconv() always return their UCS-2 results in
-  // big-endian order, and they also require UCS-2 inputs to be in
-  // big-endian order.  For instance, glibc 2.1.3 does this.  If the
-  // UTF-8=>UCS-2 iconv converter has this feature, then we assume
-  // that all UCS-2 converters do.  (This might not be the best
-  // heuristic, but is is all we've got.)
-  jboolean result = false;
-#ifdef HAVE_ICONV
-  iconv_t handle = iconv_open ("UCS-2", "UTF-8");
-  if (handle != (iconv_t) -1)
-    {
-      jchar c;
-      unsigned char in[4];
-      char *inp, *outp;
-      size_t inc, outc, r;
-
-      // This is the UTF-8 encoding of \ufeff.  At least Tru64 UNIX libiconv
-      // needs the trailing NUL byte, otherwise iconv fails with EINVAL.
-      in[0] = 0xef;
-      in[1] = 0xbb;
-      in[2] = 0xbf;
-      in[3] = 0x00;
-
-      inp = (char *) in;
-      inc = 4;
-      outp = (char *) &c;
-      outc = 2;
-
-      r = iconv_adapter (iconv, handle, &inp, &inc, &outp, &outc);
-      // Conversion must be complete for us to use the result.
-      if (r != (size_t) -1 && inc == 0 && outc == 0)
-	result = (c != 0xfeff);
-
-      // Release iconv handle.
-      iconv_close (handle);
-    }
-#endif /* HAVE_ICONV */
-  return result;
-}
-
-void
-gnu::gcj::convert::Output_iconv::done ()
-{
-#ifdef HAVE_ICONV
-  // 50 bytes should be enough for any reset sequence.
-  size_t avail = 50;
-  char tmp[avail];
-  char *p = tmp;
-  // Calling iconv() with a NULL INBUF pointer will cause iconv() to
-  // switch to its initial state.  We don't care about the output that
-  // might be generated in that situation.
-  iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
-  UnicodeToBytes::done ();
-#else /* HAVE_ICONV */
-  // If no iconv, do nothing
-#endif /* HAVE_ICONV */
-}
diff --git a/libjava/gnu/gcj/convert/natInput_EUCJIS.cc b/libjava/gnu/gcj/convert/natInput_EUCJIS.cc
deleted file mode 100644
index 42562b9..0000000
--- a/libjava/gnu/gcj/convert/natInput_EUCJIS.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/convert/Input_EUCJIS.h>
-
-#define ERROR_CHAR 0xFFFD
-
-extern unsigned short JIS0208_to_Unicode[84][94];
-extern unsigned short JIS0212_to_Unicode[76][94];
-
-jint
-gnu::gcj::convert::Input_EUCJIS::read(jcharArray outbuffer, jint outpos,
-				      jint count)
-{
-  jint start_outpos = outpos;
-  for (;;)
-    {
-      if (outpos - start_outpos >= count)
-	break;
-      if (inpos >= inlength)
-	break;
-      int b = ((unsigned char*) elements(inbuffer))[inpos++];
-      if (codeset == 0)  // ASCII or JIS-Roman
-	{
-	  if (b < 128)
-	    {
-#if 1
-	      // Technically, we should translate 0x5c to Yen symbol;
-	      // in practice, it is not clear.
-	      if (b == 0x5c)
-		b = 0x00A5;  // Yen sign.
-#endif
-	      elements(outbuffer)[outpos++] = (char) b;
-	    }
-	  else
-	    {
-	      if (b == 0x8E) // SS2
-		codeset = 2;
-	      else if (b == 0x8F) // SS3
-		codeset = 3;
-	      else
-		{
-		  codeset = 1;
-		  first_byte = b;
-		}
-	    }
-	}
-      else if (codeset == 1) // JIS X 0208:1997
-	{
-	  first_byte -= 0x80 + 33;
-	  b -= 0x80 + 33;
-	  if ((unsigned) first_byte >= 84 || (unsigned) b >= 94)
-	    b = ERROR_CHAR;
-	  else
-	    {
-	      b = JIS0208_to_Unicode[first_byte][b];
-	      if (b == 0)
-		b = ERROR_CHAR;
-	    }
-	  elements(outbuffer)[outpos++] = b;
-	  codeset = 0;
-	}
-      else if (codeset == 2) // Half-width katakana
-	{
-	  if (b >= 0xA1 && b <= 0xDF)
-	    b += 0xFF61 - 0xA1;
-	  else
-	    b = ERROR_CHAR;
-	  elements(outbuffer)[outpos++] = b;
-	  codeset = 0;
-	}
-      else if (codeset == 3) // second byte of JIS X 0212-1990
-	{
-	  first_byte = b;
-	  codeset = 4;
-	}
-      else // codeset == 4 // third byte of JIS X 0212-1990
-	{
-	  first_byte -= 0x80 + 34;
-	  b -= 0x80 + 33;
-	  if ((unsigned) first_byte >= 76 || (unsigned) b >= 94)
-	    b = ERROR_CHAR;
-	  else
-	    {
-	      b = JIS0208_to_Unicode[first_byte][b];
-	      if (b == 0)
-		b = ERROR_CHAR;
-	    }
-	  elements(outbuffer)[outpos++] = b;
-	  codeset = 0;
-	}
-    }
-  return outpos - start_outpos;
-}
diff --git a/libjava/gnu/gcj/convert/natInput_SJIS.cc b/libjava/gnu/gcj/convert/natInput_SJIS.cc
deleted file mode 100644
index c7f11ad..0000000
--- a/libjava/gnu/gcj/convert/natInput_SJIS.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/convert/Input_SJIS.h>
-
-#define ERROR_CHAR 0xFFFD
-
-extern unsigned short JIS0208_to_Unicode[84][94];
-extern unsigned short JIS0212_to_Unicode[76][94];
-
-jint
-gnu::gcj::convert::Input_SJIS::read(jcharArray outbuffer, jint outpos,
-				    jint count)
-{
-  jint start_outpos = outpos;
-  for (;;)
-    {
-      if (outpos - start_outpos >= count)
-	break;
-      if (inpos >= inlength)
-	break;
-      int b = ((unsigned char*) elements(inbuffer))[inpos++];
-      if (first_byte == 0)
-	{
-	  if (b < 128)
-	    {
-#if 1
-	      // Technically, we should translate 0x5c to Yen symbol;
-	      // in practice, it is not clear.
-	      if (b == 0x5c)
-		b = 0x00A5;  // Yen sign.
-#endif
-	      elements(outbuffer)[outpos++] = (char) b;
-	    }
-	  else if (b >= 0xA1 && b <= 0xDF)
-	    {
-	      b += 0xFF61 - 0xA1;
-	      elements(outbuffer)[outpos++] = b;
-	    }
-	  else
-	    first_byte = b;
-	}
-      else
-	{
-	  // From Lunde: "CJKV Informatio Processing", O'Reilly, 1999, p 420:
-	  bool adjust = b < 159;
-	  int rowOffset = first_byte < 160 ? 112 : 176;
-	  int cellOffset = adjust ? (b > 127 ? 32 : 31) : 126;
-	  first_byte = ((first_byte - rowOffset) << 1) - adjust;
-	  b -= cellOffset;
-
-	  first_byte -= 33;
-	  b -= 33;
-
-	  if ((unsigned) first_byte >= 84 || (unsigned) b >= 94)
-	    b = ERROR_CHAR;
-	  else
-	    {
-	      b = JIS0208_to_Unicode[first_byte][b];
-	      if (b == 0)
-		b = ERROR_CHAR;
-	    }
-	  elements(outbuffer)[outpos++] = b;
-
-	  first_byte = 0;
-	}
-    }
-  return outpos - start_outpos;
-}
diff --git a/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc b/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
deleted file mode 100644
index 533fb9f..0000000
--- a/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/convert/Output_EUCJIS.h>
-
-/* A trie structure to map unicode values to JIS codes.
- * code == -1: the character is undefined.
- * code >= 0 && code < 128:  JIS-Roman - mostly Ascii.
- * code >= 128 && code < 256:  Half-width Katakana.
- * code >= 256 && code < 0x8000:  JIS X 0208:1997.
- * code >= 0x8000 && code < 0xFFFF:  JIX X 0212-1990.
- */
-
-extern unsigned short Unicode_to_JIS[];
-
-int
-trie_lookup (unsigned short *trie, unsigned short key)
-{
-  unsigned short branch = trie[(key >> 12) & 0xf];
-  if (branch == 0)
-    return -1;
-  branch = trie[branch + ((key >> 8) & 0xf)];
-  if (branch == 0)
-    return -1;
-  branch = trie[branch + ((key >> 4) & 0xf)];
-  if (branch == 0)
-    return -1;
-  return trie[branch + (key & 0xf)];
-}
-
-static jint
-convert_TO_EUCJIS (gnu::gcj::convert::Output_EUCJIS *encoder,
-			  jchar *ptr, jint inlength)
-{
-  int orig_inlength = inlength;
-  jint outbuf_length = encoder->buf->length;
-  for (;;)
-    {
-      if (encoder->count >= outbuf_length)
-	break;
-      if (encoder->pending1 >= 0)
-	{
-	  elements(encoder->buf)[encoder->count++] = encoder->pending1;
-	  encoder->pending1 = encoder->pending2;
-	  encoder->pending2 = -1;
-	  continue;
-	}
-      if (inlength == 0)
-	break;
-      jchar ch = *ptr++;
-      inlength--;
-      unsigned short val = trie_lookup(Unicode_to_JIS, ch);
-      if (val < 0x80)
-	{
-	  if (val == 0xffff)
-	    val = '?';
-	}
-      else if (val <= 0xFF)
-	{
-	  encoder->pending1 = val;
-	  encoder->pending2 = -1;
-	  val = 0x8e;
-	}
-      else if (val < 0x8000)
-	{
-	  val |= 0x8080;
-	  encoder->pending1 = val & 0xff;
-	  val = val >> 8;
-	  encoder->pending2 = -1;
-	}
-      else
-	{
-	  val |= 0x8080;
-	  encoder->pending1 = val >> 8;
-	  encoder->pending2 = val & 0xff;
-	  val = 0x8f;
-	}
-      elements(encoder->buf)[encoder->count++] = val;
-    }
-  return orig_inlength - inlength;
-}
-
-jint
-gnu::gcj::convert::Output_EUCJIS::write (jcharArray inbuffer,
-					 jint inpos, jint inlength)
-{
-  return convert_TO_EUCJIS(this, &elements(inbuffer)[inpos], inlength);
-}
-
-jint
-gnu::gcj::convert::Output_EUCJIS::write (jstring str, jint inpos,
-					 jint inlength, jcharArray)
-{
-  return convert_TO_EUCJIS(this, _Jv_GetStringChars(str)+inpos, inlength);
-}
diff --git a/libjava/gnu/gcj/convert/natOutput_SJIS.cc b/libjava/gnu/gcj/convert/natOutput_SJIS.cc
deleted file mode 100644
index 3cde58d..0000000
--- a/libjava/gnu/gcj/convert/natOutput_SJIS.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/convert/Output_SJIS.h>
-
-extern unsigned short Unicode_to_JIS[];
-
-extern int trie_lookup (unsigned short *trie, unsigned short key);
-
-static jint
-convert_TO_SJIS (gnu::gcj::convert::Output_SJIS *encoder,
-			  jchar *ptr, jint inlength)
-{
-  int orig_inlength = inlength;
-  jint outbuf_length = encoder->buf->length;
-  for (;;)
-    {
-      if (encoder->count >= outbuf_length)
-	break;
-      if (encoder->pending >= 0)
-	{
-	  elements(encoder->buf)[encoder->count++] = encoder->pending;
-	  encoder->pending = -1;
-	  continue;
-	}
-      if (inlength == 0)
-	break;
-      jchar ch = *ptr++;
-      inlength--;
-      unsigned short val = trie_lookup(Unicode_to_JIS, ch);
-      if (val < 0xFF)
-	{
-	  if (val == 0xffff)
-	    val = '?';
-	}
-      else
-	{
-	  int b1 = val >> 8;
-	  int b2 = val & 0xff;
-	  // From Lunde: "CJKV Informatio Processing", O'Reilly, 1999:
-	  int rowOffset = b1 < 95 ? 112 : 176;
-	  int cellOffset = (b1 & 1) != 0 ? (b2 > 95 ? 32 : 31) : 126;
-	  b1 = ((b1 + 1) >> 1) + rowOffset;
-	  b2 += cellOffset;
-	  val = b1;
-	  encoder->pending = b2;
-	}
-      elements(encoder->buf)[encoder->count++] = val;
-    }
-  return orig_inlength - inlength;
-}
-
-jint
-gnu::gcj::convert::Output_SJIS::write (jcharArray inbuffer,
-					 jint inpos, jint inlength)
-{
-  return convert_TO_SJIS(this, &elements(inbuffer)[inpos], inlength);
-}
-
-jint
-gnu::gcj::convert::Output_SJIS::write (jstring str, jint inpos,
-					 jint inlength, jcharArray)
-{
-  return convert_TO_SJIS(this, _Jv_GetStringChars(str)+inpos, inlength);
-}
diff --git a/libjava/gnu/gcj/io/SimpleSHSStream.h b/libjava/gnu/gcj/io/SimpleSHSStream.h
deleted file mode 100644
index 3cabc4a..0000000
--- a/libjava/gnu/gcj/io/SimpleSHSStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_io_SimpleSHSStream__
-#define __gnu_gcj_io_SimpleSHSStream__
-
-#pragma interface
-
-#include <java/io/DataOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace io
-      {
-          class SimpleSHSStream;
-      }
-    }
-  }
-}
-
-class gnu::gcj::io::SimpleSHSStream : public ::java::io::DataOutputStream
-{
-
-public: // actually package-private
-  static JArray< jbyte > * shsFinal(JArray< jbyte > *);
-  static void shsUpdate(JArray< jbyte > *, JArray< jbyte > *, jint);
-  static JArray< jbyte > * shsInit();
-private:
-  void update(jbyte);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  SimpleSHSStream(::java::io::OutputStream *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::io::DataOutputStream)))) counter;
-  const jint SHS_BLOCKSIZE;
-  const jint SHS_DIGESTSIZE;
-  JArray< jbyte > * buf;
-  JArray< jbyte > * shs_info;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_io_SimpleSHSStream__
diff --git a/libjava/gnu/gcj/io/SimpleSHSStream.java b/libjava/gnu/gcj/io/SimpleSHSStream.java
deleted file mode 100644
index bcf8ea5..0000000
--- a/libjava/gnu/gcj/io/SimpleSHSStream.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// SimpleSHSStream.java
-
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.io;
-import java.io.Serializable;
-import java.io.*;
-import java.lang.reflect.*;
-
-public class SimpleSHSStream extends java.io.DataOutputStream
-{
-  int counter;
- 
-  final int SHS_BLOCKSIZE = 64;
-  final int SHS_DIGESTSIZE = 20;
-
-  byte buf[];
-  byte shs_info[];
-
-  native static byte [] shsFinal (byte info[]);
-  native static void shsUpdate (byte info[], byte buf[], int count);
-  native static byte [] shsInit ();
-
-  private void update (byte b)
-  {
-    buf [counter++] = b;
-    if (counter % SHS_BLOCKSIZE == 0)
-      {
-	counter = 0;
-	shsUpdate (shs_info, buf, SHS_BLOCKSIZE);
-      }
-  }    
-  
-  public void write (int b) throws IOException
-  {
-    update ((byte)b);
-    super.write (b);
-  }
-
-  public void write (byte[] b, int off, int len) throws IOException
-  {
-    for (int i = 0; i < len; i++)
-      write (b[i+off]);
-  }
-
-  public byte[] digest()
-  {
-    shsUpdate (shs_info, buf, counter);
-    return shsFinal (shs_info);
-  }
-
-  public SimpleSHSStream (OutputStream out)
-  {
-    super (out);
-    buf = new byte[SHS_BLOCKSIZE];
-    shs_info = shsInit ();
-    counter = 0;
-  }
-}
-
diff --git a/libjava/gnu/gcj/io/natSimpleSHSStream.cc b/libjava/gnu/gcj/io/natSimpleSHSStream.cc
deleted file mode 100644
index 0487ce7..0000000
--- a/libjava/gnu/gcj/io/natSimpleSHSStream.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// natSimpleSHSStream.cc
-
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gnu/gcj/io/SimpleSHSStream.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#define PROTO
-#include "shs.h"
-
-
-jbyteArray 
-gnu::gcj::io::SimpleSHSStream::shsFinal (jbyteArray shs_info)
-{
-  SHS_INFO *info = (SHS_INFO *)elements(shs_info);
-  ::shsFinal (info);
-
-  jbyteArray buffer = JvNewByteArray (SHS_DIGESTSIZE);
-  memcpy (elements (buffer), &info->digest, SHS_DIGESTSIZE);
-  return buffer;
-}
-    
-void 
-gnu::gcj::io::SimpleSHSStream::shsUpdate (jbyteArray shs_info, jbyteArray buf, jint count)
-{
-  SHS_INFO *info = (SHS_INFO *)elements(shs_info);
-  uint8_t *buffer = (uint8_t *)elements(buf);
-  
-  ::shsUpdate (info, buffer, count);
-}
-
-jbyteArray 
-gnu::gcj::io::SimpleSHSStream::shsInit ()
-{
-  jbyteArray result = JvNewByteArray (sizeof (SHS_INFO));
-  SHS_INFO *info = (SHS_INFO *)elements(result);
-
-  ::shsInit (info);
-  return result;
-}
-
-
diff --git a/libjava/gnu/gcj/io/shs.cc b/libjava/gnu/gcj/io/shs.cc
deleted file mode 100644
index ca82661..0000000
--- a/libjava/gnu/gcj/io/shs.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-
-/* --------------------------------- SHS.CC ------------------------------- */
-
-/*
- * NIST proposed Secure Hash Standard.
- *
- * Written 2 September 1992, Peter C. Gutmann.
- * This implementation placed in the public domain.
- *
- * Comments to pgut1@cs.aukuni.ac.nz
- */
-
-// Force C++ compiler to use Java-style EH, so we don't have to link with
-// libstdc++.
-#pragma GCC java_exceptions
-
-#include <string.h>
-#include "shs.h"
-
-/* The SHS f()-functions */
-
-#define f1(x,y,z)   ( ( x & y ) | ( ~x & z ) )		  /* Rounds  0-19 */
-#define f2(x,y,z)   ( x ^ y ^ z )			  /* Rounds 20-39 */
-#define f3(x,y,z)   ( ( x & y ) | ( x & z ) | ( y & z ) ) /* Rounds 40-59 */
-#define f4(x,y,z)   ( x ^ y ^ z )			  /* Rounds 60-79 */
-
-/* The SHS Mysterious Constants */
-
-#define K1  0x5A827999L 	/* Rounds  0-19 */
-#define K2  0x6ED9EBA1L 	/* Rounds 20-39 */
-#define K3  0x8F1BBCDCL 	/* Rounds 40-59 */
-#define K4  0xCA62C1D6L 	/* Rounds 60-79 */
-
-/* SHS initial values */
-
-#define h0init	0x67452301L
-#define h1init	0xEFCDAB89L
-#define h2init	0x98BADCFEL
-#define h3init	0x10325476L
-#define h4init	0xC3D2E1F0L
-
-/* 32-bit rotate - kludged with shifts */
-
-#define S(n,X)	((X << n) | (X >> (32 - n)))
-
-/* The initial expanding function */
-
-#define expand(count)	W [count] = W [count - 3] ^ W [count - 8] ^ W [count - 14] ^ W [count - 16]
-
-/* The four SHS sub-rounds */
-
-#define subRound1(count)    \
-	{ \
-		temp = S (5, A) + f1 (B, C, D) + E + W [count] + K1; \
-		E = D; \
-		D = C; \
-		C = S (30, B); \
-		B = A; \
-		A = temp; \
-	}
-
-#define subRound2(count)    \
-	{ \
-		temp = S (5, A) + f2 (B, C, D) + E + W [count] + K2; \
-		E = D; \
-		D = C; \
-		C = S (30, B); \
-		B = A; \
-		A = temp; \
-	}
-
-#define subRound3(count)    \
-	{ \
-		temp = S (5, A) + f3 (B, C, D) + E + W [count] + K3; \
-		E = D; \
-		D = C; \
-		C = S (30, B); \
-		B = A; \
-		A = temp; \
-	}
-
-#define subRound4(count)    \
-	{ \
-		temp = S (5, A) + f4 (B, C, D) + E + W [count] + K4; \
-		E = D; \
-		D = C; \
-		C = S (30, B); \
-		B = A; \
-		A = temp; \
-	}
-
-/* The two buffers of 5 32-bit words */
-
-uint32_t h0, h1, h2, h3, h4;
-uint32_t A, B, C, D, E;
-
-local void byteReverse OF((uint32_t *buffer, int byteCount));
-void shsTransform OF((SHS_INFO *shsInfo));
-
-/* Initialize the SHS values */
-
-void shsInit (SHS_INFO *shsInfo)
-{
-	/* Set the h-vars to their initial values */
-	shsInfo->digest [0] = h0init;
-	shsInfo->digest [1] = h1init;
-	shsInfo->digest [2] = h2init;
-	shsInfo->digest [3] = h3init;
-	shsInfo->digest [4] = h4init;
-
-	/* Initialise bit count */
-	shsInfo->countLo = shsInfo->countHi = 0L;
-}
-
-/*
- * Perform the SHS transformation.  Note that this code, like MD5, seems to
- * break some optimizing compilers - it may be necessary to split it into
- * sections, eg based on the four subrounds
- */
-
-void shsTransform (SHS_INFO *shsInfo)
-{
-       uint32_t W [80], temp;
-	int i;
-
-	/* Step A.	Copy the data buffer into the local work buffer */
-	for (i = 0; i < 16; i++)
-		W [i] = shsInfo->data [i];
-
-	/* Step B.	Expand the 16 words into 64 temporary data words */
-	expand (16); expand (17); expand (18); expand (19); expand (20);
-	expand (21); expand (22); expand (23); expand (24); expand (25);
-	expand (26); expand (27); expand (28); expand (29); expand (30);
-	expand (31); expand (32); expand (33); expand (34); expand (35);
-	expand (36); expand (37); expand (38); expand (39); expand (40);
-	expand (41); expand (42); expand (43); expand (44); expand (45);
-	expand (46); expand (47); expand (48); expand (49); expand (50);
-	expand (51); expand (52); expand (53); expand (54); expand (55);
-	expand (56); expand (57); expand (58); expand (59); expand (60);
-	expand (61); expand (62); expand (63); expand (64); expand (65);
-	expand (66); expand (67); expand (68); expand (69); expand (70);
-	expand (71); expand (72); expand (73); expand (74); expand (75);
-	expand (76); expand (77); expand (78); expand (79);
-
-	/* Step C.	Set up first buffer */
-	A = shsInfo->digest [0];
-	B = shsInfo->digest [1];
-	C = shsInfo->digest [2];
-	D = shsInfo->digest [3];
-	E = shsInfo->digest [4];
-
-	/* Step D.	Serious mangling, divided into four sub-rounds */
-	subRound1  (0); subRound1  (1); subRound1  (2); subRound1  (3);
-	subRound1  (4); subRound1  (5); subRound1  (6); subRound1  (7);
-	subRound1  (8); subRound1  (9); subRound1 (10); subRound1 (11);
-	subRound1 (12); subRound1 (13); subRound1 (14); subRound1 (15);
-	subRound1 (16); subRound1 (17); subRound1 (18); subRound1 (19);
-
-	subRound2 (20); subRound2 (21); subRound2 (22); subRound2 (23);
-	subRound2 (24); subRound2 (25); subRound2 (26); subRound2 (27);
-	subRound2 (28); subRound2 (29); subRound2 (30); subRound2 (31);
-	subRound2 (32); subRound2 (33); subRound2 (34); subRound2 (35);
-	subRound2 (36); subRound2 (37); subRound2 (38); subRound2 (39);
-
-	subRound3 (40); subRound3 (41); subRound3 (42); subRound3 (43);
-	subRound3 (44); subRound3 (45); subRound3 (46); subRound3 (47);
-	subRound3 (48); subRound3 (49); subRound3 (50); subRound3 (51);
-	subRound3 (52); subRound3 (53); subRound3 (54); subRound3 (55);
-	subRound3 (56); subRound3 (57); subRound3 (58); subRound3 (59);
-
-	subRound4 (60); subRound4 (61); subRound4 (62); subRound4 (63);
-	subRound4 (64); subRound4 (65); subRound4 (66); subRound4 (67);
-	subRound4 (68); subRound4 (69); subRound4 (70); subRound4 (71);
-	subRound4 (72); subRound4 (73); subRound4 (74); subRound4 (75);
-	subRound4 (76); subRound4 (77); subRound4 (78); subRound4 (79);
-
-	/* Step E.	Build message digest */
-	shsInfo->digest [0] += A;
-	shsInfo->digest [1] += B;
-	shsInfo->digest [2] += C;
-	shsInfo->digest [3] += D;
-	shsInfo->digest [4] += E;
-}
-
-local void byteReverse (uint32_t *buffer, int byteCount)
-{
-       uint32_t value;
-	int count;
-
-	/*
-	 * Find out what the byte order is on this machine.
-	 * Big endian is for machines that place the most significant byte
-	 * first (eg. Sun SPARC). Little endian is for machines that place
-	 * the least significant byte first (eg. VAX).
-	 *
-	 * We figure out the byte order by stuffing a 2 byte string into a
-	 * short and examining the left byte. '@' = 0x40  and  'P' = 0x50
-	 * If the left byte is the 'high' byte, then it is 'big endian'.
-	 * If the left byte is the 'low' byte, then the machine is 'little
-	 * endian'.
-	 *
-	 *                          -- Shawn A. Clifford (sac@eng.ufl.edu)
-	 */
-
-	/*
-	 * Several bugs fixed       -- Pat Myrto (pat@rwing.uucp)
-	 */
-
-	if ((*(unsigned short *) ("@P") >> 8) == '@')
-		return;
-
-       byteCount /= sizeof (uint32_t);
-	for (count = 0; count < byteCount; count++) {
-		value = (buffer [count] << 16) | (buffer [count] >> 16);
-		buffer [count] = ((value & 0xFF00FF00L) >> 8) | ((value & 0x00FF00FFL) << 8);
-	}
-}
-
-/*
- * Update SHS for a block of data.  This code assumes that the buffer size is
- * a multiple of SHS_BLOCKSIZE bytes long, which makes the code a lot more
- * efficient since it does away with the need to handle partial blocks
- * between calls to shsUpdate()
- */
-
-void shsUpdate (SHS_INFO *shsInfo, uint8_t *buffer, int count)
-{
-	/* Update bitcount */
-       if ((shsInfo->countLo + ((uint32_t) count << 3)) < shsInfo->countLo)
-		 shsInfo->countHi++;	/* Carry from low to high bitCount */
-       shsInfo->countLo += ((uint32_t) count << 3);
-       shsInfo->countHi += ((uint32_t) count >> 29);
-
-	/* Process data in SHS_BLOCKSIZE chunks */
-	while (count >= SHS_BLOCKSIZE) {
-		memcpy (shsInfo->data, buffer, SHS_BLOCKSIZE);
-		byteReverse (shsInfo->data, SHS_BLOCKSIZE);
-		shsTransform (shsInfo);
-		buffer += SHS_BLOCKSIZE;
-		count -= SHS_BLOCKSIZE;
-	}
-
-	/*
-	 * Handle any remaining bytes of data.
-	 * This should only happen once on the final lot of data
-	 */
-	memcpy (shsInfo->data, buffer, count);
-}
-
-void shsFinal (SHS_INFO *shsInfo)
-{
-	int count;
-       uint32_t lowBitcount = shsInfo->countLo, highBitcount = shsInfo->countHi;
-
-	/* Compute number of bytes mod 64 */
-	count = (int) ((shsInfo->countLo >> 3) & 0x3F);
-
-	/*
-	 * Set the first char of padding to 0x80.
-	 * This is safe since there is always at least one byte free
-	 */
-       ((uint8_t *) shsInfo->data) [count++] = 0x80;
-
-	/* Pad out to 56 mod 64 */
-	if (count > 56) {
-		/* Two lots of padding:  Pad the first block to 64 bytes */
-               memset ((uint8_t *) shsInfo->data + count, 0, 64 - count);
-		byteReverse (shsInfo->data, SHS_BLOCKSIZE);
-		shsTransform (shsInfo);
-
-		/* Now fill the next block with 56 bytes */
-		memset (shsInfo->data, 0, 56);
-	} else
-		/* Pad block to 56 bytes */
-               memset ((uint8_t *) shsInfo->data + count, 0, 56 - count);
-	byteReverse (shsInfo->data, SHS_BLOCKSIZE);
-
-	/* Append length in bits and transform */
-	shsInfo->data [14] = highBitcount;
-	shsInfo->data [15] = lowBitcount;
-
-	shsTransform (shsInfo);
-	byteReverse (shsInfo->data, SHS_DIGESTSIZE);
-}
diff --git a/libjava/gnu/gcj/io/shs.h b/libjava/gnu/gcj/io/shs.h
deleted file mode 100644
index c4b2d5a..0000000
--- a/libjava/gnu/gcj/io/shs.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* --------------------------------- SHS.H ------------------------------- */
-
-/*
- * NIST proposed Secure Hash Standard. 
- *
- * Written 2 September 1992, Peter C. Gutmann.
- * This implementation placed in the public domain. 
- *
- * Comments to pgut1@cs.aukuni.ac.nz 
- */
-
-/* Useful defines/typedefs */
-
-#ifndef SHS_H
-#define SHS_H
-
-#include<config.h>
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# else
-typedef unsigned int uint8_t __attribute__((mode(QI)));
-/* This is a blatant hack: on Solaris 2.5, pthread.h defines uint32_t
-   in pthread.h, which we sometimes include.  We protect our
-   definition the same way Solaris 2.5 does, to avoid redefining it.  */
-#  ifndef _UINT32_T
-typedef unsigned int uint32_t __attribute__((mode(SI)));
-#  endif
-# endif
-#endif
-
-#define PROTO
-
-/* The SHS block size and message digest sizes, in bytes */
-
-#define SHS_BLOCKSIZE	64
-#define SHS_DIGESTSIZE	20
-
-/* The structure for storing SHS info */
-
-typedef struct {
-       uint32_t digest [5];    /* Message digest */
-       uint32_t countLo, countHi;      /* 64-bit bit count */
-       uint32_t data [16];             /* SHS data buffer */
-} SHS_INFO;
-
-/* Turn off prototypes if requested */
-#if (defined(NOPROTO) && defined(PROTO))
-#	undef PROTO
-#endif
-
-/* Used to remove arguments in function prototypes for non-ANSI C */
-#ifdef PROTO
-#	define OF(a) a
-#else	/* !PROTO */
-#	define OF(a) ()
-#endif	/* ?PROTO */
-
-#define	local	static
-
-void shsInit OF((SHS_INFO *shsInfo));
-void shsUpdate OF((SHS_INFO *shsInfo, uint8_t *buffer, int count));
-void shsFinal OF((SHS_INFO *shsInfo));
-
-#endif
diff --git a/libjava/gnu/gcj/jvmti/Breakpoint.h b/libjava/gnu/gcj/jvmti/Breakpoint.h
deleted file mode 100644
index f614df9..0000000
--- a/libjava/gnu/gcj/jvmti/Breakpoint.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_jvmti_Breakpoint__
-#define __gnu_gcj_jvmti_Breakpoint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawDataManaged;
-      namespace jvmti
-      {
-          class Breakpoint;
-      }
-    }
-  }
-}
-
-#ifdef DIRECT_THREADED
-void _Jv_RewriteBreakpointInsn (jmethodID, jlocation, pc_t);
-#endif
-
-class gnu::gcj::jvmti::Breakpoint : public ::java::lang::Object
-{
-
-#ifdef DIRECT_THREADED
-friend void (::_Jv_RewriteBreakpointInsn (jmethodID, jlocation, pc_t));
-#endif
-
-public:
-  Breakpoint(jlong, jlong);
-  Breakpoint();
-private:
-  void _save_insn();
-public:
-  virtual void install();
-  virtual void remove();
-  virtual ::gnu::gcj::RawDataManaged * getInsn();
-  virtual void execute() = 0;
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
-  jlong location;
-private:
-  ::gnu::gcj::RawDataManaged * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_jvmti_Breakpoint__
diff --git a/libjava/gnu/gcj/jvmti/Breakpoint.java b/libjava/gnu/gcj/jvmti/Breakpoint.java
deleted file mode 100644
index 00b325a..0000000
--- a/libjava/gnu/gcj/jvmti/Breakpoint.java
+++ /dev/null
@@ -1,73 +0,0 @@
-// Breakpoint.java -  a base class for interpreter breakpoints
-
-/* Copyright (C) 2006, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.jvmti;
-
-import gnu.gcj.RawDataManaged;
-
-/**
- * Base class representing a type of breakpoint in the interpreter.
- * This class deals with saving insns and installing and
- * uninstalling insns in the interpreter for all breakpoint classes.
- *
- * @author Keith Seitz (keiths@redhat.com)
- */
-public abstract class Breakpoint
-{
-  // Location of this breakpoint
-  protected long method;
-  protected long location;
-
-  // The original instruction that this breakpoint replaced
-  private RawDataManaged data;
-
-  /**
-   * Constructs a new Breakpoint
-   *
-   * @param method the method in which to set the breakpoint
-   * @param location the location at which to set the breakpoint
-   */
-  public Breakpoint (long method, long location)
-  {
-    this.method = method;
-    this.location = location;
-  }
-
-  public Breakpoint ()
-  {
-  }
-
-  private native void _save_insn ();
-
-  /**
-   * Installs the breakpoint into the interpreter
-   */
-  public native void install ();
-
-  /**
-   * Removes the breakpoint from the interpreter, re-installing
-   * the original instruction.
-   */
-  public native void remove ();
-
-  /**
-   * Returns the original instruction at the location where
-   * this breakpoint was set
-   */
-  public RawDataManaged getInsn ()
-  {
-    return data;
-  }
-
-  /**
-   * Execute the actions of this breakpoint
-   */
-  public abstract void execute ();
-}
diff --git a/libjava/gnu/gcj/jvmti/BreakpointManager.h b/libjava/gnu/gcj/jvmti/BreakpointManager.h
deleted file mode 100644
index d53be50..0000000
--- a/libjava/gnu/gcj/jvmti/BreakpointManager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_jvmti_BreakpointManager__
-#define __gnu_gcj_jvmti_BreakpointManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace jvmti
-      {
-          class Breakpoint;
-          class BreakpointManager;
-      }
-    }
-  }
-}
-
-class gnu::gcj::jvmti::BreakpointManager : public ::java::lang::Object
-{
-
-  BreakpointManager();
-public:
-  static ::gnu::gcj::jvmti::Breakpoint * newBreakpoint(jlong, jlong);
-  static void deleteBreakpoint(jlong, jlong);
-  static ::gnu::gcj::jvmti::Breakpoint * getBreakpoint(jlong, jlong);
-private:
-  static ::gnu::gcj::jvmti::BreakpointManager * _instance;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _breakpoints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_jvmti_BreakpointManager__
diff --git a/libjava/gnu/gcj/jvmti/BreakpointManager.java b/libjava/gnu/gcj/jvmti/BreakpointManager.java
deleted file mode 100644
index 0eb9f33..0000000
--- a/libjava/gnu/gcj/jvmti/BreakpointManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// BreakpointManager.java - A convenience class for dealing with breakpoints
-
-/* Copyright (C) 2006, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.jvmti;
-
-import java.util.Hashtable;
-
-/**
- * A class which manages breakpoints in the VM interpreter engine.
- *
- * BreakpointManager is a location manager that the interpreter
- * uses to lookup the original instruction for any given installed
- * breakpoint. JVMTI does not allow multiple breakpoints to be set
- * at any given location.
- *
- * @author Keith Seitz (keiths@redhat.com)
- */
-public class BreakpointManager
-{
-  private static BreakpointManager _instance = new BreakpointManager ();
-
-  // List of breakpoints indexed by Location
-  private Hashtable _breakpoints;
-
-  private BreakpointManager ()
-  {
-    _breakpoints = new Hashtable ();
-  }
-
-  /**
-   * Creates a new breakpoint. SetBreakpoint will verify the validity
-   * of the arguments.
-   *
-   * @param method  method in which to set breakpoint (a jmethodID)
-   * @param location index where the breakpoint is to be set (a jlocation)
-   */
-  public static Breakpoint newBreakpoint (long method, long location)
-  {
-    NormalBreakpoint bp = new NormalBreakpoint (method, location);
-    Location loc = new Location (method, location);
-    bp.install ();
-    _instance._breakpoints.put (loc, bp);
-    return bp;
-  }
-
-  /**
-   * Deletes the breakpoint at the given Location
-   *
-   * @param method method in which to clear breakpoint
-   * @param location index of breakpoint in method
-   */
-  public static void deleteBreakpoint (long method, long location)
-  {
-    Location loc = new Location (method, location);
-    Breakpoint bp = (Breakpoint) _instance._breakpoints.get (loc);
-    if (bp != null)
-      {
-	bp.remove ();
-	_instance._breakpoints.remove (loc);
-      }
-  }
-
-  /**
-   * Returns the breakpoint at the given location or null if none installed
-   * at location
-   *
-   * @param method the jmethodID of the breakpoint location
-   * @param location the index in the method
-   */
-  public static Breakpoint getBreakpoint (long method, long location)
-  {
-    Location loc = new Location (method, location);
-    return (Breakpoint) _instance._breakpoints.get (loc);
-  }
-}
diff --git a/libjava/gnu/gcj/jvmti/Location.h b/libjava/gnu/gcj/jvmti/Location.h
deleted file mode 100644
index 7a00a2d..0000000
--- a/libjava/gnu/gcj/jvmti/Location.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_jvmti_Location__
-#define __gnu_gcj_jvmti_Location__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace jvmti
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::gcj::jvmti::Location : public ::java::lang::Object
-{
-
-public:
-  Location(jlong, jlong);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
-  jlong location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_jvmti_Location__
diff --git a/libjava/gnu/gcj/jvmti/Location.java b/libjava/gnu/gcj/jvmti/Location.java
deleted file mode 100644
index 8fae4dd..0000000
--- a/libjava/gnu/gcj/jvmti/Location.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Location.java - a wrapper class for breakpoint locations in JVMTI
-
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.jvmti;
-
-import java.lang.Long;
-
-/**
- * This class represents a breakpoint location (pair<jmethodID,jlocation>).
- * BreakpointManager uses this class as a key in the Map of installed
- * breakpoints.
- *
- * @author Keith Seitz (keiths@redhat.com)
- */
-public class Location
-{
-  // method (a jmethodID in JVMTI)
-  private long method;
-
-  // index (a jlocation in JVMTI)
-  private long location;
-
-  /**
-   * Constructor
-   *
-   * @param method   the method defined by this location (a jmethodID)
-   * @param location the integer index of the insn in the method (a jlocation)
-   */
-  public Location (long method, long location)
-  {
-    this.method = method;
-    this.location = location;
-  }
-
-  public int hashCode ()
-  {
-    return toString ().hashCode ();
-  }
-
-  public boolean equals (Object obj)
-  {
-    Location loc = (Location) obj;
-    return (loc.method == method && loc.location == location);
-  }
-
-  /**
-   * Converts the Location to a String
-   */
-  public String toString ()
-  {
-    return Long.toHexString (method) + "." + Long.toString (location);
-  }
-}
diff --git a/libjava/gnu/gcj/jvmti/NormalBreakpoint.h b/libjava/gnu/gcj/jvmti/NormalBreakpoint.h
deleted file mode 100644
index 8ee4cbc..0000000
--- a/libjava/gnu/gcj/jvmti/NormalBreakpoint.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_jvmti_NormalBreakpoint__
-#define __gnu_gcj_jvmti_NormalBreakpoint__
-
-#pragma interface
-
-#include <gnu/gcj/jvmti/Breakpoint.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace jvmti
-      {
-          class NormalBreakpoint;
-      }
-    }
-  }
-}
-
-class gnu::gcj::jvmti::NormalBreakpoint : public ::gnu::gcj::jvmti::Breakpoint
-{
-
-public:
-  NormalBreakpoint(jlong, jlong);
-  virtual void execute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_jvmti_NormalBreakpoint__
diff --git a/libjava/gnu/gcj/jvmti/NormalBreakpoint.java b/libjava/gnu/gcj/jvmti/NormalBreakpoint.java
deleted file mode 100644
index 4ff4883..0000000
--- a/libjava/gnu/gcj/jvmti/NormalBreakpoint.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// NormalBreakpoint.java -  a "normal" breakpoint in the interpreter
-
-/* Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.jvmti;
-
-/**
- * This class represents a "normal" breakpoint in the interpreter.
- * When the interpreter hits this breakpoint type, it will send out
- * a JVMTI breakpoint notification.
- *
- * @author Keith Seitz (keiths@redhat.com)
- */
-public class NormalBreakpoint
-  extends Breakpoint
-{
-  public NormalBreakpoint (long method, long id)
-  {
-    super (method, id);
-  }
-
-  public native void execute ();
-}
diff --git a/libjava/gnu/gcj/jvmti/natBreakpoint.cc b/libjava/gnu/gcj/jvmti/natBreakpoint.cc
deleted file mode 100644
index 87016b0..0000000
--- a/libjava/gnu/gcj/jvmti/natBreakpoint.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// natBreakpoint.cc - C++ side of Breakpoint
-
-/* Copyright (C) 2006, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gcj/method.h>
-#include <java-interp.h>
-#include <java-insns.h>
-#include <java-assert.h>
-#include <jvmti.h>
-
-#include <gnu/gcj/jvmti/Breakpoint.h>
-#include <gnu/gcj/jvmti/BreakpointManager.h>
-
-static _Jv_InterpMethod *
-get_interp_method (jlong method)
-{
-  jmethodID id = reinterpret_cast<jmethodID> (method);
-  jclass klass = _Jv_GetMethodDeclaringClass (id);
-  JvAssert (_Jv_IsInterpretedClass (klass));
-  _Jv_MethodBase *base
-    = _Jv_FindInterpreterMethod (klass, id);
-  JvAssert (base != NULL);
-  return reinterpret_cast<_Jv_InterpMethod *> (base);
-}
-
-void
-gnu::gcj::jvmti::Breakpoint::_save_insn ()
-{
-  _Jv_InterpMethod *imeth = get_interp_method (method);
-
-  // copy contents of insn at location into data
-  pc_t code = imeth->get_insn (location);
-  data = (RawDataManaged *) JvAllocBytes (sizeof (*code));
-  memcpy (data, code, sizeof (*code));
-}
-
-void
-gnu::gcj::jvmti::Breakpoint::install ()
-{
-  _save_insn ();
-  _Jv_InterpMethod *imeth = get_interp_method (method);
-  imeth->install_break (location);
-}
-
-void
-gnu::gcj::jvmti::Breakpoint::remove ()
-{
-  _Jv_InterpMethod *imeth = get_interp_method (method);
-  imeth->set_insn (location, reinterpret_cast<pc_t> (data));
-}
-
-#ifdef DIRECT_THREADED
-void
-_Jv_RewriteBreakpointInsn (jmethodID mid, jlocation loc, pc_t new_insn)
-{
-  using namespace ::gnu::gcj::jvmti;
-  Breakpoint *bp
-    = BreakpointManager::getBreakpoint (reinterpret_cast<jlong> (mid), loc);
-  if (bp != NULL)
-    {
-      pc_t old_insn = (pc_t) bp->data;
-      old_insn->insn = new_insn;
-    }
-}
-#endif // DIRECT_THREADED
diff --git a/libjava/gnu/gcj/jvmti/natNormalBreakpoint.cc b/libjava/gnu/gcj/jvmti/natNormalBreakpoint.cc
deleted file mode 100644
index be38240..0000000
--- a/libjava/gnu/gcj/jvmti/natNormalBreakpoint.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// natNormalBreakpoint.cc - C++ side of NormalBreakpoint
-
-/* Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <java-interp.h>
-#include <jvmti.h>
-#include "jvmti-int.h"
-
-#include <gnu/gcj/jvmti/NormalBreakpoint.h>
-#include <java/lang/Thread.h>
-
-void
-gnu::gcj::jvmti::NormalBreakpoint::execute ()
-{
-  using namespace ::java::lang;
-
-  Thread *thread = Thread::currentThread ();
-  JNIEnv *jni_env = _Jv_GetCurrentJNIEnv ();
-      
-  JvAssert (JVMTI_REQUESTED_EVENT (Breakpoint));
-  _Jv_JVMTI_PostEvent (JVMTI_EVENT_BREAKPOINT, thread, jni_env,
-		       method, location);
-}
diff --git a/libjava/gnu/gcj/natCore.cc b/libjava/gnu/gcj/natCore.cc
deleted file mode 100644
index 2d650f7..0000000
--- a/libjava/gnu/gcj/natCore.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// natCore -- C++ side of Core
-
-/* Copyright (C) 2001, 2002, 2003, 2005, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Anthony Green <green@redhat.com>.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <java/lang/NullPointerException.h>
-#include <java/io/IOException.h>
-#include <gnu/gcj/Core.h>
-
-// List of global core values.
-static _Jv_core_chain *root;
-
-static void
-default_register_resource (_Jv_core_chain *node)
-{
-  node->next = root;
-  root = node;
-}
-
-// This is set only when a lock is held on java.lang.Class.
-// This function is called to handle a new core node.
-void (*_Jv_RegisterCoreHook) (_Jv_core_chain *) = default_register_resource;
-
-void
-_Jv_RegisterResource (void *vptr)
-{
-  char *rptr = (char *) vptr;
-
-  _Jv_core_chain *cc = (_Jv_core_chain *) _Jv_Malloc (sizeof (_Jv_core_chain));
-
-  cc->name_length = ((int *)rptr)[0];
-  cc->data_length = ((int *)rptr)[1];
-  cc->name = rptr + 2 * sizeof (int);
-  cc->data = cc->name + cc->name_length;
-  cc->next = NULL;
-
-  (*_Jv_RegisterCoreHook) (cc);
-}
-
-void
-_Jv_FreeCoreChain (_Jv_core_chain *chain)
-{
-  while (chain != NULL)
-    {
-      _Jv_core_chain *next = chain->next;
-      _Jv_Free (chain);
-      chain = next;
-    }
-}
-
-_Jv_core_chain *
-_Jv_FindCore (_Jv_core_chain *node, jstring name)
-{
-  char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (name) + 1);
-  jsize total = JvGetStringUTFRegion (name, 0, name->length(), buf);
-  buf[total] = '\0';
-
-  // Usually requests here end up as an absolute URL.  We strip the
-  // initial `/'.
-  if (buf[0] == '/')
-    {
-      ++buf;
-      --total;
-    }
-
-  while (node)
-    {
-      if (total == node->name_length
-	  && strncmp (buf, node->name, total) == 0)
-	return node;
-      node = node->next;
-    }
-
-  return NULL;
-}
-
-gnu::gcj::Core *
-_Jv_create_core (_Jv_core_chain *node, jstring name)
-{
-  node = _Jv_FindCore (node, name);
-
-  gnu::gcj::Core *core = NULL;
-  if (node)
-    {
-      core = new gnu::gcj::Core ();
-      core->ptr = (gnu::gcj::RawData *) node->data;
-      core->length = node->data_length;
-    }
-  return core;
-}
-
-gnu::gcj::Core *
-gnu::gcj::Core::find (jstring name)
-{
-  gnu::gcj::Core *core = _Jv_create_core (root, name);
-  return core;
-}
-
-gnu::gcj::Core *
-gnu::gcj::Core::create (jstring name)
-{
-  gnu::gcj::Core *core = _Jv_create_core (root, name);
-  if (core == NULL)
-    throw new ::java::io::IOException (JvNewStringLatin1 ("can't open core"));
-  return core;
-}
diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.h b/libjava/gnu/gcj/runtime/BootClassLoader.h
deleted file mode 100644
index c1d3987..0000000
--- a/libjava/gnu/gcj/runtime/BootClassLoader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_BootClassLoader__
-#define __gnu_gcj_runtime_BootClassLoader__
-
-#pragma interface
-
-#include <gnu/gcj/runtime/HelperClassLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class BootClassLoader;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-    }
-  }
-}
-
-class gnu::gcj::runtime::BootClassLoader : public ::gnu::gcj::runtime::HelperClassLoader
-{
-
-public: // actually package-private
-  BootClassLoader(::java::lang::String *);
-public:
-  ::java::lang::Class * bootLoadClass(::java::lang::String *);
-private:
-  ::java::net::URLClassLoader * getBootURLLoader();
-public:
-  ::java::net::URL * bootGetResource(::java::lang::String *);
-  ::java::util::Enumeration * bootGetResources(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::Class * coreHandler;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::gcj::runtime::HelperClassLoader)))) initialized;
-  ::java::net::URLClassLoader * bootURLLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_BootClassLoader__
diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.java b/libjava/gnu/gcj/runtime/BootClassLoader.java
deleted file mode 100644
index 40f3147..0000000
--- a/libjava/gnu/gcj/runtime/BootClassLoader.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright (C) 2005, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-import gnu.java.net.protocol.core.Handler;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/**
- * This is a helper for the bootstrap class loader.  It is a
- * URLClassLoader so that we can read a class path and re-use all the
- * existing code for finding classes, extracting them from jars, etc.
- * However, it is never called the way that an ordinary ClassLoader is
- * called.  For instance, loadClass() is never used.
- */
-public final class BootClassLoader extends HelperClassLoader
-{
-  // This forces the core URL handler to be included in statically
-  // linked executables.  The line that adds core:/ to the search
-  // path fails otherwise.
-  static Class coreHandler = gnu.java.net.protocol.core.Handler.class;
-
-  private boolean initialized;
-  private URLClassLoader bootURLLoader;
-
-  BootClassLoader(String libdir)
-  {
-    // The BootClassLoader is the top of the delegation chain. It does not
-    // have a parent.
-    super((ClassLoader) null);
-    addDirectoriesFromProperty("java.endorsed.dirs");
-    addDirectoriesFromProperty("gnu.gcj.runtime.endorsed.dirs");
-
-    try
-      {
-	// Add core:/ to the end so any resources compiled into this
-	// executable may be found.
-	addURL(new URL("core", "", -1, "/"));
-      }
-    catch (java.net.MalformedURLException x)
-      {
-	// This should never happen.
-	throw new RuntimeException(x);
-      }
-  }
-
-  public Class bootLoadClass(String name)
-    throws ClassNotFoundException
-  {
-    Class c = findLoadedClass(name);
-    if (c == null)
-      {
-	try
-	  {
-	    // We could hack URLClassLoader to make this more
-	    // efficient, if it mattered.
-	    c = findClass(name);
-	  }
-	catch (ClassNotFoundException _)
-	  {
-	    c = null;
-	  }
-      }
-    return c;
-  }
-
-  // Parse the boot classpath and create a URLClassLoader that loads
-  // resources from it.  This is provided for the benefit of code that
-  // does things like
-  //   ClassLoader.getResourceAsStream("java/lang/Object.class")
-  private synchronized URLClassLoader getBootURLLoader()
-  {
-    if (initialized)
-      return bootURLLoader;
-    initialized = true;
-
-    Vector<URL> urls = new Vector<URL>();
-    String bootClasspath = System.getProperty ("sun.boot.class.path");
-    StringTokenizer st =
-      new StringTokenizer(bootClasspath, File.pathSeparator);
-    while (st.hasMoreTokens())
-      {
-	try
-	  {
-	    urls.add(new File(st.nextToken()).toURL());
-	  }
-	catch (java.net.MalformedURLException e)
-	  {
-	  }
-      }
-
-    if (urls.size() > 0)
-      bootURLLoader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
-    return bootURLLoader;
-  }
-
-  public URL bootGetResource(String name)
-  {
-    URL url = findResource(name);
-    if (url != null)
-      return url;
-
-    URLClassLoader loader = getBootURLLoader();
-    if (loader != null)
-      url = loader.findResource(name);
-
-    return url;
-  }
-
-  public Enumeration bootGetResources(String name) throws IOException
-  {
-    URLClassLoader loader = getBootURLLoader();
-    Enumeration[] e =
-      {
-	findResources(name),
-	(loader != null) ? loader.findResources(name) : null
-      };
-
-    Vector v = new Vector();
-    for (Enumeration en : e)
-      if (en != null)
-	while (en.hasMoreElements())
-	  v.add(en.nextElement());
-
-    return v.elements();
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/ExtensionClassLoader.h b/libjava/gnu/gcj/runtime/ExtensionClassLoader.h
deleted file mode 100644
index ee17c2d..0000000
--- a/libjava/gnu/gcj/runtime/ExtensionClassLoader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_ExtensionClassLoader__
-#define __gnu_gcj_runtime_ExtensionClassLoader__
-
-#pragma interface
-
-#include <gnu/gcj/runtime/HelperClassLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class ExtensionClassLoader;
-          class SystemClassLoader;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::ExtensionClassLoader : public ::gnu::gcj::runtime::HelperClassLoader
-{
-
-  ExtensionClassLoader();
-  void init();
-public: // actually package-private
-  static void initialize();
-  static ::gnu::gcj::runtime::ExtensionClassLoader * instance;
-  static ::gnu::gcj::runtime::SystemClassLoader * system_instance;
-public:
-  static ::java::lang::Class class$;
-
-  friend class ::java::lang::ClassLoader;
-};
-
-#endif // __gnu_gcj_runtime_ExtensionClassLoader__
diff --git a/libjava/gnu/gcj/runtime/ExtensionClassLoader.java b/libjava/gnu/gcj/runtime/ExtensionClassLoader.java
deleted file mode 100644
index 690143a..0000000
--- a/libjava/gnu/gcj/runtime/ExtensionClassLoader.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Kresten Krab Thorup <krab@gnu.org>  */
-
-package gnu.gcj.runtime;
-
-import java.net.URL;
-
-// The extension loader for libgcj.  Class loader bootstrap is a bit
-// tricky, see prims.cc and SystemClassLoader for some details.
-public final class ExtensionClassLoader extends HelperClassLoader
-{
-  private ExtensionClassLoader ()
-  {	
-  }
-
-  private void init() 
-  {
-    addDirectoriesFromProperty("java.ext.dirs");
-  }
-
-  // This can be package-private because we only call it from native
-  // code during startup.
-  static void initialize ()
-  {
-    instance.init();
-    system_instance.init();
-  }
-
-  // The only ExtensionClassLoader that can exist.
-  static ExtensionClassLoader instance = new ExtensionClassLoader();
-  // The system class loader.
-  static SystemClassLoader system_instance = new SystemClassLoader(instance);
-}
diff --git a/libjava/gnu/gcj/runtime/FinalizerThread.h b/libjava/gnu/gcj/runtime/FinalizerThread.h
deleted file mode 100644
index 572f89d..0000000
--- a/libjava/gnu/gcj/runtime/FinalizerThread.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_FinalizerThread__
-#define __gnu_gcj_runtime_FinalizerThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class FinalizerThread;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::FinalizerThread : public ::java::lang::Thread
-{
-
-public:
-  FinalizerThread();
-private:
-  void init();
-public: // actually package-private
-  static void finalizerReady();
-public:
-  void run();
-private:
-  static jboolean finalizer_ready;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_FinalizerThread__
diff --git a/libjava/gnu/gcj/runtime/FinalizerThread.java b/libjava/gnu/gcj/runtime/FinalizerThread.java
deleted file mode 100644
index c9a917c..0000000
--- a/libjava/gnu/gcj/runtime/FinalizerThread.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// FinalizerThread.java -- Thread in which finalizers are run.
-
-/* Copyright (C) 2001, 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-/**
- * @author Tom Tromey <tromey@redhat.com>
- * @date October 3, 2001
- */
-public final class FinalizerThread extends Thread
-{
-  private static boolean finalizer_ready;
-
-  public FinalizerThread ()
-  {
-    super ("LibgcjInternalFinalizerThread");
-    setDaemon (true);
-    finalizer_ready = false;
-    init();
-  }
-
-  private native void init();
-  static native void finalizerReady();
-  public native void run();
-}
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader$1.h b/libjava/gnu/gcj/runtime/HelperClassLoader$1.h
deleted file mode 100644
index ee04477..0000000
--- a/libjava/gnu/gcj/runtime/HelperClassLoader$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_HelperClassLoader$1__
-#define __gnu_gcj_runtime_HelperClassLoader$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class HelperClassLoader;
-          class HelperClassLoader$1;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::HelperClassLoader$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HelperClassLoader$1(::gnu::gcj::runtime::HelperClassLoader *);
-public:
-  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
-public: // actually package-private
-  ::gnu::gcj::runtime::HelperClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_HelperClassLoader$1__
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader.h b/libjava/gnu/gcj/runtime/HelperClassLoader.h
deleted file mode 100644
index 30311d3..0000000
--- a/libjava/gnu/gcj/runtime/HelperClassLoader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_HelperClassLoader__
-#define __gnu_gcj_runtime_HelperClassLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class HelperClassLoader;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::HelperClassLoader : public ::java::net::URLClassLoader
-{
-
-public: // actually package-private
-  HelperClassLoader();
-  HelperClassLoader(::java::lang::ClassLoader *);
-  virtual void addDirectoriesFromProperty(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_HelperClassLoader__
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader.java b/libjava/gnu/gcj/runtime/HelperClassLoader.java
deleted file mode 100644
index 3b48da1..0000000
--- a/libjava/gnu/gcj/runtime/HelperClassLoader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.StringTokenizer;
-
-/**
- * This is a URLClassLoader that has an extra helper method for
- * handling things like java.ext.dirs.
- */
-class HelperClassLoader extends URLClassLoader
-{
-  HelperClassLoader()
-  {
-    super(new URL[0]);
-  }
-  
-  HelperClassLoader(ClassLoader parent)
-  {
-    super(new URL[0], parent);
-  }
-
-  /**
-   * This is a helper method that adds all the jar and zip files from
-   * a given list of paths to this class loader.  The paths are taken
-   * from a system property whose name is provided as an argument.
-   */
-  final void addDirectoriesFromProperty(String propName)
-  {
-    StringTokenizer st
-      = new StringTokenizer (System.getProperty (propName, ""),
-			     File.pathSeparator);
-    try
-      {
-	while (st.hasMoreElements ())
-	  {
-	    String dirname = st.nextToken ();
-	    File dir = new File (dirname);
-            if (dir.exists ())
-	      {
-		if (! dirname.endsWith (File.separator))
-		  dirname = dirname + File.separator;
-		String files[] = dir.list (new FilenameFilter ()
-		  {
-		    public boolean accept (File dir, String name)
-		    {
-		      return name.endsWith (".jar") || name.endsWith (".zip");
-		    }
-		  });
-		for (int i = files.length - 1; i >= 0; i--)
-		  addURL(new URL("file", "", -1, dirname + files[i]));
-	      }
-	  }
-      }
-    catch (java.net.MalformedURLException x)
-      {
-	// This should never happen.
-	throw new RuntimeException(x);
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/JNIWeakRef.h b/libjava/gnu/gcj/runtime/JNIWeakRef.h
deleted file mode 100644
index e23a59f..0000000
--- a/libjava/gnu/gcj/runtime/JNIWeakRef.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_JNIWeakRef__
-#define __gnu_gcj_runtime_JNIWeakRef__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class JNIWeakRef;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::JNIWeakRef : public ::java::lang::ref::WeakReference
-{
-
-public:
-  JNIWeakRef(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_JNIWeakRef__
diff --git a/libjava/gnu/gcj/runtime/JNIWeakRef.java b/libjava/gnu/gcj/runtime/JNIWeakRef.java
deleted file mode 100644
index c0c76cd..0000000
--- a/libjava/gnu/gcj/runtime/JNIWeakRef.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// JNIWeakRef.java - Wrapper class for JNI-specific weak references.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-import java.lang.ref.*;
-
-// This wrapper is used by the JNI implementation to keep track of
-// global weak references.  Each such reference is wrapped in an
-// instance of this class, and automatically unwrapped when used.
-public final class JNIWeakRef extends WeakReference
-{
-  public JNIWeakRef (Object referent)
-  {
-    super (referent);
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h b/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h
deleted file mode 100644
index 7d5b5a3..0000000
--- a/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_NameFinder$Addr2Line__
-#define __gnu_gcj_runtime_NameFinder$Addr2Line__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class NameFinder;
-          class NameFinder$Addr2Line;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::NameFinder$Addr2Line : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NameFinder$Addr2Line(::gnu::gcj::runtime::NameFinder *, ::java::lang::String *);
-  virtual void close();
-  ::java::lang::Process * __attribute__((aligned(__alignof__( ::java::lang::Object)))) proc;
-  ::java::io::BufferedWriter * out;
-  ::java::io::BufferedReader * in;
-  ::gnu::gcj::runtime::NameFinder * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_NameFinder$Addr2Line__
diff --git a/libjava/gnu/gcj/runtime/NameFinder.h b/libjava/gnu/gcj/runtime/NameFinder.h
deleted file mode 100644
index 38fd98b..0000000
--- a/libjava/gnu/gcj/runtime/NameFinder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_NameFinder__
-#define __gnu_gcj_runtime_NameFinder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class NameFinder;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::NameFinder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static jboolean showRaw();
-  static jboolean removeUnknown();
-public:
-  NameFinder();
-  virtual ::java::lang::String * getSourceFile();
-  virtual jint getLineNum();
-  virtual void lookup(::java::lang::String *, jlong);
-  static ::java::lang::String * demangleInterpreterMethod(::java::lang::String *, ::java::lang::String *);
-  virtual void close();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) binaryFile;
-  ::java::lang::String * sourceFile;
-  jint lineNum;
-  ::java::util::HashMap * procs;
-  static ::java::util::Set * blacklist;
-  static jboolean use_addr2line;
-  static jboolean show_raw;
-  static jboolean remove_unknown;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_NameFinder__
diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java
deleted file mode 100644
index 0742af1..0000000
--- a/libjava/gnu/gcj/runtime/NameFinder.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/* NameFinder.java -- Translates addresses to StackTraceElements.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-import gnu.classpath.Configuration;
-import gnu.gcj.RawData;
-
-import java.lang.StringBuffer;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.File;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-
-/**
- * Lookup addresses (represented as longs) to find source & line number info.
- *
- * The following system property is available (defaults to true):
- * <li>
- * <ul><code>gnu.gcj.runtime.NameFinder.use_addr2line</code>
- *     Whether an external process, addr2line, should be used to look up
- *     source file and line number info. Throwable.printStackTrace() will
- *     be faster if this property is set to 'false'.
- * </ul>
- * <ul><code>gnu.gcj.runtime.NameFinder.remove_unknown</code>
- *     Whether calls to unknown functions (class and method names are unknown)
- *     should be removed from the stack trace. </ul>
- * </li>
- *
- * <code>close()</code> should be called to get rid of all resources.
- *
- * This class is used from <code>java.lang.VMThrowable</code>.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class NameFinder
-{
-  /**
-   * The name of the binary to look up.
-   */
-  private String binaryFile;
-  private String sourceFile;
-  private int lineNum;
-  private HashMap procs = new HashMap();
-  /**
-   * Set of binary files that addr2line should not be called on.
-   */
-  private static Set blacklist = Collections.synchronizedSet(new HashSet());
-
-  private static boolean use_addr2line
-          = Boolean.valueOf(System.getProperty
-                ("gnu.gcj.runtime.NameFinder.use_addr2line", "true")
-            ).booleanValue();
-
-  private static boolean show_raw
-          = Boolean.valueOf(System.getProperty
-                ("gnu.gcj.runtime.NameFinder.show_raw", "false")
-            ).booleanValue();
-
-  /**
-   * Return true if raw addresses should be printed in stacktraces
-   * when no line number information is available.
-   */
-  static final boolean showRaw()
-  {
-    return show_raw;
-  }
-
-  private static final boolean remove_unknown
-	  = Boolean.valueOf(System.getProperty
-		("gnu.gcj.runtime.NameFinder.remove_unknown", "true")
-	    ).booleanValue();
-
-  /**
-   * Return true if non-Java frames should be removed from stack
-   * traces.
-   */
-  static final boolean removeUnknown()
-  {
-    return remove_unknown;
-  }
-
-  class Addr2Line
-  {
-    Process proc;
-    BufferedWriter out;
-    BufferedReader in;
-
-    Addr2Line(String binaryFile)
-    {
-      try
-      {
-	String[] exec = new String[] {"addr2line", "-e", binaryFile};
-	Runtime runtime = Runtime.getRuntime();
-	proc = runtime.exec(exec);
-      }
-      catch (IOException ioe)
-      {
-      }
-
-      if (proc != null)
-      {
-	in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-	out = new BufferedWriter(new OutputStreamWriter(proc.getOutputStream()));
-      }
-    }
-    
-    void close()
-    {
-      try
-      {
-	if (in != null)
-	  in.close();
-	if (out != null)
-	  out.close();
-      }
-      catch (IOException x) {}
-      if (proc != null)
-	proc.destroy();
-    }
-  }
-
-  /**
-   * Create a new NameFinder to lookup names in binaryFile. Call close to get rid of any 
-   * resources created while using the <code>lookup</code> methods.
-   */
-  public NameFinder()
-  {
-  }
-
-  /**
-   * Returns the source file name if lookup() was successful. If the source file could not be 
-   * determined, the binary name will be returned instead.
-   */
-  public String getSourceFile()
-  {
-    String file;
-    if (sourceFile != null)
-      file = sourceFile;
-    else
-      file = binaryFile;
-    
-    return file.substring(file.lastIndexOf(File.separator) + 1, file.length());
-  }
-
-  /**
-   * If lookup() was successful, returns the line number of addr. If the line number could not
-   * be determined, -1 is returned.
-   */  
-  public int getLineNum()
-  {
-    return lineNum;
-  }
-  
-  public void lookup (String file, long addr)
-  {
-    binaryFile = file;
-    sourceFile = null;
-    lineNum = -1;
-    
-    if (! use_addr2line || blacklist.contains(file))
-      return;
-    Addr2Line addr2line = (Addr2Line) procs.get(file);
-    if (addr2line == null)
-      {
-      addr2line = new Addr2Line(file);
-      procs.put(file, addr2line);
-      }
-    
-    if (addr2line.proc == null)
-      {
-        use_addr2line = false;
-	return;
-      }
-    
-    String hexAddr = "0x" + Long.toHexString(addr);
-    String name;
-
-    try
-      {
-      addr2line.out.write(hexAddr);
-      addr2line.out.newLine();
-      addr2line.out.flush();
-      String result = addr2line.in.readLine();
-
-      if (result.indexOf("??") == -1)
-	{
-	  int split = result.lastIndexOf(':');
-	  sourceFile = result.substring(0, split);
-	  String lineNumStr = result.substring(split + 1, result.length());
-	  lineNum = Integer.parseInt (lineNumStr);
-	}
-      else
-        {
-	  /* This binary has no debug info (assuming addr was valid). 
-	     Avoid repeat addr2line invocations. */
- 	  blacklist.add(binaryFile);
-	}
-      }
-    catch (IOException ioe)
-      {
-      addr2line = null;
-      }
-    catch (NumberFormatException x)
-      {
-      }
-  }
-
-  /**
-   * Returns human readable method name and aguments given a method type
-   * signature as known to the interpreter and a classname.
-   */
-  public static String demangleInterpreterMethod(String m, String cn)
-  {
-    int index = 0;
-    int length = m.length();
-    StringBuffer sb = new StringBuffer(length);
-
-    // Figure out the real method name
-    if (m.startsWith("<init>"))
-      {
-	String className;
-	int i = cn.lastIndexOf('.');
-	if (i < 0)
-	  className = cn;
-	else
-	  className = cn.substring(i + 1);
-	sb.append(className);
-	index += 7;
-      }
-    else
-      {
-	int i = m.indexOf('(');
-	if (i > 0)
-	  {
-	    sb.append(m.substring(0,i));
-	    index += i + 1;
-	  }
-      }
-
-    sb.append('(');
-
-    // Demangle the type arguments
-    int arrayDepth = 0;
-    char c = (index < length) ? m.charAt(index) : ')';
-    while (c != ')')      
-      {
-	String type;
-	switch(c)
-	{
-          case 'B':
-            type = "byte";
-	    break;
-          case 'C':
-            type = "char";
-	    break;
-          case 'D':
-            type = "double";
-	    break;
-          case 'F':
-            type = "float";
-	    break;
-          case 'I':
-            type = "int";
-	    break;
-          case 'J':
-            type = "long";
-	    break;
-          case 'S':
-            type = "short";
-	    break;
-          case 'Z':
-            type = "boolean";
-	    break;
-          case 'L':
-	    int i = m.indexOf(';', index);
-	    if (i > 0)
-	      {
-		type = m.substring(index+1, i);
-		index = i;
-	      }
-	    else
-	      type = "<unknown ref>";
-	    break;
-          case '[':
-	    type = "";
-	    arrayDepth++;
-	    break;
-          default:
-	    type = "<unknown " + c + '>';
-	}
-	sb.append(type);
-
-	// Handle arrays
-	if (c != '[' && arrayDepth > 0)
-	  while (arrayDepth > 0)
-	    {
-	      sb.append("[]");
-	      arrayDepth--;
-	    }
-
-	index++;
-	char nc = (index < length) ? m.charAt(index) : ')';
-	if (c != '[' && nc  != ')')
-	  sb.append(", ");
-	c = nc;
-      }
-
-    // Stop. We are not interested in the return type.
-    sb.append(')');
-    return sb.toString();
-  }
-
-  /**
-   * Releases all resources used by this NameFinder.
-   */
-  public void close()
-  {
-    Iterator itr = procs.values().iterator();
-    while (itr.hasNext())
-      {
-        Addr2Line proc = (Addr2Line) itr.next();
-        proc.close();
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h b/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h
deleted file mode 100644
index 2cd93fa..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_PersistentByteMap$AccessMode__
-#define __gnu_gcj_runtime_PersistentByteMap$AccessMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap$AccessMode;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel$MapMode;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::PersistentByteMap$AccessMode : public ::java::lang::Object
-{
-
-  PersistentByteMap$AccessMode(::java::nio::channels::FileChannel$MapMode *);
-public: // actually package-private
-  static ::java::nio::channels::FileChannel$MapMode * access$0(::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
-private:
-  ::java::nio::channels::FileChannel$MapMode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mapMode;
-public:
-  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * READ_ONLY;
-  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * READ_WRITE;
-  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * PRIVATE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_PersistentByteMap$AccessMode__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h b/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h
deleted file mode 100644
index 39cad37..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
-#define __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap;
-          class PersistentByteMap$ByteWrapper;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::PersistentByteMap$ByteWrapper : public ::java::lang::Object
-{
-
-public:
-  PersistentByteMap$ByteWrapper(::gnu::gcj::runtime::PersistentByteMap *, JArray< jbyte > *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bytes;
-  jint hash;
-  ::gnu::gcj::runtime::PersistentByteMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h b/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h
deleted file mode 100644
index 65df6ce..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_PersistentByteMap$HashIterator__
-#define __gnu_gcj_runtime_PersistentByteMap$HashIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap;
-          class PersistentByteMap$HashIterator;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::PersistentByteMap$HashIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistentByteMap$HashIterator(::gnu::gcj::runtime::PersistentByteMap *, jint);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) idx;
-  jint count;
-  jint type;
-public: // actually package-private
-  ::gnu::gcj::runtime::PersistentByteMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_PersistentByteMap$HashIterator__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h b/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h
deleted file mode 100644
index 7cb8b63..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_PersistentByteMap$MapEntry__
-#define __gnu_gcj_runtime_PersistentByteMap$MapEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap$MapEntry;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::PersistentByteMap$MapEntry : public ::java::lang::Object
-{
-
-public:
-  PersistentByteMap$MapEntry(jint, ::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * getKey();
-  ::java::lang::Object * getValue();
-  jint getBucket();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::Object * value;
-  jint bucket;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_PersistentByteMap$MapEntry__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap.h b/libjava/gnu/gcj/runtime/PersistentByteMap.h
deleted file mode 100644
index 1bac1d2..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_PersistentByteMap__
-#define __gnu_gcj_runtime_PersistentByteMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap;
-          class PersistentByteMap$AccessMode;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class MappedByteBuffer;
-      namespace channels
-      {
-          class FileChannel;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::PersistentByteMap : public ::java::lang::Object
-{
-
-  PersistentByteMap(::java::io::File *);
-public:
-  PersistentByteMap(::java::lang::String *, ::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
-  PersistentByteMap(::java::io::File *, ::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
-private:
-  void init(::gnu::gcj::runtime::PersistentByteMap *, ::java::io::File *, jint, jint);
-public:
-  static ::gnu::gcj::runtime::PersistentByteMap * emptyPersistentByteMap(::java::io::File *, jint, jint);
-private:
-  jint getWord(jint);
-  void putWord(jint, jint);
-public:
-  virtual ::java::util::Set * entrySet();
-private:
-  jint getBucket(jint);
-  jint getKeyPos(jint);
-  jint getValuePos(jint);
-  void putKeyPos(jint, jint);
-  void putValuePos(jint, jint);
-  JArray< jbyte > * getBytes(jint);
-  jint hash(JArray< jbyte > *);
-public:
-  virtual JArray< jbyte > * get(JArray< jbyte > *);
-  virtual void put(JArray< jbyte > *, JArray< jbyte > *);
-private:
-  jint addBytes(JArray< jbyte > *);
-public:
-  virtual ::java::util::Iterator * iterator(jint);
-  virtual jint size();
-  virtual jint stringTableSize();
-  virtual jint capacity();
-  virtual void force();
-  virtual ::java::io::File * getFile();
-  virtual void close();
-  virtual void putAll(::gnu::gcj::runtime::PersistentByteMap *);
-public: // actually package-private
-  static jint access$0(::gnu::gcj::runtime::PersistentByteMap *);
-  static jint access$1(::gnu::gcj::runtime::PersistentByteMap *);
-  static jint access$2(::gnu::gcj::runtime::PersistentByteMap *, jint);
-  static jint access$3(::gnu::gcj::runtime::PersistentByteMap *, jint);
-  static JArray< jbyte > * access$4(::gnu::gcj::runtime::PersistentByteMap *, jint);
-private:
-  ::java::nio::MappedByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buf;
-  static const jint MAGIC = 0;
-  static const jint VERSION = 4;
-  static const jint CAPACITY = 8;
-  static const jint TABLE_BASE = 12;
-  static const jint STRING_BASE = 16;
-  static const jint STRING_SIZE = 20;
-  static const jint FILE_SIZE = 24;
-  static const jint ELEMENTS = 28;
-  static const jint INT_SIZE = 4;
-  static const jint TABLE_ENTRY_SIZE = 8;
-  jint capacity__;
-  jint table_base;
-  jint string_base;
-  jint string_size;
-  jint file_size;
-  jint elements;
-  jlong length;
-  ::java::io::File * name;
-  static const jint UNUSED_ENTRY = -1;
-public:
-  static const jint KEYS = 0;
-  static const jint VALUES = 1;
-  static const jint ENTRIES = 2;
-private:
-  ::java::util::HashMap * values;
-public: // actually package-private
-  ::java::nio::channels::FileChannel * fc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_PersistentByteMap__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap.java b/libjava/gnu/gcj/runtime/PersistentByteMap.java
deleted file mode 100644
index fec3080..0000000
--- a/libjava/gnu/gcj/runtime/PersistentByteMap.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/* Copyright (C) 2004, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-
-
-/*  A PersistentByteMap maps a byte array to another byte array.  It
-uses a file that does not need to be serialized but may be
-memory-mapped and read in-place.  So, even if there are many instances
-of gcj applications running, they can share PersistentByteMaps.
-
-The idea is to make searches as fast as possible: opening a
-PersistentByteMap is cheap and search time doesn't grow with the
-number of entries in the table.  On the other hand, enumerating the
-map is slow, but that is a relatively uncommon operation.
-
-The main use of this class is to provide a way to map the
-MessageDigest of a class file to the location of a DSO that contains
-the compiled version of that class.  It is up the the installer of an
-application to keep the DSO up to date with the jar.  
-
-USAGE:
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        digest = md.digest(bytes);
-
-        PersistentByteMap map 
-          = new PersistentByteMap
-            (fileName, PersistentByteMap.AccessMode.READ_ONLY);
-
-        byte[] soName = map.get(digest);
-        if (soName)
-          {
-            String SharedLibraryName = new String(soName);
-
-BUGS/FEATURES:
-        remove() isn't written yet.
-
-        capacity is fixed once the map has been created.
-
-        We use linear probing to resolve collisions.  It might be
-        better to use a scheme that results in fewer probes to
-        determine that an item isn't found.  However, even when the
-        table is half full there are only on average 1.5 probes for a
-        successful search and 2.5 probes for an unsuccessful one.
-
-	We don't do any locking at all: adding to a PersistentByteMap
-	at runtime is possible, but it requires filesystem locks
-	around get(), put(), and remove().
-*/
-
-package gnu.gcj.runtime;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.security.MessageDigest;
-import java.math.BigInteger;
-
-public class PersistentByteMap
-{
-  private MappedByteBuffer buf;
-
-  static private final int MAGIC = 0;
-  static private final int VERSION = 4;
-  static private final int CAPACITY = 8;
-  static private final int TABLE_BASE = 12;
-  static private final int STRING_BASE = 16;
-  static private final int STRING_SIZE = 20;
-  static private final int FILE_SIZE = 24;
-  static private final int ELEMENTS = 28;
-  
-  static private final int INT_SIZE = 4;
-
-  static private final int TABLE_ENTRY_SIZE = 2 * INT_SIZE;
-
-  private int capacity;   // number of entries
-  private int table_base;   // offset from start of file, in bytes
-  private int string_base;  // offset from start of file, in bytes
-  private int string_size;  // size of string table, in bytes
-  private int file_size;    // size of file, in bytes;
-  private int elements;     // number of elements in table
-
-  private long length;      // the length of the underlying file
-
-  private final File name;  // The name of the underlying file
-
-  static private final int UNUSED_ENTRY = -1; 
-
-  static public final int KEYS = 0;
-  static public final int VALUES = 1;
-  static public final int ENTRIES = 2;
-
-  private HashMap values;   // A map of strings in the string table.
-
-  FileChannel fc;           // The underlying file channel.
-
-  static final public class AccessMode
-  {
-    private final FileChannel.MapMode mapMode;
-
-    static
-    {
-      READ_ONLY = new AccessMode(FileChannel.MapMode.READ_ONLY);
-      READ_WRITE = new AccessMode(FileChannel.MapMode.READ_WRITE);
-      PRIVATE = new AccessMode(FileChannel.MapMode.PRIVATE);
-    }
-
-    public static final AccessMode READ_ONLY;
-    public static final AccessMode READ_WRITE; 
-    public static final AccessMode PRIVATE;
-
-    private AccessMode(FileChannel.MapMode mode)
-    {
-      this.mapMode = mode;
-    }
-  }
-
-  private PersistentByteMap(File name)
-  {
-    this.name = name;
-  }
-
-  public PersistentByteMap(String filename, AccessMode mode)
-    throws IOException 
-  {
-    this(new File(filename), mode);
-  }
-
-  public PersistentByteMap(File f, AccessMode mode)
-    throws IOException 
-  {
-    name = f;
-
-    if (mode == AccessMode.READ_ONLY)
-      {
-        FileInputStream fis = new FileInputStream(f);
-        fc = fis.getChannel();
-      }
-    else
-      {
-        RandomAccessFile fos = new RandomAccessFile(f, "rw");
-        fc = fos.getChannel();
-      }
-
-    length = fc.size();
-    buf = fc.map(mode.mapMode, 0, length);
-
-    int magic = getWord (MAGIC);
-    if (magic != 0x67636a64) /* "gcjd" */
-      throw new IllegalArgumentException(f.getName());
-
-    table_base = getWord (TABLE_BASE);
-    capacity = getWord (CAPACITY);
-    string_base = getWord (STRING_BASE);
-    string_size = getWord (STRING_SIZE);
-    file_size = getWord (FILE_SIZE);
-    elements = getWord (ELEMENTS);
-
-    // FIXME:  Insert a bunch of sanity checks here
-  }
-
-  private void init (PersistentByteMap m, File f, int capacity, int strtabSize)
-    throws IOException 
-  {
-    f.createNewFile();
-    RandomAccessFile raf = new RandomAccessFile(f, "rw");
-
-    {        
-      // The user has explicitly provided a size for the table.
-      // We're going to make that size prime.  This isn't
-      // strictly necessary but it can't hurt.
-      //
-      // We expand the size by 3/2 and round the result because the
-      // hash table is intolerably slow when more than 2/3 full.
-      
-      BigInteger size = new BigInteger(Integer.toString(((capacity*3)+1)/2));
-      BigInteger two = BigInteger.ONE.add(BigInteger.ONE);
-      
-      if (size.getLowestSetBit() != 0) // A hard way to say isEven()
-	size = size.add(BigInteger.ONE);
-    
-      while (! size.isProbablePrime(10))
-	size = size.add(two);
-      
-      this.capacity = capacity = size.intValue();
-    }
-
-    table_base = 64;
-    string_base = table_base + capacity * TABLE_ENTRY_SIZE;
-    string_size = 0;
-    file_size = string_base;
-    elements = 0;
-
-    int totalFileSize = string_base + strtabSize;
-
-    // Create the file; this rounds up the size of the file to a fixed
-    // number of 4k pages.
-    byte[] _4k = new byte[4096];
-    for (long i = 0; i < totalFileSize; i+= 4096)
-      raf.write(_4k);
-        
-    fc = raf.getChannel();
-    buf = fc.map(FileChannel.MapMode.READ_WRITE, 0, raf.length());
-
-    for (int i = 0; i < capacity; i++)
-      putKeyPos(UNUSED_ENTRY, i);
-        
-    putWord(0x67636a64, MAGIC);
-    putWord(0x01, VERSION);
-    putWord(capacity, CAPACITY);
-    putWord(table_base, TABLE_BASE);
-    putWord(string_base, STRING_BASE);
-    putWord(file_size, FILE_SIZE);
-    putWord(elements, ELEMENTS);
-    buf.force();
-
-    length = fc.size();
-    string_size = 0;
-  }     
-
-  static public PersistentByteMap 
-  emptyPersistentByteMap(File name, int capacity, int strtabSize)
-    throws IOException 
-  {
-    PersistentByteMap m = new PersistentByteMap(name);
-    m.init(m, name, capacity, strtabSize);
-    return m;
-  }     
-
-  private int getWord (int index)
-  {
-    buf.position(index);
-    byte[] wordBuf = new byte[4];
-    buf.get(wordBuf);
-
-    int result = (int)wordBuf[0]&0xff;
-    result += ((int)wordBuf[1]&0xff) << 8;
-    result += ((int)wordBuf[2]&0xff) << 16;
-    result += ((int)wordBuf[3]&0xff) << 24;
-    return result;
-  }
-
-  private void putWord (int word, int index)
-  {
-    buf.position(index);
-    byte[] wordBuf = new byte[4];
-    wordBuf[0] = (byte)(word);
-    wordBuf[1] = (byte)(word >>> 8);
-    wordBuf[2] = (byte)(word >>> 16);
-    wordBuf[3] = (byte)(word >>> 24);
-    buf.put(wordBuf);
-  }
-
-  public Set entrySet()
-  {
-    return null;
-  }
-
-  private int getBucket(int n)
-  {
-    return table_base + (2*n * INT_SIZE);
-  }
-
-  private int getKeyPos(int n)
-  {
-    return getWord(getBucket(n));
-  }
-  
-  private int getValuePos(int n)
-  {
-    return getWord(getBucket(n) + INT_SIZE);
-  }
-
-  private void putKeyPos(int index, int n)
-  {
-    putWord(index, getBucket(n));
-  }
-
-  private void putValuePos(int index, int n)
-  {
-    putWord(index, getBucket(n) + INT_SIZE);
-  }
-
-  private byte[] getBytes(int n)
-  {
-    int len = getWord (string_base + n);
-    int base = string_base + n + INT_SIZE;
-    byte[] key = new byte[len];
-    buf.position(base);
-    buf.get(key, 0, len);
-    return key;
-  }
-
-  private int hash (byte[] b)
-  {    
-    // We assume that the message digest is evenly distributed, so we
-    // only need to use a few bytes of it as the hash function.
-    long hashIndex 
-      = ((b[0]&0xffL)
-         + ((b[1]&0xffL)<<8) 
-         + ((b[2]&0xffL)<<16) 
-         + ((b[3]&0xffL)<<24));
-    long result = hashIndex % (long)capacity;
-    return (int)result;
-  }
-        
-  public byte[] get(byte[] digest)
-  {
-    int hashIndex = hash(digest);
-
-    do
-      {
-        int k = getKeyPos(hashIndex);
-        if (k == UNUSED_ENTRY)
-          return null;
-
-        if (Arrays.equals ((byte[])digest, getBytes(k)))
-          return getBytes(getValuePos(hashIndex));
-                
-        // Use linear probing to resolve hash collisions.  This may
-        // not be theoretically as good as open addressing, but it has
-        // good cache behviour.
-        hashIndex++;
-        hashIndex %= capacity;
-      }
-    while (true);
-  }
-
-  public void put(byte[] digest, byte[] value)
-    throws IllegalAccessException
-  {
-    int hashIndex = hash(digest);
-
-    if (elements >= capacity())
-      throw new IllegalAccessException("Table Full: " + elements);
-
-    do
-      {
-        int k = getKeyPos(hashIndex);
-        if (k == UNUSED_ENTRY)
-          {
-            int newKey = addBytes(digest);
-            putKeyPos(newKey, hashIndex);
-            int newValue = addBytes(value);
-            putValuePos(newValue, hashIndex);
-            elements++;
-            putWord(elements, ELEMENTS);            
-            return;
-          }
-        else if (Arrays.equals (digest, getBytes(k)))
-          {
-            int newValue = addBytes((byte[])value);
-            putValuePos(newValue, hashIndex);
-            return;
-          }
-                
-        hashIndex++;
-        hashIndex %= capacity;
-      }
-    while (true);
-  }
-
-  private int addBytes (byte[] data)
-    throws IllegalAccessException
-  {
-    if (data.length > 16)
-      {
-	// Keep track of long strings in the hope that we will be able
-	// to re-use them.
-	if (values == null)
-	  {
-	    values = new HashMap();
-	
-	    for (int i = 0; i < capacity; i++)
-	      if (getKeyPos(i) != UNUSED_ENTRY)
-		{
-		  int pos = getValuePos(i);
-		  ByteWrapper bytes = new ByteWrapper(getBytes(pos));
-		  values.put(bytes, new Integer(pos));
-		}
-	  }
-
-	{
-	  Object result = values.get(new ByteWrapper(data));
-	  if (result != null)
-	    {
-	      // We already have this value in the string table
-	      return ((Integer)result).intValue();
-	    }
-	}
-      }
-
-    if (data.length + INT_SIZE >= this.length)
-      throw new IllegalAccessException("String table Full");
-
-    int extent = string_base+string_size;
-    int top = extent;
-    putWord(data.length, extent);
-    extent += INT_SIZE;
-    buf.position(extent);
-    buf.put(data, 0, data.length);
-    extent += data.length;
-    extent += INT_SIZE-1;
-    extent &= ~(INT_SIZE-1); // align
-    string_size = extent - string_base;
-    file_size = extent;
-    putWord (string_size, STRING_SIZE);
-    putWord (file_size, FILE_SIZE);
-
-    if (data.length > 16)
-      values.put(new ByteWrapper(data), new Integer(top - string_base));
-        
-    return top - string_base;
-  }
-
-  public Iterator iterator(int type)
-  {
-    return new HashIterator(type);
-  }
-
-  public int size()
-  {
-    return elements;
-  }
-
-  public int stringTableSize()
-  {
-    return string_size;
-  }
-
-  public int capacity()
-  {
-    // With the the table 2/3 full there will be on average 2 probes
-    // for a successful search and 5 probes for an unsuccessful one.
-    return capacity * 2/3;
-  }
-
-  public void force()
-  {
-    buf.force();
-  }
-
-  public File getFile()
-  {
-    return name;
-  }
-
-  // Close the map.  Once this has been done, the map can no longer be
-  // used.
-  public void close() throws IOException
-  {
-    force();
-    fc.close();
-  }
-
-  public void 
-  putAll(PersistentByteMap t)
-    throws IllegalAccessException
-  {
-    // We can use a fast copy if the size of a map has not changed.
-    if (this.elements == 0 && t.capacity == this.capacity
-	&& t.length == this.length)
-      {
-	this.buf.position(0);
-	t.buf.position(0);
-	this.buf.put(t.buf);
-	this.table_base = t.table_base;
-	this.string_base = t.string_base;
-	this.string_size = t.string_size;
-	this.file_size = t.file_size;
-	this.elements = t.elements;
-	if (t.values != null)
-	  this.values = (HashMap)t.values.clone();
-	return;
-      }
-
-    // Otherwise do it the hard way.
-    Iterator iterator = t.iterator(PersistentByteMap.ENTRIES);
-    while (iterator.hasNext())
-      {
-	PersistentByteMap.MapEntry entry 
-	  = (PersistentByteMap.MapEntry)iterator.next();
-	this.put((byte[])entry.getKey(), (byte[])entry.getValue());
-      }
-  }
-	
-
-  private final class HashIterator implements Iterator
-  {
-    /** Current index in the physical hash table. */
-
-    private int idx;
-    private int count;
-    private final int type;
-
-    /**
-     * Construct a new HashIterator with the supplied type.
-     * @param type {@link #KEYS}, {@link #VALUES}, or {@link #ENTRIES}
-     */
-    HashIterator(int type)
-    {
-      this.type = type;
-      count = elements;
-      idx = 0;
-    }
-
-    /**
-     * Returns true if the Iterator has more elements.
-     * @return true if there are more elements
-     * @throws ConcurrentModificationException if the HashMap was modified
-     */
-    public boolean hasNext()
-    {
-      return count > 0;
-    }
-
-    /**
-     * Returns the next element in the Iterator's sequential view.
-     * @return the next element
-     * @throws ConcurrentModificationException if the HashMap was modified
-     * @throws NoSuchElementException if there is none
-     */
-    public Object next()
-    {
-      count--;
-      for (int i = idx; i < capacity; i++)
-        if (getKeyPos(i) != UNUSED_ENTRY)
-          {
-            idx = i+1;
-            if (type == VALUES)
-              return getBytes(getValuePos(i));
-            if (type == KEYS)
-              return getBytes(getKeyPos(i));
-            return new MapEntry(i,
-                                getBytes(getKeyPos(i)),
-                                getBytes(getValuePos(i)));
-          }
-      return null;
-    }    
-
-    /**
-     * Remove from the underlying collection the last element returned
-     * by next (optional operation). This method can be called only
-     * once after each call to <code>next()</code>. It does not affect
-     * what will be returned by subsequent calls to next.
-     *
-     * @throws IllegalStateException if next has not yet been called
-     *         or remove has already been called since the last call
-     *         to next.
-     * @throws UnsupportedOperationException if this Iterator does not
-     *         support the remove operation.
-     */
-     public void remove()
-    {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  static public final class MapEntry
-  {
-    private final Object key;
-    private final Object value;
-    private final int bucket;
-
-    public MapEntry(int bucket, Object newKey, Object newValue)
-    {
-      this.key = newKey;
-      this.value = newValue;
-      this.bucket = bucket;
-    }
-
-    public final Object getKey()
-    {
-      return key;
-    }
-
-    public final Object getValue()
-    {
-      return value;
-    }
-
-    public final int getBucket()
-    {
-      return bucket;
-    }
-  }
-
-  // A wrapper class for a byte array that allows collections to be
-  // made.
-  private final class ByteWrapper
-  {
-    final byte[] bytes;
-    final int hash;
-
-    public ByteWrapper (byte[] bytes)
-    {
-      int sum = 0;
-      this.bytes = bytes;
-      for (int i = 0; i < bytes.length; i++)
-	sum += bytes[i];
-      hash = sum;
-    }
-
-    public int hashCode()
-    {
-      return hash;
-    }
-  
-    public boolean equals(Object obj)
-    {
-      return Arrays.equals(bytes, ((ByteWrapper)obj).bytes);
-    }
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/SharedLibHelper.h b/libjava/gnu/gcj/runtime/SharedLibHelper.h
deleted file mode 100644
index b2900b7..0000000
--- a/libjava/gnu/gcj/runtime/SharedLibHelper.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_SharedLibHelper__
-#define __gnu_gcj_runtime_SharedLibHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-        class RawData;
-      namespace runtime
-      {
-          class SharedLibHelper;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class CodeSource;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class gnu::gcj::runtime::SharedLibHelper : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SharedLibHelper(::java::lang::String *, ::java::lang::ClassLoader *, ::java::security::CodeSource *, ::java::security::ProtectionDomain *, jint);
-public:
-  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::String *);
-public: // actually package-private
-  static void copyFile(::java::io::File *, ::java::io::File *);
-public:
-  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::ClassLoader *, ::java::lang::String *, ::java::security::CodeSource *, jboolean);
-  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::ClassLoader *, ::java::lang::String *, ::java::security::CodeSource *, ::java::security::ProtectionDomain *, jboolean);
-  virtual void finalize();
-  virtual ::java::lang::Class * findClass(::java::lang::String *);
-  virtual ::java::net::URL * findResource(::java::lang::String *);
-  virtual ::gnu::gcj::Core * findCore(::java::lang::String *);
-public: // actually package-private
-  virtual void ensureInit();
-  virtual jboolean hasResource(::java::lang::String *);
-  virtual void init();
-  virtual void ensureSupersLinked(::java::lang::Class *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual void registerClass(::java::lang::String *, ::java::lang::Class *);
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handler;
-  ::gnu::gcj::RawData * core_chain;
-  ::java::util::HashMap * classMap;
-  ::java::lang::ClassLoader * loader;
-  ::java::lang::String * baseName;
-  ::java::security::ProtectionDomain * domain;
-  jint flags;
-  jboolean initialized;
-  static ::java::util::HashMap * map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_SharedLibHelper__
diff --git a/libjava/gnu/gcj/runtime/SharedLibHelper.java b/libjava/gnu/gcj/runtime/SharedLibHelper.java
deleted file mode 100644
index bdf7c04..0000000
--- a/libjava/gnu/gcj/runtime/SharedLibHelper.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/* Copyright (C) 2001, 2003, 2004, 2005  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.security.*;
-import gnu.gcj.Core;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.nio.channels.FileChannel;
-import java.io.*;
-
-public class SharedLibHelper
-{
-  /** Load a shared library, and associate a ClassLoader with it.
-   * @param libname named of shared library (passed to dlopen)
-   * @param parent the parent ClassLoader
-   * @parem flags passed to dlopen
-   */
-  SharedLibHelper(String libname, ClassLoader parent, CodeSource source,
-		  ProtectionDomain domain, int flags)
-  {
-    // FIXME: ask security manager first.
-    loader = parent;
-    baseName = libname;
-    if (domain == null)
-      domain = new ProtectionDomain(source,
-				    Policy.getPolicy().getPermissions(source));
-    this.domain = domain;
-    this.flags = flags;
-  }
-
-  public static SharedLibHelper findHelper (String libname)
-  {
-    synchronized (map)
-      {
-	Set s = (Set)map.get(libname);
-	if (s == null)
-	  return null;
-	for (Iterator i=s.iterator(); i.hasNext();)
-	  {
-	    WeakReference ref = (WeakReference)i.next();
-	    if (ref != null)
-	      return (SharedLibHelper) ref.get();
-	  }
-	return null;
-      }
-  }
-
-  static void copyFile (File in, File out) throws IOException 
-  {
-    FileChannel source = new FileInputStream(in).getChannel();
-    FileChannel destination = new FileOutputStream(out).getChannel();
-    source.transferTo(0, source.size(), destination);
-    source.close();
-    destination.close();
-  }
-
-  public static SharedLibHelper findHelper (ClassLoader loader, String libname,
-					    CodeSource source,
-					    boolean tryParents)
-  {
-    return findHelper (loader, libname, source, null, tryParents);
-  }
-
-  public static SharedLibHelper findHelper (ClassLoader loader, String libname,
-					    CodeSource source,
-					    ProtectionDomain domain, 
-					    boolean tryParents)
-  {
-    synchronized (map)
-      {
-	SharedLibHelper result;
-	Set s = (Set)map.get(libname);
-	if (s == null)
-	  {
-	    s = new HashSet();
-	    map.put(libname, s);
-	  }
-	else
-	  {
-	    for (Iterator i=s.iterator(); i.hasNext();)
-	      {
-		WeakReference ref = (WeakReference)i.next();
-		if (ref != null)
-		  {
-		    result = (SharedLibHelper) ref.get();
-		    if (result != null)
-		      {			
-			// A match succeeds if the library is already
-			// loaded by LOADER or any of its ancestors.
-			ClassLoader l = loader;
-			do
-			  {
-			    if (result.loader == l)
-			      return result;
-			    l = l.getParent();
-			  }
-			while (tryParents && l != null);
-		      }
-		  }
-	      }
-
-	    // Oh dear.  We've already mapped this shared library, but
-	    // with a different class loader.  We need to copy it.
-	    try
-	      {
-		File copy 
-		  = File.createTempFile(new File(libname).getName(), 
-					".so", new File ("/tmp"));
-		File src = new File(libname);
-		copyFile (src, copy);
-		copy.deleteOnExit();
-		libname = copy.getPath();
-	      }
-	    catch (IOException e)
-	      {
-		return null;
-	      }
-	  }
-	result = new SharedLibHelper(libname, loader, source, domain, 0);
-	s.add(new WeakReference(result));
-	return result;
-      }
-  }
-
-  public native void finalize ();
-
-  public Class findClass(String name)
-  {
-    ensureInit();
-    Class result = (Class) classMap.get(name);
-    if (result != null)
-      {
-	// We never want to return a class without its supers linked.
-	// It isn't clear from the spec, but this is what other
-	// implementations do in practice.
-	ensureSupersLinked(result);
-      }
-    return result;
-  }
-
-  public URL findResource (String name)
-  {
-    ensureInit();
-    if (! hasResource(name))
-      return null;
-    try
-      {
-	return new URL("gcjlib", "", -1, baseName + "!/" + name);
-      }
-    catch (MalformedURLException _)
-      {
-      }
-    return null;
-  }
-
-  public native Core findCore (String name);
-
-  void ensureInit()
-  {
-    synchronized (classMap)
-      {
-	if (initialized)
-	  return;
-	init();
-	initialized = true;
-      }
-  }
-
-  native boolean hasResource(String name);
-  native void init();
-  native void ensureSupersLinked(Class k);
-
-  public String toString ()
-  {
-    return "shared object " + baseName;
-  }
-
-  /** Called during dlopen's processing of the init section. */
-  void registerClass(String name, Class cls)
-  {
-    classMap.put(name, cls);
-  }
-
-  /** The handle returned by dlopen. */
-  gnu.gcj.RawData handler;
-
-  /** Holds a _Jv_core_chain for the loader.  */
-  gnu.gcj.RawData core_chain;
-
-  /** Map classnames to Classes. */
-  HashMap classMap = new HashMap(20);
-
-  /** Class loader we're helping.  */
-  ClassLoader loader;
-
-  /** Name of base file.  */
-  String baseName;
-
-  /** Protection domain for loaded classes.  */
-  ProtectionDomain domain;
-
-  /** Flags to pass to dlopen.  FIXME: platform dependent.
-      0 is always "sensible" (defined by us).  */
-  int flags;
-
-  /** True if we've been initialized.  */
-  boolean initialized = false;
-
-  /** Map shared library names to a helper object.  This uses weak
-      references in the values so we don't prevent collection.  */
-  static HashMap map = new HashMap ();
-}
diff --git a/libjava/gnu/gcj/runtime/SharedLibLoader.h b/libjava/gnu/gcj/runtime/SharedLibLoader.h
deleted file mode 100644
index 8a439d3..0000000
--- a/libjava/gnu/gcj/runtime/SharedLibLoader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_SharedLibLoader__
-#define __gnu_gcj_runtime_SharedLibLoader__
-
-#pragma interface
-
-#include <java/lang/ClassLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class SharedLibHelper;
-          class SharedLibLoader;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::gcj::runtime::SharedLibLoader : public ::java::lang::ClassLoader
-{
-
-public:
-  SharedLibLoader(::java::lang::String *, ::java::lang::ClassLoader *, jint);
-  SharedLibLoader(::java::lang::String *);
-  virtual ::java::lang::Class * findClass(::java::lang::String *);
-  virtual ::java::net::URL * findResource(::java::lang::String *);
-  virtual ::java::util::Enumeration * findResources(::java::lang::String *);
-public: // actually package-private
-  ::gnu::gcj::runtime::SharedLibHelper * __attribute__((aligned(__alignof__( ::java::lang::ClassLoader)))) helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_SharedLibLoader__
diff --git a/libjava/gnu/gcj/runtime/SharedLibLoader.java b/libjava/gnu/gcj/runtime/SharedLibLoader.java
deleted file mode 100644
index b8e6a57d..0000000
--- a/libjava/gnu/gcj/runtime/SharedLibLoader.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright (C) 2001, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.CodeSource;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * A ClassLoader backed by a gcj-compiled shared library.
- * @author Per Bothner <per@bothner.com>, Brainfood Inc.
- */
-
-public class SharedLibLoader extends ClassLoader
-{
-  /** Load a shared library, and associate a ClassLoader with it.
-   * @param libname named of shared library (passed to dlopen)
-   * @param parent the parent ClassLoader
-   * @parem flags passed to dlopen
-   */
-  public SharedLibLoader(String libname, ClassLoader parent, int flags)
-  {
-    super(parent);
-    URL url;
-    try
-      {
-	url = new URL("file", "", libname);
-      }
-    catch (MalformedURLException _)
-      {
-	url = null;
-      }
-    helper = SharedLibHelper.findHelper(this, libname,
-					new CodeSource(url, null), true);
-  }
-
-  /** Load a shared library, and asociate a ClassLoader with it.
-   * @param libname named of shared library (passed to dlopen)
-   */
-  public SharedLibLoader(String libname)
-  {
-    this(libname, getSystemClassLoader(), 0);
-  }
-
-  public Class findClass(String name)
-    throws ClassNotFoundException
-  {
-    Class cls = helper.findClass(name);
-    if (cls == null)
-      throw new ClassNotFoundException(name);
-    return cls;
-  }
-
-  public URL findResource (String name)
-  {
-    return helper.findResource(name);
-  }
-
-  public Enumeration findResources (String name) throws IOException
-  {
-    URL url = findResource(name);
-    if (url == null)
-      return null;
-    Vector v = new Vector(1);
-    v.add(url);
-    return v.elements();
-  }
-
-  /** The helper that does the work for us.  */
-  SharedLibHelper helper;
-}
diff --git a/libjava/gnu/gcj/runtime/StringBuffer.h b/libjava/gnu/gcj/runtime/StringBuffer.h
deleted file mode 100644
index 27a3a7e..0000000
--- a/libjava/gnu/gcj/runtime/StringBuffer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_StringBuffer__
-#define __gnu_gcj_runtime_StringBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class StringBuffer;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::StringBuffer : public ::java::lang::Object
-{
-
-public:
-  ::gnu::gcj::runtime::StringBuffer * append(jboolean);
-  ::gnu::gcj::runtime::StringBuffer * append(jchar);
-  ::gnu::gcj::runtime::StringBuffer * append(jint);
-  ::gnu::gcj::runtime::StringBuffer * append(jlong);
-  ::gnu::gcj::runtime::StringBuffer * append(jfloat);
-  ::gnu::gcj::runtime::StringBuffer * append(jdouble);
-  ::gnu::gcj::runtime::StringBuffer * append(::java::lang::Object *);
-  ::gnu::gcj::runtime::StringBuffer * append(::java::lang::String *);
-private:
-  void ensureCapacity_unsynchronized(jint);
-public:
-  StringBuffer();
-  StringBuffer(jint);
-  StringBuffer(::java::lang::String *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  JArray< jchar > * value;
-private:
-  static const jint DEFAULT_CAPACITY = 16;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_StringBuffer__
diff --git a/libjava/gnu/gcj/runtime/StringBuffer.java b/libjava/gnu/gcj/runtime/StringBuffer.java
deleted file mode 100644
index f9a433e..0000000
--- a/libjava/gnu/gcj/runtime/StringBuffer.java
+++ /dev/null
@@ -1,199 +0,0 @@
-// This is a simplified copy of java.lang.StringBuffer with
-// `synchronized' removed.
-
-/* StringBuffer.java -- Growable strings
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.gcj.runtime;
-
-public final class StringBuffer
-{
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param bool the <code>boolean</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(boolean)
-   */
-  public StringBuffer append (boolean bool)
-  {
-    return append (bool ? "true" : "false");
-  }
-
-  /** Append the <code>char</code> to this <code>StringBuffer</code>.
-   *  @param c the <code>char</code> to append.
-   *  @return this <code>StringBuffer</code>.
-   */
-  public StringBuffer append (char ch)
-  {
-    ensureCapacity_unsynchronized (count + 1);
-    value[count++] = ch;
-    return this;
-  }
-
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param inum the <code>int</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(int)
-   */
-  public native StringBuffer append (int inum);
-
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param lnum the <code>long</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(long)
-   */
-  public StringBuffer append (long lnum)
-  {
-    return append (Long.toString (lnum));
-  }
-
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param fnum the <code>float</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(float)
-   */
-  public StringBuffer append (float fnum)
-  {
-    return append (Float.toString (fnum));
-  }
-
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param dnum the <code>double</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(double)
-   */
-  public StringBuffer append (double dnum)
-  {
-    return append (Double.toString (dnum));
-  }
-
-  /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
-   *  Uses <code>String.valueOf()</code> to convert to
-   *  <code>String</code>.
-   *  @param obj the <code>Object</code> to convert and append.
-   *  @return this <code>StringBuffer</code>.
-   *  @see java.lang.String#valueOf(java.lang.Object)
-   */
-  public StringBuffer append (Object obj)
-  {
-    return append (String.valueOf(obj));
-  }
-
-  /** Append the <code>String</code> to this <code>StringBuffer</code>.
-   *  @param str the <code>String</code> to append.
-   *  @return this <code>StringBuffer</code>.
-   */
-  public StringBuffer append (String str)
-  {
-    if (str == null)
-      str = "null";
-    int len = str.length();
-    ensureCapacity_unsynchronized (count + len);
-    str.getChars(0, len, value, count);
-    count += len;
-    return this;
-  }
-
-  private void ensureCapacity_unsynchronized (int minimumCapacity)
-  {
-    if (minimumCapacity > value.length)
-      {
-	minimumCapacity = Math.max (minimumCapacity, value.length * 2 + 2);
-	char[] nb = new char[minimumCapacity];
-	System.arraycopy(value, 0, nb, 0, count);
-	value = nb;
-      }
-  }
-
-  /** Create a new StringBuffer with default capacity 16.
-   *  @see JLS 20.13.1
-   */
-  public StringBuffer ()
-  {
-    this (DEFAULT_CAPACITY);
-  }
-
-  /** Create an empty <code>StringBuffer</code> with the specified initial capacity.
-   *  @param capacity the initial capacity.
-   */
-  public StringBuffer (int capacity)
-  {
-    count = 0;
-    value = new char[capacity];
-  }
-
-  /** Create a new <code>StringBuffer</code> with the characters in the specified <code>String</code>.
-   *  Initial capacity will be the size of the String plus 16.
-   *  @param str the <code>String</code> to make a <code>StringBuffer</code> out of.
-   */
-  public StringBuffer (String str)
-  {
-    if (str == null)
-      str = "null";
-    count = str.length();
-    // JLS: The initial capacity of the string buffer is 16 plus the
-    // length of the argument string.
-    value = new char[count + DEFAULT_CAPACITY];
-    str.getChars(0, count, value, 0);
-  }
-
-  /** Convert this <code>StringBuffer</code> to a <code>String</code>.
-   *  @return the characters in this StringBuffer
-   */
-  // This is native because efficient implementation requires avoiding
-  // the Java protection mechanism.
-  public native String toString ();
-
-  // Index of next available character.  Note that this has
-  // permissions set this way so that String can get the value.
-  int count;
-
-  // The buffer.  Note that this has permissions set this way so that
-  // String can get the value.
-  char[] value;
-
-  private final static int DEFAULT_CAPACITY = 16; // JLS 20.13.1
-}
diff --git a/libjava/gnu/gcj/runtime/SystemClassLoader.h b/libjava/gnu/gcj/runtime/SystemClassLoader.h
deleted file mode 100644
index 58c7096..0000000
--- a/libjava/gnu/gcj/runtime/SystemClassLoader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_runtime_SystemClassLoader__
-#define __gnu_gcj_runtime_SystemClassLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class SystemClassLoader;
-      }
-    }
-  }
-}
-
-class gnu::gcj::runtime::SystemClassLoader : public ::java::net::URLClassLoader
-{
-
-public: // actually package-private
-  SystemClassLoader(::java::lang::ClassLoader *);
-  void addClass(::java::lang::Class *);
-public: // actually protected
-  ::java::lang::Class * findClass(::java::lang::String *);
-public: // actually package-private
-  void init();
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader)))) nativeClasses;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_SystemClassLoader__
diff --git a/libjava/gnu/gcj/runtime/SystemClassLoader.java b/libjava/gnu/gcj/runtime/SystemClassLoader.java
deleted file mode 100644
index 7470542..0000000
--- a/libjava/gnu/gcj/runtime/SystemClassLoader.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright (C) 2005, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.runtime;
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.StringTokenizer;
-import java.util.HashMap;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public final class SystemClassLoader extends URLClassLoader
-{
-  SystemClassLoader(ClassLoader parent)
-  {
-    super(new URL[0], parent);
-  }
-
-  // This holds all the "native" classes linked into the executable
-  // and registered with this loader.
-  private HashMap nativeClasses = new HashMap();
-
-  // This is called to register a native class which was linked into
-  // the application but which is registered with the system class
-  // loader after the VM is initialized.
-  void addClass(Class klass)
-  {
-    String packageName = null;
-    String className = klass.getName();
-    int lastDot = className.lastIndexOf('.');
-    if (lastDot != -1)
-      packageName = className.substring(0, lastDot);
-    if (packageName != null && getPackage(packageName) == null)
-      {
-	// Should have some way to store this information in a
-	// precompiled manifest.
-	definePackage(packageName, null, null, null, null, null, null, null);
-      }
-      
-    // Use reflection to access the package-private "loadedClasses" field.
-    nativeClasses.put(className, klass);
-  }
-
-  protected native Class findClass(String name);
-
-  // We add the URLs to the system class loader late.  The reason for
-  // this is that during bootstrap we don't want to parse URLs or
-  // create URL connections, since that will result in circularities
-  // causing a crash.
-  void init()
-  {
-    String sep = File.pathSeparator;
-    StringTokenizer st
-      = new StringTokenizer (System.getProperty ("java.class.path", "."),
-			     sep, true);
-    // Pretend we start with a ':', so if we see a ':' first we add
-    // '.'.
-    boolean last_was_sep = true;
-    while (st.hasMoreElements ()) 
-      {  
-	String e = st.nextToken ();
-	try
-	  {
-	    if (sep.equals(e))
-	      {
-		if (last_was_sep)
-		  {
-		    // We saw two separators in a row, so add ".".
-		    addURL(new URL("file", "", -1, "./"));
-		    last_was_sep = false;
-		  }
-		else
-		  last_was_sep = true;
-		continue;
-	      }
-
-	    last_was_sep = false;
-	    File path = new File(e);
-	    // Ignore invalid paths.
-	    if (!path.exists())
-	      continue;
-	    if (!e.endsWith (File.separator) && path.isDirectory ())
-	      addURL(new URL("file", "", -1, e + File.separator));
-	    else
-	      addURL(new URL("file", "", -1, e));
-	  } 
-	catch (java.net.MalformedURLException x)
-	  {
-	    // This should never happen.
-	    throw new RuntimeException(x);
-	  }
-      }
-    // If we saw a trailing ":", add "." to the path.
-    if (last_was_sep)
-      {
-	try
-	  {
-	    addURL(new URL("file", "", -1, "./"));
-	  }
-	catch (java.net.MalformedURLException x)
-	  {
-	    // This should never happen.
-	    throw new RuntimeException(x);
-	  }
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/runtime/natFinalizerThread.cc b/libjava/gnu/gcj/runtime/natFinalizerThread.cc
deleted file mode 100644
index ec1846b..0000000
--- a/libjava/gnu/gcj/runtime/natFinalizerThread.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// natFinalizerThread.cc - Implementation of FinalizerThread native methods.
-
-/* Copyright (C) 2001, 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#include <gnu/gcj/runtime/FinalizerThread.h>
-
-#include <java-threads.h>
-
-static _Jv_Mutex_t mutex;
-static _Jv_ConditionVariable_t condition;
-
-// Initialize lock & condition variable.
-void
-gnu::gcj::runtime::FinalizerThread::init ()
-{
-  _Jv_MutexInit (&mutex);
-  _Jv_CondInit (&condition);
-}
-
-// This is called by the GC when a finalizer is ready to be
-// run.  It sets a flag and wakes up the finalizer thread. Note
-// that this MUST NOT aquire any Java lock, as this could result in 
-// the hash synchronization code being re-entered: the synchronization
-// code itself might need to allocate. See PR 16478.
-void
-gnu::gcj::runtime::FinalizerThread::finalizerReady ()
-{
-#ifdef __JV_NO_THREADS__
-  _Jv_RunFinalizers ();
-#else
-  _Jv_MutexLock (&mutex);
-  finalizer_ready = true;
-  _Jv_CondNotify (&condition, &mutex);
-  _Jv_MutexUnlock (&mutex);
-#endif
-}
-
-// Main loop for the finalizer thread. 
-void
-gnu::gcj::runtime::FinalizerThread::run ()
-{
-  while (true)
-    {
-      _Jv_MutexLock (&mutex);
-      if (! finalizer_ready)
-	_Jv_CondWait (&condition, &mutex, 0, 0);
-      finalizer_ready = false;
-      _Jv_MutexUnlock (&mutex);
-      _Jv_RunFinalizers ();
-    }
-}
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
deleted file mode 100644
index 5ae6842..0000000
--- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// natSharedLibLoader.cc - Implementation of SharedLibHelper native methods.
-
-/* Copyright (C) 2001, 2003, 2004, 2005, 2006, 2010  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <execution.h>
-
-#include <gnu/gcj/runtime/SharedLibHelper.h>
-#include <java/io/IOException.h>
-#include <java/lang/UnsupportedOperationException.h>
-#include <java/lang/UnknownError.h>
-
-#include <java/lang/VMClassLoader.h>
-
-// If we're using the Boehm GC, then we need this include to override dlopen.
-#ifdef HAVE_BOEHM_GC
-// Set GC_DEBUG before including gc.h!
-#ifdef LIBGCJ_GC_DEBUG
-# define GC_DEBUG
-#endif
-#include <gc.h>
-#endif /* HAVE_BOEHM_GC */
-
-#ifdef HAVE_DLOPEN
-#include <dlfcn.h>
-
-/* Only used during dlopen, while having a lock on Class.class. */
-static java::lang::ClassLoader *curLoader;
-static gnu::gcj::runtime::SharedLibHelper *curHelper;
-
-typedef void (*ClassHookFunc) (jclass);
-typedef void (*CoreHookFunc) (_Jv_core_chain *);
-
-void
-_Jv_sharedlib_register_hook (jclass cls)
-{
-  cls->protectionDomain = curHelper->domain;
-  cls->loader = curLoader;
-  if (! cls->engine)
-    cls->engine = &_Jv_soleCompiledEngine;
-  curHelper->registerClass(cls->getName(), cls);
-}
-
-static void
-core_hook (_Jv_core_chain *chain)
-{
-  chain->next = (_Jv_core_chain *) curHelper->core_chain;
-  curHelper->core_chain = (gnu::gcj::RawData *) chain;
-}
-
-struct SharedLibDummy
-{
-  ClassHookFunc saved;
-  CoreHookFunc saved_core;
-  SharedLibDummy()
-  {
-    saved = _Jv_RegisterClassHook;
-    saved_core = _Jv_RegisterCoreHook;
-  }
-  ~SharedLibDummy()
-  {
-    _Jv_RegisterClassHook = saved;
-    _Jv_RegisterCoreHook = saved_core;
-    curLoader = NULL;
-  }
-};
-#endif
-
-void
-gnu::gcj::runtime::SharedLibHelper::init(void)
-{
-#ifdef HAVE_DLOPEN
-  char *lname = (char *) __builtin_alloca (JvGetStringUTFLength (baseName)
-					   + 1);
-  jsize total = JvGetStringUTFRegion (baseName, 0, baseName->length(), lname);
-  lname[total] = '\0';
-
-  if (flags==0)
-    flags = RTLD_GLOBAL | RTLD_LAZY;
-  JvSynchronize dummy1(&::java::lang::Class::class$);
-  SharedLibDummy dummy2;
-  curLoader = ((void*)loader == ::java::lang::VMClassLoader::bootLoader
-	       ? NULL : loader);
-  curHelper = this;
-  _Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
-  _Jv_RegisterCoreHook = core_hook;
-  void *h = dlopen(lname, flags);
-  if (h == NULL)
-    {
-      const char *msg = dlerror();
-      throw new ::java::lang::UnknownError(JvNewStringLatin1(msg));
-    }
-  handler = (gnu::gcj::RawData*) h;
-#else
-  const char *msg
-    = "shared library class loading is not supported on this platform";
-  throw new ::java::lang::UnsupportedOperationException(JvNewStringLatin1(msg));
-#endif
-}
-
-jboolean
-gnu::gcj::runtime::SharedLibHelper::hasResource (jstring name)
-{
-#ifdef HAVE_DLOPEN
-  _Jv_core_chain *node = _Jv_FindCore ((_Jv_core_chain *) core_chain, name);
-  return node != NULL;
-#else
-  return false;
-#endif
-}
-
-#ifdef HAVE_DLOPEN
-extern gnu::gcj::Core *_Jv_create_core (_Jv_core_chain *node, jstring name);
-#endif
-
-gnu::gcj::Core *
-gnu::gcj::runtime::SharedLibHelper::findCore (jstring name)
-{
-#ifdef HAVE_DLOPEN
-  ensureInit();
-  return _Jv_create_core ((_Jv_core_chain *) core_chain, name);
-#else
-  return NULL;
-#endif
-}
-
-void
-gnu::gcj::runtime::SharedLibHelper::finalize()
-{
-  _Jv_FreeCoreChain ((_Jv_core_chain *) core_chain);
-#ifdef HAVE_DLOPEN
-  if (handler)
-    dlclose (handler);
-#endif
-}
-
-void
-gnu::gcj::runtime::SharedLibHelper::ensureSupersLinked(jclass k)
-{
-  _Jv_Linker::wait_for_state (k, JV_STATE_LOADING);
-}
diff --git a/libjava/gnu/gcj/runtime/natStringBuffer.cc b/libjava/gnu/gcj/runtime/natStringBuffer.cc
deleted file mode 100644
index 2777b9e..0000000
--- a/libjava/gnu/gcj/runtime/natStringBuffer.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// natStringBuffer.cc - Implementation of java.lang.StringBuffer native methods.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/runtime/StringBuffer.h>
-#include <java/lang/String.h>
-
-gnu::gcj::runtime::StringBuffer *
-gnu::gcj::runtime::StringBuffer::append (jint num)
-{
-  // Use an array large enough for "-2147483648"; i.e. 11 chars.
-  jchar buffer[11];
-  int i = _Jv_FormatInt (buffer+11, num);
-  jint needed = count + i;
-  ensureCapacity_unsynchronized (needed);
-  jchar* dst = elements (value) + count;
-  jchar* src = buffer+11-i;
-  while (--i >= 0)
-    *dst++ = *src++;
-  count = needed;
-  return this;
-}
-
-java::lang::String *
-gnu::gcj::runtime::StringBuffer::toString ()
-{
-  return new java::lang::String (this);
-}
diff --git a/libjava/gnu/gcj/runtime/natSystemClassLoader.cc b/libjava/gnu/gcj/runtime/natSystemClassLoader.cc
deleted file mode 100644
index 7052bc8..0000000
--- a/libjava/gnu/gcj/runtime/natSystemClassLoader.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// natSystemClassLoader.cc - native code for system class loader
-
-/* Copyright (C) Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <execution.h>
-
-#include <gnu/gcj/runtime/SystemClassLoader.h>
-#include <java/lang/ClassNotFoundException.h>
-#include <java/util/HashMap.h>
-
-jclass
-gnu::gcj::runtime::SystemClassLoader::findClass (jstring name)
-{
-  jclass result = (jclass) nativeClasses->get(name);
-  if (! result)
-    return URLClassLoader::findClass(name);
-  // Never return a class whose supers are not installed.
-  _Jv_Linker::wait_for_state (result, JV_STATE_LOADING);
-  return result;
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/BlockMap.java b/libjava/gnu/gcj/tools/gc_analyze/BlockMap.java
deleted file mode 100644
index 6e7adae..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/BlockMap.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/* BlockMap.java -- Container for information on GC maintained memory blocks.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-
-class BlockMap
-{
-  static final int HBLKSIZE = 4096;
-
-  class SizeKind implements Comparable<SizeKind>
-  {
-    int size;
-    int kind;
-
-    public SizeKind(int size, int kind)
-    {
-      this.size = size;
-      this.kind = kind;
-    }
-
-    public int compareTo(SizeKind b)
-    {
-      if (this.size != b.size)
-        return this.size - b.size;
-      return this.kind - b.kind;
-    }
-  }
-
-  class PtrMarks
-  {
-    long ptr;
-    int marks;
-  
-    public PtrMarks(long ptr, int marks)
-    {
-      this.ptr = ptr;
-      this.marks = marks;
-    }
-  }
-
-  private TreeMap<SizeKind, ArrayList<PtrMarks>> map =
-    new TreeMap<SizeKind, ArrayList<PtrMarks>>();
-
-  public BlockMap(BufferedReader reader) throws IOException
-  {
-    for (;;)
-      {
-        String s = reader.readLine();
-        if (s == null)
-          break;
-        if (s.charAt(0) == '#')
-          continue;
-        if (s.indexOf("Begin block map") >= 0)
-          {
-            for (;;)
-              {
-                s = reader.readLine();
-                if (s.charAt(0) == '#')
-                  continue;
-                if (s.indexOf("End block map") >= 0)
-                  return;
-                String[] items = s.split(",");
-                long ptr = 0;
-                int kind = 0, size = 0, marks = 0;
-                for (int i=0; i<items.length; i++)
-                  {
-                    String[] x = items[i].split(" ");
-                    String last = x[x.length - 1];
-                    switch (i)
-                      {
-                      case 0:
-                        ptr = MemoryMap.parseHexLong(last.substring(2));
-                        break;
-                      case 1:
-                        kind = Integer.parseInt(last);
-                        break;
-                      case 2:
-                        size = Integer.parseInt(last);
-                        break;
-                      case 3:
-                        marks = Integer.parseInt(last);
-                        break;
-                      }
-                  }
-                SizeKind sk = new SizeKind(size, kind);
-                ArrayList<PtrMarks> m = map.get(sk);
-                if (m == null)
-                    {
-                        m = new ArrayList<PtrMarks>();
-                        map.put(sk, m);
-                    }
-                PtrMarks pm = new PtrMarks(ptr, marks);
-                m.add(pm);
-              } // inner loop
-          } // started inner loop
-      } // outer loop - finding begin
-  } // memoryMap
-
-  public void dump()
-  {
-    System.out.println();
-    System.out.println();
-    System.out.println("*** Used Blocks ***\n");
-    System.out.println();
-    System.out.println("  Size     Kind            Blocks     Used       Free       Wasted");
-    System.out.println("-------  -------------    ------- ---------- ----------    -------");
-
-    int total_blocks = 0, total_used = 0, total_free = 0, total_wasted = 0;
-
-    for (Map.Entry<SizeKind, ArrayList<PtrMarks>> me : map.entrySet())
-      {
-        SizeKind sk = me.getKey();
-
-        System.out.println(MemoryAnalyze.format(sk.size, 7) + "  "
-                           + MemoryAnalyze.kindToName(sk.kind));
-
-        int sub_blocks = 0, sub_used = 0, sub_free = 0, sub_wasted = 0;
-        int sub_count = 0;
-
-        ArrayList<PtrMarks> v = me.getValue();
-
-        for (PtrMarks pm : v)
-          {
-            int bytes = sk.size;
-            int blocks = (sk.size + HBLKSIZE - 1) / HBLKSIZE;
-            int used;
-            int free;
-            int wasted;
-
-            if (bytes < HBLKSIZE)
-              {
-                used = bytes * pm.marks;
-                free = bytes * (HBLKSIZE / bytes - pm.marks);
-                wasted = HBLKSIZE - HBLKSIZE / bytes * bytes;
-              }
-            else
-              {
-                if (pm.marks != 0)
-                  {
-                    used = bytes;
-                    free = 0;
-                    wasted = (bytes + HBLKSIZE - 1)
-                      / HBLKSIZE * HBLKSIZE - used;
-                  }
-                else
-                  {
-                    used = 0;
-                    free = bytes;
-                    wasted = 0;
-                  }
-              }
-
-            StringBuilder sb = new StringBuilder();
-            sb.append("                            ");
-            sb.append(MemoryAnalyze.format(blocks, 5));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(used, 9));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(free, 9));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(wasted, 9));
-            System.out.println(sb);
-
-            sub_blocks += blocks;
-            sub_used += used;
-            sub_free += free;
-            sub_wasted += wasted;
-            sub_count++;
-
-            total_blocks += blocks;
-            total_used += used;
-            total_free += free;
-            total_wasted += wasted;
-          } // blocks with size/kind
-        if (sub_count > 1)
-          {
-            System.out.println(
-                               "                          ------- ---------- ----------    -------");
-            StringBuilder sb = new StringBuilder();
-            sb.append("                            ");
-            sb.append(MemoryAnalyze.format(sub_blocks, 5));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(sub_used, 9));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(sub_free, 9));
-            sb.append("  ");
-            sb.append(MemoryAnalyze.format(sub_wasted, 9));
-            System.out.println(sb);
-          }
-      } // size/kind
-
-    System.out.println("-------  -------------    ------- ---------- ----------    -------");
-    StringBuilder sb = new StringBuilder();
-    sb.append("                            ");
-    sb.append(MemoryAnalyze.format(total_blocks, 5));
-    sb.append("  ");
-    sb.append(MemoryAnalyze.format(total_used, 9));
-    sb.append("  ");
-    sb.append(MemoryAnalyze.format(total_free, 9));
-    sb.append("  ");
-    sb.append(MemoryAnalyze.format(total_wasted, 9));
-    System.out.println(sb);
-    System.out.println("Total bytes = "
-                       + MemoryAnalyze.format(total_blocks * HBLKSIZE, 10));
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/BytePtr.java b/libjava/gnu/gcj/tools/gc_analyze/BytePtr.java
deleted file mode 100644
index 4afceee..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/BytePtr.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* BytePtr.java -- Container for bytes from a memory image.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.nio.ByteBuffer;
-
-public class BytePtr
-{
-  ByteBuffer content;
-  int wordSize;
-
-  BytePtr(ByteBuffer b, int ws)
-  {
-    content = b;
-    wordSize = ws;
-  }
-  
-  public int getsize()
-  {
-    return content.limit();
-  }
-
-  public int getByte(int offset)
-  {
-    return content.get(offset);
-  }
-
-  public int getInt(int n)
-  {
-    return content.getInt(n * 4);
-  }
-
-  public int getShort(int n)
-  {
-    return content.getShort(n * 2);
-  }
-  
-  public long getWord(int n)
-  {
-    if (4 == wordSize)
-      return 0xffffffffL & content.getInt(n * 4);
-    else
-      return content.getLong(n * 8);
-  }
-  
-  public int intsPerWord()
-  {
-    return (4 == wordSize) ? 1 : 2;
-  }
-
-  public BytePtr getRegion(int offset, int size)
-  {
-    int oldLimit = content.limit();
-    content.position(offset);
-    content.limit(offset + size);
-    ByteBuffer n = content.slice();
-    content.position(0);
-    content.limit(oldLimit);
-    
-    return new BytePtr(n, wordSize);
-  }
-
-  public void setInt(int a, int n)
-  {
-    content.putInt(a * 4, n);
-  }
-
-  public void dump()
-  {
-    // 38 5a f4 2a 50 bd 04 10 10 00 00 00 0e 00 00 00   8Z.*P...........
-    int i;
-    StringBuilder b = new StringBuilder(67);
-    for (i = 0; i < 66; i++)
-      b.append(' ');
-    b.append('\n');
-
-    i = 0;
-    do
-      {
-        for (int j = 0; j < 16; j++)
-          {
-            int k = i + j;
-
-            if (k < content.limit())
-              {
-                int v = 0xff & getByte(k);
-                // hex
-                int v1 = v/16;
-                b.setCharAt(j * 3 + 0,
-                            (char)(v1 >= 10 ? 'a' - 10 + v1 : v1 + '0'));
-                v1 = v % 16;
-                b.setCharAt(j * 3 + 1,
-                            (char)(v1 >= 10 ? 'a' - 10 + v1 : v1 + '0'));
-                // ascii
-                b.setCharAt(j + 50, (char)((v >= 32 && v <= 127) ? v: '.'));
-              }
-            else
-              {
-                b.setCharAt(j * 3 + 0, ' ');
-                b.setCharAt(j * 3 + 1, ' ');
-                b.setCharAt(j + 50, ' ');
-              }
-          }
-        i += 16;
-        System.out.print(b);
-      } while (i < content.limit());
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/ItemList.java b/libjava/gnu/gcj/tools/gc_analyze/ItemList.java
deleted file mode 100644
index 7912beb..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/ItemList.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ItemList.java -- Maps all objects keyed by their addresses.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-class ItemList
-{
-  public ItemList()
-  {
-  }
-
-  private TreeMap<Long, HashMap<ObjectMap.ObjectItem, Integer>> map;
-
-  public void add(ObjectMap.ObjectItem item)
-  {
-    if (map == null)
-      map = new TreeMap<Long, HashMap<ObjectMap.ObjectItem, Integer>>();
-    Long x = new Long(item.klass);
-    HashMap<ObjectMap.ObjectItem, Integer> list = map.get(x);
-    if (list == null)
-      {
-        list = new HashMap<ObjectMap.ObjectItem, Integer>();
-        map.put(x, list);
-      }
-    Integer count = list.get(item);
-    if (count == null)
-      list.put(item, new Integer(1));
-    else
-      list.put(item, new Integer(count.intValue() + 1));
-  }
-
-  void dump(String title, SymbolLookup lookup) throws IOException
-  {
-    if (map == null)
-      return;
-    System.out.println(title);
-    for (Map.Entry<Long, HashMap<ObjectMap.ObjectItem, Integer>> me :
-           map.entrySet())
-      {
-        HashMap<ObjectMap.ObjectItem, Integer> list = me.getValue();
-        boolean first = true;
-
-        for (Map.Entry<ObjectMap.ObjectItem, Integer> me2 : list.entrySet())
-          {
-            ObjectMap.ObjectItem item = me2.getKey();
-            Integer count = me2.getValue();
-            if (first)
-              {
-                String name =
-                  MemoryAnalyze.getSymbolPretty(lookup, item, false);
-                System.out.println("    " + name + ":");
-                first = false;
-              }
-            System.out.print("        0x" + Long.toHexString(item.ptr));
-            if (count.intValue() != 1)
-              System.out.print(" * " + count);
-            System.out.println();
-          }
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/MemoryAnalyze.java b/libjava/gnu/gcj/tools/gc_analyze/MemoryAnalyze.java
deleted file mode 100644
index d56a71d..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/MemoryAnalyze.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/* MemoryAnalyze.java -- Analyzes a libgcj heap dump.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import gnu.classpath.tools.getopt.FileArgumentCallback;
-import gnu.classpath.tools.getopt.Option;
-import gnu.classpath.tools.getopt.OptionException;
-import gnu.classpath.tools.getopt.Parser;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-class MemoryAnalyze
-{
-  public MemoryAnalyze()
-  {
-  }
-
-  private static NumberFormat numberFormat;
-  private static boolean verbose;
-  static String format(long number, int digits)
-  {
-    if (numberFormat == null)
-      {
-        numberFormat = NumberFormat.getNumberInstance();
-        numberFormat.setGroupingUsed(true);
-      }
-    String temp = numberFormat.format(number);
-    int spaces = digits - temp.length();
-    if (spaces < 0)
-      spaces = 0;
-    return "                                ".substring(0,spaces) + temp;
-  }
-
-  static void sorted_report(String description,
-                            int total_space,
-                            ArrayList<String> list,
-                            Comparator<String> comparator)
-  {
-    System.out.println("*** " + description + " ***");
-    System.out.println();
-    System.out.println("  Total Size       Count       Size    Description");
-    System.out.println("--------------     -----    --------   -----------------------------------");
-    Collections.sort(list, comparator);
-    for (Iterator it = list.iterator(); it.hasNext(); )
-      {
-        String v = (String)it.next();
-        System.out.println(stripend(v));
-      }
-    System.out.println("--------------     -----    --------   -----------------------------------");
-    System.out.println(format(total_space, 14));
-    System.out.println();
-    System.out.println();
-  }
-
-  private static String stripend(String s)
-  {
-    int n = s.lastIndexOf(" /");
-    if (n > 0)
-      return s.substring(0,n);
-    return s;
-  }
-
-  static  class SubstringComparator implements Comparator<String>
-  {
-    private int begin, end;
-    private boolean reverse;
-
-    SubstringComparator(int begin, int end, boolean reverse)
-    {
-      this.begin = begin;
-      this.end = end;
-      this.reverse = reverse;
-    }
-
-    public int compare(String s1, String s2)
-    {
-      if (end == 0)
-        s1 = s1.substring(begin);
-      else
-        s1 = s1.substring(begin, end);
-
-      if (end == 0)
-        s2 = s2.substring(begin);
-      else
-        s2 = s2.substring(begin, end);
-      int i = s1.compareTo(s2);
-      if (reverse)
-        return -i;
-      return i;
-    }
-  }
-
-  static class OptionParser extends Parser
-  {
-    int filesFound;
-	  
-    OptionParser()
-    {
-      super("gc-analyze",
-            "gc-analyze (" + System.getProperty("java.vm.version") + ")");
-
-      add(new Option('d',
-                     "Directory containing runtime objects",
-                     "directory")
-        {
-          public void parsed(String argument) throws OptionException
-          {
-            ToolPrefix.pathPrefix = argument;			
-          }
-        });
-
-      add(new Option('p',
-                     "Binary tool prefix, prepended to nm and readelf to "
-                     + "obtain target specific versions of these commands",
-                     "prefix")
-        {
-          public void parsed(String argument) throws OptionException
-          {
-            ToolPrefix.toolPrefix = argument;			
-          }
-        });
-
-      add(new Option("verbose", 'v',
-                     "Verbose output; requires filename.bytes")
-        {
-          public void parsed(String argument) throws OptionException
-          {
-            verbose = true;			
-          }
-        });
-
-      setHeader("usage: gc-analyze [-v] [-p tool-prefix] [-d <directory>] "
-                + "filename");
-    }
-	  
-    protected void validate() throws OptionException
-    {
-      if (filesFound != 1)
-        throw new OptionException("Must specify exactly one filename");
-    }
-	  
-    public String[] parse(String[] inArgs)
-    {
-      final ArrayList<String> fileResult = new ArrayList<String>();
-      parse(inArgs, new FileArgumentCallback()
-        {
-          public void notifyFile(String fileArgument)
-          {
-            filesFound++;
-            fileResult.add(fileArgument);
-          }
-        });
-      return fileResult.toArray(new String[1]);
-    }
-  }
-  
-  public static void main(String[] args)
-  {
-    class Info
-    {
-      int size;
-      int count;
-    }
-    int total_space = 0;
-
-    Parser optionParser = new OptionParser();
-    
-    String rest[] = optionParser.parse(args);
-    
-    String filename = rest[0];
-    
-    try
-      {
-        BufferedReader reader =
-          new BufferedReader(new InputStreamReader(new FileInputStream(filename)));
-        SymbolLookup lookup = new SymbolLookup(reader, filename + ".bytes");
-        ObjectMap objectMap = new ObjectMap(reader);
-        BlockMap blockMap = new BlockMap(reader);
-        reader.close();
-
-        // add info to item(s)
-        // add item.klass
-        for (Map.Entry<Long, ObjectMap.ObjectItem> me : objectMap)
-        {
-            ObjectMap.ObjectItem item = me.getValue();
-
-            // try to get a klass (happens with intern'ed strings...)
-            if (item.klass==0)
-              {
-                BytePtr p = lookup.getBytePtr(item.ptr, item.size);
-                if (p!=null)
-                  {
-                    long vtable = p.getWord(0);
-                    String sym =
-                        lookup.getSymbolViaVtable(vtable - 2 * lookup.memoryMap.wordSize);
-                    if (sym != null)
-                      {
-                        item.typeName = SymbolTable.demangleVTName(sym);
-                      }
-                    else if (vtable != 0)
-                      {
-                        // get klass from vtable
-                        p = lookup.getBytePtr(vtable,
-                                              lookup.memoryMap.wordSize);
-                        if (p != null)
-                          {
-                            long klass = p.getWord(0);
-                            item.klass = klass;
-                          }
-                      }
-                  }
-              }
-
-            // figure out strings
-            String class_name;
-            if (null == item.typeName)
-              {
-                class_name =
-                  MemoryAnalyze.getSymbolPretty(lookup, item, false);
-                item.typeName = class_name;
-              }
-            else
-              {
-                class_name = item.typeName;
-              }
-            System.out.print("class_name=[" + class_name + "]");
-
-            if (class_name.compareTo("_ZTVN4java4lang6StringE")==0
-                || class_name.compareTo("java.lang.String")==0)
-              {
-                BytePtr p = lookup.getBytePtr(item.ptr, item.size);
-                long data = p.getWord(1); 
-                int boffset = p.getInt(2 * p.intsPerWord());
-                int count = p.getInt(1 + 2 * p.intsPerWord());
-                int hash = p.getInt(2 + 2 * p.intsPerWord());
-                BytePtr chars = lookup.getBytePtr(data+boffset, count * 2);
-                StringBuffer sb = new StringBuffer(count);
-                for (int qq = 0; qq<count; qq++)
-                  sb.append((char)chars.getShort(qq));
-                int newhash = sb.toString().hashCode();
-                if (newhash!=hash)
-                  {
-                    p.setInt(4, newhash);
-                  }
-
-                item.string = sb.toString();
-                System.out.println(" value = \"" + item.string + "\"");
-                if (data != item.ptr)
-                  {
-                    ObjectMap.ObjectItem next = objectMap.get(data);
-                    if (next != null)
-                      next.stringData = true;
-                    else
-                      System.out.println("String [" + item.string + "] at "
-                                         + Long.toHexString(item.ptr)
-                                         + " can't find array at " 
-                                         + Long.toHexString(data));
-                  }
-              }
-            else if (null != item.string)
-              System.out.println(" value = \"" + item.string + "\"");
-            else
-              System.out.println();
-          }
-
-
-        HashMap<String, Info> map = new HashMap<String, Info>();
-        for (Map.Entry<Long, ObjectMap.ObjectItem> me : objectMap)
-          {
-            ObjectMap.ObjectItem item = me.getValue();
-            String name = getSymbolPretty(lookup, item, true);
-            Info info = map.get(name);
-            if (info == null)
-              {
-                info = new Info();
-                info.count = 0;
-                info.size = item.size;
-                map.put(name, info);
-              }
-            info.count++;
-            total_space += item.size;
-          }
-
-        ArrayList<String> list = new ArrayList<String>();
-        for (Iterator it = map.entrySet().iterator(); it.hasNext(); )
-          {
-            Map.Entry me = (Map.Entry)it.next();
-            String name = (String)me.getKey();
-            Info info = (Info)me.getValue();
-
-            StringBuffer sb = new StringBuffer();
-            sb.append(format(info.count * info.size * 100 / total_space,
-                             3));
-            sb.append("%");
-            sb.append(format(info.count * info.size, 10));
-            sb.append(" = ");
-            sb.append(format(info.count, 7));
-            sb.append(" * ");
-            sb.append(format(info.size, 9));
-            sb.append(" - ");
-            sb.append(name);
-            list.add(sb.toString());
-          }
-
-        sorted_report("Memory Usage Sorted by Total Size",
-                      total_space, list, new SubstringComparator(5,14,true));
-        sorted_report("Memory Usage Sorted by Description",
-                      total_space, list, new SubstringComparator(39,0,false));
-        sorted_report("Memory Usage Sorted by Count",
-                      total_space, list, new SubstringComparator(17,25,true));
-        sorted_report("Memory Usage Sorted by Size",
-                      total_space, list, new SubstringComparator(28,37,true));
-
-        blockMap.dump();
-
-        // dump raw memory
-        if (verbose)
-          {
-            // analyze references
-            for (Map.Entry<Long, ObjectMap.ObjectItem> me : objectMap)
-              {
-                long ptr = me.getKey();
-                ObjectMap.ObjectItem item = me.getValue();
-                BytePtr p = lookup.getBytePtr(ptr, item.size);
-                if (p == null)
-                  System.out.println("can't find ptr 0x"
-                                     + Long.toHexString(ptr));
-                else if (item.kind != 0) // not GC_PTRFREE
-                  for (int i = 1;
-                       i < item.size / lookup.memoryMap.wordSize; i++)
-                    {
-                      long maybe_ptr = p.getWord(i);
-                      ObjectMap.ObjectItem item2 = objectMap.get(maybe_ptr);
-                      if (item2 != null)
-                        {
-                          item2.pointed_by.add(item);
-                          item.points_to.add(item2);
-                        }
-                    }
-              }
-            System.out.println();
-            System.out.println("*** All Objects ***");
-            System.out.println();
-
-            for (Map.Entry<Long, ObjectMap.ObjectItem> me : objectMap)
-            {
-              long ptr = me.getKey();
-              ObjectMap.ObjectItem item = me.getValue();
-              String name = getSymbolPretty(lookup, item, false);
-              System.out.print("0x" + Long.toHexString(ptr) + " - " + name
-                               + " (" + item.size + ")");
-              if (item.string != null)
-        	System.out.println(" \"" + item.string + "\"");
-              else
-        	System.out.println();
-
-              BytePtr p = lookup.getBytePtr(ptr, item.size);
-
-              if (p == null)
-                System.out.println(
-                  "can't find memory; recently allocated from free list?");
-              else
-                p.dump();
-
-              item.points_to.dump("  points to:", lookup);
-              item.pointed_by.dump("  pointed to by:", lookup);
-              System.out.println();
-            }
-          }
-      }
-    catch (IOException e)
-      {
-        e.printStackTrace();
-      }
-  }
-
-  public static String kindToName(int kind)
-  {
-    String name;
-    switch (kind)
-      {
-      case 0:
-        name = "GC_PTRFREE";
-        break;
-      case 1:
-        name = "GC_NORMAL";
-        break;
-      case 2:
-        name = "GC_UNCOLLECTABLE";
-        break;
-      case 3:
-        name = "GC_AUUNCOLLCTABLE";
-        break;
-      case 4:
-        name = "(Java)";
-        break;
-      case 5:
-        name = "(Java Debug)";
-        break;
-      case 6:
-        name = "(Java Array)";
-        break;
-      default:
-        name = "(Kind " + kind + ")";
-        break;
-      }
-    return name;
-  }
-
-  public static String getSymbolPretty(SymbolLookup lookup,
-                                       ObjectMap.ObjectItem item,
-                                       boolean bsize)
-    throws IOException
-  {
-    
-    String name = item.typeName;
-    
-    if (name == null)
-      name = lookup.getSymbol(item.klass);
-    
-    if (name == null)
-      {
-      	String v = lookup.decodeUTF8(item.ptr, item.size);
-      	if (null != v)
-      	  {
-      	    name = "UTF8Const";
-      	    item.string = v;
-      	  }
-      }
-    
-    if (name == null)
-      {
-        name = kindToName(item.kind);
-      }
-    if (item.kind==6)
-      name += "[" + format(item.data, 0) + "]";
-    if (bsize)
-      name = name + " / " + format(item.size, 7);
-    return name;
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/MemoryMap.java b/libjava/gnu/gcj/tools/gc_analyze/MemoryMap.java
deleted file mode 100644
index 1bc06d5..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/MemoryMap.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/* MemoryMap.java -- Maps address ranges to their data.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * Reads /proc/self/maps output from dump file.
- * Creates map of <filename> to Range.
- *
- * Returns filename given address.
- * Returns offset given address.
- * Returns BytePtr given address.
- *
- */
-class MemoryMap
-{
-  static class RangeComparator implements Comparator<Range>
-  {
-    public int compare(Range r1, Range r2)
-    {
-      if (r2.end == 0 && r1.end != 0)
-        return -compare(r2, r1);
-      
-      if (r1.begin < r2.begin)
-        return -1;
-      else if (r1.begin >= r2.end)
-        return 1;
-      else
-        return 0;
-    }
-  }
-  
-  static class Range
-  {
-    long begin;
-    long end;
-
-    long offset;
-    String filename;
-    Range()
-    {
-    }
-    
-    Range(long b, long e, String s, long o)
-    {
-      begin = b;
-      end = e;
-      filename = s;
-      offset = o;
-    }
-  }
-
-  /**
-   * Parse the string as an unsigned hexadecimal number.  This is
-   * similar to Long.parseInt(s,16), but without the restriction that
-   * values that have the sign bit set not being allowed.
-   *
-   * @param s the number as a String.
-   * @return the number.
-   */
-  static long parseHexLong(String s)
-  {
-    if (s.length() > 16)
-      throw new NumberFormatException();
-    long r = 0;
-    for (int i = 0; i < s.length(); i++)
-      {
-        int digit = 0;
-        char c = s.charAt(i);
-        switch (c)
-          {
-          case '0':
-          case '1':
-          case '2':
-          case '3':
-          case '4':
-          case '5':
-          case '6':
-          case '7':
-          case '8':
-          case '9':
-            digit = c - '0';
-            break;
-          case 'a':
-          case 'b':
-          case 'c':
-          case 'd':
-          case 'e':
-          case 'f':
-            digit = 10 + c - 'a';
-            break;
-          case 'A':
-          case 'B':
-          case 'C':
-          case 'D':
-          case 'E':
-          case 'F':
-            digit = 10 + c - 'A';
-            break;
-          default:
-            throw new NumberFormatException();
-          }
-        r = (r << 4) + digit;
-      }
-    return r;
-  }
-  
-  // String filename -> Range
-  TreeSet<Range> map = new TreeSet<Range>(new RangeComparator());
-  HashMap<String, SymbolTable> symbolTables =
-    new HashMap<String, SymbolTable>();
-  ByteOrder byteOrder;
-  int wordSize;
-
-  public MemoryMap(BufferedReader reader,
-                   String rawFileName) throws IOException
-  {
-    FileChannel raw = (new RandomAccessFile(rawFileName, "r")).getChannel();
-    ByteBuffer buf = ByteBuffer.allocate(8);
-    raw.read(buf);
-    if (buf.hasRemaining())
-      {
-        raw.close();
-        throw new EOFException();
-      }
-    buf.flip();
-    wordSize = buf.get();
-    
-    if (wordSize == 8 || wordSize == 4)
-      byteOrder = ByteOrder.LITTLE_ENDIAN;
-    else
-      {
-        byteOrder = ByteOrder.BIG_ENDIAN;
-        buf.rewind();
-        wordSize = buf.getInt();
-        if (0 == wordSize)
-          wordSize = buf.getInt();
-      }
-    switch (wordSize)
-      {
-      case 4:
-      case 8:
-        break;
-      default:
-        throw new IOException("Bad .bytes file header");
-      }
-    buf = ByteBuffer.allocate(3 * wordSize);
-    buf.order(byteOrder);
-    raw.position(0L);
-
-    for(;;)
-      {
-        // Read the block header.
-        buf.clear();
-        if (-1 == raw.read(buf))
-          {
-            //EOF
-            raw.close();
-            break;
-          }
-        if (buf.hasRemaining())
-          {
-            raw.close();
-            throw new EOFException();
-          }
-        buf.flip();
-        long dummy
-          = (wordSize == 4) ? (buf.getInt() & 0xffffffffL) : buf.getLong();
-        if (dummy != wordSize)
-          throw new IOException("Bad .bytes file header");
-        long start
-          = wordSize == 4 ? (buf.getInt() & 0xffffffffL) : buf.getLong();
-        long length
-          = wordSize == 4 ? (buf.getInt() & 0xffffffffL) : buf.getLong();
-        if (length < 0L)
-          throw new IOException("Bad .bytes file header");
-      
-        long currentPos = raw.position();
-        raw.position(currentPos + length);
-    
-        Range range = new Range(start, start + length,
-                                rawFileName, currentPos);
-        map.add(range);
-      }
-
-    for (;;)
-      {
-        String s = reader.readLine();
-        if (s == null)
-          break;
-        if (s.indexOf("Begin address map") >= 0)
-          {
-            for (;;)
-              {
-                s = reader.readLine();
-                if (s.indexOf("End address map") >= 0)
-                  {
-                    dump();
-                    return;
-                  }
-                int endOfAddress = s.indexOf('-');
-                long address = parseHexLong(s.substring(0, endOfAddress));
-                int endOfAddress2 = s.indexOf(' ', endOfAddress + 1);
-                long address2 = parseHexLong(s.substring(endOfAddress + 1,
-                                                         endOfAddress2));
-                int endOfOffset = s.indexOf(' ', endOfAddress2 + 6);
-                long offset;
-                try
-                  {
-                    offset = parseHexLong(s.substring(endOfAddress2 + 6,
-                                                      endOfOffset));
-                  }
-                catch (Exception e)
-                  {
-                    offset = 0;
-                  }
-                int end = s.indexOf('/');
-
-                if (end > 0)
-                  {
-                    String file = s.substring(end);
-                    if (file.startsWith("/dev/"))
-                      continue;
-
-                    Range r = new Range(address, address2, file, offset);
-                    if (offset == 0)
-                      {
-                        // Read the file's symbol table
-                        try
-                          {
-                            File f = ToolPrefix.fileForName(file);
-                            if (f != null)
-                              {
-                                SymbolTable st = new SymbolTable(f.getPath());
-                                if (st.loadAddr != address)
-                                  st.relocation = address - st.loadAddr;
-                                symbolTables.put(file, st);
-                              }
-                          }
-                        catch (Exception ex)
-                          {
-                            ex.printStackTrace();
-                          }
-                      }
-                    map.add(r);
-                  }
-              } // inner loop
-          } // started inner loop
-      } // outer loop - finding begin
-  } // memoryMap
-
-  
-  public void dump()
-  {
-    System.out.println("MemoryMap:");
-    for (Range r : map)
-      {
-        System.out.println(Long.toHexString(r.begin) + "-"
-                           + Long.toHexString(r.end) + " -> "
-                           + r.filename + " offset "
-                           + Long.toHexString(r.offset));
-      }
-  }
-
-  Range getRange(long addr)
-  {
-    Range r = new Range();
-    r.begin = addr;
-    SortedSet<Range> t = map.tailSet(r);
-    if (t.isEmpty())
-      return null;
-    Range c = t.first();
-    if (c.begin <= addr && addr < c.end)
-      return c;
-    return null;
-  }
-  
-  String getFile(long addr)
-  {
-    Range r = getRange(addr);
-    if (null != r)
-      return r.filename;
-    return null;
-  }
-
-  long getOffset(long addr)
-  {
-    Range r = getRange(addr);
-    if (null != r)
-      return r.offset;
-    return 0L;
-  }
-
-  /**
-   * @return BytePtr which includes given address.
-   */
-  BytePtr getBytePtr(long addr, int length) throws IOException
-  {
-    Range r = getRange(addr);
-    
-    if (null == r)
-      return null;
-
-    File f = ToolPrefix.fileForName(r.filename);
-    if (null == f)
-      return null;
-    
-    if (addr + length > r.end)
-      length = (int)(r.end - addr);
-    
-    ByteBuffer b = ByteBuffer.allocate(length);
-    b.order(byteOrder);
-    
-    FileChannel fc = (new RandomAccessFile(f, "r")).getChannel();
-    fc.position(r.offset + addr - r.begin);
-    int nr = fc.read(b);
-    fc.close();
-    if (nr != length)
-      return null;
-    b.flip();
-    return new BytePtr(b, wordSize);
-  }
-  
-  public String getSymbol(long addr)
-  {
-    Range r = getRange(addr);
-    
-    if (r == null)
-      return null;
-    
-    SymbolTable st = symbolTables.get(r.filename);
-    if (st == null)
-      return null;
-    
-    // Apply relocation
-    addr -= st.relocation;
-    
-    return st.getSymbol(addr);
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/ObjectMap.java b/libjava/gnu/gcj/tools/gc_analyze/ObjectMap.java
deleted file mode 100644
index b55034b..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/ObjectMap.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ObjectMap.java -- Contains a map of all objects keyed by their addresses.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-class ObjectMap implements Iterable<Map.Entry<Long, ObjectMap.ObjectItem>>
-{
-
-  class ObjectItem
-  {
-    int used;
-    int size;
-    int kind;
-    long klass;
-    long data;
-    long ptr;
-    String typeName;
-    String string; // only for string objects
-    boolean stringData; // character array pointed to by a string
-    ObjectItem reference; // object at reference points to this
-
-    ItemList points_to = new ItemList();
-    ItemList pointed_by = new ItemList();
-  }
-
-  private TreeMap<Long, ObjectItem> map = new TreeMap<Long, ObjectItem>();
-
-  public Iterator<Map.Entry<Long, ObjectItem>> iterator()
-  {
-    return map.entrySet().iterator();
-  }
-
-  public ObjectItem get(long ptr)
-  {
-    ObjectItem item = map.get(ptr);
-    return item;
-  }
-
-  public ObjectMap(BufferedReader reader) throws IOException
-  {
-    outer_loop:
-    for (;;)
-      {
-        String s = reader.readLine();
-        if (s == null)
-          break;
-        if (s.indexOf("Begin object map") >= 0)
-          {
-            for (;;)
-              {
-                s = reader.readLine();
-                if (s.indexOf("End object map") >= 0)
-                  break outer_loop;
-                String[] items = s.split(",");
-                ObjectItem item = new ObjectItem();
-                long ptr = 0;
-                for (int i=0; i<items.length; i++)
-                  {
-                    String[] x = items[i].split(" ");
-                    String last = x[x.length-1];
-                    switch (i)
-                      {
-                      case 0:
-                        item.used = Integer.parseInt(last);
-                        break;
-                      case 1:
-                        ptr = MemoryMap.parseHexLong(last.substring(2));
-                        break;
-                      case 2:
-                        item.size = Integer.parseInt(last);
-                        break;
-                      case 3:
-                        item.kind = Integer.parseInt(last);
-                        break;
-                      case 4:
-                        if (last.length() > 1)
-                          item.klass =
-                            MemoryMap.parseHexLong(last.substring(2));
-                        else
-                          item.klass  = Integer.parseInt(last,16);
-                        break;
-                      case 5:
-                        try
-                          {
-                            item.data =
-                              Integer.parseInt(last.substring(2), 16);
-                          }
-                        catch (Exception e)
-                          {
-                            item.data = 0;
-                          }
-                        break;
-                      }
-                  }
-                item.ptr = ptr;
-                map.put(ptr, item);
-              } // inner loop
-          } // started inner loop
-      } // outer loop - finding begin
-    for (Map.Entry<Long, ObjectItem> me : this)
-      {
-        ObjectItem item = me.getValue();
-        if (item.data != 0)
-          {
-            // see if data is a pointer to a block
-            ObjectItem referenced = map.get(item.data);
-            if (referenced != null)
-              {
-                referenced.reference = item;
-              }
-          }
-      }
-  } // memoryMap
-
-  public void dump()
-  {
-    for (Map.Entry<Long, ObjectItem> me : this)
-      {
-        long ptr = me.getKey();
-        ObjectItem item = me.getValue();
-        System.out.println("ptr = " + Long.toHexString(ptr)
-                           + ", size = " + item.size
-                           + ", klass = " + Long.toHexString(item.klass)
-                           + ", kind = " + item.kind
-                           + ", data = " + item.data);
-      }
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/SymbolLookup.java b/libjava/gnu/gcj/tools/gc_analyze/SymbolLookup.java
deleted file mode 100644
index b3963d8..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/SymbolLookup.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* SymbolLookup.java -- Finds class names by analyzing memory.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-
-class SymbolLookup
-{
-  MemoryMap memoryMap;
-
-  public SymbolLookup(BufferedReader reader,
-                      String rawFileName)
-    throws IOException
-  {
-    memoryMap = new MemoryMap(reader, rawFileName);
-  }
-
-  public String decodeUTF8(long address) throws IOException
-  {
-    return decodeUTF8(address, -1);
-  }
-  
-  public String decodeUTF8(long address, int limit) throws IOException
-  {
-    if (address == 0)
-      return null;
-
-    BytePtr utf8 = memoryMap.getBytePtr(address, 64);
-
-    if (utf8 == null)
-      return null;
-
-    int len = utf8.getShort(1);
-    int hash16 = utf8.getShort(0) & 0xffff;
-
-    if (len <= 0 || (limit > 0 && len > (limit - 4)))
-      return null;
-    
-    if (len > utf8.getsize() + 4)
-      utf8 = memoryMap.getBytePtr(address, len + 4);
-
-    if (utf8 == null)
-      return null;
-    
-    StringBuilder sb = new StringBuilder(len);
-    int pos = 4;
-    len += 4;
-    
-    while (pos < len)
-      {
-        int f = utf8.getByte(pos++);
-        if ((f & 0x80) == 0)
-          {
-            sb.append((char)f);
-          }
-        else if ((f & 0xe0) == 0xc0)
-          {
-            int s = utf8.getByte(pos++);
-            char c = (char)(((f & 0x1f) << 6) | (s & 0x80));
-            sb.append(c);
-          }
-        else if ((f & 0xe0) == 0xe0)
-          {
-            int s = utf8.getByte(pos++);
-            int t = utf8.getByte(pos++);
-            char c = (char)(((f & 0x0f) << 12)
-                            | ((s & 0x80) << 6) | (t & 0x80));
-            sb.append(c);
-          }
-        else 
-          break;  // Bad utf8
-      }
-    String rv = sb.toString();
-    if (hash16 == (rv.hashCode() & 0xffff))
-      return rv;
-    else
-      return null;
-  }
-
-  public String getSymbolViaVtable(long address) throws IOException
-  {
-    return memoryMap.getSymbol(address);
-  }
-
-  public String getSymbol(long address) throws IOException
-  {
-    String symbol = memoryMap.getSymbol(address);
-    if (null != symbol)
-      return symbol;
-    
-    BytePtr klass = memoryMap.getBytePtr(address, 3 * memoryMap.wordSize);
-    if (klass == null)
-      return null;
-    
-    long nameUTF8p = klass.getWord(2);
-    
-    return decodeUTF8(nameUTF8p);
-  }
-
-  BytePtr getBytePtr(long addr, int length) throws IOException
-  {
-    return memoryMap.getBytePtr(addr, length);
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/SymbolTable.java b/libjava/gnu/gcj/tools/gc_analyze/SymbolTable.java
deleted file mode 100644
index eb5df76..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/SymbolTable.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/* SymbolTable.java -- Maintains a mapping of addresses to names.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-class SymbolTable
-{
-  // Long address->String name
-  private HashMap<Long, String> map = new HashMap<Long, String>();
-
-  // Reverse
-  // String name -> Long address
-  // used for RelocateImage
-  private HashMap<String, Long> reverse = new HashMap<String, Long>();
-  
-  long loadAddr;
-  long relocation;
-
-  static Matcher interestingSymbol =
-    Pattern.compile("^([0-9a-fA-F]+)\\s+\\S+\\s+(_Z\\S+)").matcher("");
-  static Matcher readelfLoadMatcher =
-    Pattern.compile("^\\s+LOAD\\s+(\\S+)\\s+(\\S+)\\s.*").matcher("");
- 
-  public SymbolTable(String filename) throws IOException
-  {
-    Process p = Runtime.getRuntime().exec(ToolPrefix.toolPrefix
-                                          + "nm " + filename);
-    InputStream es = p.getErrorStream();
-    InputStream is = p.getInputStream();
-
-    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-    int count = 0;
-
-    String line;
-    while ((line = reader.readLine()) != null)
-      {
-        interestingSymbol.reset(line);
-        if (interestingSymbol.matches())
-          {
-            try
-              {
-                String name = interestingSymbol.group(2);
-                String addr = interestingSymbol.group(1);
-                if (name.startsWith("_ZTVN") || name.endsWith("6class$E"))
-                  {
-                    long address = MemoryMap.parseHexLong(addr);
-                    Long l = new Long(address);
-                    map.put(l, name);
-                    count++;
-                    reverse.put(name, l);
-                  }
-              }
-            catch (NumberFormatException e)
-              {
-                // ignore it
-              }
-          }
-      }
-    es.close();
-    is.close();
-    p.destroy();
-    
-    if (count > 0)
-      {
-        // Assume nm read some symbols from it and that
-        // readelf can tell us something about how it is loaded.
-        p = Runtime.getRuntime().exec(ToolPrefix.toolPrefix
-                                      + "readelf -l " + filename);
-        es = p.getErrorStream();
-        is = p.getInputStream();
-
-        reader = new BufferedReader(new InputStreamReader(is));
-        while ((line = reader.readLine()) != null)
-          {
-            readelfLoadMatcher.reset(line);
-            if (readelfLoadMatcher.matches())
-              {
-                loadAddr
-                  = Long.decode(readelfLoadMatcher.group(2)).longValue();
-                break;
-              }
-          }
-        es.close();
-        is.close();
-        p.destroy();
-      }
-    
-    System.out.println(ToolPrefix.toolPrefix + "nm " + filename
-                       + " -> " + count + " symbols");
-  }
-
-  public static void main(String args[])
-  {
-    try
-      {
-        SymbolTable st = new SymbolTable(args[0]);
-        st.dump();
-      }
-    catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
-  }
-
-  public static String demangleVTName(String n)
-  {
-    if (n.startsWith("_ZTVN") && n.endsWith("E"))
-      return demangle(n.substring(5, n.length() - 1));
-    else
-      return null;
-  }
-
-  public void dump()
-  {
-    for (Map.Entry<Long, String> me : map.entrySet())
-      {
-        long address = me.getKey();
-        String symbol = me.getValue();
-        System.out.println(Long.toHexString(address) + " -> " + symbol);
-        if (symbol.startsWith("_ZN") && symbol.endsWith("6class$E"))
-          {
-            System.out.println("  Class: "
-                               + demangle(symbol.substring(3, symbol.length()
-                                                           - 8)));
-          }
-        else if (symbol.startsWith("_ZTVN") && symbol.endsWith("E"))
-          {
-            System.out.println("  VT: "
-                               + demangle(symbol.substring(5, symbol.length()
-                                                           - 1)));
-          }
-      }
-  }
-
-  private static String demangle(String symbol)
-  {
-    StringBuilder sb = new StringBuilder();
-    for (int i=0; i<symbol.length(); )
-      {
-        int l = 0;
-        while (i < symbol.length())
-          {
-            int d = symbol.charAt(i);
-            if (d < '0' || d > '9')
-              break;
-            l = 10 * l + (d - '0');
-            i++;
-          }
-        if (l == 0)
-          break; 
-        // copy
-        if (sb.length() > 0)
-          sb.append('.');
-        while (l > 0 && i < symbol.length())
-          {
-            sb.append(symbol.charAt(i));
-            l--;
-            i++;
-          }
-      }
-    return sb.toString();
-  }
-
-  public String getSymbol(long address)
-  {
-    String symbol = map.get(address);
-    if (symbol == null)
-      return null;
-
-    if (symbol.startsWith("_ZN") && symbol.endsWith("6class$E"))
-      symbol = demangle(symbol.substring(3, symbol.length() - 8));
-    return symbol;
-  }
-
-  // will return -1 if not found
-  public long getAddress(String symbol)
-  {
-    Long address = reverse.get(symbol);
-    if (address == null)
-      return -1;
-    return address.longValue();
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gc_analyze/ToolPrefix.java b/libjava/gnu/gcj/tools/gc_analyze/ToolPrefix.java
deleted file mode 100644
index e8d73ae..0000000
--- a/libjava/gnu/gcj/tools/gc_analyze/ToolPrefix.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ToolPrefix.java -- Container of the toolPrefix String.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gc_analyze;
-
-import java.io.File;
-
-class ToolPrefix
-{
-  /**
-   * Private constructor.  No creation allowed.  This class has
-   * Static methods only.
-    */
-  private ToolPrefix()
-  {
-  }
-  
-  static String toolPrefix = "";
-
-  static String pathPrefix = "";
-  
-  static File fileForName(String filename)
-  {
-    File f = new File(pathPrefix + filename);
-    if (!f.canRead())
-      {
-        // Try it without the prefix.
-        f = new File(filename);
-        if (!f.canRead())
-          {
-            // Try to find it in the current directory.
-            f = new File(f.getName());
-            if (!f.canRead())
-              return null;
-          }      
-      }
-    return f;
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h b/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h
deleted file mode 100644
index fb9b2d6..0000000
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_tools_gcj_dbtool_Fileset__
-#define __gnu_gcj_tools_gcj_dbtool_Fileset__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace tools
-      {
-        namespace gcj_dbtool
-        {
-            class Fileset;
-        }
-      }
-    }
-  }
-}
-
-class gnu::gcj::tools::gcj_dbtool::Fileset : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Fileset(JArray< ::java::lang::String * > *, jint, jint);
-  Fileset(::java::io::InputStream *, jchar);
-  virtual ::java::util::Iterator * iterator();
-  virtual jint size();
-  ::java::util::LinkedHashSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) files;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_tools_gcj_dbtool_Fileset__
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.h b/libjava/gnu/gcj/tools/gcj_dbtool/Main.h
deleted file mode 100644
index 4052bb34..0000000
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_tools_gcj_dbtool_Main__
-#define __gnu_gcj_tools_gcj_dbtool_Main__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class PersistentByteMap;
-      }
-      namespace tools
-      {
-        namespace gcj_dbtool
-        {
-            class Fileset;
-            class Main;
-        }
-      }
-    }
-  }
-}
-
-class gnu::gcj::tools::gcj_dbtool::Main : public ::java::lang::Object
-{
-
-public:
-  Main();
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  static ::java::lang::String * getDbPathTail();
-  static void insist(jboolean);
-  static void usage(::java::io::PrintStream *);
-  static ::gnu::gcj::runtime::PersistentByteMap * addJar(::java::io::File *, ::gnu::gcj::runtime::PersistentByteMap *, ::java::io::File *);
-public: // actually package-private
-  static ::gnu::gcj::runtime::PersistentByteMap * resizeMap(::gnu::gcj::runtime::PersistentByteMap *, jint, jboolean);
-  static ::java::lang::String * bytesToString(JArray< jbyte > *);
-private:
-  static ::gnu::gcj::tools::gcj_dbtool::Fileset * getFiles(JArray< ::java::lang::String * > *, jint, jboolean, jchar);
-  static jboolean verbose;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_tools_gcj_dbtool_Main__
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
deleted file mode 100644
index 91e4ead..0000000
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.tools.gcj_dbtool;
-
-
-import gnu.gcj.runtime.PersistentByteMap;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.jar.*;
-import java.security.MessageDigest;
-
-public class Main
-{
-  static private boolean verbose = false;
-
-  public static void main (String[] s)
-  {
-    boolean fileListFromStdin = false;
-    char filenameSeparator = ' ';
-
-    insist (s.length >= 1);
-
-    if (s[0].equals("-") ||
-	s[0].equals("-0"))
-      {
-	if (s[0].equals("-0"))
-	  filenameSeparator = (char)0;
-	fileListFromStdin = true;
-	String[] newArgs = new String[s.length - 1];
-	System.arraycopy(s, 1, newArgs, 0, s.length - 1);
-	s = newArgs;
-      }
-
-    if (s[0].equals("-v") || s[0].equals("--version"))
-      {
-	insist (s.length == 1);
-	System.out.println("gcj-dbtool ("
-			   + System.getProperty("java.vm.name")
-			   + ") "
-			   + System.getProperty("java.vm.version"));
-	System.out.println();
-	System.out.println("Copyright 2016 Free Software Foundation, Inc.");
-	System.out.println("This is free software; see the source for copying conditions.  There is NO");
-	System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
-	return;
-      }
-    if (s[0].equals("--help"))
-      {
-	usage(System.out);
-	return;
-      }
-
-    if (s[0].equals("-n"))
-      {
-	// Create a new database.
-	insist (s.length >= 2 && s.length <= 3);
-
-	int capacity = 32749;
-
-	if (s.length == 3)
-	  {	    
-	    capacity = Integer.parseInt(s[2]);
-
-	    if (capacity <= 2)
-	      {
-		usage(System.err);
-		System.exit(1);
-	      }
-	  }
-	    
-	try
-	  {
-	    PersistentByteMap b 
-	      = PersistentByteMap.emptyPersistentByteMap(new File(s[1]), 
-							 capacity, capacity*32);
-	  }
-	catch (Exception e)
-	  {
-	    System.err.println ("error: could not create " 
-				+ s[1] + ": " + e.toString());
-	    System.exit(2);
-	  }
-	return;
-      }
-
-    if (s[0].equals("-a") || s[0].equals("-f"))
-      {
-	// Add a jar file to a database, creating it if necessary.
-	// Copies the database, adds the jar file to the copy, and
-	// then renames the new database over the old.
-	try
-	  {
-	    insist (s.length == 4);
-	    File database = new File(s[1]);
-	    database = database.getAbsoluteFile();
-	    File jar = new File(s[2]);	
-	    PersistentByteMap map; 
-	    if (database.isFile())
-	      map = new PersistentByteMap(database, 
-					  PersistentByteMap.AccessMode.READ_ONLY);
-	    else
-	      map = PersistentByteMap.emptyPersistentByteMap(database, 
-							     100, 100*32);
-	    File soFile = new File(s[3]);
-	    if (! s[0].equals("-f") && ! soFile.isFile())
-	      throw new IllegalArgumentException(s[3] + " is not a file");
- 	    map = addJar(jar, map, soFile);
-	  }
-	catch (Exception e)
-	  {
-	    System.err.println ("error: could not update " + s[1] 
-				+ ": " + e.toString());
-	    System.exit(2);
-	  }
-	return;
-      }
-
-    if (s[0].equals("-t"))
-      {
-	// Test
-	try
-	  {
-	    insist (s.length == 2);
-	    PersistentByteMap b 
-	      = new PersistentByteMap(new File(s[1]),
-				      PersistentByteMap.AccessMode.READ_ONLY);
-	    Iterator iterator = b.iterator(PersistentByteMap.ENTRIES);
-	
-	    while (iterator.hasNext())
-	      {
-		PersistentByteMap.MapEntry entry 
-		  = (PersistentByteMap.MapEntry)iterator.next();
-		byte[] key = (byte[])entry.getKey();
-		byte[] value = (byte[])b.get(key);
-		if (! Arrays.equals (value, (byte[])entry.getValue()))
-		  {
-		    String err 
-		      = ("Key " + bytesToString(key) + " at bucket " 
-			 + entry.getBucket());
-		  
-		    throw new RuntimeException(err);
-		  }
-	      }
-	  }
-	catch (Exception e)
-	  {
-	    e.printStackTrace();
-	    System.exit(3);
-	  }
-	return;
-      }
-	 
-    if (s[0].equals("-m"))
-      {
-	// Merge databases.
-	insist (s.length >= 3
-		|| fileListFromStdin && s.length == 2);
-	try
-	  {
-	    File database = new File(s[1]);
-	    database = database.getAbsoluteFile();
-	    File temp = File.createTempFile(database.getName(), "", 
-					    database.getParentFile());
-	    	
-	    int newSize = 0;
-	    int newStringTableSize = 0;
-	    Fileset files = getFiles(s, 2, fileListFromStdin, 
-				     filenameSeparator);
-	    PersistentByteMap[] sourceMaps 
-	      = new PersistentByteMap[files.size()];
-
-	    // Scan all the input files, calculating worst case string
-	    // table and hash table use.
-	    {
-	      Iterator it = files.iterator();
-	      int i = 0;
-	      while (it.hasNext())
-		{
-		  PersistentByteMap b 
-		    = new PersistentByteMap((File)it.next(),
-					    PersistentByteMap.AccessMode.READ_ONLY);
-		  newSize += b.size();
-		  newStringTableSize += b.stringTableSize();
-		  sourceMaps[i++] = b;
-		}
-	    }
-	    
-	    newSize *= 1.5; // Scaling the new size by 1.5 results in
-			    // fewer collisions.
-	    PersistentByteMap map 
-	      = PersistentByteMap.emptyPersistentByteMap
-	      (temp, newSize, newStringTableSize);
-
-	    for (int i = 0; i < sourceMaps.length; i++)
-	      {
-		if (verbose)
-		  System.err.println("adding " + sourceMaps[i].size() 
-				     + " elements from "
-				     + sourceMaps[i].getFile());
-		map.putAll(sourceMaps[i]);
-	      }
-	    map.close();
-	    temp.renameTo(database);
-	  }
-	catch (Exception e)
-	  {
-	    e.printStackTrace();
-	    System.exit(3);
-	  }
-	return;
-      }
-
-    if (s[0].equals("-l"))
-      {
-	// List a database.
-	insist (s.length == 2);
-	try
-	  {
-	    PersistentByteMap b 
-	      = new PersistentByteMap(new File(s[1]),
-				      PersistentByteMap.AccessMode.READ_ONLY);
-
-	    System.out.println ("Capacity: " + b.capacity());
-	    System.out.println ("Size: " + b.size());
-	    System.out.println ();
-
-	    System.out.println ("Elements: ");
-	    Iterator iterator = b.iterator(PersistentByteMap.ENTRIES);
-    
-	    while (iterator.hasNext())
-	      {
-		PersistentByteMap.MapEntry entry 
-		  = (PersistentByteMap.MapEntry)iterator.next();
-		byte[] digest = (byte[])entry.getKey();
-		System.out.print ("[" + entry.getBucket() + "] " 
-				  + bytesToString(digest)
-				  + " -> ");
-		System.out.println (new String((byte[])entry.getValue()));
-	      }
-	  }
-	catch (Exception e)
-	  {
-	    System.err.println ("error: could not list " 
-				+ s[1] + ": " + e.toString());
-	    System.exit(2);
-	  }
-	return;
-      }
-
-    if (s[0].equals("-d"))
-      {
-	// For testing only: fill the byte map with random data.
-	insist (s.length == 2);
-	try
-	  {    
-	    MessageDigest md = MessageDigest.getInstance("MD5");
-	    PersistentByteMap b 
-	      = new PersistentByteMap(new File(s[1]), 
-				      PersistentByteMap.AccessMode.READ_WRITE);
-	    int N = b.capacity();
-	    byte[] bytes = new byte[1];
-	    byte digest[] = md.digest(bytes);
-	    for (int i = 0; i < N; i++)
-	      {
-		digest = md.digest(digest);
-		b.put(digest, digest);
-	      }
-	  }
-	catch (Exception e)
-	  {
-	    e.printStackTrace();
-	    System.exit(3);
-	  }	    
-	return;
-      }
-
-    if (s[0].equals("-p"))
-      {
-	insist (s.length == 1 || s.length == 2);
-	String result;
-	
-	if (s.length == 1)
-	  result = System.getProperty("gnu.gcj.precompiled.db.path", "");
-	else 
-	  result = (s[1] 
-		    + (s[1].endsWith(File.separator) ? "" : File.separator)
-		    + getDbPathTail ());
-
-	System.out.println (result);
-	return;
-      }
-
-    usage(System.err);
-    System.exit(1);	    
-  }
-
-  private static native String getDbPathTail ();
-    
-  private static void insist(boolean ok)
-  {
-    if (! ok)
-      {
-	usage(System.err);
-	System.exit(1);
-      }	    
-  }
-
-  private static void usage(PrintStream out)
-  {
-    out.println
-      ("gcj-dbtool: Manipulate gcj map database files\n"
-       + "\n"
-       + "  Usage: \n"
-       + "    gcj-dbtool -n file.gcjdb [size]     - Create a new gcj map database\n"
-       + "    gcj-dbtool -a file.gcjdb file.jar file.so\n"
-       + "            - Add the contents of file.jar to a gcj map database\n"
-       + "    gcj-dbtool -f file.gcjdb file.jar file.so\n"
-       + "            - Add the contents of file.jar to a gcj map database\n"
-       + "    gcj-dbtool -t file.gcjdb            - Test a gcj map database\n"
-       + "    gcj-dbtool -l file.gcjdb            - List a gcj map database\n"
-       + "    gcj-dbtool [-][-0] -m dest.gcjdb [source.gcjdb]...\n"
-       + "            - Merge gcj map databases into dest\n"
-       + "              Replaces dest\n"
-       + "              To add to dest, include dest in the list of sources\n"
-       + "              If the first arg is -, read the list from stdin\n"
-       + "              If the first arg is -0, filenames separated by nul\n"
-       + "    gcj-dbtool -p [LIBDIR]              - Print default database name"
-       );
-  }
-
-  // Add a jar to a map.  This copies the map first and returns a
-  // different map that contains the data.  The original map is
-  // closed.
-
-  private static PersistentByteMap 
-  addJar(File f, PersistentByteMap b, File soFile)
-    throws Exception
-  {
-    MessageDigest md = MessageDigest.getInstance("MD5");
-
-    JarFile jar = new JarFile (f);
-
-    int count = 0;
-    {
-      Enumeration entries = jar.entries();      
-      while (entries.hasMoreElements())
-	{
-	  JarEntry classfile = (JarEntry)entries.nextElement();
-	  if (classfile.getName().endsWith(".class"))
-	    count++;
-	}
-    }
-
-    if (verbose)
-      System.err.println("adding " + count + " elements from "
-			 + f + " to " + b.getFile());
-    
-    // Maybe resize the destination map.  We're allowing plenty of
-    // extra space by using a loadFactor of 2.  
-    b = resizeMap(b, (b.size() + count) * 2, true);
-
-    Enumeration entries = jar.entries();
-
-    byte[] soFileName = soFile.getCanonicalPath().getBytes("UTF-8");
-    while (entries.hasMoreElements())
-      {
-	JarEntry classfile = (JarEntry)entries.nextElement();
-	if (classfile.getName().endsWith(".class"))
-	  {
-	    InputStream str = jar.getInputStream(classfile);
-	    int length = (int) classfile.getSize();
-	    if (length == -1)
-	      throw new EOFException();
-
-	    byte[] data = new byte[length];
-	    int pos = 0;
-	    while (length - pos > 0)
-	      {
-		int len = str.read(data, pos, length - pos);
-		if (len == -1)
-		  throw new EOFException("Not enough data reading from: "
-					 + classfile.getName());
-		pos += len;
-	      }
-	    b.put(md.digest(data), soFileName);
-	  }
-      }
-    return b;
-  }    
-
-  // Resize a map by creating a new one with the same data and
-  // renaming it.  If close is true, close the original map.
-
-  static PersistentByteMap resizeMap(PersistentByteMap m, int newCapacity, boolean close)
-    throws IOException, IllegalAccessException
-  {
-    newCapacity = Math.max(m.capacity(), newCapacity);
-    File name = m.getFile();
-    File copy = File.createTempFile(name.getName(), "", name.getParentFile());
-    try
-      {
-	PersistentByteMap dest 
-	  = PersistentByteMap.emptyPersistentByteMap
-	  (copy, newCapacity, newCapacity*32);
-	dest.putAll(m);
-	dest.force();
-	if (close)
-	  m.close();
-	copy.renameTo(name);
-	return dest;
-      }
-    catch (Exception e)
-      {
-	copy.delete();
-      }
-    return null;
-  }
-    
-	 
-  static String bytesToString(byte[] b)
-  {
-    StringBuffer hexBytes = new StringBuffer();
-    int length = b.length;
-    for (int i = 0; i < length; ++i)
-      {
-	int v = b[i] & 0xff;
-	if (v < 16)
-	  hexBytes.append('0');
-	hexBytes.append(Integer.toHexString(v));
-      }
-    return hexBytes.toString();
-  }
-
-
-  // Return a Fileset, either from a String array or from System.in,
-  // depending on fileListFromStdin.
-  private static final Fileset getFiles(String[] s, int startPos,
-					boolean fileListFromStdin,
-					char separator)
-  {
-    if (fileListFromStdin)
-      return new Fileset(System.in, separator);
-    else
-      return new Fileset(s, startPos, s.length);
-  }
-}
-
-// Parse a stream into tokens.  The separator can be any char, and
-// space is equivalent to any whitepace character.
-class Tokenizer
-{
-  final Reader r;
-  final char separator;
-
-  Tokenizer(Reader r, char separator)
-  {
-    this.r = r;
-    this.separator = separator;
-  }
-
-  boolean isSeparator(int c)
-  {
-    if (Character.isWhitespace(separator))
-      return Character.isWhitespace((char)c);
-    else
-      return c == separator;
-  }
-
-  // Parse a token from the input stream.  Return the empty string
-  // when the stream is exhausted.
-  String nextToken ()
-  {
-    StringBuffer buf = new StringBuffer();
-    int c;
-    try
-      {
-	while ((c = r.read()) != -1)
-	  {
-	    if (! isSeparator(c))
-	      {
-		buf.append((char)c);
-		break;
-	      }
-	  }
-	while ((c = r.read()) != -1)
-	  {
-	    if (isSeparator(c))
-	      break;
-	    else
-	      buf.append((char)c);
-	  }
-      }
-    catch (java.io.IOException e)
-      {
-      }
-    return buf.toString();
-  }
-}
-
-// A Fileset is a container for a set of files; it can be created
-// either from a string array or from an input stream, given a
-// separator character.
-class Fileset
-{
-  LinkedHashSet files = new LinkedHashSet();
-  
-  Fileset (String[] s, int start, int end)
-  {
-    for (int i = start; i < end; i++)
-      {
-	files.add(new File(s[i]));
-      }
-  }
-
-  Fileset (InputStream is, char separator)
-  {
-    Reader r = new BufferedReader(new InputStreamReader(is));
-    Tokenizer st = new Tokenizer(r, separator);
-    String name;
-    while (! "".equals(name = st.nextToken()))
-      files.add(new File(name));
-  }
-
-  Iterator iterator()
-  {
-    return files.iterator();
-  }
-
-  int size()
-  {
-    return files.size();
-  }
-}
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h b/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h
deleted file mode 100644
index 7c5c411..0000000
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_tools_gcj_dbtool_Tokenizer__
-#define __gnu_gcj_tools_gcj_dbtool_Tokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace tools
-      {
-        namespace gcj_dbtool
-        {
-            class Tokenizer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::gcj::tools::gcj_dbtool::Tokenizer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Tokenizer(::java::io::Reader *, jchar);
-  virtual jboolean isSeparator(jint);
-  virtual ::java::lang::String * nextToken();
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) r;
-  jchar separator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_tools_gcj_dbtool_Tokenizer__
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/natMain.cc b/libjava/gnu/gcj/tools/gcj_dbtool/natMain.cc
deleted file mode 100644
index 52ba0d7..0000000
--- a/libjava/gnu/gcj/tools/gcj_dbtool/natMain.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// natMain -- gcj-dbtool native code.
-
-/* Copyright (C) 2005  Free Software Foundation
-
-   This file is part of gcj-dbtool.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Anthony Green <green@redhat.com>.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#include <gnu/gcj/tools/gcj_dbtool/Main.h>
-
-java::lang::String *
-gnu::gcj::tools::gcj_dbtool::Main::getDbPathTail ()
-{
-  return JvNewStringLatin1 (LIBGCJ_DEFAULT_DATABASE_PATH_TAIL);
-}
diff --git a/libjava/gnu/gcj/util/Debug.h b/libjava/gnu/gcj/util/Debug.h
deleted file mode 100644
index 3ad59ef..0000000
--- a/libjava/gnu/gcj/util/Debug.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_util_Debug__
-#define __gnu_gcj_util_Debug__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace util
-      {
-          class Debug;
-      }
-    }
-  }
-}
-
-class gnu::gcj::util::Debug : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Debug(::java::io::PrintStream *, jint, jint, jboolean);
-  Debug(::java::io::PrintStream *);
-  Debug(jint, jboolean);
-  Debug(jint);
-  Debug();
-private:
-  void indent();
-  static JArray< ::java::lang::reflect::Field * > * getDeclaredFields(::java::lang::Class *);
-  static ::java::lang::Object * getField(::java::lang::Object *, ::java::lang::reflect::Field *);
-  static jlong getAddr(::java::lang::Object *);
-  JArray< ::java::lang::reflect::Field * > * internalGetFields(::java::lang::Class *);
-  static ::java::lang::Class * getItsClass(::java::lang::Object *);
-  void print(::java::lang::Object *);
-  void print0(::java::lang::Object *, ::java::lang::Class *);
-public:
-  virtual void write(::java::lang::Object *);
-private:
-  ::java::io::PrintStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  jint maxdepth;
-  jint maxArrayLength;
-  jboolean printStaticFields;
-  jint depth;
-  ::java::util::IdentityHashMap * h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_util_Debug__
diff --git a/libjava/gnu/gcj/util/Debug.java b/libjava/gnu/gcj/util/Debug.java
deleted file mode 100644
index d19ab69..0000000
--- a/libjava/gnu/gcj/util/Debug.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*  Copyright (C) 2004  Free Software Foundation
-
-This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Utility methods that allow an object to be converted to a textual
-   representation on an OutputStream.  The intention here is that this
-   class be used for debugging, so we provide information about all
-   fields, public or otherwise. */
-
-package gnu.gcj.util;
-
-import java.lang.reflect.*;
-import java.io.*;
-import java.util.*;
-
-class Debug 
-{
-  private final PrintStream p;
-  private final int maxdepth;
-  private final int maxArrayLength;
-  private final boolean printStaticFields;
-  private int depth; 
-
-  Debug(PrintStream writer, int maxdepth, int maxArrayLength, boolean printStaticFields)
-  {
-    p = writer;
-    this.maxdepth = maxdepth;
-    this.maxArrayLength = maxArrayLength;
-    this.printStaticFields = printStaticFields;
-  }
-
-  Debug(PrintStream writer)
-  {
-    this(writer, 0, 10, false);
-  }
-
-  Debug(int maxdepth, boolean printStaticFields)
-  {
-    this(new PrintStream
-	 (new FileOutputStream(FileDescriptor.err), true), 
-	 maxdepth, 
-	 maxdepth > 0 ? 1000 : 10, printStaticFields);
-  }
-
-  Debug(int maxdepth)
-  {
-    this(maxdepth, false);
-  }
-
-  Debug()
-  {
-    this(0, false);
-  }
-  
-  private final void indent()
-  {
-    for (int i = 0; i < depth; i++)
-      p.print("  ");
-  }
-
-  private final java.util.IdentityHashMap h = 
-  new java.util.IdentityHashMap();
-
-  private static native Field[] getDeclaredFields(Class c);
-  private static native Object getField(Object o, Field f);
-  private static native long getAddr(Object o);
-
-  // Return an array containing all the fields of a class and its
-  // superclasses.
-  private Field[] internalGetFields(Class c)
-  {
-    HashSet set = new HashSet();
-    set.addAll(Arrays.asList(getDeclaredFields(c)));
-    Class[] interfaces = c.getInterfaces();
-    for (int i = 0; i < interfaces.length; i++)
-      set.addAll(Arrays.asList(internalGetFields(interfaces[i])));
-    Class superClass = c.getSuperclass();
-    if (superClass != null)
-      set.addAll(Arrays.asList(internalGetFields(superClass)));
-    return (Field[])set.toArray(new Field[set.size()]);
-  }
-
-  // FIXME: We could just use getClass() here, but this is a
-  // workaround for a C++ bug that is causing getClass() to be
-  // miscompiled.
-  static private Class getItsClass(Object O)
-  {
-    return O.getClass();
-  }
-
-  // Print a reasonably readable textual representation of an object
-  // on our OutputStream.  Objects are only printed once, no matter
-  // how many references point to them.
-  private void print(Object O)
-  {
-    int savedDepth = depth;
-    h.put(O, O);
-    try
-      {
-	Class C = getItsClass(O);
-	p.print(C.getName() + "@");
-	p.println(Long.toHexString(getAddr(O)));
-
-	if (C.isArray())
-	  {
-	    indent(); p.println("{");
-	    depth++;
-	    indent();
-	    C = C.getComponentType();
-
-	    int len = Array.getLength(O);
-	    for (int i = 0; i < len; i++)
-	      {
-		Object thing = Array.get(O, i);
-		print0(thing, C);
-		p.print(", ");
-		if (i > maxArrayLength)
-		  {
-		    p.print("...");
-		    break;
-		  }
-	      }
-	    depth--;
-	    p.println();
-	    indent(); p.print("}");
-	    return;
-	  }
-
-	indent(); p.println("{");
-	depth++;
-	if (C == java.lang.Class.class)
-	  {
-	    indent();
-	    p.println ("class = " + O.toString() + ",");
-	  }
-	else if (C == java.lang.reflect.Field.class)
-	  {
-	    indent();
-	    p.println ("<field> = \"" + O.toString() + "\",");
-	  }
-	else if (C == java.lang.String.class)
-	  {
-	    indent();
-	    p.println ("<string> = \"" + O.toString() + "\",");
-	  }
-	Field[] f = internalGetFields(C);
-	for (int i = 0; i < f.length; i++)
-	  {
-	    Class type = f[i].getType();
-	    boolean isStatic = (f[i].getModifiers() & Modifier.STATIC) != 0;
- 
-	    if (isStatic && ! printStaticFields)
-	      continue;
-
-	    indent();
-	    if (isStatic)
-	      p.print("static ");
-	    p.print(type.getName() +" " +f[i].getName() + " = ");
-	    Object thing = getField(O, f[i]);
-	    print0(thing, type);
-	    p.println(",");
-	  }
-	depth--;
-	indent(); p.print("}");
-      }
-    catch (Throwable t)
-      {
-	p.print("error: 0x" + Long.toHexString(getAddr(O)) + ";");
-	depth = savedDepth;
-      }
-  }
-
-  private void print0(Object thing, Class C)
-  {
-    try
-      {
-	if (thing == null)
-	  {
-	    p.print("null");
-	    return;
-	  }
-	else if (C == gnu.gcj.RawData.class || 
-		 C == gnu.gcj.RawDataManaged.class)
-	  {
-	  }
-	else if (C.isPrimitive())
-	  {
-	    if (getItsClass(thing) == Character.class)				
-	      p.print("'" + thing + "'");
-	    else
-	      p.print(thing);
-	    return;
-	  }
-	else if (getItsClass(thing) == String.class)
-	  {			  
-	    p.print("\"" + thing + "\"");
-	    return;
-	  }
-	else if (depth < maxdepth && h.get(thing) == null)
-	  {
-	    depth++;
-	    print(thing);
-	    depth--;
-	    return;
-	  }
-      }
-    catch (Throwable t)
-      {
-      }
-    
-    // The default action: just print the address.
-    p.print("0x"+ Long.toHexString(getAddr(thing)));    
-  }
-
-  // Print the textual representation of an object on System.err.
-  public void write(Object O)
-  {
-    depth = 0;
-    print(O);
-    p.flush();
-  }
-}
diff --git a/libjava/gnu/gcj/util/GCInfo.h b/libjava/gnu/gcj/util/GCInfo.h
deleted file mode 100644
index 06e0dd0..0000000
--- a/libjava/gnu/gcj/util/GCInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_util_GCInfo__
-#define __gnu_gcj_util_GCInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace util
-      {
-          class GCInfo;
-      }
-    }
-  }
-}
-
-class gnu::gcj::util::GCInfo : public ::java::lang::Object
-{
-
-  GCInfo();
-  static void checkPermission();
-public:
-  static void dump(::java::lang::String *);
-private:
-  static void dump0(::java::lang::String *);
-public:
-  static void enumerate(::java::lang::String *);
-private:
-  static void enumerate0(::java::lang::String *);
-public:
-  static void setOOMDump(::java::lang::String *);
-private:
-  static void setOOMDump0(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_util_GCInfo__
diff --git a/libjava/gnu/gcj/util/GCInfo.java b/libjava/gnu/gcj/util/GCInfo.java
deleted file mode 100644
index 73f4718..0000000
--- a/libjava/gnu/gcj/util/GCInfo.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GCInfo.java -- Support for creating heap dumps.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.util;
-
-public class GCInfo
-{
-  private GCInfo()
-  {
-  }
-
-  /**
-   * @throws SecurityException if there is a SecurityManager installed
-   * and UtilPermission("dumpHeap") is not granted.
-   */
-  private static void checkPermission()
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkPermission(new UtilPermission("dumpHeap"));
-  }
-  
-
-  /**
-   * Dump a description of the heap state.
-   *
-   * @param namePrefix The filename prefix for the dump files.
-   *
-   * @throws SecurityException if there is a SecurityManager installed
-   * and UtilPermission("dumpHeap") is not granted.
-   */
-  public static synchronized void dump(String name)
-  {
-    checkPermission();
-    dump0(name);
-  }
-  
-  private static native void dump0(String name);
-
-
-  /**
-   * Create a heap dump.
-   *
-   * @param namePrefix The filename prefix for the dump files.
-   *
-   * @throws SecurityException if there is a SecurityManager installed
-   * and UtilPermission("dumpHeap") is not granted.
-   */
-  public static synchronized void enumerate(String namePrefix)
-  {
-    checkPermission();
-    enumerate0(namePrefix);
-  }
-  
-  private static native void enumerate0(String namePrefix);
-
-  /**
-   * Cause a heap dump if out-of-memory condition occurs.
-   *
-   * @param namePrefix The filename prefix for the dump files.  If
-   * null no dumps are created.
-   *
-   * @throws SecurityException if there is a SecurityManager installed
-   * and UtilPermission("dumpHeap") is not granted.
-   */
-  public static synchronized void setOOMDump(String namePrefix)
-  {
-    checkPermission();
-    setOOMDump0(namePrefix);
-  }
-  
-  private static native void setOOMDump0(String namePrefix);
-}
diff --git a/libjava/gnu/gcj/util/UtilPermission.h b/libjava/gnu/gcj/util/UtilPermission.h
deleted file mode 100644
index 4c7b226..0000000
--- a/libjava/gnu/gcj/util/UtilPermission.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_util_UtilPermission__
-#define __gnu_gcj_util_UtilPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace util
-      {
-          class UtilPermission;
-      }
-    }
-  }
-}
-
-class gnu::gcj::util::UtilPermission : public ::java::security::BasicPermission
-{
-
-public:
-  UtilPermission(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_util_UtilPermission__
diff --git a/libjava/gnu/gcj/util/UtilPermission.java b/libjava/gnu/gcj/util/UtilPermission.java
deleted file mode 100644
index 1ea4cb7..0000000
--- a/libjava/gnu/gcj/util/UtilPermission.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/* GCInfo.java -- Support for creating heap dumps.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-package gnu.gcj.util;
-
-import java.security.BasicPermission;
-
-public class UtilPermission extends BasicPermission
-{
-  public UtilPermission(String name)
-  {
-    super(name);
-  }
-}
diff --git a/libjava/gnu/gcj/util/natDebug.cc b/libjava/gnu/gcj/util/natDebug.cc
deleted file mode 100644
index e2631b1..0000000
--- a/libjava/gnu/gcj/util/natDebug.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// natDebug -- C++ side of Debug
-
-/* Copyright (C) 2004  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <stddef.h>
-#include <gcj/cni.h>
-#include <gcj/field.h>
-#include <gcj/javaprims.h>
-#include <java/lang/reflect/Field.h>
-#include <java/lang/Class.h>
-#include <java/lang/Byte.h>
-#include <java/lang/Short.h>
-#include <java/lang/Integer.h>
-#include <java/lang/Long.h>
-#include <java/lang/Float.h>
-#include <java/lang/Double.h>
-#include <java/lang/Boolean.h>
-#include <java/lang/Character.h>
-#include <java/lang/IllegalArgumentException.h>
-
-#include <gnu/gcj/util/Debug.h>
-
-jlong 
-gnu::gcj::util::Debug::getAddr (::java::lang::Object *o)
-{
-  return (jlong)(size_t)o;
-}
-
-JArray< ::java::lang::reflect::Field *> *
-gnu::gcj::util::Debug::getDeclaredFields (::java::lang::Class *c)
-{
-  return c->getDeclaredFields (false);
-}
-
-static void *
-getField (::java::lang::Object *obj, 
-	  ::java::lang::reflect::Field *field)
-{
-  using namespace java::lang::reflect;
-  
-  jfieldID fld = _Jv_FromReflectedField (field);
-  _Jv_ushort flags = fld->getModifiers();
-
-  if (flags & Modifier::STATIC)
-    {
-      jclass fldClass = field->getDeclaringClass ();
-      JvInitClass(fldClass);
-      return (void*) fld->u.addr;
-    }
-  else
-    {
-      return (void*) ((char*) obj + fld->getOffset ());
-    }
-}
-
-::java::lang::Object *
-gnu::gcj::util::Debug::getField (::java::lang::Object *o, 
-				   ::java::lang::reflect::Field *field)
-{
-  void *addr = ::getField (o, field);
-
-  jclass type = field->getType();
-  if (! type->isPrimitive ())
-    return * (jobject*) addr;
-  if (type == JvPrimClass (double))
-    return new ::java::lang::Double (* (jdouble*) addr);
-  if (type == JvPrimClass (float))
-    return new ::java::lang::Float (* (jfloat*) addr);
-  if (type == JvPrimClass (long))
-    return new ::java::lang::Long (* (jlong*) addr);
-  if (type == JvPrimClass (int))
-    return new ::java::lang::Integer (* (jint*) addr);
-  if (type == JvPrimClass (short))
-    return new ::java::lang::Short (* (jshort*) addr);
-  if (type == JvPrimClass (byte))
-    return new ::java::lang::Byte (* (jbyte*) addr);
-  if (type == JvPrimClass (char))
-    return new ::java::lang::Character (* (jchar*) addr);
-  if (type == JvPrimClass (boolean))
-    {
-      _Jv_InitClass (&::java::lang::Boolean::class$);
-      if (* (jboolean*) addr)
-	return ::java::lang::Boolean::TRUE;
-      else
-	return ::java::lang::Boolean::FALSE;
-    }
-  throw new ::java::lang::IllegalArgumentException;
-}
-
-/* A simple method of printing an object that can be called from a
-   debugger.  */
-extern "C"
-void
-_Jv_Debug (void *p)
-{
-  (new ::gnu::gcj::util::Debug ())->write ((jobject)p);
-}
-
-extern "C"
-void
-_Jv_DeepDebug (void *p, int depth)
-{
-  (new ::gnu::gcj::util::Debug (depth))->write ((jobject)p);
-}
-
-extern "C"
-void
-_Jv_StaticDeepDebug (void *p, int depth)
-{
-  (new ::gnu::gcj::util::Debug (depth, true))->write ((jobject)p);
-}
diff --git a/libjava/gnu/gcj/util/natGCInfo.cc b/libjava/gnu/gcj/util/natGCInfo.cc
deleted file mode 100644
index a593617..0000000
--- a/libjava/gnu/gcj/util/natGCInfo.cc
+++ /dev/null
@@ -1,458 +0,0 @@
-/* natGCInfo.cc -- Native portion of support for creating heap dumps.
-   Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-   This software is copyrighted work licensed under the terms of the
-   Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-   details.  */
-
-
-#include <config.h>
-
-#include <gcj/cni.h>
-
-#include <gnu/gcj/util/GCInfo.h>
-
-#ifdef HAVE_PROC_SELF_MAPS
-//
-// If /proc/self/maps does not exist we assume we are doomed and do nothing.
-//
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-//
-// Boehm GC includes.
-//
-#ifdef PACKAGE_NAME
-#undef PACKAGE_NAME
-#endif
-
-#ifdef PACKAGE_STRING
-#undef PACKAGE_STRING
-#endif
-
-#ifdef PACKAGE_TARNAME
-#undef PACKAGE_TARNAME
-#endif
-
-#ifdef PACKAGE_VERSION
-#undef PACKAGE_VERSION
-#endif
-
-#ifdef TRUE
-#undef TRUE
-#endif
-
-#ifdef FALSE
-#undef FALSE
-#endif
-
-extern "C" {
-#include "private/dbg_mlc.h"
-  int GC_n_set_marks(hdr* hhdr);
-  ptr_t GC_clear_stack(ptr_t p);
-  extern int GC_gcj_kind;
-  extern int GC_gcj_debug_kind;
-}
-
-#endif
-
-#ifdef HAVE_PROC_SELF_MAPS
-
-static int gc_ok = 1;
-
-struct gc_debug_info
-{
-  int used;
-  int free;
-  int wasted;
-  int blocks;
-  FILE* fp;
-};
-
-static void
-GC_print_debug_callback(hblk *h, word user_data)
-{
-  hdr *hhdr = HDR(h);
-  size_t bytes = WORDS_TO_BYTES(hhdr -> hb_sz);
-
-  gc_debug_info *pinfo = (gc_debug_info *)user_data;
-
-  fprintf(pinfo->fp, "ptr = %#lx, kind = %d, size = %zd, marks = %d\n",
-          (unsigned long)h, hhdr->hb_obj_kind, bytes, GC_n_set_marks(hhdr));
-}
-
-/*
-  this next section of definitions shouldn't really be here.
-  copied from boehmgc/allchblk.c
-*/
-
-# define UNIQUE_THRESHOLD 32
-# define HUGE_THRESHOLD 256
-# define FL_COMPRESSION 8
-# define N_HBLK_FLS (HUGE_THRESHOLD - UNIQUE_THRESHOLD)/FL_COMPRESSION \
-                         + UNIQUE_THRESHOLD
-#ifndef USE_MUNMAP
-extern "C" {
-  extern word GC_free_bytes[N_HBLK_FLS+1];
-}
-#endif
-
-# ifdef USE_MUNMAP
-#   define IS_MAPPED(hhdr) (((hhdr) -> hb_flags & WAS_UNMAPPED) == 0)
-# else  /* !USE_MMAP */
-#   define IS_MAPPED(hhdr) 1
-# endif /* USE_MUNMAP */
-
-static void
-GC_print_hblkfreelist_file(FILE *fp)
-{
-  struct hblk * h;
-  word total_free = 0;
-  hdr * hhdr;
-  word sz;
-  int i;
-    
-  fprintf(fp, "---------- Begin free map ----------\n");
-  for (i = 0; i <= N_HBLK_FLS; ++i)
-    {
-      h = GC_hblkfreelist[i];
-#ifdef USE_MUNMAP
-      if (0 != h)
-        fprintf (fp, "Free list %ld:\n", (unsigned long)i);
-#else
-      if (0 != h)
-        fprintf (fp, "Free list %ld (Total size %ld):\n",
-                 (unsigned long)i,
-                 (unsigned long)GC_free_bytes[i]);
-#endif
-      while (h != 0)
-        {
-          hhdr = HDR(h);
-          sz = hhdr -> hb_sz;
-          fprintf (fp, "\t0x%lx size %lu ", (unsigned long)h,
-                   (unsigned long)sz);
-          total_free += sz;
-
-          if (GC_is_black_listed (h, HBLKSIZE) != 0)
-            fprintf (fp, "start black listed\n");
-          else if (GC_is_black_listed(h, hhdr -> hb_sz) != 0)
-            fprintf (fp, "partially black listed\n");
-          else
-            fprintf (fp, "not black listed\n");
-
-          h = hhdr -> hb_next;
-        }
-    }
-#ifndef USE_MUNMAP
-  if (total_free != GC_large_free_bytes)
-    {
-      fprintf (fp, "GC_large_free_bytes = %lu (INCONSISTENT!!)\n",
-               (unsigned long) GC_large_free_bytes);
-    }
-#endif
-  fprintf (fp, "Total of %lu bytes on free list\n", (unsigned long)total_free);
-  fprintf (fp, "---------- End free map ----------\n");
-}
-
-static int GC_dump_count = 1;
-
-static void
-GC_print_debug_info_file(FILE* fp)
-{
-  gc_debug_info info;
-
-  memset(&info, 0, sizeof info);
-  info.fp = fp;
-
-  if (gc_ok)
-    GC_gcollect();
-  fprintf(info.fp, "---------- Begin block map ----------\n");
-  GC_apply_to_all_blocks(GC_print_debug_callback, (word)(void*)(&info));
-  //fprintf(fp, "#Total used %d free %d wasted %d\n", info.used, info.free, info.wasted);
-  //fprintf(fp, "#Total blocks %d; %dK bytes\n", info.blocks, info.blocks*4);
-  fprintf(info.fp, "---------- End block map ----------\n");
-
-  //fprintf(fp, "\n***Free blocks:\n");
-  //GC_print_hblkfreelist();
-}
-
-namespace
-{
-  class  __attribute__ ((visibility ("hidden"))) GC_enumerator
-  {
-  public:
-    GC_enumerator(const char *name);
-    void enumerate();
-  private:
-    FILE* fp;
-    int bytes_fd;
-
-    void print_address_map();
-    void enumerate_callback(struct hblk *h);
-    static void enumerate_callback_adaptor(struct hblk *h, word dummy);
-  };
-}
-
-GC_enumerator::GC_enumerator(const char *name)
-{
-  bytes_fd = -1;
-  fp = fopen (name, "w");
-  if (!fp)
-    {
-      printf ("GC_enumerator failed to open [%s]\n", name);
-      return;
-    }
-  printf ("GC_enumerator saving summary to [%s]\n", name);
-
-  // open heap file
-  char bytes_name[strlen(name) + 10];
-  sprintf (bytes_name, "%s.bytes", name);
-  bytes_fd = open (bytes_name, O_CREAT|O_TRUNC|O_WRONLY, 0666);
-  if (bytes_fd <= 0)
-    {
-      printf ("GC_enumerator failed to open [%s]\n", bytes_name);
-      return;
-    }
-  printf ("GC_enumerator saving heap contents to [%s]\n", bytes_name);
-}
-
-/*
-  sample format of /proc/self/maps
-
-  0063b000-00686000 rw-p 001fb000 03:01 81993      /avtrex/bin/dumppropapp
-  00686000-0072e000 rwxp 00000000 00:00 0 
-
-  These are parsed below as:
-  start   -end      xxxx xxxxxxxx  a:b xxxxxxxxxxxxxxx
-
-*/
-
-
-void
-GC_enumerator::print_address_map()
-{
-  FILE* fm;
-  char buffer[128];
-
-  fprintf(fp, "---------- Begin address map ----------\n");
-
-  fm = fopen("/proc/self/maps", "r");
-  if (fm == NULL)
-    {
-#ifdef HAVE_STRERROR_R
-      if (0 == strerror_r (errno, buffer, sizeof buffer))
-        fputs (buffer, fp);
-#else
-      fputs (strerror (errno), fp);
-#endif
-    }
-  else
-    {
-      while (fgets (buffer, sizeof buffer, fm) != NULL)
-        {
-          fputs (buffer, fp);
-          char *dash = strchr(buffer, '-');
-          char *colon = strchr(buffer, ':');
-          if (dash && colon && ((ptrdiff_t)strlen(buffer) > (colon - buffer) + 2))
-            {
-              char *endp;
-              unsigned long start = strtoul(buffer, NULL, 16);
-              unsigned long end   = strtoul(dash + 1, &endp, 16);
-              unsigned long a     = strtoul(colon - 2, NULL, 16);
-              unsigned long b     = strtoul(colon + 1, NULL, 16);
-              // If it is an anonymous mapping 00:00 and both readable
-              // and writeable then dump the contents of the mapping
-              // to the bytes file.  Each block has a header of three
-              // unsigned longs:
-              // 0 - The number sizeof(unsigned long) to detect endianness and
-              //     structure layout.
-              // 1 - The offset in VM.
-              // 2 - The Length in bytes.
-              // Followed by the bytes.
-              if (!a && !b && endp < colon && 'r' == endp[1] && 'w' == endp[2])
-                {
-                  unsigned long t = sizeof(unsigned long);
-                  write(bytes_fd, (void*)&t, sizeof(t));
-                  write(bytes_fd, (void*)&start, sizeof(start));
-                  t = end - start;
-                  write(bytes_fd, (void*)&t, sizeof(t));
-                  write(bytes_fd, (void*)start, (end - start));
-                }
-            }
-        } 
-      fclose(fm);
-    }
-  fprintf(fp, "---------- End address map ----------\n");
-  fflush(fp);
-}
-
-void
-GC_enumerator::enumerate()
-{
-  print_address_map();
-  fprintf(fp, "---------- Begin object map ----------\n");
-  if (gc_ok)
-    GC_gcollect();
-  GC_apply_to_all_blocks(enumerate_callback_adaptor, 
-                         (word)(void*)(this));
-  fprintf(fp, "---------- End object map ----------\n");
-  fflush(fp); 
-
-  GC_print_debug_info_file(fp);
-  fflush(fp); 
-  GC_print_hblkfreelist_file(fp);
-  fflush(fp); 
-
-  close(bytes_fd);
-  fclose(fp);
-
-  GC_clear_stack(0);
-}
-
-void
-GC_enumerator::enumerate_callback_adaptor(struct hblk *h,
-                                          word dummy)
-{
-  GC_enumerator* pinfo = (GC_enumerator*)dummy;
-  pinfo->enumerate_callback(h);
-}
-
-void
-GC_enumerator::enumerate_callback(struct hblk *h)
-{
-  hdr * hhdr = HDR(h);
-  size_t bytes = WORDS_TO_BYTES(hhdr->hb_sz);
-  int i;
-
-  for (i = 0; i == 0 || (i + bytes <= HBLKSIZE); i += bytes)
-    {
-      int inUse = mark_bit_from_hdr(hhdr,BYTES_TO_WORDS(i));  // in use
-      char *ptr = (char*)h+i;                                 // address
-      int kind = hhdr->hb_obj_kind;                           // kind
-      void *klass = 0;
-      void *data = 0;
-      if (kind == GC_gcj_kind
-          || kind == GC_gcj_debug_kind
-          || kind == GC_gcj_debug_kind+1)
-        {
-          void* v = *(void **)ptr;
-          if (v)
-            {
-              klass = *(void **)v;
-              data = *(void **)(ptr + sizeof(void*));
-            }
-        }
-      if (inUse)
-        fprintf (fp, "used = %d, ptr = %#lx, size = %zd, kind = %d, "
-                 "klass = %#lx, data = %#lx\n", 
-                 inUse, (unsigned long)ptr, bytes, kind,
-                 (unsigned long)klass, (unsigned long)data);
-    }
-}
-
-/*
- * Fill in a char[] with low bytes of the string characters.  These
- * methods may be called while an OutOfMemoryError is being thrown, so
- * we cannot call nice java methods to get the encoding of the string.
- */
-static void
-J2A(::java::lang::String* str, char *dst)
-{
-  jchar * pchars = JvGetStringChars(str);
-  jint len = str->length();
-  int i;
-  for (i=0; i<len; i++)
-    dst[i] = (char)pchars[i];
-  dst[i] = 0;
-}
-
-void
-::gnu::gcj::util::GCInfo::dump0 (::java::lang::String * name)
-{
-  char n[name->length() + 1];
-  J2A(name, n);
-  
-  char temp[name->length() + 20];
-  sprintf(temp, "%s%03d", n, GC_dump_count++);
-  FILE* fp = fopen(temp, "w");
-
-  GC_print_debug_info_file(fp);
-
-  fclose(fp);
-}
-
-void
-::gnu::gcj::util::GCInfo::enumerate0 (::java::lang::String * name)
-{
-  char n[name->length() + 1];
-  J2A(name, n);
-  char temp[name->length() + 20];
-  sprintf(temp, "%s%03d", n, GC_dump_count++);
-
-  GC_enumerator x(temp);
-  x.enumerate();
-}
-
-static char *oomDumpName = NULL;
-
-static void *
-nomem_handler(size_t size)
-{
-  if (oomDumpName)
-    {
-      char temp[strlen(oomDumpName) + 20];
-      sprintf(temp, "%s%03d", oomDumpName, GC_dump_count++);
-      printf("nomem_handler(%zd) called\n", size);
-      gc_ok--;
-      GC_enumerator x(temp);
-      x.enumerate();
-      gc_ok++;
-    }
-  return (void*)0;
-}
-
-void
-::gnu::gcj::util::GCInfo::setOOMDump0 (::java::lang::String * name)
-{
-  char *oldName = oomDumpName;
-  oomDumpName = NULL;
-  free (oldName);
-  
-  if (NULL == name)
-    return;
-  
-  char *n = (char *)malloc(name->length() + 1);
-
-  J2A(name, n);
-  oomDumpName = n;
-  GC_oom_fn = nomem_handler;
-}
-
-#else  // HAVE_PROC_SELF_MAPS
-
-void
-::gnu::gcj::util::GCInfo::dump0 (::java::lang::String * name)
-{
-  // Do nothing if dumping not supported.
-}
-
-void
-::gnu::gcj::util::GCInfo::enumerate0 (::java::lang::String * name)
-{
-  // Do nothing if dumping not supported.
-}
-
-void
-::gnu::gcj::util::GCInfo::setOOMDump0 (::java::lang::String * name)
-{
-  // Do nothing if dumping not supported.
-}
-
-#endif // HAVE_PROC_SELF_MAPS
-
diff --git a/libjava/gnu/gcj/xlib/Clip.h b/libjava/gnu/gcj/xlib/Clip.h
deleted file mode 100644
index 3fe491b..0000000
--- a/libjava/gnu/gcj/xlib/Clip.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Clip__
-#define __gnu_gcj_xlib_Clip__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Clip;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::Clip : public ::java::lang::Object
-{
-
-public:
-  Clip(JArray< ::java::awt::Rectangle * > *);
-private:
-  void init(JArray< ::java::awt::Rectangle * > *);
-public:
-  void finalize();
-  void dispose();
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xrects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Clip__
diff --git a/libjava/gnu/gcj/xlib/Clip.java b/libjava/gnu/gcj/xlib/Clip.java
deleted file mode 100644
index 311dfa6..0000000
--- a/libjava/gnu/gcj/xlib/Clip.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-import java.awt.Rectangle;
-
-/**
- * Describes a clip that is used to constrain drawing using a GC
- * within a specific region. Currently it supports clip regions
- * consisting of the union of multiple rectangles. Other clip forms
- * may be implented later. This class is used internally by the GC
- * class, and wraps a native XRectVector[].
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-final class Clip
-{
-  public Clip(Rectangle[] rects)
-  {
-    init(rects);
-  }
-
-  private native void init(Rectangle[] rects);
-
-  public void finalize()
-  {
-    dispose ();
-  }
-  
-  public native void dispose();
-
-  RawData xrects;
-}
diff --git a/libjava/gnu/gcj/xlib/Colormap.h b/libjava/gnu/gcj/xlib/Colormap.h
deleted file mode 100644
index 440766e..0000000
--- a/libjava/gnu/gcj/xlib/Colormap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Colormap__
-#define __gnu_gcj_xlib_Colormap__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XID.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Colormap;
-          class Screen;
-          class XColor;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Colormap : public ::gnu::gcj::xlib::XID
-{
-
-public:
-  Colormap(::gnu::gcj::xlib::Screen *, jint);
-  jlong allocateColorPixel(::gnu::gcj::xlib::XColor *);
-  ::gnu::gcj::xlib::XColor * allocateColor(jint, jint, jint);
-  JArray< ::gnu::gcj::xlib::XColor * > * getSharedColors();
-  JArray< ::gnu::gcj::xlib::XColor * > * getXColors();
-private:
-  JArray< ::gnu::gcj::xlib::XColor * > * newXColorArray(jint);
-public: // actually package-private
-  ::gnu::gcj::xlib::Screen * __attribute__((aligned(__alignof__( ::gnu::gcj::xlib::XID)))) screen;
-public:
-  static const jbyte FLAG_SHARED = 1;
-  static const jbyte FLAG_NOT_SHARED = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Colormap__
diff --git a/libjava/gnu/gcj/xlib/Colormap.java b/libjava/gnu/gcj/xlib/Colormap.java
deleted file mode 100644
index 538782e..0000000
--- a/libjava/gnu/gcj/xlib/Colormap.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/**
- * An X11 color map resource.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class Colormap extends XID
-{
-  Screen screen;
-  
-  public static final byte FLAG_SHARED = 1;
-  public static final byte FLAG_NOT_SHARED = 2;
-  
-  public Colormap(Screen screen, int xid)
-  {
-    super(screen.getDisplay(), xid);
-    this.screen = screen;
-  }
-  
-  /**
-   * Allocate color pixel.
-   *
-   * @param color The color to be allocated.  If allocation is
-   * successful, this object will be modified to reflect the actual
-   * color that was allocated.
-   *
-   * @return the pixel value of the allocated color.
-   */
-  public native long allocateColorPixel(XColor color);
-
-  /**
-   * Allocate a color consisting of the given RGB-triplet.
-   *
-   * @return a color object describing the allocated color.
-   */
-  public XColor allocateColor(int r, int g, int b)
-  {
-    XColor color = new XColor(r, g, b);
-    allocateColorPixel(color);
-    
-    return color;
-  }
-
-  /**
-   * Get an array of all colors that currently resides in shared (read
-   * only) color-cells in this color map.
-   */
-  public native XColor[] getSharedColors();
-
-
-  /**
-   * Get all colors currently residing in this color map.  Colors that
-   * are shared (read only) are marked as such by the color flags.
-   * The indexes of the returned array will correspond to the
-   * colorcells of the color map.  Given a color <code>XColor
-   * color</code> from a given color-cell, the expression
-   * <code>color.getFlags() == Colormap.FLAG_SHARED</code> will check
-   * whether the color-cell is shared.
-   */
-  public native XColor[] getXColors();
-
-  /**
-   * Convenience method used by native code to create fully
-   * initialized arrays of XColor objects.
-   */
-  private XColor[] newXColorArray(int n)
-  {
-    XColor[] array = new XColor[n];
-    for (int i=0; i<n; i++)
-      array[i] = new XColor();
-    return array;
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/Display.h b/libjava/gnu/gcj/xlib/Display.h
deleted file mode 100644
index 78bc41d..0000000
--- a/libjava/gnu/gcj/xlib/Display.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Display__
-#define __gnu_gcj_xlib_Display__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Display;
-          class Screen;
-          class Window;
-          class XID;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Display : public ::java::lang::Object
-{
-
-public:
-  Display();
-private:
-  static void staticInit();
-  void init();
-public: // actually protected
-  virtual void finalize();
-  virtual void addXID(jint, ::gnu::gcj::xlib::XID *);
-  virtual void removeXID(jint);
-public:
-  virtual ::gnu::gcj::xlib::Window * getDefaultRootWindow();
-  virtual ::gnu::gcj::xlib::XID * getXID(jint);
-  virtual ::gnu::gcj::xlib::Window * getWindow(jint);
-  virtual ::gnu::gcj::xlib::Screen * getDefaultScreen();
-  virtual jint getDefaultScreenNumber();
-private:
-  jint getDefaultRootWindowXID();
-public:
-  virtual jint getAtom(::java::lang::String *);
-  virtual ::java::lang::String * getAtomName(jint);
-private:
-  jint internAtom(::java::lang::String *);
-public:
-  virtual void flush();
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-private:
-  ::java::util::Dictionary * xids;
-  ::java::util::Dictionary * atoms;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Display__
diff --git a/libjava/gnu/gcj/xlib/Display.java b/libjava/gnu/gcj/xlib/Display.java
deleted file mode 100644
index 50ff129..0000000
--- a/libjava/gnu/gcj/xlib/Display.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
-
-import gnu.gcj.RawData;
-
-/**
- * A connection to an X11 display.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-
-public class Display
-{
-  static
-  {
-    staticInit();
-  }
-
-  public Display()
-  {
-    init();
-  }
-    
-  private static native void staticInit();
-  private native void init();
-  protected native void finalize();
-
-  RawData display = null;
-
-  /* TODO?: Rather than storing such data here, we might consider
-     using the context manager facilities provided by Xlib... */
-  private Dictionary xids = new Hashtable();
-
-  protected final void addXID(int xid, XID window)
-  {
-    xids.put(new Integer(xid), window);
-  }
-  
-  protected final void removeXID(int xid)
-  {
-    xids.remove(new Integer(xid));
-  }
-
-  public final Window getDefaultRootWindow()
-  {
-    int rootXID = getDefaultRootWindowXID();
-    return getWindow(rootXID);
-  }
-
-  public final XID getXID(int xid)
-  {
-    return (XID) xids.get(new Integer(xid));
-  }
-
-  public final Window getWindow(int xid)
-  {
-    Window window = (Window) getXID(xid);
-    if (window == null)
-      {
-	window = new Window(this, xid);
-	addXID(xid, window);
-      }
-    return window;
-  }
-
-  public final Screen getDefaultScreen()
-  {
-    /* Screens objects are not cached since they are lightweight.
-       We just create a new object when requested. */
-    return new Screen(this, getDefaultScreenNumber());
-  }
-
-  public final native int getDefaultScreenNumber();
-
-  private final native int getDefaultRootWindowXID();
-    
-  private Dictionary atoms = new Hashtable();
-
-  public final int getAtom(String name)
-  {
-    Integer atomInt = (Integer) atoms.get(name);
-    if (atomInt == null)
-      return internAtom(name);
-    return atomInt.intValue();
-  }
-
-  // TODO?: cache reverse lookup too?
-  public final native String getAtomName(int atom);
-
-  private final native int internAtom(String name);
-
-  public native void flush();
-}
diff --git a/libjava/gnu/gcj/xlib/Drawable.h b/libjava/gnu/gcj/xlib/Drawable.h
deleted file mode 100644
index 213c361..0000000
--- a/libjava/gnu/gcj/xlib/Drawable.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Drawable__
-#define __gnu_gcj_xlib_Drawable__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XID.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class Drawable;
-          class GC;
-          class XImage;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::Drawable : public ::gnu::gcj::xlib::XID
-{
-
-public:
-  Drawable(::gnu::gcj::xlib::Display *, jint);
-  virtual ::java::awt::Rectangle * copyIntoXImage(::gnu::gcj::xlib::XImage *, ::java::awt::Rectangle *, jint, jint);
-private:
-  jboolean copyIntoXImageImpl(::gnu::gcj::xlib::XImage *, jint, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
-  virtual jint getDepth();
-public: // actually protected
-  virtual void finalize();
-public: // actually package-private
-  virtual void putGCInCache(::gnu::gcj::xlib::GC *);
-  virtual ::gnu::gcj::xlib::GC * getGCFromCache();
-private:
-  JArray< ::gnu::gcj::xlib::GC * > * __attribute__((aligned(__alignof__( ::gnu::gcj::xlib::XID)))) gcCache;
-  jint gcCachedCount;
-  static ::java::lang::String * MSG_XGETSUBIMAGE_FAILED;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Drawable__
diff --git a/libjava/gnu/gcj/xlib/Drawable.java b/libjava/gnu/gcj/xlib/Drawable.java
deleted file mode 100644
index fa12ba2..0000000
--- a/libjava/gnu/gcj/xlib/Drawable.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import java.awt.Rectangle;
-
-/** An X11 drawable.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class Drawable extends XID
-{
-  private GC[] gcCache = new GC[10];
-  private int gcCachedCount = 0;
-
-  public Drawable(Display display, int xid)
-  {
-    super(display, xid);
-  }
-
-  /**
-   * Gets as much as possible of the image data within the requested
-   * region. Data from obscured parts of windows may not be
-   * retrievable.
-   *  
-   * @param dest where to place the image data.
-   * 
-   * @return the actual region of image data that was retrieved.
-   */
-  public Rectangle copyIntoXImage(XImage dest, Rectangle bounds,
-				  int destX, int destY)
-  {
-    Rectangle newBounds = null;
-    int tries = 5;
-    while (!bounds.isEmpty())
-      {
-	if (copyIntoXImageImpl(dest, bounds.x, bounds.y,
-			       bounds.width, bounds.height,
-			       destX, destY))
-	  return bounds;
-	    
-	// failed, likely due to wrong bounds...
-	
-	newBounds = getBounds(newBounds);
-	
-	bounds = newBounds.intersection(bounds);
-	
-	tries--;
-	
-	if (tries < 0)
-	throw new RuntimeException("copyIntoXImage is buggy");
-	
-      }
-    
-    return bounds; // always empty
-  }
-
-
-
-  /**
-   * Performs an XGetSubImage. This method will fail if the X server
-   * does not possess the requested image data. This might occur when
-   * requesting the image date of a window that is partially obscured.
-   *
-   * @param desitantionImage where to place the image data
-   *
-   * @return false if method was unable to read the requested region.
-   */
-  private native boolean copyIntoXImageImpl(XImage destinationImage,
-					    int x, int y,
-					    int width, int height,
-					    int destX, int destY);
-
-  public native Rectangle getBounds(Rectangle rv);
-  
-  public native int getDepth ();
-  
-  private static final String MSG_XGETSUBIMAGE_FAILED =
-    "XGetSubImage() failed.";
-
-  protected void finalize() throws Throwable
-  {
-    // Dispose all the cached GCs, to reduce X server resource usage
-    for (int i=0; i<gcCachedCount; i++)
-      gcCache[i].disposeImpl ();
-    gcCachedCount = 0;
-    super.finalize();
-  }
-
-  /** Put a GC in the cache for this drawable, so it can be retrieved later.
-   * @param gc The GC to put
-   */
-  void putGCInCache (GC gc)
-  {
-    if (gcCachedCount >= gcCache.length)
-    {
-      // List full - extend it to double its present size
-      GC[] oldList = gcCache;
-      gcCache = new GC[oldList.length*2];
-      System.arraycopy (oldList,0,gcCache,0,oldList.length);
-    }
-    gcCache[gcCachedCount++] = gc;
-  }
-
-  /** Get a GC from the cache, if available
-   * @return A GC from the cache, or null if the cache is empty
-   */
-  GC getGCFromCache ()
-  {
-    return (gcCachedCount>0) ? gcCache[--gcCachedCount] : null;
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/Font.h b/libjava/gnu/gcj/xlib/Font.h
deleted file mode 100644
index 7cf50d3..0000000
--- a/libjava/gnu/gcj/xlib/Font.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Font__
-#define __gnu_gcj_xlib_Font__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XID.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Display;
-          class Font;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Font : public ::gnu::gcj::xlib::XID
-{
-
-public:
-  Font(::gnu::gcj::xlib::Display *, ::java::lang::String *);
-public: // actually package-private
-  Font(::gnu::gcj::xlib::Display *, ::gnu::gcj::RawData *);
-  static ::gnu::gcj::RawData * loadFont(::gnu::gcj::xlib::Display *, ::java::lang::String *);
-  static ::gnu::gcj::RawData * loadFontImpl(::gnu::gcj::xlib::Display *, ::java::lang::String *);
-  static jint getXIDFromStruct(::gnu::gcj::RawData *);
-public:
-  jint getAscent();
-  jint getDescent();
-  jint getMaxAscent();
-  jint getMaxDescent();
-  jint getStringWidth(::java::lang::String *);
-public: // actually protected
-  void finalize();
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::gnu::gcj::xlib::XID)))) structure;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Font__
diff --git a/libjava/gnu/gcj/xlib/Font.java b/libjava/gnu/gcj/xlib/Font.java
deleted file mode 100644
index 74985b9..0000000
--- a/libjava/gnu/gcj/xlib/Font.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/**
- * An X11 Font, implemented as a wrapper around an X11 Font XID and
- * the associated Xlib XFontStruct structure.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class Font extends XID
-{
-
-  /**
-   * @param lfdNamePattern a font name pattern following the
-   * <em>X Logical Font Description Conventions</em>.
-   */
-  public Font(Display display, String lfdNamePattern)
-  {
-    this(display, loadFont(display, lfdNamePattern));
-  }
-
-  Font(Display display, RawData struct)
-  {
-    super(display, getXIDFromStruct(struct));
-    structure = struct;
-  }
-
-  static RawData loadFont(Display display, String lfdNamePattern)
-  {
-    RawData returnValue = null;
-    try
-    {
-      returnValue = loadFontImpl (display,lfdNamePattern);
-    }
-    catch (XException e)
-    {
-      // Throw a descriptive exception, including the font pattern
-      throw new XException ("Font not found: " + lfdNamePattern);
-    }
-    return returnValue;
-  }
-  static native RawData loadFontImpl(Display display, String lfdNamePattern);
-
-  static native int getXIDFromStruct(RawData structure);
-
-  public native int getAscent();
-  public native int getDescent();
-  public native int getMaxAscent();
-  public native int getMaxDescent();
-
-  public native int getStringWidth(String str);
-
-  protected native void finalize();
-
-  RawData structure;
-}
diff --git a/libjava/gnu/gcj/xlib/GC.h b/libjava/gnu/gcj/xlib/GC.h
deleted file mode 100644
index cb8bf391..0000000
--- a/libjava/gnu/gcj/xlib/GC.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_GC__
-#define __gnu_gcj_xlib_GC__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Drawable;
-          class Font;
-          class GC;
-          class XImage;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::GC : public ::java::lang::Object
-{
-
-public: // actually protected
-  GC(::gnu::gcj::xlib::Drawable *);
-public:
-  virtual ::java::lang::Object * clone();
-private:
-  void initStructure(::gnu::gcj::xlib::GC *);
-public:
-  virtual ::gnu::gcj::xlib::GC * create();
-  static ::gnu::gcj::xlib::GC * create(::gnu::gcj::xlib::Drawable *);
-  virtual void finalize();
-  virtual void dispose();
-  virtual void disposeImpl();
-  virtual void setForeground(jlong);
-  virtual void setFont(::gnu::gcj::xlib::Font *);
-  virtual void setClipRectangles(JArray< ::java::awt::Rectangle * > *);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRectangle(jint, jint, jint, jint);
-  virtual void fillRectangle(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void clearArea(jint, jint, jint, jint, jboolean);
-  virtual void drawPoint(jint, jint);
-  virtual void putImage(::gnu::gcj::xlib::XImage *, jint, jint, jint, jint, jint, jint);
-  virtual void copyArea(::gnu::gcj::xlib::Drawable *, jint, jint, jint, jint, jint, jint);
-  virtual ::gnu::gcj::xlib::Drawable * getDrawable();
-private:
-  void updateClip(JArray< ::java::awt::Rectangle * > *);
-  ::gnu::gcj::xlib::Drawable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  ::gnu::gcj::RawData * structure;
-  JArray< ::java::awt::Rectangle * > * clipRectangles;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_GC__
diff --git a/libjava/gnu/gcj/xlib/GC.java b/libjava/gnu/gcj/xlib/GC.java
deleted file mode 100644
index 1a47cf6..0000000
--- a/libjava/gnu/gcj/xlib/GC.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-import java.awt.Rectangle;
-
-/**
- * An X11 graphics context.  Unlike a traditional X11 graphics
- * context, the target drawable is part of the GC state.
- *
- * Implementation notes: There is no need to do coalescing of changes
- * since Xlib will do this for us.  The implementation relies on the
- * Xlib GC cache and will not try to be clever.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class GC implements Cloneable
-{
-  /** Protected constructor, because GC.create(target) should be used instead.
-   */
-  protected GC(Drawable target)
-  {
-    this.target = target;
-    initStructure(null);
-  }
-
-  /** Try to get a suitable GC from the drawable's cache.
-   * If there isn't one, create one.
-   */
-  public Object clone()
-  {
-    try
-      {
-	GC gcClone = target.getGCFromCache ();
-	if (gcClone==null)
-	  {
-	    gcClone = (GC) super.clone();
-	    gcClone.structure = null;
-	  }
-	gcClone.initStructure(this);
-	gcClone.updateClip(clipRectangles);
-	return gcClone;
-      } 
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-
-  private native void initStructure(GC copyFrom);
-
-  public GC create()
-  {
-    return (GC) clone();
-  }
-  
-  /** Create a GC, or if one is already cached for target, return that.
-   * @param target The Drawable for which a GC is needed
-   * @return The new or retrieved GC
-   */
-  static public GC create (Drawable target)
-  {
-    GC returnValue = target.getGCFromCache ();
-    if (returnValue == null)
-      returnValue = new GC (target);
-    return returnValue;
-  }
-
-  public void finalize()
-  {
-    disposeImpl();
-  }
-
-  /** Save this GC in the drawable's cache.
-   *  The "real" dispose (disposeImpl) is called when the
-   *  drawable is finialized, to free X server resources.
-   */
-  public void dispose()
-  {
-    target.putGCInCache (this);
-  }
-
-  public synchronized native void disposeImpl();
-
-  public native void setForeground(long pixel);
-  public native void setFont(gnu.gcj.xlib.Font font);
-
-  /**
-   * Set the clip region for the graphics operations performed by the
-   * GC.
-   *
-   * This is one of the few costly operations of this class.  It is
-   * suggested that the clip is only set or changed if really
-   * necessary.  Higher level APIs can make such optimizations
-   * transparent.
-   *
-   * @param rectangles the union of these rectangles describe the clip
-   * region.
-   */
-  public void setClipRectangles(Rectangle[] rectangles)
-  {
-    clipRectangles = rectangles;
-    updateClip(clipRectangles);
-  }
-
-  public native void drawString(String text, int x, int y);
-  public native void drawLine(int x1, int y1, int x2, int y2);
-  public native void drawRectangle(int x, int y, int w, int h);
-
-  public native void fillRectangle(int x, int y, int w, int h);
-  public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
-				 int translateX, int translateY);
-  
-  public native void drawArc(int x, int y, int w, int h,
-			     int startAngle, int arcAngle);
-  public native void fillArc(int x, int y, int w, int h,
-			     int startAngle, int arcAngle);
-
-  /** 
-   * 
-   * Clear area using the background pixel or pixmap of the drawable.
-   * Note that this operation does not adhere to the current clip.
-   */
-  public native void clearArea(int x, int y, int w, int h,
-			       boolean exposures);
-
-  /** Draw a point using the current foreground color
-   * @param x The x coordinate at which to draw
-   * @param t The y coordinate at which to draw
-   */
-  public native void drawPoint (int x, int y);
-
-  public native void putImage(XImage image,
-			      int srcX, int srcY,
-			      int destX, int destY,
-			      int width, int height);
-
-  public native void copyArea (Drawable source,
-                               int srcX, int srcY,
-                               int destX, int destY,
-                               int width, int height);
-  
-  public Drawable getDrawable()
-  {
-    return target;
-  }
-
-  private native void updateClip(Rectangle[] rectangles);
-
-  private Drawable target;
-  private RawData structure;
-  private Rectangle[] clipRectangles;
-}
-
diff --git a/libjava/gnu/gcj/xlib/Pixmap.h b/libjava/gnu/gcj/xlib/Pixmap.h
deleted file mode 100644
index b73ee70..0000000
--- a/libjava/gnu/gcj/xlib/Pixmap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Pixmap__
-#define __gnu_gcj_xlib_Pixmap__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/Drawable.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Drawable;
-          class Pixmap;
-          class Screen;
-          class XImage;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Pixmap : public ::gnu::gcj::xlib::Drawable
-{
-
-public:
-  Pixmap(::gnu::gcj::xlib::XImage *, ::gnu::gcj::xlib::Screen *);
-  Pixmap(::gnu::gcj::xlib::Drawable *, jint, jint, jint);
-public: // actually protected
-  static jint createXID(::gnu::gcj::xlib::Drawable *, jint, jint, jint);
-  virtual void finalize();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Pixmap__
diff --git a/libjava/gnu/gcj/xlib/Pixmap.java b/libjava/gnu/gcj/xlib/Pixmap.java
deleted file mode 100644
index 7ba5a62..0000000
--- a/libjava/gnu/gcj/xlib/Pixmap.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-/**
- * An X11 Pixmap. A pixmap is an offscreen drawable that resides on
- * the X server. A pixmap is bound to the screen it was created for.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class Pixmap extends Drawable
-{
-  public Pixmap(XImage image, Screen screen)
-  {
-    this(screen.getRootWindow(),
-	 image.getWidth(), image.getHeight(),
-	 image.getDepth());
-    
-    /* FIXME: don't create a new GC all the time.  This might actually
-    not be as bad as initially believed.  The GC cache of Xlib makes
-    this operation less costly. */
-    GC gc = GC.create (this);
-    
-    gc.putImage(image, 0, 0, 0, 0, image.getWidth(), image.getHeight());
-  }
-
-  public Pixmap(Drawable sameScreenAs, int width, int height, int depth)
-  {
-    super(sameScreenAs.getDisplay(), 
-	  createXID(sameScreenAs, width, height, depth));
-  }
-
-  protected static native int createXID(Drawable sameScreenAs,
-					int width, int height, int depth);
-
-  protected native void finalize();
-}
diff --git a/libjava/gnu/gcj/xlib/Screen.h b/libjava/gnu/gcj/xlib/Screen.h
deleted file mode 100644
index 362c2e4..0000000
--- a/libjava/gnu/gcj/xlib/Screen.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Screen__
-#define __gnu_gcj_xlib_Screen__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Colormap;
-          class Display;
-          class Screen;
-          class Visual;
-          class Window;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Screen : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Screen(::gnu::gcj::xlib::Display *, ::gnu::gcj::RawData *);
-public:
-  Screen(::gnu::gcj::xlib::Display *);
-  Screen(::gnu::gcj::xlib::Display *, jint);
-  ::gnu::gcj::xlib::Display * getDisplay();
-  ::gnu::gcj::xlib::Window * getRootWindow();
-  ::gnu::gcj::xlib::Visual * getRootVisual();
-private:
-  ::gnu::gcj::RawData * getRootVisualStructure();
-public:
-  jint getRootDepth();
-  jint getRootWindowXID();
-  jint getDefaultColormapXID();
-public: // actually package-private
-  void initStructure();
-public:
-  ::gnu::gcj::xlib::Colormap * getDefaultColormap();
-  jint getScreenNumber();
-  jint findScreenNumber();
-public: // actually package-private
-  static const jint UNKNOWN = -1;
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-  jint screenNumber;
-  ::gnu::gcj::RawData * structure;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Screen__
diff --git a/libjava/gnu/gcj/xlib/Screen.java b/libjava/gnu/gcj/xlib/Screen.java
deleted file mode 100644
index 675ed1b..0000000
--- a/libjava/gnu/gcj/xlib/Screen.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/**
- * A flyweight class that denotes an X11 screen.  Display and screen
- * number is the only data kept by this class.  The real screen
- * structure is stored in the display.  There may exist several
- * objects denoting the same screen.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class Screen
-{
-  static final int UNKNOWN = -1;
-
-  Display display;
-  int screenNumber = UNKNOWN;
-  RawData structure;
-  
-  Screen(Display display, RawData screenStructure)
-  {
-    structure = screenStructure;
-    this.display = display;
-  }
-
-  public Screen(Display display)
-  {
-    this(display, display.getDefaultScreenNumber());
-  }
-
-  public Screen(Display display, int screenNumber)
-  {
-    this.display = display;
-    this.screenNumber = screenNumber;
-    initStructure();
-  }
-
-  public final Display getDisplay()
-  {
-    return display;
-  }
-
-  public Window getRootWindow()
-  {
-    int rootXID = getRootWindowXID();
-    return display.getWindow(rootXID);
-  }
-
-  public Visual getRootVisual()
-  {
-    RawData visualStructure = getRootVisualStructure();
-    int depth = getRootDepth();
-    return new Visual(visualStructure, this, depth);
-  }
-
-  private native RawData getRootVisualStructure();
-
-  public native int getRootDepth();
-  public native int getRootWindowXID();
-  public native int getDefaultColormapXID();
-
-  native void initStructure();
-
-  public Colormap getDefaultColormap()
-  {
-    return new Colormap(this, getDefaultColormapXID());
-  }
-  
-  public final int getScreenNumber()
-  {
-    if (screenNumber == UNKNOWN)
-      screenNumber = findScreenNumber();
-    return screenNumber;
-  }
-
-  public native int findScreenNumber();
-}
diff --git a/libjava/gnu/gcj/xlib/Visual.h b/libjava/gnu/gcj/xlib/Visual.h
deleted file mode 100644
index de3e25e..0000000
--- a/libjava/gnu/gcj/xlib/Visual.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Visual__
-#define __gnu_gcj_xlib_Visual__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Display;
-          class Screen;
-          class Visual;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::Visual : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Visual(::gnu::gcj::RawData *, ::gnu::gcj::xlib::Screen *, jint);
-  Visual(::gnu::gcj::xlib::Display *, ::gnu::gcj::RawData *, jint);
-public: // actually protected
-  void init(::gnu::gcj::RawData *, jint);
-  void finalize();
-public: // actually package-private
-  ::gnu::gcj::RawData * getVisualStructure();
-public:
-  jint getRedMask();
-  jint getGreenMask();
-  jint getBlueMask();
-  jint getScreenNumber();
-  jint getDepth();
-  ::gnu::gcj::xlib::Screen * getScreen();
-  jint getVisualClass();
-  jboolean hasRGBSubfields();
-public: // actually protected
-  void ensureXVisualInfo(jint);
-public:
-  ::java::lang::String * toString();
-  static const jint VC_STATIC_GRAY = 0;
-  static const jint VC_GRAY_SCALE = 1;
-  static const jint VC_STATIC_COLOR = 2;
-  static const jint VC_PSEUDO_COLOR = 3;
-  static const jint VC_TRUE_COLOR = 4;
-  static const jint VC_DIRECT_COLOR = 5;
-public: // actually protected
-  static const jint MASK_ID = 1;
-  static const jint MASK_SCREEN = 2;
-  static const jint MASK_DEPTH = 4;
-  static const jint MASK_CLASS = 8;
-  static const jint MASK_RED = 16;
-  static const jint MASK_GREEN = 32;
-  static const jint MASK_BLUE = 64;
-  static const jint MASK_COLORMAP_SIZE = 128;
-  static const jint MASK_BITS_PER_RGB = 256;
-  static const jint MASK_ALL = 511;
-private:
-  static const jint MASK_VISUAL_STRUCTURE = -2147483647 - 1;
-public: // actually package-private
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-  ::gnu::gcj::RawData * xVisualInfo;
-  jint infoMask;
-  ::gnu::gcj::xlib::Screen * screen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Visual__
diff --git a/libjava/gnu/gcj/xlib/Visual.java b/libjava/gnu/gcj/xlib/Visual.java
deleted file mode 100644
index 46fd3ee..0000000
--- a/libjava/gnu/gcj/xlib/Visual.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/** 
- * A visual determines how a color is encoded into a pixel/bitfield
- * value.  It does not determine how the pixel/bitfield value is
- * encoded into the image data.
- * 
- * <p>This class encapsulates all three Xlib representations of a
- * visual.
- * 
- * <ul>
- * 
- * <li>int: visual id.
- * 
- * <li>Visual: opaque data structure used by a lot of Xlib functions.
- * 
- * <li>VisualInfo: transparent data structure that binds the visual to
- * a certain screen and depth.
- * 
- * </ul>
- * 
- * <p>Implementation note: This class does not examine nor manipulate
- * the Visual structure, since the X manual says the structure is
- * opaque, and that XVisualInfo should be used instead.</p>
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class Visual
-{
-  public static final int VC_STATIC_GRAY  = 0,
-	                  VC_GRAY_SCALE   = 1,
-                          VC_STATIC_COLOR = 2,
-                          VC_PSEUDO_COLOR = 3,
-                      	  VC_TRUE_COLOR   = 4,
-                          VC_DIRECT_COLOR = 5;
-  
-  protected static final int MASK_ID            = 1 << 0,
-                             MASK_SCREEN        = 1 << 1,
-                             MASK_DEPTH         = 1 << 2,
-                             MASK_CLASS         = 1 << 3,
-                             MASK_RED           = 1 << 4,
-                             MASK_GREEN         = 1 << 5,
-                             MASK_BLUE          = 1 << 6,
-                             MASK_COLORMAP_SIZE = 1 << 7,
-                             MASK_BITS_PER_RGB  = 1 << 8;
-
-  protected static final int MASK_ALL = MASK_ID
-      | MASK_SCREEN
-      | MASK_DEPTH
-      | MASK_CLASS
-      | MASK_RED
-      | MASK_GREEN
-      | MASK_BLUE
-      | MASK_COLORMAP_SIZE
-      | MASK_BITS_PER_RGB;
-
-  private static final int MASK_VISUAL_STRUCTURE = 1 << 31;
-
-  Display display;
-  RawData xVisualInfo;
-  int infoMask;
-  Screen screen;
-
-  Visual(RawData structure, Screen screen, int depth )
-  {
-    this.display = screen.getDisplay();
-    this.screen = screen;
-    init(structure, depth);
-  }
-
-  Visual(Display display, RawData structure, int depth )
-  {
-    this.display = display;
-    init(structure, depth);
-  }
-
-  protected native void init(RawData structure, int depth);
-
-  protected native void finalize();
-
-  /**
-   *
-   * Returns the a reference to the visual structure.  This method has
-   * package accessibility since the data visual structure is only
-   * useful for direct Xlib calls.
-   *
-   * @return a pointer to the visual structure.
-   */
-  native RawData getVisualStructure();
-
-    
-  // These methods only make sense if the visual is decomposed:
-
-  public native int getRedMask();
-  public native int getGreenMask();
-  public native int getBlueMask();
-
-  public native int getScreenNumber();
-  public native int getDepth();
-
-  public Screen getScreen()
-  {
-    if (screen == null)
-      screen = new Screen(display, getScreenNumber());
-    return screen;
-  }
-
-  public native int getVisualClass();
-
-  public boolean hasRGBSubfields()
-  {
-    switch (getVisualClass())
-      {
-      case VC_TRUE_COLOR:
-      case VC_DIRECT_COLOR:
-	return true;
-      default:
-	return false;
-      }
-  }
-
-  protected native void ensureXVisualInfo(int requiredMask);
-
-
-  public String toString()
-  {
-    int missingInfo = ~infoMask;
-    boolean hasSubfieldInfo =
-      (missingInfo & (MASK_CLASS|MASK_RED|MASK_GREEN|MASK_BLUE)) == 0;
-
-    boolean hasDepth = (missingInfo & MASK_DEPTH) == 0;
-	
-    return getClass().getName() + "[" +
-      (hasDepth ? "depth=" + getDepth() : "") +
-      (hasRGBSubfields() ?
-       (", redMask=" + Integer.toHexString(getRedMask()) +
-	", greenMask=" + Integer.toHexString(getGreenMask()) +
-	", blueMask=" + Integer.toHexString(getBlueMask())) :
-       ", no-subfields") + ", class=" + getVisualClass() +
-      "]";
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/WMSizeHints.h b/libjava/gnu/gcj/xlib/WMSizeHints.h
deleted file mode 100644
index 2acd58c..0000000
--- a/libjava/gnu/gcj/xlib/WMSizeHints.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_WMSizeHints__
-#define __gnu_gcj_xlib_WMSizeHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class WMSizeHints;
-          class Window;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::WMSizeHints : public ::java::lang::Object
-{
-
-public:
-  WMSizeHints();
-private:
-  void init(::gnu::gcj::xlib::WMSizeHints *);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void applyNormalHints(::gnu::gcj::xlib::Window *);
-  virtual void setMinSize(jint, jint);
-  virtual void setMaxSize(jint, jint);
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) structure;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_WMSizeHints__
diff --git a/libjava/gnu/gcj/xlib/WMSizeHints.java b/libjava/gnu/gcj/xlib/WMSizeHints.java
deleted file mode 100644
index c0b198c..0000000
--- a/libjava/gnu/gcj/xlib/WMSizeHints.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/** 
- * Size hints for an X11 window in its normal state. This class wraps
- * the Xlib XSizeHints stucture.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class WMSizeHints implements Cloneable
-{
-  public WMSizeHints()
-  {
-    init(null);
-  }
-
-  private native void init(WMSizeHints copyFrom);
-  protected native void finalize();
-
-  public Object clone() {
-    try
-      {
-	WMSizeHints hints = (WMSizeHints) super.clone();
-	// In case of an exception before the stucture is copied.
-	hints.structure = null;
-	
-	hints.init(this);
-	return hints;
-      }
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-
-  public native void applyNormalHints(Window window);
-
-  public native void setMinSize(int width, int height);
-  public native void setMaxSize(int width, int height);
-  
-  RawData structure;
-}
diff --git a/libjava/gnu/gcj/xlib/Window.h b/libjava/gnu/gcj/xlib/Window.h
deleted file mode 100644
index 03ece8a..0000000
--- a/libjava/gnu/gcj/xlib/Window.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_Window__
-#define __gnu_gcj_xlib_Window__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/Drawable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class Visual;
-          class Window;
-          class WindowAttributes;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::Window : public ::gnu::gcj::xlib::Drawable
-{
-
-public:
-  Window(::gnu::gcj::xlib::Window *, ::java::awt::Rectangle *, ::gnu::gcj::xlib::WindowAttributes *);
-  Window(::gnu::gcj::xlib::Window *, ::java::awt::Rectangle *, ::gnu::gcj::xlib::WindowAttributes *, ::gnu::gcj::xlib::Visual *);
-  Window(::gnu::gcj::xlib::Window *, ::java::awt::Rectangle *, jint, ::gnu::gcj::xlib::WindowAttributes *, jint, ::gnu::gcj::xlib::Visual *);
-public: // actually protected
-  Window(::gnu::gcj::xlib::Display *, jint);
-  virtual void finalize();
-  virtual void destroy();
-  virtual jint createChildXID(::java::awt::Rectangle *, jint, ::gnu::gcj::xlib::WindowAttributes *, jint, ::gnu::gcj::xlib::Visual *);
-public:
-  virtual void setAttributes(::gnu::gcj::xlib::WindowAttributes *);
-  virtual void map();
-  virtual void unmap();
-  virtual void toFront();
-  virtual void toBack();
-  virtual void setProperty(jint, jint, JArray< jbyte > *);
-  virtual void setProperty(jint, jint, ::java::lang::String *);
-  virtual void setWMProtocols(JArray< jint > *);
-  virtual JArray< jint > * getWMProtocols();
-  virtual void setProperty(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void setBounds(jint, jint, jint, jint);
-  static const jint COPY_FROM_PARENT = 0;
-  static const jint INPUT_OUTPUT = 1;
-  static const jint INPUT_ONLY = 2;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::gnu::gcj::xlib::Drawable)))) owned;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_Window__
diff --git a/libjava/gnu/gcj/xlib/Window.java b/libjava/gnu/gcj/xlib/Window.java
deleted file mode 100644
index 3ff3657..0000000
--- a/libjava/gnu/gcj/xlib/Window.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-import java.awt.Rectangle;
-
-/**
- * An X11 window.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class Window extends Drawable
-{
-  // Must correspond with X.h definitions:
-  public static final int COPY_FROM_PARENT = 0;
-  public static final int INPUT_OUTPUT     = 1;
-  public static final int INPUT_ONLY       = 2;
-
-  public Window(Window parent, Rectangle bounds,
-		WindowAttributes attributes)
-  {
-    this(parent, bounds, attributes, null);
-  }
-  
-  public Window(Window parent, Rectangle bounds,
-		WindowAttributes attributes, Visual visual)
-  {
-    this(parent, bounds, 0, attributes, COPY_FROM_PARENT, visual);
-  }
-
-  public Window(Window parent, Rectangle bounds, int borderWidth,
-		WindowAttributes attributes, int windowIOClass,
-		Visual visual)
-  {
-    this(parent.display,
-	 parent.createChildXID(bounds, borderWidth, attributes, 
-			       windowIOClass, visual));
-    this.owned = true;
-  }
-
-  protected Window(Display display, int xid)
-  {
-    super(display, xid);
-    display.addXID(xid, this);
-  }
-
-  protected void finalize()
-  {
-    display.removeXID(xid);
-    if (owned)
-      {
-	destroy();
-	owned = false;
-      }
-  }
-
-  protected native void destroy();
-
-  protected native int createChildXID(Rectangle bounds,
-				      int borderWidth,
-				      WindowAttributes attributes,
-				      int windowIOClass, 
-				      Visual visual);
-
-  public native void setAttributes(WindowAttributes attributes);
-
-  public native void map();
-  public native void unmap();
-  public native void toFront();
-  public native void toBack();
-  
-  protected boolean owned = false;
-
-  public native void setProperty(int nameAtom, int typeAtom, byte[] data);
-  
-  public void setProperty(int nameAtom, int typeAtom, String data)
-  {
-    int length = data.length();
-    byte[] byteData = new byte[length];
-    
-    for (int i=0; i<length; i++)
-      byteData[i] = (byte) data.charAt(i);
-
-    setProperty(nameAtom, typeAtom, byteData);
-  }
-
-  public native void setWMProtocols(int[] atoms);
-  public native int[] getWMProtocols();
-
-  public void setProperty(String nameAtom, String typeAtom, String data)
-  {
-    int xaName = display.getAtom(nameAtom);
-    int xaType = display.getAtom(typeAtom);
-    
-    setProperty(xaName, xaType, data);
-  }
-
-  public native void setBounds(int x, int y, int width, int height);
-}
diff --git a/libjava/gnu/gcj/xlib/WindowAttributes.h b/libjava/gnu/gcj/xlib/WindowAttributes.h
deleted file mode 100644
index 6c53303..0000000
--- a/libjava/gnu/gcj/xlib/WindowAttributes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_WindowAttributes__
-#define __gnu_gcj_xlib_WindowAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Display;
-          class Pixmap;
-          class Visual;
-          class Window;
-          class WindowAttributes;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::WindowAttributes : public ::java::lang::Object
-{
-
-public:
-  WindowAttributes();
-  WindowAttributes(::gnu::gcj::xlib::Window *);
-private:
-  void initFromWindow(::gnu::gcj::xlib::Window *);
-  void init(::gnu::gcj::xlib::WindowAttributes *);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setBackground(jlong);
-  virtual void setBackground(::gnu::gcj::xlib::Pixmap *);
-  virtual void setEventMask(jlong);
-  virtual void setVisual(::gnu::gcj::xlib::Visual *);
-  virtual ::gnu::gcj::xlib::Visual * getVisual();
-  virtual void apply(::gnu::gcj::xlib::Window *);
-public: // actually package-private
-  virtual ::gnu::gcj::RawData * getXSetWindowAttributesStructure();
-  virtual void initOut();
-public:
-  static const jlong MASK_BUTTON_PRESS = 4LL;
-  static const jlong MASK_BUTTON_RELEASE = 8LL;
-  static const jlong MASK_EXPOSURE = 32768LL;
-  static const jlong MASK_STRUCTURE_NOTIFY = 131072LL;
-public: // actually package-private
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-  ::gnu::gcj::RawData * in;
-  ::gnu::gcj::RawData * out;
-  jlong mask;
-  ::gnu::gcj::xlib::Visual * visual;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_WindowAttributes__
diff --git a/libjava/gnu/gcj/xlib/WindowAttributes.java b/libjava/gnu/gcj/xlib/WindowAttributes.java
deleted file mode 100644
index 23be37d..0000000
--- a/libjava/gnu/gcj/xlib/WindowAttributes.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-import gnu.gcj.RawData;
-
-/**
- * 
- * Collection of attributes that can be applied to or read from an
- * X11 window.
- *
- * <p>TODO: Split this class into two classes. One for the structure
- * XSetWindowAttributes and one for the XWindowAttributes.  However
- * they should still share this common base class.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no> */
-public class WindowAttributes
-{
-  // Must match definitions in X.h:
-  public final static long MASK_BUTTON_PRESS     = 1L<< 2,
-                           MASK_BUTTON_RELEASE   = 1L<< 3,
-                           MASK_EXPOSURE         = 1L<<15,
-                           MASK_STRUCTURE_NOTIFY = 1L<<17;
-
-  public WindowAttributes()
-  {
-    init(null);
-  }
-  
-  public WindowAttributes(Window from)
-  {
-    initFromWindow(from);
-  }
-
-  private native void initFromWindow(Window from);
-  private native void init(WindowAttributes copyFrom);
-  protected native void finalize();
-    
-  public Object clone()
-  {
-    try
-      {
-	WindowAttributes attributes = (WindowAttributes) super.clone();
-	// In case of an exception before the stucture is copied.
-	attributes.in  = null;
-	attributes.out = null;
-	
-	// FIXME: do anything else?
-	
-	attributes.init(this);
-	return attributes;
-      }
-    catch (CloneNotSupportedException ex)
-      {
-	// This should never happen.
-	throw new InternalError ();
-      }
-  }
-
-  public native void setBackground(long pixel);
-  public native void setBackground(Pixmap pixmap);
-  public native void setEventMask(long eventMask);
-
-  public void setVisual(Visual visual)
-  {
-    this.visual = visual;
-  }
-
-  /**
-   * Retrieve the visual. 
-   *
-   * @return the visual that is or should be used by a window.  null
-   * means CopyFormParent. 
-   */
-  public native Visual getVisual();
-
-  Display display;
-
-  /**
-   * Reference to XWindowAttribute structure containing attributes
-   * read from a window.
-   */
-  RawData in = null;
-
-  /**
-   * Reference to XSetWindowAttribute structure containing attributes
-   * to be applied to a window.
-   */
-  RawData out = null;
-
-  long mask;
-
-  /** null means CopyFromParent during window creation. */
-  Visual visual = null;
-
-  public native void apply(Window window);
-
-  final RawData getXSetWindowAttributesStructure()
-  {
-    if (out == null)
-      initOut();
-    return out;
-  }
-  
-  void initOut()
-  {
-    throw new UnsupportedOperationException("not implemented yet");
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XAnyEvent.h b/libjava/gnu/gcj/xlib/XAnyEvent.h
deleted file mode 100644
index 9a7096e..0000000
--- a/libjava/gnu/gcj/xlib/XAnyEvent.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XAnyEvent__
-#define __gnu_gcj_xlib_XAnyEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Display;
-          class Window;
-          class XAnyEvent;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XAnyEvent : public ::java::lang::Object
-{
-
-public:
-  XAnyEvent(::gnu::gcj::xlib::Display *);
-private:
-  void init();
-public: // actually protected
-  void finalize();
-public:
-  jboolean loadNext(jboolean);
-  void interrupt();
-  jint getType();
-  void setType(jint);
-  ::gnu::gcj::xlib::Window * getWindow();
-  void setWindow(::gnu::gcj::xlib::Window *);
-  jlong getSerial();
-  void send(::gnu::gcj::xlib::Window *, jboolean, jlong);
-  ::java::lang::String * toString();
-  static const jint TYPE_KEY_PRESS = 2;
-  static const jint TYPE_KEY_RELEASE = 3;
-  static const jint TYPE_BUTTON_PRESS = 4;
-  static const jint TYPE_BUTTON_RELEASE = 5;
-  static const jint TYPE_MOTION_NOTIFY = 6;
-  static const jint TYPE_ENTER_NOTIFY = 7;
-  static const jint TYPE_LEAVE_NOTIFY = 8;
-  static const jint TYPE_FOCUS_IN = 9;
-  static const jint TYPE_FOCUS_OUT = 10;
-  static const jint TYPE_KEYMAP_NOTIFY = 11;
-  static const jint TYPE_EXPOSE = 12;
-  static const jint TYPE_GRAPHICS_EXPOSE = 13;
-  static const jint TYPE_NO_EXPOSE = 14;
-  static const jint TYPE_VISIBILITY_NOTIFY = 15;
-  static const jint TYPE_CREATE_NOTIFY = 16;
-  static const jint TYPE_DESTROY_NOTIFY = 17;
-  static const jint TYPE_UNMAP_NOTIFY = 18;
-  static const jint TYPE_MAP_NOTIFY = 19;
-  static const jint TYPE_MAP_REQUEST = 20;
-  static const jint TYPE_REPARENT_NOTIFY = 21;
-  static const jint TYPE_CONFIGURE_NOTIFY = 22;
-  static const jint TYPE_CONFIGURE_REQUEST = 23;
-  static const jint TYPE_GRAVITY_NOTIFY = 24;
-  static const jint TYPE_RESIZE_REQUEST = 25;
-  static const jint TYPE_CIRCULATE_NOTIFY = 26;
-  static const jint TYPE_CIRCULATE_REQUEST = 27;
-  static const jint TYPE_PROPERTY_NOTIFY = 28;
-  static const jint TYPE_SELECTION_CLEAR = 29;
-  static const jint TYPE_SELECTION_REQUEST = 30;
-  static const jint TYPE_SELECTION_NOTIFY = 31;
-  static const jint TYPE_COLORMAP_NOTIFY = 32;
-  static const jint TYPE_CLIENT_MESSAGE = 33;
-  static const jint TYPE_MAPPING_NOTIFY = 34;
-  static const jlong MASK_SUBSTRUCTURE_NOTIFY = 524288LL;
-  static const jlong MASK_SUBSTRUCTURE_REDIRECT = 1048576LL;
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pipefds;
-  ::gnu::gcj::RawData * structure;
-  ::gnu::gcj::xlib::Display * display;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XAnyEvent__
diff --git a/libjava/gnu/gcj/xlib/XAnyEvent.java b/libjava/gnu/gcj/xlib/XAnyEvent.java
deleted file mode 100644
index bce3a61..0000000
--- a/libjava/gnu/gcj/xlib/XAnyEvent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/** 
- * Mutable event structure that can contain any data from any event
- * type.  Events can be constructed or loaded from the event queue.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class XAnyEvent
-{
-  // Must match the definitions in X.h:
-  public static final int 
-                      TYPE_KEY_PRESS          =  2,
-                      TYPE_KEY_RELEASE        =  3,
-                      TYPE_BUTTON_PRESS       =  4,
-                      TYPE_BUTTON_RELEASE     =  5,
-                      TYPE_MOTION_NOTIFY      =  6,
-                      TYPE_ENTER_NOTIFY       =  7,
-                      TYPE_LEAVE_NOTIFY       =  8,
-                      TYPE_FOCUS_IN           =  9,
-                      TYPE_FOCUS_OUT          = 10,
-                      TYPE_KEYMAP_NOTIFY      = 11,
-                      TYPE_EXPOSE             = 12,
-                      TYPE_GRAPHICS_EXPOSE    = 13,
-                      TYPE_NO_EXPOSE          = 14,
-                      TYPE_VISIBILITY_NOTIFY  = 15,
-                      TYPE_CREATE_NOTIFY      = 16,
-                      TYPE_DESTROY_NOTIFY     = 17,
-                      TYPE_UNMAP_NOTIFY       = 18,
-                      TYPE_MAP_NOTIFY         = 19,
-                      TYPE_MAP_REQUEST        = 20,
-                      TYPE_REPARENT_NOTIFY    = 21,
-                      TYPE_CONFIGURE_NOTIFY   = 22,
-                      TYPE_CONFIGURE_REQUEST  = 23,
-                      TYPE_GRAVITY_NOTIFY     = 24,
-                      TYPE_RESIZE_REQUEST     = 25,
-                      TYPE_CIRCULATE_NOTIFY   = 26,
-                      TYPE_CIRCULATE_REQUEST  = 27,
-                      TYPE_PROPERTY_NOTIFY    = 28,
-                      TYPE_SELECTION_CLEAR    = 29,
-                      TYPE_SELECTION_REQUEST  = 30,
-                      TYPE_SELECTION_NOTIFY   = 31,
-                      TYPE_COLORMAP_NOTIFY    = 32,
-                      TYPE_CLIENT_MESSAGE     = 33,
-                      TYPE_MAPPING_NOTIFY     = 34;
-    
-  // Must match the definitions in X.h:
-  public final static long MASK_SUBSTRUCTURE_NOTIFY   = 1L<<19,
-	                   MASK_SUBSTRUCTURE_REDIRECT = 1L<<20;
-
-  public XAnyEvent(Display display)
-  {
-    this.display = display;
-    init();
-  }
-
-  private native void init();
-  protected native void finalize();
-
-  /**
-   * Load next event into the event structure.
-   */
-  public native boolean loadNext(boolean block);
-  public native void interrupt();
-
-  public native int getType();
-  public native void setType(int type);
-
-  public native Window getWindow();
-  public native void setWindow(Window window);
-  
-  /**
-   * @returns the number of the last request processed by the server.
-   */
-  public native long getSerial();
-
-  public native void send(Window destination, boolean propagate,
-			  long mask);
-
-  RawData pipefds;
-  RawData structure;
-  Display display;
-
-  public String toString()
-  {
-    if (structure == null)
-      return getClass().getName() + "[no-structure]";
-
-    return getClass().getName() +
-      "[type=" + getType() +
-      ",window=" + getWindow() + "]";
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XButtonEvent.h b/libjava/gnu/gcj/xlib/XButtonEvent.h
deleted file mode 100644
index 7b482c4..0000000
--- a/libjava/gnu/gcj/xlib/XButtonEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XButtonEvent__
-#define __gnu_gcj_xlib_XButtonEvent__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class XAnyEvent;
-          class XButtonEvent;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XButtonEvent : public ::gnu::gcj::xlib::XEvent
-{
-
-public:
-  XButtonEvent(::gnu::gcj::xlib::XAnyEvent *);
-public: // actually package-private
-  virtual void init();
-public:
-  static const jint MASK_SHIFT = 1;
-  static const jint MASK_LOCK = 2;
-  static const jint MASK_CONTROL = 4;
-  static const jint MASK_MOD1 = 8;
-  static const jint MASK_MOD2 = 16;
-  static const jint MASK_MOD3 = 32;
-  static const jint MASK_MOD4 = 64;
-  static const jint MASK_MOD5 = 128;
-  jlong __attribute__((aligned(__alignof__( ::gnu::gcj::xlib::XEvent)))) time;
-  jint x;
-  jint y;
-  jint state;
-  jint button;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XButtonEvent__
diff --git a/libjava/gnu/gcj/xlib/XButtonEvent.java b/libjava/gnu/gcj/xlib/XButtonEvent.java
deleted file mode 100644
index 032830b..0000000
--- a/libjava/gnu/gcj/xlib/XButtonEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-/**
- * Interprets data from an Xlib XButtonEvent into members of java
- * primitive types.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XButtonEvent extends XEvent
-{
-
-  // Must match the definition in X.h:
-  public static final int MASK_SHIFT   = 1<<0,
-                          MASK_LOCK    = 1<<1,
-                          MASK_CONTROL = 1<<2,
-                          MASK_MOD1    = 1<<3,
-                          MASK_MOD2    = 1<<4,
-                          MASK_MOD3    = 1<<5,
-                          MASK_MOD4    = 1<<6,
-                          MASK_MOD5    = 1<<7;
- 
-  public XButtonEvent(XAnyEvent event)
-  {
-    super(event);
-
-    // FIXME: Avoid double checking?
-    if ((event.getType() != XAnyEvent.TYPE_BUTTON_PRESS) &&
-	(event.getType() != XAnyEvent.TYPE_BUTTON_RELEASE))
-      {
-	throw new IllegalArgumentException("Wrong event type");
-      }
-    init();
-  }
-
-  native void init();
-  
-  public long time;
-  public int  x;
-  public int  y;
-  public int  state;
-  public int  button;
-}
-
-
-
diff --git a/libjava/gnu/gcj/xlib/XColor.h b/libjava/gnu/gcj/xlib/XColor.h
deleted file mode 100644
index fa2ea69..0000000
--- a/libjava/gnu/gcj/xlib/XColor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XColor__
-#define __gnu_gcj_xlib_XColor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class XColor;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XColor : public ::java::lang::Object
-{
-
-public:
-  XColor(jint, jint, jint);
-  XColor();
-private:
-  void init();
-public: // actually protected
-  void finalize();
-public:
-  void setRGB(jint, jint, jint);
-  jint getRed();
-  jint getGreen();
-  jint getBlue();
-  jbyte getFlags();
-  jlong getPixelValue();
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) structure;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XColor__
diff --git a/libjava/gnu/gcj/xlib/XColor.java b/libjava/gnu/gcj/xlib/XColor.java
deleted file mode 100644
index 74ad6d7..0000000
--- a/libjava/gnu/gcj/xlib/XColor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/**
- * A color or color-cell on the X server.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public final class XColor
-{
-  public XColor(int r, int g, int b)
-  {
-    this();
-    setRGB(r, g, b);
-  }
-
-  public XColor()
-  {
-    init();
-  }
-
-  private native void init();
-  protected native void finalize();
-
-  public final native void setRGB(int r, int g, int b);
-  public final native int getRed();
-  public final native int getGreen();
-  public final native int getBlue();
-  public final native byte getFlags();
-  public final native long getPixelValue();
-  
-  RawData structure = null;
-}
diff --git a/libjava/gnu/gcj/xlib/XConfigureEvent.h b/libjava/gnu/gcj/xlib/XConfigureEvent.h
deleted file mode 100644
index cbc402d..0000000
--- a/libjava/gnu/gcj/xlib/XConfigureEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XConfigureEvent__
-#define __gnu_gcj_xlib_XConfigureEvent__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class XAnyEvent;
-          class XConfigureEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::XConfigureEvent : public ::gnu::gcj::xlib::XEvent
-{
-
-public:
-  XConfigureEvent(::gnu::gcj::xlib::XAnyEvent *);
-  virtual ::java::awt::Rectangle * getBounds();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XConfigureEvent__
diff --git a/libjava/gnu/gcj/xlib/XConfigureEvent.java b/libjava/gnu/gcj/xlib/XConfigureEvent.java
deleted file mode 100644
index 0d069ea..0000000
--- a/libjava/gnu/gcj/xlib/XConfigureEvent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import java.awt.Rectangle;
-
-/**
- * Interprets and retrieves data from an Xlib XConfigureEvent.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XConfigureEvent extends XEvent
-{
-  public XConfigureEvent(XAnyEvent event)
-  {
-    super(event);
-    // FIXME: Avoid double checking?
-    if (event.getType() != XAnyEvent.TYPE_CONFIGURE_NOTIFY)
-      throw new IllegalArgumentException("Wrong event type");
-  }
-  
-  public native Rectangle getBounds();
-}
-
-
-
diff --git a/libjava/gnu/gcj/xlib/XConnectException.h b/libjava/gnu/gcj/xlib/XConnectException.h
deleted file mode 100644
index a234ec9..0000000
--- a/libjava/gnu/gcj/xlib/XConnectException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XConnectException__
-#define __gnu_gcj_xlib_XConnectException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class XConnectException;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XConnectException : public ::java::io::IOException
-{
-
-public:
-  XConnectException();
-  XConnectException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XConnectException__
diff --git a/libjava/gnu/gcj/xlib/XConnectException.java b/libjava/gnu/gcj/xlib/XConnectException.java
deleted file mode 100644
index 829da66..0000000
--- a/libjava/gnu/gcj/xlib/XConnectException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import java.io.IOException;
-
-/**
- * Indicates that something went wrong with the connection to an X11
- * display.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XConnectException extends IOException
-{
-  public XConnectException()
-  {
-    super();
-  }
-
-  public XConnectException(String message)
-  {
-    super(message);
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XEvent.h b/libjava/gnu/gcj/xlib/XEvent.h
deleted file mode 100644
index d74a31c..0000000
--- a/libjava/gnu/gcj/xlib/XEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XEvent__
-#define __gnu_gcj_xlib_XEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class XAnyEvent;
-          class XEvent;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XEvent : public ::java::lang::Object
-{
-
-public:
-  XEvent(::gnu::gcj::xlib::XAnyEvent *);
-  XEvent(jint, ::gnu::gcj::xlib::Display *);
-  virtual ::gnu::gcj::xlib::XAnyEvent * getXAnyEvent();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::gcj::xlib::XAnyEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) event;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XEvent__
diff --git a/libjava/gnu/gcj/xlib/XEvent.java b/libjava/gnu/gcj/xlib/XEvent.java
deleted file mode 100644
index 75f602a..0000000
--- a/libjava/gnu/gcj/xlib/XEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/**
- * Base class for interpreters of specific X event types.  For methods
- * concerning all X events, see XAnyEvent.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XEvent
-{
-  public XEvent(XAnyEvent event)
-  {
-    this.event = event;
-  }
-  
-  public XEvent(int type, Display display)
-  {
-    this(new XAnyEvent(display));
-    event.setType(type);
-  }
-
-  XAnyEvent event;
-
-  public XAnyEvent getXAnyEvent()
-  {
-    return event;
-  }
-
-  public String toString()
-  {
-    if (event == null)
-      return super.toString();
-    return event.toString();
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XException.h b/libjava/gnu/gcj/xlib/XException.h
deleted file mode 100644
index de1eff0..0000000
--- a/libjava/gnu/gcj/xlib/XException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XException__
-#define __gnu_gcj_xlib_XException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class XException;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XException : public ::java::lang::RuntimeException
-{
-
-public:
-  XException();
-  XException(::java::lang::String *);
-  XException(::gnu::gcj::xlib::Display *, jint);
-public: // actually package-private
-  static ::java::lang::String * toString(::gnu::gcj::xlib::Display *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XException__
diff --git a/libjava/gnu/gcj/xlib/XException.java b/libjava/gnu/gcj/xlib/XException.java
deleted file mode 100644
index 32adfc1..0000000
--- a/libjava/gnu/gcj/xlib/XException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-/**
- * Runtime exception that occurred during an Xlib operation. 
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XException extends RuntimeException
-{  
-  public XException() {}
-  public XException(String msg) { super(msg); }
-  
-  public XException(Display display, int status)
-  {
-    super(toString(display, status));
-  }
-  
-  static native String toString(Display display, int status);
-}
diff --git a/libjava/gnu/gcj/xlib/XExposeEvent.h b/libjava/gnu/gcj/xlib/XExposeEvent.h
deleted file mode 100644
index ac8715b..0000000
--- a/libjava/gnu/gcj/xlib/XExposeEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XExposeEvent__
-#define __gnu_gcj_xlib_XExposeEvent__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class XAnyEvent;
-          class XExposeEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::gcj::xlib::XExposeEvent : public ::gnu::gcj::xlib::XEvent
-{
-
-public:
-  XExposeEvent(::gnu::gcj::xlib::XAnyEvent *);
-  virtual ::java::awt::Rectangle * getBounds();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XExposeEvent__
diff --git a/libjava/gnu/gcj/xlib/XExposeEvent.java b/libjava/gnu/gcj/xlib/XExposeEvent.java
deleted file mode 100644
index 2c29cf1..0000000
--- a/libjava/gnu/gcj/xlib/XExposeEvent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import java.awt.Rectangle;
-
-/**
- * Interprets data from an Xlib XExposeEvent.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XExposeEvent extends XEvent
-{
-  public XExposeEvent(XAnyEvent event)
-  {
-    super(event);
-
-    // FIXME: Avoid double checking?
-    if (event.getType() != XAnyEvent.TYPE_EXPOSE)
-      throw new IllegalArgumentException("Wrong event type");
-  }
-
-  public native Rectangle getBounds();
-}
-
-
-
diff --git a/libjava/gnu/gcj/xlib/XID.h b/libjava/gnu/gcj/xlib/XID.h
deleted file mode 100644
index d216df6..0000000
--- a/libjava/gnu/gcj/xlib/XID.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XID__
-#define __gnu_gcj_xlib_XID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class XID;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XID : public ::java::lang::Object
-{
-
-public:
-  XID(::gnu::gcj::xlib::Display *, jint);
-  virtual jint getXID();
-  virtual ::gnu::gcj::xlib::Display * getDisplay();
-  virtual ::java::lang::Object * getClientData();
-  virtual void setClientData(::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::String * params();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::java::lang::Object)))) display;
-  jint xid;
-private:
-  ::java::lang::Object * clientData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XID__
diff --git a/libjava/gnu/gcj/xlib/XID.java b/libjava/gnu/gcj/xlib/XID.java
deleted file mode 100644
index f7bb9cf..0000000
--- a/libjava/gnu/gcj/xlib/XID.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-/**
- * Common base class for all resources that are stored on the server
- * and refered to on the client side using XIDs.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XID
-{
-  public XID(Display display, int xid)
-  {
-    this.display = display;
-    this.xid = xid;
-  }
-
-  public final int getXID()
-  {
-    return xid;
-  }
-
-  public final Display getDisplay()
-  {
-    return display;
-  }
-
-  protected Display display;
-  protected int xid;
-
-  private Object clientData;
-  public final Object getClientData()
-  {
-    return clientData;
-  }
-  public final void setClientData(Object clientData)
-  {
-    this.clientData = clientData;
-  }
-
-  protected String params()
-  {
-    return "display=" + display + ",xid=" + Integer.toHexString(xid);
-  }
-  
-  public String toString()
-  {
-    return getClass().getName() +
-      "[" + params() + "]";
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XImage.h b/libjava/gnu/gcj/xlib/XImage.h
deleted file mode 100644
index 679c60d..0000000
--- a/libjava/gnu/gcj/xlib/XImage.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XImage__
-#define __gnu_gcj_xlib_XImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-      namespace xlib
-      {
-          class Visual;
-          class XImage;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XImage : public ::java::lang::Object
-{
-
-public:
-  XImage(::gnu::gcj::xlib::Visual *, jint, jint, jint, jint, jint, jint, jint);
-  XImage(::gnu::gcj::xlib::Visual *, jint, jint, jint, jint, jint, jint, jint, jint);
-  virtual void init(::gnu::gcj::xlib::Visual *, jint, jint, jint, jint, jint, jint, jint, jint);
-private:
-  void init(::gnu::gcj::xlib::Visual *, jint, jint);
-public:
-  XImage(::gnu::gcj::xlib::Visual *, jint, jint);
-  XImage(::gnu::gcj::xlib::Visual *, jint, jint, jboolean);
-  virtual void setData(JArray< jbyte > *, jint);
-  virtual void setData(JArray< jshort > *, jint);
-  virtual void setData(JArray< jint > *, jint);
-private:
-  void internalSetData(JArray< jbyte > *, jint);
-  void internalSetData(JArray< jshort > *, jint);
-  void internalSetData(JArray< jint > *, jint);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getDepth();
-  virtual jint getFormat();
-  virtual jboolean isZPixmapFormat();
-  virtual jint getXOffset();
-  virtual jint getBytesPerLine();
-  virtual jint getBitsPerPixel();
-  virtual jint getImageByteOrder();
-  virtual jint getBitmapBitOrder();
-  virtual jint getBitmapUnit();
-  virtual jint getBitmapPad();
-  virtual jint getRedMask();
-  virtual jint getGreenMask();
-  virtual jint getBlueMask();
-  virtual void setPixel(jint, jint, jint);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataRef;
-public:
-  static const jint XYBITMAP_FORMAT = 0;
-  static const jint XYPIXMAP_FORMAT = 1;
-  static const jint ZPIXMAP_FORMAT = 2;
-  static const jint LEAST_SIGNIFICANT_B_FIRST_ORDER = 0;
-  static const jint MOST_SIGNIFICANT_B_FIRST_ORDER = 1;
-public: // actually package-private
-  jboolean ownsData;
-  ::gnu::gcj::RawData * structure;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XImage__
diff --git a/libjava/gnu/gcj/xlib/XImage.java b/libjava/gnu/gcj/xlib/XImage.java
deleted file mode 100644
index 5460549..0000000
--- a/libjava/gnu/gcj/xlib/XImage.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-import gnu.gcj.RawData;
-
-/** 
- * Structure containing image data that resides on the client side.
- * The format, depth and offset attributes of an XImage determines how
- * bitfields are encoded in a raster image. However, it does not
- * determine how a color is encoded into a bitfield. I.e. the XImage
- * pixel values in a specific structure, but does not determine what
- * colors that will be used to represent these pixel values on the
- * screen.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XImage
-{
-  /** This object reference points to the data, hindering garbage
-      collection of the data. */
-  Object dataRef;
-
-  // Must match definitions in X.h:
-  public static final int XYBITMAP_FORMAT = 0,
-                          XYPIXMAP_FORMAT = 1,
-                          ZPIXMAP_FORMAT  = 2;
-  
-  // Must match definitions in X.h:
-  public static final int LEAST_SIGNIFICANT_B_FIRST_ORDER  = 0,
-                          MOST_SIGNIFICANT_B_FIRST_ORDER   = 1;
-  
-  public XImage(Visual visual, int depth, int format, int xoffset,
-		int width, int height, int bitmapPad,
-		int bytesPerLine)
-  {
-    this(visual, depth, format, xoffset, width, height, bitmapPad,
-	 bytesPerLine,
-	 0 // bitsPerPixel
-	 );
-  }
-
-  public XImage(Visual visual, int depth, int format, int xoffset,
-		int width, int height, int bitmapPad,
-		int bytesPerLine, int bitsPerPixel)
-  {
-    if (visual == null) throw new 
-      NullPointerException("a visual must be specified");
-	
-    init(visual, depth, format, xoffset, width, height,
-	 bitmapPad, bytesPerLine, bitsPerPixel);
-  }
-
-  public native void init(Visual visual, int depth, int format, int xoffset,
-			  int width, int height, int bitmapPad,
-			  int bytesPerLine, int bitsPerPixel);
-  
-  private native void init(Visual visual, int width, int height);
-
-    
-  public XImage(Visual visual, int width, int height)
-  {
-    this(visual, width, height,
-	 true // Automatically allocate memory
-	 );
-  }
-
-  /** 
-   * Create a new XImage.
-   *
-   * @param allocate specifies whether to automatically allocate
-   * memory for the image.  It is possible to create the data array
-   * elsewhere, so that we can for instance use a DataBufferUShort as
-   * data.  Ie. not limit ourself to byte arrays.  This is done by
-   * passing false and calling a setData() method manually after
-   * creation.
-   */
-  public XImage(Visual visual, int width, int height, boolean allocate)
-  {
-    if (visual == null)
-      throw new NullPointerException("a visual must be specified");
-    
-    init(visual, width, height);
-
-    if (allocate)
-      {
-	/* Now that Xlib has figured out the appropriate bytes per
-	   line, we can allocate memory for the image.  */
-	// FIXME: What about formats with several layers/bands?
-	byte[] data = new byte[getBytesPerLine()*height];
-
-	setData(data, 0);
-      }
-  }
-
-  /**
-   * Attach image data to this XImage.
-   *
-   * @param offset the index of the first actual data element in the array.
-   */
-  public void setData(byte[] data, int offset)
-  {
-    dataRef = data;
-    internalSetData(data, offset);
-  }
-
-  /**
-   * Attach image data to this XImage. 
-   *
-   * @param offset the index of the first actual data element in the
-   *  array.  Note: this is short offset, not a byte offset.
-   */
-  public void setData(short[] data, int offset)
-  {
-    dataRef = data;
-    internalSetData(data, offset);
-  }
-
-  /**
-   * Attach image data to this XImage
-   * 
-   * @param offset the index of the first actual data element in the array.
-   * Note: this is not a byte offset.
-   */
-  public void setData(int[] data, int offset)
-  {
-    dataRef = data;
-    internalSetData(data, offset);
-  }
-  
-  private native void internalSetData(byte[] data, int offset);
-  private native void internalSetData(short[] data, int offset);
-  private native void internalSetData(int[] data, int offset);
-    
-  protected native void finalize();
-
-  boolean ownsData = false;
-  RawData structure = null;
-
-  public final native int getWidth();
-  public final native int getHeight();
-  public final native int getDepth();
-  public final native int getFormat();
-
-  public final boolean isZPixmapFormat()
-  {
-    return getFormat() == ZPIXMAP_FORMAT;
-  } 
-
-
-  /** 
-   * Get the xoffset. The xoffset avoids the need of shifting the
-   * scanlines into place.
-   */
-  public final native int getXOffset();
-
-  public native final int getBytesPerLine();
-  public native final int getBitsPerPixel();
-
-  public native final int getImageByteOrder();
-  public native final int getBitmapBitOrder();
-  public native final int getBitmapUnit();
-  public native final int getBitmapPad();
-
-
-  // True/Direct Color specific:
-  public native int getRedMask();
-  public native int getGreenMask();
-  public native int getBlueMask();
-
-
-  /**
-   * Set a pixel value at a given position in the image. This method
-   * is slow. Don't use it, except as a fall-back.
-   */
-  public native final void setPixel(int x, int y, int pixel);
-
-  public String toString()
-  {
-    String format;
-    switch(getFormat())
-      {
-      case ZPIXMAP_FORMAT:
-	format = "ZPixmapFormat";
-	break;
-      default:
-	format = "unknown";
-      }
-    
-    String imageByteOrder;
-    switch(getImageByteOrder())
-      {
-      case LEAST_SIGNIFICANT_B_FIRST_ORDER:
-	imageByteOrder = "leastSignificantByteFirst";
-	break;
-      case MOST_SIGNIFICANT_B_FIRST_ORDER:
-	imageByteOrder = "mostSignificantByteFirst";
-	break;
-      default:
-	imageByteOrder = "unknwon";
-      }
-    
-    String bitmapBitOrder;
-    switch(getBitmapBitOrder())
-      {
-      case LEAST_SIGNIFICANT_B_FIRST_ORDER:
-	bitmapBitOrder = "leastSignificantBitFirst";
-	break;
-      case MOST_SIGNIFICANT_B_FIRST_ORDER:
-	bitmapBitOrder = "mostSignificantBitFirst";
-	break;
-      default:
-	bitmapBitOrder = "unknown";
-      }
-    
-    return getClass().getName() + "[" + format +
-      ", width=" + getWidth() +
-      ", height=" + getHeight() +
-      ", bytesPerLine=" + getBytesPerLine() +
-      ", xoffset=" + getXOffset() +
-      ", depth=" + getDepth() +
-      ", bitsPerPixel=" + getBitsPerPixel() +
-      ", bitmapUnit=" + getBitmapUnit() +
-      ", bitmapPad=" + getBitmapPad() +
-      ", byteOrder=" + imageByteOrder +
-      ", bitOrder=" + bitmapBitOrder +
-      "]";
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/XUnmapEvent.h b/libjava/gnu/gcj/xlib/XUnmapEvent.h
deleted file mode 100644
index a426952..0000000
--- a/libjava/gnu/gcj/xlib/XUnmapEvent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_xlib_XUnmapEvent__
-#define __gnu_gcj_xlib_XUnmapEvent__
-
-#pragma interface
-
-#include <gnu/gcj/xlib/XEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace xlib
-      {
-          class Display;
-          class Window;
-          class XUnmapEvent;
-      }
-    }
-  }
-}
-
-class gnu::gcj::xlib::XUnmapEvent : public ::gnu::gcj::xlib::XEvent
-{
-
-public:
-  XUnmapEvent(::gnu::gcj::xlib::Display *, ::gnu::gcj::xlib::Window *, ::gnu::gcj::xlib::Window *, jboolean);
-  virtual void setUnmappedWindow(::gnu::gcj::xlib::Window *);
-  virtual void setFromConfigure(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_xlib_XUnmapEvent__
diff --git a/libjava/gnu/gcj/xlib/XUnmapEvent.java b/libjava/gnu/gcj/xlib/XUnmapEvent.java
deleted file mode 100644
index 803bdba..0000000
--- a/libjava/gnu/gcj/xlib/XUnmapEvent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.xlib;
-
-/**
- * Interprets data from an Xlib XUnmapEvent.
- *
- * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
- */
-public class XUnmapEvent extends XEvent
-{
-  public XUnmapEvent(Display display, Window eventWindow,
-		     Window unmappedWindow,
-		     boolean fromConfigure)
-  {
-    super(XAnyEvent.TYPE_UNMAP_NOTIFY, display);
-    getXAnyEvent().setWindow(eventWindow);
-    setUnmappedWindow(unmappedWindow);
-    setFromConfigure(fromConfigure);
-  }
-
-  public native void setUnmappedWindow(Window unmappedWindow);
-  public native void setFromConfigure(boolean fromConfigure);
-}
-
-
-
diff --git a/libjava/gnu/gcj/xlib/natClip.cc b/libjava/gnu/gcj/xlib/natClip.cc
deleted file mode 100644
index a1f626d..0000000
--- a/libjava/gnu/gcj/xlib/natClip.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-// Needed to avoid linking in libstdc++
-#ifndef __STL_USE_EXCEPTIONS
-#   include <java/lang/OutOfMemoryError.h>
-#   define __THROW_BAD_ALLOC throw new java::lang::OutOfMemoryError()
-#endif 
-
-#include <vector>
-
-#include <X11/Xlib.h>
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-#include <java/awt/Rectangle.h>
-
-#include "gnu/gcj/xlib/Clip.h"
-
-typedef java::awt::Rectangle AWTRect;
-typedef JArray<AWTRect*> AWTRectArray;
-typedef std::vector<XRectangle> XRectVector;
-
-void gnu::gcj::xlib::Clip::init(AWTRectArray* rectangles)
-{
-  // Prepare rectangles:
-  
-  int numRect = JvGetArrayLength(rectangles);
-  XRectVector* xrectvector = new XRectVector(numRect);
-  
-  for (int i=0; i<numRect; i++)
-    {
-      AWTRect* awtrect = elements(rectangles)[i];
-      XRectangle& xrect = (*xrectvector)[i];
-      
-      xrect.x      = awtrect->x;
-      xrect.y      = awtrect->y;
-      xrect.width  = awtrect->width;
-      xrect.height = awtrect->height;
-    }
-
-  xrects = reinterpret_cast<gnu::gcj::RawData*>(xrectvector);
-}
-
-void gnu::gcj::xlib::Clip::dispose()
-{
-  if (xrects)
-  {
-    delete xrects; 
-    xrects = 0;
-  }
-}
diff --git a/libjava/gnu/gcj/xlib/natColormap.cc b/libjava/gnu/gcj/xlib/natColormap.cc
deleted file mode 100644
index 2f6a6c7..0000000
--- a/libjava/gnu/gcj/xlib/natColormap.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-// Needed to avoid linking in libstdc++
-#ifndef __STL_USE_EXCEPTIONS
-#   include <java/lang/OutOfMemoryError.h>
-#   define __THROW_BAD_ALLOC throw new java::lang::OutOfMemoryError()
-#endif
-
-#include <vector>
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <java/lang/RuntimeException.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Screen.h>
-#include <gnu/gcj/xlib/Colormap.h>
-#include <gnu/gcj/xlib/XColor.h>
-#include <gnu/gcj/RawData.h>
-
-jlong gnu::gcj::xlib::Colormap::allocateColorPixel(XColor* color)
-{
-  ::Display* dpy = (::Display*) (screen->getDisplay()->display);
-  ::XColor* col = (::XColor*) (color->structure);
-  Status result = XAllocColor(dpy, xid, col);
-  if (result == 0)
-    throw new ::java::lang::RuntimeException(
-      JvNewStringLatin1("Unable to allocate color pixel."));
-
-  return col->pixel;
-}
-
-typedef JArray<gnu::gcj::xlib::XColor*>* xcolorarray;
-
-xcolorarray gnu::gcj::xlib::Colormap::getSharedColors()
-{
-  ::Display* dpy = (::Display*) (screen->getDisplay()->display);
-  unsigned int nCells = CellsOfScreen(ScreenOfDisplay(dpy, screen->screenNumber));
-
-  typedef ::XColor xcolor;
-  std::vector<xcolor> colors(nCells);
-  for (unsigned int i=0; i<nCells; i++)
-    colors[i].pixel = i;
-  ::XColor* cols = colors.get_allocator().address(colors.front());
-  XQueryColors(dpy, xid, cols,
-	       nCells);
-
-  int nShared = 0;
-  for (unsigned int i=0; i<nCells; i++)
-    {
-      ::XColor color = colors[i];
-
-      if (!XAllocColor(dpy, xid, &color))
-	continue;
-
-      /* FIXME: In some cases this algorithm may identify a free
-	 color cell as a shared one. */
-      if (color.pixel != i)
-	{
-	  // Oops, the color wasn't shared. Free it.
-	  XFreeColors(dpy, xid, &(color.pixel), 1, 0);
-	  colors[i].flags = FLAG_NOT_SHARED;
-	  continue;
-	}
-      
-      // FIXME: Shared or free?
-      
-      nShared++;
-      colors[i].flags = FLAG_SHARED;
-    }
-  
-  JArray<XColor*>* shared = newXColorArray(nShared);
-  int si=0;
-  for (unsigned int i=0; i<nCells; i++)
-    {
-      if (colors[i].flags != FLAG_SHARED)
-	continue;
-      
-      XColor* col = elements(shared)[si++];
-      gnu::gcj::RawData* colorData = col->structure;
-      ::XColor* colStruct = reinterpret_cast<xcolor*>(colorData);
-      *colStruct = colors[i];
-    }
-
-  return shared;
-}
-
-xcolorarray gnu::gcj::xlib::Colormap::getXColors()
-{
-  ::Display* dpy = (::Display*) (screen->getDisplay()->display);
-  unsigned int nCells =
-    CellsOfScreen(ScreenOfDisplay(dpy, screen->screenNumber));
-  
-  typedef ::XColor xcolor;
-  std::vector<xcolor> colors(nCells);
-  
-  JArray<XColor*>* colArray = newXColorArray(nCells);
-  
-  for (unsigned int i=0; i<nCells; i++)
-    colors[i].pixel = i;
-  
-  XQueryColors(dpy, xid, &(colors.front()), nCells);
-
-  /* TODO: The current problem with this code is that it relies on
-     (color.pixel == i) as an indicator that the color is
-     shared. However, (color.pixel == i), may also occur simply
-     because color cell i simply was the next free in the list of
-     unallocated color cells.  IDEA: run through the list both
-     backwards and forwards, and only pick out the colorcells that
-     have been identified as shared during both passes.  Reversing the
-     traversal direction might prevent i from corresponding to the
-     next free colorcell, atleast in one of the passes. */
-  for (unsigned int i=0; i<nCells; i++)
-    {
-      ::XColor color = colors[i];
-      
-      char flag = FLAG_NOT_SHARED;
-      if (XAllocColor(dpy, xid, &color))
-	{
-	  if (color.pixel == i)
-	    {
-	      flag = FLAG_SHARED;
-	    }
-	  else
-	    {
-	      // Oops, the color wasn't shared. Free it.
-	      XFreeColors(dpy, xid, &(color.pixel), 1, 0);
-	    }
-	}
-      
-      // Copy color data into object in array
-      XColor* col = elements(colArray)[i];
-      gnu::gcj::RawData* colorData = col->structure;
-      ::XColor* colStruct = reinterpret_cast<xcolor*>(colorData);
-      *colStruct = colors[i];
-      colStruct->flags = flag;
-    }
-  
-  return colArray;
-}
-
diff --git a/libjava/gnu/gcj/xlib/natDisplay.cc b/libjava/gnu/gcj/xlib/natDisplay.cc
deleted file mode 100644
index f89cb74..0000000
--- a/libjava/gnu/gcj/xlib/natDisplay.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
-#include <stdio.h>
-
-#include <java/lang/System.h>
-#include <java/lang/RuntimeException.h>
-#include <java/io/PrintStream.h>
-#include <gcj/cni.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/XConnectException.h>
-#include <gnu/gcj/xlib/XException.h>
-
-void gnu::gcj::xlib::Display::init()
-{
-  ::Display* openedDisplay = XOpenDisplay(0); // default display
-  
-  if (openedDisplay == 0) {
-    jstring msg = JvNewStringLatin1("Unable to open display");
-    throw new gnu::gcj::xlib::XConnectException(msg);
-  }
-  
-  display = reinterpret_cast<gnu::gcj::RawData*>(openedDisplay); 
-}
-
-void gnu::gcj::xlib::Display::finalize()
-{
-  if (display == 0) return;
-  ::Display* dpy = (::Display*) display;
-  XCloseDisplay(dpy);
-}
-
-jint gnu::gcj::xlib::Display::getDefaultScreenNumber()
-{
-  ::Display* dpy = (::Display*) display;
-  return DefaultScreen(dpy);
-}
-
-jint gnu::gcj::xlib::Display::getDefaultRootWindowXID()
-{
-  ::Display* dpy = (::Display*) display;
-  return DefaultRootWindow(dpy);
-}
-
-jint gnu::gcj::xlib::Display::internAtom(jstring name)
-{
-  ::Display* dpy = (::Display*) display;
-  int len = JvGetStringUTFLength(name);
-  char cName[len+1];
-  JvGetStringUTFRegion(name, 0, name->length(), cName);
-  cName[len] = '\0';
-  bool onlyIfExists = false;
-  return XInternAtom(dpy, cName, onlyIfExists);
-}
-
-jstring gnu::gcj::xlib::Display::getAtomName(jint atom)
-{
-  ::Display* dpy = (::Display*) display;
-  char* cName = XGetAtomName(dpy, atom);
-  jstring name = JvNewStringLatin1(cName);
-  XFree(cName);
-  return name;
-}
-
-static int handleXError(Display* dpy, XErrorEvent* xee)
-{
-  const int ERROR_TEXT_LENGTH = 256;
-  char errorText[ERROR_TEXT_LENGTH];
-  XGetErrorText(dpy, xee->error_code, errorText, ERROR_TEXT_LENGTH);
-  int requestCode = xee->request_code;
-  
-  if (requestCode == X_GetImage)
-    {
-      /* The current implementation of Drawable.copyIntoXImage()
-	 will generate harmless X_GetImage errors if the initially
-	 requested area is not completly within the drawable. Until
-	 we find a better solution, simply ignore these errors. */
-      return 0;
-    }
-
-  java::lang::System::err->print(JvNewStringLatin1("X error: "));
-  java::lang::System::err->print(JvNewStringLatin1(errorText));
-  java::lang::System::err->print(JvNewStringLatin1(", serial="));
-  java::lang::System::err->print((jlong) xee->serial);
-  java::lang::System::err->print(JvNewStringLatin1(", requestCode="));
-  java::lang::System::err->print((jint) requestCode);
-  
-  if (requestCode < 128)
-    {
-      char number[8];
-      snprintf(number, 8, "%d", requestCode);
-      number[7] = '\0';
-
-      XGetErrorDatabaseText(dpy, "XRequest", number,
-			    "", errorText, ERROR_TEXT_LENGTH);
-      java::lang::System::err->print(JvNewStringLatin1(" ("));
-      java::lang::System::err->print(JvNewStringLatin1(errorText));
-      java::lang::System::err->print(JvNewStringLatin1(")"));
-    }
-
-  java::lang::System::err->print(JvNewStringLatin1(", minorCode="));
-  java::lang::System::err->print((jint) xee->minor_code);
-  java::lang::System::err->print(JvNewStringLatin1(", XID="));
-  java::lang::System::err->println((jlong) xee->resourceid);
-  
-  return 0;
-}
-
-void gnu::gcj::xlib::Display::staticInit()
-{
-  if (XInitThreads() == 0)
-    {
-      char msg[] = "threads are not supported on this platform";
-      throw new ::java::lang::RuntimeException(JvNewStringLatin1(msg));
-    }
-  
-  XSetErrorHandler(&handleXError);
-}
-
-void gnu::gcj::xlib::Display::flush() 
-{
-  ::Display* dpy = (::Display*) display;
-  XFlush(dpy);
-}
diff --git a/libjava/gnu/gcj/xlib/natDrawable.cc b/libjava/gnu/gcj/xlib/natDrawable.cc
deleted file mode 100644
index 371a92b..0000000
--- a/libjava/gnu/gcj/xlib/natDrawable.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/XException.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Drawable.h>
-#include <gnu/gcj/xlib/XImage.h>
-
-#include <java/awt/Rectangle.h>
-
-jboolean gnu::gcj::xlib::Drawable::copyIntoXImageImpl(XImage* image,
-						      jint x, jint y,
-						      jint width, jint height,
-						      jint destX, jint destY)
-{
-  ::Display* dpy = (::Display*) (getDisplay()->display);
-  ::XImage* ximage = (::XImage*) image->structure;
-  int format = image->getFormat();
-  int xid = getXID();
-
-  ::XImage* result = XGetSubImage(dpy, xid,
-				  x, y, width, height,
-				  ~0, // plane mask
-				  format,
-				  ximage,
-				  destX, destY);
-  if (result == 0)
-    return false;
-    
-  if (result != ximage)
-    throw new XException(MSG_XGETSUBIMAGE_FAILED);
-
-  return true;
-}
-
-jint gnu::gcj::xlib::Drawable::getDepth ()
-{
-  ::Display* dpy = (::Display*) (getDisplay ()->display);
-  ::Window root;
-  int x, y;
-  unsigned int w, h, bw, depth;
-
-  Status status = XGetGeometry (dpy, getXID(), &root,
-			        &x, &y, &w, &h,
-			        &bw, &depth);
-  switch (status)
-  {
-    case BadDrawable:
-      throw new XException (display, status);
-    default:
-      ; // All OK, NOP.
-  }
-  return (jint)depth;
-}
-
-java::awt::Rectangle*
-gnu::gcj::xlib::Drawable::getBounds(::java::awt::Rectangle* rv)
-{
-  ::Display* dpy = (::Display*) (getDisplay()->display);
-
-  ::Window root;
-  int x, y;
-  unsigned int w, h, bw, depth;
-
-  Status status = XGetGeometry(dpy, getXID(), &root,
-			       &x, &y, &w, &h,
-			       &bw, &depth);
-  
-  switch (status)
-    {
-    case BadDrawable:
-      throw new XException(display, status);
-    default:
-      ; // All OK, NOP.
-    }
- 
-  if (rv == 0)
-    {
-      rv = new ::java::awt::Rectangle(x, y, w, h);
-    }
-  else
-    {
-      rv->x = x;
-      rv->y = y;
-      rv->width = w;
-      rv->height = h;
-    }
-  return rv;
-}
diff --git a/libjava/gnu/gcj/xlib/natFont.cc b/libjava/gnu/gcj/xlib/natFont.cc
deleted file mode 100644
index be842d0..0000000
--- a/libjava/gnu/gcj/xlib/natFont.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-#include <java/lang/String.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Font.h>
-#include <gnu/gcj/xlib/XException.h>
-
-gnu::gcj::RawData* gnu::gcj::xlib::Font::loadFontImpl(Display* display,
-						  jstring lfdNamePattern)
-{
-  ::Display* dpy = (::Display*) display->display;
-  int len = JvGetStringUTFLength(lfdNamePattern);
-  char cName[len+1];
-  JvGetStringUTFRegion(lfdNamePattern, 0, lfdNamePattern->length(),
-		       cName);
-  cName[len] = '\0';
-
-  XFontStruct* fontStruct = XLoadQueryFont(dpy, cName);
-  if (fontStruct == 0)
-    {
-      throw new XException(JvNewStringLatin1("font not found"));
-    }
-
-  return reinterpret_cast<gnu::gcj::RawData*>(fontStruct);
-}
-
-jint gnu::gcj::xlib::Font::getXIDFromStruct(gnu::gcj::RawData* structure)
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  return fontStruct->fid;
-}
-
-jint gnu::gcj::xlib::Font::getMaxAscent()
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  return fontStruct->max_bounds.ascent+1;   // +1 to include the baseline
-}
-
-jint gnu::gcj::xlib::Font::getMaxDescent()
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  return fontStruct->max_bounds.descent-1;  // -1 to exclude the baseline
-}
-
-jint gnu::gcj::xlib::Font::getAscent()
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  jint returnValue = fontStruct->ascent;
-  if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'O')
-    returnValue = fontStruct
-        ->per_char[(unsigned)'O'-fontStruct->min_char_or_byte2]
-        .ascent;
-  return returnValue+1;  // +1 to include the baseline
-}
-
-jint gnu::gcj::xlib::Font::getDescent()
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  jint returnValue = fontStruct->descent;
-  if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'y')
-    returnValue = fontStruct
-        ->per_char[(unsigned)'y'-fontStruct->min_char_or_byte2]
-        .descent;
-  return returnValue-1;  // -1 to exclude the baseline
-}
-
-jint gnu::gcj::xlib::Font::getStringWidth(::java::lang::String* text)
-{
-  XFontStruct* fontStruct = (XFontStruct*) structure;
-  
-  // FIXME: Convert to the character set used in the font, which may
-  // or may not be unicode. For now, treat everything as 16-bit and
-  // use character codes directly, which should be OK for unicode or
-  // 8-bit ascii fonts.
-  jint length = text->length();
-  jchar* txt = JvGetStringChars(text);
-  XChar2b xwchars[length];
-  for (int i=0; i<length; i++)
-    {
-      XChar2b* xc = &(xwchars[i]);
-      jchar jc = txt[i];
-      xc->byte1 = (jc >> 8) & 0xff;
-      xc->byte2 = jc & 0xff;
-    }
-  return XTextWidth16(fontStruct, xwchars, length);
-}
-
-void gnu::gcj::xlib::Font::finalize()
-{
-  if (structure != 0)
-    {
-      ::Display* dpy = (::Display*) display->display;
-      XFontStruct* fontStruct = (XFontStruct*) structure;
-      int result = XFreeFont(dpy, fontStruct);
-
-      if (result == BadFont) 
-	throw new XException(display, result);
-      
-      structure = 0; xid = 0;
-    }
-}
-
diff --git a/libjava/gnu/gcj/xlib/natGC.cc b/libjava/gnu/gcj/xlib/natGC.cc
deleted file mode 100644
index 4529ebb..0000000
--- a/libjava/gnu/gcj/xlib/natGC.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Copyright (C) 2000, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <vector>
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gcj/array.h>
-#include <gnu/gcj/RawData.h>
-#include <java/lang/String.h>
-#include <java/awt/Rectangle.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/XID.h>
-#include <gnu/gcj/xlib/Drawable.h>
-#include <gnu/gcj/xlib/Font.h>
-#include <gnu/gcj/xlib/XImage.h>
-#include <gnu/gcj/xlib/XException.h>
-#include <gnu/gcj/xlib/Clip.h>
-#include <gnu/gcj/xlib/GC.h>
-#include <gnu/gcj/xlib/XException.h>
-
-typedef java::awt::Rectangle AWTRect;
-typedef JArray<AWTRect*> AWTRectArray;
-typedef std::vector<XRectangle> XRectVector;
-
-void gnu::gcj::xlib::GC::initStructure(GC* copyFrom)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::GC gc = (::GC) structure;
-  if (gc == 0)
-  {
-    // If we haven't already created a GC, create one now
-    ::Drawable drawableXID = target->getXID();
-    gc = XCreateGC(dpy, drawableXID, 0, 0);
-    structure = reinterpret_cast<gnu::gcj::RawData*>(gc);
-    if (gc == 0) 
-      throw new XException(JvNewStringLatin1("GC creation failed"));
-  }
-
-  if (copyFrom != 0)
-    {
-      ::GC fromGC = (::GC) copyFrom->structure;
-      XCopyGC(dpy, fromGC, ~0, gc);
-      // no fast fail
-    }
-}
-
-void gnu::gcj::xlib::GC::disposeImpl()
-{
-  gnu::gcj::RawData* lStructure = structure;
-  Drawable* lTargetType = target;
-
-  if ((lStructure == 0) || (lTargetType == 0))
-    return;
-    
-  structure = 0;
-  target = 0;
-	
-  Display* display = lTargetType->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::GC gc = (::GC) lStructure;
-	
-  XFreeGC(dpy, gc);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::setForeground(jlong pixel)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::GC gc = (::GC) structure;
-  XSetForeground(dpy, gc, pixel);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::setFont(Font* font)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::GC gc = (::GC) structure;
-  XSetFont(dpy, gc, font->getXID());
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::drawString(jstring text, jint x, jint y)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  
-  jint length = text->length();
-  jchar* txt = JvGetStringChars(text);
-
-  XChar2b xwchars[length];
-    
-  // FIXME: Convert to the character set used in the font, which may
-  // or may not be unicode. For now, treat everything as 16-bit and
-  // use character codes directly, which should be OK for unicode or
-  // 8-bit ascii fonts.
-
-  for (int i=0; i<length; i++)
-    {
-      XChar2b* xc = &(xwchars[i]);
-      jchar jc = txt[i];
-      xc->byte1 = (jc >> 8) & 0xff;
-      xc->byte2 = jc & 0xff;
-    }
-  XDrawString16(dpy, drawableXID, gc, x, y, xwchars, length);
-}
-
-void gnu::gcj::xlib::GC::drawPoint(jint x, jint y)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XDrawPoint (dpy, drawableXID, gc, x, y);
-}
-
-void gnu::gcj::xlib::GC::drawLine(jint x1, jint y1, jint x2, jint y2)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XDrawLine(dpy, drawableXID, gc, x1, y1, x2, y2);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::drawRectangle(jint x, jint y, jint w, jint h)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XDrawRectangle(dpy, drawableXID, gc, x, y, w, h);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::fillRectangle(jint x, jint y, jint w, jint h)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XFillRectangle(dpy, drawableXID, gc, x, y, w, h);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::drawArc(jint x, jint y, jint w, jint h,jint startAngle, jint arcAngle)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XDrawArc(dpy, drawableXID, gc, x, y, w, h, startAngle * 64, arcAngle * 64);
-}
-
-void gnu::gcj::xlib::GC::fillArc(jint x, jint y, jint w, jint h,jint startAngle, jint arcAngle)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  XFillArc(dpy, drawableXID, gc, x, y, w, h, startAngle * 64, arcAngle * 64);
-}
-
-void gnu::gcj::xlib::GC::fillPolygon(jintArray xPoints, jintArray yPoints,
-				     jint nPoints,
-				     jint translateX, jint translateY)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  typedef ::XPoint xpoint;
-  std::vector<xpoint> points(nPoints+1);
-  for (int i=0; i<nPoints; i++)
-    {
-      points[i].x = elements(xPoints)[i] + translateX;
-      points[i].y = elements(yPoints)[i] + translateY;
-    }
-  points[nPoints] = points[0];
-  XFillPolygon(dpy, drawableXID, gc, &(points.front()), nPoints,
-	       Complex, CoordModeOrigin);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::clearArea(jint x, jint y, jint w, jint h,
-				   jboolean exposures)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  
-  XClearArea(dpy, drawableXID, x, y, w, h,
-	     exposures ? True : False);
-  // no fast fail
-}
-
-
-void gnu::gcj::xlib::GC::putImage(XImage* image,
-				  jint srcX, jint srcY,
-				  jint destX, jint destY,
-				  jint width, jint height)
-{
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID();
-  ::GC gc = (::GC) structure;
-  ::XImage* ximage = (::XImage*) (image->structure);
-  
-  XPutImage(dpy, drawableXID, gc, ximage,
-	    srcX, srcY,
-	    destX, destY,
-	    width, height);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::GC::updateClip(AWTRectArray* rectangles)
-{
-  int numRect = JvGetArrayLength(rectangles);
-  XRectVector* xrectvector = new XRectVector(numRect);
-  
-  for (int i=0; i<numRect; i++)
-  {
-    AWTRect* awtrect = elements(rectangles)[i];
-    XRectangle& xrect = (*xrectvector)[i];
-      
-    xrect.x      = awtrect->x;
-    xrect.y      = awtrect->y;
-    xrect.width  = awtrect->width;
-    xrect.height = awtrect->height;
-  }
-
-  Display* display = target->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  ::GC gc = (::GC) structure;
-
-  int originX = 0;
-  int originY = 0;
-  int ordering = Unsorted;
-  XSetClipRectangles(dpy, gc, originX, originY,
-		     &(xrectvector->front()), numRect,
-		     ordering);
-  delete xrectvector;
-}
-
-void gnu::gcj::xlib::GC::copyArea (gnu::gcj::xlib::Drawable * source, 
-				  jint srcX, jint srcY,
-				  jint destX, jint destY,
-				  jint width, jint height)
-{
-  Display* display = target->getDisplay ();
-  ::Display* dpy = (::Display*) (display->display);
-  ::Drawable drawableXID = target->getXID ();
-  ::GC gc = (::GC) structure;
-  ::Drawable srcXID = source->getXID ();
-
-  XCopyArea (dpy, srcXID, drawableXID, gc, srcX, srcY, width, height,
-    destX, destY);
-}
diff --git a/libjava/gnu/gcj/xlib/natPixmap.cc b/libjava/gnu/gcj/xlib/natPixmap.cc
deleted file mode 100644
index 459f5bf..0000000
--- a/libjava/gnu/gcj/xlib/natPixmap.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <java/lang/OutOfMemoryError.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Screen.h>
-#include <gnu/gcj/xlib/Visual.h>
-#include <gnu/gcj/xlib/Drawable.h>
-#include <gnu/gcj/xlib/XImage.h>
-#include <gnu/gcj/xlib/Pixmap.h>
-
-jint gnu::gcj::xlib::Pixmap::createXID(Drawable* drawable,
-				       jint width, jint height,
-				       jint depth)
-{
-  Display* display = drawable->getDisplay();
-  ::Display* dpy = (::Display*) (display->display);
-  jint xid = drawable->getXID();
-  
-  return XCreatePixmap(dpy, xid, width, height, depth);
-}
-
-void gnu::gcj::xlib::Pixmap::finalize()
-{
-  ::Display* dpy = (::Display*) (getDisplay()->display);
-  XFreePixmap(dpy, getXID());
-}
diff --git a/libjava/gnu/gcj/xlib/natScreen.cc b/libjava/gnu/gcj/xlib/natScreen.cc
deleted file mode 100644
index 9459c1f..0000000
--- a/libjava/gnu/gcj/xlib/natScreen.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Screen.h>
-
-void gnu::gcj::xlib::Screen::initStructure()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Screen* screen = ScreenOfDisplay(dpy, screenNumber);
-  
-  structure = reinterpret_cast<gnu::gcj::RawData*>(screen);
-}
-
-
-jint gnu::gcj::xlib::Screen::getRootDepth()
-{
-  ::Screen* screen = (::Screen*) structure;
-  return screen->root_depth;
-}
-
-jint gnu::gcj::xlib::Screen::getRootWindowXID()
-{
-  ::Screen* screen = (::Screen*) structure;
-  return RootWindowOfScreen(screen);
-}
-
-jint gnu::gcj::xlib::Screen::getDefaultColormapXID()
-{
-  ::Screen* screen = (::Screen*) structure;
-  return DefaultColormapOfScreen(screen);
-}
-
-jint gnu::gcj::xlib::Screen::findScreenNumber()
-{
-  ::Screen* screen = (::Screen*) structure;
-  return XScreenNumberOfScreen(screen);
-}
-
-gnu::gcj::RawData* gnu::gcj::xlib::Screen::getRootVisualStructure()
-{
-  ::Screen* screen = (::Screen*) structure;
-  ::Visual* visual = DefaultVisualOfScreen(screen);
-  return reinterpret_cast<gnu::gcj::RawData*>(visual);
-}
diff --git a/libjava/gnu/gcj/xlib/natVisual.cc b/libjava/gnu/gcj/xlib/natVisual.cc
deleted file mode 100644
index 56e03b5..0000000
--- a/libjava/gnu/gcj/xlib/natVisual.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/xlib/Visual.h>
-#include <gnu/gcj/xlib/Screen.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/XException.h>
-#include <gnu/gcj/RawData.h>
-
-using namespace gnu::gcj;
-
-void gnu::gcj::xlib::Visual::init(RawData* visual, jint depth)
-{
-  XVisualInfo* info = new XVisualInfo;
-  xVisualInfo = reinterpret_cast<gnu::gcj::RawData*>(info);
-  infoMask = 0;
-    
-  if (visual != 0)
-    {
-      ::Visual* visualStructure = (::Visual*) visual;
-      info->visual = visualStructure;
-      info->visualid = XVisualIDFromVisual(visualStructure);
-      infoMask |= MASK_ID | MASK_VISUAL_STRUCTURE;
-    }
-
-  if (depth  != 0)
-    {
-      info->depth = depth;
-      infoMask |= MASK_DEPTH;
-    }
-}
-
-void gnu::gcj::xlib::Visual::finalize()
-{
-  if (xVisualInfo != 0)
-    {
-      delete xVisualInfo;
-      xVisualInfo = 0;
-    }
-}
-
-RawData* gnu::gcj::xlib::Visual::getVisualStructure()
-{
-    ensureXVisualInfo(MASK_ALL); // Make sure structure is set
-    XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-    return reinterpret_cast<gnu::gcj::RawData*>(info->visual);
-}
-
-jint gnu::gcj::xlib::Visual::getRedMask()
-{
-  ensureXVisualInfo(MASK_RED);
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-  return info->red_mask;
-}
-
-jint gnu::gcj::xlib::Visual::getGreenMask()
-{
-  ensureXVisualInfo(MASK_GREEN);
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-  return info->green_mask;
-}
-
-jint gnu::gcj::xlib::Visual::getBlueMask()
-{
-  ensureXVisualInfo(MASK_BLUE);
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-  return info->blue_mask;
-}
-
-jint gnu::gcj::xlib::Visual::getScreenNumber()
-{
-  if (screen != 0)
-    return screen->getScreenNumber();
-
-  ensureXVisualInfo(MASK_SCREEN);
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-  return info->screen;
-}
-
-jint gnu::gcj::xlib::Visual::getDepth()
-{
-  ensureXVisualInfo(MASK_DEPTH);
-  
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-  return info->depth;
-}
-
-jint gnu::gcj::xlib::Visual::getVisualClass()
-{
-  ensureXVisualInfo(MASK_CLASS);
-  ::XVisualInfo* info = (::XVisualInfo*) xVisualInfo;
-  return info->c_class;
-}
-
-void gnu::gcj::xlib::Visual::ensureXVisualInfo(jint requiredMask)
-{
-  int missingInformation = ~infoMask;
-  if ((missingInformation & requiredMask) == 0)
-    return;
-  
-  // We need more info...
-
-  XVisualInfo* info = (XVisualInfo*) xVisualInfo;
-
-  // Store everything we know into template
-  if (screen != 0)
-    {
-      info->screen = screen->getScreenNumber();
-      infoMask |= MASK_SCREEN;
-    }
-  
-  // Aquire info using the current info as template for matching
-  ::Display* dpy = (::Display*) display->display;
-  int visualInfoCount;
-
-  long mask = infoMask & MASK_ALL & (~MASK_VISUAL_STRUCTURE);
-  XVisualInfo* matches = XGetVisualInfo(dpy, mask,
-					  info, &visualInfoCount);
-  if (matches != 0)
-    {
-      (*info) = matches[0];
-
-      // redundant?
-      xVisualInfo = reinterpret_cast<gnu::gcj::RawData*>(info);
-
-      infoMask = ~0; // ALL
-      XFree(matches);
-    } 
-  else 
-    {
-      char msg[] = 
-	"XGetVisualInfo failed to find any matching visuals. The template "
-	"describes a combination of properties that does not exist on "
-	"this X server.";
-      throw new XException(JvNewStringLatin1(msg));
-    }
-}
diff --git a/libjava/gnu/gcj/xlib/natWMSizeHints.cc b/libjava/gnu/gcj/xlib/natWMSizeHints.cc
deleted file mode 100644
index fd54699..0000000
--- a/libjava/gnu/gcj/xlib/natWMSizeHints.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-#include <java/lang/OutOfMemoryError.h>
-
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/WMSizeHints.h>
-
-void gnu::gcj::xlib::WMSizeHints::init(WMSizeHints* copyFrom)
-{
-  XSizeHints* hints = XAllocSizeHints();
-  if (hints == 0)
-    {
-      jstring errorMessage = JvNewStringLatin1("XAllocSizeHints failed");
-      throw new ::java::lang::OutOfMemoryError(errorMessage);
-    }
-
-  if (copyFrom != 0)
-    {
-      XSizeHints* from = (XSizeHints*) copyFrom->structure;
-      (*hints) = (*from);
-    } 
-  else
-    {
-      // Is this necessary?
-      hints->flags = 0;
-    }
-  structure = reinterpret_cast<gnu::gcj::RawData*>(hints);
-}
-
-void gnu::gcj::xlib::WMSizeHints::finalize()
-{
-  delete structure;
-}
-
-void gnu::gcj::xlib::WMSizeHints::applyNormalHints(gnu::gcj::xlib::Window* window)
-{
-  Display* display = window->display;
-  ::Display* dpy = (::Display*) display->display;
-  ::Window win = window->getXID();
-  XSizeHints* hints = (XSizeHints*) structure;
-  
-  XSetWMNormalHints(dpy, win, hints);
-  /* FIXME, alternative?
-     // X11 source reports XSetWMNormalHints() as an old routine. (?)
-     XSetWMSizeHints(dpy, win, hints, display->getAtom("WM_NORMAL_HINTS"));
-  */
-}
-
-void gnu::gcj::xlib::WMSizeHints::setMinSize(jint width, jint height)
-{
-  XSizeHints* hints = (XSizeHints*) structure;
-  hints->min_width = width;
-  hints->min_height = height;
-  hints->flags = hints->flags | PMinSize;
-}
-
-void gnu::gcj::xlib::WMSizeHints::setMaxSize(jint width, jint height)
-{
-  XSizeHints* hints = (XSizeHints*) structure;
-  hints->max_width = width;
-  hints->max_height = height;
-  hints->flags = hints->flags | PMaxSize;
-}
diff --git a/libjava/gnu/gcj/xlib/natWindow.cc b/libjava/gnu/gcj/xlib/natWindow.cc
deleted file mode 100644
index 42ef649..0000000
--- a/libjava/gnu/gcj/xlib/natWindow.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-// Needed to avoid linking in libstdc++
-#ifndef __STL_USE_EXCEPTIONS
-#   include <java/lang/OutOfMemoryError.h>
-#   define __THROW_BAD_ALLOC throw new java::lang::OutOfMemoryError()
-#endif
-
-#include <vector>
-
-#include <X11/Xlib.h>
-#include <gcj/cni.h>
-#include <java/awt/Rectangle.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/WindowAttributes.h>
-#include <gnu/gcj/xlib/Visual.h>
-#include <gnu/gcj/xlib/XException.h>
-
-jint gnu::gcj::xlib::Window::createChildXID(::java::awt::Rectangle* bounds,
-					jint borderWidth,
-					WindowAttributes* attributes,
-					jint windowIOClass, 
-					Visual* visual)
-{
-  ::Window parentXID = xid;
-  
-  int x      = bounds->x;
-  int y      = bounds->y;
-  int width  = bounds->width;
-  int height = bounds->height;
-  
-  long mask = attributes->mask;
-  XSetWindowAttributes* attr = (XSetWindowAttributes*)
-    attributes->getXSetWindowAttributesStructure();
-  
-  ::Visual* vis = CopyFromParent;
-  int depth = CopyFromParent;
-  if (visual != 0)
-    {
-      vis = (::Visual*) visual->getVisualStructure();
-      depth = visual->getDepth();
-    }
-
-  ::Window childXID = XCreateWindow((::Display*) (display->display),
-				    parentXID,
-				    x, y, width, height,
-				    borderWidth, depth, windowIOClass,
-				    vis,
-				    mask, attr);
-  // no fast fail
-  return childXID;
-}
-
-void gnu::gcj::xlib::Window::destroy()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  XDestroyWindow(dpy, window);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::Window::setAttributes(WindowAttributes* attributes)
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  ::XSetWindowAttributes* attr = (::XSetWindowAttributes*)
-      attributes->getXSetWindowAttributesStructure();
-
-  XChangeWindowAttributes(dpy, window, attributes->mask, attr);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::Window::toBack()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  XLowerWindow(dpy, window);
-}
-
-void gnu::gcj::xlib::Window::toFront()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  XRaiseWindow(dpy, window);
-}
-
-void gnu::gcj::xlib::Window::map()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  XMapWindow(dpy, window);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::Window::unmap()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  ::Window window = xid;
-  XUnmapWindow(dpy, window);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::Window::setProperty(jint nameAtom, jint typeAtom, 
-					 jbyteArray data)
-{
-  ::Display* dpy = (::Display*) (display->display);
-  int format = 8;
-  int mode = PropModeReplace;
-  unsigned char* pData = (unsigned char*) elements(data);
-  int len = data->length;
-  
-  XChangeProperty(dpy, xid, nameAtom, typeAtom, format, mode,
-		  pData, len);
-  // no fast fail
-}
-
-void gnu::gcj::xlib::Window::setWMProtocols(jintArray atoms)
-{
-  ::Display* dpy = (::Display*) (display->display);
-  
-  size_t length = atoms->length;
-  jint* atomsBegin = elements(atoms);
-  jint* atomsEnd   = atomsBegin + length;
-  
-  // Avoid confusion between Xlib.h and Atom.java "Atom" types.
-  typedef ::Atom XLibAtom;
-  
-  std::vector<XLibAtom> atomVector(atomsBegin, atomsEnd);
-  XLibAtom* atomsArray = &(atomVector.front());
-  
-  XSetWMProtocols(dpy, xid, atomsArray, length);
-  // no fail fast
-}
-
-jintArray gnu::gcj::xlib::Window::getWMProtocols()
-{
-  ::Display* dpy = (::Display*) (display->display);
-  
-  ::Atom* protocolsReturn;
-  int countReturn;
-  
-  Status success = XGetWMProtocols(dpy, xid, &protocolsReturn,
-				   &countReturn);
-  
-  if (!success)
-    throw new XException(JvNewStringLatin1("cannot get "
-					   "WM protocols "));
-  
-  jintArray atoms;
-  try
-    {
-      ::Atom* protocolsBegin = protocolsReturn;
-      ::Atom* protocolsEnd = protocolsBegin + countReturn;
-      
-      atoms = JvNewIntArray(countReturn);
-      jint* atomsBegin = elements(atoms);
-      
-      std::copy(protocolsBegin, protocolsEnd, atomsBegin);
-      
-    }
-  catch (...)
-    {
-      XFree(protocolsReturn);
-      throw;
-    }
-  XFree(protocolsReturn);
-  
-  return atoms;
-}
-
-void gnu::gcj::xlib::Window::setBounds(jint x, jint y,
-				       jint width, jint height)
-{
-  ::Display* dpy = (::Display*) (display->display);
-  
-  XMoveResizeWindow(dpy, xid, x, y, width, height);
-  // no fast fail
-}
diff --git a/libjava/gnu/gcj/xlib/natWindowAttributes.cc b/libjava/gnu/gcj/xlib/natWindowAttributes.cc
deleted file mode 100644
index b619348..0000000
--- a/libjava/gnu/gcj/xlib/natWindowAttributes.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/WindowAttributes.h>
-#include <gnu/gcj/xlib/Pixmap.h>
-#include <gnu/gcj/xlib/XException.h>
-#include <gnu/gcj/xlib/Screen.h>
-#include <gnu/gcj/xlib/Visual.h>
-
-
-void gnu::gcj::xlib::WindowAttributes::initFromWindow(Window* from)
-{
-  display = from->getDisplay();
-  ::Display* dpy = (::Display*) display->display;
-  ::Window win = from->getXID();
-  
-  XWindowAttributes* attributesIn  = new XWindowAttributes;
-  in = reinterpret_cast<gnu::gcj::RawData*>(attributesIn);
-
-  Status status = XGetWindowAttributes(dpy, win, attributesIn);
-  if ((status == BadDrawable) | (status == BadWindow))
-    throw new XException(display, status);
-}
-
-
-void gnu::gcj::xlib::WindowAttributes::init(WindowAttributes* copyFrom)
-{
-  XSetWindowAttributes* attributes = new XSetWindowAttributes;
-
-  if (copyFrom != 0)
-    {
-      XSetWindowAttributes* from = 
-	(XSetWindowAttributes*) copyFrom->out;
-      (*attributes) = (*from);
-    } 
-  
-  out = reinterpret_cast<gnu::gcj::RawData*>(attributes);
-}
-
-void gnu::gcj::xlib::WindowAttributes::finalize()
-{
-  delete in; in = 0;
-  delete out; out = 0;
-}
-
-void gnu::gcj::xlib::WindowAttributes::setBackground(jlong pixel)
-{
-  XSetWindowAttributes* attributes = (XSetWindowAttributes*) out;
-  
-  attributes->background_pixel = pixel;
-  mask = mask | CWBackPixel;
-}
-
-void gnu::gcj::xlib::WindowAttributes::setBackground(Pixmap* pixmap)
-{
-  XSetWindowAttributes* attributes = (XSetWindowAttributes*) out;
-
-  attributes->background_pixmap = pixmap->getXID();
-  mask = mask | CWBackPixmap;
-}
-
-void gnu::gcj::xlib::WindowAttributes::setEventMask(jlong eventMask)
-{
-  XSetWindowAttributes* attributes = (XSetWindowAttributes*) out;
-
-  attributes->event_mask = eventMask;
-  mask = mask | CWEventMask;
-}
-
-gnu::gcj::xlib::Visual* gnu::gcj::xlib::WindowAttributes::getVisual()
-{
-  if (in == 0)
-    return 0;
-
-  XWindowAttributes* attributesIn = (XWindowAttributes*) in;
-
-  gnu::gcj::RawData* screenRef =
-    reinterpret_cast<gnu::gcj::RawData*>(attributesIn->screen);
-
-  Screen* screen = new Screen(display, screenRef);
-
-  gnu::gcj::RawData* visualRef =
-    reinterpret_cast<gnu::gcj::RawData*>(attributesIn->visual);
-
-  return new gnu::gcj::xlib::Visual(visualRef, screen, attributesIn->depth);
-}
-
-
-void gnu::gcj::xlib::WindowAttributes::apply(Window* window)
-{
-  ::Display* dpy = (::Display*) window->getDisplay()->display;
-  ::Window win = window->getXID();
-  XSetWindowAttributes* attributes = (XSetWindowAttributes*) out;
-  
-  XChangeWindowAttributes(dpy, win, mask, attributes);
-}
-
diff --git a/libjava/gnu/gcj/xlib/natXAnyEvent.cc b/libjava/gnu/gcj/xlib/natXAnyEvent.cc
deleted file mode 100644
index 0bef563..0000000
--- a/libjava/gnu/gcj/xlib/natXAnyEvent.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/javaprims.h>
-#include <jvm.h>
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <java/lang/RuntimeException.h>
-
-#include <java/lang/System.h>
-#include <java/io/PrintStream.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/XAnyEvent.h>
-#include <gnu/gcj/xlib/XExposeEvent.h>
-#include <gnu/gcj/xlib/XException.h>
-
-#include <unistd.h>
-#include <posix.h>
-
-void gnu::gcj::xlib::XAnyEvent::init()
-{
-  ::XEvent* event = new ::XEvent;
-  int *pipes = new int[2];
-  pipe(pipes);
-  structure = reinterpret_cast<gnu::gcj::RawData*>(event);
-  pipefds = reinterpret_cast<gnu::gcj::RawData*>(pipes);
-}
-
-void gnu::gcj::xlib::XAnyEvent::finalize()
-{
-  delete structure;
-  int *pipe = reinterpret_cast<int *>(pipefds);
-  close(pipe[0]);
-  close(pipe[1]);
-  delete [] pipefds;
-  pipefds = 0;
-  structure = 0;
-}
-
-jboolean gnu::gcj::xlib::XAnyEvent::loadNext(jboolean block)
-{
-  ::Display* dpy = (::Display*) display->display;
-  ::XEvent* evt = (::XEvent*) structure;
-
-  if (XPending(dpy))
-    {
-      XNextEvent(dpy, evt);
-      return true;  
-    }
-
-  if (!block)
-    return false;
-
-  int *pipe = reinterpret_cast<int *>(pipefds);
-  int xfd = XConnectionNumber(dpy);
-  int pipefd = pipe[0];
-  int n = (xfd > pipefd ? xfd : pipefd) + 1;
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  FD_SET(xfd, &rfds);
-  FD_SET(pipefd, &rfds);  
-  int sel = _Jv_select (n, &rfds, NULL, NULL, NULL);
-  if (sel > 0)
-    {
-      if (FD_ISSET(xfd, &rfds))
-	{
-	  XNextEvent(dpy, evt);
-	  return true;  
-	}
-      if (FD_ISSET(pipefd, &rfds))
-	{
-	  char c;
-	  read(pipefd, &c, 1);
-	}
-    }
-  return false;
-}
-
-void gnu::gcj::xlib::XAnyEvent::interrupt()
-{
-  int *pipe = reinterpret_cast<int *>(pipefds);
-  write(pipe[1], "W", 1);
-}
-
-jint gnu::gcj::xlib::XAnyEvent::getType()
-{
-  ::XEvent* event = (::XEvent*) structure;
-  return event->type;
-}
-
-void gnu::gcj::xlib::XAnyEvent::setType(jint type)
-{
-  ::XEvent* event = (::XEvent*) structure;
-  event->type = type;
-}
-
-gnu::gcj::xlib::Window* gnu::gcj::xlib::XAnyEvent::getWindow()
-{
-  ::XEvent* event = (::XEvent*) structure;
-  return display->getWindow(event->xany.window);
-}
-
-void gnu::gcj::xlib::XAnyEvent::setWindow(gnu::gcj::xlib::Window* window)
-{
-  ::XEvent* event = (::XEvent*) structure;
-  event->xany.window = window->getXID();
-}
-
-jlong gnu::gcj::xlib::XAnyEvent::getSerial()
-{
-  ::XEvent* event = (::XEvent*) structure;
-  return event->xany.serial;
-}
-
-void gnu::gcj::xlib::XAnyEvent::send(gnu::gcj::xlib::Window* destination,
-				     jboolean propagate, jlong mask)
-{
-  ::Display* dpy = (::Display*) display->display;
-  ::XEvent* event = (::XEvent*) structure;
-
-  Status status = 
-    XSendEvent(dpy, destination->getXID(), propagate ? True : False,
-	       mask, event);
-
-  switch (status)
-    {
-    case 0:
-      throw new XException(JvNewStringLatin1("conversion to wire "
-					     "protocol failed"));
-    case BadWindow:
-    case BadValue:
-      throw new XException(display, status);
-
-    default:
-      /* All other return values indicate success.  Ie. (status ==
-	 1) indicates success, not BadRequest. */
-      ; // NOP
-    }
-}
diff --git a/libjava/gnu/gcj/xlib/natXButtonEvent.cc b/libjava/gnu/gcj/xlib/natXButtonEvent.cc
deleted file mode 100644
index fa02df8..0000000
--- a/libjava/gnu/gcj/xlib/natXButtonEvent.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/XAnyEvent.h>
-#include <gnu/gcj/xlib/XEvent.h>
-#include <gnu/gcj/xlib/XButtonEvent.h>
-
-void gnu::gcj::xlib::XButtonEvent::init()
-{
-  ::XButtonEvent* evt = (::XButtonEvent*) event->structure;
-  
-  time = evt->time;
-  x = evt->x;
-  y = evt->y;
-  state = evt->state;
-  button = evt->button;
-}
-
diff --git a/libjava/gnu/gcj/xlib/natXColor.cc b/libjava/gnu/gcj/xlib/natXColor.cc
deleted file mode 100644
index 4e76cf9..0000000
--- a/libjava/gnu/gcj/xlib/natXColor.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-#include <gnu/gcj/xlib/XColor.h>
-
-void gnu::gcj::xlib::XColor::init()
-{
-  structure = reinterpret_cast<gnu::gcj::RawData*>(new ::XColor);
-}
-
-void gnu::gcj::xlib::XColor::finalize()
-{
-  delete structure;
-}
-
-void gnu::gcj::xlib::XColor::setRGB(jint r, jint g, jint b)
-{
-  ::XColor* color = (::XColor*) structure;
-  color->red   = r;
-  color->green = g;
-  color->blue  = b;
-}
-
-jint gnu::gcj::xlib::XColor::getRed()
-{
-  ::XColor* color = (::XColor*) structure;
-  return color->red;
-}
-
-jint gnu::gcj::xlib::XColor::getGreen()
-{
-  ::XColor* color = (::XColor*) structure;
-  return color->green;
-}
-
-jint gnu::gcj::xlib::XColor::getBlue()
-{
-  ::XColor* color = (::XColor*) structure;
-  return color->blue;
-}
-
-jbyte gnu::gcj::xlib::XColor::getFlags()
-{
-  ::XColor* color = (::XColor*) structure;
-  return color->flags;
-}
-
-jlong gnu::gcj::xlib::XColor::getPixelValue()
-{
-  ::XColor* color = (::XColor*) structure;
-  return color->pixel;
-}
diff --git a/libjava/gnu/gcj/xlib/natXConfigureEvent.cc b/libjava/gnu/gcj/xlib/natXConfigureEvent.cc
deleted file mode 100644
index a65c0b3..0000000
--- a/libjava/gnu/gcj/xlib/natXConfigureEvent.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/XAnyEvent.h>
-#include <gnu/gcj/xlib/XEvent.h>
-#include <gnu/gcj/xlib/XConfigureEvent.h>
-#include <java/awt/Rectangle.h>
-
-using java::awt::Rectangle;
-
-java::awt::Rectangle* gnu::gcj::xlib::XConfigureEvent::getBounds()
-{
-  ::XConfigureEvent* evt = (::XConfigureEvent*) event->structure;
-  Rectangle* rectangle = new Rectangle(evt->x, evt->y,
-				       evt->width, evt->height);
-					 
-  return rectangle;
-}
-
diff --git a/libjava/gnu/gcj/xlib/natXException.cc b/libjava/gnu/gcj/xlib/natXException.cc
deleted file mode 100644
index 4bf7197..0000000
--- a/libjava/gnu/gcj/xlib/natXException.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/XException.h>
-
-jstring gnu::gcj::xlib::XException::toString(Display* display, jint status)
-{
-  ::Display* dpy = (::Display*) (display->display);
-  
-  const int ERROR_TEXT_LENGTH = 256;
-  char errorText[ERROR_TEXT_LENGTH];
-  
-  XGetErrorText(dpy, status, errorText, ERROR_TEXT_LENGTH);
-  return JvNewStringLatin1(errorText);
-}
diff --git a/libjava/gnu/gcj/xlib/natXExposeEvent.cc b/libjava/gnu/gcj/xlib/natXExposeEvent.cc
deleted file mode 100644
index 6dad170..0000000
--- a/libjava/gnu/gcj/xlib/natXExposeEvent.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/XAnyEvent.h>
-#include <gnu/gcj/xlib/XEvent.h>
-#include <gnu/gcj/xlib/XExposeEvent.h>
-#include <java/awt/Rectangle.h>
-
-using java::awt::Rectangle;
-
-java::awt::Rectangle* gnu::gcj::xlib::XExposeEvent::getBounds()
-{
-  ::XExposeEvent* evt = (::XExposeEvent*) event->structure;
-  Rectangle* rectangle = new Rectangle(evt->x, evt->y,
-				       evt->width, evt->height);
-					 
-  return rectangle;
-}
-
diff --git a/libjava/gnu/gcj/xlib/natXImage.cc b/libjava/gnu/gcj/xlib/natXImage.cc
deleted file mode 100644
index 8102222..0000000
--- a/libjava/gnu/gcj/xlib/natXImage.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <java/lang/OutOfMemoryError.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Screen.h>
-#include <gnu/gcj/xlib/Visual.h>
-#include <gnu/gcj/xlib/XImage.h>
-#include <java/lang/System.h>
-#include <java/io/PrintStream.h>
-
-void gnu::gcj::xlib::XImage::init(Visual* visual, jint depth,
-				  jint format, jint xoffset,
-				  jint width, jint height,
-				  jint bitmapPad, jint bytesPerLine,
-				  jint bitsPerPixel)
-{
-  ::Display* dpy = (::Display*) visual->display->display;
-  ::Visual* vis = (::Visual*) visual->getVisualStructure();
-
-  char* data = 0; // no preallocated data
-  ::XImage* ximage = XCreateImage(dpy, vis, depth, format, xoffset,
-				  data,
-				  width, height, 
-				  bitmapPad,
-				  bytesPerLine
-				  );
-  if (ximage == 0)
-    {
-      jstring errorMessage = JvNewStringLatin1("XCreateImage failed");
-      throw new ::java::lang::OutOfMemoryError(errorMessage);
-    }
-    
-  bool reinitialize = false;
-    
-  if ((bitsPerPixel != 0) && (ximage->bits_per_pixel != bitsPerPixel))
-    {
-      ximage->bits_per_pixel = bitsPerPixel;
-      reinitialize = true;
-    }
-    
-  // FIXME: make autoconf test?
-  jshort endianTestShort[] = { 1 };
-  jbyte* endianTestByte = reinterpret_cast<jbyte*>(endianTestShort);
-    
-  jint byteOrder;
-  if (endianTestByte[0] == 1)
-    {
-      // little endian machine
-      byteOrder = LEAST_SIGNIFICANT_B_FIRST_ORDER;
-    }
-  else
-    {
-      // big endian machine
-      byteOrder = MOST_SIGNIFICANT_B_FIRST_ORDER;
-    }
-  /* NB: This doesn't consider those weird machines out there with
-     middle-endian byte order. */
-    
-  if (byteOrder != ximage->byte_order)
-    {
-      ximage->byte_order = byteOrder;
-      reinitialize = true;
-    }
-    
-  if (reinitialize)
-    XInitImage(ximage);
-    
-  structure = reinterpret_cast<gnu::gcj::RawData*>(ximage);
-  // Notice that no image data has been allocated at this point
-}
-
-void gnu::gcj::xlib::XImage::init(Visual* visual, 
-				  jint width,
-				  jint height)
-{
-  int depth = visual->getDepth();
-    
-  int format = ZPixmap; // Chunky, not planar.
-  int offset = 0;
-  int bitmapPad = 32; // FIXME, don't hardcode this
-  int bytesPerLine = 0; // Let the server figure it out
-
-  init(visual, depth, format, offset, width, height, bitmapPad,
-       bytesPerLine, 0);
-}
-
-void gnu::gcj::xlib::XImage::internalSetData(jbyteArray data, jint offset)
-{
-  ::XImage* ximage = (::XImage*) structure;
-  ximage->data = reinterpret_cast<char*>(elements(data)+offset);
-}
-
-void gnu::gcj::xlib::XImage::internalSetData(jshortArray data, jint offset)
-{
-  ::XImage* ximage = (::XImage*) structure;
-  ximage->data = reinterpret_cast<char*>(elements(data)+offset);
-}
-
-void gnu::gcj::xlib::XImage::internalSetData(jintArray data, jint offset)
-{
-  ::XImage* ximage = (::XImage*) structure;
-  ximage->data = reinterpret_cast<char*>(elements(data)+offset);
-}
-
-void gnu::gcj::xlib::XImage::finalize()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  if (ownsData)
-    delete ximage->data;
-  
-  ximage->data = 0; // Never allow XLib to free the data allocation.
-  dataRef = 0;
-  XDestroyImage(ximage);
-}
-
-jint gnu::gcj::xlib::XImage::getWidth()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->width;
-}
-
-jint gnu::gcj::xlib::XImage::getHeight()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->height;
-}
-
-jint gnu::gcj::xlib::XImage::getDepth()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->depth;
-}
-
-jint gnu::gcj::xlib::XImage::getFormat()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->format;
-}
-
-jint gnu::gcj::xlib::XImage::getXOffset()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->xoffset;
-}
-
-jint gnu::gcj::xlib::XImage::getImageByteOrder()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->byte_order;
-}
-
-jint gnu::gcj::xlib::XImage::getBitmapBitOrder()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->bitmap_bit_order;
-}
-
-jint gnu::gcj::xlib::XImage::getBitmapUnit()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->bitmap_unit;
-}
-
-jint gnu::gcj::xlib::XImage::getBitmapPad()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->bitmap_pad;
-}
-
-jint gnu::gcj::xlib::XImage::getBytesPerLine()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->bytes_per_line;
-}
-
-jint gnu::gcj::xlib::XImage::getBitsPerPixel()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->bits_per_pixel;
-}
-
-
-// True/Direct Color specific:
-
-jint gnu::gcj::xlib::XImage::getRedMask()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->red_mask;
-}
-
-jint gnu::gcj::xlib::XImage::getGreenMask()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->green_mask;
-}
-
-jint gnu::gcj::xlib::XImage::getBlueMask()
-{
-  ::XImage* ximage = (::XImage*) structure;
-  return ximage->blue_mask;
-}
-
-void gnu::gcj::xlib::XImage::setPixel(jint x, jint y, jint pixel)
-{
-  ::XImage* ximage = (::XImage*) structure;
-  XPutPixel(ximage, x, y, pixel);
-}
diff --git a/libjava/gnu/gcj/xlib/natXUnmapEvent.cc b/libjava/gnu/gcj/xlib/natXUnmapEvent.cc
deleted file mode 100644
index d91a778..0000000
--- a/libjava/gnu/gcj/xlib/natXUnmapEvent.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2000  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <X11/Xlib.h>
-
-#include <gcj/cni.h>
-#include <gnu/gcj/RawData.h>
-
-#include <gnu/gcj/xlib/Display.h>
-#include <gnu/gcj/xlib/Window.h>
-#include <gnu/gcj/xlib/XAnyEvent.h>
-#include <gnu/gcj/xlib/XEvent.h>
-#include <gnu/gcj/xlib/XUnmapEvent.h>
-
-void gnu::gcj::xlib::XUnmapEvent::setUnmappedWindow(gnu::gcj::xlib::Window*
-						    unmappedWindow)
-{
-  ::XUnmapEvent* evt = (::XUnmapEvent*) event->structure;
-  evt->window = unmappedWindow->getXID();
-}
-
-void gnu::gcj::xlib::XUnmapEvent::setFromConfigure(jboolean fromConfigure)
-{
-  ::XUnmapEvent* evt = (::XUnmapEvent*) event->structure;
-  evt->from_configure = fromConfigure ? True : False;
-}
-
diff --git a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h b/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h
deleted file mode 100644
index 27344b5..0000000
--- a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
-#define __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities$VisibleComponentList;
-          class AWTUtilities$VisibleComponentList$VisibleComponentIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities$VisibleComponentList$VisibleComponentIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTUtilities$VisibleComponentList$VisibleComponentIterator(::gnu::java::awt::AWTUtilities$VisibleComponentList *, jint);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasPrevious();
-  virtual ::java::lang::Object * previous();
-  virtual jint nextIndex();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void set(::java::lang::Object *);
-  virtual void add(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint listIndex;
-  ::gnu::java::awt::AWTUtilities$VisibleComponentList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities$VisibleComponentList$VisibleComponentIterator__
diff --git a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h b/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h
deleted file mode 100644
index 53a5eb3..0000000
--- a/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities$VisibleComponentList__
-#define __gnu_java_awt_AWTUtilities$VisibleComponentList__
-
-#pragma interface
-
-#include <java/util/AbstractSequentialList.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities$VisibleComponentList;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities$VisibleComponentList : public ::java::util::AbstractSequentialList
-{
-
-public: // actually package-private
-  AWTUtilities$VisibleComponentList(JArray< ::java::awt::Component * > *);
-public:
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual jint size();
-public: // actually package-private
-  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::util::AbstractSequentialList)))) components;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities$VisibleComponentList__
diff --git a/libjava/gnu/java/awt/AWTUtilities.h b/libjava/gnu/java/awt/AWTUtilities.h
deleted file mode 100644
index 70b5111..0000000
--- a/libjava/gnu/java/awt/AWTUtilities.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_AWTUtilities__
-#define __gnu_java_awt_AWTUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class AWTUtilities;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Font;
-        class FontMetrics;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Window;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::AWTUtilities : public ::java::lang::Object
-{
-
-public:
-  AWTUtilities();
-  static ::java::util::List * getVisibleChildren(::java::awt::Container *);
-  static ::java::awt::Rectangle * calculateInsetArea(::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *);
-  static ::java::awt::Rectangle * getLocalBounds(::java::awt::Component *);
-  static ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  static ::java::awt::Container * getAncestorNamed(::java::lang::String *, ::java::awt::Component *);
-  static ::java::awt::Container * getAncestorOfClass(::java::lang::Class *, ::java::awt::Component *);
-  static ::java::awt::Window * windowForComponent(::java::awt::Component *);
-  static ::java::awt::Component * getRoot(::java::awt::Component *);
-  static jboolean isDescendingFrom(::java::awt::Component *, ::java::awt::Component *);
-  static ::java::awt::Component * getDeepestComponentAt(::java::awt::Component *, jint, jint);
-  static void convertPointToScreen(::java::awt::Point *, ::java::awt::Component *);
-  static void convertPointFromScreen(::java::awt::Point *, ::java::awt::Component *);
-  static ::java::awt::Point * convertPoint(::java::awt::Component *, jint, jint, ::java::awt::Component *);
-  static ::java::awt::Rectangle * convertRectangle(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
-  static ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::Component *, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
-  static void invokeLater(::java::lang::Runnable *);
-  static void invokeAndWait(::java::lang::Runnable *);
-  static jboolean isEventDispatchThread();
-  static jboolean isValidKey(jint);
-public: // actually package-private
-  static ::java::util::WeakHashMap * visibleChildrenCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_AWTUtilities__
diff --git a/libjava/gnu/java/awt/BitMaskExtent.h b/libjava/gnu/java/awt/BitMaskExtent.h
deleted file mode 100644
index 5d3fd63..0000000
--- a/libjava/gnu/java/awt/BitMaskExtent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitMaskExtent__
-#define __gnu_java_awt_BitMaskExtent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitMaskExtent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitMaskExtent : public ::java::lang::Object
-{
-
-public:
-  BitMaskExtent();
-  void setMask(jlong);
-  jlong toMask();
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) leastSignificantBit;
-  jbyte bitWidth;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitMaskExtent__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h b/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h
deleted file mode 100644
index d67d140..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite$GeneralContext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite$GeneralContext__
-#define __gnu_java_awt_BitwiseXORComposite$GeneralContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite$GeneralContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite$GeneralContext : public ::java::lang::Object
-{
-
-public:
-  BitwiseXORComposite$GeneralContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::Color *);
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual void dispose();
-public: // actually package-private
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) srcColorModel;
-  ::java::awt::image::ColorModel * dstColorModel;
-  ::java::awt::Color * xorColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite$GeneralContext__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h b/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h
deleted file mode 100644
index 25d67e7..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite$IntContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite$IntContext__
-#define __gnu_java_awt_BitwiseXORComposite$IntContext__
-
-#pragma interface
-
-#include <gnu/java/awt/BitwiseXORComposite$GeneralContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite$IntContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite$IntContext : public ::gnu::java::awt::BitwiseXORComposite$GeneralContext
-{
-
-public:
-  BitwiseXORComposite$IntContext(::java::awt::image::ColorModel *, ::java::awt::Color *);
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  static jboolean isSupported(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite$IntContext__
diff --git a/libjava/gnu/java/awt/BitwiseXORComposite.h b/libjava/gnu/java/awt/BitwiseXORComposite.h
deleted file mode 100644
index 2dd89d6..0000000
--- a/libjava/gnu/java/awt/BitwiseXORComposite.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_BitwiseXORComposite__
-#define __gnu_java_awt_BitwiseXORComposite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class BitwiseXORComposite;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::BitwiseXORComposite : public ::java::lang::Object
-{
-
-public:
-  BitwiseXORComposite(::java::awt::Color *);
-  virtual ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xorColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_BitwiseXORComposite__
diff --git a/libjava/gnu/java/awt/Buffers.h b/libjava/gnu/java/awt/Buffers.h
deleted file mode 100644
index 9456b13..0000000
--- a/libjava/gnu/java/awt/Buffers.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_Buffers__
-#define __gnu_java_awt_Buffers__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class Buffers;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::Buffers : public ::java::lang::Object
-{
-
-public:
-  Buffers();
-  static ::java::awt::image::DataBuffer * createBuffer(jint, ::java::lang::Object *, jint);
-  static ::java::awt::image::DataBuffer * createBuffer(jint, jint);
-  static ::java::awt::image::DataBuffer * createBuffer(jint, jint, jint);
-  static ::java::awt::image::DataBuffer * createBufferFromData(jint, ::java::lang::Object *, jint);
-  static ::java::lang::Object * getData(::java::awt::image::DataBuffer *);
-  static ::java::lang::Object * getData(::java::awt::image::DataBuffer *, jint, ::java::lang::Object *, jint, jint);
-  static jint smallestAppropriateTransferType(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_Buffers__
diff --git a/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h b/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
deleted file mode 100644
index 4f3c2ab..0000000
--- a/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ClasspathGraphicsEnvironment__
-#define __gnu_java_awt_ClasspathGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathGraphicsEnvironment;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ClasspathGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  ClasspathGraphicsEnvironment();
-  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ClasspathGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/ClasspathToolkit.h b/libjava/gnu/java/awt/ClasspathToolkit.h
deleted file mode 100644
index 565b924..0000000
--- a/libjava/gnu/java/awt/ClasspathToolkit.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ClasspathToolkit__
-#define __gnu_java_awt_ClasspathToolkit__
-
-#pragma interface
-
-#include <java/awt/Toolkit.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathToolkit;
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop;
-        class Font;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-      namespace peer
-      {
-          class DesktopPeer;
-          class RobotPeer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ClasspathToolkit : public ::java::awt::Toolkit
-{
-
-public:
-  ClasspathToolkit();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment() = 0;
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::awt::Font * getFont(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *) = 0;
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *) = 0;
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *) = 0;
-  virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
-  virtual jint getMouseNumberOfButtons();
-public: // actually protected
-  virtual ::java::awt::peer::DesktopPeer * createDesktopPeer(::java::awt::Desktop *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ClasspathToolkit__
diff --git a/libjava/gnu/java/awt/ComponentDataBlitOp.h b/libjava/gnu/java/awt/ComponentDataBlitOp.h
deleted file mode 100644
index 0db1e05..0000000
--- a/libjava/gnu/java/awt/ComponentDataBlitOp.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ComponentDataBlitOp__
-#define __gnu_java_awt_ComponentDataBlitOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ComponentDataBlitOp;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::ComponentDataBlitOp : public ::java::lang::Object
-{
-
-public:
-  ComponentDataBlitOp();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  static ::gnu::java::awt::ComponentDataBlitOp * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ComponentDataBlitOp__
diff --git a/libjava/gnu/java/awt/ComponentReshapeEvent.h b/libjava/gnu/java/awt/ComponentReshapeEvent.h
deleted file mode 100644
index bfd6f83..0000000
--- a/libjava/gnu/java/awt/ComponentReshapeEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_ComponentReshapeEvent__
-#define __gnu_java_awt_ComponentReshapeEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ComponentReshapeEvent;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::ComponentReshapeEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ComponentReshapeEvent(::java::awt::Component *, jint, jint, jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) x;
-  jint y;
-  jint width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_ComponentReshapeEvent__
diff --git a/libjava/gnu/java/awt/EmbeddedWindow.h b/libjava/gnu/java/awt/EmbeddedWindow.h
deleted file mode 100644
index 5a251bf..0000000
--- a/libjava/gnu/java/awt/EmbeddedWindow.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_EmbeddedWindow__
-#define __gnu_java_awt_EmbeddedWindow__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::EmbeddedWindow : public ::java::awt::Frame
-{
-
-public:
-  EmbeddedWindow();
-  EmbeddedWindow(jlong);
-  virtual void addNotify();
-  virtual void setHandle(jlong);
-  virtual jlong getHandle();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Frame)))) handle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_EmbeddedWindow__
diff --git a/libjava/gnu/java/awt/EventModifier.h b/libjava/gnu/java/awt/EventModifier.h
deleted file mode 100644
index b6c2193..0000000
--- a/libjava/gnu/java/awt/EventModifier.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_EventModifier__
-#define __gnu_java_awt_EventModifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EventModifier;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::EventModifier : public ::java::lang::Object
-{
-
-  EventModifier();
-public:
-  static jint extend(jint);
-  static jint revert(jint);
-  static const jint OLD_MASK = 63;
-  static const jint NEW_MASK = 16320;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_EventModifier__
diff --git a/libjava/gnu/java/awt/GradientPaintContext.h b/libjava/gnu/java/awt/GradientPaintContext.h
deleted file mode 100644
index a3aacbb..0000000
--- a/libjava/gnu/java/awt/GradientPaintContext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_GradientPaintContext__
-#define __gnu_java_awt_GradientPaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class GradientPaintContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::GradientPaintContext : public ::java::lang::Object
-{
-
-public:
-  GradientPaintContext(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *, jboolean);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-  virtual void dispose();
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) x1;
-  jfloat y1;
-  ::java::awt::Color * c1;
-  jfloat x2;
-  jfloat y2;
-  ::java::awt::Color * c2;
-  jboolean cyclic;
-  jdouble length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_GradientPaintContext__
diff --git a/libjava/gnu/java/awt/LowPriorityEvent.h b/libjava/gnu/java/awt/LowPriorityEvent.h
deleted file mode 100644
index edec534..0000000
--- a/libjava/gnu/java/awt/LowPriorityEvent.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_LowPriorityEvent__
-#define __gnu_java_awt_LowPriorityEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class LowPriorityEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::LowPriorityEvent : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_LowPriorityEvent__
diff --git a/libjava/gnu/java/awt/color/CieXyzConverter.h b/libjava/gnu/java/awt/color/CieXyzConverter.h
deleted file mode 100644
index 9541963..0000000
--- a/libjava/gnu/java/awt/color/CieXyzConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_CieXyzConverter__
-#define __gnu_java_awt_color_CieXyzConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class CieXyzConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::CieXyzConverter : public ::java::lang::Object
-{
-
-public:
-  CieXyzConverter();
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_CieXyzConverter__
diff --git a/libjava/gnu/java/awt/color/ClutProfileConverter.h b/libjava/gnu/java/awt/color/ClutProfileConverter.h
deleted file mode 100644
index 0b8ba5c..0000000
--- a/libjava/gnu/java/awt/color/ClutProfileConverter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ClutProfileConverter__
-#define __gnu_java_awt_color_ClutProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ClutProfileConverter;
-            class ColorLookUpTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ClutProfileConverter : public ::java::lang::Object
-{
-
-public:
-  ClutProfileConverter(::java::awt::color::ICC_Profile *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-private:
-  ::gnu::java::awt::color::ColorLookUpTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-  jint nChannels;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ClutProfileConverter__
diff --git a/libjava/gnu/java/awt/color/ColorLookUpTable.h b/libjava/gnu/java/awt/color/ColorLookUpTable.h
deleted file mode 100644
index b61fc84..0000000
--- a/libjava/gnu/java/awt/color/ColorLookUpTable.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ColorLookUpTable__
-#define __gnu_java_awt_color_ColorLookUpTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ColorLookUpTable : public ::java::lang::Object
-{
-
-public:
-  ColorLookUpTable(::java::awt::color::ICC_Profile *, jint);
-private:
-  void readClut16(JArray< jbyte > *);
-  void readClut8(JArray< jbyte > *);
-public: // actually package-private
-  virtual JArray< jfloat > * lookup(JArray< jfloat > *);
-private:
-  JArray< jfloat > * LabtoXYZ(JArray< jfloat > *);
-  JArray< jfloat > * XYZtoLab(JArray< jfloat > *);
-  static JArray< jfloat > * D50;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nIn;
-  jint nOut;
-  jint nInTableEntries;
-  jint nOutTableEntries;
-  jint gridpoints;
-  jint nClut;
-  JArray< JArray< jdouble > * > * inTable;
-  JArray< JArray< jshort > * > * outTable;
-  JArray< jdouble > * clut;
-  JArray< JArray< jfloat > * > * inMatrix;
-  jboolean useMatrix;
-  JArray< jint > * multiplier;
-  JArray< jint > * offsets;
-  jboolean inputLab;
-  jboolean outputLab;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ColorLookUpTable__
diff --git a/libjava/gnu/java/awt/color/ColorSpaceConverter.h b/libjava/gnu/java/awt/color/ColorSpaceConverter.h
deleted file mode 100644
index cc3b19f..0000000
--- a/libjava/gnu/java/awt/color/ColorSpaceConverter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ColorSpaceConverter__
-#define __gnu_java_awt_color_ColorSpaceConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorSpaceConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ColorSpaceConverter : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_color_ColorSpaceConverter__
diff --git a/libjava/gnu/java/awt/color/GrayProfileConverter.h b/libjava/gnu/java/awt/color/GrayProfileConverter.h
deleted file mode 100644
index b79d2b7..0000000
--- a/libjava/gnu/java/awt/color/GrayProfileConverter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_GrayProfileConverter__
-#define __gnu_java_awt_color_GrayProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-            class GrayProfileConverter;
-            class GrayScaleConverter;
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileGray;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::GrayProfileConverter : public ::java::lang::Object
-{
-
-public:
-  GrayProfileConverter(::java::awt::color::ICC_ProfileGray *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-private:
-  ::gnu::java::awt::color::GrayScaleConverter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gc;
-  ::gnu::java::awt::color::ToneReproductionCurve * trc;
-  ::gnu::java::awt::color::ColorLookUpTable * toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_GrayProfileConverter__
diff --git a/libjava/gnu/java/awt/color/GrayScaleConverter.h b/libjava/gnu/java/awt/color/GrayScaleConverter.h
deleted file mode 100644
index bcd8d26..0000000
--- a/libjava/gnu/java/awt/color/GrayScaleConverter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_GrayScaleConverter__
-#define __gnu_java_awt_color_GrayScaleConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class GrayScaleConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::GrayScaleConverter : public ::java::lang::Object
-{
-
-public:
-  GrayScaleConverter();
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-public: // actually package-private
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) coeff;
-private:
-  static JArray< jfloat > * D50;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_GrayScaleConverter__
diff --git a/libjava/gnu/java/awt/color/LinearRGBConverter.h b/libjava/gnu/java/awt/color/LinearRGBConverter.h
deleted file mode 100644
index bff63b7..0000000
--- a/libjava/gnu/java/awt/color/LinearRGBConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_LinearRGBConverter__
-#define __gnu_java_awt_color_LinearRGBConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class LinearRGBConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::LinearRGBConverter : public ::java::lang::Object
-{
-
-public:
-  LinearRGBConverter();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_LinearRGBConverter__
diff --git a/libjava/gnu/java/awt/color/ProfileHeader.h b/libjava/gnu/java/awt/color/ProfileHeader.h
deleted file mode 100644
index 744dc78..0000000
--- a/libjava/gnu/java/awt/color/ProfileHeader.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ProfileHeader__
-#define __gnu_java_awt_color_ProfileHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ProfileHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ProfileHeader : public ::java::lang::Object
-{
-
-public:
-  ProfileHeader();
-  ProfileHeader(JArray< jbyte > *);
-  virtual void verifyHeader(jint);
-  virtual JArray< jbyte > * getData(jint);
-  virtual jint getSize();
-  virtual void setSize(jint);
-  virtual jint getMajorVersion();
-  virtual jint getMinorVersion();
-  virtual jint getProfileClass();
-  virtual void setProfileClass(jint);
-  virtual jint getColorSpace();
-  virtual jint getProfileColorSpace();
-  virtual void setColorSpace(jint);
-  virtual void setProfileColorSpace(jint);
-private:
-  static const jint icMagicNumber = 1633907568;
-  static JArray< jint > * csTypeMap;
-public:
-  static const jint HEADERSIZE = 128;
-private:
-  static JArray< jint > * classMap;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-  jint cmmId;
-  jint majorVersion;
-  jint minorVersion;
-  jint profileClass;
-  jint colorSpace;
-  jint profileColorSpace;
-  JArray< jbyte > * timestamp;
-  jint platform;
-  jint flags;
-  jint magic;
-  jint manufacturerSig;
-  jint modelSig;
-  JArray< jbyte > * attributes;
-  jint intent;
-  JArray< jbyte > * illuminant;
-  jint creatorSig;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ProfileHeader__
diff --git a/libjava/gnu/java/awt/color/PyccConverter.h b/libjava/gnu/java/awt/color/PyccConverter.h
deleted file mode 100644
index ef9caeb..0000000
--- a/libjava/gnu/java/awt/color/PyccConverter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_PyccConverter__
-#define __gnu_java_awt_color_PyccConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class PyccConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::PyccConverter : public ::java::lang::Object
-{
-
-public:
-  PyccConverter();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_PyccConverter__
diff --git a/libjava/gnu/java/awt/color/RgbProfileConverter.h b/libjava/gnu/java/awt/color/RgbProfileConverter.h
deleted file mode 100644
index 2998894..0000000
--- a/libjava/gnu/java/awt/color/RgbProfileConverter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_RgbProfileConverter__
-#define __gnu_java_awt_color_RgbProfileConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorLookUpTable;
-            class RgbProfileConverter;
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileRGB;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::RgbProfileConverter : public ::java::lang::Object
-{
-
-public:
-  RgbProfileConverter(::java::awt::color::ICC_ProfileRGB *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-private:
-  JArray< JArray< jfloat > * > * invertMatrix(JArray< JArray< jfloat > * > *);
-  JArray< JArray< jfloat > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) matrix;
-  JArray< JArray< jfloat > * > * inv_matrix;
-  ::gnu::java::awt::color::ToneReproductionCurve * rTRC;
-  ::gnu::java::awt::color::ToneReproductionCurve * gTRC;
-  ::gnu::java::awt::color::ToneReproductionCurve * bTRC;
-  ::gnu::java::awt::color::ColorLookUpTable * toPCS;
-  ::gnu::java::awt::color::ColorLookUpTable * fromPCS;
-  static JArray< jfloat > * D50;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_RgbProfileConverter__
diff --git a/libjava/gnu/java/awt/color/SrgbConverter.h b/libjava/gnu/java/awt/color/SrgbConverter.h
deleted file mode 100644
index 2debe68..0000000
--- a/libjava/gnu/java/awt/color/SrgbConverter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_SrgbConverter__
-#define __gnu_java_awt_color_SrgbConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class SrgbConverter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::SrgbConverter : public ::java::lang::Object
-{
-
-public:
-  SrgbConverter();
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  static JArray< jfloat > * XYZtoRGB(JArray< jfloat > *);
-  static JArray< jfloat > * RGBtoXYZ(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_SrgbConverter__
diff --git a/libjava/gnu/java/awt/color/TagEntry.h b/libjava/gnu/java/awt/color/TagEntry.h
deleted file mode 100644
index a464b32..0000000
--- a/libjava/gnu/java/awt/color/TagEntry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_TagEntry__
-#define __gnu_java_awt_color_TagEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class TagEntry;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::TagEntry : public ::java::lang::Object
-{
-
-public:
-  TagEntry(jint, jint, jint, JArray< jbyte > *);
-  TagEntry(jint, JArray< jbyte > *);
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::String * hashKey();
-  virtual ::java::lang::String * toString();
-  virtual jint getSignature();
-  virtual jint getSize();
-  virtual jint getOffset();
-  virtual void setOffset(jint);
-  static ::java::lang::String * tagHashKey(jint);
-  static const jint entrySize = 12;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) signature;
-  jint size;
-  jint offset;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_TagEntry__
diff --git a/libjava/gnu/java/awt/color/ToneReproductionCurve.h b/libjava/gnu/java/awt/color/ToneReproductionCurve.h
deleted file mode 100644
index 7c0edec..0000000
--- a/libjava/gnu/java/awt/color/ToneReproductionCurve.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_color_ToneReproductionCurve__
-#define __gnu_java_awt_color_ToneReproductionCurve__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ToneReproductionCurve;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::color::ToneReproductionCurve : public ::java::lang::Object
-{
-
-public:
-  ToneReproductionCurve(jfloat);
-  ToneReproductionCurve(JArray< jfloat > *);
-  ToneReproductionCurve(JArray< jshort > *);
-  virtual jfloat lookup(jfloat);
-  virtual jfloat reverseLookup(jfloat);
-  virtual void setupReverseTrc();
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trc;
-  jfloat gamma;
-  JArray< jfloat > * reverseTrc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_color_ToneReproductionCurve__
diff --git a/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h b/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h
deleted file mode 100644
index 13cf4aa..0000000
--- a/libjava/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
-#define __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
-
-#pragma interface
-
-#include <java/awt/dnd/MouseDragGestureRecognizer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-            class GtkMouseDragGestureRecognizer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragSource;
-      }
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::GtkMouseDragGestureRecognizer : public ::java::awt::dnd::MouseDragGestureRecognizer
-{
-
-public:
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  GtkMouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual void registerListeners();
-  virtual void unregisterListeners();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  jint getDropActionFromEvent(::java::awt::event::MouseEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_GtkMouseDragGestureRecognizer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h
deleted file mode 100644
index a53f916..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDragSourceContextPeer;
-                class GtkDropTargetContextPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragSourceContext;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDragSourceContextPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually package-private
-  virtual void nativeStartDrag(::java::awt::Image *, jint, jint, jint, ::java::lang::String *);
-  virtual void connectSignals(::java::awt::peer::ComponentPeer *);
-  virtual void create(::java::awt::peer::ComponentPeer *);
-  virtual void nativeSetCursor(jint);
-  virtual void setTarget(::gnu::java::awt::dnd::peer::gtk::GtkDropTargetContextPeer *);
-public:
-  GtkDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually package-private
-  virtual ::java::awt::peer::ComponentPeer * getComponentPeer(::java::awt::Component *);
-public:
-  virtual void startDrag(::java::awt::dnd::DragSourceContext *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void transferablesFlavorsChanged();
-  virtual void dragEnter(jint, jint);
-  virtual void dragExit(jint, jint, jint);
-  virtual void dragDropEnd(jint, jboolean, jint, jint);
-  virtual void dragMouseMoved(jint, jint);
-  virtual void dragOver(jint, jint);
-  virtual void dragActionChanged(jint, jint);
-private:
-  ::java::awt::peer::ComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) peer;
-  ::java::awt::Cursor * cursor;
-  ::java::awt::dnd::DragSourceContext * context;
-public:
-  static ::java::awt::Component * target;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h
deleted file mode 100644
index 2ddfeb5..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDropTargetContextPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDropTargetContextPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public:
-  GtkDropTargetContextPeer(::java::lang::Object *);
-  virtual void setTargetActions(jint);
-  virtual jint getTargetActions();
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual jboolean isTransferableJVMLocal();
-  virtual void acceptDrag(jint);
-  virtual void rejectDrag();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual void dropComplete(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDropTargetContextPeer__
diff --git a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h b/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h
deleted file mode 100644
index a5797f2..0000000
--- a/libjava/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
-#define __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace dnd
-        {
-          namespace peer
-          {
-            namespace gtk
-            {
-                class GtkDropTargetPeer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTarget;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::dnd::peer::gtk::GtkDropTargetPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public:
-  GtkDropTargetPeer();
-  virtual void addDropTarget(::java::awt::dnd::DropTarget *);
-  virtual void removeDropTarget(::java::awt::dnd::DropTarget *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_dnd_peer_gtk_GtkDropTargetPeer__
diff --git a/libjava/gnu/java/awt/font/FontDelegate.h b/libjava/gnu/java/awt/font/FontDelegate.h
deleted file mode 100644
index add9155..0000000
--- a/libjava/gnu/java/awt/font/FontDelegate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_FontDelegate__
-#define __gnu_java_awt_font_FontDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::FontDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getFullName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getFamilyName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getSubFamilyName(::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getPostScriptName() = 0;
-  virtual jint getNumGlyphs() = 0;
-  virtual jint getGlyphIndex(jint) = 0;
-  virtual jint getMissingGlyphCode() = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0;
-  virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint) = 0;
-  virtual ::java::lang::String * getGlyphName(jint) = 0;
-  virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  static const jint FLAG_FITTED = 1;
-  static const jint FLAG_NO_HINT_HORIZONTAL = 2;
-  static const jint FLAG_NO_HINT_VERTICAL = 4;
-  static const jint FLAG_NO_HINT_EDGE_POINTS = 8;
-  static const jint FLAG_NO_HINT_STRONG_POINTS = 16;
-  static const jint FLAG_NO_HINT_WEAK_POINTS = 32;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_FontDelegate__
diff --git a/libjava/gnu/java/awt/font/FontFactory.h b/libjava/gnu/java/awt/font/FontFactory.h
deleted file mode 100644
index 660ca22..0000000
--- a/libjava/gnu/java/awt/font/FontFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_FontFactory__
-#define __gnu_java_awt_font_FontFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class FontFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::FontFactory : public ::java::lang::Object
-{
-
-  FontFactory();
-public:
-  static JArray< ::gnu::java::awt::font::FontDelegate * > * createFonts(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_FontFactory__
diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h
deleted file mode 100644
index a3f54bf..0000000
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_GNUGlyphVector__
-#define __gnu_java_awt_font_GNUGlyphVector__
-
-#pragma interface
-
-#include <java/awt/font/GlyphVector.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class GNUGlyphVector;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::GNUGlyphVector : public ::java::awt::font::GlyphVector
-{
-
-public:
-  GNUGlyphVector(::gnu::java::awt::font::FontDelegate *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void performDefaultLayout();
-  virtual jint getNumGlyphs();
-  virtual jint getGlyphCode(jint);
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *);
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds();
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds();
-  virtual ::java::awt::Shape * getOutline();
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat);
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat, jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint, jint);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *);
-  virtual jint getLayoutFlags();
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *);
-private:
-  jfloat getAscent();
-  jfloat getDescent();
-public:
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint);
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint);
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint);
-  virtual jboolean equals(::java::awt::font::GlyphVector *);
-private:
-  void validate();
-  ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::java::awt::font::GlyphVector)))) fontDelegate;
-  ::java::awt::Font * font;
-  ::java::awt::font::FontRenderContext * renderContext;
-  JArray< jint > * glyphs;
-  jfloat fontSize;
-  ::java::awt::geom::AffineTransform * transform;
-  jboolean valid;
-  JArray< jfloat > * pos;
-  JArray< ::java::awt::geom::AffineTransform * > * transforms;
-  jint layoutFlags;
-  ::java::awt::Shape * cleanOutline;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_GNUGlyphVector__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
deleted file mode 100644
index 3f0b4d2..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
-#define __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class OpenTypeFontPeer;
-            class OpenTypeFontPeer$XFontMetrics;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer$XFontMetrics : public ::java::awt::FontMetrics
-{
-
-public: // actually package-private
-  OpenTypeFontPeer$XFontMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *);
-public:
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint stringWidth(::java::lang::String *);
-private:
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) cachedPoint;
-public: // actually package-private
-  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
deleted file mode 100644
index 1fec3c2..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
-#define __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
-
-#pragma interface
-
-#include <java/awt/font/LineMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class OpenTypeFontPeer;
-            class OpenTypeFontPeer$XLineMetrics;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer$XLineMetrics : public ::java::awt::font::LineMetrics
-{
-
-public: // actually package-private
-  OpenTypeFontPeer$XLineMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-public:
-  virtual jfloat getAscent();
-  virtual jint getBaselineIndex();
-  virtual JArray< jfloat > * getBaselineOffsets();
-  virtual jfloat getDescent();
-  virtual jfloat getHeight();
-  virtual jfloat getLeading();
-  virtual jint getNumChars();
-  virtual jfloat getStrikethroughOffset();
-  virtual jfloat getStrikethroughThickness();
-  virtual jfloat getUnderlineOffset();
-  virtual jfloat getUnderlineThickness();
-private:
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) font;
-  ::java::awt::font::GlyphVector * glyphVector;
-  ::java::awt::font::FontRenderContext * fontRenderContext;
-public: // actually package-private
-  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
deleted file mode 100644
index 6129982..0000000
--- a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_OpenTypeFontPeer__
-#define __gnu_java_awt_font_OpenTypeFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-            class OpenTypeFontPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::OpenTypeFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public:
-  OpenTypeFontPeer(::java::lang::String *, jint, jint);
-  OpenTypeFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  static ::java::lang::String * encodeFont(::java::lang::String *, ::java::util::Map *);
-public: // actually package-private
-  static ::java::lang::String * encodeFont(::java::lang::String *, jint);
-  static ::java::lang::String * validName(::java::lang::String *);
-public:
-  static JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-private:
-  static ::java::util::Set * getFontNames();
-  ::java::lang::String * mapFontToFilename(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::font::FontDelegate * access$0(::gnu::java::awt::font::OpenTypeFontPeer *);
-  static ::java::awt::geom::AffineTransform * access$1();
-private:
-  static ::java::util::Properties * fontProperties;
-  static ::java::util::Set * availableFontNames;
-  static ::java::util::Map * fontToFileMap;
-  static ::java::awt::geom::AffineTransform * IDENDITY;
-  ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) fontDelegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_OpenTypeFontPeer__
diff --git a/libjava/gnu/java/awt/font/autofit/AutoHinter.h b/libjava/gnu/java/awt/font/autofit/AutoHinter.h
deleted file mode 100644
index e11a394..0000000
--- a/libjava/gnu/java/awt/font/autofit/AutoHinter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_AutoHinter__
-#define __gnu_java_awt_font_autofit_AutoHinter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AutoHinter;
-              class GlyphHints;
-              class HintScaler;
-              class Latin;
-              class LatinMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::AutoHinter : public ::java::lang::Object
-{
-
-public:
-  AutoHinter();
-  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *);
-  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *);
-  virtual void setFlags(jint);
-public: // actually package-private
-  ::gnu::java::awt::font::autofit::Latin * __attribute__((aligned(__alignof__( ::java::lang::Object)))) latinScript;
-  ::gnu::java::awt::font::autofit::LatinMetrics * metrics;
-  ::gnu::java::awt::font::autofit::GlyphHints * hints;
-  ::gnu::java::awt::font::autofit::HintScaler * scaler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_AutoHinter__
diff --git a/libjava/gnu/java/awt/font/autofit/AxisHints.h b/libjava/gnu/java/awt/font/autofit/AxisHints.h
deleted file mode 100644
index 0d8b7ea..0000000
--- a/libjava/gnu/java/awt/font/autofit/AxisHints.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_AxisHints__
-#define __gnu_java_awt_font_autofit_AxisHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AxisHints;
-              class Edge;
-              class Segment;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::AxisHints : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AxisHints();
-  virtual ::gnu::java::awt::font::autofit::Segment * newSegment();
-public:
-  virtual ::gnu::java::awt::font::autofit::Edge * newEdge(jint);
-public: // actually package-private
-  virtual jint getEdgeIndex(::gnu::java::awt::font::autofit::Edge *);
-  JArray< ::gnu::java::awt::font::autofit::Segment * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
-  jint majorDir;
-  jint numSegments;
-  jint numEdges;
-  JArray< ::gnu::java::awt::font::autofit::Edge * > * edges;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_AxisHints__
diff --git a/libjava/gnu/java/awt/font/autofit/Constants.h b/libjava/gnu/java/awt/font/autofit/Constants.h
deleted file mode 100644
index 60932a9..0000000
--- a/libjava/gnu/java/awt/font/autofit/Constants.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Constants__
-#define __gnu_java_awt_font_autofit_Constants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Constants;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Constants : public ::java::lang::Object
-{
-
-public:
-  static const jint DIMENSION_HORZ = 0;
-  static const jint DIMENSION_VERT = 1;
-  static const jint DIMENSION_MAX = 2;
-  static const jint DIR_NONE = 0;
-  static const jint DIR_RIGHT = 1;
-  static const jint DIR_LEFT = -1;
-  static const jint DIR_UP = 2;
-  static const jint DIR_DOWN = -2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_autofit_Constants__
diff --git a/libjava/gnu/java/awt/font/autofit/Edge.h b/libjava/gnu/java/awt/font/autofit/Edge.h
deleted file mode 100644
index f456c36..0000000
--- a/libjava/gnu/java/awt/font/autofit/Edge.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Edge__
-#define __gnu_java_awt_font_autofit_Edge__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class Segment;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Edge : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Edge();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fpos;
-  ::gnu::java::awt::font::autofit::Segment * first;
-  ::gnu::java::awt::font::autofit::Segment * last;
-  jint opos;
-  ::gnu::java::awt::font::autofit::Edge * link;
-  ::gnu::java::awt::font::autofit::Edge * serif;
-  jint flags;
-  jint dir;
-  ::gnu::java::awt::font::autofit::Width * blueEdge;
-  jint pos;
-  jint scale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Edge__
diff --git a/libjava/gnu/java/awt/font/autofit/GlyphHints.h b/libjava/gnu/java/awt/font/autofit/GlyphHints.h
deleted file mode 100644
index 27ce963..0000000
--- a/libjava/gnu/java/awt/font/autofit/GlyphHints.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_GlyphHints__
-#define __gnu_java_awt_font_autofit_GlyphHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class AxisHints;
-              class GlyphHints;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::GlyphHints : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphHints();
-  virtual void rescale(::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void reload(::gnu::java::awt::font::opentype::truetype::Zone *);
-private:
-  void setWeakPoint(::gnu::java::awt::font::opentype::truetype::Point *);
-  void computeInflectionPoints();
-public: // actually package-private
-  virtual jboolean doHorizontal();
-  virtual jboolean doVertical();
-  virtual void alignWeakPoints(jint);
-private:
-  void iupShift(jint, jint, jint);
-  void iupInterp(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void alignStrongPoints(jint);
-private:
-  void storePoint(::gnu::java::awt::font::opentype::truetype::Point *, jint, jint, jshort);
-public: // actually package-private
-  virtual void alignEdgePoints(jint);
-private:
-  jint getPointIndex(::gnu::java::awt::font::opentype::truetype::Point *);
-public:
-  virtual jboolean doAlignEdgePoints();
-  virtual jboolean doAlignStrongPoints();
-  virtual jboolean doAlignWeakPoints();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  JArray< ::gnu::java::awt::font::autofit::AxisHints * > * axis;
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * points;
-  jint numPoints;
-  jint maxPoints;
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * contours;
-  jint numContours;
-  jint maxContours;
-  ::gnu::java::awt::font::autofit::ScriptMetrics * metrics;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_GlyphHints__
diff --git a/libjava/gnu/java/awt/font/autofit/HintScaler.h b/libjava/gnu/java/awt/font/autofit/HintScaler.h
deleted file mode 100644
index b494fe4..0000000
--- a/libjava/gnu/java/awt/font/autofit/HintScaler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_HintScaler__
-#define __gnu_java_awt_font_autofit_HintScaler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class HintScaler;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::HintScaler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HintScaler();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  ::gnu::java::awt::font::opentype::OpenTypeFont * face;
-  jint renderMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_HintScaler__
diff --git a/libjava/gnu/java/awt/font/autofit/Latin.h b/libjava/gnu/java/awt/font/autofit/Latin.h
deleted file mode 100644
index 7afa24c..0000000
--- a/libjava/gnu/java/awt/font/autofit/Latin.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Latin__
-#define __gnu_java_awt_font_autofit_Latin__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class GlyphHints;
-              class HintScaler;
-              class Latin;
-              class LatinMetrics;
-              class ScriptMetrics;
-              class Width;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Latin : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Latin();
-public:
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
-private:
-  void hintEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void alignSerifEdge(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
-  jint computeStemWidth(::gnu::java::awt::font::autofit::GlyphHints *, jint, jint, jint, jint);
-  jboolean doMono(::gnu::java::awt::font::autofit::GlyphHints *);
-  jint snapWidth(JArray< ::gnu::java::awt::font::autofit::Width * > *, jint, jint);
-  jint doneWidth(jint, jint);
-  jboolean doVertSnap(::gnu::java::awt::font::autofit::GlyphHints *);
-  jboolean doHorzSnap(::gnu::java::awt::font::autofit::GlyphHints *);
-  jboolean doStemAdjust(::gnu::java::awt::font::autofit::GlyphHints *);
-  void alignLinkedEdge(::gnu::java::awt::font::autofit::GlyphHints *, jint, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
-public:
-  virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
-  virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *);
-private:
-  void scaleMetricsDim(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::autofit::HintScaler *, jint);
-  void initWidths(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *, jchar);
-public: // actually package-private
-  virtual void linkSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-private:
-  void initBlues(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  jint constant(::gnu::java::awt::font::autofit::LatinMetrics *, jint);
-  void computeSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  jboolean isTopBlue(jint);
-  void detectFeatures(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void computeEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
-  void computeBlueEdges(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::LatinMetrics *);
-public: // actually package-private
-  static const jint MAX_WIDTHS = 16;
-private:
-  static const jint MAX_TEST_CHARS = 12;
-  static const jint CAPITAL_TOP = 0;
-  static const jint CAPITAL_BOTTOM = 1;
-  static const jint SMALL_F_TOP = 2;
-  static const jint SMALL_TOP = 3;
-  static const jint SMALL_BOTTOM = 4;
-  static const jint SMALL_MINOR = 5;
-public: // actually package-private
-  static const jint BLUE_MAX = 6;
-private:
-  static JArray< ::java::lang::String * > * TEST_CHARS;
-  static ::java::awt::geom::AffineTransform * IDENTITY;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Latin__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinAxis.h b/libjava/gnu/java/awt/font/autofit/LatinAxis.h
deleted file mode 100644
index 8c56e5a..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinAxis.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinAxis__
-#define __gnu_java_awt_font_autofit_LatinAxis__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinAxis;
-              class LatinBlue;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinAxis : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LatinAxis();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) scale;
-  jint delta;
-  jint widthCount;
-  JArray< ::gnu::java::awt::font::autofit::Width * > * widths;
-  jint edgeDistanceTreshold;
-  JArray< ::gnu::java::awt::font::autofit::LatinBlue * > * blues;
-  jint blueCount;
-  jint orgDelta;
-  jint orgScale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinAxis__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinBlue.h b/libjava/gnu/java/awt/font/autofit/LatinBlue.h
deleted file mode 100644
index b8a6a39..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinBlue.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinBlue__
-#define __gnu_java_awt_font_autofit_LatinBlue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinBlue;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinBlue : public ::java::lang::Object
-{
-
-public:
-  LatinBlue();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint FLAG_BLUE_ACTIVE = 1;
-  static const jint FLAG_TOP = 2;
-  static const jint FLAG_ADJUSTMENT = 4;
-  ::gnu::java::awt::font::autofit::Width * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ref;
-  ::gnu::java::awt::font::autofit::Width * shoot;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinBlue__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h b/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
deleted file mode 100644
index 18a21db..0000000
--- a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_LatinMetrics__
-#define __gnu_java_awt_font_autofit_LatinMetrics__
-
-#pragma interface
-
-#include <gnu/java/awt/font/autofit/ScriptMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class LatinAxis;
-              class LatinMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinMetrics : public ::gnu::java::awt::font::autofit::ScriptMetrics
-{
-
-public: // actually package-private
-  LatinMetrics();
-  LatinMetrics(::gnu::java::awt::font::opentype::OpenTypeFont *);
-  JArray< ::gnu::java::awt::font::autofit::LatinAxis * > * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::autofit::ScriptMetrics)))) axis;
-  jint unitsPerEm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinMetrics__
diff --git a/libjava/gnu/java/awt/font/autofit/Script.h b/libjava/gnu/java/awt/font/autofit/Script.h
deleted file mode 100644
index 6455af5..0000000
--- a/libjava/gnu/java/awt/font/autofit/Script.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Script__
-#define __gnu_java_awt_font_autofit_Script__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class GlyphHints;
-              class HintScaler;
-              class Script;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Script : public ::java::lang::Object
-{
-
-public:
-  virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *) = 0;
-  virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_autofit_Script__
diff --git a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h b/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
deleted file mode 100644
index c58575b..0000000
--- a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_ScriptMetrics__
-#define __gnu_java_awt_font_autofit_ScriptMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class HintScaler;
-              class Script;
-              class ScriptMetrics;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::ScriptMetrics : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScriptMetrics();
-  ::gnu::java::awt::font::autofit::Script * __attribute__((aligned(__alignof__( ::java::lang::Object)))) script;
-  ::gnu::java::awt::font::autofit::HintScaler * scaler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_ScriptMetrics__
diff --git a/libjava/gnu/java/awt/font/autofit/Segment.h b/libjava/gnu/java/awt/font/autofit/Segment.h
deleted file mode 100644
index d3c1d72..0000000
--- a/libjava/gnu/java/awt/font/autofit/Segment.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Segment__
-#define __gnu_java_awt_font_autofit_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Edge;
-              class Segment;
-          }
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Segment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Segment();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint FLAG_EDGE_NORMAL = 0;
-  static const jint FLAG_EDGE_ROUND = 1;
-  static const jint FLAG_EDGE_SERIF = 2;
-  static const jint FLAG_EDGE_DONE = 4;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dir;
-  jint flags;
-  ::gnu::java::awt::font::autofit::Segment * link;
-  ::gnu::java::awt::font::autofit::Segment * serif;
-  jint numLinked;
-  jint pos;
-  ::gnu::java::awt::font::opentype::truetype::Point * first;
-  ::gnu::java::awt::font::opentype::truetype::Point * last;
-  ::gnu::java::awt::font::opentype::truetype::Point * contour;
-  jint minPos;
-  jint maxPos;
-  jint score;
-  jint len;
-  ::gnu::java::awt::font::autofit::Segment * edgeNext;
-  ::gnu::java::awt::font::autofit::Edge * edge;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Segment__
diff --git a/libjava/gnu/java/awt/font/autofit/Utils.h b/libjava/gnu/java/awt/font/autofit/Utils.h
deleted file mode 100644
index 12fb2f5..0000000
--- a/libjava/gnu/java/awt/font/autofit/Utils.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Utils__
-#define __gnu_java_awt_font_autofit_Utils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Utils;
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Utils : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Utils();
-  static jint computeDirection(jint, jint);
-public:
-  static jint atan(jint, jint);
-  static jint angleDiff(jint, jint);
-public: // actually package-private
-  static void sort(jint, JArray< jint > *);
-  static void sort(jint, JArray< ::gnu::java::awt::font::autofit::Width * > *);
-  static jint pixRound(jint);
-  static jint pixFloor(jint);
-public:
-  static jint mulDiv(jint, jint, jint);
-private:
-  static const jint ATAN_BITS = 8;
-  static JArray< jbyte > * ATAN;
-  static const jint ANGLE_PI = 256;
-  static const jint ANGLE_PI2 = 128;
-  static const jint ANGLE_PI4 = 64;
-  static const jint ANGLE_2PI = 512;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Utils__
diff --git a/libjava/gnu/java/awt/font/autofit/Width.h b/libjava/gnu/java/awt/font/autofit/Width.h
deleted file mode 100644
index d107e50..0000000
--- a/libjava/gnu/java/awt/font/autofit/Width.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Width__
-#define __gnu_java_awt_font_autofit_Width__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Width;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Width : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Width(jint);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) org;
-  jint cur;
-  jint fit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Width__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h
deleted file mode 100644
index a5f784d..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Dummy;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Dummy : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-  CharGlyphMap$Dummy();
-public:
-  jint getGlyph(jint);
-public: // actually package-private
-  CharGlyphMap$Dummy(::gnu::java::awt::font::opentype::CharGlyphMap$Dummy *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Dummy__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h
deleted file mode 100644
index 0b5a45f..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type0.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type0;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type0 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public:
-  CharGlyphMap$Type0(::java::nio::ByteBuffer *);
-private:
-  void readSingleTable(::java::nio::ByteBuffer *, jint, jint, jint);
-public:
-  jint getGlyph(jint);
-private:
-  static ::java::lang::String * getUpper129(jint, jint, jint);
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) glyphToUCS2;
-  static ::java::lang::String * UPPER_ARABIC;
-  static ::java::lang::String * UPPER_EAST_EUROPEAN_ROMAN;
-  static ::java::lang::String * UPPER_CROATIAN;
-  static ::java::lang::String * UPPER_CYRILLIC;
-  static ::java::lang::String * UPPER_FARSI;
-  static ::java::lang::String * UPPER_GREEK;
-  static ::java::lang::String * UPPER_HEBREW;
-  static ::java::lang::String * UPPER_ICELANDIC;
-  static ::java::lang::String * UPPER_ROMAN;
-  static ::java::lang::String * UPPER_ROMANIAN;
-  static ::java::lang::String * UPPER_TURKISH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type0__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h
deleted file mode 100644
index d1250fc..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type12.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type12;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type12 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public: // actually package-private
-  static jboolean isSupported(jint, jint);
-  CharGlyphMap$Type12(::java::nio::ByteBuffer *, jint, jint);
-public:
-  jint getGlyph(jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) numGroups;
-  ::java::nio::IntBuffer * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type12__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h
deleted file mode 100644
index 3009200..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap$Type4.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
-#define __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/CharGlyphMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap$Type4;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap$Type4 : public ::gnu::java::awt::font::opentype::CharGlyphMap
-{
-
-public: // actually package-private
-  static jboolean isSupported(jint, jint, jint);
-  static ::gnu::java::awt::font::opentype::CharGlyphMap$Type4 * readTable(::java::nio::ByteBuffer *, jint, jint);
-private:
-  CharGlyphMap$Type4(jint, ::java::nio::CharBuffer *, ::java::nio::CharBuffer *, ::java::nio::ShortBuffer *, ::java::nio::CharBuffer *);
-public:
-  jint getGlyph(jint);
-private:
-  jint find(jchar);
-  ::java::nio::CharBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::CharGlyphMap)))) lastChar;
-  ::java::nio::CharBuffer * firstChar;
-  ::java::nio::ShortBuffer * idDelta;
-  ::java::nio::CharBuffer * rangeID;
-  jint numSegments;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap$Type4__
diff --git a/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h b/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h
deleted file mode 100644
index d5baafb..0000000
--- a/libjava/gnu/java/awt/font/opentype/CharGlyphMap.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_CharGlyphMap__
-#define __gnu_java_awt_font_opentype_CharGlyphMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::CharGlyphMap : public ::java::lang::Object
-{
-
-public:
-  CharGlyphMap();
-  virtual jint getGlyph(jint) = 0;
-  static ::gnu::java::awt::font::opentype::CharGlyphMap * forTable(::java::nio::ByteBuffer *);
-private:
-  static const jint PLATFORM_UNICODE = 0;
-  static const jint PLATFORM_MACINTOSH = 1;
-  static const jint PLATFORM_MICROSOFT = 3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_CharGlyphMap__
diff --git a/libjava/gnu/java/awt/font/opentype/GlyphNamer.h b/libjava/gnu/java/awt/font/opentype/GlyphNamer.h
deleted file mode 100644
index 55e4790..0000000
--- a/libjava/gnu/java/awt/font/opentype/GlyphNamer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_GlyphNamer__
-#define __gnu_java_awt_font_opentype_GlyphNamer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class GlyphNamer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::GlyphNamer : public ::java::lang::Object
-{
-
-  GlyphNamer(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  static ::gnu::java::awt::font::opentype::GlyphNamer * forTables(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public: // actually package-private
-  ::java::lang::String * getGlyphName(jint);
-private:
-  void readZapf(jint);
-  void readPost();
-  static ::java::lang::String * getAGLFNName(jchar);
-  static ::java::lang::String * getGlyphName(JArray< jchar > *);
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) postTable;
-  ::java::nio::ByteBuffer * zapfTable;
-  ::java::nio::IntBuffer * zapfOffsets;
-  jint zapfExtraInfo;
-  jint postFormat;
-  JArray< ::java::lang::String * > * glyphNames;
-  ::java::nio::CharBuffer * glyphCharacterCodes;
-  static JArray< ::java::lang::String * > * STANDARD_POSTSCRIPT_GLYPH_NAMES;
-  static ::java::lang::String * AGLFN_GLYPHS;
-  static ::java::lang::String * AGLFN_NAME_OFFSET;
-  static ::java::lang::String * AGLFN_NAMES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_GlyphNamer__
diff --git a/libjava/gnu/java/awt/font/opentype/Hinter.h b/libjava/gnu/java/awt/font/opentype/Hinter.h
deleted file mode 100644
index 29992b7..0000000
--- a/libjava/gnu/java/awt/font/opentype/Hinter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_Hinter__
-#define __gnu_java_awt_font_opentype_Hinter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-              class OpenTypeFont;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::Hinter : public ::java::lang::Object
-{
-
-public:
-  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
-  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *) = 0;
-  virtual void setFlags(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_opentype_Hinter__
diff --git a/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h b/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h
deleted file mode 100644
index d6ba836..0000000
--- a/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_MacResourceFork$Resource__
-#define __gnu_java_awt_font_opentype_MacResourceFork$Resource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class MacResourceFork$Resource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::MacResourceFork$Resource : public ::java::lang::Object
-{
-
-  MacResourceFork$Resource(::java::nio::ByteBuffer *, jint, jshort, jint, jint);
-public:
-  jint getType();
-  jshort getID();
-  ::java::nio::ByteBuffer * getContent();
-  jint getLength();
-public: // actually package-private
-  MacResourceFork$Resource(::java::nio::ByteBuffer *, jint, jshort, jint, jint, ::gnu::java::awt::font::opentype::MacResourceFork$Resource *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jshort id;
-  jbyte attribute;
-  jint nameOffset;
-  jint dataOffset;
-  ::java::nio::ByteBuffer * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_MacResourceFork$Resource__
diff --git a/libjava/gnu/java/awt/font/opentype/MacResourceFork.h b/libjava/gnu/java/awt/font/opentype/MacResourceFork.h
deleted file mode 100644
index 76ad0a6..0000000
--- a/libjava/gnu/java/awt/font/opentype/MacResourceFork.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_MacResourceFork__
-#define __gnu_java_awt_font_opentype_MacResourceFork__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class MacResourceFork;
-              class MacResourceFork$Resource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::MacResourceFork : public ::java::lang::Object
-{
-
-public:
-  MacResourceFork(::java::nio::ByteBuffer *);
-  JArray< ::gnu::java::awt::font::opentype::MacResourceFork$Resource * > * getResources(jint);
-  ::gnu::java::awt::font::opentype::MacResourceFork$Resource * getResource(jint, jshort);
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) types;
-  JArray< JArray< ::gnu::java::awt::font::opentype::MacResourceFork$Resource * > * > * resources;
-  ::java::nio::ByteBuffer * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_MacResourceFork__
diff --git a/libjava/gnu/java/awt/font/opentype/NameDecoder.h b/libjava/gnu/java/awt/font/opentype/NameDecoder.h
deleted file mode 100644
index a33ffa3..0000000
--- a/libjava/gnu/java/awt/font/opentype/NameDecoder.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_NameDecoder__
-#define __gnu_java_awt_font_opentype_NameDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class NameDecoder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::NameDecoder : public ::java::lang::Object
-{
-
-public:
-  NameDecoder();
-  static ::java::lang::String * getName(::java::nio::ByteBuffer *, jint, ::java::util::Locale *);
-private:
-  static jint getMacLanguageCode(::java::util::Locale *);
-  static jint getMicrosoftLanguageCode(::java::util::Locale *);
-  static jint findLanguageCode(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * decodeName(jint, jint, jint, ::java::nio::ByteBuffer *, jint, jint);
-  static ::java::lang::String * decodeName(::java::lang::String *, ::java::nio::ByteBuffer *, jint, jint);
-  static ::java::util::Locale * getMacLocale(jint);
-  static ::java::util::Locale * getWindowsLocale(jint);
-  static ::java::lang::String * getMacCharsetName(jint);
-  static ::java::lang::String * getMicrosoftCharsetName(jint);
-public:
-  static ::java::util::Locale * getLocale(jint, jint, jint);
-  static ::java::lang::String * getCharsetName(jint, jint, jint);
-  static const jint NAME_COPYRIGHT = 0;
-  static const jint NAME_FAMILY = 1;
-  static const jint NAME_SUBFAMILY = 2;
-  static const jint NAME_UNIQUE = 3;
-  static const jint NAME_FULL = 4;
-  static const jint NAME_VERSION = 5;
-  static const jint NAME_POSTSCRIPT = 6;
-  static const jint NAME_TRADEMARK = 7;
-  static const jint NAME_MANUFACTURER = 8;
-  static const jint NAME_DESIGNER = 9;
-  static const jint NAME_DESCRIPTION = 10;
-  static const jint NAME_VENDOR_URL = 11;
-  static const jint NAME_DESIGNER_URL = 12;
-  static const jint NAME_LICENSE = 13;
-  static const jint NAME_LICENSE_URL = 14;
-  static const jint NAME_PREFERRED_FAMILY = 16;
-  static const jint NAME_PREFERRED_SUBFAMILY = 17;
-  static const jint NAME_FULL_MACCOMPATIBLE = 18;
-  static const jint NAME_SAMPLE_TEXT = 19;
-  static const jint NAME_POSTSCRIPT_CID = 20;
-private:
-  static const jint PLATFORM_MACINTOSH = 1;
-  static const jint PLATFORM_MICROSOFT = 3;
-  static ::java::lang::String * macLanguageCodes;
-  static ::java::lang::String * microsoftLanguageCodes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_NameDecoder__
diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
deleted file mode 100644
index 3fec583..0000000
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_OpenTypeFont__
-#define __gnu_java_awt_font_opentype_OpenTypeFont__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class CharGlyphMap;
-              class GlyphNamer;
-              class Hinter;
-              class OpenTypeFont;
-              class Scaler;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::OpenTypeFont : public ::java::lang::Object
-{
-
-public: // actually package-private
-  OpenTypeFont(::java::nio::ByteBuffer *, jint);
-private:
-  jint getTableIndex(jint);
-public:
-  ::java::lang::String * getFamilyName(::java::util::Locale *);
-  ::java::lang::String * getSubFamilyName(::java::util::Locale *);
-  ::java::lang::String * getFullName(::java::util::Locale *);
-  ::java::lang::String * getPostScriptName();
-  jint getNumGlyphs();
-  jint getMissingGlyphCode();
-private:
-  ::java::lang::String * getName(jint, ::java::util::Locale *);
-public:
-  jint getVersion();
-  ::java::nio::ByteBuffer * getFontTable(jint);
-  jint getFontTableSize(jint);
-private:
-  ::gnu::java::awt::font::opentype::CharGlyphMap * getCharGlyphMap();
-public:
-  jint getGlyph(jint);
-  ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  jint getGlyphIndex(jint);
-  void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
-  ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getRawGlyphOutline(jint, ::java::awt::geom::AffineTransform *);
-  ::java::lang::String * getGlyphName(jint);
-  jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-  jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-public: // actually package-private
-  static ::java::lang::String * tagToString(jint);
-private:
-  void checkHinter(jint);
-public: // actually package-private
-  static const jint TAG_OTTO = 1330926671;
-  static const jint TAG_SFNT = 1936092788;
-  static const jint TAG_TRUE = 1953658213;
-  static const jint TAG_TTCF = 1953784678;
-  static const jint TAG_ZAPF = 1516335206;
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buf;
-  jint numGlyphs;
-  JArray< jint > * tableTag;
-  JArray< jint > * tableStart;
-  JArray< jint > * tableLength;
-private:
-  jint version;
-public:
-  jint unitsPerEm;
-private:
-  jfloat emsPerUnit;
-  ::gnu::java::awt::font::opentype::Scaler * scaler;
-  ::gnu::java::awt::font::opentype::CharGlyphMap * cmap;
-  ::gnu::java::awt::font::opentype::GlyphNamer * glyphNamer;
-  ::gnu::java::awt::font::opentype::Hinter * hinter;
-  ::java::nio::ByteBuffer * nameTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_OpenTypeFont__
diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h
deleted file mode 100644
index d356250..0000000
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFontFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_OpenTypeFontFactory__
-#define __gnu_java_awt_font_opentype_OpenTypeFontFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-            class FontDelegate;
-          namespace opentype
-          {
-              class OpenTypeFontFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::OpenTypeFontFactory : public ::java::lang::Object
-{
-
-  OpenTypeFontFactory();
-public:
-  static JArray< ::gnu::java::awt::font::FontDelegate * > * createFonts(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_OpenTypeFontFactory__
diff --git a/libjava/gnu/java/awt/font/opentype/Scaler.h b/libjava/gnu/java/awt/font/opentype/Scaler.h
deleted file mode 100644
index 6d229d7..0000000
--- a/libjava/gnu/java/awt/font/opentype/Scaler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_Scaler__
-#define __gnu_java_awt_font_opentype_Scaler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-              class Scaler;
-            namespace truetype
-            {
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::Scaler : public ::java::lang::Object
-{
-
-public:
-  Scaler();
-  virtual ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint) = 0;
-  virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
-  virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
-  virtual ::gnu::java::awt::font::opentype::truetype::Zone * getRawOutline(jint, ::java::awt::geom::AffineTransform *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_Scaler__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h b/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
deleted file mode 100644
index 9427f13..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Fixed__
-#define __gnu_java_awt_font_opentype_truetype_Fixed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Fixed;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Fixed : public ::java::lang::Object
-{
-
-  Fixed();
-public:
-  static jint mul(jint, jint);
-  static jint mul16(jint, jint);
-  static jint div(jint, jint);
-  static jint div16(jint, jint);
-  static jint ceil(jint);
-  static jint floor(jint);
-  static jint vectorLength(jint, jint);
-  static jint intValue(jint);
-  static jfloat floatValue(jint);
-  static jfloat floatValue16(jint);
-  static jdouble doubleValue(jint);
-  static jint valueOf(jfloat);
-  static jint valueOf(jdouble);
-  static jint valueOf16(jdouble);
-  static ::java::lang::String * toString(jint);
-  static ::java::lang::String * toString(jint, jint);
-  static const jint ONE = 64;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Fixed__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
deleted file mode 100644
index f0582d3..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLoader__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-            namespace truetype
-            {
-                class GlyphLoader;
-                class GlyphLocator;
-                class GlyphMeasurer;
-                class VirtualMachine;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphLoader(::gnu::java::awt::font::opentype::truetype::GlyphLocator *, ::gnu::java::awt::font::opentype::truetype::VirtualMachine *, jint, jint, jint, ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer *);
-public:
-  void loadGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadGlyph(jint, ::java::awt::geom::AffineTransform *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
-private:
-  void loadSubGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadSimpleGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  void loadCompoundGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
-  jdouble getDouble214(::java::nio::ByteBuffer *);
-  void loadFlags(jint, ::java::nio::ByteBuffer *);
-  void loadCoordinates(jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *);
-  void setPhantomPoints(jint, jint, ::gnu::java::awt::font::opentype::truetype::Zone *);
-  ::gnu::java::awt::font::opentype::truetype::GlyphLocator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyphLocator;
-  ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer * glyphMeasurer;
-  ::gnu::java::awt::font::opentype::truetype::VirtualMachine * vm;
-  jint unitsPerEm;
-  JArray< jint > * contourEndPoints;
-  JArray< jbyte > * pointFlags;
-  static const jshort ARGS_ARE_WORDS = 1;
-  static const jshort ARGS_ARE_XY_VALUES = 2;
-  static const jshort ROUND_XY_TO_GRID = 4;
-  static const jshort WE_HAVE_A_SCALE = 8;
-  static const jshort MORE_COMPONENTS = 32;
-  static const jshort WE_HAVE_AN_X_AND_Y_SCALE = 64;
-  static const jshort WE_HAVE_A_TWO_BY_TWO = 128;
-  static const jshort WE_HAVE_INSTRUCTIONS = 256;
-  static const jshort USE_MY_METRICS = 512;
-  static const jshort OVERLAP_COMPOUND = 1024;
-  static const jshort SCALED_COMPONENT_OFFSET = 2048;
-  static const jshort UNSCALED_COMPONENT_OFFSET = 4096;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLoader__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h
deleted file mode 100644
index 1e06f69..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/truetype/GlyphLocator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator$FourByte;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class IntBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator$FourByte : public ::gnu::java::awt::font::opentype::truetype::GlyphLocator
-{
-
-public: // actually package-private
-  GlyphLocator$FourByte(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  ::java::nio::ByteBuffer * getGlyphData(jint);
-public: // actually package-private
-  ::java::nio::IntBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::truetype::GlyphLocator)))) indexToLoc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator$FourByte__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h
deleted file mode 100644
index 7489c5e..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/truetype/GlyphLocator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator$TwoByte;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator$TwoByte : public ::gnu::java::awt::font::opentype::truetype::GlyphLocator
-{
-
-public: // actually package-private
-  GlyphLocator$TwoByte(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  ::java::nio::ByteBuffer * getGlyphData(jint);
-public: // actually package-private
-  ::java::nio::CharBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::truetype::GlyphLocator)))) indexToLoc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator$TwoByte__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h
deleted file mode 100644
index aa93b65..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLocator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphLocator__
-#define __gnu_java_awt_font_opentype_truetype_GlyphLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphLocator;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphLocator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphLocator();
-public:
-  static ::gnu::java::awt::font::opentype::truetype::GlyphLocator * forTable(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteBuffer * getGlyphData(jint) = 0;
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyfTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphLocator__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h
deleted file mode 100644
index 558584d..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
-#define __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class GlyphMeasurer;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::GlyphMeasurer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GlyphMeasurer(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-public:
-  jint getAscent(jboolean);
-  jint getDescent(jboolean);
-  jint getLineGap(jboolean);
-  jint getAdvanceWidth(jint, jboolean);
-  jint getAdvanceHeight(jint, jboolean);
-private:
-  ::java::nio::ShortBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) horizontalGlyphMetrics;
-  ::java::nio::ShortBuffer * verticalGlyphMetrics;
-  jint numLongHorizontalMetricsEntries;
-  jint numLongVerticalMetricsEntries;
-  jint horizontalAscent;
-  jint verticalAscent;
-  jint horizontalDescent;
-  jint verticalDescent;
-  jint horizontalLineGap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_GlyphMeasurer__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Point.h b/libjava/gnu/java/awt/font/opentype/truetype/Point.h
deleted file mode 100644
index a993ca0..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Point.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Point__
-#define __gnu_java_awt_font_opentype_truetype_Point__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Point : public ::java::lang::Object
-{
-
-public:
-  Point();
-  virtual ::gnu::java::awt::font::opentype::truetype::Point * getNext();
-  virtual void setNext(::gnu::java::awt::font::opentype::truetype::Point *);
-  virtual ::gnu::java::awt::font::opentype::truetype::Point * getPrev();
-  virtual void setPrev(::gnu::java::awt::font::opentype::truetype::Point *);
-  virtual jint getOrigX();
-  virtual void setOrigX(jint);
-  virtual jint getOrigY();
-  virtual void setOrigY(jint);
-  virtual jint getInDir();
-  virtual void setInDir(jint);
-  virtual jint getOutDir();
-  virtual void setOutDir(jint);
-  virtual jshort getFlags();
-  virtual void setFlags(jshort);
-  virtual void addFlags(jshort);
-  virtual jboolean isControlPoint();
-  virtual jint getU();
-  virtual void setU(jint);
-  virtual jint getV();
-  virtual void setV(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint getX();
-  virtual void setX(jint);
-  virtual jint getY();
-  virtual void setY(jint);
-  virtual jint getScaledX();
-  virtual void setScaledX(jint);
-  virtual jint getScaledY();
-  virtual void setScaledY(jint);
-  static const jshort FLAG_TOUCHED_X = 1;
-  static const jshort FLAG_TOUCHED_Y = 2;
-  static const jshort FLAG_ON_CURVE = 4;
-  static const jshort FLAG_CONTOUR_END = 8;
-  static const jshort FLAG_WEAK_INTERPOLATION = 16;
-  static const jshort FLAG_INFLECTION = 32;
-  static const jshort FLAG_DONE_X = 64;
-  static const jshort FLAG_DONE_Y = 128;
-  static const jint DIR_RIGHT = 1;
-  static const jint DIR_LEFT = -1;
-  static const jint DIR_UP = 2;
-  static const jint DIR_DOWN = -2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) origX;
-  jint origY;
-  jint scaledX;
-  jint scaledY;
-  jint x;
-  jint y;
-  jint u;
-  jint v;
-  jshort flags;
-private:
-  ::gnu::java::awt::font::opentype::truetype::Point * prev;
-  ::gnu::java::awt::font::opentype::truetype::Point * next;
-public: // actually package-private
-  jint inDir;
-  jint outDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Point__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h b/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
deleted file mode 100644
index fadc996..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
-#define __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
-
-#pragma interface
-
-#include <gnu/java/awt/font/opentype/Scaler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-              class Hinter;
-            namespace truetype
-            {
-                class GlyphLoader;
-                class GlyphMeasurer;
-                class TrueTypeScaler;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::TrueTypeScaler : public ::gnu::java::awt::font::opentype::Scaler
-{
-
-public:
-  TrueTypeScaler(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getRawOutline(jint, ::java::awt::geom::AffineTransform *);
-  void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
-private:
-  jfloat scaleFromFUnits(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean);
-public:
-  jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-  jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::opentype::Scaler)))) glyfTable;
-  ::gnu::java::awt::font::opentype::truetype::GlyphLoader * glyphLoader;
-  ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer * glyphMeasurer;
-  ::gnu::java::awt::font::opentype::truetype::Zone * glyphZone;
-  jint unitsPerEm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_TrueTypeScaler__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h b/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h
deleted file mode 100644
index 6193a6d..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/VirtualMachine.h
+++ /dev/null
@@ -1,153 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_VirtualMachine__
-#define __gnu_java_awt_font_opentype_truetype_VirtualMachine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class VirtualMachine;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::VirtualMachine : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VirtualMachine(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-private:
-  void resetGraphicsState();
-  void reloadControlValueTable();
-  jint funitsToPixels(jint);
-public:
-  virtual jboolean setup(jdouble, ::java::awt::geom::AffineTransform *, jboolean);
-private:
-  void execute(::java::nio::ByteBuffer *, jint);
-  void dumpInstruction(::java::nio::ByteBuffer *);
-  static jchar getNibble(jint, jint);
-  static ::java::lang::String * getHex(jbyte);
-  static ::java::lang::String * getHex(jshort);
-  static void skipAfter(::java::nio::ByteBuffer *, jint, jint, jint, jint, jboolean);
-  static jint getInstructionLength(jint);
-  jboolean executeInstruction(::java::nio::ByteBuffer *);
-  void setRoundingMode(jint, jint);
-  void deltaC(JArray< jint > *, jint, jint, jint);
-  ::gnu::java::awt::font::opentype::truetype::Zone * getZone(jint);
-  jint getProjection(jint, jint);
-  jint getDualProjection(jint, jint);
-  jint getProjection(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-  jint getOriginalProjection(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-  void handleISECT(jint, jint, jint, jint, jint);
-  static jint muldiv(jint, jint, jint);
-  jint getFreeDotProj();
-  void movePoint(::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void dumpVectors();
-  void handleIP();
-  void handleMDAP(jint, jboolean);
-  void handleMIAP(jint, jint, jboolean);
-  void handleMIRP(jint, jint, jint);
-  jint round(jint, jint);
-  static jint nround(jint, jint);
-  jboolean isRotated();
-  jboolean isStretched();
-  jint getPixelsPerEM();
-  void setProjectionVector(jshort, jshort);
-  void setFreedomVector(jshort, jshort);
-  void setDualVector(jshort, jshort);
-  jint applyCTM_x(jint, jint);
-  jint applyCTM_y(jint, jint);
-  static const jboolean PATENTED_HINTING = 0;
-  static const jboolean TRACE_EXECUTION = 0;
-  static const jshort ONE_214 = 16384;
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) storage;
-  JArray< jint > * stack;
-  jint maxStackElements;
-  jint sp;
-  JArray< ::java::nio::ByteBuffer * > * fdefBuffer;
-  JArray< jint > * fdefEntryPoint;
-  ::java::nio::ShortBuffer * controlValueTable;
-  JArray< jint > * cvt;
-  jint engineCompensation;
-  ::java::nio::ByteBuffer * fontProgram;
-  ::java::nio::ByteBuffer * preProgram;
-  jint numTwilightPoints;
-  jint pointSize;
-  ::java::awt::geom::AffineTransform * deviceTransform;
-  jint scaleX;
-  jint scaleY;
-  jint shearX;
-  jint shearY;
-  jboolean antialiased;
-  jint cvtCutIn;
-  jint deltaBase;
-  jint deltaShift;
-  jshort freeX;
-  jshort freeY;
-  jint loop;
-  jint minimumDistance;
-  jshort projX;
-  jshort projY;
-  jshort dualX;
-  jshort dualY;
-  jint rp0;
-  jint rp1;
-  jint rp2;
-  jboolean scanControl;
-  jint scanType;
-  jint singleWidthValue;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp0;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp1;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zp2;
-  ::gnu::java::awt::font::opentype::truetype::Zone * twilightZone;
-  ::gnu::java::awt::font::opentype::truetype::Zone * glyphZone;
-  jboolean executeGlyphInstructions;
-  jboolean ignoreCVTProgram;
-  jint roundPeriod;
-  jint roundPhase;
-  jint roundThreshold;
-  jint cachedPixelsPerEM;
-  jint unitsPerEm;
-  static JArray< ::java::lang::String * > * INST_NAME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_VirtualMachine__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h b/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
deleted file mode 100644
index e564789..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_Zone__
-#define __gnu_java_awt_font_opentype_truetype_Zone__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Point;
-                class Zone;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::Zone : public ::java::lang::Object
-{
-
-public:
-  Zone(jint);
-  jint getCapacity();
-  jint getSize();
-  jint getX(jint);
-  jint getX(jint, jint);
-  void setX(jint, jint, jboolean);
-  void setY(jint, jint, jboolean);
-  jint getY(jint);
-  jint getY(jint, jint);
-  jint getOriginalX(jint);
-  jint getOriginalY(jint);
-  void setOriginalX(jint, jint);
-  void setOriginalY(jint, jint);
-  void setNumPoints(jint);
-  jboolean isOnCurve(jint);
-  void setOnCurve(jint, jboolean);
-  jboolean isContourEnd(jint);
-  void setContourEnd(jint, jboolean);
-public: // actually package-private
-  void transform(jdouble, ::java::awt::geom::AffineTransform *, jint, jint, jint);
-  void combineWithSubGlyph(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-private:
-  void dump();
-public:
-  ::java::awt::geom::PathIterator * getPathIterator(jint);
-  ::java::awt::geom::GeneralPath * getPath(jint);
-  jint getNumContours();
-  jint getContourEnd(jint);
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * getPoints();
-private:
-  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) points;
-  jint numPoints;
-public:
-  jdouble scaleX;
-  jdouble scaleY;
-  jdouble shearX;
-  jdouble shearY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_Zone__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h b/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
deleted file mode 100644
index 5e64ba8..0000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
-#define __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace opentype
-          {
-            namespace truetype
-            {
-                class Zone;
-                class ZonePathIterator;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::opentype::truetype::ZonePathIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ZonePathIterator(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-private:
-  jint getSuccessor(jint);
-public:
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint getSegment(jint, JArray< jfloat > *);
-  jint getStartSegment(jint, JArray< jfloat > *);
-  static const jint EMIT_SEGMENT = 0;
-  static const jint EMIT_CLOSE = 1;
-  static const jint EMIT_MOVETO = 2;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) state;
-  ::gnu::java::awt::font::opentype::truetype::Zone * zone;
-  jint numPoints;
-  jint curPoint;
-  jint contourStart;
-  jint type;
-public: // actually package-private
-  JArray< jfloat > * floats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_opentype_truetype_ZonePathIterator__
diff --git a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
deleted file mode 100644
index ecd73a5..0000000
--- a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_AsyncImage$AsyncImageSource__
-#define __gnu_java_awt_image_AsyncImage$AsyncImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-            class AsyncImage$AsyncImageSource;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::AsyncImage$AsyncImageSource : public ::java::lang::Object
-{
-
-  AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-private:
-  ::java::awt::image::ImageProducer * getRealSource();
-public: // actually package-private
-  AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *, ::gnu::java::awt::image::AsyncImage$AsyncImageSource *);
-private:
-  ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) realSource;
-public: // actually package-private
-  ::gnu::java::awt::image::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_AsyncImage$AsyncImageSource__
diff --git a/libjava/gnu/java/awt/image/AsyncImage.h b/libjava/gnu/java/awt/image/AsyncImage.h
deleted file mode 100644
index 7c1a731..0000000
--- a/libjava/gnu/java/awt/image/AsyncImage.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_AsyncImage__
-#define __gnu_java_awt_image_AsyncImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::AsyncImage : public ::java::awt::Image
-{
-
-public: // actually package-private
-  AsyncImage();
-public:
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jboolean isComplete();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual void addObserver(::java::awt::image::ImageObserver *);
-  virtual jboolean prepareImage(jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * getRealImage();
-  virtual void setRealImage(::java::awt::Image *);
-  virtual void notifyObservers(jint, jint, jint, jint, jint);
-  virtual void waitForImage(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  static ::java::awt::Image * access$0(::gnu::java::awt::image::AsyncImage *);
-private:
-  ::java::awt::Image * volatile __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage;
-public: // actually package-private
-  ::java::util::HashSet * observers;
-private:
-  jboolean volatile complete;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_AsyncImage__
diff --git a/libjava/gnu/java/awt/image/ImageConverter.h b/libjava/gnu/java/awt/image/ImageConverter.h
deleted file mode 100644
index 8df255f..0000000
--- a/libjava/gnu/java/awt/image/ImageConverter.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageConverter__
-#define __gnu_java_awt_image_ImageConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class AsyncImage;
-            class ImageConverter;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class IndexColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageConverter : public ::java::lang::Object
-{
-
-public:
-  ImageConverter();
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  ::java::awt::image::ColorModel * setupColorModel(::java::awt::image::ColorModel *);
-  void createImage();
-  jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
-  jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
-  jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jbyte > *, jint, jint, jint);
-  jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jint > *, jint, jint, jint);
-  jint updateTransparency(jint, jint);
-public:
-  virtual void imageComplete(jint);
-  virtual void setTargetColorModel(::java::awt::image::ColorModel *);
-  virtual ::java::awt::Image * getImage();
-  static ::java::lang::String * IMAGE_TRANSPARENCY_PROPERTY;
-  static ::java::lang::String * IMAGE_PROPERTIES_PROPERTY;
-private:
-  ::gnu::java::awt::image::AsyncImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::BufferedImage * bImage;
-  ::java::util::Hashtable * imageProperties;
-  jint width;
-  jint height;
-  ::java::awt::image::ColorModel * colorModel;
-  ::java::awt::image::ColorModel * targetColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageConverter__
diff --git a/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h b/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h
deleted file mode 100644
index 611ead3b..0000000
--- a/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
-#define __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class ImageDecoder$DataInputStreamWrapper;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageDecoder$DataInputStreamWrapper : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  ImageDecoder$DataInputStreamWrapper(::java::io::DataInput *);
-public:
-  virtual jint read();
-private:
-  ::java::io::DataInput * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) datainput;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageDecoder$DataInputStreamWrapper__
diff --git a/libjava/gnu/java/awt/image/ImageDecoder.h b/libjava/gnu/java/awt/image/ImageDecoder.h
deleted file mode 100644
index 69af2a5..0000000
--- a/libjava/gnu/java/awt/image/ImageDecoder.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_ImageDecoder__
-#define __gnu_java_awt_image_ImageDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class ImageDecoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::image::ImageDecoder : public ::java::lang::Object
-{
-
-public:
-  ImageDecoder(::java::lang::String *);
-  ImageDecoder(::java::net::URL *);
-  ImageDecoder(::java::io::InputStream *);
-  ImageDecoder(::java::io::DataInput *);
-  ImageDecoder(JArray< jbyte > *, jint, jint);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *) = 0;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-  ::java::lang::String * filename;
-  ::java::net::URL * url;
-  JArray< jbyte > * data;
-  jint offset;
-  jint length;
-  ::java::io::InputStream * input;
-  ::java::io::DataInput * datainput;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_ImageDecoder__
diff --git a/libjava/gnu/java/awt/image/XBMDecoder.h b/libjava/gnu/java/awt/image/XBMDecoder.h
deleted file mode 100644
index 0d33850..0000000
--- a/libjava/gnu/java/awt/image/XBMDecoder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_image_XBMDecoder__
-#define __gnu_java_awt_image_XBMDecoder__
-
-#pragma interface
-
-#include <gnu/java/awt/image/ImageDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace image
-        {
-            class XBMDecoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::image::XBMDecoder : public ::gnu::java::awt::image::ImageDecoder
-{
-
-public:
-  XBMDecoder(::java::lang::String *);
-  XBMDecoder(::java::net::URL *);
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *);
-  static JArray< jint > * getScanline(::java::io::Reader *, jint);
-public: // actually package-private
-  ::java::io::BufferedReader * __attribute__((aligned(__alignof__( ::gnu::java::awt::image::ImageDecoder)))) reader;
-  static ::java::awt::image::ColorModel * cm;
-  static const jint black = -16777216;
-  static const jint transparent = 0;
-  static JArray< jint > * masktable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_image_XBMDecoder__
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
deleted file mode 100644
index 8effd32..0000000
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ /dev/null
@@ -1,226 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_AbstractGraphics2D__
-#define __gnu_java_awt_java2d_AbstractGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class AbstractGraphics2D;
-            class ScanlineConverter;
-            class ScanlineCoverage;
-            class ShapeCache;
-            class TextCacheKey;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BasicStroke;
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Paint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-          class ImageObserver;
-          class Raster;
-          class RenderedImage;
-          class WritableRaster;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::java2d::AbstractGraphics2D : public ::java::awt::Graphics2D
-{
-
-public: // actually protected
-  AbstractGraphics2D();
-public:
-  virtual void draw(::java::awt::Shape *);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-private:
-  jboolean drawImageImpl(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *, ::java::awt::Rectangle *);
-public:
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-private:
-  void drawRenderedImageImpl(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *, ::java::awt::Rectangle *);
-public:
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-private:
-  void drawRenderableImageImpl(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *, ::java::awt::Rectangle *);
-public:
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void fill(::java::awt::Shape *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual void setComposite(::java::awt::Composite *);
-  virtual void setPaint(::java::awt::Paint *);
-  virtual void setStroke(::java::awt::Stroke *);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void clip(::java::awt::Shape *);
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual ::java::awt::Graphics * create();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::java::awt::Color * getColor();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual void setClip(::java::awt::Shape *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void dispose();
-public: // actually protected
-  virtual void fillShape(::java::awt::Shape *, jboolean);
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::Rectangle * getDeviceBounds() = 0;
-  virtual void rawDrawLine(jint, jint, jint, jint);
-  virtual void rawDrawRect(jint, jint, jint, jint);
-  virtual void rawClearRect(jint, jint, jint, jint);
-  virtual void rawFillRect(jint, jint, jint, jint);
-  virtual jboolean rawDrawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void rawCopyArea(jint, jint, jint, jint, jint, jint);
-private:
-  void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-public:
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
-public: // actually protected
-  virtual void init();
-  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
-  virtual void updateRaster(::java::awt::image::Raster *, jint, jint, jint, jint);
-private:
-  void updateOptimization();
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  void updateClip(::java::awt::geom::AffineTransform *);
-  ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
-  void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *);
-  ::java::awt::PaintContext * getPaintContext();
-public:
-  static ::java::awt::Image * prepareImage(::java::awt::Image *, jint, jint);
-public: // actually protected
-  static ::java::util::WeakHashMap * imageCache;
-private:
-  static jboolean DEFAULT_TEXT_AA;
-  static ::java::awt::Font * FONT;
-  static const jint GV_CACHE_SIZE = 50;
-  static ::gnu::java::awt::java2d::ShapeCache * shapeCache;
-  static ::java::util::LinkedList * scanlineConverters;
-  static ::java::util::Map * gvCache;
-  static ::gnu::java::awt::java2d::TextCacheKey * searchTextKey;
-public: // actually protected
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
-private:
-  ::java::awt::Paint * paint;
-  ::java::awt::PaintContext * paintContext;
-  ::java::awt::Color * background;
-  ::java::awt::Color * foreground;
-  jboolean isForegroundColorNull;
-  ::java::awt::Font * font;
-  ::java::awt::Composite * composite;
-  ::java::awt::Stroke * stroke;
-  ::java::awt::Shape * clip__;
-  ::java::awt::RenderingHints * renderingHints;
-  ::java::awt::image::WritableRaster * destinationRaster;
-  jboolean isOptimized;
-  static ::java::awt::BasicStroke * STANDARD_STROKE;
-  static ::java::util::HashMap * STANDARD_HINTS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_AbstractGraphics2D__
diff --git a/libjava/gnu/java/awt/java2d/ActiveEdges.h b/libjava/gnu/java/awt/java2d/ActiveEdges.h
deleted file mode 100644
index 9310460..0000000
--- a/libjava/gnu/java/awt/java2d/ActiveEdges.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ActiveEdges__
-#define __gnu_java_awt_java2d_ActiveEdges__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ActiveEdges;
-            class PolyEdge;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ActiveEdges : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ActiveEdges();
-  void clear();
-  void add(::gnu::java::awt::java2d::PolyEdge *);
-  void intersectSortAndPack(jint, jint);
-  jint getNumActiveEdges();
-  ::gnu::java::awt::java2d::PolyEdge * getActiveEdge(jint);
-  void remove(jint);
-public:
-  ::java::lang::String * toString();
-private:
-  JArray< ::gnu::java::awt::java2d::PolyEdge * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) activeEdges;
-  jint numActiveEdges;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ActiveEdges__
diff --git a/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h b/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h
deleted file mode 100644
index 9c591a4..0000000
--- a/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_AlphaCompositeContext__
-#define __gnu_java_awt_java2d_AlphaCompositeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class AlphaCompositeContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::AlphaCompositeContext : public ::java::lang::Object
-{
-
-public:
-  AlphaCompositeContext(::java::awt::AlphaComposite *, ::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *);
-  virtual void dispose();
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  ::java::awt::AlphaComposite * __attribute__((aligned(__alignof__( ::java::lang::Object)))) composite;
-  ::java::awt::image::ColorModel * srcColorModel;
-  ::java::awt::image::ColorModel * dstColorModel;
-  jfloat fs;
-  jfloat fd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_AlphaCompositeContext__
diff --git a/libjava/gnu/java/awt/java2d/CubicSegment.h b/libjava/gnu/java/awt/java2d/CubicSegment.h
deleted file mode 100644
index c7ef3b2..0000000
--- a/libjava/gnu/java/awt/java2d/CubicSegment.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_CubicSegment__
-#define __gnu_java_awt_java2d_CubicSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class CubicSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::CubicSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  CubicSegment(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  CubicSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::Segment)))) cp1__;
-  ::java::awt::geom::Point2D * cp2__;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_CubicSegment__
diff --git a/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h b/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h
deleted file mode 100644
index b0a1d08..0000000
--- a/libjava/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
-#define __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ImagePaint;
-            class ImagePaint$ImagePaintContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ImagePaint$ImagePaintContext : public ::java::lang::Object
-{
-
-  ImagePaint$ImagePaintContext(::gnu::java::awt::java2d::ImagePaint *);
-public:
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-private:
-  void ensureRasterSize(jint, jint);
-public: // actually package-private
-  ImagePaint$ImagePaintContext(::gnu::java::awt::java2d::ImagePaint *, ::gnu::java::awt::java2d::ImagePaint$ImagePaintContext *);
-private:
-  ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-public: // actually package-private
-  ::gnu::java::awt::java2d::ImagePaint * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ImagePaint$ImagePaintContext__
diff --git a/libjava/gnu/java/awt/java2d/ImagePaint.h b/libjava/gnu/java/awt/java2d/ImagePaint.h
deleted file mode 100644
index e9e2ea2..0000000
--- a/libjava/gnu/java/awt/java2d/ImagePaint.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ImagePaint__
-#define __gnu_java_awt_java2d_ImagePaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ImagePaint;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ImagePaint : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImagePaint(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual jint getTransparency();
-public: // actually package-private
-  ::java::awt::image::RenderedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::geom::AffineTransform * transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ImagePaint__
diff --git a/libjava/gnu/java/awt/java2d/LineSegment.h b/libjava/gnu/java/awt/java2d/LineSegment.h
deleted file mode 100644
index 50f51e0..0000000
--- a/libjava/gnu/java/awt/java2d/LineSegment.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_LineSegment__
-#define __gnu_java_awt_java2d_LineSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class LineSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::LineSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  LineSegment(jdouble, jdouble, jdouble, jdouble);
-  LineSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_LineSegment__
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
deleted file mode 100644
index 07b6ac0..0000000
--- a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PixelCoverage$Bucket__
-#define __gnu_java_awt_java2d_PixelCoverage$Bucket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PixelCoverage$Bucket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PixelCoverage$Bucket : public ::java::lang::Object
-{
-
-  PixelCoverage$Bucket();
-public: // actually package-private
-  PixelCoverage$Bucket(::gnu::java::awt::java2d::PixelCoverage$Bucket *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint xCov;
-  jint yCov;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * next;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * prev;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PixelCoverage$Bucket__
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage.h b/libjava/gnu/java/awt/java2d/PixelCoverage.h
deleted file mode 100644
index 75a5057..0000000
--- a/libjava/gnu/java/awt/java2d/PixelCoverage.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PixelCoverage__
-#define __gnu_java_awt_java2d_PixelCoverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PixelCoverage;
-            class PixelCoverage$Bucket;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PixelCoverage : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PixelCoverage();
-  void rewind();
-  void clear();
-  void add(jint, jint, jint);
-private:
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * findOrInsert(jint);
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * current;
-  ::gnu::java::awt::java2d::PixelCoverage$Bucket * last;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PixelCoverage__
diff --git a/libjava/gnu/java/awt/java2d/Pixelizer.h b/libjava/gnu/java/awt/java2d/Pixelizer.h
deleted file mode 100644
index 469019a..0000000
--- a/libjava/gnu/java/awt/java2d/Pixelizer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Pixelizer__
-#define __gnu_java_awt_java2d_Pixelizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class Pixelizer;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Pixelizer : public ::java::lang::Object
-{
-
-public:
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_java2d_Pixelizer__
diff --git a/libjava/gnu/java/awt/java2d/PolyEdge.h b/libjava/gnu/java/awt/java2d/PolyEdge.h
deleted file mode 100644
index e51a868..0000000
--- a/libjava/gnu/java/awt/java2d/PolyEdge.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PolyEdge__
-#define __gnu_java_awt_java2d_PolyEdge__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdge;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PolyEdge : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PolyEdge();
-  PolyEdge(jint, jint, jint, jint, jint, jboolean);
-  void init(jint, jint, jint, jint, jint, jboolean);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  void intersect(jint, jint);
-public:
-  ::java::lang::String * toString();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x0;
-  jint y0;
-  jint x1;
-  jint y1;
-private:
-  jint slope;
-public: // actually package-private
-  jint xIntersection;
-  jboolean isClip;
-  ::gnu::java::awt::java2d::PolyEdge * poolNext;
-  ::gnu::java::awt::java2d::PolyEdge * scanlineNext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PolyEdge__
diff --git a/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h b/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h
deleted file mode 100644
index b27bdaf..0000000
--- a/libjava/gnu/java/awt/java2d/PolyEdgeComparator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_PolyEdgeComparator__
-#define __gnu_java_awt_java2d_PolyEdgeComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdgeComparator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::PolyEdgeComparator : public ::java::lang::Object
-{
-
-public:
-  PolyEdgeComparator();
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_PolyEdgeComparator__
diff --git a/libjava/gnu/java/awt/java2d/QuadSegment.h b/libjava/gnu/java/awt/java2d/QuadSegment.h
deleted file mode 100644
index 1075241..0000000
--- a/libjava/gnu/java/awt/java2d/QuadSegment.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_QuadSegment__
-#define __gnu_java_awt_java2d_QuadSegment__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class QuadSegment;
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::QuadSegment : public ::gnu::java::awt::java2d::Segment
-{
-
-public:
-  QuadSegment(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  QuadSegment(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  QuadSegment(::java::awt::geom::QuadCurve2D *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble);
-private:
-  ::gnu::java::awt::java2d::QuadSegment * offsetSubdivided(::java::awt::geom::QuadCurve2D *, jboolean);
-  ::java::awt::geom::Point2D * lineIntersection(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jboolean);
-public:
-  virtual void reverse();
-  virtual JArray< jdouble > * cp1();
-  virtual JArray< jdouble > * cp2();
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::Segment)))) cp;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_QuadSegment__
diff --git a/libjava/gnu/java/awt/java2d/RasterGraphics.h b/libjava/gnu/java/awt/java2d/RasterGraphics.h
deleted file mode 100644
index 37baf26..0000000
--- a/libjava/gnu/java/awt/java2d/RasterGraphics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_RasterGraphics__
-#define __gnu_java_awt_java2d_RasterGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/java2d/AbstractGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class RasterGraphics;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::RasterGraphics : public ::gnu::java::awt::java2d::AbstractGraphics2D
-{
-
-public:
-  RasterGraphics(::java::awt::image::WritableRaster *, ::java::awt::image::ColorModel *);
-  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::Rectangle * getDeviceBounds();
-private:
-  ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::AbstractGraphics2D)))) raster;
-  ::java::awt::image::ColorModel * colorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_RasterGraphics__
diff --git a/libjava/gnu/java/awt/java2d/Scanline.h b/libjava/gnu/java/awt/java2d/Scanline.h
deleted file mode 100644
index ce2be0e..0000000
--- a/libjava/gnu/java/awt/java2d/Scanline.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Scanline__
-#define __gnu_java_awt_java2d_Scanline__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class PolyEdge;
-            class Scanline;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Scanline : public ::java::lang::Object
-{
-
-public: // actually package-private
-  virtual void clear();
-  Scanline();
-  virtual void addEdge(::gnu::java::awt::java2d::PolyEdge *);
-  virtual ::gnu::java::awt::java2d::PolyEdge * getEdges();
-private:
-  ::gnu::java::awt::java2d::PolyEdge * __attribute__((aligned(__alignof__( ::java::lang::Object)))) edges;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_Scanline__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
deleted file mode 100644
index b2da8ff..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineConverter.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineConverter__
-#define __gnu_java_awt_java2d_ScanlineConverter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ActiveEdges;
-            class Pixelizer;
-            class PolyEdge;
-            class Scanline;
-            class ScanlineConverter;
-            class ScanlineCoverage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineConverter();
-public:
-  void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, jint, ::java::awt::RenderingHints *);
-private:
-  void clear();
-  void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean);
-  void setResolution(jint, jint);
-  void setUpperBounds(jint);
-  void addShape(::java::awt::geom::PathIterator *, jboolean);
-  void addEdge(::gnu::java::awt::java2d::PolyEdge *);
-  jint fit(jint);
-  jint scanlineIndex(jint);
-  void edgePoolAdd(jint, jint, jint, jint, jboolean);
-  static jint FIXED_DIGITS;
-  static jint ONE;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines;
-  JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines;
-  jint upperBounds;
-  jint resolution;
-  jint yResolution;
-  jint halfStep;
-  JArray< jfloat > * coords;
-  ::gnu::java::awt::java2d::ActiveEdges * activeEdges;
-  ::gnu::java::awt::java2d::PolyEdge * edgePool;
-  ::gnu::java::awt::java2d::PolyEdge * edgePoolLast;
-  jint minY;
-  jint maxY;
-  jint minX;
-  jint maxX;
-  ::gnu::java::awt::java2d::ScanlineCoverage * scanlineCoverage;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineConverter__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h
deleted file mode 100644
index 0f1a5b7..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage$Coverage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Coverage : public ::java::lang::Object
-{
-
-  ScanlineCoverage$Coverage();
-public:
-  jint getXPos();
-  jint getCoverageDelta();
-  ::java::lang::String * toString();
-  ::java::lang::String * list();
-public: // actually package-private
-  ScanlineCoverage$Coverage(::gnu::java::awt::java2d::ScanlineCoverage$Coverage *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint covDelta;
-  jint pixelCoverage;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h
deleted file mode 100644
index 2ea741e..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage;
-            class ScanlineCoverage$Coverage;
-            class ScanlineCoverage$Iterator;
-            class ScanlineCoverage$Range;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Iterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineCoverage$Iterator(::gnu::java::awt::java2d::ScanlineCoverage *);
-public:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Range * next();
-  jboolean hasNext();
-public: // actually package-private
-  void reset();
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Range * __attribute__((aligned(__alignof__( ::java::lang::Object)))) range;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentItem;
-  jint currentCoverage;
-  jboolean handledPixelCoverage;
-public: // actually package-private
-  ::gnu::java::awt::java2d::ScanlineCoverage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h
deleted file mode 100644
index 5f6ccd6..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Range__
-#define __gnu_java_awt_java2d_ScanlineCoverage$Range__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage$Range;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage$Range : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScanlineCoverage$Range();
-  void setXPos(jint);
-public:
-  jint getXPos();
-public: // actually package-private
-  void setLength(jint);
-public:
-  jint getLength();
-  jint getXPosEnd();
-public: // actually package-private
-  void setCoverage(jint);
-public:
-  jint getCoverage();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static jint access$0(::gnu::java::awt::java2d::ScanlineCoverage$Range *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
-  jint length;
-  jint coverage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage$Range__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage.h
deleted file mode 100644
index 46d9ae8..0000000
--- a/libjava/gnu/java/awt/java2d/ScanlineCoverage.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ScanlineCoverage__
-#define __gnu_java_awt_java2d_ScanlineCoverage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ScanlineCoverage;
-            class ScanlineCoverage$Coverage;
-            class ScanlineCoverage$Iterator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ScanlineCoverage : public ::java::lang::Object
-{
-
-public:
-  ScanlineCoverage();
-  void rewind();
-  void clear();
-  void add(jint, jint, jint);
-  jint getMaxCoverage();
-public: // actually package-private
-  void setMaxCoverage(jint);
-public:
-  jint getMaxX();
-  jint getMinX();
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * findOrInsert(jint);
-public:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterate();
-  jboolean isEmpty();
-public: // actually package-private
-  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$0(::gnu::java::awt::java2d::ScanlineCoverage *);
-  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$1(::gnu::java::awt::java2d::ScanlineCoverage *);
-private:
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * current;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentPrev;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * last;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * lastPrev;
-  jint minX;
-  jint maxX;
-  jint maxCoverage;
-  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterator;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ScanlineCoverage__
diff --git a/libjava/gnu/java/awt/java2d/Segment.h b/libjava/gnu/java/awt/java2d/Segment.h
deleted file mode 100644
index 3e771bb..0000000
--- a/libjava/gnu/java/awt/java2d/Segment.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_Segment__
-#define __gnu_java_awt_java2d_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::Segment : public ::java::lang::Object
-{
-
-public:
-  Segment();
-  virtual void add(::gnu::java::awt::java2d::Segment *);
-  virtual void reverseAll();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< jdouble > * normal(jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual void reverse() = 0;
-  virtual JArray< ::gnu::java::awt::java2d::Segment * > * getDisplacedSegments(jdouble) = 0;
-  virtual JArray< jdouble > * cp1() = 0;
-  virtual JArray< jdouble > * cp2() = 0;
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) P1;
-  ::java::awt::geom::Point2D * P2;
-  ::gnu::java::awt::java2d::Segment * first;
-  ::gnu::java::awt::java2d::Segment * next;
-  ::gnu::java::awt::java2d::Segment * last;
-public: // actually protected
-  jdouble radius;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_Segment__
diff --git a/libjava/gnu/java/awt/java2d/ShapeCache.h b/libjava/gnu/java/awt/java2d/ShapeCache.h
deleted file mode 100644
index 1ae8ffd..0000000
--- a/libjava/gnu/java/awt/java2d/ShapeCache.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ShapeCache__
-#define __gnu_java_awt_java2d_ShapeCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ShapeCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Polygon;
-        class Rectangle;
-      namespace geom
-      {
-          class Arc2D;
-          class Ellipse2D;
-          class GeneralPath;
-          class Line2D;
-          class RoundRectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ShapeCache : public ::java::lang::Object
-{
-
-public:
-  ShapeCache();
-  ::java::awt::geom::Line2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) line;
-  ::java::awt::Rectangle * rect;
-  ::java::awt::geom::RoundRectangle2D * roundRect;
-  ::java::awt::geom::Ellipse2D * ellipse;
-  ::java::awt::geom::Arc2D * arc;
-  ::java::awt::Polygon * polygon;
-  ::java::awt::geom::GeneralPath * polyline;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ShapeCache__
diff --git a/libjava/gnu/java/awt/java2d/ShapeWrapper.h b/libjava/gnu/java/awt/java2d/ShapeWrapper.h
deleted file mode 100644
index 62c9b35..0000000
--- a/libjava/gnu/java/awt/java2d/ShapeWrapper.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_ShapeWrapper__
-#define __gnu_java_awt_java2d_ShapeWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class ShapeWrapper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::ShapeWrapper : public ::java::lang::Object
-{
-
-public:
-  ShapeWrapper(::java::awt::Shape *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-private:
-  ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::lang::Object)))) shape;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ShapeWrapper__
diff --git a/libjava/gnu/java/awt/java2d/TextCacheKey.h b/libjava/gnu/java/awt/java2d/TextCacheKey.h
deleted file mode 100644
index 9904a6a..0000000
--- a/libjava/gnu/java/awt/java2d/TextCacheKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_TextCacheKey__
-#define __gnu_java_awt_java2d_TextCacheKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class TextCacheKey;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::TextCacheKey : public ::java::lang::Object
-{
-
-public:
-  TextCacheKey();
-  TextCacheKey(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  virtual void setString(::java::lang::String *);
-  virtual void setFontRenderContext(::java::awt::font::FontRenderContext *);
-  virtual void setFont(::java::awt::Font *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) string;
-  ::java::awt::font::FontRenderContext * fontRenderContext;
-  ::java::awt::Font * font;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_TextCacheKey__
diff --git a/libjava/gnu/java/awt/java2d/TexturePaintContext.h b/libjava/gnu/java/awt/java2d/TexturePaintContext.h
deleted file mode 100644
index 5074e62..0000000
--- a/libjava/gnu/java/awt/java2d/TexturePaintContext.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_java2d_TexturePaintContext__
-#define __gnu_java_awt_java2d_TexturePaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class TexturePaintContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class TexturePaint;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::java2d::TexturePaintContext : public ::java::lang::Object
-{
-
-public:
-  TexturePaintContext(::java::awt::TexturePaint *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *);
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-private:
-  void ensureRasterSize(jint, jint);
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::WritableRaster * paintRaster;
-  ::java::awt::geom::AffineTransform * transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_TexturePaintContext__
diff --git a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h b/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
deleted file mode 100644
index 5433933..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathDesktopPeer__
-#define __gnu_java_awt_peer_ClasspathDesktopPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class ClasspathDesktopPeer;
-            class GnomeDesktopPeer;
-            class KDEDesktopPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop$Action;
-      namespace peer
-      {
-          class DesktopPeer;
-      }
-    }
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathDesktopPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  ClasspathDesktopPeer();
-public:
-  virtual jboolean isSupported(::java::awt::Desktop$Action *);
-  virtual void browse(::java::net::URI *);
-  virtual void edit(::java::io::File *);
-  virtual void mail(::java::net::URI *);
-  virtual void mail();
-  virtual void open(::java::io::File *);
-  virtual void print(::java::io::File *);
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-  virtual void checkPermissions();
-  virtual void checkPermissions(::java::io::File *, jboolean);
-  virtual void checkPrintPermissions(::java::io::File *);
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  static ::java::awt::peer::DesktopPeer * getDesktop();
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action();
-public: // actually protected
-  static ::java::lang::String * _DEFAULT_BROWSER;
-  static ::java::lang::String * _BROWSE;
-  static ::java::lang::String * _MAIL;
-  static ::java::lang::String * _EDIT;
-  static ::java::lang::String * _PRINT;
-  static ::java::lang::String * _OPEN;
-  static ::gnu::java::awt::peer::KDEDesktopPeer * kde;
-  static ::gnu::java::awt::peer::GnomeDesktopPeer * gnome;
-  static ::gnu::java::awt::peer::ClasspathDesktopPeer * classpath;
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
-private:
-  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
deleted file mode 100644
index 7445662..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
-#define __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class ClasspathFontPeer$LRUCache;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathFontPeer$LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  ClasspathFontPeer$LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) max_entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
deleted file mode 100644
index 18ab58c..0000000
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_ClasspathFontPeer__
-#define __gnu_java_awt_peer_ClasspathFontPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathToolkit;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class ClasspathFontPeer$LRUCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::ClasspathFontPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  static ::gnu::java::awt::ClasspathToolkit * tk();
-  static jboolean isLogicalFontName(::java::lang::String *);
-  static ::java::lang::String * logicalFontNameToFaceName(::java::lang::String *);
-  static ::java::lang::String * faceNameToFamilyName(::java::lang::String *);
-public:
-  static void copyStyleToAttrs(jint, ::java::util::Map *);
-public: // actually protected
-  static void copyFamilyToAttrs(::java::lang::String *, ::java::util::Map *);
-public:
-  static void copySizeToAttrs(jfloat, ::java::util::Map *);
-public: // actually protected
-  static void copyTransformToAttrs(::java::awt::geom::AffineTransform *, ::java::util::Map *);
-  virtual void setStandardAttributes(::java::lang::String *, ::java::lang::String *, jint, jfloat, ::java::awt::geom::AffineTransform *);
-  virtual void setStandardAttributes(::java::lang::String *, ::java::util::Map *);
-  virtual void getStandardAttributes(::java::util::Map *);
-public:
-  ClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  ClasspathFontPeer(::java::lang::String *, jint, jint);
-  virtual ::java::lang::String * getName(::java::awt::Font *);
-  virtual ::java::lang::String * getFamily(::java::awt::Font *);
-  virtual ::java::lang::String * getFamily(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getFontName(::java::awt::Font *);
-  virtual ::java::lang::String * getFontName(::java::awt::Font *, ::java::util::Locale *);
-  virtual jfloat getSize(::java::awt::Font *);
-  virtual jboolean isPlain(::java::awt::Font *);
-  virtual jboolean isBold(::java::awt::Font *);
-  virtual jboolean isItalic(::java::awt::Font *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint, jfloat);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jfloat);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, jint, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::Font *, ::java::util::Map *);
-  virtual ::java::util::Map * getAttributes(::java::awt::Font *);
-  virtual JArray< ::java::text::AttributedCharacterIterator$Attribute * > * getAvailableAttributes(::java::awt::Font *);
-  virtual ::java::awt::geom::AffineTransform * getTransform(::java::awt::Font *);
-  virtual jboolean isTransformed(::java::awt::Font *);
-  virtual jfloat getItalicAngle(::java::awt::Font *);
-  virtual jint getStyle(::java::awt::Font *);
-  virtual jboolean canDisplay(::java::awt::Font *, jint) = 0;
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint) = 0;
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *) = 0;
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *) = 0;
-  virtual jint getNumGlyphs(::java::awt::Font *) = 0;
-  virtual jint getMissingGlyphCode(::java::awt::Font *) = 0;
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar) = 0;
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint) = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0;
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *) = 0;
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *) = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) logicalName;
-  ::java::lang::String * familyName;
-  ::java::lang::String * faceName;
-  jint style;
-  jfloat size;
-  ::java::awt::geom::AffineTransform * transform;
-private:
-  static ::gnu::java::awt::peer::ClasspathFontPeer$LRUCache * transCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_ClasspathFontPeer__
diff --git a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h
deleted file mode 100644
index 89b4c8b..0000000
--- a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_EmbeddedWindowPeer__
-#define __gnu_java_awt_peer_EmbeddedWindowPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class EmbeddedWindowPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::EmbeddedWindowPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void embed(jlong) = 0;
-  virtual void setIconImage(::java::awt::Image *) = 0;
-  virtual void setMenuBar(::java::awt::MenuBar *) = 0;
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual jint getState() = 0;
-  virtual void setState(jint) = 0;
-  virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void setBoundsPrivate(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getBoundsPrivate() = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  virtual void setAlwaysOnTop(jboolean) = 0;
-  virtual void updateFocusableWindowState() = 0;
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
-  virtual void updateMinimumSize() = 0;
-  virtual void updateIconImages() = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_peer_EmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/GLightweightPeer.h b/libjava/gnu/java/awt/peer/GLightweightPeer.h
deleted file mode 100644
index ecf0b46..0000000
--- a/libjava/gnu/java/awt/peer/GLightweightPeer.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_GLightweightPeer__
-#define __gnu_java_awt_peer_GLightweightPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GLightweightPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::GLightweightPeer : public ::java::lang::Object
-{
-
-public:
-  GLightweightPeer();
-  virtual ::java::awt::Insets * insets();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void hide();
-  virtual jboolean isFocusable();
-  virtual jboolean isFocusTraversable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setEventMask(jlong);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual jboolean handlesWheelScrolling();
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_GLightweightPeer__
diff --git a/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h b/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
deleted file mode 100644
index 7621bd1..0000000
--- a/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_GnomeDesktopPeer__
-#define __gnu_java_awt_peer_GnomeDesktopPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GnomeDesktopPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::java::awt::peer::GnomeDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
-{
-
-public:
-  GnomeDesktopPeer();
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-public:
-  virtual void browse(::java::net::URI *);
-public: // actually protected
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  virtual void mail();
-public: // actually protected
-  virtual ::java::lang::String * execQuery(::java::lang::String *);
-private:
-  static ::java::lang::String * BROWSER_QUERY_GNOME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_GnomeDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/KDEDesktopPeer.h b/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
deleted file mode 100644
index 1d6448b..0000000
--- a/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_KDEDesktopPeer__
-#define __gnu_java_awt_peer_KDEDesktopPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class KDEDesktopPeer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::KDEDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
-{
-
-public:
-  KDEDesktopPeer();
-public: // actually protected
-  virtual ::java::lang::String * getCommand(::java::lang::String *);
-  virtual jboolean supportCommand(::java::lang::String *);
-public:
-  virtual void mail();
-public: // actually protected
-  virtual ::java::lang::String * execQuery(::java::lang::String *);
-private:
-  static ::java::lang::String * BROWSER_QUERY_GNOME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_KDEDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h b/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h
deleted file mode 100644
index 48a10a7..0000000
--- a/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_NativeEventLoopRunningEvent__
-#define __gnu_java_awt_peer_NativeEventLoopRunningEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class NativeEventLoopRunningEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::NativeEventLoopRunningEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  NativeEventLoopRunningEvent(::java::lang::Object *);
-  virtual jboolean isRunning();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) running;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_NativeEventLoopRunningEvent__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h
deleted file mode 100644
index aa276f4..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage$Loader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage$Loader__
-#define __gnu_java_awt_peer_gtk_AsyncImage$Loader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-              class AsyncImage$Loader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage$Loader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AsyncImage$Loader(::gnu::java::awt::peer::gtk::AsyncImage *, ::java::net::URL *);
-public:
-  virtual void run();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) url;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage$Loader__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h
deleted file mode 100644
index 86bfeae..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
-#define __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-              class AsyncImage$NullImageSource;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage$NullImageSource : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AsyncImage$NullImageSource(::gnu::java::awt::peer::gtk::AsyncImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::AsyncImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage$NullImageSource__
diff --git a/libjava/gnu/java/awt/peer/gtk/AsyncImage.h b/libjava/gnu/java/awt/peer/gtk/AsyncImage.h
deleted file mode 100644
index d1735ea..0000000
--- a/libjava/gnu/java/awt/peer/gtk/AsyncImage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_AsyncImage__
-#define __gnu_java_awt_peer_gtk_AsyncImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class AsyncImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::AsyncImage : public ::java::awt::Image
-{
-
-public: // actually package-private
-  AsyncImage(::java::net::URL *);
-public:
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  virtual void addObserver(::java::awt::image::ImageObserver *);
-  static ::java::awt::Image * realImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual void notifyObservers(jint);
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage__;
-  ::java::util::HashSet * observers;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_AsyncImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
deleted file mode 100644
index 032eb27..0000000
--- a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_BufferedImageGraphics__
-#define __gnu_java_awt_peer_gtk_BufferedImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class BufferedImageGraphics;
-              class CairoSurface;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::BufferedImageGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public:
-  BufferedImageGraphics(::java::awt::image::BufferedImage *);
-public: // actually package-private
-  BufferedImageGraphics(::gnu::java::awt::peer::gtk::BufferedImageGraphics *);
-private:
-  void updateBufferedImage(jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-private:
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) image;
-  ::java::awt::image::BufferedImage * buffer;
-  jint imageWidth;
-  jint imageHeight;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::CairoSurface * surface;
-  static ::java::util::WeakHashMap * bufferedImages;
-private:
-  jlong cairo_t;
-  jboolean hasFastCM;
-  jboolean hasAlpha;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_BufferedImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
deleted file mode 100644
index 5d5ee49..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
+++ /dev/null
@@ -1,279 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__
-#define __gnu_java_awt_peer_gtk_CairoGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoGraphics2D;
-              class CairoSurface;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BasicStroke;
-        class Color;
-        class Composite;
-        class CompositeContext;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-          class ImageObserver;
-          class Raster;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoGraphics2D : public ::java::awt::Graphics2D
-{
-
-public:
-  CairoGraphics2D();
-  virtual void setup(jlong);
-  virtual void copy(::gnu::java::awt::peer::gtk::CairoGraphics2D *, jlong);
-  virtual void finalize();
-  virtual void dispose();
-public: // actually protected
-  virtual jlong init(jlong);
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-public: // actually protected
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds() = 0;
-public:
-  virtual void disposeNative(jlong);
-public: // actually protected
-  virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint);
-  virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint);
-  virtual void cairoSetMatrix(jlong, JArray< jdouble > *);
-  virtual void cairoScale(jlong, jdouble, jdouble);
-  virtual void cairoSetOperator(jlong, jint);
-  virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSetFillRule(jlong, jint);
-  virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
-  virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-  virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *, JArray< jlong > *);
-  virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *);
-  virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSave(jlong);
-  virtual void cairoRestore(jlong);
-  virtual void cairoNewPath(jlong);
-  virtual void cairoClosePath(jlong);
-  virtual void cairoMoveTo(jlong, jdouble, jdouble);
-  virtual void cairoLineTo(jlong, jdouble, jdouble);
-  virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoStroke(jlong);
-  virtual void cairoFill(jlong, jdouble);
-  virtual void cairoClip(jlong);
-  virtual void cairoResetClip(jlong);
-  virtual void cairoSetAntialias(jlong, jboolean);
-public:
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-private:
-  void setTransformImpl(::java::awt::geom::AffineTransform *);
-public:
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void translate(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void shear(jdouble, jdouble);
-  virtual void clip(::java::awt::Shape *);
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setPaint(::java::awt::Paint *);
-public: // actually protected
-  virtual void setCustomPaint(::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void setStroke(::java::awt::Stroke *);
-public: // actually protected
-  virtual ::java::awt::Rectangle * findStrokedBounds(::java::awt::Shape *);
-public:
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void setColor(::java::awt::Color *);
-public: // actually package-private
-  virtual void updateColor();
-public:
-  virtual ::java::awt::Color * getColor();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getClipInDevSpace();
-public:
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setComposite(::java::awt::Composite *);
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM() = 0;
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-public:
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-private:
-  void createPath(::java::awt::Shape *, jboolean);
-public:
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-private:
-  jint getInterpolation();
-  void setAntialias(jboolean);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
-public:
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Font * getFont();
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  jboolean drawRaster(::java::awt::image::ColorModel *, ::java::awt::image::Raster *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *);
-  jdouble shiftX(jdouble, jboolean);
-  jdouble shiftY(jdouble, jboolean);
-  void walkPath(::java::awt::geom::PathIterator *, jboolean);
-  ::java::util::Map * getDefaultHints();
-public:
-  static JArray< jint > * findSimpleIntegerArray(::java::awt::image::ColorModel *, ::java::awt::image::Raster *);
-private:
-  void updateClip(::java::awt::geom::AffineTransform *);
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-public: // actually package-private
-  static ::java::awt::geom::Rectangle2D * getTransformedBounds(::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *);
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativePointer;
-  ::java::awt::Paint * paint;
-  jboolean customPaint;
-  ::java::awt::Stroke * stroke;
-  ::java::awt::Color * fg;
-  ::java::awt::Color * bg;
-  ::java::awt::Shape * clip__;
-  ::java::awt::geom::AffineTransform * transform__;
-  ::java::awt::Font * font;
-  ::java::awt::Composite * comp;
-  ::java::awt::CompositeContext * compCtx;
-private:
-  ::java::awt::RenderingHints * hints;
-  jboolean antialias;
-  jboolean ignoreAA;
-public: // actually protected
-  jboolean shiftDrawCalls;
-private:
-  jboolean firstClip;
-  ::java::awt::Shape * originalClip;
-  static ::java::awt::BasicStroke * draw3DRectStroke;
-public: // actually package-private
-  static ::java::awt::image::ColorModel * rgb32;
-  static ::java::awt::image::ColorModel * argb32;
-public:
-  static const jint INTERPOLATION_NEAREST = 0;
-  static const jint INTERPOLATION_BILINEAR = 1;
-  static const jint INTERPOLATION_BICUBIC = 5;
-  static const jint ALPHA_INTERPOLATION_SPEED = 2;
-  static const jint ALPHA_INTERPOLATION_QUALITY = 3;
-  static const jint ALPHA_INTERPOLATION_DEFAULT = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoGraphics2D__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
deleted file mode 100644
index 7e34ee9..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurface__
-#define __gnu_java_awt_peer_gtk_CairoSurface__
-
-#pragma interface
-
-#include <java/awt/image/WritableRaster.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster
-{
-
-  void create(jint, jint, jint, JArray< jint > *);
-  void destroy(jlong, JArray< jint > *);
-public:
-  virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint);
-public: // actually package-private
-  virtual void syncNativeToJava(jlong, JArray< jint > *);
-  virtual void syncJavaToNative(jlong, JArray< jint > *);
-  virtual jlong getFlippedBuffer(jlong);
-public:
-  CairoSurface(jint, jint);
-  CairoSurface(jint, jint, jint, jint);
-  CairoSurface(::java::awt::image::SampleModel *, ::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::Rectangle *, ::java::awt::Point *);
-public: // actually package-private
-  CairoSurface(::gnu::java::awt::peer::gtk::GtkImage *);
-public:
-  virtual void dispose();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
-  virtual JArray< jint > * getData();
-  static ::java::awt::image::BufferedImage * getBufferedImage(jint, jint);
-  static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::GtkImage *);
-  static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::CairoSurface *);
-  virtual ::java::awt::Graphics2D * getGraphics();
-public: // actually package-private
-  virtual jlong nativeNewCairoContext(jlong);
-public:
-  virtual jlong newCairoContext();
-  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint);
-public: // actually protected
-  static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint);
-public:
-  static jboolean isCompatibleColorModel(::java::awt::image::ColorModel *);
-  static jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width;
-  jint height;
-  jlong surfacePointer;
-  jboolean sharedBuffer;
-  static ::java::awt::image::ColorModel * cairoColorModel;
-  static ::java::awt::image::ColorModel * cairoCM_pre;
-  static ::java::awt::image::ColorModel * cairoCM_opaque;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurface__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h b/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h
deleted file mode 100644
index 938da7b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
-#define __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class CairoSurfaceGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurfaceGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public:
-  CairoSurfaceGraphics(::gnu::java::awt::peer::gtk::CairoSurface *);
-private:
-  CairoSurfaceGraphics(::gnu::java::awt::peer::gtk::CairoSurfaceGraphics *);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual ::java::awt::image::ColorModel * getBufferCM();
-  ::gnu::java::awt::peer::gtk::CairoSurface * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) surface;
-private:
-  ::java::awt::image::BufferedImage * buffer;
-  jlong cairo_t;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurfaceGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
deleted file mode 100644
index a9b70e7..0000000
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
-#define __gnu_java_awt_peer_gtk_ComponentGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoGraphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class ComponentGraphics;
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::ComponentGraphics : public ::gnu::java::awt::peer::gtk::CairoGraphics2D
-{
-
-public: // actually package-private
-  ComponentGraphics();
-private:
-  ComponentGraphics(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  ComponentGraphics(::gnu::java::awt::peer::gtk::ComponentGraphics *);
-  jlong initState(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  void lock();
-  void unlock();
-public: // actually protected
-  virtual jlong initFromVolatile(jlong);
-private:
-  void start_gdk_drawing();
-  void end_gdk_drawing();
-public:
-  static jboolean hasXRender();
-private:
-  static ::gnu::classpath::Pointer * nativeGrab(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  void copyAreaNative(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint, jint, jint, jint, jint);
-  void drawVolatile(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jlong, jint, jint, jint, jint, jint, jint, jint, jint);
-public:
-  static ::gnu::java::awt::peer::gtk::GtkImage * grab(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  static ::java::awt::Graphics2D * getComponentGraphics(::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::Graphics * create();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-  virtual jlong init(jlong);
-  virtual void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint);
-  virtual void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint);
-  virtual void cairoSetMatrix(jlong, JArray< jdouble > *);
-  virtual void cairoScale(jlong, jdouble, jdouble);
-  virtual void cairoSetOperator(jlong, jint);
-  virtual void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSetFillRule(jlong, jint);
-  virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
-  virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-  virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoSave(jlong);
-  virtual void cairoRestore(jlong);
-  virtual void cairoNewPath(jlong);
-  virtual void cairoClosePath(jlong);
-  virtual void cairoMoveTo(jlong, jdouble, jdouble);
-  virtual void cairoLineTo(jlong, jdouble, jdouble);
-  virtual void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void cairoStroke(jlong);
-  virtual void cairoFill(jlong, jdouble);
-  virtual void cairoClip(jlong);
-  virtual void cairoResetClip(jlong);
-  virtual void cairoSetAntialias(jlong, jboolean);
-  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
-private:
-  static jboolean hasXRenderExtension;
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) component;
-public: // actually protected
-  jlong cairo_t;
-private:
-  ::java::awt::image::BufferedImage * buffer;
-  ::java::awt::image::BufferedImage * componentBuffer;
-  static ::java::lang::ThreadLocal * hasLock;
-  static ::java::lang::Integer * ONE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_ComponentGraphics__
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h
deleted file mode 100644
index 7ba10f8..0000000
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
-#define __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/CairoSurfaceGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class ComponentGraphicsCopy;
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-          class RenderedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::ComponentGraphicsCopy : public ::gnu::java::awt::peer::gtk::CairoSurfaceGraphics
-{
-
-public: // actually package-private
-  virtual void getPixbuf(::gnu::java::awt::peer::gtk::GtkComponentPeer *, ::gnu::java::awt::peer::gtk::GtkImage *);
-  virtual void copyPixbuf(::gnu::java::awt::peer::gtk::GtkComponentPeer *, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint, jint, jint);
-public:
-  ComponentGraphicsCopy(jint, jint, ::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-private:
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoSurfaceGraphics)))) component;
-  ::gnu::java::awt::peer::gtk::GtkImage * gtkimage;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_ComponentGraphicsCopy__
diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
deleted file mode 100644
index 3f7a629..0000000
--- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
-#define __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
-
-#pragma interface
-
-#include <java/awt/font/GlyphVector.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class FreetypeGlyphVector;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::FreetypeGlyphVector : public ::java::awt::font::GlyphVector
-{
-
-  void dispose(JArray< jlong > *);
-  jlong getNativeFontPointer(jint);
-public:
-  FreetypeGlyphVector(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  FreetypeGlyphVector(::java::awt::Font *, JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *, jint);
-  FreetypeGlyphVector(::java::awt::Font *, JArray< jint > *, ::java::awt::font::FontRenderContext *);
-private:
-  FreetypeGlyphVector(::gnu::java::awt::peer::gtk::FreetypeGlyphVector *);
-public:
-  virtual void finalize();
-private:
-  void getGlyphs();
-public:
-  virtual void getGlyphs(JArray< jint > *, JArray< jint > *, JArray< jlong > *);
-private:
-  void getKerning(jint, jint, jlong, JArray< jfloat > *);
-  JArray< jdouble > * getMetricsNative(jint, jlong);
-  ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint, jlong);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::font::GlyphVector *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void performDefaultLayout();
-  virtual jint getGlyphCode(jint);
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *);
-public: // actually protected
-  virtual JArray< jlong > * getGlyphFonts(jint, jint, JArray< jlong > *);
-public:
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint);
-  virtual void setupGlyphMetrics();
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual ::java::awt::Shape * getGlyphOutline(jint);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *);
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
-public: // actually protected
-  virtual jboolean hasTransforms();
-public:
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint);
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds();
-  virtual jint getNumGlyphs();
-  virtual ::java::awt::Shape * getOutline();
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint);
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds();
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *);
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *);
-private:
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::GlyphVector)))) font;
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * peer;
-  ::java::awt::geom::Rectangle2D * logicalBounds;
-  JArray< jfloat > * glyphPositions;
-  ::java::lang::String * s;
-  ::java::awt::font::FontRenderContext * frc;
-  jint nGlyphs;
-  JArray< jint > * glyphCodes;
-  JArray< jlong > * fontSet;
-  JArray< ::java::awt::geom::AffineTransform * > * glyphTransforms;
-  JArray< ::java::awt::font::GlyphMetrics * > * metricsCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h
deleted file mode 100644
index 508a37d..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
-
-#pragma interface
-
-#include <java/awt/font/LineMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontLineMetrics;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontLineMetrics : public ::java::awt::font::LineMetrics
-{
-
-public:
-  GdkFontPeer$GdkFontLineMetrics(::gnu::java::awt::peer::gtk::GdkFontPeer *, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jint);
-  virtual jfloat getAscent();
-  virtual jint getBaselineIndex();
-  virtual JArray< jfloat > * getBaselineOffsets();
-  virtual jfloat getDescent();
-  virtual jfloat getHeight();
-  virtual jfloat getLeading();
-  virtual jint getNumChars();
-  virtual jfloat getStrikethroughOffset();
-  virtual jfloat getStrikethroughThickness();
-  virtual jfloat getUnderlineOffset();
-  virtual jfloat getUnderlineThickness();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) nchars;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontLineMetrics__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h
deleted file mode 100644
index 0c9961b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontMetrics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics : public ::java::awt::FontMetrics
-{
-
-public:
-  GdkFontPeer$GdkFontMetrics(::gnu::java::awt::peer::gtk::GdkFontPeer *, ::java::awt::Font *);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint getHeight();
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getMaxAscent();
-  virtual jint getDescent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxAdvance();
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer$GdkFontMetrics__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
deleted file mode 100644
index ebfdd2c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontPeer__
-#define __gnu_java_awt_peer_gtk_GdkFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontPeer;
-              class GdkFontPeer$GdkFontMetrics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphMetrics;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public: // actually package-private
-  static void initStaticState();
-private:
-  void initState();
-  void dispose();
-  void setFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void getFontMetrics(JArray< jdouble > *);
-  virtual void getTextMetrics(::java::lang::String *, JArray< jdouble > *);
-  virtual void releasePeerGraphicsResource();
-public: // actually protected
-  virtual void finalize();
-private:
-  ::java::lang::String * buildString(::java::text::CharacterIterator *);
-  ::java::lang::String * buildString(::java::text::CharacterIterator *, jint, jint);
-  ::java::lang::String * buildString(JArray< jchar > *, jint, jint);
-public:
-  GdkFontPeer(::java::lang::String *, jint);
-  GdkFontPeer(::java::lang::String *, jint, jint);
-  GdkFontPeer(::java::lang::String *, ::java::util::Map *);
-public: // actually package-private
-  static ::java::awt::Font * initFont(::java::awt::Font *);
-private:
-  void setupMetrics();
-public:
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-private:
-  JArray< jbyte > * getTrueTypeTable(jbyte, jbyte, jbyte, jbyte);
-public:
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-private:
-  ::java::lang::String * getName(jint, ::java::util::Locale *);
-public:
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually package-private
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual void putGlyphMetrics(jint, ::java::awt::font::GlyphMetrics *);
-  static ::java::awt::font::FontRenderContext * DEFAULT_CTX;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) textLayoutCache;
-private:
-  jint native_state;
-  ::java::util::HashMap * metricsCache;
-  static const jint FONT_METRICS_ASCENT = 0;
-  static const jint FONT_METRICS_MAX_ASCENT = 1;
-  static const jint FONT_METRICS_DESCENT = 2;
-  static const jint FONT_METRICS_MAX_DESCENT = 3;
-  static const jint FONT_METRICS_MAX_ADVANCE = 4;
-  static const jint FONT_METRICS_HEIGHT = 5;
-  static const jint FONT_METRICS_UNDERLINE_OFFSET = 6;
-  static const jint FONT_METRICS_UNDERLINE_THICKNESS = 7;
-public: // actually package-private
-  jfloat ascent;
-  jfloat descent;
-  jfloat maxAscent;
-  jfloat maxDescent;
-  jfloat maxAdvance;
-  jfloat height;
-  jfloat underlineOffset;
-  jfloat underlineThickness;
-  ::gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics * metrics;
-private:
-  ::java::nio::ByteBuffer * nameTable;
-  ::gnu::classpath::Pointer * nativeFont;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h
deleted file mode 100644
index d36580f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
-#define __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
-
-#pragma interface
-
-#include <java/awt/GraphicsConfiguration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsConfiguration;
-              class GdkScreenGraphicsDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkGraphicsConfiguration : public ::java::awt::GraphicsConfiguration
-{
-
-public:
-  GdkGraphicsConfiguration(::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice *);
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::ColorModel * getColorModel(jint);
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform();
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::BufferCapabilities * getBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getImageCapabilities();
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * __attribute__((aligned(__alignof__( ::java::awt::GraphicsConfiguration)))) gdkScreenGraphicsDevice;
-  ::java::awt::image::ColorModel * opaqueColorModel;
-  ::java::awt::image::ColorModel * bitmaskColorModel;
-  ::java::awt::image::ColorModel * translucentColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkGraphicsConfiguration__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
deleted file mode 100644
index 978c2ec..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
-#define __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathGraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsEnvironment;
-              class GdkScreenGraphicsDevice;
-              class GtkWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment
-{
-
-  static void initIDs();
-public:
-  GdkGraphicsEnvironment();
-public: // actually package-private
-  virtual void nativeInitState();
-public:
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-private:
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * nativeGetScreenDevices();
-public:
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-private:
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * nativeGetDefaultScreenDevice();
-public:
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-private:
-  jint nativeGetNumFontFamilies();
-  void nativeGetFontFamilies(JArray< ::java::lang::String * > *);
-public:
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-public: // actually package-private
-  virtual JArray< jint > * getMouseCoordinates();
-  virtual jboolean isWindowUnderMouse(::gnu::java::awt::peer::gtk::GtkWindowPeer *);
-public:
-  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathGraphicsEnvironment)))) native_state;
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice;
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices;
-  ::gnu::classpath::Pointer * display;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h
deleted file mode 100644
index 197639f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder;
-              class GdkPixbufDecoder$GdkPixbufReader;
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReader : public ::javax::imageio::ImageReader
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufReader(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi *, ::java::lang::Object *);
-  GdkPixbufDecoder$GdkPixbufReader(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi *, ::java::lang::Object *, ::gnu::java::awt::peer::gtk::GdkPixbufDecoder *);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-  virtual ::java::awt::image::BufferedImage * getBufferedImage();
-  virtual jint getNumImages(jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getHeight(jint);
-  virtual jint getWidth(jint);
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkPixbufDecoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) dec;
-  ::java::awt::image::BufferedImage * bufferedImage;
-  ::java::awt::image::ColorModel * defaultModel;
-  jint width;
-  jint height;
-  ::java::lang::String * ext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReader__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h
deleted file mode 100644
index 1181671..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufReaderSpi();
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufReaderSpi__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h
deleted file mode 100644
index d88b2ae..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufWriter;
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriter : public ::javax::imageio::ImageWriter
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufWriter(::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi *, ::java::lang::Object *);
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *);
-  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  void write(JArray< jbyte > *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriter)))) ext;
-private:
-  static ::java::lang::Object * DATADONE;
-  ::java::util::ArrayList * data;
-  ::java::io::IOException * exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriter__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h
deleted file mode 100644
index d8ac5af..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageWriterSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-        class ImageWriter;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi : public ::javax::imageio::spi::ImageWriterSpi
-{
-
-public:
-  GdkPixbufDecoder$GdkPixbufWriterSpi();
-  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *);
-  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$GdkPixbufWriterSpi__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h
deleted file mode 100644
index 03316f5..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder$ImageFormatSpec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder$ImageFormatSpec : public ::java::lang::Object
-{
-
-public:
-  GdkPixbufDecoder$ImageFormatSpec(::java::lang::String *, jboolean);
-  virtual void addMimeType(::java::lang::String *);
-  virtual void addExtension(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jboolean writable;
-  ::java::util::ArrayList * mimeTypes;
-  ::java::util::ArrayList * extensions;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder$ImageFormatSpec__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
deleted file mode 100644
index 1c5fa79..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
-#define __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
-
-#pragma interface
-
-#include <gnu/java/awt/image/ImageDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkPixbufDecoder;
-              class GdkPixbufDecoder$GdkPixbufReaderSpi;
-              class GdkPixbufDecoder$GdkPixbufWriter;
-              class GdkPixbufDecoder$GdkPixbufWriterSpi;
-              class GdkPixbufDecoder$ImageFormatSpec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkPixbufDecoder : public ::gnu::java::awt::image::ImageDecoder
-{
-
-public: // actually package-private
-  static void initStaticState();
-  virtual void initState();
-  virtual void pumpBytes(JArray< jbyte > *, jint);
-  virtual void pumpDone();
-  virtual void finish(jboolean);
-  static void streamImage(JArray< jint > *, ::java::lang::String *, jint, jint, jboolean, ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriter *);
-public:
-  GdkPixbufDecoder(::java::io::DataInput *);
-  GdkPixbufDecoder(::java::io::InputStream *);
-  GdkPixbufDecoder(::java::lang::String *);
-  GdkPixbufDecoder(::java::net::URL *);
-  GdkPixbufDecoder(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual void areaPrepared(jint, jint);
-  virtual void areaUpdated(jint, jint, jint, jint, JArray< jint > *, jint);
-public:
-  virtual void produce(::java::util::Vector *, ::java::io::InputStream *);
-  virtual void finalize();
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$ImageFormatSpec * registerFormat(::java::lang::String *, jboolean);
-public: // actually package-private
-  static JArray< ::java::lang::String * > * getFormatNames(jboolean);
-  static JArray< ::java::lang::String * > * getFormatExtensions(jboolean);
-  static JArray< ::java::lang::String * > * getFormatMimeTypes(jboolean);
-  static ::java::lang::String * findFormatName(::java::lang::Object *, jboolean);
-public:
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi * getReaderSpi();
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi * getWriterSpi();
-  static void registerSpis(::javax::imageio::spi::IIORegistry *);
-public: // actually package-private
-  static ::java::lang::Object * pixbufLock;
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::image::ImageDecoder)))) native_state;
-  jboolean needsClose;
-public: // actually package-private
-  ::java::util::Vector * curr;
-private:
-  ::gnu::classpath::Pointer * nativeDecoder;
-public: // actually package-private
-  static ::java::awt::image::ColorModel * cm;
-  static ::java::util::ArrayList * imageFormatSpecs;
-private:
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufReaderSpi * readerSpi;
-  static ::gnu::java::awt::peer::gtk::GdkPixbufDecoder$GdkPixbufWriterSpi * writerSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkPixbufDecoder__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
deleted file mode 100644
index 24c6a85..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkRobotPeer__
-#define __gnu_java_awt_peer_gtk_GdkRobotPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkRobotPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkRobotPeer : public ::java::lang::Object
-{
-
-public:
-  GdkRobotPeer(::java::awt::GraphicsDevice *);
-public: // actually package-private
-  virtual jboolean initXTest();
-public:
-  virtual void mouseMove(jint, jint);
-  virtual void mousePress(jint);
-  virtual void mouseRelease(jint);
-  virtual void mouseWheel(jint);
-  virtual void keyPress(jint);
-  virtual void keyRelease(jint);
-public: // actually package-private
-  virtual JArray< jint > * nativeGetRGBPixels(jint, jint, jint, jint);
-public:
-  virtual jint getRGBPixel(jint, jint);
-  virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *);
-  virtual void dispose();
-public: // actually package-private
-  static ::java::awt::image::ColorModel * cm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkRobotPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h
deleted file mode 100644
index 5c27e4c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
-#define __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkScreenGraphicsDevice$X11DisplayMode;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GdkScreenGraphicsDevice$X11DisplayMode(jint, jint, JArray< jshort > *);
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rates;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice$X11DisplayMode__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
deleted file mode 100644
index ff0362b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
-#define __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
-
-#pragma interface
-
-#include <java/awt/GraphicsDevice.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsConfiguration;
-              class GdkGraphicsEnvironment;
-              class GdkScreenGraphicsDevice;
-              class GdkScreenGraphicsDevice$X11DisplayMode;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfiguration;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice : public ::java::awt::GraphicsDevice
-{
-
-public: // actually package-private
-  static void initIDs();
-  GdkScreenGraphicsDevice(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-  virtual void init();
-  virtual ::java::awt::DisplayMode * nativeGetFixedDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual jint getType();
-  virtual ::java::lang::String * getIDstring();
-private:
-  ::java::lang::String * nativeGetIDString();
-public:
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations();
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration();
-  virtual ::java::awt::DisplayMode * getDisplayMode();
-public: // actually package-private
-  virtual jint nativeGetDisplayModeIndex(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-  virtual jint nativeGetDisplayModeRate(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual JArray< ::java::awt::DisplayMode * > * getDisplayModes();
-public: // actually package-private
-  virtual JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * nativeGetDisplayModes(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
-public:
-  virtual jboolean isFullScreenSupported();
-  virtual jboolean isDisplayChangeSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-public: // actually package-private
-  virtual void nativeSetDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *, jint, jshort);
-public:
-  virtual void setFullScreenWindow(::java::awt::Window *);
-  virtual ::java::awt::Window * getFullScreenWindow();
-public: // actually package-private
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * nativeGetBounds();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsDevice)))) native_state;
-  ::java::awt::Window * fullscreenWindow;
-  jboolean oldWindowDecorationState;
-  ::java::awt::Rectangle * oldWindowBounds;
-  ::java::awt::Rectangle * bounds;
-  JArray< ::gnu::java::awt::peer::gtk::GdkGraphicsConfiguration * > * configurations;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment * env;
-  ::java::lang::String * idString;
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * displayModes;
-  ::java::awt::DisplayMode * fixedDisplayMode;
-private:
-  ::gnu::classpath::Pointer * screen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h
deleted file mode 100644
index 6abd267..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkButtonPeer__
-#define __gnu_java_awt_peer_gtk_GtkButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkButtonPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkButtonPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(::java::lang::String *);
-public:
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkSetLabel(::java::lang::String *);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkActivate();
-  virtual void gtkWidgetRequestFocus();
-  virtual void setNativeBounds(jint, jint, jint, jint);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-public:
-  GtkButtonPeer(::java::awt::Button *);
-public: // actually package-private
-  virtual void create();
-public:
-  virtual void setLabel(::java::lang::String *);
-public: // actually package-private
-  virtual void postActionEvent(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h
deleted file mode 100644
index 3808c2f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCanvasPeer__
-#define __gnu_java_awt_peer_gtk_GtkCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCanvasPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Dimension;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCanvasPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-public:
-  GtkCanvasPeer(::java::awt::Canvas *);
-  virtual ::java::awt::Dimension * preferredSize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h
deleted file mode 100644
index 2a2f455..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
-#define __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuItemPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCheckboxMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class CheckboxMenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCheckboxMenuItemPeer : public ::gnu::java::awt::peer::gtk::GtkMenuItemPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-public:
-  GtkCheckboxMenuItemPeer(::java::awt::CheckboxMenuItem *);
-  virtual void setState(jboolean);
-public: // actually protected
-  virtual void postMenuActionEvent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h
deleted file mode 100644
index e97d21f..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
-#define __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCheckboxPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCheckboxPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  virtual void createCheckButton();
-  virtual void createRadioButton(jlong);
-  virtual void addToGroup(jlong);
-  virtual void removeFromGroup();
-  virtual void switchToGroup(jlong);
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkButtonSetLabel(::java::lang::String *);
-  virtual void gtkToggleButtonSetActive(jboolean);
-public:
-  GtkCheckboxPeer(::java::awt::Checkbox *);
-  virtual void create();
-  virtual void setState(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void postItemEvent(::java::lang::Object *, jboolean);
-  virtual void addToGroupMap(jlong);
-  virtual void dispose();
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) current_group;
-private:
-  jboolean currentState;
-  static ::java::util::WeakHashMap * groupMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h
deleted file mode 100644
index 632fb40..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkChoicePeer__
-#define __gnu_java_awt_peer_gtk_GtkChoicePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkChoicePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Choice;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkChoicePeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  GtkChoicePeer(::java::awt::Choice *);
-public: // actually package-private
-  virtual void create();
-  virtual jint nativeGetSelected();
-  virtual void connectSignals();
-  virtual void selectNative(jint);
-  virtual void selectNativeUnlocked(jint);
-public:
-  virtual void add(::java::lang::String *, jint);
-public: // actually package-private
-  virtual void nativeRemove(jint);
-  virtual void nativeRemoveAll();
-public:
-  virtual void select(jint);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void addItem(::java::lang::String *, jint);
-public: // actually protected
-  virtual void postChoiceItemEvent(jint);
-public:
-  virtual void handleEvent(::java::awt::AWTEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) selected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkChoicePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h b/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h
deleted file mode 100644
index 24b275a..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkClipboard.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkClipboard__
-#define __gnu_java_awt_peer_gtk_GtkClipboard__
-
-#pragma interface
-
-#include <java/awt/datatransfer/Clipboard.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class ClipboardOwner;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkClipboard : public ::java::awt::datatransfer::Clipboard
-{
-
-  GtkClipboard(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * getClipboardInstance();
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * getSelectionInstance();
-private:
-  void setSystemContents(jboolean);
-public:
-  virtual void setContents(::java::awt::datatransfer::Transferable *, ::java::awt::datatransfer::ClipboardOwner *);
-private:
-  void advertiseContent(JArray< ::java::lang::String * > *, jboolean, jboolean, jboolean);
-  ::java::lang::String * provideText();
-  ::gnu::java::awt::peer::gtk::GtkImage * provideImage();
-  JArray< ::java::lang::String * > * provideURIs();
-  JArray< jbyte > * provideContent(::java::lang::String *);
-  static jboolean initNativeState(::gnu::java::awt::peer::gtk::GtkClipboard *, ::gnu::java::awt::peer::gtk::GtkClipboard *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * clipboard;
-  static ::gnu::java::awt::peer::gtk::GtkClipboard * selection;
-  static ::java::lang::String * stringMimeType;
-  static ::java::lang::String * imageMimeType;
-  static ::java::lang::String * filesMimeType;
-  static jboolean canCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkClipboard__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h b/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h
deleted file mode 100644
index 59d04d0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkClipboardNotifier.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
-#define __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkClipboardNotifier;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkClipboardNotifier : public ::java::lang::Thread
-{
-
-  GtkClipboardNotifier();
-public: // actually package-private
-  static void announce(::gnu::java::awt::peer::gtk::GtkClipboard *);
-public:
-  virtual void run();
-private:
-  static jboolean announceClipboardChange;
-  static jboolean announcePrimaryChange;
-  static ::gnu::java::awt::peer::gtk::GtkClipboardNotifier * notifier;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkClipboardNotifier__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h
deleted file mode 100644
index c556b52..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
-#define __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer$RepaintTimerTask;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkComponentPeer$RepaintTimerTask : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  GtkComponentPeer$RepaintTimerTask(::java::awt::Component *, jint, jint, jint, jint);
-public:
-  virtual void run();
-public: // actually package-private
-  static void schedule(jlong, jint, jint, jint, jint, ::java::awt::Component *);
-private:
-  static ::java::util::Timer * repaintTimer;
-  jint __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) x;
-  jint y;
-  jint width;
-  jint height;
-  ::java::awt::Component * awtComponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkComponentPeer$RepaintTimerTask__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
deleted file mode 100644
index 78c7127..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
+++ /dev/null
@@ -1,208 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkComponentPeer__
-#define __gnu_java_awt_peer_gtk_GtkComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-        class Window;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually package-private
-  virtual jboolean isEnabled();
-  static jboolean modalHasGrab();
-  virtual JArray< jint > * gtkWidgetGetForeground();
-  virtual JArray< jint > * gtkWidgetGetBackground();
-  virtual void gtkWidgetGetDimensions(JArray< jint > *);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-  virtual void gtkWindowGetLocationOnScreen(JArray< jint > *);
-  virtual void gtkWindowGetLocationOnScreenUnlocked(JArray< jint > *);
-  virtual void gtkWidgetGetLocationOnScreen(JArray< jint > *);
-  virtual void gtkWidgetGetLocationOnScreenUnlocked(JArray< jint > *);
-  virtual void gtkWidgetSetCursor(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
-  virtual void gtkWidgetSetCursorUnlocked(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-  virtual void gtkWidgetSetSensitive(jboolean);
-  virtual void gtkWidgetSetParent(::java::awt::peer::ComponentPeer *);
-  virtual void gtkWidgetRequestFocus();
-  virtual void gtkWidgetDispatchKeyEvent(jint, jlong, jint, jint, jint);
-  virtual jboolean gtkWidgetHasFocus();
-  virtual jboolean gtkWidgetCanFocus();
-  virtual void realize();
-  virtual void setNativeEventMask();
-  virtual void create();
-  virtual void connectSignals();
-public: // actually protected
-  GtkComponentPeer(::java::awt::Component *);
-public: // actually package-private
-  virtual void setParentAndBounds();
-  virtual void setParent();
-  virtual void setComponentBounds();
-  virtual void setVisibleAndEnabled();
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void enable();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void paintComponent(::java::awt::event::PaintEvent *);
-  virtual void updateComponent(::java::awt::event::PaintEvent *);
-public:
-  virtual jboolean isFocusTraversable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-public: // actually package-private
-  virtual void setNativeBounds(jint, jint, jint, jint);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void setCursor();
-public:
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setVisibleNative(jboolean);
-  virtual void setVisibleNativeUnlocked(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void hide();
-  virtual void show();
-public: // actually protected
-  virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean);
-  virtual void postMouseWheelEvent(jint, jlong, jint, jint, jint, jint, jboolean, jint, jint, jint);
-  virtual void postExposeEvent(jint, jint, jint, jint);
-  virtual void postKeyEvent(jint, jlong, jint, jint, jchar, jint);
-  virtual void postFocusEvent(jint, jboolean);
-  virtual void postItemEvent(::java::lang::Object *, jint);
-  virtual void postTextEvent();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual void setEventMask(jlong);
-  virtual jboolean isFocusable();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-private:
-  ::java::awt::Window * getWindowFor(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isLightweightDescendant(::java::awt::Component *);
-public:
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual jboolean handlesWheelScrolling();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually package-private
-  ::java::awt::image::VolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) backBuffer;
-  ::java::awt::BufferCapabilities * caps;
-  ::java::awt::Component * awtComponent;
-  ::java::awt::Insets * insets;
-private:
-  ::java::awt::Rectangle * currentPaintArea;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h
deleted file mode 100644
index 6097fc8..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkContainerPeer__
-#define __gnu_java_awt_peer_gtk_GtkContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkContainerPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Container;
-        class Font;
-        class Insets;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkContainerPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public:
-  GtkContainerPeer(::java::awt::Container *);
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setFont(::java::awt::Font *);
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual void setBackground(::java::awt::Color *);
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-public: // actually package-private
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkComponentPeer)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCursor.h b/libjava/gnu/java/awt/peer/gtk/GtkCursor.h
deleted file mode 100644
index c0e6375..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkCursor.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkCursor__
-#define __gnu_java_awt_peer_gtk_GtkCursor__
-
-#pragma interface
-
-#include <java/awt/Cursor.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkCursor;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-        class Point;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkCursor : public ::java::awt::Cursor
-{
-
-public: // actually package-private
-  GtkCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-  virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
-  virtual ::java::awt::Point * getHotspot();
-private:
-  ::gnu::java::awt::peer::gtk::GtkImage * __attribute__((aligned(__alignof__( ::java::awt::Cursor)))) image;
-  ::java::awt::Point * hotspot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkCursor__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h
deleted file mode 100644
index d143f47..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkDialogPeer__
-#define __gnu_java_awt_peer_gtk_GtkDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkDialogPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkDialogPeer : public ::gnu::java::awt::peer::gtk::GtkWindowPeer
-{
-
-public:
-  GtkDialogPeer(::java::awt::Dialog *);
-public: // actually package-private
-  virtual void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h
deleted file mode 100644
index 6dea24e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
-#define __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkFramePeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkEmbeddedWindowPeer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkEmbeddedWindowPeer : public ::gnu::java::awt::peer::gtk::GtkFramePeer
-{
-
-public: // actually package-private
-  virtual void create(jlong);
-  virtual void create();
-  virtual void construct(jlong);
-public:
-  virtual void embed(jlong);
-  GtkEmbeddedWindowPeer(::gnu::java::awt::EmbeddedWindow *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h
deleted file mode 100644
index 7bf3529..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
-#define __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkDialogPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkContainerPeer;
-              class GtkFileDialogPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class FileDialog;
-      namespace event
-      {
-          class PaintEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkFileDialogPeer : public ::gnu::java::awt::peer::gtk::GtkDialogPeer
-{
-
-public: // actually package-private
-  virtual void create(::gnu::java::awt::peer::gtk::GtkContainerPeer *, jint);
-  virtual void connectSignals();
-  virtual void nativeSetFile(::java::lang::String *);
-public:
-  virtual ::java::lang::String * nativeGetDirectory();
-  virtual void nativeSetDirectory(::java::lang::String *);
-public: // actually package-private
-  virtual void nativeSetFilenameFilter(::java::io::FilenameFilter *);
-public:
-  virtual void create();
-  GtkFileDialogPeer(::java::awt::FileDialog *);
-public: // actually package-private
-  virtual void setComponentBounds();
-public:
-  virtual void setFile(::java::lang::String *);
-  virtual void setDirectory(::java::lang::String *);
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-public: // actually package-private
-  virtual jboolean filenameFilterCallback(::java::lang::String *);
-public: // actually protected
-  virtual void updateComponent(::java::awt::event::PaintEvent *);
-public: // actually package-private
-  virtual void gtkHideFileDialog();
-  virtual void gtkDisposeFileDialog();
-  virtual void gtkSetFilename(::java::lang::String *);
-  static ::java::lang::String * FS;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkDialogPeer)))) currentFile;
-  ::java::lang::String * currentDirectory;
-  ::java::io::FilenameFilter * filter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkFileDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
deleted file mode 100644
index 2c8ea0e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkFramePeer__
-#define __gnu_java_awt_peer_gtk_GtkFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkFramePeer;
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Image;
-        class MenuBar;
-        class Rectangle;
-      namespace peer
-      {
-          class MenuBarPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkFramePeer : public ::gnu::java::awt::peer::gtk::GtkWindowPeer
-{
-
-public: // actually package-private
-  virtual jint getMenuBarHeight(::java::awt::peer::MenuBarPeer *);
-  virtual void setMenuBarWidthUnlocked(::java::awt::peer::MenuBarPeer *, jint);
-  virtual void setMenuBarWidth(::java::awt::peer::MenuBarPeer *, jint);
-  virtual void setMenuBarPeer(::java::awt::peer::MenuBarPeer *);
-  virtual void removeMenuBarPeer();
-  virtual void gtkFixedSetVisible(jboolean);
-private:
-  void maximize();
-  void unmaximize();
-  void iconify();
-  void deiconify();
-public: // actually package-private
-  virtual jint getMenuBarHeight();
-public:
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void postInsetsChangedEvent(jint, jint, jint, jint);
-public:
-  GtkFramePeer(::java::awt::Frame *);
-public: // actually package-private
-  virtual void create();
-  virtual void nativeSetIconImage(::gnu::java::awt::peer::gtk::GtkImage *);
-public:
-  virtual void setIconImage(::java::awt::Image *);
-public: // actually protected
-  virtual void postConfigureEvent(jint, jint, jint, jint);
-public:
-  virtual jint getState();
-  virtual void setState(jint);
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual void setBoundsPrivate(jint, jint, jint, jint);
-  virtual jboolean requestWindowFocus();
-  virtual ::java::awt::Rectangle * getBoundsPrivate();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkWindowPeer)))) menuBarHeight;
-  ::java::awt::peer::MenuBarPeer * menuBar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkFramePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
deleted file mode 100644
index ffb135b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkGenericPeer__
-#define __gnu_java_awt_peer_gtk_GtkGenericPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class EventQueue;
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkGenericPeer : public ::java::lang::Object
-{
-
-  static void initIDs();
-public:
-  virtual void dispose();
-public: // actually package-private
-  static ::java::awt::EventQueue * q();
-public: // actually protected
-  GtkGenericPeer(::java::lang::Object *);
-  virtual void postActionEvent(::java::lang::String *, jint);
-public: // actually package-private
-  static jint getUniqueInteger();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::awt::Font *);
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  static void printCurrentThread();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) native_state;
-private:
-  static jint next_native_state;
-public: // actually protected
-  ::java::lang::Object * awtWidget;
-private:
-  ::gnu::classpath::Pointer * widget;
-  ::gnu::classpath::Pointer * globalRef;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkGenericPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImage.h b/libjava/gnu/java/awt/peer/gtk/GtkImage.h
deleted file mode 100644
index 4028d93..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkImage.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkImage__
-#define __gnu_java_awt_peer_gtk_GtkImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkImage : public ::java::awt::Image
-{
-
-  void initFromBuffer(jlong);
-public: // actually package-private
-  virtual JArray< jint > * getPixels();
-private:
-  void setPixels(JArray< jint > *);
-  jboolean loadPixbuf(::java::lang::String *);
-  jboolean loadImageFromData(JArray< jbyte > *);
-  void createPixbuf();
-  void freePixbuf();
-  void createScaledPixbuf(::gnu::java::awt::peer::gtk::GtkImage *, jint);
-public:
-  GtkImage(::java::awt::image::ImageProducer *);
-  GtkImage();
-  GtkImage(::java::lang::String *);
-  GtkImage(JArray< jbyte > *);
-  GtkImage(::java::net::URL *);
-private:
-  GtkImage(::gnu::java::awt::peer::gtk::GtkImage *, jint, jint, jint);
-public: // actually package-private
-  GtkImage(::gnu::classpath::Pointer *);
-  GtkImage(jint, jint, jlong);
-  static ::gnu::java::awt::peer::gtk::GtkImage * getErrorImage();
-private:
-  void createFromPixbuf();
-public:
-  virtual void setImage(jint, jint, JArray< jint > *, ::java::util::Hashtable *);
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual void finalize();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-private:
-  void deliver();
-  jboolean addObserver(::java::awt::image::ImageObserver *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jboolean isLoaded;
-  ::gnu::classpath::Pointer * pixbuf;
-  ::java::util::Vector * observers;
-  jboolean errorLoading;
-  ::java::awt::image::ImageProducer * source;
-  static ::java::awt::image::ColorModel * nativeModel;
-private:
-  static ::gnu::java::awt::peer::gtk::GtkImage * errorImage;
-public: // actually package-private
-  static ::java::lang::Object * pixbufLock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h b/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h
deleted file mode 100644
index aeccd06..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkImageConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkImageConsumer__
-#define __gnu_java_awt_peer_gtk_GtkImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkImage;
-              class GtkImageConsumer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkImageConsumer : public ::java::lang::Object
-{
-
-public:
-  GtkImageConsumer(::gnu::java::awt::peer::gtk::GtkImage *, ::java::awt::image::ImageProducer *);
-  virtual void imageComplete(jint);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setDimensions(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jint > * convertPixels(JArray< jbyte > *);
-public:
-  virtual void setProperties(::java::util::Hashtable *);
-private:
-  ::gnu::java::awt::peer::gtk::GtkImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  jint width;
-  jint height;
-  ::java::util::Hashtable * properties;
-  JArray< jint > * pixelCache;
-  ::java::awt::image::ImageProducer * source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkImageConsumer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h
deleted file mode 100644
index c80c6f4..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkLabelPeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkLabelPeer__
-#define __gnu_java_awt_peer_gtk_GtkLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkLabelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkLabelPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(::java::lang::String *, jfloat);
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void nativeSetAlignment(jfloat);
-public:
-  virtual void setNativeText(::java::lang::String *);
-public: // actually package-private
-  virtual void setNativeBounds(jint, jint, jint, jint);
-  virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
-  virtual void create();
-public:
-  virtual void setText(::java::lang::String *);
-  GtkLabelPeer(::java::awt::Label *);
-  virtual void setAlignment(jint);
-public: // actually package-private
-  virtual jfloat getGtkAlignment(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h
deleted file mode 100644
index 8d8a7a0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkListPeer__
-#define __gnu_java_awt_peer_gtk_GtkListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkListPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class List;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkListPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-  virtual void create(jint);
-  virtual void connectSignals();
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkWidgetRequestFocus();
-  virtual void getSize(jint, jint, JArray< jint > *);
-public:
-  GtkListPeer(::java::awt::List *);
-public: // actually package-private
-  virtual void append(JArray< ::java::lang::String * > *);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void postItemEvent(jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkListPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h
deleted file mode 100644
index 159ec78..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMainThread__
-#define __gnu_java_awt_peer_gtk_GtkMainThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMainThread;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMainThread : public ::java::lang::Thread
-{
-
-  GtkMainThread();
-public:
-  virtual void run();
-private:
-  static void setRunning(jboolean);
-  static void startMainThread();
-  static void endMainThread();
-public:
-  static void createWindow();
-  static void destroyWindow();
-private:
-  static jint numberOfWindows;
-  static ::java::lang::Object * nWindowsLock;
-  static jboolean running;
-  static ::java::lang::Object * runningLock;
-public:
-  static ::gnu::java::awt::peer::gtk::GtkMainThread * mainThread;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMainThread__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h
deleted file mode 100644
index 916d6dd..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuBarPeer;
-              class GtkMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuBarPeer : public ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer
-{
-
-public: // actually protected
-  virtual void create();
-private:
-  void addMenu(::gnu::java::awt::peer::gtk::GtkMenuPeer *);
-public:
-  GtkMenuBarPeer(::java::awt::MenuBar *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  virtual void addMenu(::java::awt::Menu *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer)))) hasHelpMenu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h
deleted file mode 100644
index 500f5a9..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkGenericPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
-{
-
-public: // actually protected
-  virtual void create() = 0;
-private:
-  void setFont();
-public:
-  GtkMenuComponentPeer(::java::awt::MenuComponent *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h
deleted file mode 100644
index e84841c..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuItemPeer : public ::gnu::java::awt::peer::gtk::GtkMenuComponentPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-  virtual void connectSignals();
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-  virtual void create();
-public:
-  GtkMenuItemPeer(::java::awt::MenuItem *);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-public: // actually protected
-  virtual void postMenuActionEvent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h
deleted file mode 100644
index 1d1f84a..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMenuPeer__
-#define __gnu_java_awt_peer_gtk_GtkMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuItemPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-              class GtkMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuItem;
-        class MenuShortcut;
-      namespace peer
-      {
-          class MenuItemPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMenuPeer : public ::gnu::java::awt::peer::gtk::GtkMenuItemPeer
-{
-
-public: // actually protected
-  virtual void create(::java::lang::String *);
-private:
-  void addItem(::java::awt::peer::MenuItemPeer *, jint, jboolean);
-public: // actually package-private
-  virtual void setupAccelGroup(::gnu::java::awt::peer::gtk::GtkGenericPeer *);
-private:
-  void addTearOff();
-public: // actually protected
-  virtual void connectSignals();
-public:
-  GtkMenuPeer(::java::awt::Menu *);
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addItem(::java::awt::peer::MenuItemPeer *, ::java::awt::MenuShortcut *);
-  virtual void delItem(jint);
-  virtual void addSeparator();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h
deleted file mode 100644
index 8edc663..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
-#define __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsEnvironment;
-              class GtkMouseInfoPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkMouseInfoPeer : public ::java::lang::Object
-{
-
-public:
-  GtkMouseInfoPeer();
-  virtual jint fillPointWithCoords(::java::awt::Point *);
-  virtual jboolean isWindowUnderMouse(::java::awt::Window *);
-private:
-  static ::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment * gde;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkMouseInfoPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h
deleted file mode 100644
index b4349ee..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkPanelPeer__
-#define __gnu_java_awt_peer_gtk_GtkPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkPanelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Panel;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkPanelPeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void create();
-public:
-  GtkPanelPeer(::java::awt::Panel *);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void connectSignals();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h
deleted file mode 100644
index f62b014..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
-#define __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkMenuPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkGenericPeer;
-              class GtkPopupMenuPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class PopupMenu;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkPopupMenuPeer : public ::gnu::java::awt::peer::gtk::GtkMenuPeer
-{
-
-public:
-  GtkPopupMenuPeer(::java::awt::PopupMenu *);
-public: // actually package-private
-  virtual void setupAccelGroup(::gnu::java::awt::peer::gtk::GtkGenericPeer *);
-  virtual void show(jint, jint, jlong);
-public:
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual void show(::java::awt::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkPopupMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h
deleted file mode 100644
index 051fd83..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkScrollPanePeer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
-#define __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkScrollPanePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Dimension;
-        class ScrollPane;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkScrollPanePeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void create(jint, jint);
-  virtual void create();
-  virtual void gtkScrolledWindowSetHScrollIncrement(jint);
-  virtual void gtkScrolledWindowSetVScrollIncrement(jint);
-public:
-  GtkScrollPanePeer(::java::awt::ScrollPane *);
-public: // actually package-private
-  virtual void setPolicy(jint);
-public:
-  virtual void childResized(jint, jint);
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual void setScrollPosition(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint);
-  virtual void setValue(::java::awt::Adjustable *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkScrollPanePeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h
deleted file mode 100644
index 3557d62..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkScrollbarPeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
-#define __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkScrollbarPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkScrollbarPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create();
-  virtual void create(jint, jint, jint, jint, jint, jint, jint);
-  virtual void connectSignals();
-public:
-  GtkScrollbarPeer(::java::awt::Scrollbar *);
-  virtual void setLineIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void setValues(jint, jint, jint, jint);
-private:
-  void setBarValues(jint, jint, jint, jint);
-public: // actually protected
-  virtual void postAdjustmentEvent(jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkScrollbarPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkSelection.h b/libjava/gnu/java/awt/peer/gtk/GtkSelection.h
deleted file mode 100644
index 5ed45d0..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkSelection.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkSelection__
-#define __gnu_java_awt_peer_gtk_GtkSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkClipboard;
-              class GtkSelection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkSelection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GtkSelection(::gnu::java::awt::peer::gtk::GtkClipboard *);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-private:
-  void mimeTypesAvailable(JArray< ::java::lang::String * > *);
-public:
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-private:
-  ::java::lang::String * getText();
-  void textAvailable(::java::lang::String *);
-  ::java::awt::Image * getImage();
-  void imageAvailable(::gnu::classpath::Pointer *);
-  ::java::util::List * getURIs();
-  void urisAvailable(JArray< ::java::lang::String * > *);
-  JArray< jbyte > * getBytes(::java::lang::String *);
-  void bytesAvailable(JArray< jbyte > *);
-public:
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-private:
-  void requestText(jboolean);
-  void requestImage(jboolean);
-  void requestURIs(jboolean);
-  void requestBytes(jboolean, ::java::lang::String *);
-  void requestMimeTypes(jboolean);
-  static ::java::lang::Object * requestLock;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) clipboard;
-  jboolean requestInProgress;
-  jboolean mimeTypesDelivered;
-  JArray< ::java::awt::datatransfer::DataFlavor * > * dataFlavors;
-  jboolean textDelivered;
-  ::java::lang::String * text;
-  jboolean imageDelivered;
-  ::gnu::classpath::Pointer * imagePointer;
-  ::java::awt::Image * image;
-  jboolean urisDelivered;
-  ::java::util::List * uris;
-  jboolean bytesDelivered;
-  JArray< jbyte > * bytes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkSelection__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h
deleted file mode 100644
index 5d4b14e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
-#define __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkTextAreaPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkTextAreaPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(jint, jint, jint);
-public: // actually protected
-  virtual void gtkWidgetModifyFont(::java::lang::String *, jint, jint);
-public: // actually package-private
-  virtual void gtkWidgetRequestFocus();
-public:
-  virtual void connectSignals();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-public: // actually package-private
-  virtual void create();
-public:
-  GtkTextAreaPeer(::java::awt::TextArea *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-public: // actually package-private
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-public:
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-private:
-  static jint DEFAULT_ROWS;
-  static jint DEFAULT_COLS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h
deleted file mode 100644
index ddcf366..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
-#define __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkTextFieldPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkTextFieldPeer : public ::gnu::java::awt::peer::gtk::GtkComponentPeer
-{
-
-public: // actually package-private
-  virtual void create(jint);
-  virtual void gtkWidgetSetBackground(jint, jint, jint);
-  virtual void gtkWidgetSetForeground(jint, jint, jint);
-public:
-  virtual void connectSignals();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-public: // actually package-private
-  virtual void create();
-  virtual jint gtkEntryGetBorderWidth();
-public:
-  GtkTextFieldPeer(::java::awt::TextField *);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual void setEchoChar(jchar);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void setEchoCharacter(jchar);
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h
deleted file mode 100644
index c8d404b..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
-#define __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkToolkit$LRUCache;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit$LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  GtkToolkit$LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) max_entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit$LRUCache__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
deleted file mode 100644
index c562e05..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
+++ /dev/null
@@ -1,250 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit__
-#define __gnu_java_awt_peer_gtk_GtkToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkToolkit;
-              class GtkToolkit$LRUCache;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class Point;
-        class PopupMenu;
-        class PrintJob;
-        class Rectangle;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class MouseInfoPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public: // actually package-private
-  static void gtkInit(jint, ::java::lang::Object *);
-  static void gtkMain();
-  static void gtkQuit();
-private:
-  static void initIDs();
-public: // actually package-private
-  static void initializeGlobalIDs();
-public:
-  GtkToolkit();
-  virtual void beep();
-private:
-  void getScreenSizeDimensions(JArray< jint > *);
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually package-private
-  static ::java::awt::Image * imageOrError(::java::awt::Image *);
-public:
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-  virtual ::java::awt::image::ImageProducer * createImageProducer(::java::net::URL *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual jint getScreenResolution();
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemSelection();
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-public: // actually protected
-  virtual void setComponentState(::java::awt::Component *, ::gnu::java::awt::peer::gtk::GtkComponentPeer *);
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-public:
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-private:
-  ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint, jint);
-public:
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::awt::Cursor * createCustomCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-public: // actually protected
-  virtual void loadSystemColors(JArray< jint > *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual jboolean getLockingKeyState(jint);
-public: // actually protected
-  virtual jint getLockState(jint);
-public:
-  virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
-public: // actually protected
-  virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer();
-public:
-  virtual jboolean isFrameStateSupported(jint);
-private:
-  void checkHeadless();
-public:
-  virtual jint getMouseNumberOfButtons();
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-public: // actually package-private
-  static ::java::lang::Object * GTK_LOCK;
-private:
-  static ::java::awt::EventQueue * q;
-  static jboolean initializedGlobalIDs;
-  ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache;
-  ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * imageCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h b/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h
deleted file mode 100644
index 308bc8e..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkVolatileImage.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
-#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
-
-#pragma interface
-
-#include <java/awt/image/VolatileImage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkComponentPeer;
-              class GtkVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkVolatileImage : public ::java::awt::image::VolatileImage
-{
-
-public: // actually package-private
-  virtual jlong init(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint);
-  virtual void destroy(jlong);
-  virtual JArray< jint > * nativeGetPixels(jlong);
-public:
-  virtual JArray< jint > * getPixels();
-public: // actually package-private
-  virtual void nativeCopyArea(jlong, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  virtual void nativeDrawVolatile(jlong, jlong, jint, jint, jint, jint);
-public:
-  virtual void drawVolatile(jlong, jint, jint, jint, jint);
-  GtkVolatileImage(::gnu::java::awt::peer::gtk::GtkComponentPeer *, jint, jint, ::java::awt::ImageCapabilities *);
-  GtkVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  GtkVolatileImage(jint, jint);
-  virtual void finalize();
-  virtual void dispose();
-  virtual ::java::awt::image::BufferedImage * getSnapshot();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual jint validate(::java::awt::GraphicsConfiguration *);
-  virtual jboolean contentsLost();
-  virtual ::java::awt::ImageCapabilities * getCapabilities();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  static ::java::awt::image::SampleModel * createGdkSampleModel(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::VolatileImage)))) width;
-  jint height;
-private:
-  ::java::awt::ImageCapabilities * caps;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GtkComponentPeer * component;
-  static ::java::awt::image::ColorModel * gdkColorModel;
-  jlong nativePointer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkVolatileImage__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
deleted file mode 100644
index a40f416..0000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkWindowPeer__
-#define __gnu_java_awt_peer_gtk_GtkWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/GtkContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dialog;
-        class Graphics;
-        class Point;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkWindowPeer : public ::gnu::java::awt::peer::gtk::GtkContainerPeer
-{
-
-public: // actually package-private
-  virtual void gtkWindowSetTitle(::java::lang::String *);
-  virtual void gtkWindowSetResizable(jboolean);
-  virtual void gtkWindowSetModal(jboolean);
-  virtual void gtkWindowSetAlwaysOnTop(jboolean);
-  virtual jboolean gtkWindowHasFocus();
-  virtual void realize();
-public:
-  virtual void dispose();
-public: // actually package-private
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual void create(jint, jboolean, ::gnu::java::awt::peer::gtk::GtkWindowPeer *);
-  virtual void create(jint, jboolean);
-  virtual void create();
-  virtual void setParent();
-  virtual void setVisibleAndEnabled();
-public:
-  virtual void setVisibleNative(jboolean);
-  virtual void setVisibleNativeUnlocked(jboolean);
-public: // actually package-private
-  virtual void connectSignals();
-public:
-  GtkWindowPeer(::java::awt::Window *);
-  virtual void toBack();
-  virtual void toFront();
-public: // actually package-private
-  virtual void nativeSetBounds(jint, jint, jint, jint);
-  virtual void nativeSetBoundsUnlocked(jint, jint, jint, jint);
-  virtual void nativeSetLocation(jint, jint);
-  virtual void nativeSetLocationUnlocked(jint, jint);
-public: // actually protected
-  virtual void setLocation(jint, jint);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setTitle(::java::lang::String *);
-public: // actually protected
-  virtual void setSize(jint, jint);
-public:
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void postInsetsChangedEvent(jint, jint, jint, jint);
-  virtual void postConfigureEvent(jint, jint, jint, jint);
-public:
-  virtual void show();
-public: // actually package-private
-  virtual void postWindowEvent(jint, ::java::awt::Window *, jint);
-public:
-  virtual void updateAlwaysOnTop();
-public: // actually protected
-  virtual void postExposeEvent(jint, jint, jint, jint);
-public:
-  virtual jboolean requestWindowFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual ::java::awt::Graphics * getGraphics();
-public: // actually protected
-  virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-public: // actually protected
-  static const jint GDK_WINDOW_TYPE_HINT_NORMAL = 0;
-  static const jint GDK_WINDOW_TYPE_HINT_DIALOG = 1;
-  static const jint GDK_WINDOW_TYPE_HINT_MENU = 2;
-  static const jint GDK_WINDOW_TYPE_HINT_TOOLBAR = 3;
-  static const jint GDK_WINDOW_TYPE_HINT_SPLASHSCREEN = 4;
-  static const jint GDK_WINDOW_TYPE_HINT_UTILITY = 5;
-  static const jint GDK_WINDOW_TYPE_HINT_DOCK = 6;
-  static const jint GDK_WINDOW_TYPE_HINT_DESKTOP = 7;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkContainerPeer)))) windowState;
-private:
-  jint x;
-  jint y;
-  jint width;
-  jint height;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h
deleted file mode 100644
index b7f0121..0000000
--- a/libjava/gnu/java/awt/peer/gtk/VolatileImageGraphics.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_VolatileImageGraphics__
-#define __gnu_java_awt_peer_gtk_VolatileImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/gtk/ComponentGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkVolatileImage;
-              class VolatileImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Shape;
-      namespace font
-      {
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::VolatileImageGraphics : public ::gnu::java::awt::peer::gtk::ComponentGraphics
-{
-
-public:
-  VolatileImageGraphics(::gnu::java::awt::peer::gtk::GtkVolatileImage *);
-private:
-  VolatileImageGraphics(::gnu::java::awt::peer::gtk::VolatileImageGraphics *);
-public:
-  virtual void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::Graphics * create();
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-public: // actually protected
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-public:
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * getRealBounds();
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-private:
-  ::gnu::java::awt::peer::gtk::GtkVolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::ComponentGraphics)))) owner;
-  ::java::awt::image::BufferedImage * buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_VolatileImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h
deleted file mode 100644
index fc1b98d..0000000
--- a/libjava/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
-#define __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace headless
-          {
-              class HeadlessGraphicsEnvironment;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::headless::HeadlessGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  HeadlessGraphicsEnvironment();
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_headless_HeadlessGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h b/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h
deleted file mode 100644
index 657b323..0000000
--- a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h
+++ /dev/null
@@ -1,192 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_headless_HeadlessToolkit__
-#define __gnu_java_awt_peer_headless_HeadlessToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace headless
-          {
-              class HeadlessGraphicsEnvironment;
-              class HeadlessToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::headless::HeadlessToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public:
-  HeadlessToolkit();
-  virtual void beep();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually protected
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-public:
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual jint getScreenResolution();
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-private:
-  ::gnu::java::awt::peer::headless::HeadlessGraphicsEnvironment * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) graphicsEnv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_headless_HeadlessToolkit__
diff --git a/libjava/gnu/java/awt/peer/qt/MainQtThread.h b/libjava/gnu/java/awt/peer/qt/MainQtThread.h
deleted file mode 100644
index 9d3b746..0000000
--- a/libjava/gnu/java/awt/peer/qt/MainQtThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_MainQtThread__
-#define __gnu_java_awt_peer_qt_MainQtThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class MainQtThread;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::MainQtThread : public ::java::lang::Thread
-{
-
-public:
-  MainQtThread(::java::lang::String *, jboolean);
-  virtual jboolean isRunning();
-  virtual jlong init(::java::lang::String *, jboolean);
-  virtual void exec(jlong);
-  virtual void run();
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Thread)))) QApplicationPointer;
-  jlong mainThreadInterface;
-  ::java::lang::String * theme;
-private:
-  jboolean running;
-  jboolean doublebuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_MainQtThread__
diff --git a/libjava/gnu/java/awt/peer/qt/NativeWrapper.h b/libjava/gnu/java/awt/peer/qt/NativeWrapper.h
deleted file mode 100644
index 0bf62e0..0000000
--- a/libjava/gnu/java/awt/peer/qt/NativeWrapper.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_NativeWrapper__
-#define __gnu_java_awt_peer_qt_NativeWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class NativeWrapper;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::NativeWrapper : public ::java::lang::Object
-{
-
-public:
-  NativeWrapper();
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) nativeObject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_NativeWrapper__
diff --git a/libjava/gnu/java/awt/peer/qt/QMatrix.h b/libjava/gnu/java/awt/peer/qt/QMatrix.h
deleted file mode 100644
index 7ff6bfb..0000000
--- a/libjava/gnu/java/awt/peer/qt/QMatrix.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QMatrix__
-#define __gnu_java_awt_peer_qt_QMatrix__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QMatrix : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QMatrix(::java::awt::geom::AffineTransform *);
-private:
-  void init(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  JArray< jdouble > * getMatrix();
-public:
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QMatrix__
diff --git a/libjava/gnu/java/awt/peer/qt/QPainterPath.h b/libjava/gnu/java/awt/peer/qt/QPainterPath.h
deleted file mode 100644
index ffc104e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QPainterPath.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QPainterPath__
-#define __gnu_java_awt_peer_qt_QPainterPath__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QPainterPath;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class GeneralPath;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QPainterPath : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public: // actually package-private
-  QPainterPath();
-public:
-  QPainterPath(::java::awt::Shape *);
-  QPainterPath(jdouble, jdouble, jdouble, jdouble);
-  QPainterPath(jdouble, jdouble, jdouble, jdouble, jboolean);
-  virtual ::java::awt::geom::GeneralPath * getPath();
-private:
-  void init(jint);
-  void moveTo(jdouble, jdouble);
-  void close();
-  void lineTo(jdouble, jdouble);
-  void quadTo(jdouble, jdouble, jdouble, jdouble);
-  void cubicTo(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QPainterPath__
diff --git a/libjava/gnu/java/awt/peer/qt/QPen.h b/libjava/gnu/java/awt/peer/qt/QPen.h
deleted file mode 100644
index 973e24c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QPen.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QPen__
-#define __gnu_java_awt_peer_qt_QPen__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QPen;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Stroke;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QPen : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QPen(::java::awt::Stroke *);
-private:
-  void init(jdouble, jint, jint, jdouble);
-public:
-  virtual void dispose();
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QPen__
diff --git a/libjava/gnu/java/awt/peer/qt/QtAudioClip.h b/libjava/gnu/java/awt/peer/qt/QtAudioClip.h
deleted file mode 100644
index 4e74b63..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtAudioClip.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtAudioClip__
-#define __gnu_java_awt_peer_qt_QtAudioClip__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtAudioClip;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtAudioClip : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QtAudioClip(::java::lang::String *);
-  QtAudioClip(::java::net::URL *);
-private:
-  void loadClip(::java::lang::String *);
-  void play(jboolean);
-  jboolean isAvailable();
-  void checkForQt();
-public:
-  virtual void loop();
-  virtual void play();
-  virtual void stop();
-  virtual void dispose();
-  virtual void finalize();
-private:
-  static ::java::awt::Toolkit * t;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtAudioClip__
diff --git a/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h b/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h
deleted file mode 100644
index 5476a04..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtButtonPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtButtonPeer__
-#define __gnu_java_awt_peer_qt_QtButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtButtonPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtButtonPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtButtonPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Button *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-public: // actually package-private
-  virtual void fireClick(jint);
-public:
-  virtual void setLabel(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h b/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h
deleted file mode 100644
index 1d8be8c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtCanvasPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtCanvasPeer__
-#define __gnu_java_awt_peer_qt_QtCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtCanvasPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Dimension;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtCanvasPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtCanvasPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Canvas *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h b/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h
deleted file mode 100644
index f90ce36..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtCheckboxPeer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtCheckboxPeer__
-#define __gnu_java_awt_peer_qt_QtCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtCheckboxPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtCheckboxPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtCheckboxPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Checkbox *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void fireToggle(jboolean);
-public:
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-private:
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtComponentPeer)))) group;
-  static ::java::util::WeakHashMap * groupMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h b/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h
deleted file mode 100644
index 46a12c2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtChoicePeer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtChoicePeer__
-#define __gnu_java_awt_peer_qt_QtChoicePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtChoicePeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Choice;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtChoicePeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtChoicePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Choice *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void fireChoice(jint);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtChoicePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h b/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h
deleted file mode 100644
index 733247a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentGraphics.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentGraphics__
-#define __gnu_java_awt_peer_qt_QtComponentGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentGraphics;
-              class QtComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentGraphics : public ::gnu::java::awt::peer::qt::QtGraphics
-{
-
-public:
-  QtComponentGraphics(jlong, ::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public: // actually package-private
-  QtComponentGraphics(::gnu::java::awt::peer::qt::QtComponentGraphics *);
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-private:
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtGraphics)))) peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h
deleted file mode 100644
index 90f9629..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
-#define __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtComponentPeer$RepaintTimerTask;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentPeer$RepaintTimerTask : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  QtComponentPeer$RepaintTimerTask(::gnu::java::awt::peer::qt::QtComponentPeer *, ::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public:
-  virtual void run();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) x;
-  jint y;
-  jint w;
-  jint h;
-  ::gnu::java::awt::peer::qt::QtComponentPeer * peer;
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtComponentPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentPeer$RepaintTimerTask__
diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
deleted file mode 100644
index 4688b8e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtComponentPeer__
-#define __gnu_java_awt_peer_qt_QtComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtContainerPeer;
-              class QtFontPeer;
-              class QtImage;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public: // actually package-private
-  QtComponentPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void callInit();
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void QtUpdate();
-  virtual void QtUpdateArea(jint, jint, jint, jint);
-private:
-  void disposeNative();
-  void setGround(jint, jint, jint, jboolean);
-  void setBoundsNative(jint, jint, jint, jint);
-  void setCursor(jint);
-  ::java::awt::Color * getNativeBackground();
-  void setFontNative(::gnu::java::awt::peer::qt::QtFontPeer *);
-  jint whichScreen();
-  void reparentNative(::gnu::java::awt::peer::qt::QtContainerPeer *);
-  void getLocationOnScreenNative(::java::awt::Point *);
-  jboolean drawableComponent();
-public: // actually package-private
-  virtual void updateBounds();
-  virtual void updateBackBuffer(jint, jint);
-public: // actually protected
-  virtual void closeEvent();
-  virtual void enterEvent(jint, jint, jint, jint);
-  virtual void focusInEvent();
-  virtual void focusOutEvent();
-  virtual void keyPressEvent(jint, jint, jint, jint);
-  virtual void keyReleaseEvent(jint, jint, jint, jint);
-  virtual void leaveEvent(jint, jint, jint, jint);
-  virtual void mouseDoubleClickEvent(jint, jint, jint, jint);
-  virtual void mouseMoveEvent(jint, jint, jint, jint);
-  virtual void mousePressEvent(jint, jint, jint, jint);
-  virtual void mouseReleaseEvent(jint, jint, jint, jint);
-  virtual void moveEvent(jint, jint, jint, jint);
-  virtual void resizeEvent(jint, jint, jint, jint);
-  virtual void showEvent();
-  virtual void hideEvent();
-public:
-  virtual void setEventMask(jlong);
-  virtual jboolean canDetermineObscurity();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void destroyBuffers();
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual void finalize();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::awt::Point * getLocationOnScreen();
-private:
-  void getSizeNative(::java::awt::Dimension *, jboolean);
-  ::java::awt::Dimension * getSize(jboolean);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual jboolean handlesWheelScrolling();
-  virtual void hide();
-  virtual jboolean isFocusable();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isObscured();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void paint(::java::awt::Graphics *);
-  virtual void paintBackBuffer();
-  virtual void paintBackBuffer(jint, jint, jint, jint);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void updateCursorImmediately();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually protected
-  static const jint POPUP_TRIGGER = 3;
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit;
-public: // actually package-private
-  ::java::awt::Component * owner;
-private:
-  jlong eventMask;
-  jboolean hasMotionListeners;
-public: // actually protected
-  ::gnu::java::awt::peer::qt::QtImage * backBuffer;
-  jlong qtApp;
-private:
-  jboolean settingUp;
-  jboolean ignoreResize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h b/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h
deleted file mode 100644
index f9e60b3..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtContainerPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtContainerPeer__
-#define __gnu_java_awt_peer_qt_QtContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtContainerPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtContainerPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtContainerPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void beginLayout();
-  virtual void beginValidate();
-  virtual void endLayout();
-  virtual void endValidate();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual jboolean isPaintPending();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h b/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h
deleted file mode 100644
index 483aa8e..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtDialogPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtDialogPeer__
-#define __gnu_java_awt_peer_qt_QtDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtDialogPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtDialogPeer : public ::gnu::java::awt::peer::qt::QtWindowPeer
-{
-
-public:
-  QtDialogPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Dialog *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void setModal(jboolean);
-private:
-  void setBoundsNative(jint, jint, jint, jint, jboolean);
-public:
-  virtual void setResizable(jboolean);
-  virtual void setBounds(jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h
deleted file mode 100644
index 5ee942d..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
-#define __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtFramePeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtEmbeddedWindowPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtEmbeddedWindowPeer : public ::gnu::java::awt::peer::qt::QtFramePeer
-{
-
-public:
-  QtEmbeddedWindowPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void embed(jlong);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtEmbeddedWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h b/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h
deleted file mode 100644
index a87e72f..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFileDialogPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFileDialogPeer__
-#define __gnu_java_awt_peer_qt_QtFileDialogPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtDialogPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFileDialogPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class FileDialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFileDialogPeer : public ::gnu::java::awt::peer::qt::QtDialogPeer
-{
-
-public:
-  QtFileDialogPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::FileDialog *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setMode(jint);
-  void fileDialogDone(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void setFile(::java::lang::String *);
-  virtual void setDirectory(::java::lang::String *);
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFileDialogPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
deleted file mode 100644
index fcb30d2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFontMetrics__
-#define __gnu_java_awt_peer_qt_QtFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFontMetrics;
-              class QtFontPeer;
-              class QtGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFontMetrics : public ::java::awt::FontMetrics
-{
-
-public:
-  QtFontMetrics(::java::awt::Font *);
-  QtFontMetrics(::java::awt::Font *, ::java::awt::Graphics *);
-public: // actually package-private
-  QtFontMetrics(::gnu::java::awt::peer::qt::QtFontPeer *, ::java::awt::Graphics *);
-public:
-  QtFontMetrics(::gnu::java::awt::peer::qt::QtFontPeer *);
-private:
-  void init(::gnu::java::awt::peer::qt::QtFontPeer *);
-  void initGraphics(::gnu::java::awt::peer::qt::QtFontPeer *, ::gnu::java::awt::peer::qt::QtGraphics *);
-  void dispose();
-public: // actually package-private
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *);
-  virtual jboolean canDisplay(jint);
-public:
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint getLeading();
-  virtual jint getMaxAdvance();
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::Graphics *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) nativeObject;
-  ::gnu::java::awt::peer::qt::QtFontPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFontMetrics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
deleted file mode 100644
index 0daebcc..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFontPeer__
-#define __gnu_java_awt_peer_qt_QtFontPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/ClasspathFontPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFontMetrics;
-              class QtFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
-{
-
-public:
-  QtFontPeer(::java::lang::String *, jint);
-  QtFontPeer(::java::lang::String *, jint, jint);
-  QtFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual void init();
-private:
-  void create(::java::lang::String *, jint, jint);
-public:
-  virtual void dispose();
-  virtual jboolean canDisplay(::java::awt::Font *, jint);
-  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
-  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
-  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
-  virtual jint getNumGlyphs(::java::awt::Font *);
-  virtual jint getMissingGlyphCode(::java::awt::Font *);
-  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
-  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) nativeObject;
-  ::gnu::java::awt::peer::qt::QtFontMetrics * metrics;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFontPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
deleted file mode 100644
index a89557c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtFramePeer__
-#define __gnu_java_awt_peer_qt_QtFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtFramePeer;
-              class QtImage;
-              class QtMenuBarPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Rectangle;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtFramePeer : public ::gnu::java::awt::peer::qt::QtWindowPeer
-{
-
-public:
-  QtFramePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setIcon(::gnu::java::awt::peer::qt::QtImage *);
-  void setMaximizedBounds(jint, jint);
-  void setMenu(::gnu::java::awt::peer::qt::QtMenuBarPeer *);
-  jint menuBarHeight();
-public:
-  virtual void destroy();
-  virtual jint getState();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void setIconImage(::java::awt::Image *);
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual void setResizable(jboolean);
-  virtual void setState(jint);
-  virtual void setBoundsPrivate(jint, jint, jint, jint);
-  virtual void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-  virtual ::java::awt::Rectangle * getBoundsPrivate();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtWindowPeer)))) theState;
-public: // actually package-private
-  jlong frameObject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtFramePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtGraphics.h b/libjava/gnu/java/awt/peer/qt/QtGraphics.h
deleted file mode 100644
index 710248b..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtGraphics.h
+++ /dev/null
@@ -1,215 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtGraphics__
-#define __gnu_java_awt_peer_qt_QtGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QPainterPath;
-              class QPen;
-              class QtFontPeer;
-              class QtGraphics;
-              class QtImage;
-              class QtVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtGraphics : public ::java::awt::Graphics2D
-{
-
-public: // actually package-private
-  QtGraphics();
-  QtGraphics(::gnu::java::awt::peer::qt::QtGraphics *);
-public: // actually protected
-  virtual void setup();
-public:
-  virtual void delete$();
-  virtual void dispose();
-private:
-  void resetClip();
-public: // actually protected
-  virtual void initImage(::gnu::java::awt::peer::qt::QtImage *);
-  virtual void initVolatileImage(::gnu::java::awt::peer::qt::QtVolatileImage *);
-private:
-  void cloneNativeContext(::gnu::java::awt::peer::qt::QtGraphics *);
-  void setColor(jint, jint, jint, jint);
-  void drawNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void fillNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void setClipNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void setClipRectNative(jint, jint, jint, jint);
-  void intersectClipNative(::gnu::java::awt::peer::qt::QPainterPath *);
-  void intersectClipRectNative(jint, jint, jint, jint);
-  void setQtTransform(::gnu::java::awt::peer::qt::QMatrix *);
-  void setNativeStroke(::gnu::java::awt::peer::qt::QPen *);
-  void setNativeComposite(jint);
-  void drawStringNative(::java::lang::String *, jdouble, jdouble);
-  void setLinearGradient(jint, jint, jint, jint, jint, jint, jdouble, jdouble, jdouble, jdouble, jboolean);
-  void setAlphaNative(jdouble);
-  void setFontNative(::gnu::java::awt::peer::qt::QtFontPeer *);
-  ::gnu::java::awt::peer::qt::QPainterPath * getClipNative();
-public: // actually package-private
-  virtual void setAlpha(jdouble);
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual void copyArea(jint, jint, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-  virtual ::java::awt::Color * getColor();
-  virtual void setColor(::java::awt::Color *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackground();
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void clip(::java::awt::Shape *);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void setClip(::java::awt::Shape *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void translate(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void setStroke(::java::awt::Stroke *);
-  virtual ::java::awt::Stroke * getStroke();
-  virtual void setComposite(::java::awt::Composite *);
-  virtual ::java::awt::Composite * getComposite();
-  virtual void setPaint(::java::awt::Paint *);
-  virtual ::java::awt::Paint * getPaint();
-  virtual void addRenderingHints(::java::util::Map *);
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-private:
-  void updateRenderingHints();
-public:
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativeObject;
-private:
-  static ::java::awt::geom::AffineTransform * identity;
-public: // actually protected
-  ::java::awt::Font * font;
-  ::java::awt::Color * color;
-  ::java::awt::Color * bgcolor;
-  ::java::awt::Shape * clip__;
-  ::java::awt::Shape * initialClip;
-  ::java::awt::geom::AffineTransform * xform;
-  ::java::awt::Stroke * currentStroke;
-  jboolean nativeStroking;
-  ::java::awt::Composite * composite;
-  jdouble currentAlpha;
-  ::java::awt::Paint * currentPaint;
-  ::java::awt::RenderingHints * renderingHints;
-public: // actually package-private
-  ::java::awt::Graphics * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h
deleted file mode 100644
index ec1e0c8..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtGraphicsEnvironment.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
-#define __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
-
-#pragma interface
-
-#include <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtGraphicsEnvironment;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public:
-  QtGraphicsEnvironment(::gnu::java::awt::peer::qt::QtToolkit *);
-  virtual JArray< ::java::awt::Font * > * getAllFonts();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames();
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice();
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *);
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices();
-  virtual ::gnu::java::awt::peer::qt::QtToolkit * getToolkit();
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) toolkit;
-  JArray< ::java::awt::GraphicsDevice * > * screens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImage.h b/libjava/gnu/java/awt/peer/qt/QtImage.h
deleted file mode 100644
index 4c921b2..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImage.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImage__
-#define __gnu_java_awt_peer_qt_QtImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QtComponentPeer;
-              class QtGraphics;
-              class QtImage;
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImage : public ::java::awt::Image
-{
-
-public:
-  virtual void clear();
-private:
-  JArray< jint > * getPixels();
-  void setPixels(JArray< jint > *);
-  jboolean loadImage(::java::lang::String *);
-  jboolean loadImageFromData(JArray< jbyte > *);
-  void createImage();
-  void freeImage();
-  void createScaledImage(::gnu::java::awt::peer::qt::QtImage *, jint);
-public: // actually package-private
-  virtual void drawPixels(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jboolean);
-private:
-  void drawPixelsScaled(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsTransformed(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *);
-public: // actually package-private
-  virtual void drawPixelsScaledFlipped(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-public:
-  QtImage(::java::awt::image::ImageProducer *);
-  QtImage(::java::net::URL *);
-  QtImage(::java::lang::String *);
-  QtImage(JArray< jbyte > *);
-  QtImage(jint, jint);
-private:
-  QtImage(::gnu::java::awt::peer::qt::QtImage *, jint, jint, jint);
-public:
-  virtual void setImage(jint, jint, JArray< jint > *, ::java::util::Hashtable *);
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-public: // actually package-private
-  virtual void putPainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-  virtual void removePainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual ::java::awt::Graphics * getGraphics();
-public: // actually package-private
-  virtual ::java::awt::Graphics * getDirectGraphics(::gnu::java::awt::peer::qt::QtComponentPeer *);
-public:
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual void finalize();
-  virtual void dispose();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-private:
-  void deliver();
-  jboolean addObserver(::java::awt::image::ImageObserver *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jboolean isLoaded;
-  jlong nativeObject;
-  ::java::util::Vector * observers;
-  jboolean errorLoading;
-  ::java::awt::image::ImageProducer * source;
-  static ::java::awt::image::ColorModel * nativeModel;
-  ::java::util::WeakHashMap * painters;
-  jboolean killFlag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImage__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h b/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h
deleted file mode 100644
index 8c929d4..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageConsumer__
-#define __gnu_java_awt_peer_qt_QtImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtImage;
-              class QtImageConsumer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageConsumer : public ::java::lang::Object
-{
-
-public:
-  QtImageConsumer(::gnu::java::awt::peer::qt::QtImage *, ::java::awt::image::ImageProducer *);
-  virtual void imageComplete(jint);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setDimensions(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jint > * convertPixels(JArray< jbyte > *);
-public:
-  virtual void setProperties(::java::util::Hashtable *);
-private:
-  ::gnu::java::awt::peer::qt::QtImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  jint width;
-  jint height;
-  ::java::util::Hashtable * properties;
-  JArray< jint > * pixelCache;
-  ::java::awt::image::ImageProducer * source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageConsumer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h b/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h
deleted file mode 100644
index d74e324..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageDirectGraphics.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageDirectGraphics__
-#define __gnu_java_awt_peer_qt_QtImageDirectGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtImageGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtImage;
-              class QtImageDirectGraphics;
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Image;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageDirectGraphics : public ::gnu::java::awt::peer::qt::QtImageGraphics
-{
-
-public:
-  QtImageDirectGraphics(::gnu::java::awt::peer::qt::QtImage *, ::gnu::java::awt::peer::qt::QtComponentPeer *);
-  QtImageDirectGraphics(::gnu::java::awt::peer::qt::QtImageGraphics *);
-private:
-  void scheduleUpdate();
-public:
-  virtual void dispose();
-  virtual void draw(::java::awt::Shape *);
-  virtual void fill(::java::awt::Shape *);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-private:
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtImageGraphics)))) peer;
-  jboolean modified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageDirectGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h b/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h
deleted file mode 100644
index e5adb79..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtImageGraphics.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtImageGraphics__
-#define __gnu_java_awt_peer_qt_QtImageGraphics__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtGraphics.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtImageGraphics;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtImageGraphics : public ::gnu::java::awt::peer::qt::QtGraphics
-{
-
-public:
-  QtImageGraphics(::java::awt::Image *);
-public: // actually package-private
-  QtImageGraphics(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual void dispose();
-  virtual ::java::awt::Graphics * create();
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtGraphics)))) parentImage;
-  ::java::util::Stack * owners;
-  ::gnu::java::awt::peer::qt::QtImageGraphics * topParent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtImageGraphics__
diff --git a/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h b/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h
deleted file mode 100644
index af81168..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtLabelPeer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtLabelPeer__
-#define __gnu_java_awt_peer_qt_QtLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtLabelPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtLabelPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtLabelPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Label *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void setAlignment(jint);
-  virtual void setText(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtListPeer.h b/libjava/gnu/java/awt/peer/qt/QtListPeer.h
deleted file mode 100644
index 0d4fbee..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtListPeer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtListPeer__
-#define __gnu_java_awt_peer_qt_QtListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtListPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class List;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtListPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtListPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::List *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-private:
-  void fireChoice(jint);
-  void itemDoubleClicked(jint, jint);
-  void select(jint, jboolean);
-public:
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtComponentPeer)))) ignoreNextSelect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtListPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h
deleted file mode 100644
index 57e6d54..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuBarPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuBarPeer__
-#define __gnu_java_awt_peer_qt_QtMenuBarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuBarPeer;
-              class QtMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuBarPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuBarPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuBar *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void addMenus();
-private:
-  void addMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void addHelpMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void delMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-public:
-  virtual void addMenu(::java::awt::Menu *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h
deleted file mode 100644
index 3cab645..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuComponentPeer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuComponentPeer__
-#define __gnu_java_awt_peer_qt_QtMenuComponentPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/NativeWrapper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuComponentPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper
-{
-
-public:
-  QtMenuComponentPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuComponent *);
-public: // actually protected
-  virtual void callInit();
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void finalize();
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-public: // actually protected
-  ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit;
-  ::java::awt::MenuComponent * owner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h
deleted file mode 100644
index 10eee1a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuItemPeer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuItemPeer__
-#define __gnu_java_awt_peer_qt_QtMenuItemPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuItemPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuItemPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuItemPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::MenuItem *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void create(::java::lang::String *, jboolean, jboolean);
-public:
-  virtual void finalize();
-  virtual void dispose();
-private:
-  void fireClick(jint);
-public:
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h b/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h
deleted file mode 100644
index 79341a4..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtMenuPeer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtMenuPeer__
-#define __gnu_java_awt_peer_qt_QtMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtMenuItemPeer;
-              class QtMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtMenuPeer : public ::gnu::java::awt::peer::qt::QtMenuComponentPeer
-{
-
-public:
-  QtMenuPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Menu *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public: // actually package-private
-  virtual void addItems();
-private:
-  void fireClick();
-  void allowTearOff();
-  void insertSeperator();
-  void insertItem(::gnu::java::awt::peer::qt::QtMenuItemPeer *);
-  void insertMenu(::gnu::java::awt::peer::qt::QtMenuPeer *);
-  void delItem(jlong);
-  void add(jlong);
-public:
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addSeparator();
-  virtual void delItem(jint);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtMenuComponentPeer)))) items;
-  jboolean itemsAdded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h b/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h
deleted file mode 100644
index c0031ef..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtPanelPeer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtPanelPeer__
-#define __gnu_java_awt_peer_qt_QtPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtPanelPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtPanelPeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtPanelPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h b/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h
deleted file mode 100644
index 3b78bc9..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtPopupMenuPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtPopupMenuPeer__
-#define __gnu_java_awt_peer_qt_QtPopupMenuPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtMenuPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtPopupMenuPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class PopupMenu;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtPopupMenuPeer : public ::gnu::java::awt::peer::qt::QtMenuPeer
-{
-
-public:
-  QtPopupMenuPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::PopupMenu *);
-private:
-  void showNative(jint, jint);
-public:
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual void show(::java::awt::Event *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtPopupMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h b/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h
deleted file mode 100644
index 9cc516c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
-#define __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtRepaintThread$RepaintComponent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent : public ::java::lang::Object
-{
-
-public:
-  QtRepaintThread$RepaintComponent(::gnu::java::awt::peer::qt::QtComponentPeer *);
-  QtRepaintThread$RepaintComponent(::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-  ::gnu::java::awt::peer::qt::QtComponentPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) curr;
-  ::gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent * next;
-  jboolean paintAll;
-  jint x;
-  jint y;
-  jint w;
-  jint h;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtRepaintThread$RepaintComponent__
diff --git a/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h b/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h
deleted file mode 100644
index e9d714c..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtRepaintThread.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtRepaintThread__
-#define __gnu_java_awt_peer_qt_QtRepaintThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtComponentPeer;
-              class QtRepaintThread;
-              class QtRepaintThread$RepaintComponent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtRepaintThread : public ::java::lang::Thread
-{
-
-public:
-  QtRepaintThread();
-  virtual void run();
-  virtual void queueComponent(::gnu::java::awt::peer::qt::QtComponentPeer *);
-  virtual void queueComponent(::gnu::java::awt::peer::qt::QtComponentPeer *, jint, jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtRepaintThread$RepaintComponent * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) component;
-  jboolean busy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtRepaintThread__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h b/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h
deleted file mode 100644
index 179fa09..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScreenDevice.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScreenDevice__
-#define __gnu_java_awt_peer_qt_QtScreenDevice__
-
-#pragma interface
-
-#include <java/awt/GraphicsDevice.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScreenDevice;
-              class QtScreenDeviceConfiguration;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScreenDevice : public ::java::awt::GraphicsDevice
-{
-
-public:
-  QtScreenDevice(jint);
-  virtual void init(jint);
-  virtual void dispose();
-public: // actually package-private
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual jint getDpiX();
-  virtual jint getDpiY();
-  virtual jint depth();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(::java::awt::GraphicsConfigTemplate *);
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations();
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration();
-  virtual ::java::lang::String * getIDstring();
-  virtual jint getType();
-  virtual jboolean isDisplayChangeSupported();
-  virtual jboolean isFullScreenSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-  virtual void setFullScreenWindow(::java::awt::Window *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::GraphicsDevice)))) nativeObject;
-  jint id;
-  ::java::lang::String * IDstring;
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtScreenDeviceConfiguration * config;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScreenDevice__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h b/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h
deleted file mode 100644
index f9ec9e0..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
-#define __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
-
-#pragma interface
-
-#include <java/awt/GraphicsConfiguration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScreenDevice;
-              class QtScreenDeviceConfiguration;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScreenDeviceConfiguration : public ::java::awt::GraphicsConfiguration
-{
-
-public:
-  QtScreenDeviceConfiguration(::gnu::java::awt::peer::qt::QtScreenDevice *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::ColorModel * getColorModel(jint);
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform();
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform();
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint);
-private:
-  ::gnu::java::awt::peer::qt::QtScreenDevice * __attribute__((aligned(__alignof__( ::java::awt::GraphicsConfiguration)))) owner;
-  ::java::awt::Rectangle * bounds;
-  jdouble dpiX;
-  jdouble dpiY;
-  jint depth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScreenDeviceConfiguration__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h b/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h
deleted file mode 100644
index 23877b3..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScrollPanePeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScrollPanePeer__
-#define __gnu_java_awt_peer_qt_QtScrollPanePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScrollPanePeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Insets;
-        class ScrollPane;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScrollPanePeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtScrollPanePeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::ScrollPane *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void setPolicy(jint);
-public:
-  virtual void childResized(jint, jint);
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual void setScrollPosition(jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint);
-  virtual void setValue(::java::awt::Adjustable *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScrollPanePeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h b/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h
deleted file mode 100644
index 3e13597..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtScrollbarPeer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtScrollbarPeer__
-#define __gnu_java_awt_peer_qt_QtScrollbarPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtScrollbarPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtScrollbarPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtScrollbarPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Scrollbar *);
-  virtual void init();
-public: // actually protected
-  virtual void setup();
-private:
-  void setOrientation(jint);
-  void fireMoved(jint, jint);
-public:
-  virtual void setLineIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void setValues(jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtScrollbarPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h b/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h
deleted file mode 100644
index 42ee905..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtTextAreaPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtTextAreaPeer__
-#define __gnu_java_awt_peer_qt_QtTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtTextAreaPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtTextAreaPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtTextAreaPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::TextArea *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  jint getSelection(jboolean);
-  void textChanged();
-public:
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual void setText(::java::lang::String *);
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual void setCaretPosition(jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h b/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h
deleted file mode 100644
index 123d95b..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtTextFieldPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtTextFieldPeer__
-#define __gnu_java_awt_peer_qt_QtTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtTextFieldPeer;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtTextFieldPeer : public ::gnu::java::awt::peer::qt::QtComponentPeer
-{
-
-public:
-  QtTextFieldPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::TextField *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-private:
-  void textChanged();
-  jint getSelection(jboolean);
-  ::java::awt::Dimension * getMinimumSizeNative(jint);
-  ::java::awt::Dimension * getPreferredSizeNative(jint);
-public:
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void select(jint, jint);
-  virtual void setCaretPosition(jint);
-  virtual void setEchoCharacter(jchar);
-  virtual void setEchoChar(jchar);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/qt/QtToolkit.h b/libjava/gnu/java/awt/peer/qt/QtToolkit.h
deleted file mode 100644
index 319318a..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtToolkit.h
+++ /dev/null
@@ -1,207 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtToolkit__
-#define __gnu_java_awt_peer_qt_QtToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class EmbeddedWindow;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-            class EmbeddedWindowPeer;
-          namespace qt
-          {
-              class MainQtThread;
-              class QtGraphicsEnvironment;
-              class QtRepaintThread;
-              class QtToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Image;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace event
-      {
-          class AWTEventListener;
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class RobotPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-  static void initToolkit();
-public:
-  QtToolkit();
-public: // actually package-private
-  virtual JArray< ::java::lang::String * > * nativeFontFamilies();
-  virtual jint numScreens();
-  virtual jint defaultScreen();
-public:
-  virtual void beep();
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *);
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *);
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *);
-public: // actually protected
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *);
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *);
-public:
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint);
-  virtual ::java::awt::Image * createImage(::java::lang::String *);
-  virtual ::java::awt::Image * createImage(::java::net::URL *);
-public: // actually protected
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *);
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *);
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *);
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *);
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-public:
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners();
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners(jlong);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual JArray< ::java::lang::String * > * getFontList();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-public: // actually protected
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Image * getImage(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *);
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl();
-public:
-  virtual ::java::awt::Dimension * getScreenSize();
-  virtual jint getScreenResolution();
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void sync();
-  virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *);
-  virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
-  virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-  static ::java::awt::EventQueue * eventQueue;
-  static ::gnu::java::awt::peer::qt::QtRepaintThread * repaintThread;
-  static ::gnu::java::awt::peer::qt::MainQtThread * guiThread;
-  static ::gnu::java::awt::peer::qt::QtGraphicsEnvironment * graphicsEnv;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtToolkit__
diff --git a/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h b/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h
deleted file mode 100644
index a3ceb29..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtVolatileImage$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtVolatileImage$1__
-#define __gnu_java_awt_peer_qt_QtVolatileImage$1__
-
-#pragma interface
-
-#include <java/awt/ImageCapabilities.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtVolatileImage;
-              class QtVolatileImage$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtVolatileImage$1 : public ::java::awt::ImageCapabilities
-{
-
-public: // actually package-private
-  QtVolatileImage$1(::gnu::java::awt::peer::qt::QtVolatileImage *, jboolean);
-public:
-  virtual jboolean isTrueVolatile();
-public: // actually package-private
-  ::gnu::java::awt::peer::qt::QtVolatileImage * __attribute__((aligned(__alignof__( ::java::awt::ImageCapabilities)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtVolatileImage$1__
diff --git a/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h b/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h
deleted file mode 100644
index 4972e9f..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtVolatileImage.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtVolatileImage__
-#define __gnu_java_awt_peer_qt_QtVolatileImage__
-
-#pragma interface
-
-#include <java/awt/image/VolatileImage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QMatrix;
-              class QtGraphics;
-              class QtImage;
-              class QtImageGraphics;
-              class QtVolatileImage;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class Image;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtVolatileImage : public ::java::awt::image::VolatileImage
-{
-
-public:
-  virtual void clear();
-private:
-  JArray< jint > * getPixels();
-  void createImage();
-  void freeImage();
-public:
-  virtual void blit(::gnu::java::awt::peer::qt::QtImage *);
-  virtual void blit(::gnu::java::awt::peer::qt::QtImage *, jint, jint, jint, jint);
-private:
-  void createScaledImage(::gnu::java::awt::peer::qt::QtVolatileImage *, jint);
-  void drawPixels(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsScaled(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  void drawPixelsTransformed(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *);
-public: // actually package-private
-  virtual void drawPixelsScaledFlipped(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-public:
-  QtVolatileImage(jint, jint);
-private:
-  QtVolatileImage(::gnu::java::awt::peer::qt::QtVolatileImage *, jint, jint, jint);
-public:
-  virtual void finalize();
-  virtual void dispose();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::ImageProducer * getSource();
-public: // actually package-private
-  virtual void putPainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-  virtual void removePainter(::gnu::java::awt::peer::qt::QtImageGraphics *);
-public:
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush();
-  virtual jint checkImage(::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, ::gnu::java::awt::peer::qt::QMatrix *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::gnu::java::awt::peer::qt::QtGraphics *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual jboolean contentsLost();
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual ::java::awt::ImageCapabilities * getCapabilities();
-  virtual jint getHeight();
-  virtual ::java::awt::image::BufferedImage * getSnapshot();
-  virtual jint getWidth();
-  virtual jint validate(::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::VolatileImage)))) width;
-  jint height;
-  ::java::util::Hashtable * props;
-  jlong nativeObject;
-  static ::java::awt::image::ColorModel * nativeModel;
-  ::java::util::WeakHashMap * painters;
-  jboolean killFlag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtVolatileImage__
diff --git a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
deleted file mode 100644
index 9e5a147..0000000
--- a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_qt_QtWindowPeer__
-#define __gnu_java_awt_peer_qt_QtWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/qt/QtContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace qt
-          {
-              class QtToolkit;
-              class QtWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dialog;
-    }
-  }
-}
-
-class gnu::java::awt::peer::qt::QtWindowPeer : public ::gnu::java::awt::peer::qt::QtContainerPeer
-{
-
-public:
-  QtWindowPeer(::gnu::java::awt::peer::qt::QtToolkit *, ::java::awt::Component *);
-public: // actually protected
-  virtual void init();
-  virtual void setup();
-public:
-  virtual void toBack();
-  virtual void toFront();
-  virtual void setTitle(::java::lang::String *);
-  virtual void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_qt_QtWindowPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h
deleted file mode 100644
index ffaa2b6..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-              class SwingButtonPeer$SwingButton;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer$SwingButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  SwingButtonPeer$SwingButton(::gnu::java::awt::peer::swing::SwingButtonPeer *, ::java::awt::Button *);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual ::java::awt::Container * getParent();
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::Button * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) button;
-  ::gnu::java::awt::peer::swing::SwingButtonPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButton__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h
deleted file mode 100644
index c6a6f9a..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-              class SwingButtonPeer$SwingButtonListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer$SwingButtonListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingButtonPeer$SwingButtonListener(::gnu::java::awt::peer::swing::SwingButtonPeer *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingButtonPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer$SwingButtonListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h
deleted file mode 100644
index cca199f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingButtonPeer__
-#define __gnu_java_awt_peer_swing_SwingButtonPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingButtonPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingButtonPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingButtonPeer(::java::awt::Button *);
-  virtual void setLabel(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingButtonPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h b/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h
deleted file mode 100644
index 1fd853b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCanvasPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCanvasPeer__
-#define __gnu_java_awt_peer_swing_SwingCanvasPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCanvasPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCanvasPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingCanvasPeer(::java::awt::Canvas *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCanvasPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h
deleted file mode 100644
index d50fe66..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
-
-#pragma interface
-
-#include <javax/swing/JCheckBox.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-              class SwingCheckboxPeer$SwingCheckbox;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckbox : public ::javax::swing::JCheckBox
-{
-
-public: // actually package-private
-  SwingCheckboxPeer$SwingCheckbox(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::javax::swing::JCheckBox)))) checkbox;
-  ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h
deleted file mode 100644
index 71517ae..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-              class SwingCheckboxPeer$SwingCheckboxListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckboxListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCheckboxPeer$SwingCheckboxListener(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtCheckbox;
-  ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h
deleted file mode 100644
index bceaa21..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer__
-#define __gnu_java_awt_peer_swing_SwingCheckboxPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingCheckboxPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingCheckboxPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingCheckboxPeer(::java::awt::Checkbox *);
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void setLabel(::java::lang::String *);
-  virtual void setState(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponent.h b/libjava/gnu/java/awt/peer/swing/SwingComponent.h
deleted file mode 100644
index 619a05e..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponent.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingComponent__
-#define __gnu_java_awt_peer_swing_SwingComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingComponent;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::JComponent * getJComponent() = 0;
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *) = 0;
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *) = 0;
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_peer_swing_SwingComponent__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h b/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h
deleted file mode 100644
index 5454968..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingComponentPeer__
-#define __gnu_java_awt_peer_swing_SwingComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingComponent;
-              class SwingComponentPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingComponentPeer : public ::java::lang::Object
-{
-
-public: // actually protected
-  SwingComponentPeer();
-  virtual void init(::java::awt::Component *, ::gnu::java::awt::peer::swing::SwingComponent *);
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual void disable();
-  virtual void dispose();
-  virtual void enable();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual void handleEvent(::java::awt::AWTEvent *);
-  virtual void hide();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isFocusable();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual void setEventMask(jlong);
-  virtual jboolean isObscured();
-  virtual jboolean canDetermineObscurity();
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *);
-  virtual void updateCursorImmediately();
-  virtual jboolean handlesWheelScrolling();
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void reparent(::java::awt::peer::ContainerPeer *);
-  virtual void setBounds(jint, jint, jint, jint, jint);
-  virtual jboolean isReparentSupported();
-  virtual void layout();
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-  virtual void peerPaintComponent(::java::awt::Graphics *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-public:
-  virtual ::java::awt::Component * getComponent();
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtComponent;
-  ::gnu::java::awt::peer::swing::SwingComponent * swingComponent;
-  ::java::awt::Font * peerFont;
-  ::java::awt::Rectangle * paintArea;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingComponentPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h b/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h
deleted file mode 100644
index a3895c0..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingContainerPeer__
-#define __gnu_java_awt_peer_swing_SwingContainerPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingContainerPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Image;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingContainerPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingContainerPeer(::java::awt::Container *);
-public: // actually protected
-  virtual void addHeavyweightDescendent(::java::awt::Component *);
-  virtual void removeHeavyweightDescendent(::java::awt::Component *);
-  virtual JArray< ::java::awt::Component * > * getHeavyweightDescendents();
-public:
-  virtual ::java::awt::Insets * insets();
-  virtual ::java::awt::Insets * getInsets();
-  virtual void beginValidate();
-  virtual void endValidate();
-  virtual void beginLayout();
-  virtual void endLayout();
-  virtual jboolean isPaintPending();
-  virtual jboolean isRestackSupported();
-  virtual void cancelPendingPaint(jint, jint, jint, jint);
-  virtual void restack();
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-private:
-  jboolean isDoubleBuffering();
-public: // actually protected
-  virtual void peerPaintChildren(::java::awt::Graphics *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-private:
-  ::java::awt::Component * getFocusOwner();
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) heavyweightDescendents;
-  ::java::awt::Image * backbuffer;
-  ::java::awt::Component * focusOwner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingContainerPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h b/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h
deleted file mode 100644
index e09ee5d..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingFramePeer__
-#define __gnu_java_awt_peer_swing_SwingFramePeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingWindowPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingFramePeer;
-              class SwingMenuBarPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Graphics;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingFramePeer : public ::gnu::java::awt::peer::swing::SwingWindowPeer
-{
-
-public:
-  SwingFramePeer(::java::awt::Frame *);
-  virtual void setMenuBar(::java::awt::MenuBar *);
-public: // actually protected
-  virtual void peerPaintComponent(::java::awt::Graphics *);
-public:
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Point * getMenuLocationOnScreen();
-public: // actually protected
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public:
-  virtual void setIconImage(::java::awt::Image *) = 0;
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual jint getState() = 0;
-  virtual void setState(jint) = 0;
-  virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0;
-  virtual void setBoundsPrivate(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getBoundsPrivate() = 0;
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingWindowPeer)))) menuBar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingFramePeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h
deleted file mode 100644
index 561c810..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
-#define __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingLabelPeer;
-              class SwingLabelPeer$SwingLabel;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Label;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingLabelPeer$SwingLabel : public ::javax::swing::JLabel
-{
-
-public: // actually package-private
-  SwingLabelPeer$SwingLabel(::gnu::java::awt::peer::swing::SwingLabelPeer *, ::java::awt::Label *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-public: // actually package-private
-  ::java::awt::Label * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) label;
-  ::gnu::java::awt::peer::swing::SwingLabelPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingLabelPeer$SwingLabel__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h
deleted file mode 100644
index a400853..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingLabelPeer__
-#define __gnu_java_awt_peer_swing_SwingLabelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingLabelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingLabelPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingLabelPeer(::java::awt::Label *);
-  virtual void setText(::java::lang::String *);
-  virtual void setAlignment(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingLabelPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h b/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h
deleted file mode 100644
index 76b8b75..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
-#define __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
-
-#pragma interface
-
-#include <javax/swing/JScrollPane.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingListPeer;
-              class SwingListPeer$SwingList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingListPeer$SwingList : public ::javax::swing::JScrollPane
-{
-
-public: // actually package-private
-  SwingListPeer$SwingList(::gnu::java::awt::peer::swing::SwingListPeer *, ::java::awt::Component *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isLightweight();
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingListPeer * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingListPeer$SwingList__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingListPeer.h b/libjava/gnu/java/awt/peer/swing/SwingListPeer.h
deleted file mode 100644
index fa6fde6..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingListPeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingListPeer__
-#define __gnu_java_awt_peer_swing_SwingListPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingListPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class List;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListModel;
-        class JList;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingListPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingListPeer(::java::awt::List *);
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void clear();
-  virtual void delItems(jint, jint);
-  virtual void deselect(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual void makeVisible(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void removeAll();
-  virtual void select(jint);
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually protected
-  virtual void peerPaint(::java::awt::Graphics *, jboolean);
-private:
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jList;
-  ::javax::swing::DefaultListModel * listModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingListPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h b/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h
deleted file mode 100644
index 4ab74e8..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
-#define __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JMenuBar.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuBarPeer;
-              class SwingMenuBarPeer$SwingMenuBar;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar : public ::javax::swing::JMenuBar
-{
-
-  SwingMenuBarPeer$SwingMenuBar(::gnu::java::awt::peer::swing::SwingMenuBarPeer *);
-public:
-  virtual ::java::awt::Container * getParent();
-  virtual jboolean isShowing();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-public: // actually package-private
-  SwingMenuBarPeer$SwingMenuBar(::gnu::java::awt::peer::swing::SwingMenuBarPeer *, ::gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar *);
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuBarPeer$SwingMenuBar__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h
deleted file mode 100644
index 3579476..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuBarPeer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuBarPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuBarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingFramePeer;
-              class SwingMenuBarPeer;
-              class SwingMenuBarPeer$SwingMenuBar;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-        class Menu;
-        class MenuBar;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuBarPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuBarPeer(::java::awt::MenuBar *);
-  virtual void setFramePeer(::gnu::java::awt::peer::swing::SwingFramePeer *);
-  virtual void addMenu(::java::awt::Menu *);
-  virtual void addHelpMenu(::java::awt::Menu *);
-  virtual void delMenu(jint);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  virtual void setWidth(jint);
-  virtual void peerPaint(::java::awt::Graphics *);
-  virtual jint getHeight();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::java::awt::MenuBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenuBar;
-  ::gnu::java::awt::peer::swing::SwingMenuBarPeer$SwingMenuBar * menuBar;
-  ::gnu::java::awt::peer::swing::SwingFramePeer * framePeer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuBarPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h b/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h
deleted file mode 100644
index 1aa993b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
-#define __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuItemPeer;
-              class SwingMenuItemPeer$SwingMenuItemListener;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuItemPeer$SwingMenuItemListener : public ::java::lang::Object
-{
-
-  SwingMenuItemPeer$SwingMenuItemListener(::gnu::java::awt::peer::swing::SwingMenuItemPeer *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  SwingMenuItemPeer$SwingMenuItemListener(::gnu::java::awt::peer::swing::SwingMenuItemPeer *, ::gnu::java::awt::peer::swing::SwingMenuItemPeer$SwingMenuItemListener *);
-  ::gnu::java::awt::peer::swing::SwingMenuItemPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuItemPeer$SwingMenuItemListener__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h
deleted file mode 100644
index f79e2d2..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuItemPeer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuItemPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuItemPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenuItem;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuItemPeer(::java::awt::MenuItem *);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-public: // actually package-private
-  ::java::awt::MenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenuItem;
-  ::javax::swing::JMenuItem * menuItem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuItemPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h b/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h
deleted file mode 100644
index 1de2bee..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
-#define __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenu.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuPeer;
-              class SwingMenuPeer$SwingMenu;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu : public ::javax::swing::JMenu
-{
-
-  SwingMenuPeer$SwingMenu(::gnu::java::awt::peer::swing::SwingMenuPeer *);
-public:
-  virtual jboolean isShowing();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  SwingMenuPeer$SwingMenu(::gnu::java::awt::peer::swing::SwingMenuPeer *, ::gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu *);
-  ::gnu::java::awt::peer::swing::SwingMenuPeer * __attribute__((aligned(__alignof__( ::javax::swing::JMenu)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuPeer$SwingMenu__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h b/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h
deleted file mode 100644
index 988b481..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingMenuPeer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingMenuPeer__
-#define __gnu_java_awt_peer_swing_SwingMenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingMenuPeer;
-              class SwingMenuPeer$SwingMenu;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Menu;
-        class MenuItem;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingMenuPeer : public ::java::lang::Object
-{
-
-public:
-  SwingMenuPeer(::java::awt::Menu *);
-  virtual void addItem(::java::awt::MenuItem *);
-  virtual void addSeparator();
-  virtual void delItem(jint);
-  virtual void disable();
-  virtual void enable();
-  virtual void setEnabled(jboolean);
-  virtual void setLabel(::java::lang::String *);
-  virtual void dispose();
-  virtual void setFont(::java::awt::Font *);
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint getX();
-  virtual jint getWidth();
-public:
-  virtual jint getY();
-public: // actually package-private
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtMenu;
-  ::gnu::java::awt::peer::swing::SwingMenuPeer$SwingMenu * menu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingMenuPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h b/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h
deleted file mode 100644
index 3b9f61b..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingPanelPeer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingPanelPeer__
-#define __gnu_java_awt_peer_swing_SwingPanelPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingPanelPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Panel;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingPanelPeer : public ::gnu::java::awt::peer::swing::SwingContainerPeer
-{
-
-public:
-  SwingPanelPeer(::java::awt::Panel *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingPanelPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h
deleted file mode 100644
index 77c1529..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
-
-#pragma interface
-
-#include <javax/swing/JViewport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$1;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$1 : public ::javax::swing::JViewport
-{
-
-public: // actually package-private
-  SwingTextAreaPeer$1(::gnu::java::awt::peer::swing::SwingTextAreaPeer *);
-public:
-  virtual ::java::awt::Image * createImage(jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h
deleted file mode 100644
index 040c7f0..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JScrollPane.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingScrollPane;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingScrollPane : public ::javax::swing::JScrollPane
-{
-
-public: // actually package-private
-  SwingTextAreaPeer$SwingScrollPane(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *);
-public:
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isLightweight();
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Container * getParent();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) textArea;
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
deleted file mode 100644
index fe39275..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
-
-#pragma interface
-
-#include <javax/swing/JTextArea.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-          class FocusEvent;
-          class HierarchyEvent;
-          class InputMethodEvent;
-          class KeyEvent;
-          class MouseEvent;
-          class MouseWheelEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea : public ::javax::swing::JTextArea
-{
-
-  SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *);
-public: // actually protected
-  virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void processComponentEvent(::java::awt::event::ComponentEvent *);
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void processHierarchyBoundsEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processHierarchyEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processInputMethodEvent(::java::awt::event::InputMethodEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseWheelEvent(::java::awt::event::MouseWheelEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *);
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JTextArea)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingTextArea__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h
deleted file mode 100644
index 2e58f53..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer__
-#define __gnu_java_awt_peer_swing_SwingTextAreaPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingTextAreaPeer(::java::awt::TextArea *);
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-  virtual jlong filterEvents(jlong);
-  virtual jint getCaretPosition();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void select(jint, jint);
-  virtual void setCaretPosition(jint);
-  virtual void setEditable(jboolean);
-  virtual void setText(::java::lang::String *);
-  virtual void reshape(jint, jint, jint, jint);
-private:
-  ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jTextArea;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h
deleted file mode 100644
index 3a46f67..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
-#define __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextFieldPeer;
-              class SwingTextFieldPeer$SwingTextField;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-        class TextField;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextFieldPeer$SwingTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  SwingTextFieldPeer$SwingTextField(::gnu::java::awt::peer::swing::SwingTextFieldPeer *, ::java::awt::TextField *);
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jboolean isShowing();
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::javax::swing::JComponent * getJComponent();
-  virtual void handleMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void handleKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void handleFocusEvent(::java::awt::event::FocusEvent *);
-  virtual ::java::awt::Container * getParent();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-public: // actually package-private
-  ::java::awt::TextField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) textField;
-  ::gnu::java::awt::peer::swing::SwingTextFieldPeer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextFieldPeer$SwingTextField__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h
deleted file mode 100644
index 43d26d5..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingTextFieldPeer__
-#define __gnu_java_awt_peer_swing_SwingTextFieldPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingComponentPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextFieldPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextField;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextFieldPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer
-{
-
-public:
-  SwingTextFieldPeer(::java::awt::TextField *);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual void setEchoChar(jchar);
-  virtual void setEchoCharacter(jchar);
-  virtual jint getSelectionEnd();
-  virtual jint getSelectionStart();
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual void select(jint, jint);
-  virtual void setEditable(jboolean);
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jint getIndexAtPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jlong filterEvents(jlong);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingTextFieldPeer__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h b/libjava/gnu/java/awt/peer/swing/SwingToolkit.h
deleted file mode 100644
index 9572f3f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingToolkit__
-#define __gnu_java_awt_peer_swing_SwingToolkit__
-
-#pragma interface
-
-#include <gnu/java/awt/ClasspathToolkit.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingToolkit;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Canvas;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Label;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class Panel;
-        class TextField;
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class LabelPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class PanelPeer;
-          class TextFieldPeer;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingToolkit : public ::gnu::java::awt::ClasspathToolkit
-{
-
-public:
-  SwingToolkit();
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *);
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *);
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *);
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *);
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *);
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *);
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *);
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *);
-public:
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingToolkit__
diff --git a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h b/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h
deleted file mode 100644
index c4fc73f..0000000
--- a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_swing_SwingWindowPeer__
-#define __gnu_java_awt_peer_swing_SwingWindowPeer__
-
-#pragma interface
-
-#include <gnu/java/awt/peer/swing/SwingContainerPeer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingWindowPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingWindowPeer : public ::gnu::java::awt::peer::swing::SwingContainerPeer
-{
-
-public:
-  SwingWindowPeer(::java::awt::Window *);
-  virtual void updateIconImages();
-  virtual void updateMinimumSize();
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
-  virtual void updateFocusableWindowState();
-  virtual void setAlwaysOnTop(jboolean);
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_swing_SwingWindowPeer__
diff --git a/libjava/gnu/java/awt/print/JavaPrinterGraphics.h b/libjava/gnu/java/awt/print/JavaPrinterGraphics.h
deleted file mode 100644
index 7809034..0000000
--- a/libjava/gnu/java/awt/print/JavaPrinterGraphics.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_JavaPrinterGraphics__
-#define __gnu_java_awt_print_JavaPrinterGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class JavaPrinterGraphics;
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class ImageObserver;
-      }
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::print::JavaPrinterGraphics : public ::java::awt::Graphics
-{
-
-public:
-  JavaPrinterGraphics(::java::awt::print::PrinterJob *);
-  virtual ::gnu::java::awt::print::SpooledDocument * spoolPostScript(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, ::java::awt::print::Pageable *);
-  virtual jint spoolPage(::java::io::PrintWriter *, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-private:
-  void initImage(::java::awt::print::PageFormat *);
-  void writePSHeader(::java::io::PrintWriter *);
-  void writePage(::java::io::PrintWriter *, ::java::awt::print::PageFormat *);
-  ::java::lang::String * colorTripleHex(jint);
-  void concatCTM(::java::io::PrintWriter *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual ::java::awt::print::PrinterJob * getPrinterJob();
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Graphics * create();
-  virtual void dispose();
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual void setColor(::java::awt::Color *);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void translate(jint, jint);
-private:
-  ::java::awt::Graphics * __attribute__((aligned(__alignof__( ::java::awt::Graphics)))) g;
-  ::java::awt::print::PrinterJob * printerJob;
-  static jdouble DPI;
-  jint xSize;
-  jint ySize;
-  ::java::awt::Image * image;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_JavaPrinterGraphics__
diff --git a/libjava/gnu/java/awt/print/JavaPrinterJob.h b/libjava/gnu/java/awt/print/JavaPrinterJob.h
deleted file mode 100644
index 6275b13..0000000
--- a/libjava/gnu/java/awt/print/JavaPrinterJob.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_JavaPrinterJob__
-#define __gnu_java_awt_print_JavaPrinterJob__
-
-#pragma interface
-
-#include <java/awt/print/PrinterJob.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class JavaPrinterJob;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::print::JavaPrinterJob : public ::java::awt::print::PrinterJob
-{
-
-public:
-  JavaPrinterJob();
-private:
-  void getPageAttributes();
-public:
-  virtual jint getCopies();
-  virtual void setCopies(jint);
-  virtual ::java::lang::String * getJobName();
-  virtual void setJobName(::java::lang::String *);
-  virtual ::java::lang::String * getUserName();
-  virtual void cancel();
-  virtual jboolean isCancelled();
-  virtual ::java::awt::print::PageFormat * defaultPage(::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * pageDialog(::java::awt::print::PageFormat *);
-  virtual void print();
-  virtual void print(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual jboolean printDialog();
-  virtual jboolean printDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void setPageable(::java::awt::print::Pageable *);
-  virtual void setPrintable(::java::awt::print::Printable *);
-  virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *);
-  virtual void setPrintService(::javax::print::PrintService *);
-private:
-  ::javax::print::PrintService * __attribute__((aligned(__alignof__( ::java::awt::print::PrinterJob)))) printer;
-  ::javax::print::attribute::PrintRequestAttributeSet * attributes;
-  static JArray< ::javax::print::PrintService * > * services;
-  ::javax::print::DocPrintJob * printJob;
-  ::java::awt::print::Printable * printable;
-  ::java::awt::print::PageFormat * pageFormat;
-  ::java::awt::print::Pageable * pageable;
-  jboolean cancelled;
-  static ::java::lang::Class * copyClass;
-  static ::java::lang::Class * jobNameClass;
-  static ::java::lang::Class * userNameClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_JavaPrinterJob__
diff --git a/libjava/gnu/java/awt/print/PostScriptGraphics2D.h b/libjava/gnu/java/awt/print/PostScriptGraphics2D.h
deleted file mode 100644
index 4601104..0000000
--- a/libjava/gnu/java/awt/print/PostScriptGraphics2D.h
+++ /dev/null
@@ -1,211 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_PostScriptGraphics2D__
-#define __gnu_java_awt_print_PostScriptGraphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics2D.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class PostScriptGraphics2D;
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class gnu::java::awt::print::PostScriptGraphics2D : public ::java::awt::Graphics2D
-{
-
-public:
-  PostScriptGraphics2D(::java::awt::print::PrinterJob *);
-  virtual ::gnu::java::awt::print::SpooledDocument * spoolPostScript(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, ::java::awt::print::Pageable *);
-private:
-  void writePSHeader();
-  void setupFonts();
-public:
-  virtual jint spoolPage(::java::io::PrintWriter *, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-private:
-  void pushCTM();
-  void popCTM();
-public:
-  virtual ::java::awt::Graphics * create();
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *);
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::lang::String *, jfloat, jfloat);
-private:
-  void drawStringPSFont(::java::lang::String *, jfloat, jfloat);
-  void saveAndInvertAxis();
-  void restoreAxis();
-  void drawStringShape(::java::awt::Shape *);
-public:
-  virtual void setColor(::java::awt::Color *);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void dispose();
-  virtual void setClip(jint, jint, jint, jint);
-  virtual void setClip(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getClip();
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setFont(::java::awt::Font *);
-private:
-  void setPSFont();
-public:
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual void close();
-  virtual void addRenderingHints(::java::util::Map *);
-private:
-  void writeShape(::java::awt::Shape *);
-public:
-  virtual void clip(::java::awt::Shape *);
-  virtual void draw(::java::awt::Shape *);
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void fill(::java::awt::Shape *);
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Composite * getComposite();
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext();
-  virtual ::java::awt::Paint * getPaint();
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::Stroke * getStroke();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setComposite(::java::awt::Composite *);
-  virtual void setPaint(::java::awt::Paint *);
-private:
-  ::java::lang::String * colorTriple(::java::awt::Color *);
-  ::java::lang::String * colorTripleHex(::java::awt::Color *);
-  void writeGradient();
-public:
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual void setRenderingHints(::java::util::Map *);
-  virtual void setStroke(::java::awt::Stroke *);
-private:
-  void concatCTM(::java::awt::geom::AffineTransform *);
-public:
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void shear(jdouble, jdouble);
-  virtual void translate(jint, jint);
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-private:
-  ::java::awt::print::PrinterJob * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) printerJob;
-  ::java::io::PrintWriter * out;
-  ::java::awt::geom::AffineTransform * currentTransform;
-  ::java::awt::geom::AffineTransform * pageTransform;
-  ::java::awt::RenderingHints * renderingHints;
-  ::java::awt::Paint * currentPaint;
-  ::java::awt::Shape * clipShape;
-  ::java::awt::Font * currentFont;
-  ::java::awt::Color * currentColor;
-  ::java::awt::Color * backgroundColor;
-  ::java::awt::Stroke * currentStroke;
-  static ::java::awt::Stroke * ordinaryStroke;
-  jfloat cx;
-  jfloat cy;
-  jboolean currentFontIsPS;
-  jdouble pageX;
-  jdouble pageY;
-  jdouble Y;
-  jboolean gradientOn;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_PostScriptGraphics2D__
diff --git a/libjava/gnu/java/awt/print/SpooledDocument.h b/libjava/gnu/java/awt/print/SpooledDocument.h
deleted file mode 100644
index a49bb14..0000000
--- a/libjava/gnu/java/awt/print/SpooledDocument.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_print_SpooledDocument__
-#define __gnu_java_awt_print_SpooledDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace print
-        {
-            class SpooledDocument;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::print::SpooledDocument : public ::java::lang::Object
-{
-
-public:
-  SpooledDocument(::java::io::File *);
-  virtual ::javax::print::attribute::DocAttributeSet * getAttributes();
-  virtual ::javax::print::DocFlavor * getDocFlavor();
-  virtual ::java::lang::Object * getPrintData();
-  virtual ::java::io::Reader * getReaderForText();
-  virtual ::java::io::InputStream * getStreamForBytes();
-private:
-  ::java::io::FileInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_print_SpooledDocument__
diff --git a/libjava/gnu/java/beans/BeanInfoEmbryo.h b/libjava/gnu/java/beans/BeanInfoEmbryo.h
deleted file mode 100644
index 0e1fe16..0000000
--- a/libjava/gnu/java/beans/BeanInfoEmbryo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_BeanInfoEmbryo__
-#define __gnu_java_beans_BeanInfoEmbryo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class BeanInfoEmbryo;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class IndexedPropertyDescriptor;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-    }
-  }
-}
-
-class gnu::java::beans::BeanInfoEmbryo : public ::java::lang::Object
-{
-
-public:
-  BeanInfoEmbryo();
-  virtual ::java::beans::BeanInfo * getBeanInfo();
-  virtual void setBeanDescriptor(::java::beans::BeanDescriptor *);
-  virtual void setAdditionalBeanInfo(JArray< ::java::beans::BeanInfo * > *);
-  virtual jboolean hasProperty(::java::beans::PropertyDescriptor *);
-  virtual void addProperty(::java::beans::PropertyDescriptor *);
-  virtual void addIndexedProperty(::java::beans::IndexedPropertyDescriptor *);
-  virtual jboolean hasEvent(::java::beans::EventSetDescriptor *);
-  virtual void addEvent(::java::beans::EventSetDescriptor *);
-  virtual jboolean hasMethod(::java::beans::MethodDescriptor *);
-  virtual void addMethod(::java::beans::MethodDescriptor *);
-  virtual void setDefaultPropertyName(::java::lang::String *);
-  virtual void setDefaultEventName(::java::lang::String *);
-  virtual void setIcons(JArray< ::java::awt::Image * > *);
-public: // actually package-private
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) properties;
-  ::java::util::Hashtable * events;
-  ::java::util::Vector * methods;
-  ::java::beans::BeanDescriptor * beanDescriptor;
-  JArray< ::java::beans::BeanInfo * > * additionalBeanInfo;
-  JArray< ::java::awt::Image * > * im;
-  ::java::lang::String * defaultPropertyName;
-  ::java::lang::String * defaultEventName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_BeanInfoEmbryo__
diff --git a/libjava/gnu/java/beans/DefaultExceptionListener.h b/libjava/gnu/java/beans/DefaultExceptionListener.h
deleted file mode 100644
index 1815fe8..0000000
--- a/libjava/gnu/java/beans/DefaultExceptionListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_DefaultExceptionListener__
-#define __gnu_java_beans_DefaultExceptionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class DefaultExceptionListener;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::DefaultExceptionListener : public ::java::lang::Object
-{
-
-public:
-  DefaultExceptionListener();
-  virtual void exceptionThrown(::java::lang::Exception *);
-  static ::gnu::java::beans::DefaultExceptionListener * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_DefaultExceptionListener__
diff --git a/libjava/gnu/java/beans/DoubleKey.h b/libjava/gnu/java/beans/DoubleKey.h
deleted file mode 100644
index c20d568..0000000
--- a/libjava/gnu/java/beans/DoubleKey.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_DoubleKey__
-#define __gnu_java_beans_DoubleKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class DoubleKey;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::DoubleKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DoubleKey(::java::lang::Class *, ::java::lang::String *);
-  virtual ::java::lang::Class * getType();
-  virtual ::java::lang::String * getName();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually package-private
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_DoubleKey__
diff --git a/libjava/gnu/java/beans/DummyAppletContext.h b/libjava/gnu/java/beans/DummyAppletContext.h
deleted file mode 100644
index 095f50d..0000000
--- a/libjava/gnu/java/beans/DummyAppletContext.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_DummyAppletContext__
-#define __gnu_java_beans_DummyAppletContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class DummyAppletContext;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-        class AudioClip;
-    }
-    namespace awt
-    {
-        class Image;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::beans::DummyAppletContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DummyAppletContext();
-public:
-  virtual ::java::applet::AudioClip * getAudioClip(::java::net::URL *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::applet::Applet * getApplet(::java::lang::String *);
-  virtual ::java::util::Enumeration * getApplets();
-  virtual void showDocument(::java::net::URL *);
-  virtual void showDocument(::java::net::URL *, ::java::lang::String *);
-  virtual void showStatus(::java::lang::String *);
-  virtual void setStream(::java::lang::String *, ::java::io::InputStream *);
-  virtual ::java::io::InputStream * getStream(::java::lang::String *);
-  virtual ::java::util::Iterator * getStreamKeys();
-private:
-  static ::java::util::Enumeration * EMPTY_ENUMERATION;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_DummyAppletContext__
diff --git a/libjava/gnu/java/beans/DummyAppletStub.h b/libjava/gnu/java/beans/DummyAppletStub.h
deleted file mode 100644
index 10ee9ff..0000000
--- a/libjava/gnu/java/beans/DummyAppletStub.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_DummyAppletStub__
-#define __gnu_java_beans_DummyAppletStub__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class DummyAppletContext;
-          class DummyAppletStub;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace applet
-    {
-        class AppletContext;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::beans::DummyAppletStub : public ::java::lang::Object
-{
-
-public:
-  DummyAppletStub(::java::net::URL *, ::java::net::URL *);
-  virtual jboolean isActive();
-  virtual ::java::net::URL * getDocumentBase();
-  virtual ::java::net::URL * getCodeBase();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::applet::AppletContext * getAppletContext();
-  virtual void appletResize(jint, jint);
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) documentBase;
-  ::java::net::URL * codeBase;
-  ::gnu::java::beans::DummyAppletContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_DummyAppletStub__
diff --git a/libjava/gnu/java/beans/ExplicitBeanInfo.h b/libjava/gnu/java/beans/ExplicitBeanInfo.h
deleted file mode 100644
index 3fd0873..0000000
--- a/libjava/gnu/java/beans/ExplicitBeanInfo.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_ExplicitBeanInfo__
-#define __gnu_java_beans_ExplicitBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class ExplicitBeanInfo;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-    }
-  }
-}
-
-class gnu::java::beans::ExplicitBeanInfo : public ::java::lang::Object
-{
-
-public:
-  ExplicitBeanInfo(::java::beans::BeanDescriptor *, JArray< ::java::beans::BeanInfo * > *, JArray< ::java::beans::PropertyDescriptor * > *, jint, JArray< ::java::beans::EventSetDescriptor * > *, jint, JArray< ::java::beans::MethodDescriptor * > *, JArray< ::java::awt::Image * > *);
-  virtual ::java::beans::BeanDescriptor * getBeanDescriptor();
-  virtual JArray< ::java::beans::EventSetDescriptor * > * getEventSetDescriptors();
-  virtual jint getDefaultEventIndex();
-  virtual JArray< ::java::beans::PropertyDescriptor * > * getPropertyDescriptors();
-  virtual jint getDefaultPropertyIndex();
-  virtual JArray< ::java::beans::MethodDescriptor * > * getMethodDescriptors();
-  virtual JArray< ::java::beans::BeanInfo * > * getAdditionalBeanInfo();
-  virtual ::java::awt::Image * getIcon(jint);
-public: // actually protected
-  ::java::beans::BeanDescriptor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beanDescriptor;
-  JArray< ::java::beans::EventSetDescriptor * > * eventSetDescriptors;
-  JArray< ::java::beans::PropertyDescriptor * > * propertyDescriptors;
-  JArray< ::java::beans::MethodDescriptor * > * methodDescriptors;
-  jint defaultPropertyIndex;
-  jint defaultEventIndex;
-  JArray< ::java::beans::BeanInfo * > * additionalBeanInfo;
-  JArray< ::java::awt::Image * > * icons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_ExplicitBeanInfo__
diff --git a/libjava/gnu/java/beans/IntrospectionIncubator.h b/libjava/gnu/java/beans/IntrospectionIncubator.h
deleted file mode 100644
index b9f11c3..0000000
--- a/libjava/gnu/java/beans/IntrospectionIncubator.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_IntrospectionIncubator__
-#define __gnu_java_beans_IntrospectionIncubator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class BeanInfoEmbryo;
-          class IntrospectionIncubator;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class BeanInfo;
-    }
-  }
-}
-
-class gnu::java::beans::IntrospectionIncubator : public ::java::lang::Object
-{
-
-public:
-  IntrospectionIncubator();
-  virtual void addMethod(::java::lang::reflect::Method *);
-  virtual void addMethods(JArray< ::java::lang::reflect::Method * > *);
-  virtual void setPropertyStopClass(::java::lang::Class *);
-  virtual void setEventStopClass(::java::lang::Class *);
-  virtual void setMethodStopClass(::java::lang::Class *);
-  virtual ::gnu::java::beans::BeanInfoEmbryo * getBeanInfoEmbryo();
-  virtual ::java::beans::BeanInfo * getBeanInfo();
-public: // actually package-private
-  virtual void findAddRemovePairs(::gnu::java::beans::BeanInfoEmbryo *);
-  virtual void findXXX(::gnu::java::beans::BeanInfoEmbryo *, jint);
-  virtual void findXXXInt(::gnu::java::beans::BeanInfoEmbryo *, jint);
-  virtual void addToPropertyHash(::java::lang::String *, ::java::lang::reflect::Method *, jint);
-  virtual void addToListenerHash(::java::lang::String *, ::java::lang::reflect::Method *, jint);
-  static jboolean isReachable(::java::lang::Class *, ::java::lang::Class *);
-  static ::java::lang::String * capitalize(::java::lang::String *);
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) propertyMethods;
-  ::java::util::Hashtable * listenerMethods;
-  ::java::util::Vector * otherMethods;
-  ::java::lang::Class * propertyStopClass;
-  ::java::lang::Class * eventStopClass;
-  ::java::lang::Class * methodStopClass;
-  static const jint IS = 0;
-  static const jint GET_I = 1;
-  static const jint SET_I = 2;
-  static const jint GET = 3;
-  static const jint SET = 4;
-  static const jint ADD = 0;
-  static const jint REMOVE = 1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_IntrospectionIncubator__
diff --git a/libjava/gnu/java/beans/decoder/AbstractContext.h b/libjava/gnu/java/beans/decoder/AbstractContext.h
deleted file mode 100644
index 9b3f03c..0000000
--- a/libjava/gnu/java/beans/decoder/AbstractContext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_AbstractContext__
-#define __gnu_java_beans_decoder_AbstractContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractContext;
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::AbstractContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractContext();
-public:
-  virtual ::java::lang::String * getId();
-  virtual void setId(::java::lang::String *);
-  virtual jboolean isStatement();
-  virtual void setStatement(jboolean);
-  virtual void addParameterObject(::java::lang::Object *) = 0;
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *) = 0;
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *) = 0;
-  virtual jboolean subContextFailed() = 0;
-  virtual void set(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual ::java::lang::Object * getResult() = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isStatement__;
-  ::java::lang::String * id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_AbstractContext__
diff --git a/libjava/gnu/java/beans/decoder/AbstractCreatableObjectContext.h b/libjava/gnu/java/beans/decoder/AbstractCreatableObjectContext.h
deleted file mode 100644
index 77f96ba..0000000
--- a/libjava/gnu/java/beans/decoder/AbstractCreatableObjectContext.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_AbstractCreatableObjectContext__
-#define __gnu_java_beans_decoder_AbstractCreatableObjectContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractCreatableObjectContext;
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::AbstractCreatableObjectContext : public ::gnu::java::beans::decoder::AbstractObjectContext
-{
-
-public: // actually package-private
-  AbstractCreatableObjectContext();
-public:
-  virtual void addParameterObject(::java::lang::Object *);
-public: // actually protected
-  virtual void addParameterObjectImpl(::java::lang::Object *) = 0;
-public:
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-public: // actually protected
-  virtual ::java::lang::Object * createObject(::gnu::java::beans::decoder::Context *) = 0;
-public:
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_AbstractCreatableObjectContext__
diff --git a/libjava/gnu/java/beans/decoder/AbstractElementHandler.h b/libjava/gnu/java/beans/decoder/AbstractElementHandler.h
deleted file mode 100644
index e0abc31..0000000
--- a/libjava/gnu/java/beans/decoder/AbstractElementHandler.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_AbstractElementHandler__
-#define __gnu_java_beans_decoder_AbstractElementHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class Context;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::AbstractElementHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractElementHandler(::gnu::java::beans::decoder::ElementHandler *, jboolean);
-public:
-  virtual void start(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *) = 0;
-public:
-  virtual void end(::java::beans::ExceptionListener *);
-  virtual void notifyStatement(::java::beans::ExceptionListener *);
-  virtual void notifyContextFailed();
-  virtual jboolean hasFailed();
-public: // actually protected
-  virtual void endElement(::java::lang::String *);
-public:
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void putObject(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObject(::java::lang::String *);
-  virtual ::java::lang::Class * instantiateClass(::java::lang::String *);
-  virtual jboolean isSubelementAllowed(::java::lang::String *);
-  virtual ::gnu::java::beans::decoder::Context * getContext();
-  virtual ::gnu::java::beans::decoder::ElementHandler * getParent();
-private:
-  ::gnu::java::beans::decoder::Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) context;
-  ::gnu::java::beans::decoder::ElementHandler * parent;
-  jboolean hasFailed__;
-  ::java::lang::StringBuffer * buffer;
-  jboolean allowsSubelements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_AbstractElementHandler__
diff --git a/libjava/gnu/java/beans/decoder/AbstractObjectContext.h b/libjava/gnu/java/beans/decoder/AbstractObjectContext.h
deleted file mode 100644
index db4bee7..0000000
--- a/libjava/gnu/java/beans/decoder/AbstractObjectContext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_AbstractObjectContext__
-#define __gnu_java_beans_decoder_AbstractObjectContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractObjectContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::AbstractObjectContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public: // actually package-private
-  AbstractObjectContext();
-public: // actually protected
-  virtual void setObject(::java::lang::Object *);
-public:
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractContext)))) object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_AbstractObjectContext__
diff --git a/libjava/gnu/java/beans/decoder/ArrayContext.h b/libjava/gnu/java/beans/decoder/ArrayContext.h
deleted file mode 100644
index 4184ed0..0000000
--- a/libjava/gnu/java/beans/decoder/ArrayContext.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ArrayContext__
-#define __gnu_java_beans_decoder_ArrayContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ArrayContext;
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ArrayContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public: // actually package-private
-  ArrayContext(::java::lang::String *, ::java::lang::Class *, jint);
-public:
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractContext)))) array;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ArrayContext__
diff --git a/libjava/gnu/java/beans/decoder/ArrayHandler.h b/libjava/gnu/java/beans/decoder/ArrayHandler.h
deleted file mode 100644
index eeacde9..0000000
--- a/libjava/gnu/java/beans/decoder/ArrayHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ArrayHandler__
-#define __gnu_java_beans_decoder_ArrayHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractElementHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ArrayHandler;
-            class Context;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ArrayHandler : public ::gnu::java::beans::decoder::AbstractElementHandler
-{
-
-public: // actually package-private
-  ArrayHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-private:
-  static ::java::util::HashMap * typeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ArrayHandler__
diff --git a/libjava/gnu/java/beans/decoder/AssemblyException.h b/libjava/gnu/java/beans/decoder/AssemblyException.h
deleted file mode 100644
index 62f76f3..0000000
--- a/libjava/gnu/java/beans/decoder/AssemblyException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_AssemblyException__
-#define __gnu_java_beans_decoder_AssemblyException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AssemblyException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::AssemblyException : public ::java::lang::Exception
-{
-
-public: // actually package-private
-  AssemblyException(::java::lang::Throwable *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_AssemblyException__
diff --git a/libjava/gnu/java/beans/decoder/BooleanHandler.h b/libjava/gnu/java/beans/decoder/BooleanHandler.h
deleted file mode 100644
index 575bac0..0000000
--- a/libjava/gnu/java/beans/decoder/BooleanHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_BooleanHandler__
-#define __gnu_java_beans_decoder_BooleanHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class BooleanHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::BooleanHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  BooleanHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_BooleanHandler__
diff --git a/libjava/gnu/java/beans/decoder/ByteHandler.h b/libjava/gnu/java/beans/decoder/ByteHandler.h
deleted file mode 100644
index ef77b6b..0000000
--- a/libjava/gnu/java/beans/decoder/ByteHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ByteHandler__
-#define __gnu_java_beans_decoder_ByteHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ByteHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ByteHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  ByteHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ByteHandler__
diff --git a/libjava/gnu/java/beans/decoder/CharHandler.h b/libjava/gnu/java/beans/decoder/CharHandler.h
deleted file mode 100644
index dfd1b45..0000000
--- a/libjava/gnu/java/beans/decoder/CharHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_CharHandler__
-#define __gnu_java_beans_decoder_CharHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class CharHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::CharHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  CharHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_CharHandler__
diff --git a/libjava/gnu/java/beans/decoder/ClassHandler.h b/libjava/gnu/java/beans/decoder/ClassHandler.h
deleted file mode 100644
index 7c8ea88..0000000
--- a/libjava/gnu/java/beans/decoder/ClassHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ClassHandler__
-#define __gnu_java_beans_decoder_ClassHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ClassHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ClassHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  ClassHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ClassHandler__
diff --git a/libjava/gnu/java/beans/decoder/ConstructorContext.h b/libjava/gnu/java/beans/decoder/ConstructorContext.h
deleted file mode 100644
index 187d740..0000000
--- a/libjava/gnu/java/beans/decoder/ConstructorContext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ConstructorContext__
-#define __gnu_java_beans_decoder_ConstructorContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractCreatableObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ConstructorContext;
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ConstructorContext : public ::gnu::java::beans::decoder::AbstractCreatableObjectContext
-{
-
-public: // actually package-private
-  ConstructorContext(::java::lang::String *, ::java::lang::Class *);
-public: // actually protected
-  virtual void addParameterObjectImpl(::java::lang::Object *);
-  virtual ::java::lang::Object * createObject(::gnu::java::beans::decoder::Context *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractCreatableObjectContext)))) arguments;
-  ::java::lang::Class * klass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ConstructorContext__
diff --git a/libjava/gnu/java/beans/decoder/Context.h b/libjava/gnu/java/beans/decoder/Context.h
deleted file mode 100644
index fa23e80..0000000
--- a/libjava/gnu/java/beans/decoder/Context.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_Context__
-#define __gnu_java_beans_decoder_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::Context : public ::java::lang::Object
-{
-
-public:
-  virtual void addParameterObject(::java::lang::Object *) = 0;
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *) = 0;
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *) = 0;
-  virtual jboolean subContextFailed() = 0;
-  virtual void set(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual ::java::lang::Object * getResult() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual jboolean isStatement() = 0;
-  virtual void setStatement(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_beans_decoder_Context__
diff --git a/libjava/gnu/java/beans/decoder/DecoderContext.h b/libjava/gnu/java/beans/decoder/DecoderContext.h
deleted file mode 100644
index f1b70ef..0000000
--- a/libjava/gnu/java/beans/decoder/DecoderContext.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_DecoderContext__
-#define __gnu_java_beans_decoder_DecoderContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class DecoderContext;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class XMLDecoder;
-    }
-  }
-}
-
-class gnu::java::beans::decoder::DecoderContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public:
-  DecoderContext(::java::beans::XMLDecoder *);
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-  virtual ::java::util::Iterator * iterator();
-private:
-  ::java::beans::XMLDecoder * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractContext)))) decoder;
-  ::java::util::ArrayList * objects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_DecoderContext__
diff --git a/libjava/gnu/java/beans/decoder/DoubleHandler.h b/libjava/gnu/java/beans/decoder/DoubleHandler.h
deleted file mode 100644
index 580b936..0000000
--- a/libjava/gnu/java/beans/decoder/DoubleHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_DoubleHandler__
-#define __gnu_java_beans_decoder_DoubleHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class DoubleHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::DoubleHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  DoubleHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_DoubleHandler__
diff --git a/libjava/gnu/java/beans/decoder/DummyContext.h b/libjava/gnu/java/beans/decoder/DummyContext.h
deleted file mode 100644
index d8839a6..0000000
--- a/libjava/gnu/java/beans/decoder/DummyContext.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_DummyContext__
-#define __gnu_java_beans_decoder_DummyContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class DummyContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::DummyContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public:
-  DummyContext();
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-private:
-  void fail();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_DummyContext__
diff --git a/libjava/gnu/java/beans/decoder/DummyHandler.h b/libjava/gnu/java/beans/decoder/DummyHandler.h
deleted file mode 100644
index 29ca81b..0000000
--- a/libjava/gnu/java/beans/decoder/DummyHandler.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_DummyHandler__
-#define __gnu_java_beans_decoder_DummyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class DummyHandler;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::DummyHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DummyHandler();
-public:
-  virtual void start(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-  virtual void end(::java::beans::ExceptionListener *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual jboolean isSubelementAllowed(::java::lang::String *);
-  virtual ::java::lang::Class * instantiateClass(::java::lang::String *);
-  virtual void notifyStatement(::java::beans::ExceptionListener *);
-  virtual jboolean hasFailed();
-  virtual ::gnu::java::beans::decoder::Context * getContext();
-  virtual void notifyContextFailed();
-  virtual void putObject(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObject(::java::lang::String *);
-  virtual ::gnu::java::beans::decoder::ElementHandler * getParent();
-private:
-  void fail();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_DummyHandler__
diff --git a/libjava/gnu/java/beans/decoder/ElementHandler.h b/libjava/gnu/java/beans/decoder/ElementHandler.h
deleted file mode 100644
index 75df225..0000000
--- a/libjava/gnu/java/beans/decoder/ElementHandler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ElementHandler__
-#define __gnu_java_beans_decoder_ElementHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ElementHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ElementHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void start(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *) = 0;
-  virtual void end(::java::beans::ExceptionListener *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual jboolean isSubelementAllowed(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * instantiateClass(::java::lang::String *) = 0;
-  virtual void notifyStatement(::java::beans::ExceptionListener *) = 0;
-  virtual jboolean hasFailed() = 0;
-  virtual ::gnu::java::beans::decoder::Context * getContext() = 0;
-  virtual void notifyContextFailed() = 0;
-  virtual void putObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual ::gnu::java::beans::decoder::ElementHandler * getParent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_beans_decoder_ElementHandler__
diff --git a/libjava/gnu/java/beans/decoder/FloatHandler.h b/libjava/gnu/java/beans/decoder/FloatHandler.h
deleted file mode 100644
index 9045ec5..0000000
--- a/libjava/gnu/java/beans/decoder/FloatHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_FloatHandler__
-#define __gnu_java_beans_decoder_FloatHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class FloatHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::FloatHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  FloatHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_FloatHandler__
diff --git a/libjava/gnu/java/beans/decoder/GrowableArrayContext.h b/libjava/gnu/java/beans/decoder/GrowableArrayContext.h
deleted file mode 100644
index e6b4a79..0000000
--- a/libjava/gnu/java/beans/decoder/GrowableArrayContext.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_GrowableArrayContext__
-#define __gnu_java_beans_decoder_GrowableArrayContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class GrowableArrayContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::GrowableArrayContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public: // actually package-private
-  GrowableArrayContext(::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-private:
-  static const jint INITIAL_SIZE = 16;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractContext)))) klass;
-  ::java::lang::Object * array;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_GrowableArrayContext__
diff --git a/libjava/gnu/java/beans/decoder/IndexContext.h b/libjava/gnu/java/beans/decoder/IndexContext.h
deleted file mode 100644
index b4c3855..0000000
--- a/libjava/gnu/java/beans/decoder/IndexContext.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_IndexContext__
-#define __gnu_java_beans_decoder_IndexContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class IndexContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::IndexContext : public ::gnu::java::beans::decoder::AbstractContext
-{
-
-public: // actually package-private
-  IndexContext(::java::lang::String *, jint);
-public:
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractContext)))) result;
-  ::java::lang::Object * argument;
-  jint index;
-  jboolean isSetter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_IndexContext__
diff --git a/libjava/gnu/java/beans/decoder/IntHandler.h b/libjava/gnu/java/beans/decoder/IntHandler.h
deleted file mode 100644
index 1810206..0000000
--- a/libjava/gnu/java/beans/decoder/IntHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_IntHandler__
-#define __gnu_java_beans_decoder_IntHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class IntHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::IntHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  IntHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_IntHandler__
diff --git a/libjava/gnu/java/beans/decoder/JavaHandler.h b/libjava/gnu/java/beans/decoder/JavaHandler.h
deleted file mode 100644
index d79c9f5..0000000
--- a/libjava/gnu/java/beans/decoder/JavaHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_JavaHandler__
-#define __gnu_java_beans_decoder_JavaHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractElementHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class DummyHandler;
-            class JavaHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::JavaHandler : public ::gnu::java::beans::decoder::AbstractElementHandler
-{
-
-public: // actually package-private
-  JavaHandler(::gnu::java::beans::decoder::DummyHandler *, ::gnu::java::beans::decoder::Context *, ::java::lang::ClassLoader *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-public:
-  virtual ::java::lang::Object * getObject(::java::lang::String *);
-  virtual void putObject(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Class * instantiateClass(::java::lang::String *);
-private:
-  ::gnu::java::beans::decoder::Context * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractElementHandler)))) context;
-  ::java::util::HashMap * objectMap;
-  ::java::lang::ClassLoader * classLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_JavaHandler__
diff --git a/libjava/gnu/java/beans/decoder/LongHandler.h b/libjava/gnu/java/beans/decoder/LongHandler.h
deleted file mode 100644
index ca84631..0000000
--- a/libjava/gnu/java/beans/decoder/LongHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_LongHandler__
-#define __gnu_java_beans_decoder_LongHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class LongHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::LongHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  LongHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_LongHandler__
diff --git a/libjava/gnu/java/beans/decoder/MethodContext.h b/libjava/gnu/java/beans/decoder/MethodContext.h
deleted file mode 100644
index 7039130..0000000
--- a/libjava/gnu/java/beans/decoder/MethodContext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_MethodContext__
-#define __gnu_java_beans_decoder_MethodContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractCreatableObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class MethodContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::MethodContext : public ::gnu::java::beans::decoder::AbstractCreatableObjectContext
-{
-
-public: // actually package-private
-  MethodContext(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void addParameterObjectImpl(::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::Object * createObject(::gnu::java::beans::decoder::Context *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractCreatableObjectContext)))) arguments;
-  ::java::lang::String * methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_MethodContext__
diff --git a/libjava/gnu/java/beans/decoder/MethodFinder.h b/libjava/gnu/java/beans/decoder/MethodFinder.h
deleted file mode 100644
index 02e8736..0000000
--- a/libjava/gnu/java/beans/decoder/MethodFinder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_MethodFinder__
-#define __gnu_java_beans_decoder_MethodFinder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class MethodFinder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::MethodFinder : public ::java::lang::Object
-{
-
-  MethodFinder();
-public: // actually package-private
-  static ::java::lang::reflect::Method * getMethod(::java::lang::Class *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::reflect::Constructor * getConstructor(::java::lang::Class *, JArray< ::java::lang::Object * > *);
-private:
-  static JArray< ::java::lang::Class * > * getArgumentTypes(JArray< ::java::lang::Object * > *);
-  static jboolean matchingArgumentTypes(JArray< ::java::lang::Class * > *, JArray< ::java::lang::Class * > *);
-  static ::java::util::HashMap * typeMapping;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_MethodFinder__
diff --git a/libjava/gnu/java/beans/decoder/NullHandler.h b/libjava/gnu/java/beans/decoder/NullHandler.h
deleted file mode 100644
index 9e76755e..0000000
--- a/libjava/gnu/java/beans/decoder/NullHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_NullHandler__
-#define __gnu_java_beans_decoder_NullHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class NullHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::NullHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  NullHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_NullHandler__
diff --git a/libjava/gnu/java/beans/decoder/ObjectContext.h b/libjava/gnu/java/beans/decoder/ObjectContext.h
deleted file mode 100644
index 7e65403..0000000
--- a/libjava/gnu/java/beans/decoder/ObjectContext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ObjectContext__
-#define __gnu_java_beans_decoder_ObjectContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ObjectContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ObjectContext : public ::gnu::java::beans::decoder::AbstractObjectContext
-{
-
-public: // actually package-private
-  ObjectContext(::java::lang::Object *);
-  ObjectContext(::java::lang::String *, ::java::lang::Object *);
-  ObjectContext();
-public:
-  void addParameterObject(::java::lang::Object *);
-  void notifyStatement(::gnu::java::beans::decoder::Context *);
-  ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  jboolean subContextFailed();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ObjectContext__
diff --git a/libjava/gnu/java/beans/decoder/ObjectHandler.h b/libjava/gnu/java/beans/decoder/ObjectHandler.h
deleted file mode 100644
index 68898f2..0000000
--- a/libjava/gnu/java/beans/decoder/ObjectHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ObjectHandler__
-#define __gnu_java_beans_decoder_ObjectHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractElementHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ElementHandler;
-            class ObjectHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ObjectHandler : public ::gnu::java::beans::decoder::AbstractElementHandler
-{
-
-public: // actually package-private
-  ObjectHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ObjectHandler__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.h
deleted file mode 100644
index 50cecb4..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$ArrayHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$ArrayHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$ArrayHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$ArrayHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$ArrayHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$ArrayHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.h
deleted file mode 100644
index d877d9c..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$BooleanHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$BooleanHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$BooleanHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$BooleanHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$BooleanHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$BooleanHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.h
deleted file mode 100644
index d3ef830..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$ByteHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$ByteHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$ByteHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$ByteHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$ByteHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$ByteHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.h
deleted file mode 100644
index 8643888..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$CharHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$CharHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$CharHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$CharHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$CharHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$CharHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.h
deleted file mode 100644
index 38cde4c..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$ClassHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$ClassHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$ClassHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$ClassHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$ClassHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$ClassHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$Creator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$Creator.h
deleted file mode 100644
index 69af77b..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$Creator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$Creator__
-#define __gnu_java_beans_decoder_PersistenceParser$Creator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser$Creator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$Creator : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$Creator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.h
deleted file mode 100644
index c78f28f..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$DoubleHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$DoubleHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$DoubleHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$DoubleHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$DoubleHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$DoubleHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.h
deleted file mode 100644
index e11e994..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$FloatHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$FloatHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$FloatHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$FloatHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$FloatHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$FloatHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.h
deleted file mode 100644
index a3893ae..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$IntHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$IntHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$IntHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$IntHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$IntHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$IntHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.h
deleted file mode 100644
index 69e0350..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$JavaHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$JavaHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$JavaHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$JavaHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$JavaHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$JavaHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.h
deleted file mode 100644
index 7081871..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$LongHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$LongHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$LongHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$LongHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$LongHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$LongHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.h
deleted file mode 100644
index 1db11b4..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$NullHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$NullHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$NullHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$NullHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$NullHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$NullHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.h
deleted file mode 100644
index 4adfc87..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$ObjectHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$ObjectHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$ObjectHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$ObjectHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$ObjectHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$ObjectHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.h
deleted file mode 100644
index f217dc4..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$ShortHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$ShortHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$ShortHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$ShortHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$ShortHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$ShortHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.h
deleted file mode 100644
index 5c9ec80..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$StringHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$StringHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$StringHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$StringHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$StringHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$StringHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.h b/libjava/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.h
deleted file mode 100644
index 9b696b4..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser$VoidHandlerCreator__
-#define __gnu_java_beans_decoder_PersistenceParser$VoidHandlerCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class AbstractElementHandler;
-            class ElementHandler;
-            class PersistenceParser;
-            class PersistenceParser$VoidHandlerCreator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser$VoidHandlerCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PersistenceParser$VoidHandlerCreator(::gnu::java::beans::decoder::PersistenceParser *);
-public:
-  virtual ::gnu::java::beans::decoder::AbstractElementHandler * createHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually package-private
-  ::gnu::java::beans::decoder::PersistenceParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser$VoidHandlerCreator__
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser.h b/libjava/gnu/java/beans/decoder/PersistenceParser.h
deleted file mode 100644
index eb4017a..0000000
--- a/libjava/gnu/java/beans/decoder/PersistenceParser.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PersistenceParser__
-#define __gnu_java_beans_decoder_PersistenceParser__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/DefaultHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ElementHandler;
-            class JavaHandler;
-            class PersistenceParser;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-        class XMLDecoder;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PersistenceParser : public ::org::xml::sax::helpers::DefaultHandler
-{
-
-public:
-  PersistenceParser(::java::io::InputStream *, ::java::beans::ExceptionListener *, ::java::lang::ClassLoader *, ::java::beans::XMLDecoder *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-  virtual void set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * getResult();
-  virtual void setId(::java::lang::String *);
-  virtual ::java::lang::String * getId();
-  virtual jboolean isStatement();
-  virtual void setStatement(jboolean);
-  virtual ::java::util::Iterator * iterator();
-private:
-  ::java::beans::ExceptionListener * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::DefaultHandler)))) exceptionListener;
-  jint skipElement;
-  ::java::util::HashMap * handlerCreators;
-  ::gnu::java::beans::decoder::ElementHandler * currentHandler;
-public: // actually package-private
-  ::gnu::java::beans::decoder::JavaHandler * javaHandler;
-private:
-  ::java::util::List * objects;
-  ::java::beans::XMLDecoder * decoder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PersistenceParser__
diff --git a/libjava/gnu/java/beans/decoder/PropertyContext.h b/libjava/gnu/java/beans/decoder/PropertyContext.h
deleted file mode 100644
index cb335b3..0000000
--- a/libjava/gnu/java/beans/decoder/PropertyContext.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_PropertyContext__
-#define __gnu_java_beans_decoder_PropertyContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class PropertyContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::PropertyContext : public ::gnu::java::beans::decoder::AbstractObjectContext
-{
-
-public: // actually package-private
-  PropertyContext(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void addParameterObject(::java::lang::Object *);
-  virtual void notifyStatement(::gnu::java::beans::decoder::Context *);
-  virtual ::java::lang::Object * endContext(::gnu::java::beans::decoder::Context *);
-  virtual jboolean subContextFailed();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractObjectContext)))) argument;
-  ::java::lang::String * propertyName;
-  ::java::lang::String * prefix;
-  jboolean methodCalled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_PropertyContext__
diff --git a/libjava/gnu/java/beans/decoder/ShortHandler.h b/libjava/gnu/java/beans/decoder/ShortHandler.h
deleted file mode 100644
index 0d5039a..0000000
--- a/libjava/gnu/java/beans/decoder/ShortHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_ShortHandler__
-#define __gnu_java_beans_decoder_ShortHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class ShortHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::ShortHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  ShortHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_ShortHandler__
diff --git a/libjava/gnu/java/beans/decoder/SimpleHandler.h b/libjava/gnu/java/beans/decoder/SimpleHandler.h
deleted file mode 100644
index 189b6c8..0000000
--- a/libjava/gnu/java/beans/decoder/SimpleHandler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_SimpleHandler__
-#define __gnu_java_beans_decoder_SimpleHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractElementHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ElementHandler;
-            class ObjectContext;
-            class SimpleHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::SimpleHandler : public ::gnu::java::beans::decoder::AbstractElementHandler
-{
-
-public: // actually package-private
-  SimpleHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-public:
-  virtual void endElement(::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *) = 0;
-private:
-  ::gnu::java::beans::decoder::ObjectContext * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractElementHandler)))) context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_SimpleHandler__
diff --git a/libjava/gnu/java/beans/decoder/StaticMethodContext.h b/libjava/gnu/java/beans/decoder/StaticMethodContext.h
deleted file mode 100644
index 098d8e8..0000000
--- a/libjava/gnu/java/beans/decoder/StaticMethodContext.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_StaticMethodContext__
-#define __gnu_java_beans_decoder_StaticMethodContext__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractCreatableObjectContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class StaticMethodContext;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::StaticMethodContext : public ::gnu::java::beans::decoder::AbstractCreatableObjectContext
-{
-
-public: // actually package-private
-  StaticMethodContext(::java::lang::String *, ::java::lang::Class *, ::java::lang::String *);
-public:
-  virtual void addParameterObjectImpl(::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::Object * createObject(::gnu::java::beans::decoder::Context *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::gnu::java::beans::decoder::AbstractCreatableObjectContext)))) arguments;
-  ::java::lang::Class * klass;
-  ::java::lang::String * methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_StaticMethodContext__
diff --git a/libjava/gnu/java/beans/decoder/StringHandler.h b/libjava/gnu/java/beans/decoder/StringHandler.h
deleted file mode 100644
index 9c59db0..0000000
--- a/libjava/gnu/java/beans/decoder/StringHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_StringHandler__
-#define __gnu_java_beans_decoder_StringHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/SimpleHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class ElementHandler;
-            class StringHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::StringHandler : public ::gnu::java::beans::decoder::SimpleHandler
-{
-
-public: // actually package-private
-  StringHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::java::lang::Object * parse(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_StringHandler__
diff --git a/libjava/gnu/java/beans/decoder/VoidHandler.h b/libjava/gnu/java/beans/decoder/VoidHandler.h
deleted file mode 100644
index 264d0c0..0000000
--- a/libjava/gnu/java/beans/decoder/VoidHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_decoder_VoidHandler__
-#define __gnu_java_beans_decoder_VoidHandler__
-
-#pragma interface
-
-#include <gnu/java/beans/decoder/AbstractElementHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace decoder
-        {
-            class Context;
-            class ElementHandler;
-            class VoidHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::decoder::VoidHandler : public ::gnu::java::beans::decoder::AbstractElementHandler
-{
-
-public: // actually package-private
-  VoidHandler(::gnu::java::beans::decoder::ElementHandler *);
-public: // actually protected
-  virtual ::gnu::java::beans::decoder::Context * startElement(::org::xml::sax::Attributes *, ::java::beans::ExceptionListener *);
-private:
-  ::gnu::java::beans::decoder::Context * startElementImpl(::org::xml::sax::Attributes *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_decoder_VoidHandler__
diff --git a/libjava/gnu/java/beans/editors/ColorEditor.h b/libjava/gnu/java/beans/editors/ColorEditor.h
deleted file mode 100644
index 7332263..0000000
--- a/libjava/gnu/java/beans/editors/ColorEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_ColorEditor__
-#define __gnu_java_beans_editors_ColorEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class ColorEditor;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-}
-
-class gnu::java::beans::editors::ColorEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  ColorEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  virtual JArray< ::java::lang::String * > * getTags();
-public: // actually package-private
-  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::java::beans::PropertyEditorSupport)))) stdColors;
-  JArray< ::java::lang::String * > * stdColorNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_ColorEditor__
diff --git a/libjava/gnu/java/beans/editors/FontEditor.h b/libjava/gnu/java/beans/editors/FontEditor.h
deleted file mode 100644
index da93ed5..0000000
--- a/libjava/gnu/java/beans/editors/FontEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_FontEditor__
-#define __gnu_java_beans_editors_FontEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class FontEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::FontEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  FontEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_FontEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeBooleanEditor.h b/libjava/gnu/java/beans/editors/NativeBooleanEditor.h
deleted file mode 100644
index 7921525..0000000
--- a/libjava/gnu/java/beans/editors/NativeBooleanEditor.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeBooleanEditor__
-#define __gnu_java_beans_editors_NativeBooleanEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeBooleanEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeBooleanEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeBooleanEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::beans::PropertyEditorSupport)))) tags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeBooleanEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeByteEditor.h b/libjava/gnu/java/beans/editors/NativeByteEditor.h
deleted file mode 100644
index 38dd6fe..0000000
--- a/libjava/gnu/java/beans/editors/NativeByteEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeByteEditor__
-#define __gnu_java_beans_editors_NativeByteEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeByteEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeByteEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeByteEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeByteEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeDoubleEditor.h b/libjava/gnu/java/beans/editors/NativeDoubleEditor.h
deleted file mode 100644
index d37c220..0000000
--- a/libjava/gnu/java/beans/editors/NativeDoubleEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeDoubleEditor__
-#define __gnu_java_beans_editors_NativeDoubleEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeDoubleEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeDoubleEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeDoubleEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeDoubleEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeFloatEditor.h b/libjava/gnu/java/beans/editors/NativeFloatEditor.h
deleted file mode 100644
index 6d30d76..0000000
--- a/libjava/gnu/java/beans/editors/NativeFloatEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeFloatEditor__
-#define __gnu_java_beans_editors_NativeFloatEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeFloatEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeFloatEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeFloatEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeFloatEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeIntEditor.h b/libjava/gnu/java/beans/editors/NativeIntEditor.h
deleted file mode 100644
index eddb16c..0000000
--- a/libjava/gnu/java/beans/editors/NativeIntEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeIntEditor__
-#define __gnu_java_beans_editors_NativeIntEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeIntEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeIntEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeIntEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeIntEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeLongEditor.h b/libjava/gnu/java/beans/editors/NativeLongEditor.h
deleted file mode 100644
index daf81c5..0000000
--- a/libjava/gnu/java/beans/editors/NativeLongEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeLongEditor__
-#define __gnu_java_beans_editors_NativeLongEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeLongEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeLongEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeLongEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeLongEditor__
diff --git a/libjava/gnu/java/beans/editors/NativeShortEditor.h b/libjava/gnu/java/beans/editors/NativeShortEditor.h
deleted file mode 100644
index 3329ed7..0000000
--- a/libjava/gnu/java/beans/editors/NativeShortEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_NativeShortEditor__
-#define __gnu_java_beans_editors_NativeShortEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class NativeShortEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::NativeShortEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  NativeShortEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_NativeShortEditor__
diff --git a/libjava/gnu/java/beans/editors/StringEditor.h b/libjava/gnu/java/beans/editors/StringEditor.h
deleted file mode 100644
index 4806582..0000000
--- a/libjava/gnu/java/beans/editors/StringEditor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_editors_StringEditor__
-#define __gnu_java_beans_editors_StringEditor__
-
-#pragma interface
-
-#include <java/beans/PropertyEditorSupport.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace editors
-        {
-            class StringEditor;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::editors::StringEditor : public ::java::beans::PropertyEditorSupport
-{
-
-public:
-  StringEditor();
-  virtual void setAsText(::java::lang::String *);
-  virtual ::java::lang::String * getAsText();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_editors_StringEditor__
diff --git a/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h
deleted file mode 100644
index 489b404..0000000
--- a/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ArrayPersistenceDelegate__
-#define __gnu_java_beans_encoder_ArrayPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ArrayPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ArrayPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  ArrayPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-private:
-  static ::java::util::HashMap * NULL_VALUES;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ArrayPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h
deleted file mode 100644
index 4ca1df8..0000000
--- a/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ClassPersistenceDelegate__
-#define __gnu_java_beans_encoder_ClassPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ClassPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ClassPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  ClassPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ClassPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h
deleted file mode 100644
index 99bd9df..0000000
--- a/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_CollectionPersistenceDelegate__
-#define __gnu_java_beans_encoder_CollectionPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class CollectionPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::CollectionPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  CollectionPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_CollectionPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/Context.h b/libjava/gnu/java/beans/encoder/Context.h
deleted file mode 100644
index 420376f..0000000
--- a/libjava/gnu/java/beans/encoder/Context.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Context__
-#define __gnu_java_beans_encoder_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Context : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Context(::java::lang::String *, jint);
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) state;
-  jint call;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Context__
diff --git a/libjava/gnu/java/beans/encoder/GenericScannerState.h b/libjava/gnu/java/beans/encoder/GenericScannerState.h
deleted file mode 100644
index 75e54ad..0000000
--- a/libjava/gnu/java/beans/encoder/GenericScannerState.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_GenericScannerState__
-#define __gnu_java_beans_encoder_GenericScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-            class GenericScannerState;
-            class ObjectId;
-            class Root;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::GenericScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  GenericScannerState(::gnu::java::beans::encoder::Root *);
-  GenericScannerState(::gnu::java::beans::encoder::Root *, jint);
-public: // actually protected
-  virtual void enterImpl(::gnu::java::beans::encoder::Context *);
-public: // actually package-private
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-  virtual void enter();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::ScannerState)))) skipElements;
-  jint initialSkipElements;
-public: // actually package-private
-  ::gnu::java::beans::encoder::Root * root;
-  ::java::util::HashMap * skipValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_GenericScannerState__
diff --git a/libjava/gnu/java/beans/encoder/IgnoringScannerState.h b/libjava/gnu/java/beans/encoder/IgnoringScannerState.h
deleted file mode 100644
index ef44b5c..0000000
--- a/libjava/gnu/java/beans/encoder/IgnoringScannerState.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_IgnoringScannerState__
-#define __gnu_java_beans_encoder_IgnoringScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class IgnoringScannerState;
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::IgnoringScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  IgnoringScannerState();
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_IgnoringScannerState__
diff --git a/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h
deleted file mode 100644
index 0c99d67..0000000
--- a/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_MapPersistenceDelegate__
-#define __gnu_java_beans_encoder_MapPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class MapPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::MapPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  MapPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_MapPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ObjectId.h b/libjava/gnu/java/beans/encoder/ObjectId.h
deleted file mode 100644
index 7447c77..0000000
--- a/libjava/gnu/java/beans/encoder/ObjectId.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ObjectId__
-#define __gnu_java_beans_encoder_ObjectId__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ObjectId : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectId(::java::lang::Class *);
-public:
-  virtual jboolean isUnused();
-  virtual ::java::lang::String * toString();
-  virtual void init();
-private:
-  static ::java::util::HashMap * nameIndices;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::Class * klass;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ObjectId__
diff --git a/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h b/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h
deleted file mode 100644
index 7102811..0000000
--- a/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
-#define __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class PrimitivePersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::PrimitivePersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  PrimitivePersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ReportingScannerState.h b/libjava/gnu/java/beans/encoder/ReportingScannerState.h
deleted file mode 100644
index b613ced..0000000
--- a/libjava/gnu/java/beans/encoder/ReportingScannerState.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ReportingScannerState__
-#define __gnu_java_beans_encoder_ReportingScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class ReportingScannerState;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ReportingScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  ReportingScannerState();
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ReportingScannerState__
diff --git a/libjava/gnu/java/beans/encoder/Root$RootElement.h b/libjava/gnu/java/beans/encoder/Root$RootElement.h
deleted file mode 100644
index b25191f..0000000
--- a/libjava/gnu/java/beans/encoder/Root$RootElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Root$RootElement__
-#define __gnu_java_beans_encoder_Root$RootElement__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Root$RootElement;
-            class Writer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Root$RootElement : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public: // actually package-private
-  Root$RootElement();
-public:
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Root$RootElement__
diff --git a/libjava/gnu/java/beans/encoder/Root.h b/libjava/gnu/java/beans/encoder/Root.h
deleted file mode 100644
index 08f587b..0000000
--- a/libjava/gnu/java/beans/encoder/Root.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Root__
-#define __gnu_java_beans_encoder_Root__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Root;
-            class Writer;
-          namespace elements
-          {
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Root : public ::java::lang::Object
-{
-
-public:
-  Root();
-  virtual void addChild(::gnu::java::beans::encoder::elements::Element *);
-  virtual void end();
-  virtual void deleteLast();
-  virtual void traverse(::gnu::java::beans::encoder::Writer *);
-  virtual void close(::gnu::java::beans::encoder::Writer *);
-private:
-  void traverse(::gnu::java::beans::encoder::Writer *, ::java::util::Iterator *);
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parents;
-  ::gnu::java::beans::encoder::elements::Element * rootElement;
-  ::gnu::java::beans::encoder::elements::Element * current;
-  jboolean started;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Root__
diff --git a/libjava/gnu/java/beans/encoder/ScanEngine.h b/libjava/gnu/java/beans/encoder/ScanEngine.h
deleted file mode 100644
index 7d5b52d..0000000
--- a/libjava/gnu/java/beans/encoder/ScanEngine.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ScanEngine__
-#define __gnu_java_beans_encoder_ScanEngine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Root;
-            class ScanEngine;
-            class ScannerState;
-            class Writer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Expression;
-        class Statement;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ScanEngine : public ::java::lang::Object
-{
-
-public:
-  ScanEngine(::java::io::OutputStream *);
-private:
-  ::gnu::java::beans::encoder::ScannerState * register$(::java::lang::String *, ::gnu::java::beans::encoder::ScannerState *);
-  ::gnu::java::beans::encoder::ObjectId * retrieveId(::java::lang::Object *);
-public:
-  virtual void writeExpression(::java::beans::Expression *);
-  virtual void end();
-  virtual void revoke();
-  virtual void writeStatement(::java::beans::Statement *);
-  virtual jboolean writeObject(::java::lang::Object *);
-  virtual void flush();
-  virtual void close();
-private:
-  void transition(jint);
-public: // actually package-private
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listSet();
-  virtual void listGet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) DEBUG;
-  ::java::util::HashMap * states;
-  ::java::util::Stack * parents;
-  ::gnu::java::beans::encoder::ScannerState * current;
-  ::gnu::java::beans::encoder::Root * root;
-  ::gnu::java::beans::encoder::Writer * writer;
-  ::java::util::IdentityHashMap * objects;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ScanEngine__
diff --git a/libjava/gnu/java/beans/encoder/ScannerState.h b/libjava/gnu/java/beans/encoder/ScannerState.h
deleted file mode 100644
index 77caf12..0000000
--- a/libjava/gnu/java/beans/encoder/ScannerState.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ScannerState__
-#define __gnu_java_beans_encoder_ScannerState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-            class ObjectId;
-            class ScannerState;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ScannerState : public ::java::lang::Object
-{
-
-public:
-  ScannerState();
-public: // actually package-private
-  virtual void init(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void enter(::gnu::java::beans::encoder::Context *);
-public: // actually protected
-  virtual void enterImpl(::gnu::java::beans::encoder::Context *);
-public: // actually package-private
-  virtual ::gnu::java::beans::encoder::Context * context();
-  virtual jint getCalls();
-  virtual void putSuccessor(jint, ::java::lang::String *);
-  virtual ::java::lang::String * getSuccessor(jint);
-  virtual void setDefaultSuccessor(::java::lang::String *);
-  virtual void methodInvocation(::java::lang::String *) = 0;
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void classResolution(::java::lang::String *) = 0;
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void arraySet(::java::lang::String *) = 0;
-  virtual void arrayGet(::java::lang::String *) = 0;
-  virtual void listGet() = 0;
-  virtual void listSet() = 0;
-  virtual void nullObject() = 0;
-  virtual void stringReference(::java::lang::String *) = 0;
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void end() = 0;
-  virtual void enter();
-  static const jint TRANSITION_METHOD_INVOCATION = 0;
-  static const jint TRANSITION_STATIC_METHOD_INVOCATION = 1;
-  static const jint TRANSITION_STATIC_FIELD_ACCESS = 2;
-  static const jint TRANSITION_CLASS_RESOLUTION = 3;
-  static const jint TRANSITION_OBJECT_INSTANTIATION = 4;
-  static const jint TRANSITION_PRIMITIVE_INSTANTIATION = 5;
-  static const jint TRANSITION_OBJECT_ARRAY_INSTANTIATION = 6;
-  static const jint TRANSITION_PRIMITIVE_ARRAY_INSTANTIATION = 7;
-  static const jint TRANSITION_ARRAY_SET = 8;
-  static const jint TRANSITION_ARRAY_GET = 9;
-  static const jint TRANSITION_LIST_SET = 10;
-  static const jint TRANSITION_LIST_GET = 11;
-  static const jint TRANSITION_NULL_OBJECT = 12;
-  static const jint TRANSITION_STRING_REFERENCE = 13;
-  static const jint TRANSITION_OBJECT_REFERENCE = 14;
-  static const jint TRANSITION_FIRST = 0;
-  static const jint TRANSITION_LAST = 14;
-  static ::java::lang::String * DEFAULT_STATE_NAME;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultSuccessor;
-  static JArray< ::java::lang::String * > * transitionNames;
-  ::java::util::HashMap * transitions;
-  jint calls;
-  ::gnu::java::beans::encoder::Context * context__;
-  ::java::lang::String * name;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ScannerState__
diff --git a/libjava/gnu/java/beans/encoder/StAXWriter.h b/libjava/gnu/java/beans/encoder/StAXWriter.h
deleted file mode 100644
index 06298b0..0000000
--- a/libjava/gnu/java/beans/encoder/StAXWriter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_StAXWriter__
-#define __gnu_java_beans_encoder_StAXWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class StAXWriter;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamWriter;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::StAXWriter : public ::java::lang::Object
-{
-
-public:
-  StAXWriter(::java::io::OutputStream *);
-  virtual void flush();
-  virtual void close();
-  virtual void writePreamble();
-  virtual void writeEnd(jboolean);
-  virtual void writeEndNoChildren();
-  virtual void write(::java::lang::String *, jboolean);
-  virtual void write(::java::lang::String *, ::java::lang::String *);
-  virtual void writeNoChildren(::java::lang::String *, ::java::lang::String *);
-  virtual void write(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual void write(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-  virtual void write(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-public: // actually package-private
-  ::javax::xml::stream::XMLStreamWriter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-  jint indent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_StAXWriter__
diff --git a/libjava/gnu/java/beans/encoder/Writer.h b/libjava/gnu/java/beans/encoder/Writer.h
deleted file mode 100644
index 21ac47d..0000000
--- a/libjava/gnu/java/beans/encoder/Writer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Writer__
-#define __gnu_java_beans_encoder_Writer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Writer : public ::java::lang::Object
-{
-
-public:
-  virtual void writePreamble() = 0;
-  virtual void writeEnd(jboolean) = 0;
-  virtual void write(::java::lang::String *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean) = 0;
-  virtual void write(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeNoChildren(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEndNoChildren() = 0;
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_beans_encoder_Writer__
diff --git a/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h b/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h
deleted file mode 100644
index aaf8ab1..0000000
--- a/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ArrayInstantiation__
-#define __gnu_java_beans_encoder_elements_ArrayInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ArrayInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ArrayInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ArrayInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * lengthAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ArrayInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/Array_Get.h b/libjava/gnu/java/beans/encoder/elements/Array_Get.h
deleted file mode 100644
index 73a0dd7..0000000
--- a/libjava/gnu/java/beans/encoder/elements/Array_Get.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Array_Get__
-#define __gnu_java_beans_encoder_elements_Array_Get__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class Array_Get;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Array_Get : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  Array_Get(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) indexAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Array_Get__
diff --git a/libjava/gnu/java/beans/encoder/elements/Array_Set.h b/libjava/gnu/java/beans/encoder/elements/Array_Set.h
deleted file mode 100644
index 353d5a0..0000000
--- a/libjava/gnu/java/beans/encoder/elements/Array_Set.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Array_Set__
-#define __gnu_java_beans_encoder_elements_Array_Set__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class Array_Set;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Array_Set : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  Array_Set(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) indexAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Array_Set__
diff --git a/libjava/gnu/java/beans/encoder/elements/ClassResolution.h b/libjava/gnu/java/beans/encoder/elements/ClassResolution.h
deleted file mode 100644
index 569602c..0000000
--- a/libjava/gnu/java/beans/encoder/elements/ClassResolution.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ClassResolution__
-#define __gnu_java_beans_encoder_elements_ClassResolution__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ClassResolution;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ClassResolution : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ClassResolution(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ClassResolution__
diff --git a/libjava/gnu/java/beans/encoder/elements/Element.h b/libjava/gnu/java/beans/encoder/elements/Element.h
deleted file mode 100644
index 5c53e7d..0000000
--- a/libjava/gnu/java/beans/encoder/elements/Element.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Element__
-#define __gnu_java_beans_encoder_elements_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Writer;
-          namespace elements
-          {
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Element : public ::java::lang::Object
-{
-
-public:
-  Element();
-  virtual void initId(::gnu::java::beans::encoder::ObjectId *);
-  virtual void addChild(::gnu::java::beans::encoder::elements::Element *);
-  virtual void removeLast();
-  virtual ::java::util::Iterator * iterator();
-  virtual void clear();
-  virtual jboolean isEmpty();
-  virtual ::gnu::java::beans::encoder::ObjectId * getId();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *) = 0;
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::gnu::java::beans::encoder::ObjectId * objectId;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Element__
diff --git a/libjava/gnu/java/beans/encoder/elements/List_Get.h b/libjava/gnu/java/beans/encoder/elements/List_Get.h
deleted file mode 100644
index cdd65d1..0000000
--- a/libjava/gnu/java/beans/encoder/elements/List_Get.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_List_Get__
-#define __gnu_java_beans_encoder_elements_List_Get__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class List_Get;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::List_Get : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  List_Get();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_List_Get__
diff --git a/libjava/gnu/java/beans/encoder/elements/List_Set.h b/libjava/gnu/java/beans/encoder/elements/List_Set.h
deleted file mode 100644
index 444fbac..0000000
--- a/libjava/gnu/java/beans/encoder/elements/List_Set.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_List_Set__
-#define __gnu_java_beans_encoder_elements_List_Set__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class List_Set;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::List_Set : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  List_Set();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_List_Set__
diff --git a/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h b/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h
deleted file mode 100644
index 884d2c8..0000000
--- a/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_MethodInvocation__
-#define __gnu_java_beans_encoder_elements_MethodInvocation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class MethodInvocation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::MethodInvocation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  MethodInvocation(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_MethodInvocation__
diff --git a/libjava/gnu/java/beans/encoder/elements/NullObject.h b/libjava/gnu/java/beans/encoder/elements/NullObject.h
deleted file mode 100644
index 9c1dca7..0000000
--- a/libjava/gnu/java/beans/encoder/elements/NullObject.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_NullObject__
-#define __gnu_java_beans_encoder_elements_NullObject__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class NullObject;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::NullObject : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  NullObject();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_NullObject__
diff --git a/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h b/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h
deleted file mode 100644
index 7888185..0000000
--- a/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ObjectInstantiation__
-#define __gnu_java_beans_encoder_elements_ObjectInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ObjectInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ObjectInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ObjectInstantiation(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ObjectInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/ObjectReference.h b/libjava/gnu/java/beans/encoder/elements/ObjectReference.h
deleted file mode 100644
index 9ee28a6..0000000
--- a/libjava/gnu/java/beans/encoder/elements/ObjectReference.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ObjectReference__
-#define __gnu_java_beans_encoder_elements_ObjectReference__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Writer;
-          namespace elements
-          {
-              class ObjectReference;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ObjectReference : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ObjectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::gnu::java::beans::encoder::ObjectId * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ObjectReference__
diff --git a/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h b/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h
deleted file mode 100644
index 1a04f34..0000000
--- a/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
-#define __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class PrimitiveInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::PrimitiveInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  PrimitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) primitiveName;
-  ::java::lang::String * valueAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h b/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h
deleted file mode 100644
index 0761cd8..0000000
--- a/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StaticFieldAccess__
-#define __gnu_java_beans_encoder_elements_StaticFieldAccess__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StaticFieldAccess;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StaticFieldAccess : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StaticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * fieldName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StaticFieldAccess__
diff --git a/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h b/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h
deleted file mode 100644
index 982c726..0000000
--- a/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StaticMethodInvocation__
-#define __gnu_java_beans_encoder_elements_StaticMethodInvocation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StaticMethodInvocation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StaticMethodInvocation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StaticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StaticMethodInvocation__
diff --git a/libjava/gnu/java/beans/encoder/elements/StringReference.h b/libjava/gnu/java/beans/encoder/elements/StringReference.h
deleted file mode 100644
index 01b1074..0000000
--- a/libjava/gnu/java/beans/encoder/elements/StringReference.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StringReference__
-#define __gnu_java_beans_encoder_elements_StringReference__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StringReference;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StringReference : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StringReference(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StringReference__
diff --git a/libjava/gnu/java/io/ASN1ParsingException.h b/libjava/gnu/java/io/ASN1ParsingException.h
deleted file mode 100644
index e29e63ca..0000000
--- a/libjava/gnu/java/io/ASN1ParsingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_ASN1ParsingException__
-#define __gnu_java_io_ASN1ParsingException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class ASN1ParsingException;
-      }
-    }
-  }
-}
-
-class gnu::java::io::ASN1ParsingException : public ::java::io::IOException
-{
-
-public:
-  ASN1ParsingException();
-  ASN1ParsingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_ASN1ParsingException__
diff --git a/libjava/gnu/java/io/Base64InputStream.h b/libjava/gnu/java/io/Base64InputStream.h
deleted file mode 100644
index 22568f8..0000000
--- a/libjava/gnu/java/io/Base64InputStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_Base64InputStream__
-#define __gnu_java_io_Base64InputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class Base64InputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::io::Base64InputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  Base64InputStream(::java::io::InputStream *);
-  static JArray< jbyte > * decode(::java::lang::String *);
-  virtual jint available();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-private:
-  static ::java::lang::String * BASE_64;
-  static const jchar BASE_64_PAD = 61;
-  jint __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) state;
-  jint temp;
-  jboolean eof;
-  JArray< jbyte > * one;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_Base64InputStream__
diff --git a/libjava/gnu/java/io/ClassLoaderObjectInputStream.h b/libjava/gnu/java/io/ClassLoaderObjectInputStream.h
deleted file mode 100644
index e2cac0b..0000000
--- a/libjava/gnu/java/io/ClassLoaderObjectInputStream.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_ClassLoaderObjectInputStream__
-#define __gnu_java_io_ClassLoaderObjectInputStream__
-
-#pragma interface
-
-#include <java/io/ObjectInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class ClassLoaderObjectInputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::io::ClassLoaderObjectInputStream : public ::java::io::ObjectInputStream
-{
-
-public:
-  ClassLoaderObjectInputStream(::java::io::InputStream *, ::java::lang::ClassLoader *);
-  virtual ::java::lang::Class * resolveClass(::java::lang::String *);
-public: // actually package-private
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::io::ObjectInputStream)))) myClassLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_ClassLoaderObjectInputStream__
diff --git a/libjava/gnu/java/io/NullOutputStream.h b/libjava/gnu/java/io/NullOutputStream.h
deleted file mode 100644
index d2e15e2..0000000
--- a/libjava/gnu/java/io/NullOutputStream.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_NullOutputStream__
-#define __gnu_java_io_NullOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class NullOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::io::NullOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  NullOutputStream();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_NullOutputStream__
diff --git a/libjava/gnu/java/io/ObjectIdentityMap2Int.h b/libjava/gnu/java/io/ObjectIdentityMap2Int.h
deleted file mode 100644
index 7ffb5ba..0000000
--- a/libjava/gnu/java/io/ObjectIdentityMap2Int.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_ObjectIdentityMap2Int__
-#define __gnu_java_io_ObjectIdentityMap2Int__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class ObjectIdentityMap2Int;
-      }
-    }
-  }
-}
-
-class gnu::java::io::ObjectIdentityMap2Int : public ::java::lang::Object
-{
-
-public:
-  ObjectIdentityMap2Int();
-private:
-  void alloc(jint);
-public:
-  virtual void put(::java::lang::Object *, jint);
-private:
-  jint slot(::java::lang::Object *);
-  void rehash();
-public:
-  virtual jint get(::java::lang::Object *);
-  virtual void clear();
-private:
-  static JArray< jint > * PRIMES;
-  static ::java::lang::Object * NIL;
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) objectTable;
-  JArray< jint > * intTable;
-  jint size;
-  jint cap;
-  jint limit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_ObjectIdentityMap2Int__
diff --git a/libjava/gnu/java/io/ObjectIdentityWrapper.h b/libjava/gnu/java/io/ObjectIdentityWrapper.h
deleted file mode 100644
index 2718b94..0000000
--- a/libjava/gnu/java/io/ObjectIdentityWrapper.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_ObjectIdentityWrapper__
-#define __gnu_java_io_ObjectIdentityWrapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class ObjectIdentityWrapper;
-      }
-    }
-  }
-}
-
-class gnu::java::io::ObjectIdentityWrapper : public ::java::lang::Object
-{
-
-public:
-  ObjectIdentityWrapper(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) object;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_ObjectIdentityWrapper__
diff --git a/libjava/gnu/java/io/PlatformHelper.h b/libjava/gnu/java/io/PlatformHelper.h
deleted file mode 100644
index 31a5fdff..0000000
--- a/libjava/gnu/java/io/PlatformHelper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_io_PlatformHelper__
-#define __gnu_java_io_PlatformHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class PlatformHelper;
-      }
-    }
-  }
-}
-
-class gnu::java::io::PlatformHelper : public ::java::lang::Object
-{
-
-public:
-  PlatformHelper();
-  static jint beginWithRootPathPrefix(::java::lang::String *);
-  static jboolean isRootDirectory(::java::lang::String *);
-  static jboolean endWithSeparator(::java::lang::String *);
-  static ::java::lang::String * removeTailSeparator(::java::lang::String *);
-  static jint lastIndexOfSeparator(::java::lang::String *);
-  static jboolean isWindows;
-  static ::java::lang::String * separator;
-  static jchar separatorChar;
-  static ::java::lang::String * pathSeparator;
-  static jchar pathSeparatorChar;
-  static const jint INITIAL_MAX_PATH = 130;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_io_PlatformHelper__
diff --git a/libjava/gnu/java/lang/ArrayHelper.h b/libjava/gnu/java/lang/ArrayHelper.h
deleted file mode 100644
index 93b7578..0000000
--- a/libjava/gnu/java/lang/ArrayHelper.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_ArrayHelper__
-#define __gnu_java_lang_ArrayHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class ArrayHelper;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::ArrayHelper : public ::java::lang::Object
-{
-
-public:
-  ArrayHelper();
-  static jboolean contains(JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static jint indexOf(JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_ArrayHelper__
diff --git a/libjava/gnu/java/lang/CPStringBuilder.h b/libjava/gnu/java/lang/CPStringBuilder.h
deleted file mode 100644
index 5b03bf3..0000000
--- a/libjava/gnu/java/lang/CPStringBuilder.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_CPStringBuilder__
-#define __gnu_java_lang_CPStringBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::CPStringBuilder : public ::java::lang::Object
-{
-
-public:
-  CPStringBuilder();
-  CPStringBuilder(jint);
-  CPStringBuilder(::java::lang::String *);
-  CPStringBuilder(::java::lang::StringBuffer *);
-  CPStringBuilder(::java::lang::StringBuilder *);
-  CPStringBuilder(::java::lang::CharSequence *);
-  void setLength(jint);
-  jchar charAt(jint);
-  jint codePointAt(jint);
-  jint codePointBefore(jint);
-  void getChars(jint, jint, JArray< jchar > *, jint);
-  void setCharAt(jint, jchar);
-  ::gnu::java::lang::CPStringBuilder * append(::java::lang::Object *);
-  ::gnu::java::lang::CPStringBuilder * append(::java::lang::String *);
-  ::gnu::java::lang::CPStringBuilder * append(::java::lang::StringBuffer *);
-  ::gnu::java::lang::CPStringBuilder * append(JArray< jchar > *);
-  ::gnu::java::lang::CPStringBuilder * append(JArray< jchar > *, jint, jint);
-  ::gnu::java::lang::CPStringBuilder * append(jboolean);
-  ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(jchar);
-  ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(::java::lang::CharSequence *);
-  ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(::java::lang::CharSequence *, jint, jint);
-  ::gnu::java::lang::CPStringBuilder * append(jint);
-  ::gnu::java::lang::CPStringBuilder * append(jlong);
-  ::gnu::java::lang::CPStringBuilder * append(jfloat);
-  ::gnu::java::lang::CPStringBuilder * append(jdouble);
-  ::gnu::java::lang::CPStringBuilder * appendCodePoint(jint);
-  ::gnu::java::lang::CPStringBuilder * delete$(jint, jint);
-  ::gnu::java::lang::CPStringBuilder * deleteCharAt(jint);
-  ::gnu::java::lang::CPStringBuilder * replace(jint, jint, ::java::lang::String *);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, JArray< jchar > *, jint, jint);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::Object *);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::String *);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::CharSequence *);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::CharSequence *, jint, jint);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, JArray< jchar > *);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jboolean);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jchar);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jint);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jlong);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jfloat);
-  ::gnu::java::lang::CPStringBuilder * insert(jint, jdouble);
-  jint indexOf(::java::lang::String *);
-  jint indexOf(::java::lang::String *, jint);
-  jint lastIndexOf(::java::lang::String *);
-  jint lastIndexOf(::java::lang::String *, jint);
-  ::gnu::java::lang::CPStringBuilder * reverse();
-  void trimToSize();
-  jint codePointCount(jint, jint);
-  jint offsetByCodePoints(jint, jint);
-  void ensureCapacity(jint);
-private:
-  void allocateArray(jint);
-public:
-  jint length();
-  ::java::lang::CharSequence * subSequence(jint, jint);
-  ::java::lang::String * substring(jint);
-  ::java::lang::String * substring(jint, jint);
-  ::java::lang::String * toString();
-  ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  ::java::lang::Appendable * append(jchar);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  JArray< jchar > * value;
-  jboolean allocated;
-  static jint DEFAULT_CAPACITY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_CPStringBuilder__
diff --git a/libjava/gnu/java/lang/CharData.h b/libjava/gnu/java/lang/CharData.h
deleted file mode 100644
index 0a16c89..0000000
--- a/libjava/gnu/java/lang/CharData.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_CharData__
-#define __gnu_java_lang_CharData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CharData;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::CharData : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * SOURCE;
-  static JArray< jint > * SHIFT;
-  static JArray< ::java::lang::String * > * BLOCKS;
-  static JArray< jint > * LARGENUMS;
-  static JArray< ::java::lang::String * > * DATA;
-  static JArray< ::java::lang::String * > * NUM_VALUE;
-  static JArray< ::java::lang::String * > * UPPER;
-  static JArray< ::java::lang::String * > * LOWER;
-  static JArray< ::java::lang::String * > * DIRECTION;
-  static ::java::lang::String * TITLE;
-  static ::java::lang::String * UPPER_SPECIAL;
-  static ::java::lang::String * UPPER_EXPAND;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_lang_CharData__
diff --git a/libjava/gnu/java/lang/ClassHelper.h b/libjava/gnu/java/lang/ClassHelper.h
deleted file mode 100644
index d42070e..0000000
--- a/libjava/gnu/java/lang/ClassHelper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_ClassHelper__
-#define __gnu_java_lang_ClassHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class ClassHelper;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::ClassHelper : public ::java::lang::Object
-{
-
-public:
-  ClassHelper();
-  static ::java::lang::String * getTruncatedClassName(::java::lang::Class *);
-  static ::java::lang::String * getTruncatedName(::java::lang::String *);
-  static ::java::lang::String * getUserName(::java::lang::Class *);
-  static JArray< ::java::lang::reflect::Method * > * getAllMethods(::java::lang::Class *);
-  static JArray< ::java::lang::reflect::Field * > * getAllFields(::java::lang::Class *);
-private:
-  static ::java::util::Map * allMethods;
-  static ::java::util::Map * allFields;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_ClassHelper__
diff --git a/libjava/gnu/java/lang/InstrumentationImpl.h b/libjava/gnu/java/lang/InstrumentationImpl.h
deleted file mode 100644
index 675626e..0000000
--- a/libjava/gnu/java/lang/InstrumentationImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_InstrumentationImpl__
-#define __gnu_java_lang_InstrumentationImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class InstrumentationImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-}
-
-class gnu::java::lang::InstrumentationImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  InstrumentationImpl();
-public:
-  void addTransformer(::java::lang::instrument::ClassFileTransformer *);
-  jboolean removeTransformer(::java::lang::instrument::ClassFileTransformer *);
-  jboolean isRedefineClassesSupported();
-  void redefineClasses(JArray< ::java::lang::instrument::ClassDefinition * > *);
-  JArray< ::java::lang::Class * > * getAllLoadedClasses();
-  JArray< ::java::lang::Class * > * getInitiatedClasses(::java::lang::ClassLoader *);
-  jlong getObjectSize(::java::lang::Object *);
-  JArray< jbyte > * callTransformers(::java::lang::ClassLoader *, ::java::lang::String *, ::java::lang::Class *, ::java::security::ProtectionDomain *, JArray< jbyte > *);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) transformers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_InstrumentationImpl__
diff --git a/libjava/gnu/java/lang/MainThread.h b/libjava/gnu/java/lang/MainThread.h
deleted file mode 100644
index 8c94dd5..0000000
--- a/libjava/gnu/java/lang/MainThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_MainThread__
-#define __gnu_java_lang_MainThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class MainThread;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::MainThread : public ::java::lang::Thread
-{
-
-public:
-  MainThread(::java::lang::Class *, JArray< ::java::lang::String * > *);
-  MainThread(::java::lang::String *, JArray< ::java::lang::String * > *, jboolean);
-  void run();
-private:
-  ::java::lang::String * getMain(::java::lang::String *);
-  void call_main();
-public: // actually package-private
-  static ::java::lang::Class * Kcert;
-  static ::java::lang::Class * Kfile;
-  static ::java::lang::Class * Khttp;
-  static ::java::lang::Class * Kjar;
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) klass;
-  ::java::lang::String * klass_name;
-  JArray< ::java::lang::String * > * args;
-  jboolean is_jar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_MainThread__
diff --git a/libjava/gnu/java/lang/MainThread.java b/libjava/gnu/java/lang/MainThread.java
deleted file mode 100644
index a33445c..0000000
--- a/libjava/gnu/java/lang/MainThread.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* gnu.java.lang.MainThread
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.lang;
-
-import java.io.File;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-
-/**
- * MainThread is a Thread which uses the main() method of some class.
- *
- * @author John Keiser
- * @author Tom Tromey (tromey@redhat.com)
- */
-final class MainThread extends Thread
-{
-  // If the user links statically then we need to ensure that these
-  // classes are linked in.  Otherwise bootstrapping fails.  These
-  // classes are only referred to via Class.forName(), so we add an
-  // explicit mention of them here.
-  static final Class Kcert     = java.security.cert.Certificate.class;
-  static final Class Kfile     = gnu.java.net.protocol.file.Handler.class;
-  static final Class Khttp     = gnu.java.net.protocol.http.Handler.class;
-  static final Class Kjar      = gnu.java.net.protocol.jar.Handler.class;
-
-  // Private data.
-  private Class klass;
-  private String klass_name;
-  private String[] args;
-  private boolean is_jar;
-
-  public MainThread(Class k, String[] args)
-  {
-    super(null, null, "main");
-    klass = k;
-    this.args = args;
-  }
-
-  public MainThread(String classname, String[] args, boolean is_jar)
-  {
-    super (null, null, "main");
-    klass_name = classname;
-    this.args = args;
-    this.is_jar = is_jar;
-  }
-
-  public void run()
-  {
-    if (is_jar)
-      klass_name = getMain(klass_name);
-
-    if (klass == null)
-      {
-        try
-	  {
-            ClassLoader cl = ClassLoader.getSystemClassLoader();
-	    // Permit main class name to be specified in file-system format.
-	    klass_name = klass_name.replace(File.separatorChar, '.');
-            klass = cl.loadClass(klass_name);
-	  }
-	catch (ClassNotFoundException x)
-	  {
-	    NoClassDefFoundError ncdfe = new NoClassDefFoundError(klass_name);
-	    ncdfe.initCause(x);
-	    throw ncdfe;
-	  }
-      }
-
-    call_main();
-  }
-
-  private String getMain(String name)
-  {
-    String mainName = null;
-    try
-      {
-	JarFile j = new JarFile(name);
-	Attributes a = j.getManifest().getMainAttributes();
-	mainName = a.getValue(Attributes.Name.MAIN_CLASS);
-      }
-    catch (Exception e)
-      {
-	// Ignore.
-      }
-
-    if (mainName == null)
-      {
-	System.err.println("Failed to load Main-Class manifest attribute from "
-			   + name);
-	System.exit(1);
-      }
-    return mainName;
-  }
-
-  // Note: this function name is known to the stack tracing code.
-  // You shouldn't change this without also updating stacktrace.cc.
-  private native void call_main();
-}
diff --git a/libjava/gnu/java/lang/VMCPStringBuilder.h b/libjava/gnu/java/lang/VMCPStringBuilder.h
deleted file mode 100644
index f8c2eb3..0000000
--- a/libjava/gnu/java/lang/VMCPStringBuilder.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_VMCPStringBuilder__
-#define __gnu_java_lang_VMCPStringBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class VMCPStringBuilder;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::VMCPStringBuilder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMCPStringBuilder();
-public:
-  static ::java::lang::String * toString(JArray< jchar > *, jint, jint);
-private:
-  static ::java::lang::reflect::Constructor * cons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_VMCPStringBuilder__
diff --git a/libjava/gnu/java/lang/VMCPStringBuilder.java b/libjava/gnu/java/lang/VMCPStringBuilder.java
deleted file mode 100644
index 8e137cd..0000000
--- a/libjava/gnu/java/lang/VMCPStringBuilder.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* VMCPStringBuilder.java -- Growable strings without locking or copying
-   Copyright (C) 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This class provides VM support for CPStringBuilder
- * by allowing the package-private constructor
- * of java.lang.String to be invoked.  The default
- * implementation uses reflection.  VMs may replace
- * this class with a more efficient version.
- */
-final class VMCPStringBuilder
-{
-
-  /**
-   * The package-private constructor for String objects without copying.
-   */
-  private static final Constructor cons;
-
-  static
-  {
-    try
-      {
-	cons = String.class.getDeclaredConstructor(new Class[] { char[].class,
-								 Integer.TYPE,
-								 Integer.TYPE,
-								 Boolean.TYPE });
-	cons.setAccessible(true);
-      }
-    catch (NoSuchMethodException e)
-      {
-	throw (Error) 
-	  new InternalError("Could not get no-copy String constructor").initCause(e);
-      }
-  }
-
-  /**
-   * Convert this <code>StringBuilder</code> to a <code>String</code>. The
-   * String is composed of the characters currently in this StringBuilder. Note
-   * that the result is not a copy, so the builder will allocate a new array
-   * if a further write operation is attempted.
-   *
-   * @param value the buffered characters.
-   * @param startIndex the index at which to start taking characters from the buffer.
-   * @param count the number of characters used in the buffer.
-   * @return the characters in this StringBuilder
-   */
-  public static String toString(char[] value, int startIndex, int count)
-  {
-    try
-      {
-	return (String)
-	  cons.newInstance(new Object[] { value, Integer.valueOf(startIndex),
-					  Integer.valueOf(count),
-					  Boolean.valueOf(true) });
-      }
-    catch (InstantiationException e)
-      {
-	throw (Error) 
-	  new InternalError("Could not instantiate no-copy String constructor").initCause(e);
-      }
-    catch (IllegalAccessException e)
-      {
-	throw (Error) 
-	  new InternalError("Could not access no-copy String constructor").initCause(e);
-      }
-    catch (InvocationTargetException e)
-      {
-	throw (Error) 
-	  new InternalError("Error calling no-copy String constructor").initCause(e);
-      }
-  }
-
-}
diff --git a/libjava/gnu/java/lang/VMInstrumentationImpl.h b/libjava/gnu/java/lang/VMInstrumentationImpl.h
deleted file mode 100644
index 1b647a3..0000000
--- a/libjava/gnu/java/lang/VMInstrumentationImpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_VMInstrumentationImpl__
-#define __gnu_java_lang_VMInstrumentationImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class VMInstrumentationImpl;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::VMInstrumentationImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMInstrumentationImpl();
-  static jboolean isRedefineClassesSupported();
-  static void redefineClasses(::java::lang::instrument::Instrumentation *, JArray< ::java::lang::instrument::ClassDefinition * > *);
-  static JArray< ::java::lang::Class * > * getAllLoadedClasses();
-  static JArray< ::java::lang::Class * > * getInitiatedClasses(::java::lang::ClassLoader *);
-  static jlong getObjectSize(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_VMInstrumentationImpl__
diff --git a/libjava/gnu/java/lang/VMInstrumentationImpl.java b/libjava/gnu/java/lang/VMInstrumentationImpl.java
deleted file mode 100644
index 4ffff83..0000000
--- a/libjava/gnu/java/lang/VMInstrumentationImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* VMInstrumentationImpl.java -- interface for the GNU implementation
-   of InstrumentationImpl
-   Copyright (C) 2005  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.lang;
-
-import java.lang.instrument.ClassDefinition;
-import java.lang.instrument.Instrumentation;
-
-/**
- * @author Nicolas Geoffray (nicolas.geoffray@menlina.com)
- * @since 1.5
- */
-final class VMInstrumentationImpl
-{
- 
-  /**
-   * Returns if the current JVM supports class redefinition
-   * 
-   * @return true if the current JVM supports class redefinition
-   */
-  static boolean isRedefineClassesSupported() { return false; }
-    
-  /**
-   * Redefines classes given as parameters. The method has to call
-   * the callTransformers from InstrumentationImpl
-   *
-   * @param inst an instrumentation object
-   * @param definitions an array of bytecode<->class correspondance
-   *
-   * @throws ClassNotFoundException if a class cannot be found 
-   * @throws UnmodifiableClassException if a class cannot be modified 
-   * @throws UnsupportedOperationException if the JVM does not support
-   * redefinition or the redefinition made unsupported changes
-   * @throws ClassFormatError if a class file is not valid
-   * @throws NoClassDefFoundError if a class name is not equal to the name
-   * in the class file specified
-   * @throws UnsupportedClassVersionError if the class file version numbers
-   * are unsupported
-   * @throws ClassCircularityError if circularity occured with the new
-   * classes
-   * @throws LinkageError if a linkage error occurs 
-   */
-  static void redefineClasses(Instrumentation inst,
-			      ClassDefinition[] definitions)
-  {
-  }
- 
-  /**
-   * Get all the classes loaded by the JVM.
-   * 
-   * @return an array containing all the classes loaded by the JVM. The array
-   * is empty if no class is loaded.
-   */
-  static Class[] getAllLoadedClasses()
-  {
-    return new Class[0];
-  }
-
-  /**
-   * Get all the classes loaded by a given class loader
-   * 
-   * @param loader the loader
-   * 
-   * @return an array containing all the classes loaded by the given loader.
-   * The array is empty if no class was loaded by the loader.
-   */
-  static Class[] getInitiatedClasses(ClassLoader loader)
-  {
-    return new Class[0];
-  }
-
-
-  /**
-   * Get the size of an object. The object is not null
-   * 
-   * @param objectToSize the object
-   * @return the size of the object
-   */
-  static long getObjectSize(Object objectToSize)
-  {
-    return 0;
-  }
-}
diff --git a/libjava/gnu/java/lang/management/BeanImpl.h b/libjava/gnu/java/lang/management/BeanImpl.h
deleted file mode 100644
index 463d617..0000000
--- a/libjava/gnu/java/lang/management/BeanImpl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_BeanImpl__
-#define __gnu_java_lang_management_BeanImpl__
-
-#pragma interface
-
-#include <javax/management/StandardMBean.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class BeanImpl;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanConstructorInfo;
-        class MBeanInfo;
-        class MBeanOperationInfo;
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanInfo;
-          class OpenMBeanParameterInfo;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::BeanImpl : public ::javax::management::StandardMBean
-{
-
-public: // actually protected
-  BeanImpl(::java::lang::Class *);
-  virtual void cacheMBeanInfo(::javax::management::MBeanInfo *);
-  virtual void checkMonitorPermissions();
-  virtual void checkControlPermissions();
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::management::MBeanInfo * getCachedMBeanInfo();
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getParameterName(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getParameterName(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint);
-public:
-  virtual ::javax::management::MBeanInfo * getMBeanInfo();
-private:
-  JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > * translateSignature(JArray< ::javax::management::MBeanParameterInfo * > *);
-  ::javax::management::openmbean::OpenMBeanInfo * __attribute__((aligned(__alignof__( ::javax::management::StandardMBean)))) openInfo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_BeanImpl__
diff --git a/libjava/gnu/java/lang/management/ClassLoadingMXBeanImpl.h b/libjava/gnu/java/lang/management/ClassLoadingMXBeanImpl.h
deleted file mode 100644
index c03db23..0000000
--- a/libjava/gnu/java/lang/management/ClassLoadingMXBeanImpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_ClassLoadingMXBeanImpl__
-#define __gnu_java_lang_management_ClassLoadingMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class ClassLoadingMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::ClassLoadingMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  ClassLoadingMXBeanImpl();
-  jint getLoadedClassCount();
-  jlong getTotalLoadedClassCount();
-  jlong getUnloadedClassCount();
-  jboolean isVerbose();
-  void setVerbose(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_ClassLoadingMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/CompilationMXBeanImpl.h b/libjava/gnu/java/lang/management/CompilationMXBeanImpl.h
deleted file mode 100644
index c11d3fb..0000000
--- a/libjava/gnu/java/lang/management/CompilationMXBeanImpl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_CompilationMXBeanImpl__
-#define __gnu_java_lang_management_CompilationMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class CompilationMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::CompilationMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  CompilationMXBeanImpl();
-  ::java::lang::String * getName();
-  jboolean isCompilationTimeMonitoringSupported();
-  jlong getTotalCompilationTime();
-private:
-  static ::java::lang::String * COMPILER_NAME;
-  static ::java::lang::String * COMPILATION_TIME_SUPPORT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_CompilationMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/GarbageCollectorMXBeanImpl.h b/libjava/gnu/java/lang/management/GarbageCollectorMXBeanImpl.h
deleted file mode 100644
index cfefdb6..0000000
--- a/libjava/gnu/java/lang/management/GarbageCollectorMXBeanImpl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_GarbageCollectorMXBeanImpl__
-#define __gnu_java_lang_management_GarbageCollectorMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/MemoryManagerMXBeanImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class GarbageCollectorMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::GarbageCollectorMXBeanImpl : public ::gnu::java::lang::management::MemoryManagerMXBeanImpl
-{
-
-public:
-  GarbageCollectorMXBeanImpl(::java::lang::String *);
-  jlong getCollectionCount();
-  jlong getCollectionTime();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_GarbageCollectorMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/MemoryMXBeanImpl.h b/libjava/gnu/java/lang/management/MemoryMXBeanImpl.h
deleted file mode 100644
index 3c87a0f..0000000
--- a/libjava/gnu/java/lang/management/MemoryMXBeanImpl.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_MemoryMXBeanImpl__
-#define __gnu_java_lang_management_MemoryMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class MemoryMXBeanImpl;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class NotificationFilter;
-        class NotificationListener;
-      namespace openmbean
-      {
-          class CompositeType;
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::MemoryMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  MemoryMXBeanImpl();
-  void gc();
-  ::java::lang::management::MemoryUsage * getHeapMemoryUsage();
-  ::java::lang::management::MemoryUsage * getNonHeapMemoryUsage();
-  jint getObjectPendingFinalizationCount();
-  jboolean isVerbose();
-  void setVerbose(jboolean);
-  void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo();
-  void removeNotificationListener(::javax::management::NotificationListener *);
-  void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-public: // actually package-private
-  void fireNotification(::java::lang::String *, ::java::lang::String *, jlong, jlong, jlong, jlong, jlong);
-  void fireThresholdExceededNotification(::java::lang::String *, jlong, jlong, jlong, jlong, jlong);
-  void fireCollectionThresholdExceededNotification(::java::lang::String *, jlong, jlong, jlong, jlong, jlong);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) listeners;
-  jlong notificationCount;
-public:
-  static ::javax::management::openmbean::CompositeType * notifType;
-  static ::javax::management::openmbean::CompositeType * usageType;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_MemoryMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/MemoryManagerMXBeanImpl.h b/libjava/gnu/java/lang/management/MemoryManagerMXBeanImpl.h
deleted file mode 100644
index 2ddbf70..0000000
--- a/libjava/gnu/java/lang/management/MemoryManagerMXBeanImpl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_MemoryManagerMXBeanImpl__
-#define __gnu_java_lang_management_MemoryManagerMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class MemoryManagerMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::MemoryManagerMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  MemoryManagerMXBeanImpl(::java::lang::String *);
-public: // actually protected
-  MemoryManagerMXBeanImpl(::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual JArray< ::java::lang::String * > * getMemoryPoolNames();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isValid();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_MemoryManagerMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/MemoryPoolMXBeanImpl.h b/libjava/gnu/java/lang/management/MemoryPoolMXBeanImpl.h
deleted file mode 100644
index ff3734d..0000000
--- a/libjava/gnu/java/lang/management/MemoryPoolMXBeanImpl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_MemoryPoolMXBeanImpl__
-#define __gnu_java_lang_management_MemoryPoolMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class MemoryPoolMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::MemoryPoolMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  MemoryPoolMXBeanImpl(::java::lang::String *);
-  ::java::lang::management::MemoryUsage * getCollectionUsage();
-  jlong getCollectionUsageThreshold();
-  jlong getCollectionUsageThresholdCount();
-  JArray< ::java::lang::String * > * getMemoryManagerNames();
-  ::java::lang::String * getName();
-  ::java::lang::management::MemoryUsage * getPeakUsage();
-  ::java::lang::management::MemoryType * getType();
-  ::java::lang::management::MemoryUsage * getUsage();
-  jlong getUsageThreshold();
-  jlong getUsageThresholdCount();
-  jboolean isCollectionUsageThresholdExceeded();
-  jboolean isCollectionUsageThresholdSupported();
-  jboolean isUsageThresholdExceeded();
-  jboolean isUsageThresholdSupported();
-  jboolean isValid();
-  void resetPeakUsage();
-  void setCollectionUsageThreshold(jlong);
-  void setUsageThreshold(jlong);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) name;
-  static ::java::lang::String * COLLECTION_USAGE_THRESHOLD;
-  static ::java::lang::String * USAGE_THRESHOLD;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_MemoryPoolMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h b/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
deleted file mode 100644
index af79980..0000000
--- a/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_OperatingSystemMXBeanImpl__
-#define __gnu_java_lang_management_OperatingSystemMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class OperatingSystemMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::OperatingSystemMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  OperatingSystemMXBeanImpl();
-  ::java::lang::String * getArch();
-  jint getAvailableProcessors();
-  ::java::lang::String * getName();
-  jdouble getSystemLoadAverage();
-  ::java::lang::String * getVersion();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_OperatingSystemMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/RuntimeMXBeanImpl.h b/libjava/gnu/java/lang/management/RuntimeMXBeanImpl.h
deleted file mode 100644
index f46f6df..0000000
--- a/libjava/gnu/java/lang/management/RuntimeMXBeanImpl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_RuntimeMXBeanImpl__
-#define __gnu_java_lang_management_RuntimeMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class RuntimeMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::RuntimeMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  RuntimeMXBeanImpl();
-  ::java::lang::String * getBootClassPath();
-  ::java::lang::String * getClassPath();
-  ::java::util::List * getInputArguments();
-  ::java::lang::String * getLibraryPath();
-  ::java::lang::String * getManagementSpecVersion();
-  ::java::lang::String * getName();
-  ::java::lang::String * getSpecName();
-  ::java::lang::String * getSpecVendor();
-  ::java::lang::String * getSpecVersion();
-  jlong getStartTime();
-  ::java::util::Map * getSystemProperties();
-  jlong getUptime();
-  ::java::lang::String * getVmName();
-  ::java::lang::String * getVmVendor();
-  ::java::lang::String * getVmVersion();
-  jboolean isBootClassPathSupported();
-private:
-  static ::java::lang::String * SUN_BOOT_CLASS_PATH;
-  static ::java::lang::String * JAVA_BOOT_CLASS_PATH;
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) startTime;
-  ::java::lang::String * bootClassPath;
-  jboolean bootClassPathSupported;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_RuntimeMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h b/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
deleted file mode 100644
index 6127548..0000000
--- a/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_ThreadMXBeanImpl__
-#define __gnu_java_lang_management_ThreadMXBeanImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/management/BeanImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class ThreadMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::ThreadMXBeanImpl : public ::gnu::java::lang::management::BeanImpl
-{
-
-public:
-  ThreadMXBeanImpl();
-  JArray< ::java::lang::management::ThreadInfo * > * dumpAllThreads(jboolean, jboolean);
-  JArray< jlong > * findDeadlockedThreads();
-  JArray< jlong > * findMonitorDeadlockedThreads();
-  JArray< jlong > * getAllThreadIds();
-  jlong getCurrentThreadCpuTime();
-  jlong getCurrentThreadUserTime();
-  jint getDaemonThreadCount();
-  jint getPeakThreadCount();
-  jint getThreadCount();
-  jlong getThreadCpuTime(jlong);
-  ::java::lang::management::ThreadInfo * getThreadInfo(jlong);
-  JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *);
-  ::java::lang::management::ThreadInfo * getThreadInfo(jlong, jint);
-  JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *, jint);
-  JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *, jboolean, jboolean);
-  jlong getThreadUserTime(jlong);
-  jlong getTotalStartedThreadCount();
-  jboolean isCurrentThreadCpuTimeSupported();
-  jboolean isObjectMonitorUsageSupported();
-  jboolean isSynchronizerUsageSupported();
-  jboolean isThreadContentionMonitoringEnabled();
-  jboolean isThreadContentionMonitoringSupported();
-  jboolean isThreadCpuTimeEnabled();
-  jboolean isThreadCpuTimeSupported();
-  void resetPeakThreadCount();
-  void setThreadContentionMonitoringEnabled(jboolean);
-  void setThreadCpuTimeEnabled(jboolean);
-private:
-  static ::java::lang::String * CURRENT_THREAD_TIME_SUPPORT;
-  static ::java::lang::String * THREAD_TIME_SUPPORT;
-  static ::java::lang::String * CONTENTION_SUPPORT;
-  static ::java::lang::String * TIME_ENABLED;
-  static ::java::lang::String * MONITOR_SUPPORT;
-  static ::java::lang::String * SYNCHRONIZER_SUPPORT;
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) timeEnabled;
-  jboolean contentionEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_ThreadMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.h b/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.h
deleted file mode 100644
index b381004..0000000
--- a/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMClassLoadingMXBeanImpl__
-#define __gnu_java_lang_management_VMClassLoadingMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMClassLoadingMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMClassLoadingMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMClassLoadingMXBeanImpl();
-  static jint getLoadedClassCount();
-  static jlong getUnloadedClassCount();
-  static jboolean isVerbose();
-  static void setVerbose(jboolean);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMClassLoadingMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java b/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java
deleted file mode 100644
index c1c7d13..0000000
--- a/libjava/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* VMClassLoadingMXBeanImpl.java - VM impl. of a class loading bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-/**
- * Provides access to information about the class loading 
- * behaviour of the current invocation of the virtual
- * machine.  Instances of this bean are obtained by calling
- * {@link ManagementFactory#getClassLoadingMXBean()}.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMClassLoadingMXBeanImpl
-{
-
-  /**
-   * Returns the number of classes currently loaded by
-   * the virtual machine.
-   *
-   * @return the number of loaded classes.
-   */
-  static native int getLoadedClassCount();
-
-  /**
-   * Returns the number of classes that have been unloaded
-   * by the virtual machine since it was started.
-   *
-   * @return the number of unloaded classes.
-   */
-  static native long getUnloadedClassCount();
-
-  /**
-   * Returns true if the virtual machine will emit additional
-   * information when classes are loaded and unloaded.  The
-   * format of the output is left up to the virtual machine.
-   *
-   * @return true if verbose class loading output is on.
-   */
-  static native boolean isVerbose();
-
-  /**
-   * Turns on or off the emission of additional information
-   * when classes are loaded and unloaded.  The format of the
-   * output is left up to the virtual machine.  This method
-   * may be called by multiple threads concurrently, but there
-   * is only one global setting of verbosity that is affected.
-   *
-   * @param verbose the new setting for verbose class loading
-   *                output.
-   */
-  static native void setVerbose(boolean verbose);
-
-}
diff --git a/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.h b/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.h
deleted file mode 100644
index 31967e1..0000000
--- a/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMCompilationMXBeanImpl__
-#define __gnu_java_lang_management_VMCompilationMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMCompilationMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMCompilationMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMCompilationMXBeanImpl();
-  static jlong getTotalCompilationTime();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMCompilationMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.java b/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.java
deleted file mode 100644
index b9b5bbc..0000000
--- a/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* VMCompilationMXBeanImpl.java - VM implementation of a compilation bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-/**
- * Provides access to information about the JIT 
- * compiler of the virtual machine, if one exists.
- * Instances of this bean are obtained by calling
- * {@link ManagementFactory#getCompilationMXBean()},
- * if this is the case.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMCompilationMXBeanImpl
-{
-
-  /**
-   * Returns the number of milliseconds the JIT
-   * compiler has spent compiling Java bytecode
-   * to native machine code.  This is only called
-   * if a JIT compiler exists and the
-   * gnu.java.lang.management.CompilationTimeSupport
-   * property has been set.
-   *
-   * @return the number of milliseconds spent
-   *         compiling.
-   */
-  static native long getTotalCompilationTime();
-
-}
diff --git a/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.h b/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.h
deleted file mode 100644
index b01f97c..0000000
--- a/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMGarbageCollectorMXBeanImpl__
-#define __gnu_java_lang_management_VMGarbageCollectorMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMGarbageCollectorMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMGarbageCollectorMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMGarbageCollectorMXBeanImpl();
-  static jlong getCollectionCount(::java::lang::String *);
-  static jlong getCollectionTime(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMGarbageCollectorMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java b/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java
deleted file mode 100644
index 2a20284..0000000
--- a/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* VMGarbageCollectorMXBeanImpl.java - VM interface for a GC bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-/**
- * Provides access to information about the garbage collectors
- * of the virtual machine.  Garbage collectors are responsible
- * for removing unreferenced objects from memory.  A garbage
- * collector is a type of memory manager, so this interface
- * is combined with that of generic memory managers.  An instance
- * of this bean for each garbage collector is obtained by calling
- * {@link ManagementFactory#getGarbageCollectorMXBeans()}.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMGarbageCollectorMXBeanImpl
-{
-
-  /**
-   * Returns the number of collections the garbage collector
-   * represented by this bean has made.  -1 is returned if the
-   * collection count is undefined.
-   *
-   * @param name the name of the garbage collector.
-   * @return the number of collections made, or -1 if this is
-   *         undefined.
-   */
-  static native long getCollectionCount(String name);
-
-  /**
-   * Returns the accumulated number of milliseconds this garbage
-   * collector has spent freeing the memory used by unreferenced
-   * objects.  -1 is returned if the collection time is undefined.
-   * Note that the accumulated time may not change, even when the
-   * collection count increases, if the time taken is sufficiently
-   * short; this depends on the resolution of the timer used.
-   * 
-   * @param name the name of the garbage collector.
-   * @return the accumulated number of milliseconds spent collecting,
-   *         or -1 if this is undefined.
-   */
-  static native long getCollectionTime(String name);
-
-}
diff --git a/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.h
deleted file mode 100644
index a31c551..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMMemoryMXBeanImpl__
-#define __gnu_java_lang_management_VMMemoryMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMMemoryMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMMemoryMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMMemoryMXBeanImpl();
-  static ::java::lang::management::MemoryUsage * getHeapMemoryUsage();
-  static ::java::lang::management::MemoryUsage * getNonHeapMemoryUsage();
-  static jint getObjectPendingFinalizationCount();
-  static jboolean isVerbose();
-  static void setVerbose(jboolean);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMMemoryMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.java
deleted file mode 100644
index 193e335..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* VMMemoryMXBeanImpl.java - VM impl. of a memory bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import java.lang.management.MemoryUsage;
-
-/**
- * Provides access to information about the memory
- * management of the current invocation of the virtual
- * machine.  Instances of this bean are obtained by calling
- * {@link ManagementFactory#getMemoryMXBean()}.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMMemoryMXBeanImpl
-{
-
-  /**
-   * Returns an instance of {@link java.lang.management.MemoryUsage}
-   * with appropriate initial, used, committed and maximum values
-   * for the heap.  By default, this uses the methods of
-   * {@link java.lang.Runtime} to provide some of the values.
-   *
-   * @return an {@link java.lang.management.MemoryUsage} instance
-   *         for the heap.
-   */
-  static MemoryUsage getHeapMemoryUsage()
-  {
-    Runtime runtime = Runtime.getRuntime();
-    long totalMem = runtime.totalMemory();
-    return new MemoryUsage(-1, totalMem - runtime.freeMemory(),
-			   totalMem, runtime.maxMemory());
-  }
-
-  /**
-   * Returns an instance of {@link java.lang.management.MemoryUsage}
-   * with appropriate initial, used, committed and maximum values
-   * for non-heap memory.
-   *
-   * @return an {@link java.lang.management.MemoryUsage} instance
-   *         for non-heap memory.
-   */
-  static native MemoryUsage getNonHeapMemoryUsage();
-
-  /**
-   * Returns the number of objects ready to be garbage collected.
-   *
-   * @return the number of finalizable objects.
-   */
-  static native int getObjectPendingFinalizationCount();
-
-  /**
-   * Returns true if the virtual machine will emit additional
-   * information when memory is allocated and deallocated.  The
-   * format of the output is left up to the virtual machine.
-   *
-   * @return true if verbose class loading output is on.
-   */
-  static native boolean isVerbose();
-
-  /**
-   * Turns on or off the emission of additional information
-   * when memory is allocated and deallocated.  The format of the
-   * output is left up to the virtual machine.  This method
-   * may be called by multiple threads concurrently, but there
-   * is only one global setting of verbosity that is affected.
-   *
-   * @param verbose the new setting for verbose class loading
-   *                output.
-   */
-  static native void setVerbose(boolean verbose);
-
-}
diff --git a/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.h
deleted file mode 100644
index 3a174c8..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMMemoryManagerMXBeanImpl__
-#define __gnu_java_lang_management_VMMemoryManagerMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMMemoryManagerMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMMemoryManagerMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMMemoryManagerMXBeanImpl();
-  static JArray< ::java::lang::String * > * getMemoryPoolNames(::java::lang::String *);
-  static jboolean isValid(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMMemoryManagerMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java b/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java
deleted file mode 100644
index 0a4204a..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* VMMemoryManagerMXBeanImpl.java - VM interface for a memory manager bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Provides access to information about the memory managers
- * of the virtual machine.  An instance of this bean for each
- * memory manager is obtained by calling
- * {@link ManagementFactory#getMemoryManagerMXBeans()}.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMMemoryManagerMXBeanImpl
-{
-
-  /** 
-   * Returns an array containing the names of the memory pools
-   * this memory manager manages.
-   * 
-   * @param name the name of the memory manager.
-   * @return an array containing the name of each memory pool
-   *         this manager is responsible for.
-   */
-  static String[] getMemoryPoolNames(String name)
-  {
-    List managedPools = new ArrayList();
-    Iterator beans = ManagementFactory.getMemoryPoolMXBeans().iterator();
-    while (beans.hasNext())
-      {
-	MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next();
-	String[] managers = bean.getMemoryManagerNames();
-	for (int a = 0; a < managers.length; ++a)
-	  if (managers[a].equals(name))
-	    {
-	      managedPools.add(bean.getName());
-	      break;
-	    }
-      }
-    return (String[]) managedPools.toArray(new String[managedPools.size()]);
-  }
-
-  /**
-   * Returns true if this memory manager is still valid.  A memory
-   * manager becomes invalid when it is removed by the virtual machine
-   * and no longer used.
-   *
-   * @param name the name of the memory manager.
-   * @return true if this memory manager is valid.
-   */
-  static native boolean isValid(String name);
-
-}
diff --git a/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.h
deleted file mode 100644
index 623162e..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMMemoryPoolMXBeanImpl__
-#define __gnu_java_lang_management_VMMemoryPoolMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMMemoryPoolMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMMemoryPoolMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMMemoryPoolMXBeanImpl();
-  static ::java::lang::management::MemoryUsage * getCollectionUsage(::java::lang::String *);
-  static jlong getCollectionUsageThreshold(::java::lang::String *);
-  static jlong getCollectionUsageThresholdCount(::java::lang::String *);
-  static JArray< ::java::lang::String * > * getMemoryManagerNames(::java::lang::String *);
-  static ::java::lang::management::MemoryUsage * getPeakUsage(::java::lang::String *);
-  static ::java::lang::String * getType(::java::lang::String *);
-  static ::java::lang::management::MemoryUsage * getUsage(::java::lang::String *);
-  static jlong getUsageThreshold(::java::lang::String *);
-  static jlong getUsageThresholdCount(::java::lang::String *);
-  static jboolean isValid(::java::lang::String *);
-  static void resetPeakUsage(::java::lang::String *);
-  static void setCollectionUsageThreshold(::java::lang::String *, jlong);
-  static void setUsageThreshold(::java::lang::String *, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMMemoryPoolMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java b/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java
deleted file mode 100644
index 723d4e8..0000000
--- a/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/* MemoryPoolMXBeanImpl.java - VM interface for memory pool beans
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import java.lang.management.MemoryUsage;
-
-/**
- * Provides access to information on the memory resources or
- * pools used by the current invocation of the virtual machine.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMMemoryPoolMXBeanImpl
-{
-
-  /**
-   * Returns memory usage statistics for the specified pool
-   * just after a best-effort attempt to free memory.  This
-   * is valid only for certain garbage collectors.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return a {@link java.lang.management.MemoryUsage} object
-   *         containing the statistics or <code>null</code>
-   *         if this pool does not support such statistics.
-   */
-  static native MemoryUsage getCollectionUsage(String name);
-
-  /**
-   * Returns the collection usage threshold for the specified pool.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.CollectionUsageThresholdSupport</code>,
-   * is defined).  The value is initially zero.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return the collection usage threshold.
-   */
-  static native long getCollectionUsageThreshold(String name);
-
-  /**
-   * Returns the number of times the collection usage threshold
-   * has been met or exceeded by the specified pool.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.CollectionUsageThresholdSupport</code>,
-   * is defined).
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return the collection usage threshold count.
-   */
-  static native long getCollectionUsageThresholdCount(String name);
-
-  /**
-   * Returns an array of names of memory managers which manage
-   * the specified pool.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return a list of memory managers for the pool.
-   */
-  static native String[] getMemoryManagerNames(String name);
-
-  /**
-   * Returns the peak usage level of the specified pool.
-   * This is only called if the pool is valid.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return a {@link java.lang.management.MemoryUsage} object
-   *         containing the statistics.
-   */
-  static native MemoryUsage getPeakUsage(String name);
-
-  /**
-   * Returns the type of memory used by the specified pool. 
-   * The value must be either "HEAP" or "NON_HEAP".
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return the type of the given pool.
-   */
-  static native String getType(String name);
-
-  /**
-   * Returns the current usage level of the specified pool.
-   * This is only called if the pool is valid.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return a {@link java.lang.management.MemoryUsage} object
-   *         containing the statistics.
-   */
-  static native MemoryUsage getUsage(String name);
-
-  /**
-   * Returns the usage threshold for the specified pool.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.UsageThresholdSupport</code>,
-   * is defined).  The value is initially defined by the
-   * virtual machine.
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return the usage threshold.
-   */
-  static native long getUsageThreshold(String name);
-
-  /**
-   * Returns the number of times the usage threshold
-   * has been met or exceeded by the specified pool.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.UsageThresholdSupport</code>,
-   * is defined).
-   *
-   * @param name the name of the pool to obtain statistics on.
-   * @return the usage threshold count.
-   */
-  static native long getUsageThresholdCount(String name);
-  
-  /**
-   * Returns true if the specified pool is still valid i.e.
-   * it is still in use by the virtual machine.
-   *
-   * @param name the name of the pool to check the validity of.
-   * @return true if the pool is valid.
-   */
-  static native boolean isValid(String name);
-  
-  /**
-   * Resets the peak usage level to the current usage level for
-   * the specified pool.
-   *
-   * @param name the name of the pool to reset the peak usage of.
-   */
-  static native void resetPeakUsage(String name);
-
-  /**
-   * Sets the collection usage threshold for the specified
-   * pool to the supplied value.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.CollectionUsageThresholdSupport</code>,
-   * is defined). 
-   *
-   * @param name the name of the pool to set the threshold of.
-   * @param threshold the new threshold level.
-   */
-  static native void setCollectionUsageThreshold(String name, long threshold);
-
-  /**
-   * Sets the usage threshold for the specified pool to the supplied value.
-   * This is only called if this functionality is supported
-   * by the virtual machine (i.e. the appropriate property,
-   * <code>gnu.java.lang.management.UsageThresholdSupport</code>,
-   * is defined). 
-   *
-   * @param name the name of the pool to set the threshold of.
-   * @param threshold the new threshold level.
-   */
-  static native void setUsageThreshold(String name, long threshold);
-
-}
diff --git a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h
deleted file mode 100644
index 183f4ba..0000000
--- a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
-#define __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMOperatingSystemMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMOperatingSystemMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMOperatingSystemMXBeanImpl();
-  static jdouble getSystemLoadAverage();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
deleted file mode 100644
index 20b3f9e..0000000
--- a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* VMOperatingSystemMXBeanImpl.java - VM implementation of an OS bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import gnu.classpath.Configuration;
-
-/**
- * Provides access to information about the operating system.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.6
- */
-final class VMOperatingSystemMXBeanImpl
-{
-
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary("javalangmanagement");
-      }
-  }
-
-  /**
-   * Returns the system load average from the last
-   * minute.
-   *
-   * @return the system load average from the last
-   *         minute.
-   */
-  static native double getSystemLoadAverage();
-
-}
diff --git a/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.h b/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.h
deleted file mode 100644
index 9bd0e44..0000000
--- a/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMRuntimeMXBeanImpl__
-#define __gnu_java_lang_management_VMRuntimeMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMRuntimeMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMRuntimeMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMRuntimeMXBeanImpl();
-  static JArray< ::java::lang::String * > * getInputArguments();
-  static ::java::lang::String * getName();
-  static jlong getStartTime();
-private:
-  static jlong getPID();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMRuntimeMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.java b/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
deleted file mode 100644
index 05d368a..0000000
--- a/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* VMRuntimeMXBeanImpl.java - VM implementation of an runtime bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import gnu.classpath.SystemProperties;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * Provides access to information about the virtual machine.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMRuntimeMXBeanImpl
-{
-
-  /**
-   * Returns the command-line arguments supplied
-   * to the virtual machine, excluding those supplied
-   * to <code>main()</code>.
-   *
-   * @return the command-line arguments.
-   */
-  static native String[] getInputArguments();
-
-  /**
-   * Returns a developer-chosen name for the virtual
-   * machine, which may differ over different running
-   * instances of the same virtual machine binary.
-   * For example, this may include the particular
-   * process identifier used by this instance or
-   * the host name of the machine on which it is
-   * running.  The intention is that this name refers
-   * to the precise entity that the other data supplied
-   * by the bean refers to, rather than the VM in general.
-   *
-   * @return the custom name of the VM.
-   */
-  static String getName()
-  {
-    String hostName;
-    try
-      {
-	hostName = InetAddress.getLocalHost().getHostName();
-      }
-    catch (UnknownHostException e)
-      {
-	hostName = "Unknown host";
-      }
-    return SystemProperties.getProperty("java.vm.name") + " " +
-      SystemProperties.getProperty("java.vm.version") + " [" +
-      getPID() + "@" + hostName + "]";
-  }
-
-  /**
-   * The time in milliseconds at which the virtual
-   * machine was started.  This method is only executed
-   * once (for efficency), as the value is not expected
-   * to change.
-   *
-   * @return the VM start time.
-   */
-  static native long getStartTime();
-
-  /**
-   * The process identifier of the runtime.
-   *
-   * @return the PID of the runtime.
-   */
-  private static native long getPID();
-
-}
diff --git a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
deleted file mode 100644
index 4c8ab8c..0000000
--- a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_VMThreadMXBeanImpl__
-#define __gnu_java_lang_management_VMThreadMXBeanImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class VMThreadMXBeanImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::management::VMThreadMXBeanImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMThreadMXBeanImpl();
-  static JArray< jlong > * findDeadlockedThreads();
-  static JArray< jlong > * findMonitorDeadlockedThreads();
-  static JArray< ::java::lang::Thread * > * getAllThreads();
-  static JArray< jlong > * getAllThreadIds();
-  static jlong getCurrentThreadCpuTime();
-  static jlong getCurrentThreadUserTime();
-  static jint getDaemonThreadCount();
-  static void getLockInfo(::java::lang::management::ThreadInfo *);
-  static void getMonitorInfo(::java::lang::management::ThreadInfo *);
-  static jint getPeakThreadCount();
-  static jint getThreadCount();
-  static jlong getThreadCpuTime(jlong);
-  static ::java::lang::management::ThreadInfo * getThreadInfoForId(jlong, jint);
-  static jlong getThreadUserTime(jlong);
-  static jlong getTotalStartedThreadCount();
-  static void resetPeakThreadCount();
-private:
-  static jint filled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_VMThreadMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java
deleted file mode 100644
index 1c061aa..0000000
--- a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* VMThreadMXBeanImpl.java - VM impl. of a thread bean
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.lang.management;
-
-import java.lang.management.ThreadInfo;
-
-/**
- * Provides access to information about the threads 
- * of the virtual machine.  An instance of this bean is
- * obtained by calling
- * {@link ManagementFactory#getThreadMXBean()}.
- * See {@link java.lang.management.ThreadMXBean} for
- * full documentation.
- *
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-final class VMThreadMXBeanImpl
-{
-
-  /**
-   * Cache of how many threads were found.
-   */
-  private static int filled;
-
-  /**
-   * Returns the ids of cycles of deadlocked threads, occurring
-   * due to monitor ownership or ownable synchronizer ownership.
-   * This will only be called if ownable synchronizer monitoring
-   * is supported.
-   *
-   * @return the ids of the deadlocked threads.
-   */
-  static native long[] findDeadlockedThreads();
-
-  /**
-   * Returns the ids of cycles of deadlocked threads, occurring
-   * due to monitor ownership.
-   *
-   * @return the ids of the deadlocked threads.
-   */
-  static native long[] findMonitorDeadlockedThreads();
-
-  /* This is the same as in Thread.getAllStackTraces() */
-  static Thread[] getAllThreads()
-  {
-    ThreadGroup group = Thread.currentThread().getThreadGroup();
-    while (group.getParent() != null)
-      group = group.getParent();
-    int arraySize = group.activeCount();
-    Thread[] threadList = new Thread[arraySize];
-    filled = group.enumerate(threadList);
-    while (filled == arraySize)
-      {
-	arraySize *= 2;
-	threadList = new Thread[arraySize];
-	filled = group.enumerate(threadList);
-      }
-    return threadList;
-  }
-  
-  /**
-   * Returns the id of all live threads at the time of execution.
-   *
-   * @return the live thread ids.
-   */
-  static long[] getAllThreadIds()
-  {
-    Thread[] threadList = getAllThreads();
-    long[] ids = new long[filled];
-    for (int a = 0; a < filled; ++a)
-      ids[a] = threadList[a].getId();
-    return ids;
-  }
-
-  /**
-   * Returns the number of nanoseconds of CPU time
-   * the current thread has used in total.   This is
-   * only called if this feature is enabled and
-   * supported.
-   *
-   * @return the nanoseconds of CPU time used by
-   *         the current thread.
-   */
-  static native long getCurrentThreadCpuTime();
-
-  /**
-   * Returns the number of nanoseconds of user time
-   * the current thread has used in total.   This is
-   * only called if this feature is enabled and
-   * supported.
-   *
-   * @return the nanoseconds of user time used by
-   *         the current thread.
-   */
-  static native long getCurrentThreadUserTime();
-
-  /**
-   * Returns the number of live daemon threads.
-   *
-   * @return the number of live daemon threads.
-   */
-  static int getDaemonThreadCount()
-  {
-    Thread[] threadList = getAllThreads();
-    int daemonCount = 0;
-    for (int a = 0; a < filled; ++a)
-      {
-	if (threadList[a].isDaemon())
-	  ++daemonCount;
-      }
-    return daemonCount;
-  }
-
-  /**
-   * Fill out the given {@link ThreadInfo} object
-   * with ownable synchronizer usage information.
-   * This is only called if ownable synchronizer
-   * usage monitoring is supported.
-   *
-   * @param info the {@link ThreadInfo} object to modify.
-   */
-  static native void getLockInfo(ThreadInfo info);
-
-  /**
-   * Fill out the given {@link ThreadInfo} object
-   * with monitor usage information.  This is only
-   * called if monitor usage monitoring is supported.
-   *
-   * @param info the {@link ThreadInfo} object to modify.
-   */
-  static native void getMonitorInfo(ThreadInfo info);
-
-  /**
-   * Returns the current peak number of live threads.
-   *
-   * @return the peak number of live threads.
-   */
-  static native int getPeakThreadCount();
-
-  /**
-   * Returns the number of live threads.
-   *
-   * @return the number of live threads.
-   */
-  static int getThreadCount()
-  {
-    getAllThreads();
-    return filled;
-  }
-
-  /**
-   * Returns the number of nanoseconds of CPU time
-   * the specified thread has used in total.   This is
-   * only called if this feature is enabled and
-   * supported.
-   *
-   * @param id the thread to obtain statistics on.
-   * @return the nanoseconds of CPU time used by
-   *         the thread.
-   */
-  static native long getThreadCpuTime(long id);
-
-  /**
-   * Returns the {@link java.lang.management.ThreadInfo}
-   * which corresponds to the specified id.
-   *
-   * @param id the id of the thread.
-   * @param maxDepth the depth of the stack trace.
-   * @return the corresponding <code>ThreadInfo</code>.
-   */
-  static native ThreadInfo getThreadInfoForId(long id, int maxDepth);
-  
-  /**
-   * Returns the number of nanoseconds of user time
-   * the specified thread has used in total.   This is
-   * only called if this feature is enabled and
-   * supported.
-   *
-   * @param id the thread to obtain statistics on.
-   * @return the nanoseconds of user time used by
-   *         the thread.
-   */
-  static native long getThreadUserTime(long id);
-  
-  /**
-   * Returns the total number of threads that have
-   * been started over the lifetime of the virtual
-   * machine.
-   *
-   * @return the total number of threads started.
-   */
-  static native long getTotalStartedThreadCount();
-
-  /**
-   * Resets the peak thread count to the current
-   * number of live threads.
-   */
-  static native void resetPeakThreadCount();
-
-}
diff --git a/libjava/gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc
deleted file mode 100644
index 5958b1f..0000000
--- a/libjava/gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
-/**
- * @author Andrew John Hughes <gnu_andrew@member.fsf.org>
- * @date Sun 20 Aug 2006 */
-/* Written using online API docs for JDK 1.5 beta from http://java.sun.com.
- * Status:  Believed complete and correct.
- */
- 
-#include <config.h>
-
-#include <jvm.h>
-
-#include <gnu/java/lang/management/VMClassLoadingMXBeanImpl.h>
-
-jint
-gnu::java::lang::management::VMClassLoadingMXBeanImpl::getLoadedClassCount ()
-{
-  /* FIXME: We never unload, so this never goes down again */
-  return ::gcj::loadedClasses;
-}
-
-
-jlong
-gnu::java::lang::management::VMClassLoadingMXBeanImpl::getUnloadedClassCount ()
-{
-  /* FIXME: We never unload, so this always == 0 */
-  return ::gcj::unloadedClasses;
-}
-
-
-jboolean
-gnu::java::lang::management::VMClassLoadingMXBeanImpl::isVerbose ()
-{
-  return ::gcj::verbose_class_flag;
-}
-
-
-void
-gnu::java::lang::management::VMClassLoadingMXBeanImpl::setVerbose (jboolean b)
-{
-  ::gcj::verbose_class_flag = b;
-}
diff --git a/libjava/gnu/java/lang/management/natVMCompilationMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMCompilationMXBeanImpl.cc
deleted file mode 100644
index 4ccadcb..0000000
--- a/libjava/gnu/java/lang/management/natVMCompilationMXBeanImpl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/lang/management/VMCompilationMXBeanImpl.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-jlong
-gnu::java::lang::management::VMCompilationMXBeanImpl::getTotalCompilationTime ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMCompilationMXBeanImpl::getTotalCompilationTime () not implemented"));
-}
diff --git a/libjava/gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc
deleted file mode 100644
index 3e4f999..0000000
--- a/libjava/gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-jlong
-gnu::java::lang::management::VMGarbageCollectorMXBeanImpl::getCollectionCount (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMGarbageCollectorMXBeanImpl::getCollectionCount (::java::lang::String *) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMGarbageCollectorMXBeanImpl::getCollectionTime (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMGarbageCollectorMXBeanImpl::getCollectionTime (::java::lang::String *) not implemented"));
-}
diff --git a/libjava/gnu/java/lang/management/natVMMemoryMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMMemoryMXBeanImpl.cc
deleted file mode 100644
index 8b59815..0000000
--- a/libjava/gnu/java/lang/management/natVMMemoryMXBeanImpl.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
-/**
- * @author Andrew John Hughes <gnu_andrew@member.fsf.org>
- * @date Tue 08 Aug 2006 */
-/* 
- * Status:  Stubbed.
- */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <gnu/java/lang/management/VMMemoryMXBeanImpl.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-::java::lang::management::MemoryUsage *
-gnu::java::lang::management::VMMemoryMXBeanImpl::getNonHeapMemoryUsage ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryMXBeanImpl::getNonHeapMemoryUsage () not implemented"));
-}
-
-
-jint
-gnu::java::lang::management::VMMemoryMXBeanImpl::getObjectPendingFinalizationCount ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryMXBeanImpl::getObjectPendingFinalizationCount () not implemented"));
-}
-
-
-jboolean
-gnu::java::lang::management::VMMemoryMXBeanImpl::isVerbose ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryMXBeanImpl::isVerbose () not implemented"));
-}
-
-
-void
-gnu::java::lang::management::VMMemoryMXBeanImpl::setVerbose (jboolean)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryMXBeanImpl::setVerbose (jboolean) not implemented"));
-}
diff --git a/libjava/gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc
deleted file mode 100644
index 8d8a3e6..0000000
--- a/libjava/gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/lang/management/VMMemoryManagerMXBeanImpl.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-jboolean
-gnu::java::lang::management::VMMemoryManagerMXBeanImpl::isValid (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryManagerMXBeanImpl::isValid (::java::lang::String *) not implemented"));
-}
diff --git a/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
deleted file mode 100644
index 7bc0162..0000000
--- a/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
-/**
- * @author Andrew John Hughes <gnu_andrew@member.fsf.org>
- * @date Tue 08 Aug 2006 */
-/* Implemented for our sole pool, the heap (we ignore the name input).
- * Status:  Stubbed.
- */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <gnu/java/lang/management/VMMemoryPoolMXBeanImpl.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-::java::lang::management::MemoryUsage *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsage(jstring)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsage (::java::lang::String *) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsageThreshold (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsageThreshold (::java::lang::String *) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsageThresholdCount (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsageThresholdCount (::java::lang::String *) not implemented"));
-}
-
-
-JArray< ::java::lang::String *> *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getMemoryManagerNames(jstring)
-{
-  return (JArray<jstring>*)
-    JvNewObjectArray(1, &::java::lang::String::class$, JvNewStringLatin1("BoehmGC"));
-}
-
-
-::java::lang::management::MemoryUsage *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getPeakUsage (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getPeakUsage (::java::lang::String *) not implemented"));
-}
-
-
-::java::lang::String *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getType (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getType (::java::lang::String *) not implemented"));
-}
-
-
-::java::lang::management::MemoryUsage *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsage (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsage (::java::lang::String *) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsageThreshold (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsageThreshold (::java::lang::String *) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsageThresholdCount (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getUsageThresholdCount (::java::lang::String *) not implemented"));
-}
-
-
-jboolean
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::isValid (::java::lang::String *)
-{
-  return true;
-}
-
-
-void
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::resetPeakUsage (::java::lang::String *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::resetPeakUsage (::java::lang::String *) not implemented"));
-}
-
-
-void
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::setCollectionUsageThreshold (::java::lang::String *, jlong)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::setCollectionUsageThreshold (::java::lang::String *, jlong) not implemented"));
-}
-
-
-void
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::setUsageThreshold (::java::lang::String *, jlong)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::setUsageThreshold (::java::lang::String *, jlong) not implemented"));
-}
diff --git a/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc
deleted file mode 100644
index daea76b..0000000
--- a/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-jdouble
-gnu::java::lang::management::VMOperatingSystemMXBeanImpl::getSystemLoadAverage ()
-{
-#ifdef HAVE_GETLOADAVG
-  double avg[1];
-  int nos = getloadavg(avg, 1);
-  if (nos == 1)
-    return avg[0];
-  else
-#endif
-    return -1;
-}
diff --git a/libjava/gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc
deleted file mode 100644
index 331079b..0000000
--- a/libjava/gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
-/**
- * @author Andrew John Hughes <gnu_andrew@member.fsf.org>
- * @date Wed 21 Jun 2006 */
-/* Written using online API docs for JDK 1.5 beta from http://java.sun.com.
- * Status:  Believed complete and correct.
- */
- 
-#include <config.h>
-
-#include <jvm.h>
-
-#include <unistd.h>
-
-#include <gnu/java/lang/management/VMRuntimeMXBeanImpl.h>
-
-JArray<jstring>* gnu::java::lang::management::VMRuntimeMXBeanImpl::getInputArguments()
-{
-  return ::gcj::vmArgs;
-}
-
-jlong gnu::java::lang::management::VMRuntimeMXBeanImpl::getStartTime()
-{
-  return ::gcj::startTime;
-}
-
-jlong gnu::java::lang::management::VMRuntimeMXBeanImpl::getPID()
-{
-  return getpid();
-}
-
-
diff --git a/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc
deleted file mode 100644
index 5d48957..0000000
--- a/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/lang/management/VMThreadMXBeanImpl.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-jlongArray
-gnu::java::lang::management::VMThreadMXBeanImpl::findDeadlockedThreads ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::findDeadlockedThreads () not implemented"));
-}
-
-jlongArray
-gnu::java::lang::management::VMThreadMXBeanImpl::findMonitorDeadlockedThreads ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::findMonitorDeadlockedThreads () not implemented"));
-}
-
-jlong
-gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadCpuTime ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadCpuTime () not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadUserTime ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadUserTime () not implemented"));
-}
-
-void
-gnu::java::lang::management::VMThreadMXBeanImpl::getLockInfo (::java::lang::management::ThreadInfo *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getLockInfo () not implemented"));
-}
-
-void
-gnu::java::lang::management::VMThreadMXBeanImpl::getMonitorInfo (::java::lang::management::ThreadInfo *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getMonitorInfo () not implemented"));
-}
-
-jint
-gnu::java::lang::management::VMThreadMXBeanImpl::getPeakThreadCount ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getPeakThreadCount () not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMThreadMXBeanImpl::getThreadCpuTime (jlong)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getThreadCpuTime (jlong) not implemented"));
-}
-
-
-::java::lang::management::ThreadInfo *
-gnu::java::lang::management::VMThreadMXBeanImpl::getThreadInfoForId (jlong, jint)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getThreadInfoForId (jlong, jint) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMThreadMXBeanImpl::getThreadUserTime (jlong)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getThreadUserTime (jlong) not implemented"));
-}
-
-
-jlong
-gnu::java::lang::management::VMThreadMXBeanImpl::getTotalStartedThreadCount ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getTotalStartedThreadCount () not implemented"));
-}
-
-
-void
-gnu::java::lang::management::VMThreadMXBeanImpl::resetPeakThreadCount ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::resetPeakThreadCount () not implemented"));
-}
diff --git a/libjava/gnu/java/lang/natMainThread.cc b/libjava/gnu/java/lang/natMainThread.cc
deleted file mode 100644
index 5cba247..0000000
--- a/libjava/gnu/java/lang/natMainThread.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-// natMainThread.cc - Implementation of MainThread native methods.
-
-/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <java-threads.h>
-
-#include <gnu/java/lang/MainThread.h>
-#include <java/lang/Runtime.h>
-#include <java/lang/ThreadGroup.h>
-
-typedef void main_func (jobject);
-
-void
-gnu::java::lang::MainThread::call_main (void)
-{
-  Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22);
-  Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4);
-
-  // This is one of the few places where we might have access to an
-  // unlinked class.
-  _Jv_Linker::wait_for_state (klass, JV_STATE_LOADING);
-
-  _Jv_Method *meth = _Jv_LookupDeclaredMethod (klass, main_name,
-					       main_signature);
-
-  // Some checks from Java Spec section 12.1.4.
-  const char *msg = NULL;
-  if (meth == NULL)
-    msg = "no suitable method `main' in class";
-  else if (! ::java::lang::reflect::Modifier::isStatic(meth->accflags))
-    msg = "`main' must be static";
-  else if (! ::java::lang::reflect::Modifier::isPublic(meth->accflags))
-    msg =  "`main' must be public";
-  if (msg != NULL)
-    {
-      fprintf (stderr, "%s\n", msg);
-      ::exit(1);
-    }
-
-  main_func *real_main = (main_func *) meth->ncode;
-  (*real_main) (args);
-
-  // Note that we do thread cleanup here.  We have to do this here and
-  // not in _Jv_RunMain; if we do if after the main thread has exited,
-  // our ThreadGroup will be null, and if Runtime.exit tries to create
-  // a new Thread (which it does when running shutdown hooks), it will
-  // eventually NPE due to this.
-  _Jv_ThreadWait ();
-
-  int status = (int) ::java::lang::ThreadGroup::had_uncaught_exception;
-  ::java::lang::Runtime::exitNoChecksAccessor (status);
-}
diff --git a/libjava/gnu/java/lang/reflect/ClassSignatureParser.h b/libjava/gnu/java/lang/reflect/ClassSignatureParser.h
deleted file mode 100644
index 10c0f4d..0000000
--- a/libjava/gnu/java/lang/reflect/ClassSignatureParser.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_ClassSignatureParser__
-#define __gnu_java_lang_reflect_ClassSignatureParser__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/GenericSignatureParser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class ClassSignatureParser;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::ClassSignatureParser : public ::gnu::java::lang::reflect::GenericSignatureParser
-{
-
-public:
-  ClassSignatureParser(::java::lang::Class *, ::java::lang::String *);
-  virtual JArray< ::java::lang::reflect::TypeVariable * > * getTypeParameters();
-  virtual ::java::lang::reflect::Type * getSuperclassType();
-  virtual JArray< ::java::lang::reflect::Type * > * getInterfaceTypes();
-private:
-  JArray< ::java::lang::reflect::TypeVariable * > * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::GenericSignatureParser)))) typeParameters;
-  ::java::lang::reflect::Type * superclassType;
-  JArray< ::java::lang::reflect::Type * > * interfaceTypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_ClassSignatureParser__
diff --git a/libjava/gnu/java/lang/reflect/FieldSignatureParser.h b/libjava/gnu/java/lang/reflect/FieldSignatureParser.h
deleted file mode 100644
index 58b972a..0000000
--- a/libjava/gnu/java/lang/reflect/FieldSignatureParser.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_FieldSignatureParser__
-#define __gnu_java_lang_reflect_FieldSignatureParser__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/GenericSignatureParser.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class FieldSignatureParser;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::FieldSignatureParser : public ::gnu::java::lang::reflect::GenericSignatureParser
-{
-
-public:
-  FieldSignatureParser(::java::lang::Class *, ::java::lang::String *);
-  ::java::lang::reflect::Type * getFieldType();
-private:
-  ::java::lang::reflect::Type * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::GenericSignatureParser)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_FieldSignatureParser__
diff --git a/libjava/gnu/java/lang/reflect/GenericArrayTypeImpl.h b/libjava/gnu/java/lang/reflect/GenericArrayTypeImpl.h
deleted file mode 100644
index 25a654d..0000000
--- a/libjava/gnu/java/lang/reflect/GenericArrayTypeImpl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_GenericArrayTypeImpl__
-#define __gnu_java_lang_reflect_GenericArrayTypeImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/TypeImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class GenericArrayTypeImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::GenericArrayTypeImpl : public ::gnu::java::lang::reflect::TypeImpl
-{
-
-public: // actually package-private
-  GenericArrayTypeImpl(::java::lang::reflect::Type *);
-  ::java::lang::reflect::Type * resolve();
-public:
-  ::java::lang::reflect::Type * getGenericComponentType();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::reflect::Type * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::TypeImpl)))) componentType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_GenericArrayTypeImpl__
diff --git a/libjava/gnu/java/lang/reflect/GenericSignatureParser.h b/libjava/gnu/java/lang/reflect/GenericSignatureParser.h
deleted file mode 100644
index 22e443b..0000000
--- a/libjava/gnu/java/lang/reflect/GenericSignatureParser.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_GenericSignatureParser__
-#define __gnu_java_lang_reflect_GenericSignatureParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class GenericSignatureParser;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::GenericSignatureParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GenericSignatureParser(::java::lang::reflect::GenericDeclaration *, ::java::lang::ClassLoader *, ::java::lang::String *);
-  virtual JArray< ::java::lang::reflect::TypeVariable * > * readFormalTypeParameters();
-private:
-  ::java::lang::reflect::TypeVariable * readFormalTypeParameter();
-public: // actually package-private
-  virtual ::java::lang::reflect::Type * readFieldTypeSignature();
-  virtual ::java::lang::reflect::Type * readClassTypeSignature();
-private:
-  JArray< ::java::lang::reflect::Type * > * readTypeArguments();
-  ::java::lang::reflect::Type * readTypeArgument();
-public: // actually package-private
-  virtual ::java::lang::reflect::Type * readArrayTypeSignature();
-  virtual ::java::lang::reflect::Type * readTypeVariableSignature();
-private:
-  ::java::lang::String * readIdentifier();
-public: // actually package-private
-  virtual jchar peekChar();
-  virtual jchar readChar();
-  virtual void consume(jchar);
-  virtual void end();
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loader;
-  ::java::lang::reflect::GenericDeclaration * container;
-  ::java::lang::String * signature;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_GenericSignatureParser__
diff --git a/libjava/gnu/java/lang/reflect/MethodSignatureParser.h b/libjava/gnu/java/lang/reflect/MethodSignatureParser.h
deleted file mode 100644
index 3a68469..0000000
--- a/libjava/gnu/java/lang/reflect/MethodSignatureParser.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_MethodSignatureParser__
-#define __gnu_java_lang_reflect_MethodSignatureParser__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/GenericSignatureParser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class MethodSignatureParser;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::MethodSignatureParser : public ::gnu::java::lang::reflect::GenericSignatureParser
-{
-
-public:
-  MethodSignatureParser(::java::lang::reflect::Method *, ::java::lang::String *);
-  MethodSignatureParser(::java::lang::reflect::Constructor *, ::java::lang::String *);
-private:
-  MethodSignatureParser(::java::lang::reflect::GenericDeclaration *, ::java::lang::ClassLoader *, ::java::lang::String *);
-public:
-  virtual JArray< ::java::lang::reflect::TypeVariable * > * getTypeParameters();
-  virtual JArray< ::java::lang::reflect::Type * > * getGenericParameterTypes();
-  virtual ::java::lang::reflect::Type * getGenericReturnType();
-  virtual JArray< ::java::lang::reflect::Type * > * getGenericExceptionTypes();
-private:
-  ::java::lang::reflect::Type * readTypeSignature();
-  JArray< ::java::lang::reflect::TypeVariable * > * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::GenericSignatureParser)))) typeParameters;
-  JArray< ::java::lang::reflect::Type * > * argTypes;
-  ::java::lang::reflect::Type * retType;
-  JArray< ::java::lang::reflect::Type * > * throwsSigs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_MethodSignatureParser__
diff --git a/libjava/gnu/java/lang/reflect/ParameterizedTypeImpl.h b/libjava/gnu/java/lang/reflect/ParameterizedTypeImpl.h
deleted file mode 100644
index 0f43af6..0000000
--- a/libjava/gnu/java/lang/reflect/ParameterizedTypeImpl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_ParameterizedTypeImpl__
-#define __gnu_java_lang_reflect_ParameterizedTypeImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/TypeImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class ParameterizedTypeImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::ParameterizedTypeImpl : public ::gnu::java::lang::reflect::TypeImpl
-{
-
-public: // actually package-private
-  ParameterizedTypeImpl(::java::lang::String *, ::java::lang::ClassLoader *, ::java::lang::reflect::Type *, JArray< ::java::lang::reflect::Type * > *);
-  ::java::lang::reflect::Type * resolve();
-public:
-  JArray< ::java::lang::reflect::Type * > * getActualTypeArguments();
-  ::java::lang::reflect::Type * getRawType();
-  ::java::lang::reflect::Type * getOwnerType();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::TypeImpl)))) rawTypeName;
-  ::java::lang::ClassLoader * loader;
-  ::java::lang::Class * rawType;
-  ::java::lang::reflect::Type * owner;
-  JArray< ::java::lang::reflect::Type * > * typeArgs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_ParameterizedTypeImpl__
diff --git a/libjava/gnu/java/lang/reflect/TypeImpl.h b/libjava/gnu/java/lang/reflect/TypeImpl.h
deleted file mode 100644
index 42c3f3a..0000000
--- a/libjava/gnu/java/lang/reflect/TypeImpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_TypeImpl__
-#define __gnu_java_lang_reflect_TypeImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class TypeImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::TypeImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TypeImpl();
-  virtual ::java::lang::reflect::Type * resolve() = 0;
-  static void resolve(JArray< ::java::lang::reflect::Type * > *);
-  static ::java::lang::reflect::Type * resolve(::java::lang::reflect::Type *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_TypeImpl__
diff --git a/libjava/gnu/java/lang/reflect/TypeSignature.h b/libjava/gnu/java/lang/reflect/TypeSignature.h
deleted file mode 100644
index 8226058..0000000
--- a/libjava/gnu/java/lang/reflect/TypeSignature.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_TypeSignature__
-#define __gnu_java_lang_reflect_TypeSignature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class TypeSignature;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::TypeSignature : public ::java::lang::Object
-{
-
-public:
-  TypeSignature();
-  static ::java::lang::String * getEncodingOfClass(::java::lang::String *, jboolean);
-  static ::java::lang::String * getEncodingOfClass(::java::lang::Class *, jboolean);
-  static ::java::lang::String * getEncodingOfClass(::java::lang::Class *);
-  static ::java::lang::Class * getClassForEncoding(::java::lang::String *, jboolean);
-  static ::java::lang::Class * getClassForEncoding(::java::lang::String *, jboolean, ::java::lang::ClassLoader *);
-  static ::java::lang::Class * getClassForEncoding(::java::lang::String *);
-  static ::java::lang::String * getEncodingOfMethod(::java::lang::reflect::Method *);
-  static ::java::lang::String * getEncodingOfConstructor(::java::lang::reflect::Constructor *);
-  static ::java::lang::String * getEncodingOfMember(::java::lang::reflect::Member *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_TypeSignature__
diff --git a/libjava/gnu/java/lang/reflect/TypeVariableImpl.h b/libjava/gnu/java/lang/reflect/TypeVariableImpl.h
deleted file mode 100644
index 82ac58a..0000000
--- a/libjava/gnu/java/lang/reflect/TypeVariableImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_TypeVariableImpl__
-#define __gnu_java_lang_reflect_TypeVariableImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/TypeImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class TypeVariableImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::TypeVariableImpl : public ::gnu::java::lang::reflect::TypeImpl
-{
-
-public: // actually package-private
-  TypeVariableImpl(::java::lang::reflect::GenericDeclaration *, JArray< ::java::lang::reflect::Type * > *, ::java::lang::String *);
-  ::java::lang::reflect::Type * resolve();
-public:
-  JArray< ::java::lang::reflect::Type * > * getBounds();
-  ::java::lang::reflect::GenericDeclaration * getGenericDeclaration();
-  ::java::lang::String * getName();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::reflect::GenericDeclaration * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::TypeImpl)))) decl;
-  JArray< ::java::lang::reflect::Type * > * bounds;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_TypeVariableImpl__
diff --git a/libjava/gnu/java/lang/reflect/UnresolvedTypeVariable.h b/libjava/gnu/java/lang/reflect/UnresolvedTypeVariable.h
deleted file mode 100644
index 4fec000..0000000
--- a/libjava/gnu/java/lang/reflect/UnresolvedTypeVariable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_UnresolvedTypeVariable__
-#define __gnu_java_lang_reflect_UnresolvedTypeVariable__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/TypeImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class UnresolvedTypeVariable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::UnresolvedTypeVariable : public ::gnu::java::lang::reflect::TypeImpl
-{
-
-public: // actually package-private
-  UnresolvedTypeVariable(::java::lang::reflect::GenericDeclaration *, ::java::lang::String *);
-  ::java::lang::reflect::Type * resolve();
-private:
-  static ::java::lang::reflect::GenericDeclaration * getParent(::java::lang::reflect::GenericDeclaration *);
-  ::java::lang::reflect::GenericDeclaration * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::TypeImpl)))) decl;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_UnresolvedTypeVariable__
diff --git a/libjava/gnu/java/lang/reflect/WildcardTypeImpl.h b/libjava/gnu/java/lang/reflect/WildcardTypeImpl.h
deleted file mode 100644
index b2eb19c..0000000
--- a/libjava/gnu/java/lang/reflect/WildcardTypeImpl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_reflect_WildcardTypeImpl__
-#define __gnu_java_lang_reflect_WildcardTypeImpl__
-
-#pragma interface
-
-#include <gnu/java/lang/reflect/TypeImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace reflect
-        {
-            class WildcardTypeImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::lang::reflect::WildcardTypeImpl : public ::gnu::java::lang::reflect::TypeImpl
-{
-
-public: // actually package-private
-  WildcardTypeImpl(::java::lang::reflect::Type *, ::java::lang::reflect::Type *);
-  ::java::lang::reflect::Type * resolve();
-public:
-  JArray< ::java::lang::reflect::Type * > * getUpperBounds();
-  JArray< ::java::lang::reflect::Type * > * getLowerBounds();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::reflect::Type * __attribute__((aligned(__alignof__( ::gnu::java::lang::reflect::TypeImpl)))) lower;
-  ::java::lang::reflect::Type * upper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_reflect_WildcardTypeImpl__
diff --git a/libjava/gnu/java/locale/LocaleData.h b/libjava/gnu/java/locale/LocaleData.h
deleted file mode 100644
index ab983a5..0000000
--- a/libjava/gnu/java/locale/LocaleData.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleData__
-#define __gnu_java_locale_LocaleData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleData;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleData : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LocaleData();
-public:
-  static JArray< ::java::lang::String * > * localeNames;
-  static JArray< ::java::lang::String * > * collatorLocaleNames;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleData__
diff --git a/libjava/gnu/java/locale/LocaleHelper.h b/libjava/gnu/java/locale/LocaleHelper.h
deleted file mode 100644
index c96dc33..0000000
--- a/libjava/gnu/java/locale/LocaleHelper.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleHelper__
-#define __gnu_java_locale_LocaleHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleHelper;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleHelper : public ::java::lang::Object
-{
-
-public:
-  LocaleHelper();
-  static ::java::util::Locale * getFallbackLocale(::java::util::Locale *);
-  static JArray< ::java::util::Locale * > * getCollatorLocales();
-  static jint getLocaleCount();
-  static ::java::lang::String * getLocaleName(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleHelper__
diff --git a/libjava/gnu/java/math/Fixed.h b/libjava/gnu/java/math/Fixed.h
deleted file mode 100644
index 18f522e..0000000
--- a/libjava/gnu/java/math/Fixed.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_math_Fixed__
-#define __gnu_java_math_Fixed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace math
-      {
-          class Fixed;
-      }
-    }
-  }
-}
-
-class gnu::java::math::Fixed : public ::java::lang::Object
-{
-
-  Fixed();
-public:
-  static jint div(jint, jint, jint);
-  static jint mul(jint, jint, jint);
-  static jint ceil(jint, jint);
-  static jint floor(jint, jint);
-  static jint trunc(jint, jint);
-  static jint round(jint, jint);
-  static jfloat floatValue(jint, jint);
-  static jdouble doubleValue(jint, jint);
-  static jint fixedValue(jint, jfloat);
-  static jint fixedValue(jint, jdouble);
-  static jint intValue(jint, jint);
-  static jint roundIntValue(jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_math_Fixed__
diff --git a/libjava/gnu/java/math/GMP.h b/libjava/gnu/java/math/GMP.h
deleted file mode 100644
index b038f10..0000000
--- a/libjava/gnu/java/math/GMP.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_math_GMP__
-#define __gnu_java_math_GMP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace math
-      {
-          class GMP;
-      }
-    }
-  }
-}
-
-class gnu::java::math::GMP : public ::java::lang::Object
-{
-
-public:
-  GMP();
-private:
-  void acquireRef();
-  void releaseRef();
-public: // actually protected
-  void finalize();
-public:
-  void fromByteArray(JArray< jbyte > *);
-  void fromBI(::gnu::java::math::GMP *);
-  void fromLong(jlong);
-  jint fromString(::java::lang::String *, jint);
-  void fromSignedMagnitude(JArray< jbyte > *, jboolean);
-  ::java::lang::String * toString(jint);
-  void toByteArray(JArray< jbyte > *);
-  jdouble doubleValue();
-  jint absIntValue();
-  jint compare(::gnu::java::math::GMP *);
-  void add(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void subtract(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void multiply(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void quotient(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void remainder(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void quotientAndRemainder(::gnu::java::math::GMP *, ::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void modulo(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void pow(jint, ::gnu::java::math::GMP *);
-  void modPow(::gnu::java::math::GMP *, ::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void modInverse(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void gcd(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void shiftLeft(jint, ::gnu::java::math::GMP *);
-  void shiftRight(jint, ::gnu::java::math::GMP *);
-  void abs(::gnu::java::math::GMP *);
-  void negate(::gnu::java::math::GMP *);
-  jint bitLength();
-  jint bitCount();
-  void and$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void or$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void xor$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void andNot(::gnu::java::math::GMP *, ::gnu::java::math::GMP *);
-  void not$(::gnu::java::math::GMP *);
-  void flipBit(jint, ::gnu::java::math::GMP *);
-  jint testBit(jint);
-  void setBit(jint, jboolean, ::gnu::java::math::GMP *);
-  jint testPrimality(jint);
-  jint lowestSetBit();
-  static void natInitializeLibrary();
-private:
-  void natInitialize();
-  void natFinalize();
-  void natFromLong(jlong);
-  void natFromBI(::gnu::classpath::Pointer *);
-  void natFromByteArray(JArray< jbyte > *);
-  jint natFromString(::java::lang::String *, jint);
-  void natFromSignedMagnitude(JArray< jbyte > *, jboolean);
-  ::java::lang::String * natToString(jint);
-  void natToByteArray(JArray< jbyte > *);
-  jint natAbsIntValue();
-  jdouble natDoubleValue();
-  jint natCompare(::gnu::classpath::Pointer *);
-  void natAdd(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natSubtract(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natMultiply(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natQuotient(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natRemainder(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natQuotientAndRemainder(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natModulo(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natPow(jint, ::gnu::classpath::Pointer *);
-  void natModPow(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natModInverse(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natGCD(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  jint natTestPrimality(jint);
-  void natShiftLeft(jint, ::gnu::classpath::Pointer *);
-  void natShiftRight(jint, ::gnu::classpath::Pointer *);
-  jint natLowestSetBit();
-  void natAbs(::gnu::classpath::Pointer *);
-  void natNegate(::gnu::classpath::Pointer *);
-  jint natBitLength();
-  jint natSetBitCount();
-  void natXor(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natOr(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natAnd(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natAndNot(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *);
-  void natFlipBit(jint, ::gnu::classpath::Pointer *);
-  jint natTestBit(jint);
-  void natSetBit(jint, jboolean, ::gnu::classpath::Pointer *);
-  void natNot(::gnu::classpath::Pointer *);
-  ::gnu::classpath::Pointer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) native_ptr;
-  jint refCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_math_GMP__
diff --git a/libjava/gnu/java/math/MPN.h b/libjava/gnu/java/math/MPN.h
deleted file mode 100644
index 50289ab..0000000
--- a/libjava/gnu/java/math/MPN.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_math_MPN__
-#define __gnu_java_math_MPN__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace math
-      {
-          class MPN;
-      }
-    }
-  }
-}
-
-class gnu::java::math::MPN : public ::java::lang::Object
-{
-
-public:
-  MPN();
-  static jint add_1(JArray< jint > *, JArray< jint > *, jint, jint);
-  static jint add_n(JArray< jint > *, JArray< jint > *, JArray< jint > *, jint);
-  static jint sub_n(JArray< jint > *, JArray< jint > *, JArray< jint > *, jint);
-  static jint mul_1(JArray< jint > *, JArray< jint > *, jint, jint);
-  static void mul(JArray< jint > *, JArray< jint > *, jint, JArray< jint > *, jint);
-  static jlong udiv_qrnnd(jlong, jint);
-  static jint divmod_1(JArray< jint > *, JArray< jint > *, jint, jint);
-  static jint submul_1(JArray< jint > *, jint, JArray< jint > *, jint, jint);
-  static void divide(JArray< jint > *, jint, JArray< jint > *, jint);
-  static jint chars_per_word(jint);
-  static jint count_leading_zeros(jint);
-  static jint set_str(JArray< jint > *, JArray< jbyte > *, jint, jint);
-  static jint cmp(JArray< jint > *, JArray< jint > *, jint);
-  static jint cmp(JArray< jint > *, jint, JArray< jint > *, jint);
-  static jint rshift(JArray< jint > *, JArray< jint > *, jint, jint, jint);
-  static void rshift0(JArray< jint > *, JArray< jint > *, jint, jint, jint);
-  static jlong rshift_long(JArray< jint > *, jint, jint);
-  static jint lshift(JArray< jint > *, jint, JArray< jint > *, jint, jint);
-  static jint findLowestBit(jint);
-  static jint findLowestBit(JArray< jint > *);
-  static jint gcd(JArray< jint > *, JArray< jint > *, jint);
-  static jint intLength(jint);
-  static jint intLength(JArray< jint > *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_math_MPN__
diff --git a/libjava/gnu/java/net/CRLFInputStream.h b/libjava/gnu/java/net/CRLFInputStream.h
deleted file mode 100644
index 1c4df5c..0000000
--- a/libjava/gnu/java/net/CRLFInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_CRLFInputStream__
-#define __gnu_java_net_CRLFInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class CRLFInputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::net::CRLFInputStream : public ::java::io::InputStream
-{
-
-public:
-  CRLFInputStream(::java::io::InputStream *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  jint indexOfCRLF(JArray< jbyte > *, jint, jint);
-public:
-  static const jint CR = 13;
-  static const jint LF = 10;
-public: // actually protected
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-private:
-  jboolean doReset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_CRLFInputStream__
diff --git a/libjava/gnu/java/net/CRLFOutputStream.h b/libjava/gnu/java/net/CRLFOutputStream.h
deleted file mode 100644
index 594d7ae..0000000
--- a/libjava/gnu/java/net/CRLFOutputStream.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_CRLFOutputStream__
-#define __gnu_java_net_CRLFOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class CRLFOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::net::CRLFOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  CRLFOutputStream(::java::io::OutputStream *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(::java::lang::String *);
-  virtual void writeln();
-public: // actually package-private
-  static ::java::lang::String * US_ASCII;
-public:
-  static const jint CR = 13;
-  static const jint LF = 10;
-  static JArray< jbyte > * CRLF;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) last;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_CRLFOutputStream__
diff --git a/libjava/gnu/java/net/DefaultContentHandlerFactory.h b/libjava/gnu/java/net/DefaultContentHandlerFactory.h
deleted file mode 100644
index 06c3f6f..0000000
--- a/libjava/gnu/java/net/DefaultContentHandlerFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_DefaultContentHandlerFactory__
-#define __gnu_java_net_DefaultContentHandlerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class DefaultContentHandlerFactory;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ContentHandler;
-    }
-  }
-}
-
-class gnu::java::net::DefaultContentHandlerFactory : public ::java::lang::Object
-{
-
-public:
-  DefaultContentHandlerFactory();
-  virtual ::java::net::ContentHandler * createContentHandler(::java::lang::String *);
-private:
-  static JArray< ::java::lang::String * > * known_image_types;
-  static ::java::util::HashSet * imageTypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_DefaultContentHandlerFactory__
diff --git a/libjava/gnu/java/net/DefaultProxySelector.h b/libjava/gnu/java/net/DefaultProxySelector.h
deleted file mode 100644
index 11a4fce..0000000
--- a/libjava/gnu/java/net/DefaultProxySelector.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_DefaultProxySelector__
-#define __gnu_java_net_DefaultProxySelector__
-
-#pragma interface
-
-#include <java/net/ProxySelector.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class DefaultProxySelector;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class SocketAddress;
-        class URI;
-    }
-  }
-}
-
-class gnu::java::net::DefaultProxySelector : public ::java::net::ProxySelector
-{
-
-public:
-  DefaultProxySelector();
-  void connectFailed(::java::net::URI *, ::java::net::SocketAddress *, ::java::io::IOException *);
-  ::java::util::List * select(::java::net::URI *);
-private:
-  static ::java::util::List * proxies;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_DefaultProxySelector__
diff --git a/libjava/gnu/java/net/EmptyX509TrustManager.h b/libjava/gnu/java/net/EmptyX509TrustManager.h
deleted file mode 100644
index df08b81..0000000
--- a/libjava/gnu/java/net/EmptyX509TrustManager.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_EmptyX509TrustManager__
-#define __gnu_java_net_EmptyX509TrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class EmptyX509TrustManager;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::net::EmptyX509TrustManager : public ::java::lang::Object
-{
-
-public:
-  EmptyX509TrustManager();
-  virtual void checkClientTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *);
-  virtual void checkServerTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *);
-  virtual JArray< ::java::security::cert::X509Certificate * > * getAcceptedIssuers();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_EmptyX509TrustManager__
diff --git a/libjava/gnu/java/net/GetLocalHostAction.h b/libjava/gnu/java/net/GetLocalHostAction.h
deleted file mode 100644
index f0d0880..0000000
--- a/libjava/gnu/java/net/GetLocalHostAction.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_GetLocalHostAction__
-#define __gnu_java_net_GetLocalHostAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class GetLocalHostAction;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-}
-
-class gnu::java::net::GetLocalHostAction : public ::java::lang::Object
-{
-
-public:
-  GetLocalHostAction();
-  virtual ::java::net::InetAddress * GetLocalHostAction$run();
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_GetLocalHostAction__
diff --git a/libjava/gnu/java/net/HeaderFieldHelper.h b/libjava/gnu/java/net/HeaderFieldHelper.h
deleted file mode 100644
index ace6678..0000000
--- a/libjava/gnu/java/net/HeaderFieldHelper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_HeaderFieldHelper__
-#define __gnu_java_net_HeaderFieldHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class HeaderFieldHelper;
-      }
-    }
-  }
-}
-
-class gnu::java::net::HeaderFieldHelper : public ::java::lang::Object
-{
-
-public:
-  HeaderFieldHelper();
-  HeaderFieldHelper(jint);
-  virtual void addHeaderField(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getHeaderFieldKeyByIndex(jint);
-  virtual ::java::lang::String * getHeaderFieldValueByIndex(jint);
-  virtual ::java::lang::String * getHeaderFieldValueByKey(::java::lang::String *);
-  virtual ::java::util::Map * getHeaderFields();
-  virtual jint getNumberOfEntries();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) headerFieldKeys;
-  ::java::util::Vector * headerFieldValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_HeaderFieldHelper__
diff --git a/libjava/gnu/java/net/ImageHandler.h b/libjava/gnu/java/net/ImageHandler.h
deleted file mode 100644
index 41aba92..0000000
--- a/libjava/gnu/java/net/ImageHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_ImageHandler__
-#define __gnu_java_net_ImageHandler__
-
-#pragma interface
-
-#include <java/net/ContentHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class ImageHandler;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::ImageHandler : public ::java::net::ContentHandler
-{
-
-public: // actually package-private
-  ImageHandler();
-public:
-  virtual ::java::lang::Object * getContent(::java::net::URLConnection *);
-public: // actually package-private
-  static ::gnu::java::net::ImageHandler * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_ImageHandler__
diff --git a/libjava/gnu/java/net/IndexListParser.h b/libjava/gnu/java/net/IndexListParser.h
deleted file mode 100644
index 2bbeec1..0000000
--- a/libjava/gnu/java/net/IndexListParser.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_IndexListParser__
-#define __gnu_java_net_IndexListParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class IndexListParser;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::IndexListParser : public ::java::lang::Object
-{
-
-public:
-  IndexListParser(::java::util::jar::JarFile *, ::java::net::URL *, ::java::net::URL *);
-public: // actually package-private
-  virtual void clearAll();
-public:
-  virtual ::java::lang::String * getVersionInfo();
-  virtual jdouble getVersionNumber();
-  virtual ::java::util::LinkedHashMap * getHeaders();
-  static ::java::lang::String * JAR_INDEX_FILE;
-  static ::java::lang::String * JAR_INDEX_VERSION_KEY;
-public: // actually package-private
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) versionNumber;
-  ::java::util::LinkedHashMap * prefixes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_IndexListParser__
diff --git a/libjava/gnu/java/net/LineInputStream.h b/libjava/gnu/java/net/LineInputStream.h
deleted file mode 100644
index 194847e..0000000
--- a/libjava/gnu/java/net/LineInputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_LineInputStream__
-#define __gnu_java_net_LineInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class LineInputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::net::LineInputStream : public ::java::io::InputStream
-{
-
-public:
-  LineInputStream(::java::io::InputStream *);
-  LineInputStream(::java::io::InputStream *, ::java::lang::String *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * readLine();
-private:
-  jint indexOf(JArray< jbyte > *, jint, jbyte);
-public: // actually protected
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-private:
-  ::java::io::ByteArrayOutputStream * buf;
-  ::java::lang::String * encoding;
-  jboolean eof;
-  jboolean blockReads;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_LineInputStream__
diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.h b/libjava/gnu/java/net/PlainDatagramSocketImpl.h
deleted file mode 100644
index c57296f..0000000
--- a/libjava/gnu/java/net/PlainDatagramSocketImpl.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_PlainDatagramSocketImpl__
-#define __gnu_java_net_PlainDatagramSocketImpl__
-
-#pragma interface
-
-#include <java/net/DatagramSocketImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainDatagramSocketImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramPacket;
-        class InetAddress;
-        class NetworkInterface;
-        class SocketAddress;
-    }
-  }
-}
-
-class gnu::java::net::PlainDatagramSocketImpl : public ::java::net::DatagramSocketImpl
-{
-
-public:
-  PlainDatagramSocketImpl();
-public: // actually protected
-  void finalize();
-public:
-  jint getNativeFD();
-public: // actually protected
-  void bind(jint, ::java::net::InetAddress *);
-  void connect(::java::net::InetAddress *, jint);
-  void disconnect();
-  void create();
-  jint peek(::java::net::InetAddress *);
-  jint peekData(::java::net::DatagramPacket *);
-  void setTimeToLive(jint);
-  jint getTimeToLive();
-  void send(::java::net::DatagramPacket *);
-  void receive(::java::net::DatagramPacket *);
-public:
-  void setOption(jint, ::java::lang::Object *);
-  ::java::lang::Object * getOption(jint);
-private:
-  void mcastGrp(::java::net::InetAddress *, ::java::net::NetworkInterface *, jboolean);
-public: // actually protected
-  void close();
-  jbyte getTTL();
-  void setTTL(jbyte);
-  void join(::java::net::InetAddress *);
-  void leave(::java::net::InetAddress *);
-  void joinGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *);
-  void leaveGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *);
-public: // actually package-private
-  static const jint _Jv_TCP_NODELAY_ = 1;
-  static const jint _Jv_SO_BINDADDR_ = 15;
-  static const jint _Jv_SO_REUSEADDR_ = 4;
-  static const jint _Jv_SO_BROADCAST_ = 32;
-  static const jint _Jv_SO_OOBINLINE_ = 4099;
-  static const jint _Jv_IP_MULTICAST_IF_ = 16;
-  static const jint _Jv_IP_MULTICAST_IF2_ = 31;
-  static const jint _Jv_IP_MULTICAST_LOOP_ = 18;
-  static const jint _Jv_IP_TOS_ = 3;
-  static const jint _Jv_SO_LINGER_ = 128;
-  static const jint _Jv_SO_TIMEOUT_ = 4102;
-  static const jint _Jv_SO_SNDBUF_ = 4097;
-  static const jint _Jv_SO_RCVBUF_ = 4098;
-  static const jint _Jv_SO_KEEPALIVE_ = 8;
-  jint __attribute__((aligned(__alignof__( ::java::net::DatagramSocketImpl)))) native_fd;
-private:
-  ::java::lang::Object * RECEIVE_LOCK;
-  ::java::lang::Object * SEND_LOCK;
-public: // actually package-private
-  ::java::net::InetAddress * localAddress;
-  jint timeout;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_PlainDatagramSocketImpl__
diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java
deleted file mode 100644
index 08c1cb3..0000000
--- a/libjava/gnu/java/net/PlainDatagramSocketImpl.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/* PlainDatagramSocketImpl.java -- Default DatagramSocket implementation
-   Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005, 2007  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.net;
-
-import gnu.classpath.Configuration;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocketImpl;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketOptions;
-
-/**
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * Status:  Believed complete and correct.
- */
-
-/**
- * This is the default socket implementation for datagram sockets.
- * It makes native calls to C routines that implement BSD style
- * SOCK_DGRAM sockets in the AF_INET family.
- *
- * @author Aaron M. Renn (arenn@urbanophile.com)
- * @author Warren Levy (warrenl@cygnus.com)
- */
-public final class PlainDatagramSocketImpl extends DatagramSocketImpl
-{
-  // Static initializer to load native library
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary("javanet");
-      }
-  }
-  
-  // These fields are mirrored for use in native code to avoid cpp conflicts
-  // when the #defines in system header files are the same as the public fields.
-  static final int _Jv_TCP_NODELAY_ = SocketOptions.TCP_NODELAY,
-                   _Jv_SO_BINDADDR_ = SocketOptions.SO_BINDADDR,
-                   _Jv_SO_REUSEADDR_ = SocketOptions.SO_REUSEADDR,
-                   _Jv_SO_BROADCAST_ = SocketOptions.SO_BROADCAST,
-                   _Jv_SO_OOBINLINE_ = SocketOptions.SO_OOBINLINE,
-                   _Jv_IP_MULTICAST_IF_ = SocketOptions.IP_MULTICAST_IF,
-                   _Jv_IP_MULTICAST_IF2_ = SocketOptions.IP_MULTICAST_IF2,
-                   _Jv_IP_MULTICAST_LOOP_ = SocketOptions.IP_MULTICAST_LOOP,
-                   _Jv_IP_TOS_ = SocketOptions.IP_TOS,
-                   _Jv_SO_LINGER_ = SocketOptions.SO_LINGER,
-                   _Jv_SO_TIMEOUT_ = SocketOptions.SO_TIMEOUT,
-                   _Jv_SO_SNDBUF_ = SocketOptions.SO_SNDBUF,
-                   _Jv_SO_RCVBUF_ = SocketOptions.SO_RCVBUF,
-                   _Jv_SO_KEEPALIVE_ = SocketOptions.SO_KEEPALIVE;
-
-  /**
-   * This is the actual underlying file descriptor
-   */
-  int native_fd = -1;
-  
-  /**
-   * Lock object to serialize threads wanting to receive 
-   */
-  private final Object RECEIVE_LOCK = new Object();
-  
-  /**
-   * Lock object to serialize threads wanting to send 
-   */
-  private final Object SEND_LOCK = new Object();
-
-  // FIXME: Is this necessary?  Could it help w/ DatagramSocket.getLocalAddress?
-  // InetAddress address;
-  
-  // localAddress cache  
-  InetAddress localAddress;
-
-  // 'timeout' is set/read by setOption/getOption.
-  int timeout = 0;
-
-  /**
-   * Default do nothing constructor
-   */
-  public PlainDatagramSocketImpl() throws IOException
-  {
-  }
-
-  protected void finalize() throws Throwable
-  {
-    synchronized (this)
-      {
-	if (native_fd != -1)
-	  close();
-      }
-    super.finalize();
-  }
-
-  public int getNativeFD()
-  {
-    return native_fd;
-  }
-
-  /**
-   * Binds this socket to a particular port and interface
-   *
-   * @param port The port to bind to
-   * @param addr The address to bind to
-   *
-   * @exception SocketException If an error occurs
-   */
-  protected native void bind(int port, InetAddress addr)
-    throws SocketException;
-
-  protected native void connect(InetAddress addr, int port)
-    throws SocketException;
-  
-  protected native void disconnect();
-  
-  /**
-   * Creates a new datagram socket
-   *
-   * @exception SocketException If an error occurs
-   */
-  protected native void create() throws SocketException;
-  
-  protected native int peek(InetAddress addr) throws IOException;
-  
-  protected native int peekData(DatagramPacket packet) throws IOException;
-
-  /**
-   * Sets the Time to Live value for the socket
-   *
-   * @param ttl The new TTL value
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native void setTimeToLive(int ttl) throws IOException;
-
-  /**
-   * Gets the Time to Live value for the socket
-   *
-   * @return The TTL value
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native int getTimeToLive() throws IOException;
-
-  /**
-   * Sends a packet of data to a remote host
-   *
-   * @param packet The packet to send
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native void send(DatagramPacket packet) throws IOException;
-
-  /**
-   * Receives a UDP packet from the network
-   *
-   * @param packet The packet to fill in with the data received
-   *
-   * @exception IOException IOException If an error occurs
-   */
-  protected native void receive(DatagramPacket packet) throws IOException;
-
-  /**
-   * Sets the value of an option on the socket
-   *
-   * @param option_id The identifier of the option to set
-   * @param val The value of the option to set
-   *
-   * @exception SocketException If an error occurs
-   */
-  public native void setOption(int option_id, Object val)
-    throws SocketException;
-
-  /**
-   * Retrieves the value of an option on the socket
-   *
-   * @param option_id The identifier of the option to retrieve
-   *
-   * @return The value of the option
-   *
-   * @exception SocketException If an error occurs
-   */
-  public native Object getOption(int option_id)
-    throws SocketException;
-
-  /**
-   * Joins or leaves a broadcasting group on a given network interface.
-   * If the network interface is <code>null</code> the group is join/left on
-   * all locale network interfaces.
-   * 
-   * @param inetAddr The broadcast address.
-   * @param netIf The network interface to join the group on.
-   * @param join True to join a broadcasting group, fals to leave it.
-   *
-   * @exception IOException If an error occurs.
-   */
-  private native void mcastGrp(InetAddress inetAddr, NetworkInterface netIf,
-		               boolean join)
-    throws IOException;
-
-  /**
-   * Closes the socket
-   */
-  protected native void close();
-
-  /**
-   * Gets the Time to Live value for the socket
-   *
-   * @return The TTL value
-   *
-   * @exception IOException If an error occurs
-   *
-   * @deprecated 1.2
-   */
-  protected byte getTTL() throws IOException
-  {
-    return (byte) getTimeToLive();
-  }
-
-  /**
-   * Sets the Time to Live value for the socket
-   *
-   * @param ttl The new TTL value
-   *
-   * @exception IOException If an error occurs
-   *
-   * @deprecated 1.2
-   */
-  protected void setTTL(byte ttl) throws IOException
-  {
-    setTimeToLive(((int) ttl) & 0xFF);
-  }
-
-  /**
-   * Joins a multicast group
-   *
-   * @param addr The group to join
-   *
-   * @exception IOException If an error occurs
-   */
-  protected void join(InetAddress addr) throws IOException
-  {
-    mcastGrp(addr, null, true);
-  }
-
-  /**
-   * Leaves a multicast group
-   *
-   * @param addr The group to leave
-   *
-   * @exception IOException If an error occurs
-   */
-  protected void leave(InetAddress addr) throws IOException
-  {
-    mcastGrp(addr, null, false);
-  }
-
-  protected void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
-    throws IOException
-  {
-    mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, true);
-  }
-
-  protected void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf)
-    throws IOException
-  {
-    mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, false);
-  }
-}
diff --git a/libjava/gnu/java/net/PlainSocketImpl$SocketInputStream.h b/libjava/gnu/java/net/PlainSocketImpl$SocketInputStream.h
deleted file mode 100644
index 83ac40c..0000000
--- a/libjava/gnu/java/net/PlainSocketImpl$SocketInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_PlainSocketImpl$SocketInputStream__
-#define __gnu_java_net_PlainSocketImpl$SocketInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-          class PlainSocketImpl$SocketInputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::net::PlainSocketImpl$SocketInputStream : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  PlainSocketImpl$SocketInputStream(::gnu::java::net::PlainSocketImpl *);
-public:
-  jint available();
-  void close();
-  jint read();
-  jint read(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  ::gnu::java::net::PlainSocketImpl * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_PlainSocketImpl$SocketInputStream__
diff --git a/libjava/gnu/java/net/PlainSocketImpl$SocketOutputStream.h b/libjava/gnu/java/net/PlainSocketImpl$SocketOutputStream.h
deleted file mode 100644
index 852e894..0000000
--- a/libjava/gnu/java/net/PlainSocketImpl$SocketOutputStream.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_PlainSocketImpl$SocketOutputStream__
-#define __gnu_java_net_PlainSocketImpl$SocketOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-          class PlainSocketImpl$SocketOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::net::PlainSocketImpl$SocketOutputStream : public ::java::io::OutputStream
-{
-
-public: // actually package-private
-  PlainSocketImpl$SocketOutputStream(::gnu::java::net::PlainSocketImpl *);
-public:
-  void close();
-  void write(jint);
-  void write(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  ::gnu::java::net::PlainSocketImpl * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_PlainSocketImpl$SocketOutputStream__
diff --git a/libjava/gnu/java/net/PlainSocketImpl.h b/libjava/gnu/java/net/PlainSocketImpl.h
deleted file mode 100644
index d907871..0000000
--- a/libjava/gnu/java/net/PlainSocketImpl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_PlainSocketImpl__
-#define __gnu_java_net_PlainSocketImpl__
-
-#pragma interface
-
-#include <java/net/SocketImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class InetSocketAddress;
-        class SocketAddress;
-        class SocketImpl;
-    }
-  }
-}
-
-class gnu::java::net::PlainSocketImpl : public ::java::net::SocketImpl
-{
-
-public:
-  jboolean isInChannelOperation();
-  void setInChannelOperation(jboolean);
-  PlainSocketImpl();
-public: // actually protected
-  void finalize();
-public:
-  jint getNativeFD();
-  void setOption(jint, ::java::lang::Object *);
-  ::java::lang::Object * getOption(jint);
-  void shutdownInput();
-  void shutdownOutput();
-  void create(jboolean);
-public: // actually protected
-  void connect(::java::lang::String *, jint);
-  void connect(::java::net::InetAddress *, jint);
-  void connect(::java::net::SocketAddress *, jint);
-  void bind(::java::net::InetAddress *, jint);
-  void listen(jint);
-  void accept(::java::net::SocketImpl *);
-private:
-  void accept(::gnu::java::net::PlainSocketImpl *);
-public: // actually protected
-  jint available();
-  void close();
-  void sendUrgentData(jint);
-public:
-  ::java::net::InetSocketAddress * getLocalAddress();
-public: // actually protected
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-public: // actually package-private
-  static const jint _Jv_TCP_NODELAY_ = 1;
-  static const jint _Jv_SO_BINDADDR_ = 15;
-  static const jint _Jv_SO_REUSEADDR_ = 4;
-  static const jint _Jv_SO_BROADCAST_ = 32;
-  static const jint _Jv_SO_OOBINLINE_ = 4099;
-  static const jint _Jv_IP_MULTICAST_IF_ = 16;
-  static const jint _Jv_IP_MULTICAST_IF2_ = 31;
-  static const jint _Jv_IP_MULTICAST_LOOP_ = 18;
-  static const jint _Jv_IP_TOS_ = 3;
-  static const jint _Jv_SO_LINGER_ = 128;
-  static const jint _Jv_SO_TIMEOUT_ = 4102;
-  static const jint _Jv_SO_SNDBUF_ = 4097;
-  static const jint _Jv_SO_RCVBUF_ = 4098;
-  static const jint _Jv_SO_KEEPALIVE_ = 8;
-  jint __attribute__((aligned(__alignof__( ::java::net::SocketImpl)))) native_fd;
-  jint timeout;
-  ::java::net::InetAddress * localAddress;
-  ::java::net::InetSocketAddress * localSocketAddress;
-private:
-  ::java::io::InputStream * in;
-  ::java::io::OutputStream * out;
-  jboolean inChannelOperation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_PlainSocketImpl__
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java
deleted file mode 100644
index d2c8f02..0000000
--- a/libjava/gnu/java/net/PlainSocketImpl.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/* PlainSocketImpl.java -- Default socket implementation
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.net;
-
-import gnu.classpath.Configuration;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketImpl;
-import java.net.SocketOptions;
-
-/**
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * Status:  Believed complete and correct.
- */
-
-/**
- * Unless the application installs its own SocketImplFactory, this is the
- * default socket implemetation that will be used.  It simply uses a
- * combination of Java and native routines to implement standard BSD
- * style sockets of family AF_INET and types SOCK_STREAM and SOCK_DGRAM
- *
- * @author Per Bothner (bothner@cygnus.com)
- * @author Nic Ferrier (nferrier@tapsellferrier.co.uk)
- * @author Aaron M. Renn (arenn@urbanophile.com)
- */
-public final class PlainSocketImpl extends SocketImpl
-{
-  // Static initializer to load native library.
-  static
-    {
-      if (Configuration.INIT_LOAD_LIBRARY)
-        {
-          System.loadLibrary("javanet");
-        }
-    }
-  
-  // These fields are mirrored for use in native code to avoid cpp conflicts
-  // when the #defines in system header files are the same as the public fields.
-  static final int _Jv_TCP_NODELAY_ = SocketOptions.TCP_NODELAY,
-                   _Jv_SO_BINDADDR_ = SocketOptions.SO_BINDADDR,
-                   _Jv_SO_REUSEADDR_ = SocketOptions.SO_REUSEADDR,
-                   _Jv_SO_BROADCAST_ = SocketOptions.SO_BROADCAST,
-                   _Jv_SO_OOBINLINE_ = SocketOptions.SO_OOBINLINE,
-                   _Jv_IP_MULTICAST_IF_ = SocketOptions.IP_MULTICAST_IF,
-                   _Jv_IP_MULTICAST_IF2_ = SocketOptions.IP_MULTICAST_IF2,
-                   _Jv_IP_MULTICAST_LOOP_ = SocketOptions.IP_MULTICAST_LOOP,
-                   _Jv_IP_TOS_ = SocketOptions.IP_TOS,
-                   _Jv_SO_LINGER_ = SocketOptions.SO_LINGER,
-                   _Jv_SO_TIMEOUT_ = SocketOptions.SO_TIMEOUT,
-                   _Jv_SO_SNDBUF_ = SocketOptions.SO_SNDBUF,
-                   _Jv_SO_RCVBUF_ = SocketOptions.SO_RCVBUF,
-                   _Jv_SO_KEEPALIVE_ = SocketOptions.SO_KEEPALIVE;
-
-  /**
-   * The OS file handle representing the socket.
-   * This is used for reads and writes to/from the socket and
-   * to close it.
-   *
-   * When the socket is closed this is reset to -1.
-   */
-  int native_fd = -1;
-
-  // This value is set/read by setOption/getOption.
-  int timeout = 0;
-  
-  // localAddress cache
-  InetAddress localAddress;
-
-  // Local address as an InetSocketAddress.
-  InetSocketAddress localSocketAddress;
-
-  /**
-   * A cached copy of the in stream for reading from the socket.
-   */
-  private InputStream in;
-
-  /**
-   * A cached copy of the out stream for writing to the socket.
-   */
-  private OutputStream out;
-
-  /**
-   * Indicates whether a channel initiated whatever operation
-   * is being invoked on this socket.
-   */
-  private boolean inChannelOperation;
-
-  /**
-   * Indicates whether we should ignore whether any associated
-   * channel is set to non-blocking mode. Certain operations
-   * throw an <code>IllegalBlockingModeException</code> if the
-   * associated channel is in non-blocking mode, <i>except</i>
-   * if the operation is invoked by the channel itself.
-   */
-  public final boolean isInChannelOperation()
-  {
-    return inChannelOperation;
-  }
-  
-  /**
-   * Sets our indicator of whether an I/O operation is being
-   * initiated by a channel.
-   */
-  public final void setInChannelOperation(boolean b)
-  {
-    inChannelOperation = b;
-  }
- 
-  /**
-   * Default do nothing constructor
-   */
-  public PlainSocketImpl()
-  {
-  }
-  
-  protected void finalize() throws Throwable
-  {
-    synchronized (this)
-      {
-	if (native_fd != -1)
-	  try
-	    {
-	      close();
-	    }
-	  catch (IOException ex)
-	    {
-	    }
-      }
-    super.finalize();
-  }
-
-  public int getNativeFD()
-  {
-    return native_fd;
-  }
-
-  /**
-   * Sets the specified option on a socket to the passed in object.  For
-   * options that take an integer argument, the passed in object is an
-   * Integer.  The option_id parameter is one of the defined constants in
-   * this interface.
-   *
-   * @param option_id The identifier of the option
-   * @param val The value to set the option to
-   *
-   * @exception SocketException If an error occurs
-   */
-  public native void setOption(int optID, Object value) throws SocketException;
-
-  /**
-   * Returns the current setting of the specified option.  The Object returned
-   * will be an Integer for options that have integer values.  The option_id
-   * is one of the defined constants in this interface.
-   *
-   * @param option_id The option identifier
-   *
-   * @return The current value of the option
-   *
-   * @exception SocketException If an error occurs
-   */
-  public native Object getOption(int optID) throws SocketException;
-
-  /**
-   * Flushes the input stream and closes it. If you read from the input stream
-   * after calling this method a <code>IOException</code> will be thrown.
-   * 
-   * @throws IOException if an error occurs
-   */
-  public native void shutdownInput() throws IOException;
-
-  /**
-   * Flushes the output stream and closes it. If you write to the output stream
-   * after calling this method a <code>IOException</code> will be thrown.
-   * 
-   * @throws IOException if an error occurs
-   */
-  public native void shutdownOutput() throws IOException;
-
-  /**
-   * Creates a new socket that is not bound to any local address/port and
-   * is not connected to any remote address/port.  This will be created as
-   * a stream socket if the stream parameter is true, or a datagram socket
-   * if the stream parameter is false.
-   *
-   * @param stream true for a stream socket, false for a datagram socket
-   */
-  // FIXME: this is public for nio ... but this is just a hack
-  // until we upgrade to Classpath's nio.
-  public native void create(boolean stream) throws IOException;
-
-  /**
-   * Connects to the remote hostname and port specified as arguments.
-   *
-   * @param hostname The remote hostname to connect to
-   * @param port The remote port to connect to
-   *
-   * @exception IOException If an error occurs
-   */
-  protected void connect(String host, int port) throws IOException
-  {
-    connect(InetAddress.getByName(host), port);
-  }
-
-  /**
-   * Connects to the remote address and port specified as arguments.
-   *
-   * @param addr The remote address to connect to
-   * @param port The remote port to connect to
-   *
-   * @exception IOException If an error occurs
-   */
-  protected void connect(InetAddress host, int port) throws IOException
-  {
-    connect (new InetSocketAddress (host, port), 0);
-  }
-
-  /**
-   * Connects to the remote socket address with a specified timeout.
-   *
-   * @param timeout The timeout to use for this connect, 0 means infinite.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native void connect(SocketAddress addr, int timeout) throws IOException;
-
-  /**
-   * Binds to the specified port on the specified addr.  Note that this addr
-   * must represent a local IP address.  **** How bind to INADDR_ANY? ****
-   *
-   * @param addr The address to bind to
-   * @param port The port number to bind to
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native void bind(InetAddress host, int port)
-    throws IOException;
-
-  /**
-   * Starts listening for connections on a socket. The queuelen parameter
-   * is how many pending connections will queue up waiting to be serviced
-   * before being accept'ed.  If the queue of pending requests exceeds this
-   * number, additional connections will be refused.
-   *
-   * @param queuelen The length of the pending connection queue
-   * 
-   * @exception IOException If an error occurs
-   */
-  protected native void listen(int queuelen)
-    throws IOException;
-
-  /**
-   * Accepts a new connection on this socket and returns in in the 
-   * passed in SocketImpl.
-   *
-   * @param impl The SocketImpl object to accept this connection.
-   */
-  protected void accept(SocketImpl impl)
-    throws IOException
-  {
-    accept((PlainSocketImpl) impl);
-  }
-
-  private native void accept(PlainSocketImpl impl)
-    throws IOException;
-
-  /**
-   * Returns the number of bytes that the caller can read from this socket
-   * without blocking. 
-   *
-   * @return The number of readable bytes before blocking
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native int available() throws IOException;
-
-  /**
-   * Closes the socket.  This will cause any InputStream or OutputStream
-   * objects for this Socket to be closed as well.
-   * <p>
-   * Note that if the SO_LINGER option is set on this socket, then the
-   * operation could block.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected native void close() throws IOException;
-
-  protected native void sendUrgentData(int data) throws IOException;
-
-  public synchronized InetSocketAddress getLocalAddress()
-  {
-    if (localSocketAddress == null)
-      {
-	try
-	  {
-	    localSocketAddress
-	      = new InetSocketAddress ((InetAddress) getOption(SocketOptions.SO_BINDADDR),
-				       localport == -1 ? 0 : localport);
-	  }
-	catch (SocketException _)
-	  {
-	    return null;
-	  }
-      }
-    return localSocketAddress;
-  }
-
-  /**
-   * Returns an InputStream object for reading from this socket.  This will
-   * be an instance of SocketInputStream.
-   *
-   * @return An input stream attached to the socket.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected synchronized InputStream getInputStream() throws IOException
-  {
-    if (in == null)
-      in = new SocketInputStream();
-    
-    return in;
-  }
-
-  /**
-   * Returns an OutputStream object for writing to this socket.  This will
-   * be an instance of SocketOutputStream.
-   *
-   * @return An output stream attached to the socket.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected synchronized OutputStream getOutputStream() throws IOException
-  {
-    if (out == null)
-      out = new SocketOutputStream();
-    
-    return out;
-  }
-
-  /**
-   * This class contains an implementation of <code>InputStream</code> for 
-   * sockets.  It in an internal only class used by <code>PlainSocketImpl</code>.
-   *
-   * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
-   */
-  final class SocketInputStream
-    extends InputStream
-  {
-    /**
-     * Returns the number of bytes available to be read before blocking
-     */
-    public int available() throws IOException
-    {
-      return PlainSocketImpl.this.available();
-    }
-
-    /**
-     * This method not only closes the stream, it closes the underlying socket
-     * (and thus any connection) and invalidates any other Input/Output streams
-     * for the underlying impl object
-     */
-    public void close() throws IOException
-    {
-      PlainSocketImpl.this.close();
-    }
-
-    /**
-     * Reads the next byte of data and returns it as an int.  
-     *
-     * @return The byte read (as an int) or -1 if end of stream);
-     *
-     * @exception IOException If an error occurs.
-     */
-    public native int read() throws IOException;
-
-    /**
-     * Reads up to len bytes of data into the caller supplied buffer starting
-     * at offset bytes from the start of the buffer
-     *
-     * @param buf The buffer
-     * @param offset Offset into the buffer to start reading from
-     * @param len The number of bytes to read
-     *
-     * @return The number of bytes actually read or -1 if end of stream
-     *
-     * @exception IOException If an error occurs.
-     */
-    public native int read(byte[] buf, int offset, int len) throws IOException;
-  }
-
-  /**
-   * This class is used internally by <code>PlainSocketImpl</code> to be the 
-   * <code>OutputStream</code> subclass returned by its 
-   * <code>getOutputStream method</code>.  It expects only to  be used in that
-   * context.
-   *
-   * @author Nic Ferrier  <nferrier@tapsellferrier.co.uk>
-   */
-  final class SocketOutputStream
-    extends OutputStream
-  {
-    /**
-     * This method closes the stream and the underlying socket connection. This
-     * action also effectively closes any other InputStream or OutputStream
-     * object associated with the connection.
-     *
-     * @exception IOException If an error occurs
-     */
-    public void close() throws IOException
-    {
-      PlainSocketImpl.this.close();
-    }
-
-    /**
-     * Writes a byte (passed in as an int) to the given output stream
-     * 
-     * @param b The byte to write
-     *
-     * @exception IOException If an error occurs
-     */
-    public native void write(int b) throws IOException;
-
-    /**
-     * Writes len number of bytes from the array buf to the stream starting
-     * at offset bytes into the buffer.
-     *
-     * @param buf The buffer
-     * @param offset Offset into the buffer to start writing from
-     * @param len The number of bytes to write
-     *
-     * @exception IOException If an error occurs.
-     */
-    public native void write(byte[] buf, int offset, int len) throws IOException;
-  }
-}
diff --git a/libjava/gnu/java/net/URLParseError.h b/libjava/gnu/java/net/URLParseError.h
deleted file mode 100644
index c900dc0..0000000
--- a/libjava/gnu/java/net/URLParseError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_URLParseError__
-#define __gnu_java_net_URLParseError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class URLParseError;
-      }
-    }
-  }
-}
-
-class gnu::java::net::URLParseError : public ::java::lang::Error
-{
-
-public:
-  URLParseError(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_URLParseError__
diff --git a/libjava/gnu/java/net/loader/FileResource.h b/libjava/gnu/java/net/loader/FileResource.h
deleted file mode 100644
index 37f1d12..0000000
--- a/libjava/gnu/java/net/loader/FileResource.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_FileResource__
-#define __gnu_java_net_loader_FileResource__
-
-#pragma interface
-
-#include <gnu/java/net/loader/Resource.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class FileResource;
-            class FileURLLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::loader::FileResource : public ::gnu::java::net::loader::Resource
-{
-
-public:
-  FileResource(::gnu::java::net::loader::FileURLLoader *, ::java::io::File *);
-  ::java::io::InputStream * getInputStream();
-  jint getLength();
-  ::java::net::URL * getURL();
-public: // actually package-private
-  ::java::io::File * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::Resource)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_FileResource__
diff --git a/libjava/gnu/java/net/loader/FileURLLoader.h b/libjava/gnu/java/net/loader/FileURLLoader.h
deleted file mode 100644
index 4592f7f..0000000
--- a/libjava/gnu/java/net/loader/FileURLLoader.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_FileURLLoader__
-#define __gnu_java_net_loader_FileURLLoader__
-
-#pragma interface
-
-#include <gnu/java/net/loader/URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class FileURLLoader;
-            class Resource;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class gnu::java::net::loader::FileURLLoader : public ::gnu::java::net::loader::URLLoader
-{
-
-public:
-  FileURLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *, ::java::net::URL *);
-  ::gnu::java::net::loader::Resource * getResource(::java::lang::String *);
-private:
-  ::java::io::File * walkPathComponents(::java::lang::String *);
-public: // actually package-private
-  ::java::io::File * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::URLLoader)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_FileURLLoader__
diff --git a/libjava/gnu/java/net/loader/JarURLLoader.h b/libjava/gnu/java/net/loader/JarURLLoader.h
deleted file mode 100644
index 68114ab..0000000
--- a/libjava/gnu/java/net/loader/JarURLLoader.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_JarURLLoader__
-#define __gnu_java_net_loader_JarURLLoader__
-
-#pragma interface
-
-#include <gnu/java/net/loader/URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class JarURLLoader;
-            class Resource;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class gnu::java::net::loader::JarURLLoader : public ::gnu::java::net::loader::URLLoader
-{
-
-  JarURLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *, ::java::net::URL *, ::java::util::Set *);
-public:
-  JarURLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *, ::java::net::URL *);
-private:
-  void initialize();
-public:
-  ::gnu::java::net::loader::Resource * getResource(::java::lang::String *);
-  ::java::util::jar::Manifest * getManifest();
-  ::java::util::ArrayList * getClassPath();
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::net::loader::URLLoader)))) initialized;
-  ::java::util::jar::JarFile * jarfile;
-  ::java::net::URL * baseJarURL;
-  ::java::util::ArrayList * classPath;
-  ::java::util::Set * indexSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_JarURLLoader__
diff --git a/libjava/gnu/java/net/loader/JarURLResource.h b/libjava/gnu/java/net/loader/JarURLResource.h
deleted file mode 100644
index e9fe6a6..0000000
--- a/libjava/gnu/java/net/loader/JarURLResource.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_JarURLResource__
-#define __gnu_java_net_loader_JarURLResource__
-
-#pragma interface
-
-#include <gnu/java/net/loader/Resource.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class JarURLLoader;
-            class JarURLResource;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::net::loader::JarURLResource : public ::gnu::java::net::loader::Resource
-{
-
-public:
-  JarURLResource(::gnu::java::net::loader::JarURLLoader *, ::java::lang::String *, ::java::util::jar::JarEntry *);
-  ::java::io::InputStream * getInputStream();
-  jint getLength();
-  JArray< ::java::security::cert::Certificate * > * getCertificates();
-  ::java::net::URL * getURL();
-private:
-  ::java::util::jar::JarEntry * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::Resource)))) entry;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_JarURLResource__
diff --git a/libjava/gnu/java/net/loader/Load_gcjlib$SoResource.h b/libjava/gnu/java/net/loader/Load_gcjlib$SoResource.h
deleted file mode 100644
index da8a2ac..0000000
--- a/libjava/gnu/java/net/loader/Load_gcjlib$SoResource.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_Load_gcjlib$SoResource__
-#define __gnu_java_net_loader_Load_gcjlib$SoResource__
-
-#pragma interface
-
-#include <gnu/java/net/loader/Resource.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class Load_gcjlib;
-            class Load_gcjlib$SoResource;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::loader::Load_gcjlib$SoResource : public ::gnu::java::net::loader::Resource
-{
-
-public: // actually package-private
-  Load_gcjlib$SoResource(::gnu::java::net::loader::Load_gcjlib *, ::java::net::URL *);
-public:
-  ::java::io::InputStream * getInputStream();
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::Resource)))) url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_Load_gcjlib$SoResource__
diff --git a/libjava/gnu/java/net/loader/Load_gcjlib.h b/libjava/gnu/java/net/loader/Load_gcjlib.h
deleted file mode 100644
index 69d2ef5..0000000
--- a/libjava/gnu/java/net/loader/Load_gcjlib.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_Load_gcjlib__
-#define __gnu_java_net_loader_Load_gcjlib__
-
-#pragma interface
-
-#include <gnu/java/net/loader/URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class SharedLibHelper;
-      }
-    }
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class Load_gcjlib;
-            class Resource;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class gnu::java::net::loader::Load_gcjlib : public ::gnu::java::net::loader::URLLoader
-{
-
-public:
-  Load_gcjlib(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *, ::java::net::URL *);
-  ::java::lang::Class * getClass(::java::lang::String *);
-  ::gnu::java::net::loader::Resource * getResource(::java::lang::String *);
-private:
-  ::gnu::gcj::runtime::SharedLibHelper * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::URLLoader)))) helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_Load_gcjlib__
diff --git a/libjava/gnu/java/net/loader/Load_gcjlib.java b/libjava/gnu/java/net/loader/Load_gcjlib.java
deleted file mode 100644
index ea39204..0000000
--- a/libjava/gnu/java/net/loader/Load_gcjlib.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.loader;
-
-import gnu.gcj.runtime.SharedLibHelper;
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.net.URLStreamHandlerFactory;
-
-/**
- * A <code>Load_gcjlib</code> is a type of <code>URLLoader</code>
- * that loads classes and resources from a shared library.
- */
-public final class Load_gcjlib extends URLLoader
-{
-  private SharedLibHelper helper;
-
-  public Load_gcjlib(URLClassLoader classloader,
-		     URLStreamHandlerCache cache,
-		     URLStreamHandlerFactory factory,
-		     URL url, URL absoluteUrl)
-  {
-    super(classloader, cache, factory, url, absoluteUrl);
-    helper = SharedLibHelper.findHelper(classloader, url.getFile(),
-					noCertCodeSource, true);
-  }
-
-  public Class getClass(String className)
-  {
-    return helper.findClass(className);
-  }
-
-  public Resource getResource(String name)
-  {
-    URL url = helper.findResource(name);
-    if (url == null)
-      return null;
-    return new SoResource(this, url);
-  }
-
-  final static class SoResource extends Resource
-  {
-    private final URL url;
-
-    SoResource(Load_gcjlib loader, URL url)
-    {
-      super(loader);
-      this.url = url;
-    }
-
-    public InputStream getInputStream() throws IOException
-    {
-      URLConnection conn = url.openConnection();
-      return conn.getInputStream();
-    }
-
-    public int getLength()
-    {
-      // FIXME we could find this by asking the core object.
-      return -1;
-    }
-
-    public URL getURL ()
-    {
-      return url;
-    }
-  }
-}
diff --git a/libjava/gnu/java/net/loader/RemoteResource.h b/libjava/gnu/java/net/loader/RemoteResource.h
deleted file mode 100644
index 29ccf16..0000000
--- a/libjava/gnu/java/net/loader/RemoteResource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_RemoteResource__
-#define __gnu_java_net_loader_RemoteResource__
-
-#pragma interface
-
-#include <gnu/java/net/loader/Resource.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class RemoteResource;
-            class RemoteURLLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::loader::RemoteResource : public ::gnu::java::net::loader::Resource
-{
-
-public:
-  RemoteResource(::gnu::java::net::loader::RemoteURLLoader *, ::java::lang::String *, ::java::net::URL *, ::java::io::InputStream *, jint);
-  ::java::io::InputStream * getInputStream();
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::Resource)))) url;
-  ::java::io::InputStream * stream;
-public: // actually package-private
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_RemoteResource__
diff --git a/libjava/gnu/java/net/loader/RemoteURLLoader.h b/libjava/gnu/java/net/loader/RemoteURLLoader.h
deleted file mode 100644
index 2c05165..0000000
--- a/libjava/gnu/java/net/loader/RemoteURLLoader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_RemoteURLLoader__
-#define __gnu_java_net_loader_RemoteURLLoader__
-
-#pragma interface
-
-#include <gnu/java/net/loader/URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class RemoteURLLoader;
-            class Resource;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class gnu::java::net::loader::RemoteURLLoader : public ::gnu::java::net::loader::URLLoader
-{
-
-public:
-  RemoteURLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *);
-  ::gnu::java::net::loader::Resource * getResource(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::net::loader::URLLoader)))) protocol;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_RemoteURLLoader__
diff --git a/libjava/gnu/java/net/loader/Resource.h b/libjava/gnu/java/net/loader/Resource.h
deleted file mode 100644
index 98b626f..0000000
--- a/libjava/gnu/java/net/loader/Resource.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_Resource__
-#define __gnu_java_net_loader_Resource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class Resource;
-            class URLLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class CodeSource;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::net::loader::Resource : public ::java::lang::Object
-{
-
-public:
-  Resource(::gnu::java::net::loader::URLLoader *);
-  virtual ::java::security::CodeSource * getCodeSource();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual ::gnu::java::net::loader::URLLoader * getLoader();
-  virtual ::java::net::URL * getURL() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-public: // actually package-private
-  ::gnu::java::net::loader::URLLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_Resource__
diff --git a/libjava/gnu/java/net/loader/URLLoader.h b/libjava/gnu/java/net/loader/URLLoader.h
deleted file mode 100644
index 76c294b..0000000
--- a/libjava/gnu/java/net/loader/URLLoader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_URLLoader__
-#define __gnu_java_net_loader_URLLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class Resource;
-            class URLLoader;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-    namespace security
-    {
-        class CodeSource;
-    }
-  }
-}
-
-class gnu::java::net::loader::URLLoader : public ::java::lang::Object
-{
-
-public:
-  URLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *);
-  URLLoader(::java::net::URLClassLoader *, ::gnu::java::net::loader::URLStreamHandlerCache *, ::java::net::URLStreamHandlerFactory *, ::java::net::URL *, ::java::net::URL *);
-  virtual ::java::net::URL * getBaseURL();
-  virtual ::java::lang::Class * getClass(::java::lang::String *);
-  virtual ::gnu::java::net::loader::Resource * getResource(::java::lang::String *) = 0;
-  virtual ::java::util::jar::Manifest * getManifest();
-  virtual ::java::util::ArrayList * getClassPath();
-public: // actually package-private
-  ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) classloader;
-  ::java::net::URL * baseURL;
-  ::java::net::URLStreamHandlerFactory * factory;
-  ::gnu::java::net::loader::URLStreamHandlerCache * cache;
-  ::java::security::CodeSource * noCertCodeSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_URLLoader__
diff --git a/libjava/gnu/java/net/loader/URLStreamHandlerCache.h b/libjava/gnu/java/net/loader/URLStreamHandlerCache.h
deleted file mode 100644
index a41d1d9..0000000
--- a/libjava/gnu/java/net/loader/URLStreamHandlerCache.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_loader_URLStreamHandlerCache__
-#define __gnu_java_net_loader_URLStreamHandlerCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URLStreamHandler;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class gnu::java::net::loader::URLStreamHandlerCache : public ::java::lang::Object
-{
-
-public:
-  URLStreamHandlerCache();
-  virtual void add(::java::net::URLStreamHandlerFactory *);
-  virtual ::java::net::URLStreamHandler * get(::java::net::URLStreamHandlerFactory *, ::java::lang::String *);
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) factoryCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_loader_URLStreamHandlerCache__
diff --git a/libjava/gnu/java/net/local/LocalServerSocket.h b/libjava/gnu/java/net/local/LocalServerSocket.h
deleted file mode 100644
index 35969bc..0000000
--- a/libjava/gnu/java/net/local/LocalServerSocket.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalServerSocket__
-#define __gnu_java_net_local_LocalServerSocket__
-
-#pragma interface
-
-#include <java/net/ServerSocket.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalServerSocket;
-            class LocalSocketImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-        class SocketAddress;
-    }
-  }
-}
-
-class gnu::java::net::local::LocalServerSocket : public ::java::net::ServerSocket
-{
-
-public:
-  LocalServerSocket();
-  LocalServerSocket(::java::net::SocketAddress *);
-  void bind(::java::net::SocketAddress *);
-  void bind(::java::net::SocketAddress *, jint);
-  ::java::net::InetAddress * getInetAddress();
-  jint getLocalPort();
-  ::java::net::SocketAddress * getLocalSocketAddress();
-  ::java::net::Socket * accept();
-  void close();
-  jboolean isBound();
-  jboolean isClosed();
-  void setSoTimeout(jint);
-  jint getSoTimeout();
-  void setReuseAddress(jboolean);
-  jboolean getReuseAddress();
-  ::java::lang::String * toString();
-  void setReceiveBufferSize(jint);
-  jint getReceiveBufferSize();
-  void setSendBufferSize(jint);
-  jint getSendBufferSize();
-private:
-  ::gnu::java::net::local::LocalSocketImpl * __attribute__((aligned(__alignof__( ::java::net::ServerSocket)))) myImpl;
-  jboolean closed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalServerSocket__
diff --git a/libjava/gnu/java/net/local/LocalSocket.h b/libjava/gnu/java/net/local/LocalSocket.h
deleted file mode 100644
index c33f540..0000000
--- a/libjava/gnu/java/net/local/LocalSocket.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalSocket__
-#define __gnu_java_net_local_LocalSocket__
-
-#pragma interface
-
-#include <java/net/Socket.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalSocket;
-            class LocalSocketAddress;
-            class LocalSocketImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::net::local::LocalSocket : public ::java::net::Socket
-{
-
-public:
-  LocalSocket();
-  LocalSocket(::gnu::java::net::local::LocalSocketAddress *);
-public: // actually package-private
-  LocalSocket(jboolean);
-public:
-  void bind(::java::net::SocketAddress *);
-  void connect(::java::net::SocketAddress *, jint);
-  ::java::net::InetAddress * getInetAddress();
-  ::java::net::InetAddress * getLocalAddress();
-  jint getPort();
-  jint getLocalPort();
-  ::java::nio::channels::SocketChannel * getChannel();
-  ::java::net::SocketAddress * getLocalSocketAddress();
-  ::java::net::SocketAddress * getRemoteSocketAddress();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  void sendUrgentData(jint);
-  void close();
-  void shutdownInput();
-  void shutdownOutput();
-  jboolean isClosed();
-  jboolean isBound();
-  jboolean isConnected();
-  void setTcpNoDelay(jboolean);
-  jboolean getTcpNoDelay();
-  void setSoLinger(jboolean, jint);
-  jint getSoLinger();
-  void setOOBInline(jboolean);
-  jboolean getOOBInline();
-  void setSoTimeout(jint);
-  jint getSoTimeout();
-  void setSendBufferSize(jint);
-  jint getSendBufferSize();
-  void setReceiveBufferSize(jint);
-  jint getReceiveBufferSize();
-  void setKeepAlive(jboolean);
-  jboolean getKeepAlive();
-  void setTrafficClass(jint);
-  jint getTrafficClass();
-  void setReuseAddress(jboolean);
-  jboolean getReuseAddress();
-public: // actually package-private
-  ::gnu::java::net::local::LocalSocketImpl * getLocalImpl();
-private:
-  ::gnu::java::net::local::LocalSocketImpl * __attribute__((aligned(__alignof__( ::java::net::Socket)))) localimpl;
-public: // actually package-private
-  jboolean localClosed;
-  jboolean localConnected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalSocket__
diff --git a/libjava/gnu/java/net/local/LocalSocketAddress.h b/libjava/gnu/java/net/local/LocalSocketAddress.h
deleted file mode 100644
index ef095f6..0000000
--- a/libjava/gnu/java/net/local/LocalSocketAddress.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalSocketAddress__
-#define __gnu_java_net_local_LocalSocketAddress__
-
-#pragma interface
-
-#include <java/net/SocketAddress.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalSocketAddress;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::local::LocalSocketAddress : public ::java::net::SocketAddress
-{
-
-public:
-  LocalSocketAddress(::java::lang::String *);
-  ::java::lang::String * getPath();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::SocketAddress)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalSocketAddress__
diff --git a/libjava/gnu/java/net/local/LocalSocketImpl$LocalInputStream.h b/libjava/gnu/java/net/local/LocalSocketImpl$LocalInputStream.h
deleted file mode 100644
index 8b1de38..0000000
--- a/libjava/gnu/java/net/local/LocalSocketImpl$LocalInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalSocketImpl$LocalInputStream__
-#define __gnu_java_net_local_LocalSocketImpl$LocalInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalSocketImpl;
-            class LocalSocketImpl$LocalInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::local::LocalSocketImpl$LocalInputStream : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  LocalSocketImpl$LocalInputStream(::gnu::java::net::local::LocalSocketImpl *, ::gnu::java::net::local::LocalSocketImpl *);
-public:
-  virtual jint available();
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual void close();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::net::local::LocalSocketImpl * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) impl;
-public: // actually package-private
-  ::gnu::java::net::local::LocalSocketImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalSocketImpl$LocalInputStream__
diff --git a/libjava/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.h b/libjava/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.h
deleted file mode 100644
index e456001..0000000
--- a/libjava/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalSocketImpl$LocalOutputStream__
-#define __gnu_java_net_local_LocalSocketImpl$LocalOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalSocketImpl;
-            class LocalSocketImpl$LocalOutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::local::LocalSocketImpl$LocalOutputStream : public ::java::io::OutputStream
-{
-
-public: // actually package-private
-  LocalSocketImpl$LocalOutputStream(::gnu::java::net::local::LocalSocketImpl *, ::gnu::java::net::local::LocalSocketImpl *);
-public:
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::net::local::LocalSocketImpl * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) impl;
-public: // actually package-private
-  ::gnu::java::net::local::LocalSocketImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalSocketImpl$LocalOutputStream__
diff --git a/libjava/gnu/java/net/local/LocalSocketImpl.h b/libjava/gnu/java/net/local/LocalSocketImpl.h
deleted file mode 100644
index 517d930..0000000
--- a/libjava/gnu/java/net/local/LocalSocketImpl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_local_LocalSocketImpl__
-#define __gnu_java_net_local_LocalSocketImpl__
-
-#pragma interface
-
-#include <java/net/SocketImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace local
-        {
-            class LocalSocketAddress;
-            class LocalSocketImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class SocketAddress;
-        class SocketImpl;
-    }
-  }
-}
-
-class gnu::java::net::local::LocalSocketImpl : public ::java::net::SocketImpl
-{
-
-public: // actually package-private
-  LocalSocketImpl();
-  LocalSocketImpl(jboolean);
-public:
-  void setOption(jint, ::java::lang::Object *);
-  ::java::lang::Object * getOption(jint);
-public: // actually protected
-  void create(jboolean);
-  void listen(jint);
-  void accept(::gnu::java::net::local::LocalSocketImpl *);
-  jint available();
-  void close();
-  void sendUrgentData(jint);
-  void shutdownInput();
-  void shutdownOutput();
-public: // actually package-private
-  void unlink();
-  void localBind(::gnu::java::net::local::LocalSocketAddress *);
-  void localConnect(::gnu::java::net::local::LocalSocketAddress *);
-  jint read(JArray< jbyte > *, jint, jint);
-  void write(JArray< jbyte > *, jint, jint);
-  void doCreate();
-  ::gnu::java::net::local::LocalSocketAddress * getLocalAddress();
-  ::gnu::java::net::local::LocalSocketAddress * getRemoteAddress();
-public: // actually protected
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  void accept(::java::net::SocketImpl *);
-  void connect(::java::lang::String *, jint);
-  void connect(::java::net::InetAddress *, jint);
-  void connect(::java::net::SocketAddress *, jint);
-  void bind(::java::net::InetAddress *, jint);
-  void bind(::java::net::SocketAddress *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::net::SocketImpl)))) created;
-  ::java::io::InputStream * in;
-  ::java::io::OutputStream * out;
-  jint socket_fd;
-  ::gnu::java::net::local::LocalSocketAddress * local;
-  ::gnu::java::net::local::LocalSocketAddress * remote;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_local_LocalSocketImpl__
diff --git a/libjava/gnu/java/net/local/LocalSocketImpl.java b/libjava/gnu/java/net/local/LocalSocketImpl.java
deleted file mode 100644
index 35df298..0000000
--- a/libjava/gnu/java/net/local/LocalSocketImpl.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/* LocalSocketImpl.java -- a unix domain client socket implementation.
-   Copyright (C) 2006  Free Software Foundation, Inc.
-
-This file is a part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-USA
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version.  */
-
-
-package gnu.java.net.local;
-
-import java.io.FileDescriptor;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.net.InetAddress;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketImpl;
-
-final class LocalSocketImpl extends SocketImpl
-{
-
-  // Fields.
-  // -------------------------------------------------------------------------
-
-  private boolean created;
-  private InputStream in;
-  private OutputStream out;
-  private int socket_fd;
-  private LocalSocketAddress local;
-  private LocalSocketAddress remote;
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
-  LocalSocketImpl ()
-  {
-    this (false);
-  }
-
-  LocalSocketImpl (boolean nocreate)
-  {
-    created = nocreate;
-    socket_fd = -1;
-    fd = new FileDescriptor ();
-  }
-
-  // Instance methods.
-  // -------------------------------------------------------------------------
-
-  public void setOption (int opt, Object value) throws SocketException
-  {
-    throw new SocketException ("local sockets do not support options");
-  }
-
-  public Object getOption (int opt) throws SocketException
-  {
-    throw new SocketException ("local sockets do not support options");
-  }
-
-  protected void create (boolean stream) throws IOException { }
-  protected void listen (int timeout) throws IOException { }
-  protected void accept (LocalSocketImpl socket) throws IOException { }
-  protected int available () throws IOException { return -1; }
-  protected void close () throws IOException { }
-  protected void sendUrgentData (int data) throws IOException { }
-  protected void shutdownInput () throws IOException { }
-  protected void shutdownOutput () throws IOException { }
-
-  void unlink () throws IOException { }
-  void localBind (LocalSocketAddress addr) throws IOException { }
-  void localConnect (LocalSocketAddress addr) throws IOException { }
-  int read (byte[] buf, int off, int len) throws IOException { return -1; }
-  void write (byte[] buf, int off, int len) throws IOException { }
-
-  void doCreate () throws IOException
-  {
-    if (!created)
-      {
-        create (true);
-      }
-  }
-
-  LocalSocketAddress getLocalAddress ()
-  {
-    return local;
-  }
-
-  LocalSocketAddress getRemoteAddress ()
-  {
-    return remote;
-  }
-
-  protected InputStream getInputStream()
-  {
-    if (in == null)
-      {
-        in = new LocalInputStream (this);
-      }
-
-    return in;
-  }
-
-  protected OutputStream getOutputStream()
-  {
-    if (out == null)
-      {
-        out = new LocalOutputStream (this);
-      }
-
-    return out;
-  }
-
-  protected void accept (SocketImpl impl) throws IOException
-  {
-    if (! (impl instanceof LocalSocketImpl))
-      {
-        throw new IllegalArgumentException ("not a local socket");
-      }
-    accept ((LocalSocketImpl) impl);
-  }
-
-  protected void connect (String host, int port) throws IOException
-  {
-    throw new SocketException ("this is a local socket");
-  }
-
-  protected void connect (InetAddress addr, int port) throws IOException
-  {
-    throw new SocketException ("this is a local socket");
-  }
-
-  protected void connect(SocketAddress addr, int timeout) throws IOException
-  {
-    if (! (addr instanceof LocalSocketAddress))
-      {
-        throw new SocketException ("address is not local");
-      }
-    localConnect ((LocalSocketAddress) addr);
-  }
-
-  protected void bind (InetAddress addr, int port) throws IOException
-  {
-    throw new SocketException ("this is a local socket");
-  }
-
-  protected void bind (SocketAddress addr) throws IOException
-  {
-    if (! (addr instanceof LocalSocketAddress))
-      {
-        throw new SocketException ("address is not local");
-      }
-    localBind ((LocalSocketAddress) addr);
-  }
-
-// Inner classes.
-  // -------------------------------------------------------------------------
-
-  class LocalInputStream extends InputStream
-  {
-
-    // Field.
-    // -----------------------------------------------------------------------
-
-    private final LocalSocketImpl impl;
-
-    // Constructor.
-    // -----------------------------------------------------------------------
-
-    LocalInputStream (LocalSocketImpl impl)
-    {
-      this.impl = impl;
-    }
-
-    // Instance methods.
-    // -----------------------------------------------------------------------
-
-    public int available () throws IOException
-    {
-      return impl.available();
-    }
-
-    public boolean markSupported ()
-    {
-      return false;
-    }
-
-    public void mark (int readLimit)
-    {
-    }
-
-    public void reset () throws IOException
-    {
-      throw new IOException ("mark/reset not supported");
-    }
-
-    public void close () throws IOException
-    {
-      impl.close();
-    }
-
-    public int read () throws IOException
-    {
-      byte[] buf = new byte[1];
-      int ret = read (buf);
-      if (ret != -1)
-        {
-          return buf[0] & 0xFF;
-        }
-      else
-        {
-          return -1;
-        }
-    }
-
-    public int read (byte[] buf) throws IOException
-    {
-      return read (buf, 0, buf.length);
-    }
-
-    public int read (byte[] buf, int off, int len) throws IOException
-    {
-      int ret = impl.read (buf, off, len);
-
-      if (ret == 0)
-        {
-          return -1;
-        }
-
-      return ret;
-    }
-  }
-
-  class LocalOutputStream extends OutputStream
-  {
-
-    // Field.
-    // -----------------------------------------------------------------------
-
-    private final LocalSocketImpl impl;
-
-    // Constructor.
-    // -----------------------------------------------------------------------
-
-    LocalOutputStream (LocalSocketImpl impl)
-    {
-      this.impl = impl;
-    }
-
-    // Instance methods.
-    // -----------------------------------------------------------------------
-
-    public void close () throws IOException
-    {
-      impl.close ();
-    }
-
-    public void flush () throws IOException
-    {
-    }
-
-    public void write (int b) throws IOException
-    {
-      byte[] buf = new byte [1];
-      buf[0] = (byte) b;
-      write (buf);
-    }
-
-    public void write (byte[] buf) throws IOException
-    {
-      write (buf, 0, buf.length);
-    }
-
-    public void write (byte[] buf, int off, int len) throws IOException
-    {
-      impl.write (buf, off, len);
-    }
-  }
-}
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplNoNet.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplNoNet.cc
deleted file mode 100644
index 7cb5a2e..0000000
--- a/libjava/gnu/java/net/natPlainDatagramSocketImplNoNet.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright (C) 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gnu/java/net/PlainDatagramSocketImpl.h>
-#include <java/io/IOException.h>
-#include <java/lang/Object.h>
-#include <java/net/BindException.h>
-#include <java/net/DatagramPacket.h>
-#include <java/net/InetAddress.h>
-#include <java/net/NetworkInterface.h>
-#include <java/net/SocketException.h>
-
-void
-gnu::java::net::PlainDatagramSocketImpl::create ()
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.create: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::bind (jint, ::java::net::InetAddress *)
-{
-  throw new ::java::net::BindException (
-    JvNewStringLatin1 ("DatagramSocketImpl.bind: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::connect (::java::net::InetAddress *, jint)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.connect: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::disconnect ()
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.disconnect: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peek (::java::net::InetAddress *)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.peek: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peekData (::java::net::DatagramPacket *)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.peekData: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::close ()
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.close: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::send (::java::net::DatagramPacket *)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.send: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.receive: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setTimeToLive (jint)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.setTimeToLive: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::getTimeToLive ()
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.getTimeToLive: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::mcastGrp (::java::net::InetAddress *,
-                                              ::java::net::NetworkInterface *,
-					      jboolean)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.mcastGrp: unimplemented"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setOption (jint, ::java::lang::Object *)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.setOption: unimplemented"));
-}
-
-::java::lang::Object *
-gnu::java::net::PlainDatagramSocketImpl::getOption (jint)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.getOption: unimplemented"));
-}
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
deleted file mode 100644
index 6ec9f38..0000000
--- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
+++ /dev/null
@@ -1,852 +0,0 @@
-/* Copyright (C) 2003, 2005, 2006, 2012 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#include <errno.h>
-#include <string.h>
-
-#include <gcj/cni.h>
-#include <gnu/java/net/PlainDatagramSocketImpl.h>
-#include <java/io/IOException.h>
-#include <java/io/InterruptedIOException.h>
-#include <java/net/BindException.h>
-#include <java/net/SocketException.h>
-#include <java/net/SocketTimeoutException.h>
-#include <java/net/InetAddress.h>
-#include <java/net/NetworkInterface.h>
-#include <java/net/DatagramPacket.h>
-#include <java/net/PortUnreachableException.h>
-#include <java/lang/InternalError.h>
-#include <java/lang/Object.h>
-#include <java/lang/Boolean.h>
-#include <java/lang/Integer.h>
-#include <java/net/UnknownHostException.h>
-#include <java/net/ConnectException.h>
-#include <java/lang/NullPointerException.h>
-
-union SockAddr
-{
-  struct sockaddr_in address;
-#ifdef HAVE_INET6
-  struct sockaddr_in6 address6;
-#endif
-};
-
-union McastReq
-{
-#if HAVE_STRUCT_IP_MREQ
-  struct ip_mreq mreq;
-#endif
-#if HAVE_STRUCT_IPV6_MREQ
-  struct ipv6_mreq mreq6;
-#endif
-};
-
-union InAddr
-{
-  struct in_addr addr;
-#ifdef HAVE_INET6
-  struct in6_addr addr6;
-#endif
-};
-
-
-// FIXME: routines here and/or in natPlainSocketImpl.cc could throw
-// NoRouteToHostException; also consider UnknownHostException, ConnectException.
-
-void
-gnu::java::net::PlainDatagramSocketImpl::create ()
-{
-  int sock = _Jv_socket (AF_INET, SOCK_DGRAM, 0);
-
-  if (sock < 0)
-    {
-      char* strerr = strerror (errno);
-      throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-    }
-
-  // We use native_fd in place of fd here.  From leaving fd null we avoid
-  // the double close problem in FileDescriptor.finalize.
-  native_fd = sock;
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::bind (jint lport,
-                                               ::java::net::InetAddress *host)
-{
-  union SockAddr u;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  // FIXME: Use getaddrinfo() to get actual protocol instead of assuming ipv4.
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-
-      if (host != NULL)
-        memcpy (&u.address.sin_addr, bytes, len);
-      else
-        u.address.sin_addr.s_addr = htonl (INADDR_ANY);
-
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (lport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (lport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (_Jv_bind (native_fd, ptr, len) == 0)
-    {
-      socklen_t addrlen = sizeof(u);
-
-      if (lport != 0)
-        localPort = lport;
-      else if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) == 0)
-        localPort = ntohs (u.address.sin_port);
-      else
-        goto error;
-
-      /* Allow broadcast by default. */
-      int broadcast = 1;
-      if (::setsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &broadcast, 
-                        sizeof (broadcast)) != 0)
-        goto error;
-
-      return;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::BindException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::connect (::java::net::InetAddress *host,
-						  jint rport)
-{ 
-  if (! host)
-    throw new ::java::lang::NullPointerException;
-
-  union SockAddr u;
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-      memcpy (&u.address.sin_addr, bytes, len);
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (rport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (rport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-  
-  if (_Jv_connect (native_fd, ptr, len) == 0)
-    return;
-  char* strerr = strerror (errno);
-  throw new ::java::net::ConnectException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::disconnect ()
-{
-  struct sockaddr addr;
-  addr.sa_family = AF_UNSPEC;
-  // Ignore errors.  This is lame but apparently required.
-  _Jv_connect (native_fd, &addr, sizeof (addr));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peek (::java::net::InetAddress *i)
-{
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  ssize_t retlen =
-    ::recvfrom (native_fd, (char *) NULL, 0, MSG_PEEK, (sockaddr*) &u,
-      &addrlen);
-  if (retlen < 0)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  i->addr = raddr;
-  return rport;
- error:
-  char* strerr = strerror (errno);
-
-  if (errno == ECONNREFUSED)
-    throw new ::java::net::PortUnreachableException (JvNewStringUTF (strerr));
-
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peekData (::java::net::DatagramPacket *p)
-{
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyte *dbytes = elements (p->getData()) + p->getOffset();
-  jint maxlen = p->maxlen - p->getOffset();
-  ssize_t retlen = 0;
-
-  // Do timeouts via select since SO_RCVTIMEO is not always available.
-  if (timeout > 0 && native_fd >= 0 && native_fd < FD_SETSIZE)
-    {
-      fd_set rset;
-      struct timeval tv;
-      FD_ZERO(&rset);
-      FD_SET(native_fd, &rset);
-      tv.tv_sec = timeout / 1000;
-      tv.tv_usec = (timeout % 1000) * 1000;
-      int retval;
-      if ((retval = _Jv_select (native_fd + 1, &rset, NULL, NULL, &tv)) < 0)
-        goto error;
-      else if (retval == 0)
-        throw new ::java::net::SocketTimeoutException
-          (JvNewStringUTF ("PeekData timed out") );
-    }
-
-  retlen =
-    ::recvfrom (native_fd, (char *) dbytes, maxlen, MSG_PEEK, (sockaddr*) &u,
-      &addrlen);
-  if (retlen < 0)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  p->setAddress (::java::net::InetAddress::getByAddress (raddr));
-  p->setPort (rport);
-  p->length = (int) retlen;
-  return rport;
-
- error:
-  char* strerr = strerror (errno);
-
-  if (errno == ECONNREFUSED)
-    throw new ::java::net::PortUnreachableException (JvNewStringUTF (strerr));
-
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-// Close(shutdown) the socket.
-void
-gnu::java::net::PlainDatagramSocketImpl::close ()
-{
-  // Avoid races from asynchronous finalization.
-  JvSynchronize sync (this);
-
-  // The method isn't declared to throw anything, so we disregard
-  // the return value.
-  _Jv_close (native_fd);
-  native_fd = -1;
-  timeout = 0;
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::send (::java::net::DatagramPacket *p)
-{
-  JvSynchronize lock (SEND_LOCK);
-  
-  // FIXME: Deal with Multicast.
-
-  ::java::net::InetAddress *host = p->getAddress();
-  if (host == NULL)
-    {
-      // If there is no host, maybe this socket was connected, in
-      // which case we try a plain send().
-      jbyte *dbytes = elements (p->getData()) + p->getOffset();
-      if (::send (native_fd, (char *) dbytes, p->getLength(), 0) >= 0)
-	return;
-    }
-  else
-    {
-      jint rport = p->getPort();
-      union SockAddr u;
-
-      jbyteArray haddress = host->addr;
-      jbyte *bytes = elements (haddress);
-      int len = haddress->length;
-      struct sockaddr *ptr = (struct sockaddr *) &u.address;
-      jbyte *dbytes = elements (p->getData()) + p->getOffset();
-      if (len == 4)
-	{
-	  u.address.sin_family = AF_INET;
-	  memcpy (&u.address.sin_addr, bytes, len);
-	  len = sizeof (struct sockaddr_in);
-	  u.address.sin_port = htons (rport);
-	}
-#ifdef HAVE_INET6
-      else if (len == 16)
-	{
-	  u.address6.sin6_family = AF_INET6;
-	  memcpy (&u.address6.sin6_addr, bytes, len);
-	  len = sizeof (struct sockaddr_in6);
-	  u.address6.sin6_port = htons (rport);
-	}
-#endif
-      else
-	throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-      if (::sendto (native_fd, (char *) dbytes, p->getLength(), 0, ptr, len)
-	  >= 0)
-	return;
-    }
-
-  char* strerr = strerror (errno);
-
-  if (errno == ECONNREFUSED)
-    throw new ::java::net::PortUnreachableException (JvNewStringUTF (strerr));
-
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p)
-{
-  JvSynchronize lock (RECEIVE_LOCK);
-
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyte *dbytes = elements (p->getData()) + p->getOffset();
-  jint maxlen = p->maxlen - p->getOffset();
-  ssize_t retlen = 0;
-
-  // Do timeouts via select since SO_RCVTIMEO is not always available.
-  if (timeout > 0 && native_fd >= 0 && native_fd < FD_SETSIZE)
-    {
-      fd_set rset;
-      struct timeval tv;
-      FD_ZERO(&rset);
-      FD_SET(native_fd, &rset);
-      tv.tv_sec = timeout / 1000;
-      tv.tv_usec = (timeout % 1000) * 1000;
-      int retval;
-      if ((retval = _Jv_select (native_fd + 1, &rset, NULL, NULL, &tv)) < 0)
-        goto error;
-      else if (retval == 0)
-        throw new ::java::net::SocketTimeoutException
-          (JvNewStringUTF ("Receive timed out") );
-    }
-
-  retlen =
-    ::recvfrom (native_fd, (char *) dbytes, maxlen, 0, (sockaddr*) &u,
-      &addrlen);
-  if (retlen < 0)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  p->setAddress (::java::net::InetAddress::getByAddress (raddr));
-  p->setPort (rport);
-  p->length = (jint) retlen;
-  return;
-
- error:
-  char* strerr = strerror (errno);
-
-  if (errno == ECONNREFUSED)
-    throw new ::java::net::PortUnreachableException (JvNewStringUTF (strerr));
-
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setTimeToLive (jint ttl)
-{
-  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is IPv4.
-  char val = (char) ttl;
-  socklen_t val_len = sizeof(val);
-
-  if (::setsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, val_len) == 0)
-    return;
-
-  char* strerr = strerror (errno);
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::getTimeToLive ()
-{
-  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is IPv4.
-  char val;
-  socklen_t val_len = sizeof(val);
-
-  if (::getsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, &val_len) == 0)
-    return ((int) val) & 0xFF;
-
-  char* strerr = strerror (errno);
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::mcastGrp (::java::net::InetAddress *inetaddr,
-                                                   ::java::net::NetworkInterface *,
-                                                   jboolean join)
-{
-  // FIXME: implement use of NetworkInterface
-
-  jbyteArray haddress = inetaddr->addr;
-#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IPV6_MREQ
-  union McastReq u;
-  jbyte *bytes = elements (haddress);
-#endif
-
-  int len = haddress->length;
-  int level, opname;
-  const char *ptr;
-  if (0)
-    ;
-#if HAVE_STRUCT_IP_MREQ
-  else if (len == 4)
-    {
-      level = IPPROTO_IP;
-      opname = join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP;
-      memcpy (&u.mreq.imr_multiaddr, bytes, len);
-      // FIXME:  If a non-default interface is set, use it; see Stevens p. 501.
-      // Maybe not, see note in last paragraph at bottom of Stevens p. 497.
-      u.mreq.imr_interface.s_addr = htonl (INADDR_ANY); 
-      len = sizeof (struct ip_mreq);
-      ptr = (const char *) &u.mreq;
-    }
-#endif
-#if HAVE_STRUCT_IPV6_MREQ
-  else if (len == 16)
-    {
-      level = IPPROTO_IPV6;
-
-      /* Prefer new RFC 2553 names.  */
-#ifndef IPV6_JOIN_GROUP
-#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
-#endif
-#ifndef IPV6_LEAVE_GROUP
-#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
-#endif
-
-      opname = join ? IPV6_JOIN_GROUP : IPV6_LEAVE_GROUP;
-      memcpy (&u.mreq6.ipv6mr_multiaddr, bytes, len);
-      // FIXME:  If a non-default interface is set, use it; see Stevens p. 501.
-      // Maybe not, see note in last paragraph at bottom of Stevens p. 497.
-      u.mreq6.ipv6mr_interface = 0;
-      len = sizeof (struct ipv6_mreq);
-      ptr = (const char *) &u.mreq6;
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::setsockopt (native_fd, level, opname, ptr, len) == 0)
-    return;
-
-  char* strerr = strerror (errno);
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-// Helper function to get the InetAddress for a given socket (file
-// descriptor).
-static ::java::net::InetAddress *
-getLocalAddress (int native_fd)
-{
-  jbyteArray laddr;
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-
-  if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) != 0)
-    {
-      char* strerr = strerror (errno);
-      throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-    }
-  if (u.address.sin_family == AF_INET)
-    {
-      laddr = JvNewByteArray (4);
-      memcpy (elements (laddr), &u.address.sin_addr, 4);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      laddr = JvNewByteArray (16);
-      memcpy (elements (laddr), &u.address6.sin6_addr, 16);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  return ::java::net::InetAddress::getByAddress (laddr);
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
-                                                    ::java::lang::Object *value)
-{
-  int val;
-  socklen_t val_len = sizeof (val);
-
-  if (native_fd < 0)
-    throw new ::java::net::SocketException (JvNewStringUTF ("Socket closed"));
-
-  if (_Jv_IsInstanceOf (value, &::java::lang::Boolean::class$))
-    {
-      ::java::lang::Boolean *boolobj = 
-        static_cast< ::java::lang::Boolean *> (value);
-      val = boolobj->booleanValue() ? 1 : 0;
-    }
-  else if (_Jv_IsInstanceOf (value, &::java::lang::Integer::class$))
-    {
-      ::java::lang::Integer *intobj = 
-        static_cast< ::java::lang::Integer *> (value);          
-      val = (int) intobj->intValue();
-    }
-  // Else assume value to be an InetAddress for use with IP_MULTICAST_IF.
-
-  switch (optID) 
-    {
-      case _Jv_TCP_NODELAY_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("TCP_NODELAY not valid for UDP"));
-        return;
-      case _Jv_SO_LINGER_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_LINGER not valid for UDP"));
-        return;
-      case _Jv_SO_KEEPALIVE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_KEEPALIVE not valid for UDP"));
-        return;
-
-      case _Jv_SO_BROADCAST_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-                          val_len) != 0)
-          goto error;
-	return;
-	
-      case _Jv_SO_OOBINLINE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_OOBINLINE: not valid for UDP"));
-        return;
-	
-      case _Jv_SO_SNDBUF_ :
-      case _Jv_SO_RCVBUF_ :
-#if defined(SO_SNDBUF) && defined(SO_RCVBUF)
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::setsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, val_len) != 0)
-	  goto error;    
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
-#endif 
-        return;
-      case _Jv_SO_REUSEADDR_ :
-#if defined(SO_REUSEADDR)
-	if (::setsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-	    val_len) != 0)
-	  goto error;
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_REUSEADDR not supported"));
-#endif 
-	return;
-      case _Jv_SO_BINDADDR_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_BINDADDR: read only option"));
-        return;
-      case _Jv_IP_MULTICAST_IF_ :
-	union InAddr u;
-        jbyteArray haddress;
-	jbyte *bytes;
-	int len;
-	int level, opname;
-	const char *ptr;
-
-	haddress = ((::java::net::InetAddress *) value)->addr;
-	bytes = elements (haddress);
-	len = haddress->length;
-	if (len == 4)
-	  {
-	    level = IPPROTO_IP;
-	    opname = IP_MULTICAST_IF;
-	    memcpy (&u.addr, bytes, len);
-	    len = sizeof (struct in_addr);
-	    ptr = (const char *) &u.addr;
-	  }
-#ifdef HAVE_INET6
-	else if (len == 16)
-	  {
-	    level = IPPROTO_IPV6;
-	    opname = IPV6_MULTICAST_IF;
-	    memcpy (&u.addr6, bytes, len);
-	    len = sizeof (struct in6_addr);
-	    ptr = (const char *) &u.addr6;
-	  }
-#endif
-	else
-	  throw
-	    new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-	if (::setsockopt (native_fd, level, opname, ptr, len) != 0)
-	  goto error;
-        return;
-	
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not yet implemented"));
-        return;
-	
-      case _Jv_IP_MULTICAST_LOOP_ :
-	// cache the local address
-	if (localAddress == NULL)
-	  localAddress = getLocalAddress (native_fd);
-	len = localAddress->addr->length;
-	if (len == 4)
-	  {
-	    level = IPPROTO_IP;
-	    opname = IP_MULTICAST_LOOP;
-	  }
-#if defined (HAVE_INET6) && defined (IPV6_MULTICAST_LOOP)
-	else if (len == 16)
-	  {
-	    level = IPPROTO_IPV6;
-	    opname = IPV6_MULTICAST_LOOP;
-	  }
-#endif
-	else
-	  throw
-	    new ::java::net::SocketException (JvNewStringUTF ("invalid address length"));
-	if (::setsockopt (native_fd, level, opname, (char *) &val,
-			  val_len) != 0)
-	  goto error;
-	return;
-	
-      case _Jv_IP_TOS_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-	   val_len) != 0)
-	  goto error;    
-	return;
-	
-      case _Jv_SO_TIMEOUT_ :
-	timeout = val;
-        return;
-      default :
-        errno = ENOPROTOOPT;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-}
-
-::java::lang::Object *
-gnu::java::net::PlainDatagramSocketImpl::getOption (jint optID)
-{
-  int val;
-  socklen_t val_len = sizeof(val);
-  int level, opname;
-
-  switch (optID)
-    {
-      case _Jv_TCP_NODELAY_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("TCP_NODELAY not valid for UDP"));
-        break;
-      case _Jv_SO_LINGER_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_LINGER not valid for UDP"));
-        break;    
-      case _Jv_SO_KEEPALIVE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_KEEPALIVE not valid for UDP"));
-        break;
-	
-      case _Jv_SO_BROADCAST_ :
-	if (::getsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-	    &val_len) != 0)
-	  goto error;
-	return new ::java::lang::Boolean (val != 0);
-	
-      case _Jv_SO_OOBINLINE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_OOBINLINE not valid for UDP"));
-        break;
-      
-      case _Jv_SO_RCVBUF_ :
-      case _Jv_SO_SNDBUF_ :
-#if defined(SO_SNDBUF) && defined(SO_RCVBUF)
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::getsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, &val_len) != 0)
-	  goto error;    
-        else
-	  return new ::java::lang::Integer (val);
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
-#endif    
-	break;
-      case _Jv_SO_BINDADDR_:
-	// cache the local address
-	if (localAddress == NULL)
-	  localAddress = getLocalAddress (native_fd);
-	return localAddress;  
-	break;
-      case _Jv_SO_REUSEADDR_ :
-#if defined(SO_REUSEADDR)
-	if (::getsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-	    &val_len) != 0)
-	  goto error;
-	return new ::java::lang::Boolean (val != 0);
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_REUSEADDR not supported"));
-#endif 
-	break;
-      case _Jv_IP_MULTICAST_IF_ :
-#ifdef HAVE_INET_NTOA
-	struct in_addr inaddr;
-  	socklen_t inaddr_len;
-	char *bytes;
-
-  	inaddr_len = sizeof(inaddr);
-	if (::getsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_IF, (char *) &inaddr,
-	    &inaddr_len) != 0)
-	  goto error;
-
-	bytes = inet_ntoa (inaddr);
-
-	return ::java::net::InetAddress::getByName (JvNewStringLatin1 (bytes));
-#else
-	throw new ::java::net::SocketException (
-	  JvNewStringUTF ("IP_MULTICAST_IF: not available - no inet_ntoa()"));
-#endif
-	break;
-      case _Jv_SO_TIMEOUT_ :
-	return new ::java::lang::Integer (timeout);
-	break;
-	
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not yet implemented"));
-        break;
-	
-      case _Jv_IP_MULTICAST_LOOP_ :
-	// cache the local address
-	localAddress = getLocalAddress (native_fd);
-	if (localAddress->addr->length == 4) 
-	  {
-	    level = IPPROTO_IP;
-	    opname = IP_MULTICAST_LOOP;
-	  }
-#if defined (HAVE_INET6) && defined (IPV6_MULTICAST_LOOP)
-	else if (localAddress->addr->length == 16)
-	  {
-	    level = IPPROTO_IPV6;
-	    opname = IPV6_MULTICAST_LOOP;
-	  }
-#endif
-	else
-	  throw
-	    new ::java::net::SocketException (JvNewStringUTF ("invalid address length"));
-	if (::getsockopt (native_fd, level, opname, (char *) &val,
-			  &val_len) != 0)
-	  goto error;
-	return new ::java::lang::Boolean (val != 0);
-	
-      case _Jv_IP_TOS_ :
-        if (::getsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-           &val_len) != 0)
-          goto error;
-        return new ::java::lang::Integer (val);
-	
-      default :
-	errno = ENOPROTOOPT;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-}
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
deleted file mode 100644
index eb1dd96..0000000
--- a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
+++ /dev/null
@@ -1,706 +0,0 @@
-/* Copyright (C) 2003, 2006, 2012 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-#include <string.h>
-
-#include <gnu/java/net/PlainDatagramSocketImpl.h>
-#include <java/io/IOException.h>
-#include <java/net/BindException.h>
-#include <java/net/SocketException.h>
-#include <java/net/InetAddress.h>
-#include <java/net/NetworkInterface.h>
-#include <java/net/DatagramPacket.h>
-#include <java/net/PortUnreachableException.h>
-#include <java/net/SocketTimeoutException.h>
-#include <java/lang/InternalError.h>
-#include <java/lang/Object.h>
-#include <java/lang/Boolean.h>
-#include <java/lang/Integer.h>
-
-union SockAddr
-{
-  struct sockaddr_in address;
-#ifdef HAVE_INET6
-  struct sockaddr_in6 address6;
-#endif
-};
-
-union McastReq
-{
-#if HAVE_STRUCT_IP_MREQ
-  struct ip_mreq mreq;
-#endif
-#if HAVE_STRUCT_IPV6_MREQ
-  struct ipv6_mreq mreq6;
-#endif
-};
-
-union InAddr
-{
-  struct in_addr addr;
-#ifdef HAVE_INET6
-  struct in6_addr addr6;
-#endif
-};
-
-// FIXME: routines here and/or in natPlainSocketImpl.cc could throw
-// NoRouteToHostException; also consider UnknownHostException, ConnectException.
-
-void
-gnu::java::net::PlainDatagramSocketImpl::create ()
-{
-  SOCKET sock = ::socket (AF_INET, SOCK_DGRAM, 0);
-
-  if (sock == INVALID_SOCKET)
-    {
-      _Jv_ThrowSocketException ();
-    }
-
-  // Cast this to a HANDLE so we can make
-  // it non-inheritable via _Jv_platform_close_on_exec.
-  HANDLE hSocket = (HANDLE) sock;
-  _Jv_platform_close_on_exec (hSocket);
-
-  // We use native_fd in place of fd here.  From leaving fd null we avoid
-  // the double close problem in FileDescriptor.finalize.
-  native_fd = (jint) hSocket;
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::bind (jint lport,
-					  ::java::net::InetAddress *host)
-{
-  union SockAddr u;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  // FIXME: Use getaddrinfo() to get actual protocol instead of assuming ipv4.
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-
-      if (host != NULL)
-        memcpy (&u.address.sin_addr, bytes, len);
-      else
-        u.address.sin_addr.s_addr = htonl (INADDR_ANY);
-
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (lport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (lport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::bind (native_fd, ptr, len) == 0)
-    {
-      socklen_t addrlen = sizeof(u);
-
-      if (lport != 0)
-        localPort = lport;
-      else if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) == 0)
-        localPort = ntohs (u.address.sin_port);
-      else
-        goto error;
-
-      /* Allow broadcast by default. */
-      int broadcast = 1;
-      if (::setsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &broadcast,
-                        sizeof (broadcast)) != 0)
-        goto error;
-
-      return;
-    }
-
-error:
-  DWORD dwErrorCode = WSAGetLastError ();
-  throw new ::java::net::BindException (_Jv_WinStrError (dwErrorCode));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::connect (::java::net::InetAddress *, jint)
-{ 
-  throw new ::java::lang::InternalError (JvNewStringLatin1 (
-      "PlainDatagramSocketImpl::connect: not implemented yet"));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::disconnect ()
-{
-  throw new ::java::lang::InternalError (JvNewStringLatin1 (
-      "PlainDatagramSocketImpl::disconnect: not implemented yet"));
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peek (::java::net::InetAddress *i)
-{
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  ssize_t retlen =
-    ::recvfrom (native_fd, (char *) NULL, 0, MSG_PEEK, (sockaddr*) &u,
-      &addrlen);
-  if (retlen < 0)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  i->addr = raddr;
-  return rport;
-error:
-  DWORD dwErrorCode = WSAGetLastError ();
-  if (dwErrorCode == WSAECONNRESET)
-    throw new ::java::net::PortUnreachableException (_Jv_WinStrError (dwErrorCode));
-
-  _Jv_ThrowIOException ();
-  return -1;
-    // we should never get here
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::peekData(::java::net::DatagramPacket *p)
-{
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyte *dbytes = elements (p->getData()) + p->getOffset();
-  jint maxlen = p->maxlen - p->getOffset();
-  ssize_t retlen = 0;
-
-  if (timeout > 0)
-    {
-      int nRet= ::setsockopt(native_fd, SOL_SOCKET, SO_RCVTIMEO,
-        (char*)&timeout, sizeof(timeout));
-      if (nRet != NO_ERROR)
-        goto error;
-    }
-
-  retlen =
-    ::recvfrom (native_fd, (char *) dbytes, maxlen, MSG_PEEK, (sockaddr*) &u,
-      &addrlen);
-  if (retlen == SOCKET_ERROR)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  p->setAddress (::java::net::InetAddress::getByAddress (raddr));
-  p->setPort (rport);
-  p->length = (jint) retlen;
-  return rport;
-
-error:
-  DWORD dwErrorCode = WSAGetLastError ();
-  if (dwErrorCode == WSAECONNRESET)
-    throw new ::java::net::PortUnreachableException (_Jv_WinStrError (dwErrorCode));
-  else if (dwErrorCode == WSAETIMEDOUT)
-    throw new ::java::net::SocketTimeoutException (_Jv_WinStrError (dwErrorCode));
-  else
-    _Jv_ThrowIOException ();
-
-  return -1;
-    // we should never get here
-}
-
-// Close(shutdown) the socket.
-void
-gnu::java::net::PlainDatagramSocketImpl::close ()
-{
-  // Avoid races from asynchronous finalization.
-  JvSynchronize sync (this);
-
-  // The method isn't declared to throw anything, so we disregard
-  // the return value.
-  ::closesocket (native_fd);
-  native_fd = -1;
-  timeout = 0;
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::send (::java::net::DatagramPacket *p)
-{
-  JvSynchronize lock (SEND_LOCK);
-
-  // FIXME: Deal with Multicast and if the socket is connected.
-  jint rport = p->getPort();
-  union SockAddr u;
-  jbyteArray haddress = p->getAddress()->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  jbyte *dbytes = elements (p->getData()) + p->getOffset();
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-      memcpy (&u.address.sin_addr, bytes, len);
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (rport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (rport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::sendto (native_fd, (char *) dbytes, p->getLength(), 0, ptr, len) >= 0)
-    return;
-
-  DWORD dwErrorCode = WSAGetLastError ();
-  if (dwErrorCode == WSAECONNRESET)
-    throw new ::java::net::PortUnreachableException (_Jv_WinStrError (dwErrorCode));
-
-  _Jv_ThrowIOException ();
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p)
-{
-  JvSynchronize lock (RECEIVE_LOCK);
-
-  // FIXME: Deal with Multicast and if the socket is connected.
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyte *dbytes = elements (p->getData()) + p->getOffset();
-  jint maxlen = p->maxlen - p->getOffset();
-  ssize_t retlen = 0;
-
-  if (timeout > 0)
-    {
-      // This implementation doesn't allow specifying an infinite
-      // timeout after specifying a finite one, but Sun's JDK 1.4.1
-      // didn't seem to allow this either....
-      int nRet= ::setsockopt(native_fd, SOL_SOCKET, SO_RCVTIMEO,
-        (char*)&timeout, sizeof(timeout));
-      if (nRet != NO_ERROR)
-        goto error;
-    }
-
-  retlen =
-    ::recvfrom (native_fd, (char *) dbytes, maxlen, 0, (sockaddr*) &u,
-      &addrlen);
-  if (retlen < 0)
-    goto error;
-  // FIXME: Deal with Multicast addressing and if the socket is connected.
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  p->setAddress (::java::net::InetAddress::getByAddress (raddr));
-  p->setPort (rport);
-  p->length = (jint) retlen;
-  return;
-
- error:
-  DWORD dwErrorCode = WSAGetLastError();
-  if (dwErrorCode == WSAECONNRESET)
-    throw new ::java::net::PortUnreachableException (_Jv_WinStrError (dwErrorCode));
-  else if (dwErrorCode == WSAETIMEDOUT)
-    throw new ::java::net::SocketTimeoutException (_Jv_WinStrError (dwErrorCode));
-  else
-    throw new ::java::io::IOException (_Jv_WinStrError (dwErrorCode));
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setTimeToLive (jint ttl)
-{
-  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is IPv4.
-  char val = (char) ttl;
-  socklen_t val_len = sizeof(val);
-
-  if (::setsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, val_len) == 0)
-    return;
-
-  _Jv_ThrowIOException ();
-}
-
-jint
-gnu::java::net::PlainDatagramSocketImpl::getTimeToLive ()
-{
-  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is IPv4.
-  char val;
-  socklen_t val_len = sizeof(val);
-
-  if (::getsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, &val_len) == 0)
-    return ((int) val) & 0xFF;
-
-  _Jv_ThrowIOException ();
-
-  return -1;
-    // we should never get here
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::mcastGrp (::java::net::InetAddress *inetaddr,
-                                              ::java::net::NetworkInterface *,
-					      jboolean join)
-{
-  // FIXME: implement use of NetworkInterface
-  jbyteArray haddress = inetaddr->addr;
-  int len = haddress->length;
-  int level, opname;
-  const char *ptr;
-  if (0)
-    ;
-#if HAVE_STRUCT_IP_MREQ
-  else if (len == 4)
-    {
-      level = IPPROTO_IP;
-      opname = join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP;
-      memcpy (&u.mreq.imr_multiaddr, bytes, len);
-      // FIXME:  If a non-default interface is set, use it; see Stevens p. 501.
-      // Maybe not, see note in last paragraph at bottom of Stevens p. 497.
-      u.mreq.imr_interface.s_addr = htonl (INADDR_ANY);
-      len = sizeof (struct ip_mreq);
-      ptr = (const char *) &u.mreq;
-    }
-#endif
-#if HAVE_STRUCT_IPV6_MREQ
-  else if (len == 16)
-    {
-      level = IPPROTO_IPV6;
-
-      /* Prefer new RFC 2553 names.  */
-#ifndef IPV6_JOIN_GROUP
-#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
-#endif
-#ifndef IPV6_LEAVE_GROUP
-#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
-#endif
-
-      opname = join ? IPV6_JOIN_GROUP : IPV6_LEAVE_GROUP;
-      memcpy (&u.mreq6.ipv6mr_multiaddr, bytes, len);
-      // FIXME:  If a non-default interface is set, use it; see Stevens p. 501.
-      // Maybe not, see note in last paragraph at bottom of Stevens p. 497.
-      u.mreq6.ipv6mr_interface = 0;
-      len = sizeof (struct ipv6_mreq);
-      ptr = (const char *) &u.mreq6;
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::setsockopt (native_fd, level, opname, ptr, len) == 0)
-    return;
-
-  _Jv_ThrowIOException ();
-}
-
-void
-gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
-					       ::java::lang::Object *value)
-{
-  int val;
-  socklen_t val_len = sizeof (val);
-
-  if (native_fd < 0)
-    throw new ::java::net::SocketException (JvNewStringUTF ("Socket closed"));
-
-  if (_Jv_IsInstanceOf (value, &::java::lang::Boolean::class$))
-    {
-      ::java::lang::Boolean *boolobj = 
-        static_cast< ::java::lang::Boolean *> (value);
-      val = boolobj->booleanValue() ? 1 : 0;
-    }
-  else if (_Jv_IsInstanceOf (value, &::java::lang::Integer::class$))
-    {
-      ::java::lang::Integer *intobj = 
-        static_cast< ::java::lang::Integer *> (value);          
-      val = (int) intobj->intValue();
-    }
-  // Else assume value to be an InetAddress for use with IP_MULTICAST_IF.
-
-  switch (optID)
-    {
-      case _Jv_TCP_NODELAY_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("TCP_NODELAY not valid for UDP"));
-        return;
-      case _Jv_SO_LINGER_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_LINGER not valid for UDP"));
-        return;
-      case _Jv_SO_KEEPALIVE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_KEEPALIVE not valid for UDP"));
-        return;
-
-      case _Jv_SO_BROADCAST_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-                          val_len) != 0)
-          goto error;
-  break;
-
-      case _Jv_SO_OOBINLINE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_OOBINLINE: not valid for UDP"));
-        break;
-
-      case _Jv_SO_SNDBUF_ :
-      case _Jv_SO_RCVBUF_ :
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::setsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, val_len) != 0)
-    goto error;
-        return;
-      case _Jv_SO_REUSEADDR_ :
-  if (::setsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-      val_len) != 0)
-    goto error;
-  return;
-      case _Jv_SO_BINDADDR_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_BINDADDR: read only option"));
-        return;
-      case _Jv_IP_MULTICAST_IF_ :
-  union InAddr u;
-        jbyteArray haddress;
-  jbyte *bytes;
-  int len;
-  int level, opname;
-  const char *ptr;
-
-  haddress = ((::java::net::InetAddress *) value)->addr;
-  bytes = elements (haddress);
-  len = haddress->length;
-  if (len == 4)
-    {
-      level = IPPROTO_IP;
-      opname = IP_MULTICAST_IF;
-      memcpy (&u.addr, bytes, len);
-      len = sizeof (struct in_addr);
-      ptr = (const char *) &u.addr;
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      level = IPPROTO_IPV6;
-      opname = IPV6_MULTICAST_IF;
-      memcpy (&u.addr6, bytes, len);
-      len = sizeof (struct in6_addr);
-      ptr = (const char *) &u.addr6;
-    }
-#endif
-  else
-    throw
-      new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::setsockopt (native_fd, level, opname, ptr, len) != 0)
-    goto error;
-        return;
-
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not yet implemented"));
-        break;
-
-      case _Jv_IP_MULTICAST_LOOP_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_LOOP: not yet implemented"));
-        break;
-
-      case _Jv_IP_TOS_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-     val_len) != 0)
-    goto error;
-  return;
-
-      case _Jv_SO_TIMEOUT_ :
-  timeout = val;
-        return;
-      default :
-        WSASetLastError (WSAENOPROTOOPT);
-    }
-
- error:
-  _Jv_ThrowSocketException ();
-}
-
-::java::lang::Object *
-gnu::java::net::PlainDatagramSocketImpl::getOption (jint optID)
-{
-  int val;
-  socklen_t val_len = sizeof(val);
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-
-  switch (optID)
-    {
-      case _Jv_TCP_NODELAY_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("TCP_NODELAY not valid for UDP"));
-        break;
-      case _Jv_SO_LINGER_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_LINGER not valid for UDP"));
-        break;
-      case _Jv_SO_KEEPALIVE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_KEEPALIVE not valid for UDP"));
-        break;
-
-      case _Jv_SO_BROADCAST_ :
-  if (::getsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-      &val_len) != 0)
-    goto error;
-  return new ::java::lang::Boolean (val != 0);
-
-      case _Jv_SO_OOBINLINE_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_OOBINLINE not valid for UDP"));
-        break;
-
-      case _Jv_SO_RCVBUF_ :
-      case _Jv_SO_SNDBUF_ :
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::getsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, &val_len) != 0)
-    goto error;
-        else
-    return new ::java::lang::Integer (val);
-  break;
-      case _Jv_SO_BINDADDR_:
-  // cache the local address
-  if (localAddress == NULL)
-    {
-      jbyteArray laddr;
-      if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) != 0)
-        goto error;
-      if (u.address.sin_family == AF_INET)
-        {
-	  laddr = JvNewByteArray (4);
-	  memcpy (elements (laddr), &u.address.sin_addr, 4);
-        }
-#ifdef HAVE_INET6
-      else if (u.address.sin_family == AF_INET6)
-        {
-	  laddr = JvNewByteArray (16);
-	  memcpy (elements (laddr), &u.address6.sin6_addr, 16);
-        }
-#endif
-      else
-        throw new ::java::net::SocketException (
-            JvNewStringUTF ("invalid family"));
-      localAddress = ::java::net::InetAddress::getByAddress (laddr);
-    }
-  return localAddress;
-  break;
-      case _Jv_SO_REUSEADDR_ :
-  if (::getsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-      &val_len) != 0)
-    goto error;
-  return new ::java::lang::Boolean (val != 0);
-  break;
-      case _Jv_IP_MULTICAST_IF_ :
-  struct in_addr inaddr;
-    socklen_t inaddr_len;
-  char *bytes;
-
-    inaddr_len = sizeof(inaddr);
-  if (::getsockopt (native_fd, IPPROTO_IP, IP_MULTICAST_IF, (char *) &inaddr,
-      &inaddr_len) != 0)
-    goto error;
-
-  bytes = inet_ntoa (inaddr);
-
-  return ::java::net::InetAddress::getByName (JvNewStringLatin1 (bytes));
-  break;
-      case _Jv_SO_TIMEOUT_ :
-	return new ::java::lang::Integer (timeout);
-	break;
-	
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not yet implemented"));
-        break;
-
-      case _Jv_IP_MULTICAST_LOOP_ :
-  if (::getsockopt (native_fd, SOL_SOCKET, IP_MULTICAST_LOOP, (char *) &val,
-      &val_len) != 0)
-    goto error;
-  return new ::java::lang::Boolean (val != 0);
-
-      case _Jv_IP_TOS_ :
-        if (::getsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-           &val_len) != 0)
-          goto error;
-        return new ::java::lang::Integer (val);
-	
-      default :
-        WSASetLastError (WSAENOPROTOOPT);
-    }
-
-error:
-  _Jv_ThrowSocketException ();
-  return 0;
-    // we should never get here
-}
diff --git a/libjava/gnu/java/net/natPlainSocketImplNoNet.cc b/libjava/gnu/java/net/natPlainSocketImplNoNet.cc
deleted file mode 100644
index a9138af..0000000
--- a/libjava/gnu/java/net/natPlainSocketImplNoNet.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gnu/java/net/PlainSocketImpl.h>
-#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
-#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
-#include <java/io/IOException.h>
-#include <java/net/BindException.h>
-#include <java/net/ConnectException.h>
-#include <java/net/SocketException.h>
-
-void
-gnu::java::net::PlainSocketImpl::create (jboolean)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.create: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *, jint)
-{
-  throw new ::java::net::BindException (
-    JvNewStringLatin1 ("SocketImpl.bind: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *, jint)
-{
-  throw new ::java::net::ConnectException (
-    JvNewStringLatin1 ("SocketImpl.connect: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::listen (jint)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.listen: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *)
-{
-  throw new ::java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.accept: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::setOption (jint, ::java::lang::Object *)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.setOption: unimplemented"));
-}
-
-::java::lang::Object *
-gnu::java::net::PlainSocketImpl::getOption (jint)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.getOption: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(void)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, 
-  jint offset, jint count)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jint b)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jbyteArray b, 
-  jint offset, jint len)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::sendUrgentData(jint data)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.sendUrgentData: unimplemented"));
-}
-
-jint
-gnu::java::net::PlainSocketImpl::available(void)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.available: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::close(void)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.close: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownInput (void)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.shutdownInput: unimplemented"));
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownOutput (void)
-{
-  throw new ::java::net::SocketException (
-    JvNewStringLatin1 ("SocketImpl.shutdownOutput: unimplemented"));
-}
diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
deleted file mode 100644
index 7671cc3..0000000
--- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc
+++ /dev/null
@@ -1,863 +0,0 @@
-/* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2012  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-#define BSD_COMP /* Get FIONREAD on Solaris2. */
-#include <sys/ioctl.h>
-#endif
-
-// Pick up FIONREAD on Solaris 2.5.
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <errno.h>
-#include <string.h>
-
-#include <gcj/cni.h>
-#include <gcj/javaprims.h>
-#include <gnu/java/net/PlainSocketImpl.h>
-#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
-#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
-#include <java/io/IOException.h>
-#include <java/io/InterruptedIOException.h>
-#include <java/net/BindException.h>
-#include <java/net/ConnectException.h>
-#include <java/net/InetAddress.h>
-#include <java/net/InetSocketAddress.h>
-#include <java/net/SocketException.h>
-#include <java/net/SocketTimeoutException.h>
-#include <java/lang/InternalError.h>
-#include <java/lang/Object.h>
-#include <java/lang/Boolean.h>
-#include <java/lang/Class.h>
-#include <java/lang/Integer.h>
-#include <java/lang/Thread.h>
-#include <java/lang/NullPointerException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/IllegalArgumentException.h>
-#include <java/net/UnknownHostException.h>
-
-union SockAddr
-{
-  struct sockaddr_in address;
-#ifdef HAVE_INET6
-  struct sockaddr_in6 address6;
-#endif
-};
-
-void
-gnu::java::net::PlainSocketImpl::create (jboolean stream)
-{
-  // We might already have been create()d in the nio case.
-  if (native_fd != -1)
-    return;
-
-  int sock = _Jv_socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
-
-  if (sock < 0)
-    {
-      char* strerr = strerror (errno);
-      throw new ::java::io::IOException (JvNewStringUTF (strerr));
-    }
-
-  // We use native_fd in place of fd here.  From leaving fd null we avoid
-  // the double close problem in FileDescriptor.finalize.
-  native_fd = sock;
-}
-
-void
-gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lport)
-{
-  union SockAddr u;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-  int i = 1;
-
-  // The following is needed for OS X/PPC, otherwise bind() fails with an
-  // error. I found the issue and following fix on some mailing list, but
-  // no explanation was given as to why this solved the problem.
-  memset (&u, 0, sizeof (u));
-
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-      memcpy (&u.address.sin_addr, bytes, len);
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (lport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (lport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  // Enable SO_REUSEADDR, so that servers can reuse ports left in TIME_WAIT.
-  ::setsockopt(native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &i, sizeof(i));
-  
-  if (_Jv_bind (native_fd, ptr, len) == 0)
-    {
-      socklen_t addrlen = sizeof(u);
-
-      if (lport != 0)
-        localport = lport;
-      else if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) == 0)
-        localport = ntohs (u.address.sin_port);
-      else
-        goto error;
-
-      return;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::BindException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr,
-					  jint timeout)
-{
-  ::java::net::InetSocketAddress *tmp = (::java::net::InetSocketAddress*) addr;
-  ::java::net::InetAddress *host = tmp->getAddress();
-  if (! host)
-    throw new ::java::net::UnknownHostException(tmp->toString());
-
-  jint rport = tmp->getPort();
-	
-  // Set the SocketImpl's address and port fields before we try to
-  // connect.  Note that the fact that these are set doesn't imply
-  // that we're actually connected to anything.  We need to record
-  // this data before we attempt the connect, since non-blocking
-  // SocketChannels will use this and almost certainly throw timeout
-  // exceptions.
-  address = host;
-  port = rport;
-
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-      memcpy (&u.address.sin_addr, bytes, len);
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (rport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (rport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (timeout > 0)
-    {
-      int flags = ::fcntl (native_fd, F_GETFL);
-      ::fcntl (native_fd, F_SETFL, flags | O_NONBLOCK);
-      
-      if ((_Jv_connect (native_fd, ptr, len) != 0) && (errno != EINPROGRESS))
-        goto error;
-
-      fd_set fset;
-      struct timeval tv;
-      FD_ZERO(&fset);
-      FD_SET(native_fd, &fset);
-      tv.tv_sec = timeout / 1000;
-      tv.tv_usec = (timeout % 1000) * 1000;
-      int retval;
-      
-      if ((retval = _Jv_select (native_fd + 1, &fset, &fset, NULL, &tv)) < 0)
-        goto error;
-      else if (retval == 0)
-        throw new ::java::net::SocketTimeoutException
-          (JvNewStringUTF ("Connect timed out"));
-       // Set the socket back into a blocking state.
-       ::fcntl (native_fd, F_SETFL, flags);
-    }
-  else
-    {
-      if (_Jv_connect (native_fd, ptr, len) != 0)
-        goto error;
-    }
-
-  // A bind may not have been done on this socket; if so, set localport now.
-  if (localport == 0)
-    {
-      if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) == 0)
-        localport = ntohs (u.address.sin_port);
-      else
-        goto error;
-    }
-
-  return;  
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::ConnectException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainSocketImpl::listen (jint backlog)
-{
-  if (::listen (native_fd, backlog) != 0)
-    {
-      char* strerr = strerror (errno);
-      throw new ::java::io::IOException (JvNewStringUTF (strerr));
-    }
-}
-
-static void 
-throw_on_sock_closed (gnu::java::net::PlainSocketImpl *soc_impl)
-{
-    // Avoid races from asynchronous close().
-    JvSynchronize sync (soc_impl);
-    if (soc_impl->native_fd == -1)
-      {
-        using namespace java::net;
-        // Socket was closed.
-        SocketException *se =
-            new SocketException (JvNewStringUTF ("Socket Closed"));
-        throw se;
-      }
-}
-
-void
-gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s)
-{
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  int new_socket = 0; 
-
-  // Do timeouts via select since SO_RCVTIMEO is not always available.
-  if (timeout > 0 && native_fd >= 0 && native_fd < FD_SETSIZE)
-    {
-      fd_set fset;
-      struct timeval tv;
-      FD_ZERO(&fset);
-      FD_SET(native_fd, &fset);
-      tv.tv_sec = timeout / 1000;
-      tv.tv_usec = (timeout % 1000) * 1000;
-      int retval;
-      if ((retval = _Jv_select (native_fd + 1, &fset, &fset, NULL, &tv)) < 0)
-        goto error;
-      else if (retval == 0)
-        throw new ::java::net::SocketTimeoutException (
-	                                  JvNewStringUTF("Accept timed out"));
-    }
-
-  new_socket = ::accept (native_fd, (sockaddr*) &u, &addrlen);
-
-  if (new_socket < 0)
-    goto error;
-
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  s->native_fd = new_socket;
-  s->localport = localport;
-  s->address = ::java::net::InetAddress::getByAddress (raddr);
-  s->port = rport;
-  return;
-
- error:
-  char* strerr = strerror (errno);
-  throw_on_sock_closed (this);
-  throw new ::java::io::IOException (JvNewStringUTF (strerr));
-}
-
-// Close(shutdown) the socket.
-void
-gnu::java::net::PlainSocketImpl::close()
-{
-  // Avoid races from asynchronous finalization.
-  JvSynchronize sync (this);
-
-  // Should we use shutdown here? Yes.
-  // How would that effect so_linger? Uncertain.
-  ::shutdown (native_fd, 2);
-  // Ignore errors in shutdown as we are closing and all the same
-  // errors are handled in the close.
-  int res = _Jv_close (native_fd);
-
-  if (res == -1)
-    {
-      // These three errors are not errors according to tests performed
-      // on the reference implementation.
-      if (errno != ENOTCONN && errno != ECONNRESET && errno != EBADF)
-        throw new ::java::io::IOException  (JvNewStringUTF (strerror (errno)));
-    }
-  // Safe place to reset the file pointer.
-  native_fd = -1;
-  timeout = 0;
-}
-
-static void
-write_helper (jint native_fd, jbyte *bytes, jint len);
-
-// Write a byte to the socket.
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jint b)
-{
-  jbyte data = (jbyte) b;
-  write_helper (this$0->native_fd, &data, 1);
-}
-
-// Write some bytes to the socket.
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jbyteArray b, jint offset, jint len)
-{
-  if (! b)
-    throw new ::java::lang::NullPointerException;
-  if (offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  write_helper (this$0->native_fd, elements (b) + offset, len);
-}
-
-static void
-write_helper(jint native_fd, jbyte *bytes, jint len)
-{
-  int written = 0;
-
-  while (len > 0)
-    {
-      int r = _Jv_write (native_fd, bytes, len);
-
-      if (r == -1)
-        {
-          if (::java::lang::Thread::interrupted())
-            {
-              ::java::io::InterruptedIOException *iioe
-                = new ::java::io::InterruptedIOException
-                (JvNewStringLatin1 (strerror (errno)));
-              iioe->bytesTransferred = written;
-              throw iioe;
-            }
-          // Some errors should not cause exceptions.
-          if (errno != ENOTCONN && errno != ECONNRESET && errno != EBADF)
-            throw new ::java::io::IOException (JvNewStringUTF (strerror (errno)));
-          break;
-        }
-
-      written += r;
-      len -= r;
-      bytes += r;
-    }
-}
-
-void
-gnu::java::net::PlainSocketImpl::sendUrgentData (jint)
-{
-  throw new ::java::net::SocketException (JvNewStringLatin1 (
-    "PlainSocketImpl: sending of urgent data not supported by this socket"));
-}
-
-static jint
-read_helper (gnu::java::net::PlainSocketImpl *soc_impl,
-             jbyte *bytes, jint count);
-
-// Read a single byte from the socket.
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(void)
-{
-  jbyte data;
-
-  if (read_helper (this$0, &data, 1) == 1)
-    return data & 0xFF;
-
-  return -1;
-}
-
-// Read count bytes into the buffer, starting at offset.
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer,
-                                                        jint offset, 
-                                                        jint count)
-{
- if (! buffer)
-    throw new ::java::lang::NullPointerException;
-
-  jsize bsize = JvGetArrayLength (buffer);
-
-  if (offset < 0 || count < 0 || offset + count > bsize)
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  return read_helper (this$0, elements (buffer) + offset, count);
-}
-
-static jint
-read_helper (gnu::java::net::PlainSocketImpl *soc_impl,
-             jbyte *bytes, jint count)
-{
-  // If zero bytes were requested, short circuit so that recv
-  // doesn't signal EOF.
-  if (count == 0)
-    return 0;
-    
-  // Do timeouts via select.
-  if (soc_impl->timeout > 0
-      && soc_impl->native_fd >= 0
-      && soc_impl->native_fd < FD_SETSIZE)
-    {
-      // Create the file descriptor set.
-      fd_set read_fds;
-      FD_ZERO (&read_fds);
-      FD_SET (soc_impl->native_fd, &read_fds);
-      // Create the timeout struct based on our internal timeout value.
-      struct timeval timeout_value;
-      timeout_value.tv_sec = soc_impl->timeout / 1000;
-      timeout_value.tv_usec =(soc_impl->timeout % 1000) * 1000;
-      // Select on the fds.
-      int sel_retval =
-        _Jv_select (soc_impl->native_fd + 1,
-                    &read_fds, NULL, NULL, &timeout_value);
-      // We're only interested in the 0 return.
-      // error returns still require us to try to read 
-      // the socket to see what happened.
-      if (sel_retval == 0)
-        {
-          ::java::net::SocketTimeoutException *timeoutException =
-            new ::java::net::SocketTimeoutException
-            (JvNewStringUTF ("Read timed out"));
-	  throw timeoutException;
-        }
-    }
-
-  // Read the socket.
-  int r = ::recv (soc_impl->native_fd, (char *) bytes, count, 0);
-
-  if (r == 0)
-    {
-      throw_on_sock_closed (soc_impl);
-      return -1;
-    }
-
-  if (::java::lang::Thread::interrupted())
-    {
-      ::java::io::InterruptedIOException *iioe =
-        new ::java::io::InterruptedIOException
-        (JvNewStringUTF ("Read interrupted"));
-      iioe->bytesTransferred = r == -1 ? 0 : r;
-      throw iioe;
-    }
-  else if (r == -1)
-    {
-      throw_on_sock_closed (soc_impl);
-      // Some errors cause us to return end of stream...
-      if (errno == ENOTCONN)
-        return -1;
-
-      // Other errors need to be signalled.
-      throw new ::java::io::IOException (JvNewStringUTF (strerror (errno)));
-    }
-
-  return r;
-}
-
-// How many bytes are available?
-jint
-gnu::java::net::PlainSocketImpl::available(void)
-{
-#if defined(FIONREAD) || defined(HAVE_SELECT)
-  int num = 0;
-  int r = 0;
-  bool num_set = false;
-
-#if defined(FIONREAD)
-  r = ::ioctl (native_fd, FIONREAD, &num);
-
-  if (r == -1 && errno == ENOTTY)
-    {
-      // If the ioctl doesn't work, we don't care.
-      r = 0;
-      num = 0;
-    }
-  else
-    num_set = true;
-#elif defined(HAVE_SELECT)
-  if (native_fd < 0)
-    {
-      errno = EBADF;
-      r = -1;
-    }
-#endif
-
-  if (r == -1)
-    {
-    posix_error:
-      throw new ::java::io::IOException(JvNewStringUTF(strerror(errno)));
-    }
-
-  // If we didn't get anything we can use select.
-
-#if defined(HAVE_SELECT)
-  if (! num_set)
-    if (! num_set && native_fd >= 0 && native_fd < FD_SETSIZE)
-      {
-        fd_set rd;
-        FD_ZERO (&rd);
-        FD_SET (native_fd, &rd);
-        struct timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 0;
-        r = _Jv_select (native_fd + 1, &rd, NULL, NULL, &tv);
-        if(r == -1)
-          goto posix_error;
-        num = r == 0 ? 0 : 1;
-      }
-#endif /* HAVE_SELECT */
-
-  return (jint) num;
-#else
-  throw new ::java::io::IOException (JvNewStringUTF ("unimplemented"));
-#endif
-}
-
-void
-gnu::java::net::PlainSocketImpl::setOption (jint optID, ::java::lang::Object *value)
-{
-  int val;
-  socklen_t val_len = sizeof (val);
-
-  if (native_fd < 0)
-    throw new ::java::net::SocketException (JvNewStringUTF ("Socket closed"));
-
-  if (_Jv_IsInstanceOf (value, &::java::lang::Boolean::class$))
-    {
-      ::java::lang::Boolean *boolobj = 
-        static_cast< ::java::lang::Boolean *> (value);
-      if (boolobj->booleanValue())
-        val = 1; 
-      else 
-        {
-          if (optID == _Jv_SO_LINGER_)
-            val = -1;
-          else
-            val = 0;
-        }
-    }
-  else if (_Jv_IsInstanceOf (value, &::java::lang::Integer::class$))
-    {
-      ::java::lang::Integer *intobj = 
-        static_cast< ::java::lang::Integer *> (value);          
-      val = (int) intobj->intValue();
-    }
-  else
-    {
-      throw new ::java::lang::IllegalArgumentException (
-        JvNewStringLatin1 ("`value' must be Boolean or Integer"));
-    }
-
-  switch (optID) 
-    {
-      case _Jv_TCP_NODELAY_ :
-#ifdef TCP_NODELAY
-        if (::setsockopt (native_fd, IPPROTO_TCP, TCP_NODELAY, (char *) &val,
-                          val_len) != 0)
-          goto error;
-#else
-        throw new ::java::lang::InternalError
-          (JvNewStringUTF ("TCP_NODELAY not supported"));
-#endif /* TCP_NODELAY */
-        return;
-
-      case _Jv_SO_KEEPALIVE_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &val,
-                          val_len) != 0)
-          goto error;
-        return;
-      
-      case _Jv_SO_BROADCAST_ :
-        throw new ::java::net::SocketException
-          (JvNewStringUTF ("SO_BROADCAST not valid for TCP"));
-        return;
-	
-      case _Jv_SO_OOBINLINE_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_OOBINLINE, (char *) &val,
-                          val_len) != 0)
-          goto error;
-        return;
-
-      case _Jv_SO_LINGER_ :
-#ifdef SO_LINGER
-        struct linger l_val;
-        l_val.l_onoff = (val != -1);
-        l_val.l_linger = val;
-
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_LINGER, (char *) &l_val,
-                          sizeof(l_val)) != 0)
-          goto error;    
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_LINGER not supported"));
-#endif /* SO_LINGER */
-        return;
-
-      case _Jv_SO_SNDBUF_ :
-      case _Jv_SO_RCVBUF_ :
-#if defined(SO_SNDBUF) && defined(SO_RCVBUF)
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::setsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, val_len) != 0)
-          goto error;    
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
-#endif 
-        return;
-
-      case _Jv_SO_BINDADDR_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_BINDADDR: read only option"));
-        return;
-
-      case _Jv_IP_MULTICAST_IF_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
-        return;
-	
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not valid for TCP"));
-        return;
-	
-      case _Jv_IP_MULTICAST_LOOP_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_LOOP: not valid for TCP"));
-        return;
-	
-      case _Jv_IP_TOS_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-                          val_len) != 0)
-          goto error;    
-        return;
-	
-      case _Jv_SO_REUSEADDR_ :
-#if defined(SO_REUSEADDR)
-	if (::setsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-	    val_len) != 0)
-	  goto error;
-	return;
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_REUSEADDR not supported"));
-#endif 
-
-      case _Jv_SO_TIMEOUT_ :
-        timeout = val;
-        return;
-
-      default :
-        errno = ENOPROTOOPT;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-}
-
-::java::lang::Object *
-gnu::java::net::PlainSocketImpl::getOption (jint optID)
-{
-  int val;
-  socklen_t val_len = sizeof(val);
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  struct linger l_val;
-  socklen_t l_val_len = sizeof(l_val);
-
-  switch (optID)
-    {
-#ifdef TCP_NODELAY
-    case _Jv_TCP_NODELAY_ :
-      if (::getsockopt (native_fd, IPPROTO_TCP, TCP_NODELAY, (char *) &val,
-                        &val_len) != 0)
-        goto error;
-      else
-        return new ::java::lang::Boolean (val != 0);
-#else
-      throw new ::java::lang::InternalError
-        (JvNewStringUTF ("TCP_NODELAY not supported"));
-#endif       
-      break;
-      
-    case _Jv_SO_LINGER_ :
-#ifdef SO_LINGER
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_LINGER, (char *) &l_val,
-                        &l_val_len) != 0)
-        goto error;    
- 
-      if (l_val.l_onoff)
-        return new ::java::lang::Integer (l_val.l_linger);
-      else
-        return new ::java::lang::Boolean ((jboolean)false);
-#else
-      throw new ::java::lang::InternalError
-        (JvNewStringUTF ("SO_LINGER not supported"));
-#endif
-      break;    
-
-    case _Jv_SO_KEEPALIVE_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &val,
-                        &val_len) != 0)
-        goto error;
-      else
-        return new ::java::lang::Boolean (val != 0);
-
-    case _Jv_SO_BROADCAST_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-                        &val_len) != 0)
-        goto error;    
-      return new ::java::lang::Boolean ((jboolean)val);
-	
-    case _Jv_SO_OOBINLINE_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_OOBINLINE, (char *) &val,
-                        &val_len) != 0)
-        goto error;    
-      return new ::java::lang::Boolean ((jboolean)val);
-	
-    case _Jv_SO_RCVBUF_ :
-    case _Jv_SO_SNDBUF_ :
-#if defined(SO_SNDBUF) && defined(SO_RCVBUF)
-      int opt;
-      optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-      if (::getsockopt (native_fd, SOL_SOCKET, opt, (char *) &val, &val_len) != 0)
-        goto error;    
-      else
-        return new ::java::lang::Integer (val);
-#else
-      throw new ::java::lang::InternalError
-        (JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
-#endif    
-      break;
-    case _Jv_SO_BINDADDR_:
-      // cache the local address 
-      if (localAddress == NULL)
-        {
-          jbyteArray laddr;
-
-          if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) != 0)
-            goto error;
-
-          if (u.address.sin_family == AF_INET)
-            {
-              laddr = JvNewByteArray (4);
-              memcpy (elements (laddr), &u.address.sin_addr, 4);
-            }
-#ifdef HAVE_INET6
-          else if (u.address.sin_family == AF_INET6)
-            {
-              laddr = JvNewByteArray (16);
-              memcpy (elements (laddr), &u.address6.sin6_addr, 16);
-            }
-#endif
-          else
-            throw new ::java::net::SocketException
-              (JvNewStringUTF ("invalid family"));
-          localAddress = ::java::net::InetAddress::getByAddress (laddr);
-        }
-
-      return localAddress;
-      break;
-    case _Jv_IP_MULTICAST_IF_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
-      break;
-	
-    case _Jv_IP_MULTICAST_IF2_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_IF2: not valid for TCP"));
-      break;
-	
-    case _Jv_IP_MULTICAST_LOOP_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_LOOP: not valid for TCP"));
-      break;
-	
-    case _Jv_IP_TOS_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-                        &val_len) != 0)
-        goto error;
-      return new ::java::lang::Integer (val);
-      break;
-	
-    case _Jv_SO_REUSEADDR_ :
-#if defined(SO_REUSEADDR)
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &val,
-                        &val_len) != 0)
-        goto error;    
-#else
-        throw new ::java::lang::InternalError (
-          JvNewStringUTF ("SO_REUSEADDR not supported"));
-#endif 
-      break;
-
-    case _Jv_SO_TIMEOUT_ :
-      return new ::java::lang::Integer (timeout);
-      break;
-
-    default :
-      errno = ENOPROTOOPT;
-    }
-
- error:
-  char* strerr = strerror (errno);
-  throw new ::java::net::SocketException (JvNewStringUTF (strerr));
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownInput (void)
-{
-  if (::shutdown (native_fd, 0))
-    throw new ::java::net::SocketException (JvNewStringUTF (strerror (errno)));
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownOutput (void)
-{
-  if (::shutdown (native_fd, 1))
-    throw new ::java::net::SocketException (JvNewStringUTF (strerror (errno)));
-}
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
deleted file mode 100644
index 9377998..0000000
--- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc
+++ /dev/null
@@ -1,796 +0,0 @@
-/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#undef STRICT
-#undef MAX_PRIORITY
-#undef MIN_PRIORITY
-
-#include <gnu/java/net/PlainSocketImpl.h>
-#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
-#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
-#include <java/io/IOException.h>
-#include <java/net/BindException.h>
-#include <java/net/ConnectException.h>
-#include <java/net/InetAddress.h>
-#include <java/net/InetSocketAddress.h>
-#include <java/net/SocketException.h>
-#include <java/net/SocketTimeoutException.h>
-#include <java/lang/InternalError.h>
-#include <java/lang/Object.h>
-#include <java/lang/Boolean.h>
-#include <java/lang/Class.h>
-#include <java/lang/Integer.h>
-#include <java/lang/Thread.h>
-#include <java/lang/NullPointerException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/IllegalArgumentException.h>
-
-union SockAddr
-{
-  struct sockaddr_in address;
-#ifdef HAVE_INET6
-  struct sockaddr_in6 address6;
-#endif
-};
-
-void
-gnu::java::net::PlainSocketImpl::create (jboolean stream)
-{
-  SOCKET sock = ::socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
-
-  if (sock == INVALID_SOCKET)
-    {
-      _Jv_ThrowIOException ();
-    }
-
-  // Cast this to a HANDLE so we can make
-  // it non-inheritable via _Jv_platform_close_on_exec.
-  HANDLE hSocket = (HANDLE) sock;
-  _Jv_platform_close_on_exec (hSocket);
-
-  // We use native_fd in place of fd here.  From leaving fd null we avoid
-  // the double close problem in FileDescriptor.finalize.
-  native_fd = (jint) hSocket;
-}
-
-void
-gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lport)
-{
-  union SockAddr u;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-
-      if (host != NULL)
-        memcpy (&u.address.sin_addr, bytes, len);
-      else
-        u.address.sin_addr.s_addr = htonl (INADDR_ANY);
-
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (lport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (lport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (::bind (native_fd, ptr, len) != SOCKET_ERROR)
-    {
-      socklen_t addrlen = sizeof(u);
-
-      if (lport != 0)
-        localport = lport;
-      else if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) != SOCKET_ERROR)
-        localport = ntohs (u.address.sin_port);
-      else
-        goto error;
-
-      return;
-    }
-
-error:
-  DWORD dwErrorCode = WSAGetLastError ();
-  throw new ::java::net::BindException (_Jv_WinStrError (dwErrorCode));
-}
-
-static void
-throwConnectException (DWORD dwErrorCode)
-{
-  throw new ::java::net::ConnectException (_Jv_WinStrError (dwErrorCode));
-}
-
-static void
-throwConnectException ()
-{
-  throwConnectException (WSAGetLastError ());
-}
-
-void
-gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr,
-                                     jint timeout)
-{
-  ::java::net::InetSocketAddress *tmp = (::java::net::InetSocketAddress*) addr;
-  ::java::net::InetAddress *host = tmp->getAddress();
-  jint rport = tmp->getPort();
-
-  // Set the SocketImpl's address and port fields before we try to
-  // connect.  Note that the fact that these are set doesn't imply
-  // that we're actually connected to anything.  We need to record
-  // this data before we attempt the connect, since non-blocking
-  // SocketChannels will use this and almost certainly throw timeout
-  // exceptions.
-  address = host;
-  port = rport;
-
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  jbyteArray haddress = host->addr;
-  jbyte *bytes = elements (haddress);
-  int len = haddress->length;
-  struct sockaddr *ptr = (struct sockaddr *) &u.address;
-  
-  if (len == 4)
-    {
-      u.address.sin_family = AF_INET;
-      memcpy (&u.address.sin_addr, bytes, len);
-      len = sizeof (struct sockaddr_in);
-      u.address.sin_port = htons (rport);
-    }
-#ifdef HAVE_INET6
-  else if (len == 16)
-    {
-      u.address6.sin6_family = AF_INET6;
-      memcpy (&u.address6.sin6_addr, bytes, len);
-      len = sizeof (struct sockaddr_in6);
-      u.address6.sin6_port = htons (rport);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
-
-  if (timeout > 0)
-    {
-      // FIXME: we're creating a fresh WSAEVENT for each connect().
-      WSAEventWrapper aWSAEventWrapper(native_fd, FD_CONNECT);
-      WSAEVENT hEvent = aWSAEventWrapper.getEventHandle ();
-
-      if (::connect (native_fd, ptr, len) == SOCKET_ERROR)
-      {
-        if (WSAGetLastError () != WSAEWOULDBLOCK)
-          throwConnectException ();
-
-        DWORD dwRet =
-          WSAWaitForMultipleEvents (1, &hEvent, true, timeout, false);
-            // use true, false instead of TRUE, FALSE because the
-            // MS constants got undefined
-
-        // Reset and ignore our thread's interrupted flag.
-        // It's not possible to interrupt these sort of
-        // operations on Win32 anyway.
-        ::java::lang::Thread::interrupted();
-
-        if (dwRet == WSA_WAIT_FAILED)
-          throwConnectException ();
-        else if (dwRet == WSA_WAIT_TIMEOUT)
-          throw new ::java::net::SocketTimeoutException
-            (JvNewStringUTF ("connect timed out"));
-            
-        // If we get here, we still need to check whether the actual
-        // connect() succeeded. Use any socket-specific error code
-        // instead of the thread-based one.
-        int nErrCode; int nErrLen=sizeof(nErrCode);
-        if (::getsockopt(native_fd, SOL_SOCKET, SO_ERROR, (char*) &nErrCode,
-          &nErrLen) == SOCKET_ERROR)
-          {
-            throwConnectException ();
-          }
-        
-        if (nErrCode != NO_ERROR)
-          {
-            throwConnectException (nErrCode);
-          }
-      }
-    }
-  else
-    {
-      if (::connect (native_fd, ptr, len) == SOCKET_ERROR)
-        throwConnectException();
-    }
-
-  // A bind may not have been done on this socket; if so, set localport now.
-  if (localport == 0)
-    {
-      if (::getsockname (native_fd, (sockaddr*) &u, &addrlen) != SOCKET_ERROR)
-        localport = ntohs (u.address.sin_port);
-      else
-        throwConnectException();
-    }
-}
-
-void
-gnu::java::net::PlainSocketImpl::listen (jint backlog)
-{
-  if (::listen (native_fd, backlog) == SOCKET_ERROR)
-    {
-      _Jv_ThrowIOException ();
-    }
-}
-
-void
-gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s)
-{
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  HANDLE hSocket = 0;
-  SOCKET new_socket = 0;
-
-  if (timeout > 0)
-    {
-      // FIXME: we're creating a fresh WSAEVENT for each accept().
-      // One possible alternative would be that native_fd really points
-      // to an extended structure consisting of the SOCKET, its
-      // associated WSAEVENT, etc.
-      WSAEventWrapper aWSAEventWrapper(native_fd, FD_ACCEPT);
-      WSAEVENT hEvent = aWSAEventWrapper.getEventHandle ();
-
-      for (;;)
-      {
-        new_socket = ::accept (native_fd, (sockaddr*) &u, &addrlen);
-
-        if (new_socket != INVALID_SOCKET)
-        {
-          // This new child socket is nonblocking because the parent
-          // socket became nonblocking via the WSAEventSelect() call,
-          // so we set its mode back to blocking.
-          WSAEventSelect (new_socket, hEvent, 0);
-            // undo the hEvent <-> FD_ACCEPT association inherited
-            // inherited from our parent socket
-
-          unsigned long lSockOpt = 0L;
-            // blocking mode
-          if (ioctlsocket(new_socket, FIONBIO, &lSockOpt) == SOCKET_ERROR)
-          {
-            goto error;
-          }
-          break;
-        }
-        else if (WSAGetLastError () != WSAEWOULDBLOCK)
-          {
-            goto error;
-          }
-
-        DWORD dwRet =
-          WSAWaitForMultipleEvents (1, &hEvent, true, timeout, false);
-            // use true, false instead of TRUE, FALSE because the
-            // MS constants got undefined
-
-        // Reset and ignore our thread's interrupted flag.
-        ::java::lang::Thread::interrupted();
-
-        if (dwRet == WSA_WAIT_FAILED)
-          goto error;
-        else if (dwRet == WSA_WAIT_TIMEOUT)
-          throw new ::java::net::SocketTimeoutException
-            (JvNewStringUTF ("Accept timed out"));
-      }
-    }
-  else
-    {
-      new_socket = ::accept (native_fd, (sockaddr*) &u, &addrlen);
-    }
-
-  if (new_socket == INVALID_SOCKET)
-    goto error;
-
-  // Cast this to a HANDLE so we can make
-  // it non-inheritable via _Jv_platform_close_on_exec.
-  hSocket = (HANDLE) new_socket;
-  _Jv_platform_close_on_exec (hSocket);
-
-  jbyteArray raddr;
-  jint rport;
-  if (u.address.sin_family == AF_INET)
-    {
-      raddr = JvNewByteArray (4);
-      memcpy (elements (raddr), &u.address.sin_addr, 4);
-      rport = ntohs (u.address.sin_port);
-    }
-#ifdef HAVE_INET6
-  else if (u.address.sin_family == AF_INET6)
-    {
-      raddr = JvNewByteArray (16);
-      memcpy (elements (raddr), &u.address6.sin6_addr, 16);
-      rport = ntohs (u.address6.sin6_port);
-    }
-#endif
-  else
-    throw new ::java::net::SocketException (JvNewStringUTF ("invalid family"));
-
-  s->native_fd = (jint) hSocket;
-  s->localport = localport;
-  s->address = ::java::net::InetAddress::getByAddress (raddr);
-  s->port = rport;
-  return;
-
- error:
-  _Jv_ThrowIOException ();
-}
-
-// Close(shutdown) the socket.
-void
-gnu::java::net::PlainSocketImpl::close()
-{
-  // Avoid races from asynchronous finalization.
-  JvSynchronize sync (this);
-
-  // should we use shutdown here? how would that effect so_linger?
-  int res = ::closesocket (native_fd);
-
-  if (res == -1)
-    {
-      // These three errors are not errors according to tests performed
-      // on the reference implementation.
-      DWORD dwErr = WSAGetLastError();
-      if (dwErr != WSAENOTCONN && dwErr != WSAECONNRESET
-        && dwErr != WSAENOTSOCK)
-        _Jv_ThrowIOException ();
-    }
-  // Safe place to reset the file pointer.
-  native_fd = -1;
-  timeout = 0;
-}
-
-// Write a byte to the socket.
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jint b)
-{
-  jbyte d =(jbyte) b;
-  int r = 0;
-
-  while (r != 1)
-    {
-      r = ::send (this$0->native_fd, (char*) &d, 1, 0);
-      if (r == -1)
-        {
-          DWORD dwErr = WSAGetLastError();
-          
-          // Reset and ignore our thread's interrupted flag.
-          // It's not possible to interrupt these sort of
-          // operations on Win32 anyway.
-          ::java::lang::Thread::interrupted();
-
-          // Some errors should not cause exceptions.
-          if (dwErr != WSAENOTCONN && dwErr != WSAECONNRESET
-            && dwErr != WSAENOTSOCK)
-            _Jv_ThrowIOException ();
-          break;
-        }
-    }
-}
-
-// Write some bytes to the socket.
-void
-gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jbyteArray b, 
-  jint offset, jint len)
-{
-  if (! b)
-    throw new ::java::lang::NullPointerException;
-  if (offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  jbyte *bytes = elements (b) + offset;
-  int written = 0;
-  while (len > 0)
-    {
-      int r = ::send (this$0->native_fd, (char*) bytes, len, 0);
-
-      if (r == -1)
-        {
-          DWORD dwErr = WSAGetLastError();
-
-          // Reset and ignore our thread's interrupted flag.
-          ::java::lang::Thread::interrupted();
-
-          // Some errors should not cause exceptions.
-          if (dwErr != WSAENOTCONN && dwErr != WSAECONNRESET
-            && dwErr != WSAENOTSOCK)
-            _Jv_ThrowIOException ();
-          break;
-        }
-
-      written += r;
-      len -= r;
-      bytes += r;
-    }
-}
-
-void
-gnu::java::net::PlainSocketImpl::sendUrgentData (jint)
-{
-  throw new ::java::net::SocketException (JvNewStringLatin1 (
-    "PlainSocketImpl: sending of urgent data not supported by this socket"));
-}
-
-// read() helper
-static jint
-doRead(int native_fd, void* buf, int count, int timeout)
-{
-  int r = 0;
-  DWORD dwErrorCode = 0;
-    // we are forced to declare this here because
-    // a call to Thread::interrupted() blanks out
-    // WSAGetLastError().
-
-  // FIXME: we unconditionally set SO_RCVTIMEO here
-  // because we can't detect whether someone has
-  // gone from a non-zero to zero timeout. What we'd
-  // really need is a member state variable in addition
-  // to timeout
-  int nRet= ::setsockopt(native_fd, SOL_SOCKET, SO_RCVTIMEO,
-    (char*)&timeout, sizeof(timeout));
-  if (nRet != NO_ERROR)
-  {
-    dwErrorCode = WSAGetLastError ();
-    goto error;
-  }
-  
-  r = ::recv (native_fd, (char*) buf, count, 0);
-
-  if (r == 0)
-    return -1;
-
-  dwErrorCode = WSAGetLastError ();
-    // save WSAGetLastError() before calling Thread.interrupted()
-  
-  // Reset and ignore our thread's interrupted flag.
-  ::java::lang::Thread::interrupted();
-  
-  if (r == -1)
-    {
-error:
-      // Some errors cause us to return end of stream...
-      if (dwErrorCode == WSAENOTCONN)
-        return -1;
-
-      // Other errors need to be signalled.
-      if (dwErrorCode == WSAETIMEDOUT)
-        throw new ::java::net::SocketTimeoutException
-          (JvNewStringUTF ("Read timed out") );
-      else
-        _Jv_ThrowIOException (dwErrorCode);
-    }
-    
-   return r;
-}
-
-// Read a single byte from the socket.
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(void)
-{
-  jbyte b;
-  doRead(this$0->native_fd, &b, 1, this$0->timeout);
-  return b & 0xFF;
-}
-
-// Read count bytes into the buffer, starting at offset.
-jint
-gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer,
-  jint offset, jint count)
-{
-  // If zero bytes were requested, short circuit so that recv
-  // doesn't signal EOF.
-  if (count == 0)
-    return 0;
-
-  if (! buffer)
-    throw new ::java::lang::NullPointerException;
-
-  jsize bsize = JvGetArrayLength (buffer);
-
-  if (offset < 0 || count < 0 || offset + count > bsize)
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  jbyte *bytes = elements (buffer) + offset;
-
-  // Read the socket.
-  return doRead(this$0->native_fd, bytes, count, this$0->timeout);
-}
-
-// How many bytes are available?
-jint
-gnu::java::net::PlainSocketImpl::available(void)
-{
-  unsigned long num = 0;
-
-  if (::ioctlsocket (native_fd, FIONREAD, &num) == SOCKET_ERROR)
-    _Jv_ThrowIOException ();
-
-  return (jint) num;
-}
-
-void
-gnu::java::net::PlainSocketImpl::setOption (jint optID, ::java::lang::Object *value)
-{
-  int val;
-  socklen_t val_len = sizeof (val);
-
-  if (native_fd < 0)
-    throw new ::java::net::SocketException (JvNewStringUTF ("Socket closed"));
-
-  if (_Jv_IsInstanceOf (value, &::java::lang::Boolean::class$))
-    {
-      ::java::lang::Boolean *boolobj =
-        static_cast< ::java::lang::Boolean *> (value);
-      if (boolobj->booleanValue())
-        val = 1;
-      else
-        {
-          if (optID == _Jv_SO_LINGER_)
-            val = -1;
-          else
-            val = 0;
-        }
-    }
-  else if (_Jv_IsInstanceOf (value, &::java::lang::Integer::class$))
-    {
-      ::java::lang::Integer *intobj =
-        static_cast< ::java::lang::Integer *> (value);
-      val = (int) intobj->intValue();
-    }
-  else
-    {
-      throw new ::java::lang::IllegalArgumentException (
-        JvNewStringLatin1 ("`value' must be Boolean or Integer"));
-    }
-
-  switch (optID)
-    {
-      case _Jv_TCP_NODELAY_ :
-        if (::setsockopt (native_fd, IPPROTO_TCP, TCP_NODELAY, (char *) &val,
-                          val_len) == SOCKET_ERROR)
-          goto error;
-        return;
-
-      case _Jv_SO_KEEPALIVE_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &val,
-                          val_len) == SOCKET_ERROR)
-          goto error;
-        break;
-
-      case _Jv_SO_BROADCAST_ :
-        throw new ::java::net::SocketException
-          (JvNewStringUTF ("SO_BROADCAST not valid for TCP"));
-        break;
-
-      case _Jv_SO_OOBINLINE_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_OOBINLINE, (char *) &val,
-                          val_len) == SOCKET_ERROR)
-          goto error;
-        break;
-
-      case _Jv_SO_LINGER_ :
-        struct linger l_val;
-        l_val.l_onoff = (val != -1);
-        l_val.l_linger = val;
-
-        if (::setsockopt (native_fd, SOL_SOCKET, SO_LINGER, (char *) &l_val,
-                          sizeof(l_val)) == SOCKET_ERROR)
-          goto error;
-        return;
-
-      case _Jv_SO_SNDBUF_ :
-      case _Jv_SO_RCVBUF_ :
-        int opt;
-        optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-        if (::setsockopt (native_fd, SOL_SOCKET, opt, (char *) &val,
-                          val_len) == SOCKET_ERROR)
-          goto error;
-        return;
-
-      case _Jv_SO_BINDADDR_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_BINDADDR: read only option"));
-        return;
-
-      case _Jv_IP_MULTICAST_IF_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
-        return;
-
-      case _Jv_IP_MULTICAST_IF2_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_IF2: not valid for TCP"));
-        break;
-
-      case _Jv_IP_MULTICAST_LOOP_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("IP_MULTICAST_LOOP: not valid for TCP"));
-        break;
-
-      case _Jv_IP_TOS_ :
-        if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-                          val_len) == SOCKET_ERROR)
-          goto error;
-        break;
-
-      case _Jv_SO_REUSEADDR_ :
-        throw new ::java::net::SocketException (
-          JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"));
-        return;
-
-      case _Jv_SO_TIMEOUT_ :
-        timeout = val;
-        return;
-
-      default :
-        WSASetLastError (WSAENOPROTOOPT);
-    }
-
-error:
-  _Jv_ThrowSocketException ();
-}
-
-::java::lang::Object *
-gnu::java::net::PlainSocketImpl::getOption (jint optID)
-{
-  int val;
-  socklen_t val_len = sizeof(val);
-  union SockAddr u;
-  socklen_t addrlen = sizeof(u);
-  struct linger l_val;
-  socklen_t l_val_len = sizeof(l_val);
-
-  switch (optID)
-    {
-    case _Jv_TCP_NODELAY_ :
-      if (::getsockopt (native_fd, IPPROTO_TCP, TCP_NODELAY, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      else
-        return new ::java::lang::Boolean (val != 0);
-      break;
-
-    case _Jv_SO_LINGER_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_LINGER, (char *) &l_val,
-                        &l_val_len) == SOCKET_ERROR)
-        goto error;
-
-      if (l_val.l_onoff)
-        return new ::java::lang::Integer (l_val.l_linger);
-      else
-        return new ::java::lang::Boolean ((jboolean)false);
-      break;
-
-    case _Jv_SO_KEEPALIVE_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      else
-        return new ::java::lang::Boolean (val != 0);
-
-    case _Jv_SO_BROADCAST_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      return new ::java::lang::Boolean ((jboolean)val);
-
-    case _Jv_SO_OOBINLINE_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, SO_OOBINLINE, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      return new ::java::lang::Boolean ((jboolean)val);
-
-    case _Jv_SO_RCVBUF_ :
-    case _Jv_SO_SNDBUF_ :
-      int opt;
-      optID == _Jv_SO_SNDBUF_ ? opt = SO_SNDBUF : opt = SO_RCVBUF;
-      if (::getsockopt (native_fd, SOL_SOCKET, opt, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      else
-        return new ::java::lang::Integer (val);
-      break;
-    case _Jv_SO_BINDADDR_:
-      // cache the local address
-      if (localAddress == NULL)
-        {
-          jbyteArray laddr;
-
-          if (::getsockname (native_fd, (sockaddr*) &u,
-                             &addrlen) == SOCKET_ERROR)
-            goto error;
-
-          if (u.address.sin_family == AF_INET)
-            {
-              laddr = JvNewByteArray (4);
-              memcpy (elements (laddr), &u.address.sin_addr, 4);
-            }
-#ifdef HAVE_INET6
-          else if (u.address.sin_family == AF_INET6)
-            {
-              laddr = JvNewByteArray (16);
-              memcpy (elements (laddr), &u.address6.sin6_addr, 16);
-            }
-#endif
-          else
-            throw new ::java::net::SocketException
-              (JvNewStringUTF ("invalid family"));
-          localAddress = ::java::net::InetAddress::getByAddress (laddr);
-        }
-
-      return localAddress;
-      break;
-    case _Jv_IP_MULTICAST_IF_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
-      break;
-
-    case _Jv_IP_MULTICAST_IF2_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_IF2: not valid for TCP"));
-      break;
-
-    case _Jv_IP_MULTICAST_LOOP_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("IP_MULTICAST_LOOP: not valid for TCP"));
-      break;
-
-    case _Jv_IP_TOS_ :
-      if (::getsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val,
-                        &val_len) == SOCKET_ERROR)
-        goto error;
-      return new ::java::lang::Integer (val);
-      break;
-
-    case _Jv_SO_REUSEADDR_ :
-      throw new ::java::net::SocketException
-        (JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"));
-      break;
-
-    case _Jv_SO_TIMEOUT_ :
-      return new ::java::lang::Integer (timeout);
-      break;
-
-    default :
-      WSASetLastError (WSAENOPROTOOPT);
-    }
-
-error:
-  _Jv_ThrowSocketException ();
-  return 0;
-    // we should never get here
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownInput (void)
-{
-  if (::shutdown (native_fd, 0))
-    _Jv_ThrowSocketException ();
-}
-
-void
-gnu::java::net::PlainSocketImpl::shutdownOutput (void)
-{
-  if (::shutdown (native_fd, 1))
-    _Jv_ThrowSocketException ();
-}
diff --git a/libjava/gnu/java/net/protocol/core/Connection.h b/libjava/gnu/java/net/protocol/core/Connection.h
deleted file mode 100644
index d09908b..0000000
--- a/libjava/gnu/java/net/protocol/core/Connection.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_core_Connection__
-#define __gnu_java_net_protocol_core_Connection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-    }
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace core
-          {
-              class Connection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::protocol::core::Connection : public ::java::net::URLConnection
-{
-
-public:
-  Connection(::java::net::URL *);
-  virtual void connect();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::lang::String * getHeaderField(::java::lang::String *);
-  virtual ::java::util::Map * getHeaderFields();
-  virtual ::java::lang::String * getHeaderField(jint);
-  virtual ::java::lang::String * getHeaderFieldKey(jint);
-private:
-  ::java::lang::String * getKey(::java::lang::String *);
-  ::java::lang::String * getField(::java::lang::String *);
-  void getHeaders();
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) hdrHash;
-  ::java::util::Vector * hdrVec;
-  jboolean gotHeaders;
-  ::gnu::gcj::Core * core;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_core_Connection__
diff --git a/libjava/gnu/java/net/protocol/core/Connection.java b/libjava/gnu/java/net/protocol/core/Connection.java
deleted file mode 100644
index 2319c0b..0000000
--- a/libjava/gnu/java/net/protocol/core/Connection.java
+++ /dev/null
@@ -1,172 +0,0 @@
-// Connection.java - Implementation of URLConnection for core protocol.
-
-/* Copyright (C) 2001, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.protocol.core;
-
-import gnu.gcj.Core;
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Map;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-/**
- * @author Anthony Green <green@redhat.com>
- * @date August 13, 2001
- */
-
-class Connection extends URLConnection
-{
-  private Hashtable hdrHash = new Hashtable();
-  private Vector hdrVec = new Vector();
-  private boolean gotHeaders = false;
-
-  private Core core;
-
-  public Connection (URL url)
-  {
-    super(url);
-  }
-
-  // Implementation of abstract method.
-  public void connect() throws IOException
-  {
-    // Call is ignored if already connected.
-    if (connected)
-      return;
-
-    // If not connected, then file needs to be opened.
-    core = Core.create (url.getFile());
-    connected = true;
-  }
-
-  public InputStream getInputStream() throws IOException
-  {
-    if (!connected)
-      connect();
-
-    if (! doInput)
-      throw new ProtocolException("Can't open InputStream if doInput is false");
-    return new CoreInputStream (core);
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderField(String name)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    return (String) hdrHash.get(name.toLowerCase());
-  }
-
-  // Override default method in URLConnection.
-  public Map getHeaderFields()
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    return hdrHash;
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderField(int n)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    if (n < hdrVec.size())
-      return getField ((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderFieldKey(int n)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    if (n < hdrVec.size())
-      return getKey ((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  private String getKey(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(0, index);
-    else
-      return null;
-  }
-
-  private String getField(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(index + 1).trim();
-    else
-      return str;
-  }
-
-  private void getHeaders() throws IOException
-  {
-    if (gotHeaders)
-      return;
-    gotHeaders = true;
-
-    connect();
-
-    // Yes, it is overkill to use the hash table and vector here since
-    // we're only putting one header in the file, but in case we need
-    // to add others later and for consistency, we'll implement it this way.
-
-    // Add the only header we know about right now:  Content-length.
-    long len = core.length;
-    String line = "Content-length: " + len;
-    hdrVec.addElement(line);
-
-    // The key will never be null in this scenario since we build up the
-    // headers ourselves.  If we ever rely on getting a header from somewhere
-    // else, then we may have to check if the result of getKey() is null.
-    String key = getKey(line);
-    hdrHash.put(key.toLowerCase(), Long.toString(len));
-  }
-}
-
diff --git a/libjava/gnu/java/net/protocol/core/CoreInputStream.h b/libjava/gnu/java/net/protocol/core/CoreInputStream.h
deleted file mode 100644
index d6beb39..0000000
--- a/libjava/gnu/java/net/protocol/core/CoreInputStream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_core_CoreInputStream__
-#define __gnu_java_net_protocol_core_CoreInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-        class RawData;
-    }
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace core
-          {
-              class CoreInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::core::CoreInputStream : public ::java::io::InputStream
-{
-
-  jint unsafeGetByte(jlong);
-  jint copyIntoByteArray(JArray< jbyte > *, jint, jint);
-public:
-  CoreInputStream(::gnu::gcj::Core *);
-  virtual jint available();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-public: // actually protected
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) ptr;
-  jint pos;
-  jint mark__;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_core_CoreInputStream__
diff --git a/libjava/gnu/java/net/protocol/core/CoreInputStream.java b/libjava/gnu/java/net/protocol/core/CoreInputStream.java
deleted file mode 100644
index 421bb1c..0000000
--- a/libjava/gnu/java/net/protocol/core/CoreInputStream.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Handler.java - URLStreamHandler for core protocol.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.protocol.core;
-
-import gnu.gcj.Core;
-import gnu.gcj.RawData;
-import java.io.InputStream;
-import java.io.IOException;
-
-public class CoreInputStream extends InputStream
-{
-  /* A pointer to the object in memory.  */
-  protected RawData ptr;
-
-  /* Position of the next byte in core to be read. */
-  protected int pos;
-
-  /* The currently marked position in the stream. */
-  protected int mark;
-
-  /* The index in core one greater than the last valid character. */
-  protected int count;
-
-  private native int unsafeGetByte (long offset);
-  private native int copyIntoByteArray (byte[] dest, int offset, int numBytes);
-
-  public CoreInputStream (Core core)
-  {
-    ptr = core.ptr;
-    count = core.length;
-  }
-
-  public synchronized int available()
-  {
-    return count - pos;
-  }
-
-  public synchronized void mark(int readAheadLimit)
-  {
-    // readAheadLimit is ignored per Java Class Lib. book, p.220.
-    mark = pos;
-  }
-
-  public boolean markSupported()
-  {
-    return true;
-  }
-
-  public synchronized int read()
-  {
-    if (pos < count)
-      return ((int) unsafeGetByte(pos++)) & 0xFF;
-    return -1;
-  }
-
-  public synchronized int read(byte[] b, int off, int len)
-  {
-    if (pos >= count)
-      return -1;
-
-    int numBytes = Math.min(count - pos, len);
-    copyIntoByteArray (b, off, numBytes);
-    pos += numBytes;
-    return numBytes;
-  }
-
-  public synchronized void reset()
-  {
-    pos = mark;
-  }
-
-  public synchronized long skip(long n)
-  {
-    // Even though the var numBytes is a long, in reality it can never
-    // be larger than an int since the result of subtracting 2 positive
-    // ints will always fit in an int.  Since we have to return a long
-    // anyway, numBytes might as well just be a long.
-    long numBytes = Math.min ((long) (count - pos), n < 0 ? 0L : n);
-    pos += numBytes;
-    return numBytes;
-  }
-}
diff --git a/libjava/gnu/java/net/protocol/core/Handler.h b/libjava/gnu/java/net/protocol/core/Handler.h
deleted file mode 100644
index 364e21a..0000000
--- a/libjava/gnu/java/net/protocol/core/Handler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_core_Handler__
-#define __gnu_java_net_protocol_core_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace core
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::core::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_core_Handler__
diff --git a/libjava/gnu/java/net/protocol/core/Handler.java b/libjava/gnu/java/net/protocol/core/Handler.java
deleted file mode 100644
index 8726172..0000000
--- a/libjava/gnu/java/net/protocol/core/Handler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Handler.java - URLStreamHandler for core protocol.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.protocol.core;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-
-/**
- * @author Anthony Green <green@redhat.com>
- * @date August 13, 2001.
- */
-public class Handler extends URLStreamHandler
-{
-  protected URLConnection openConnection(URL url) throws IOException
-  {
-    return new Connection(url);
-  }
-}
diff --git a/libjava/gnu/java/net/protocol/core/natCoreInputStream.cc b/libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
deleted file mode 100644
index 4053efc..0000000
--- a/libjava/gnu/java/net/protocol/core/natCoreInputStream.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// natCoreInputStream.cc -- C++ side of CoreInputStream
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Anthony Green <green@redhat.com>.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <string.h>
-
-#include <java/lang/NullPointerException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <gnu/java/net/protocol/core/CoreInputStream.h>
-
-jint
-gnu::java::net::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
-{
-  return ((char*) ptr) [offset];
-}
-
-jint
-gnu::java::net::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
-							            jint offset,
-							            jint numBytes)
-{
-  if (!dest)
-    throw new ::java::lang::NullPointerException;
-  
-  jsize destSize = JvGetArrayLength (dest);
-  
-  if (offset < 0 || numBytes < 0 || offset + numBytes < 0
-      || offset + numBytes > destSize
-      || pos + numBytes > count)
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  void *pcore = (void *) &((char*) ptr) [pos];
-  void *pdest = (void *) (elements (dest) + offset);
-
-  memcpy (pdest, pcore, numBytes);
-
-  return 0;
-}
-
diff --git a/libjava/gnu/java/net/protocol/file/Connection$StaticData.h b/libjava/gnu/java/net/protocol/file/Connection$StaticData.h
deleted file mode 100644
index 46ed9ac..0000000
--- a/libjava/gnu/java/net/protocol/file/Connection$StaticData.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_file_Connection$StaticData__
-#define __gnu_java_net_protocol_file_Connection$StaticData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace file
-          {
-              class Connection$StaticData;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class gnu::java::net::protocol::file::Connection$StaticData : public ::java::lang::Object
-{
-
-  Connection$StaticData();
-public: // actually package-private
-  static ::java::text::SimpleDateFormat * dateFormat;
-  static ::java::lang::String * lineSeparator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_file_Connection$StaticData__
diff --git a/libjava/gnu/java/net/protocol/file/Connection.h b/libjava/gnu/java/net/protocol/file/Connection.h
deleted file mode 100644
index 160f808..0000000
--- a/libjava/gnu/java/net/protocol/file/Connection.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_file_Connection__
-#define __gnu_java_net_protocol_file_Connection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace file
-          {
-              class Connection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class gnu::java::net::protocol::file::Connection : public ::java::net::URLConnection
-{
-
-public:
-  Connection(::java::net::URL *);
-  static ::java::lang::String * unquote(::java::lang::String *);
-  virtual void connect();
-public: // actually package-private
-  virtual JArray< jbyte > * getDirectoryListing();
-public:
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual jlong getLastModified();
-  virtual ::java::lang::String * getHeaderField(::java::lang::String *);
-  virtual jint getContentLength();
-  virtual ::java::security::Permission * getPermission();
-private:
-  static ::java::lang::String * DEFAULT_PERMISSION;
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) file;
-  JArray< jbyte > * directoryListing;
-  ::java::io::InputStream * inputStream;
-  ::java::io::OutputStream * outputStream;
-  ::java::io::FilePermission * permission;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_file_Connection__
diff --git a/libjava/gnu/java/net/protocol/file/Handler.h b/libjava/gnu/java/net/protocol/file/Handler.h
deleted file mode 100644
index f3edf9a..0000000
--- a/libjava/gnu/java/net/protocol/file/Handler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_file_Handler__
-#define __gnu_java_net_protocol_file_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace file
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::file::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_file_Handler__
diff --git a/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.h b/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.h
deleted file mode 100644
index 4ea352a..0000000
--- a/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_ActiveModeDTP__
-#define __gnu_java_net_protocol_ftp_ActiveModeDTP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class ActiveModeDTP;
-              class DTPInputStream;
-              class DTPOutputStream;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-        class Socket;
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::ActiveModeDTP : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ActiveModeDTP(::java::net::InetAddress *, jint, jint, jint);
-public:
-  void run();
-  void waitFor();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  void setTransferMode(jint);
-  void complete();
-  jboolean abort();
-  void transferComplete();
-public: // actually package-private
-  ::java::net::ServerSocket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) server;
-  ::java::net::Socket * socket;
-  ::gnu::java::net::protocol::ftp::DTPInputStream * in;
-  ::gnu::java::net::protocol::ftp::DTPOutputStream * out;
-  jboolean completed;
-  jboolean inProgress;
-  jint transferMode;
-  ::java::io::IOException * exception;
-  ::java::lang::Thread * acceptThread;
-  jint connectionTimeout;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_ActiveModeDTP__
diff --git a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.h b/libjava/gnu/java/net/protocol/ftp/BlockInputStream.h
deleted file mode 100644
index a6c0e18..0000000
--- a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_BlockInputStream__
-#define __gnu_java_net_protocol_ftp_BlockInputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class BlockInputStream;
-              class DTP;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::BlockInputStream : public ::gnu::java::net::protocol::ftp::DTPInputStream
-{
-
-public: // actually package-private
-  BlockInputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::InputStream *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual void readHeader();
-  static const jint EOF = 64;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::net::protocol::ftp::DTPInputStream)))) descriptor;
-  jint max;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_BlockInputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/BlockOutputStream.h b/libjava/gnu/java/net/protocol/ftp/BlockOutputStream.h
deleted file mode 100644
index dd712fd..0000000
--- a/libjava/gnu/java/net/protocol/ftp/BlockOutputStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_BlockOutputStream__
-#define __gnu_java_net_protocol_ftp_BlockOutputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class BlockOutputStream;
-              class DTP;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::BlockOutputStream : public ::gnu::java::net::protocol::ftp::DTPOutputStream
-{
-
-public: // actually package-private
-  BlockOutputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::OutputStream *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void close();
-public: // actually package-private
-  static const jbyte RECORD = -128;
-  static const jbyte EOF = 64;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_BlockOutputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.h b/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.h
deleted file mode 100644
index 75de07d..0000000
--- a/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_CompressedInputStream__
-#define __gnu_java_net_protocol_ftp_CompressedInputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class CompressedInputStream;
-              class DTP;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::CompressedInputStream : public ::gnu::java::net::protocol::ftp::DTPInputStream
-{
-
-public: // actually package-private
-  CompressedInputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::InputStream *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual void readHeader();
-  virtual void readCodeHeader();
-  static const jint EOF = 64;
-  static const jint RAW = 0;
-  static const jint COMPRESSED = 128;
-  static const jint FILLER = 192;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::net::protocol::ftp::DTPInputStream)))) descriptor;
-  jint max;
-  jint count;
-  jint state;
-  jint rep;
-  jint n;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_CompressedInputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/CompressedOutputStream.h b/libjava/gnu/java/net/protocol/ftp/CompressedOutputStream.h
deleted file mode 100644
index 243ac7c..0000000
--- a/libjava/gnu/java/net/protocol/ftp/CompressedOutputStream.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_CompressedOutputStream__
-#define __gnu_java_net_protocol_ftp_CompressedOutputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class CompressedOutputStream;
-              class DTP;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::CompressedOutputStream : public ::gnu::java::net::protocol::ftp::DTPOutputStream
-{
-
-public: // actually package-private
-  CompressedOutputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::OutputStream *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual JArray< jbyte > * compress(JArray< jbyte > *, jint, jint);
-  virtual jint flush_compressed(JArray< jbyte > *, jint, jint, jbyte);
-  virtual jint flush_raw(JArray< jbyte > *, jint, JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * realloc(JArray< jbyte > *, jint);
-public:
-  virtual void close();
-public: // actually package-private
-  static const jbyte RECORD = -128;
-  static const jbyte EOF = 64;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_CompressedOutputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/DTP.h b/libjava/gnu/java/net/protocol/ftp/DTP.h
deleted file mode 100644
index 132e902..0000000
--- a/libjava/gnu/java/net/protocol/ftp/DTP.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_DTP__
-#define __gnu_java_net_protocol_ftp_DTP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::DTP : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  virtual ::java::io::OutputStream * getOutputStream() = 0;
-  virtual void setTransferMode(jint) = 0;
-  virtual void complete() = 0;
-  virtual jboolean abort() = 0;
-  virtual void transferComplete() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_net_protocol_ftp_DTP__
diff --git a/libjava/gnu/java/net/protocol/ftp/DTPInputStream.h b/libjava/gnu/java/net/protocol/ftp/DTPInputStream.h
deleted file mode 100644
index 2574799..0000000
--- a/libjava/gnu/java/net/protocol/ftp/DTPInputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_DTPInputStream__
-#define __gnu_java_net_protocol_ftp_DTPInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-              class DTPInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::DTPInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  DTPInputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::InputStream *);
-  virtual void setTransferComplete(jboolean);
-public:
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::net::protocol::ftp::DTP * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) dtp;
-  jboolean transferComplete;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_DTPInputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/DTPOutputStream.h b/libjava/gnu/java/net/protocol/ftp/DTPOutputStream.h
deleted file mode 100644
index 1e59c7a..0000000
--- a/libjava/gnu/java/net/protocol/ftp/DTPOutputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_DTPOutputStream__
-#define __gnu_java_net_protocol_ftp_DTPOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-              class DTPOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::DTPOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually package-private
-  DTPOutputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::OutputStream *);
-  virtual void setTransferComplete(jboolean);
-public:
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::net::protocol::ftp::DTP * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) dtp;
-  jboolean transferComplete;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_DTPOutputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPConnection.h b/libjava/gnu/java/net/protocol/ftp/FTPConnection.h
deleted file mode 100644
index d0b1183..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPConnection.h
+++ /dev/null
@@ -1,165 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPConnection__
-#define __gnu_java_net_protocol_ftp_FTPConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class CRLFOutputStream;
-          class LineInputStream;
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-              class FTPConnection;
-              class FTPResponse;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPConnection : public ::java::lang::Object
-{
-
-public:
-  FTPConnection(::java::lang::String *);
-  FTPConnection(::java::lang::String *, jint);
-  FTPConnection(::java::lang::String *, jint, jint, jint, jboolean);
-  virtual jboolean authenticate(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean starttls(jboolean);
-  virtual jboolean starttls(jboolean, ::javax::net::ssl::TrustManager *);
-  virtual jboolean changeWorkingDirectory(::java::lang::String *);
-  virtual jboolean changeToParentDirectory();
-  virtual void reinitialize();
-  virtual void logout();
-public: // actually protected
-  virtual void initialiseDTP();
-public:
-  virtual void setPassive(jboolean);
-  virtual jint getRepresentationType();
-  virtual void setRepresentationType(jint);
-  virtual jint getFileStructure();
-  virtual void setFileStructure(jint);
-  virtual jint getTransferMode();
-  virtual void setTransferMode(jint);
-  virtual ::java::io::InputStream * retrieve(::java::lang::String *);
-  virtual ::java::io::OutputStream * store(::java::lang::String *);
-  virtual ::java::io::OutputStream * append(::java::lang::String *);
-  virtual void allocate(jlong);
-  virtual jboolean rename(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean abort();
-  virtual jboolean delete$(::java::lang::String *);
-  virtual jboolean removeDirectory(::java::lang::String *);
-  virtual jboolean makeDirectory(::java::lang::String *);
-  virtual ::java::lang::String * getWorkingDirectory();
-  virtual ::java::io::InputStream * list(::java::lang::String *);
-  virtual ::java::util::List * nameList(::java::lang::String *);
-  virtual ::java::lang::String * system();
-  virtual void noop();
-public: // actually protected
-  virtual void send(::java::lang::String *);
-  virtual ::gnu::java::net::protocol::ftp::FTPResponse * getResponse();
-  virtual ::gnu::java::net::protocol::ftp::FTPResponse * readResponse();
-public: // actually package-private
-  static jint parseCode(::java::lang::String *);
-public:
-  static const jint FTP_PORT = 21;
-  static const jint FTP_DATA_PORT = 20;
-public: // actually protected
-  static ::java::lang::String * USER;
-  static ::java::lang::String * PASS;
-  static ::java::lang::String * ACCT;
-  static ::java::lang::String * CWD;
-  static ::java::lang::String * CDUP;
-  static ::java::lang::String * SMNT;
-  static ::java::lang::String * REIN;
-  static ::java::lang::String * QUIT;
-  static ::java::lang::String * PORT;
-  static ::java::lang::String * PASV;
-  static ::java::lang::String * TYPE;
-  static ::java::lang::String * STRU;
-  static ::java::lang::String * MODE;
-  static ::java::lang::String * RETR;
-  static ::java::lang::String * STOR;
-  static ::java::lang::String * STOU;
-  static ::java::lang::String * APPE;
-  static ::java::lang::String * ALLO;
-  static ::java::lang::String * REST;
-  static ::java::lang::String * RNFR;
-  static ::java::lang::String * RNTO;
-  static ::java::lang::String * ABOR;
-  static ::java::lang::String * DELE;
-  static ::java::lang::String * RMD;
-  static ::java::lang::String * MKD;
-  static ::java::lang::String * PWD;
-  static ::java::lang::String * LIST;
-  static ::java::lang::String * NLST;
-  static ::java::lang::String * SITE;
-  static ::java::lang::String * SYST;
-  static ::java::lang::String * STAT;
-  static ::java::lang::String * HELP;
-  static ::java::lang::String * NOOP;
-  static ::java::lang::String * AUTH;
-  static ::java::lang::String * PBSZ;
-  static ::java::lang::String * PROT;
-  static ::java::lang::String * CCC;
-  static ::java::lang::String * TLS;
-public:
-  static const jint TYPE_ASCII = 1;
-  static const jint TYPE_EBCDIC = 2;
-  static const jint TYPE_BINARY = 3;
-  static const jint STRUCTURE_FILE = 1;
-  static const jint STRUCTURE_RECORD = 2;
-  static const jint STRUCTURE_PAGE = 3;
-  static const jint MODE_STREAM = 1;
-  static const jint MODE_BLOCK = 2;
-  static const jint MODE_COMPRESSED = 3;
-private:
-  static ::java::lang::String * US_ASCII;
-public: // actually protected
-  ::java::net::Socket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) socket;
-  ::gnu::java::net::LineInputStream * in;
-  ::gnu::java::net::CRLFOutputStream * out;
-  jint connectionTimeout;
-  jint timeout;
-  jboolean debug;
-  ::gnu::java::net::protocol::ftp::DTP * dtp;
-  jint representationType;
-  jint fileStructure;
-  jint transferMode;
-  jboolean passive;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPConnection__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPException.h b/libjava/gnu/java/net/protocol/ftp/FTPException.h
deleted file mode 100644
index b22c2f2..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPException__
-#define __gnu_java_net_protocol_ftp_FTPException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class FTPException;
-              class FTPResponse;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPException : public ::java::io::IOException
-{
-
-public:
-  FTPException(::gnu::java::net::protocol::ftp::FTPResponse *);
-  virtual ::gnu::java::net::protocol::ftp::FTPResponse * getResponse();
-public: // actually protected
-  ::gnu::java::net::protocol::ftp::FTPResponse * __attribute__((aligned(__alignof__( ::java::io::IOException)))) response;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPException__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPResponse.h b/libjava/gnu/java/net/protocol/ftp/FTPResponse.h
deleted file mode 100644
index b7faeb9..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPResponse.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPResponse__
-#define __gnu_java_net_protocol_ftp_FTPResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class FTPResponse;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPResponse : public ::java::lang::Object
-{
-
-public:
-  FTPResponse(jint, ::java::lang::String *);
-  FTPResponse(jint, ::java::lang::String *, ::java::lang::String *);
-  jint getCode();
-  ::java::lang::String * getMessage();
-  ::java::lang::String * getData();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) code;
-  ::java::lang::String * message;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPResponse__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.h b/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.h
deleted file mode 100644
index ab8c4e0..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingInputStream__
-#define __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class FTPURLConnection;
-              class FTPURLConnection$ClosingInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPURLConnection$ClosingInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  FTPURLConnection$ClosingInputStream(::gnu::java::net::protocol::ftp::FTPURLConnection *, ::java::io::InputStream *);
-public:
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::net::protocol::ftp::FTPURLConnection * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingInputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.h b/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.h
deleted file mode 100644
index 7cdb24c..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingOutputStream__
-#define __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class FTPURLConnection;
-              class FTPURLConnection$ClosingOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPURLConnection$ClosingOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually package-private
-  FTPURLConnection$ClosingOutputStream(::gnu::java::net::protocol::ftp::FTPURLConnection *, ::java::io::OutputStream *);
-public:
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::net::protocol::ftp::FTPURLConnection * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPURLConnection$ClosingOutputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.h b/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.h
deleted file mode 100644
index a413928..0000000
--- a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_FTPURLConnection__
-#define __gnu_java_net_protocol_ftp_FTPURLConnection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class FTPConnection;
-              class FTPURLConnection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::FTPURLConnection : public ::java::net::URLConnection
-{
-
-public:
-  FTPURLConnection(::java::net::URL *);
-  virtual void connect();
-  virtual void setDoInput(jboolean);
-  virtual void setDoOutput(jboolean);
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual ::java::lang::String * getRequestProperty(::java::lang::String *);
-  virtual ::java::util::Map * getRequestProperties();
-private:
-  void addRequestPropertyValue(::java::util::Map *, ::java::lang::String *);
-public:
-  virtual void setRequestProperty(::java::lang::String *, ::java::lang::String *);
-  virtual void addRequestProperty(::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  ::gnu::java::net::protocol::ftp::FTPConnection * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) connection;
-  jboolean passive;
-  jint representationType;
-  jint fileStructure;
-  jint transferMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_FTPURLConnection__
diff --git a/libjava/gnu/java/net/protocol/ftp/Handler.h b/libjava/gnu/java/net/protocol/ftp/Handler.h
deleted file mode 100644
index 05839d6..0000000
--- a/libjava/gnu/java/net/protocol/ftp/Handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_Handler__
-#define __gnu_java_net_protocol_ftp_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual jint getDefaultPort();
-public:
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_Handler__
diff --git a/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.h b/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.h
deleted file mode 100644
index 01a4a8a..0000000
--- a/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_PassiveModeDTP__
-#define __gnu_java_net_protocol_ftp_PassiveModeDTP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTPInputStream;
-              class DTPOutputStream;
-              class PassiveModeDTP;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::PassiveModeDTP : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PassiveModeDTP(::java::lang::String *, jint, ::java::net::InetAddress *, jint, jint);
-public:
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  void setTransferMode(jint);
-  void complete();
-  jboolean abort();
-  void transferComplete();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) address;
-  jint port;
-  ::java::net::Socket * socket;
-  ::gnu::java::net::protocol::ftp::DTPInputStream * in;
-  ::gnu::java::net::protocol::ftp::DTPOutputStream * out;
-  jboolean completed;
-  jboolean inProgress;
-  jint transferMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_PassiveModeDTP__
diff --git a/libjava/gnu/java/net/protocol/ftp/StreamInputStream.h b/libjava/gnu/java/net/protocol/ftp/StreamInputStream.h
deleted file mode 100644
index 2a344be..0000000
--- a/libjava/gnu/java/net/protocol/ftp/StreamInputStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_StreamInputStream__
-#define __gnu_java_net_protocol_ftp_StreamInputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-              class StreamInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::StreamInputStream : public ::gnu::java::net::protocol::ftp::DTPInputStream
-{
-
-public: // actually package-private
-  StreamInputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::InputStream *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_StreamInputStream__
diff --git a/libjava/gnu/java/net/protocol/ftp/StreamOutputStream.h b/libjava/gnu/java/net/protocol/ftp/StreamOutputStream.h
deleted file mode 100644
index 7787c3b..0000000
--- a/libjava/gnu/java/net/protocol/ftp/StreamOutputStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_ftp_StreamOutputStream__
-#define __gnu_java_net_protocol_ftp_StreamOutputStream__
-
-#pragma interface
-
-#include <gnu/java/net/protocol/ftp/DTPOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace ftp
-          {
-              class DTP;
-              class StreamOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::ftp::StreamOutputStream : public ::gnu::java::net::protocol::ftp::DTPOutputStream
-{
-
-public: // actually package-private
-  StreamOutputStream(::gnu::java::net::protocol::ftp::DTP *, ::java::io::OutputStream *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_ftp_StreamOutputStream__
diff --git a/libjava/gnu/java/net/protocol/gcjlib/Connection.h b/libjava/gnu/java/net/protocol/gcjlib/Connection.h
deleted file mode 100644
index 9ecf032..0000000
--- a/libjava/gnu/java/net/protocol/gcjlib/Connection.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_gcjlib_Connection__
-#define __gnu_java_net_protocol_gcjlib_Connection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-    }
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace gcjlib
-          {
-              class Connection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::protocol::gcjlib::Connection : public ::java::net::URLConnection
-{
-
-public:
-  Connection(::java::net::URL *);
-  virtual void connect();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::lang::String * getHeaderField(::java::lang::String *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) solib;
-  ::java::lang::String * name;
-  ::gnu::gcj::Core * core;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_gcjlib_Connection__
diff --git a/libjava/gnu/java/net/protocol/gcjlib/Connection.java b/libjava/gnu/java/net/protocol/gcjlib/Connection.java
deleted file mode 100644
index 4e6e462..0000000
--- a/libjava/gnu/java/net/protocol/gcjlib/Connection.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// Connection.java - Implementation of URLConnection for gcjlib
-// protocol.
-
-/* Copyright (C) 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.protocol.gcjlib;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import gnu.gcj.Core;
-import gnu.gcj.runtime.SharedLibHelper;
-import gnu.java.net.protocol.core.CoreInputStream;
-
-/**
- * @author Tom Tromey <tromey@redhat.com>
- * @date January 10, 2003
- */
-class Connection extends URLConnection
-{
-  String solib;
-  String name;
-  Core core;
-
-  public Connection (URL url) throws MalformedURLException
-  {
-    super (url);
-    int index = url.getFile().indexOf ("!/");
-    
-    if (index == -1)
-      throw new MalformedURLException ("couldn't find !/ in gcjlib URL");
-
-    name = url.getFile().substring (index + 2);
-    solib = url.getFile().substring (0, index);
-  }
-
-  public void connect() throws IOException
-  {
-    if (core != null)
-      return;
-    // We can't create a new SharedLibHelper here, since we don't know
-    // what parent class loader to use.
-    SharedLibHelper helper = SharedLibHelper.findHelper(solib);
-    if (helper == null)
-      throw new IOException("library not loaded: " + solib);
-    core = helper.findCore(name);
-    if (core == null)
-      throw new IOException("couldn't find core object: " + name);
-  }
-
-  public InputStream getInputStream() throws IOException
-  {
-    connect();
-    return new CoreInputStream(core);
-  }
-  
-  public String getHeaderField(String field)
-  {
-    try
-      {
-	if (!connected)
-	  connect();
-
-	if (field.equals("content-type"))
-          return guessContentTypeFromName(name);
-	else if (field.equals("content-length"))
-          return Long.toString(core.length);
-      }
-    catch (IOException e)
-      {
-        // Fall through.
-      }
-    return null;
-  }  
-}
diff --git a/libjava/gnu/java/net/protocol/gcjlib/Handler.h b/libjava/gnu/java/net/protocol/gcjlib/Handler.h
deleted file mode 100644
index 40813ae..0000000
--- a/libjava/gnu/java/net/protocol/gcjlib/Handler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_gcjlib_Handler__
-#define __gnu_java_net_protocol_gcjlib_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace gcjlib
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::gcjlib::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_gcjlib_Handler__
diff --git a/libjava/gnu/java/net/protocol/gcjlib/Handler.java b/libjava/gnu/java/net/protocol/gcjlib/Handler.java
deleted file mode 100644
index 60f5bcc..0000000
--- a/libjava/gnu/java/net/protocol/gcjlib/Handler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Handler.java - URLStreamHandler for gcjlib protocol.
-
-/* Copyright (C) 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.java.net.protocol.gcjlib;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-
-public class Handler extends URLStreamHandler
-{
-  protected URLConnection openConnection (URL url) throws IOException
-  {
-    return new Connection (url);
-  }
-}
diff --git a/libjava/gnu/java/net/protocol/http/Authenticator.h b/libjava/gnu/java/net/protocol/http/Authenticator.h
deleted file mode 100644
index c2390d2..0000000
--- a/libjava/gnu/java/net/protocol/http/Authenticator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Authenticator__
-#define __gnu_java_net_protocol_http_Authenticator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Authenticator;
-              class Credentials;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Authenticator : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::java::net::protocol::http::Credentials * getCredentials(::java::lang::String *, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_net_protocol_http_Authenticator__
diff --git a/libjava/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.h b/libjava/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.h
deleted file mode 100644
index 2d9b519..0000000
--- a/libjava/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_ByteArrayRequestBodyWriter__
-#define __gnu_java_net_protocol_http_ByteArrayRequestBodyWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class ByteArrayRequestBodyWriter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::ByteArrayRequestBodyWriter : public ::java::lang::Object
-{
-
-public:
-  ByteArrayRequestBodyWriter(JArray< jbyte > *);
-  virtual jint getContentLength();
-  virtual void reset();
-  virtual jint write(JArray< jbyte > *);
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_ByteArrayRequestBodyWriter__
diff --git a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
deleted file mode 100644
index 4a362e9..0000000
--- a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_ChunkedInputStream__
-#define __gnu_java_net_protocol_http_ChunkedInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class ChunkedInputStream;
-              class Headers;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::ChunkedInputStream : public ::java::io::InputStream
-{
-
-public:
-  ChunkedInputStream(::java::io::InputStream *, ::gnu::java::net::protocol::http::Headers *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::net::protocol::http::Headers * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) headers;
-private:
-  ::java::io::InputStream * in;
-public: // actually package-private
-  jint size;
-  jint count;
-  jboolean meta;
-  jboolean eof;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_ChunkedInputStream__
diff --git a/libjava/gnu/java/net/protocol/http/Cookie.h b/libjava/gnu/java/net/protocol/http/Cookie.h
deleted file mode 100644
index 3c23640..0000000
--- a/libjava/gnu/java/net/protocol/http/Cookie.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Cookie__
-#define __gnu_java_net_protocol_http_Cookie__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Cookie;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Cookie : public ::java::lang::Object
-{
-
-public:
-  Cookie(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, ::java::util::Date *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getValue();
-  virtual ::java::lang::String * getComment();
-  virtual ::java::lang::String * getDomain();
-  virtual ::java::lang::String * getPath();
-  virtual jboolean isSecure();
-  virtual ::java::util::Date * getExpiryDate();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean, jboolean);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-  ::java::lang::String * comment;
-  ::java::lang::String * domain;
-  ::java::lang::String * path;
-  jboolean secure;
-  ::java::util::Date * expires;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Cookie__
diff --git a/libjava/gnu/java/net/protocol/http/CookieManager.h b/libjava/gnu/java/net/protocol/http/CookieManager.h
deleted file mode 100644
index f06ac97..0000000
--- a/libjava/gnu/java/net/protocol/http/CookieManager.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_CookieManager__
-#define __gnu_java_net_protocol_http_CookieManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Cookie;
-              class CookieManager;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::CookieManager : public ::java::lang::Object
-{
-
-public:
-  virtual void setCookie(::gnu::java::net::protocol::http::Cookie *) = 0;
-  virtual JArray< ::gnu::java::net::protocol::http::Cookie * > * getCookies(::java::lang::String *, jboolean, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_net_protocol_http_CookieManager__
diff --git a/libjava/gnu/java/net/protocol/http/Credentials.h b/libjava/gnu/java/net/protocol/http/Credentials.h
deleted file mode 100644
index e877d54..0000000
--- a/libjava/gnu/java/net/protocol/http/Credentials.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Credentials__
-#define __gnu_java_net_protocol_http_Credentials__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Credentials;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Credentials : public ::java::lang::Object
-{
-
-public:
-  Credentials(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getUsername();
-  virtual ::java::lang::String * getPassword();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) username;
-  ::java::lang::String * password;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Credentials__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.h b/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.h
deleted file mode 100644
index 727cb83..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPConnection$Pool$Reaper__
-#define __gnu_java_net_protocol_http_HTTPConnection$Pool$Reaper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class HTTPConnection$Pool;
-              class HTTPConnection$Pool$Reaper;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPConnection$Pool$Reaper : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HTTPConnection$Pool$Reaper(::gnu::java::net::protocol::http::HTTPConnection$Pool *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::java::net::protocol::http::HTTPConnection$Pool * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPConnection$Pool$Reaper__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool.h b/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool.h
deleted file mode 100644
index 62aaa26..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPConnection$Pool.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPConnection$Pool__
-#define __gnu_java_net_protocol_http_HTTPConnection$Pool__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class HTTPConnection;
-              class HTTPConnection$Pool;
-              class HTTPConnection$Pool$Reaper;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPConnection$Pool : public ::java::lang::Object
-{
-
-  HTTPConnection$Pool();
-  static jboolean matches(::gnu::java::net::protocol::http::HTTPConnection *, ::java::lang::String *, jint, jboolean);
-public: // actually package-private
-  virtual ::gnu::java::net::protocol::http::HTTPConnection * get(::java::lang::String *, jint, jboolean, jint, jint);
-  virtual void put(::gnu::java::net::protocol::http::HTTPConnection *);
-  virtual void removeOldest();
-  static ::gnu::java::net::protocol::http::HTTPConnection$Pool * instance;
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connectionPool;
-  jint maxConnections;
-  jint connectionTTL;
-  ::gnu::java::net::protocol::http::HTTPConnection$Pool$Reaper * reaper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPConnection$Pool__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPConnection.h b/libjava/gnu/java/net/protocol/http/HTTPConnection.h
deleted file mode 100644
index e0d1c46..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPConnection.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPConnection__
-#define __gnu_java_net_protocol_http_HTTPConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class CookieManager;
-              class HTTPConnection;
-              class HTTPConnection$Pool;
-              class Request;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedListener;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPConnection : public ::java::lang::Object
-{
-
-public:
-  HTTPConnection(::java::lang::String *);
-  HTTPConnection(::java::lang::String *, jboolean);
-  HTTPConnection(::java::lang::String *, jboolean, jint, jint);
-  HTTPConnection(::java::lang::String *, jint);
-  HTTPConnection(::java::lang::String *, jint, jboolean);
-  HTTPConnection(::java::lang::String *, jint, jboolean, jint, jint);
-  virtual ::java::lang::String * getHostName();
-  virtual jint getPort();
-  virtual jboolean isSecure();
-  virtual ::java::lang::String * getVersion();
-  virtual void setVersion(jint, jint);
-  virtual void setProxy(::java::lang::String *, jint);
-  virtual jboolean isUsingProxy();
-  virtual void setCookieManager(::gnu::java::net::protocol::http::CookieManager *);
-  virtual ::gnu::java::net::protocol::http::CookieManager * getCookieManager();
-public: // actually package-private
-  virtual void setPool(::gnu::java::net::protocol::http::HTTPConnection$Pool *);
-  virtual void release();
-public:
-  virtual ::gnu::java::net::protocol::http::Request * newRequest(::java::lang::String *, ::java::lang::String *);
-  virtual void close();
-public: // actually protected
-  virtual ::java::net::Socket * getSocket();
-public: // actually package-private
-  virtual ::javax::net::ssl::SSLSocketFactory * getSSLSocketFactory();
-  virtual void setSSLSocketFactory(::javax::net::ssl::SSLSocketFactory *);
-public: // actually protected
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual void closeConnection();
-  virtual ::java::lang::String * getURI();
-public: // actually package-private
-  virtual jint getNonceCount(::java::lang::String *);
-  virtual void incrementNonce(::java::lang::String *);
-  virtual void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-  virtual void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-public:
-  static const jint HTTP_PORT = 80;
-  static const jint HTTPS_PORT = 443;
-private:
-  static ::java::lang::String * userAgent;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hostname;
-  jint port;
-  jboolean secure;
-  jint connectionTimeout;
-  jint timeout;
-  ::java::lang::String * proxyHostname;
-  jint proxyPort;
-  jint majorVersion;
-  jint minorVersion;
-private:
-  ::java::util::List * handshakeCompletedListeners;
-public: // actually protected
-  ::java::net::Socket * socket;
-private:
-  ::javax::net::ssl::SSLSocketFactory * sslSocketFactory;
-public: // actually protected
-  ::java::io::InputStream * in;
-  ::java::io::OutputStream * out;
-private:
-  ::java::util::Map * nonceCounts;
-public: // actually protected
-  ::gnu::java::net::protocol::http::CookieManager * cookieManager;
-private:
-  ::gnu::java::net::protocol::http::HTTPConnection$Pool * pool;
-public: // actually package-private
-  jint useCount;
-  jlong timeLastUsed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPConnection__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPDateFormat.h b/libjava/gnu/java/net/protocol/http/HTTPDateFormat.h
deleted file mode 100644
index 2a305ba..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPDateFormat.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPDateFormat__
-#define __gnu_java_net_protocol_http_HTTPDateFormat__
-
-#pragma interface
-
-#include <java/text/DateFormat.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class HTTPDateFormat;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class FieldPosition;
-        class NumberFormat;
-        class ParsePosition;
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPDateFormat : public ::java::text::DateFormat
-{
-
-public:
-  HTTPDateFormat();
-  virtual ::java::lang::StringBuffer * format(::java::util::Date *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::util::Date * parse(::java::lang::String *, ::java::text::ParsePosition *);
-private:
-  jint skipWhitespace(::java::lang::String *, jint);
-  jint skipNonWhitespace(::java::lang::String *, jint);
-  jint skipTo(::java::lang::String *, jint, jchar);
-public:
-  virtual void setCalendar(::java::util::Calendar *);
-  virtual void setNumberFormat(::java::text::NumberFormat *);
-public: // actually package-private
-  static JArray< ::java::lang::String * > * DAYS_OF_WEEK;
-  static JArray< ::java::lang::String * > * MONTHS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPDateFormat__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPURLConnection$1.h b/libjava/gnu/java/net/protocol/http/HTTPURLConnection$1.h
deleted file mode 100644
index 678a71a..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPURLConnection$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPURLConnection$1__
-#define __gnu_java_net_protocol_http_HTTPURLConnection$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Credentials;
-              class HTTPURLConnection;
-              class HTTPURLConnection$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPURLConnection$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HTTPURLConnection$1(::gnu::java::net::protocol::http::HTTPURLConnection *, ::gnu::java::net::protocol::http::Credentials *);
-public:
-  virtual ::gnu::java::net::protocol::http::Credentials * getCredentials(::java::lang::String *, jint);
-public: // actually package-private
-  ::gnu::java::net::protocol::http::HTTPURLConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::gnu::java::net::protocol::http::Credentials * val$creds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPURLConnection$1__
diff --git a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.h b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.h
deleted file mode 100644
index 460928e..0000000
--- a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_HTTPURLConnection__
-#define __gnu_java_net_protocol_http_HTTPURLConnection__
-
-#pragma interface
-
-#include <javax/net/ssl/HttpsURLConnection.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class HTTPConnection;
-              class HTTPURLConnection;
-              class Headers;
-              class Request;
-              class Response;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedEvent;
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::HTTPURLConnection : public ::javax::net::ssl::HttpsURLConnection
-{
-
-public:
-  HTTPURLConnection(::java::net::URL *);
-  virtual void connect();
-public: // actually package-private
-  virtual ::gnu::java::net::protocol::http::HTTPConnection * getConnection(::java::lang::String *, jint, jboolean);
-public:
-  virtual void disconnect();
-  virtual jboolean usingProxy();
-  virtual void setRequestMethod(::java::lang::String *);
-  virtual ::java::lang::String * getRequestProperty(::java::lang::String *);
-  virtual ::java::util::Map * getRequestProperties();
-  virtual void setRequestProperty(::java::lang::String *, ::java::lang::String *);
-  virtual void addRequestProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::InputStream * getErrorStream();
-  virtual ::java::util::Map * getHeaderFields();
-public: // actually package-private
-  virtual ::java::lang::String * getStatusLine(::gnu::java::net::protocol::http::Response *);
-public:
-  virtual ::java::lang::String * getHeaderField(jint);
-  virtual ::java::lang::String * getHeaderFieldKey(jint);
-  virtual ::java::lang::String * getHeaderField(::java::lang::String *);
-  virtual jlong getHeaderFieldDate(::java::lang::String *, jlong);
-  virtual ::java::lang::String * getContentType();
-  virtual jint getResponseCode();
-  virtual ::java::lang::String * getResponseMessage();
-  virtual ::java::lang::String * getCipherSuite();
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates();
-  virtual JArray< ::java::security::cert::Certificate * > * getServerCertificates();
-  virtual void handshakeCompleted(::javax::net::ssl::HandshakeCompletedEvent *);
-  virtual void setReadTimeout(jint);
-private:
-  ::gnu::java::net::protocol::http::HTTPConnection * __attribute__((aligned(__alignof__( ::javax::net::ssl::HttpsURLConnection)))) connection;
-public: // actually package-private
-  ::java::lang::String * proxyHostname;
-  jint proxyPort;
-  ::java::lang::String * agent;
-  jboolean keepAlive;
-private:
-  ::gnu::java::net::protocol::http::Request * request;
-  ::gnu::java::net::protocol::http::Headers * requestHeaders;
-  ::java::io::ByteArrayOutputStream * requestSink;
-  jboolean requestMethodSetExplicitly;
-  ::gnu::java::net::protocol::http::Response * response;
-  ::java::io::InputStream * responseSink;
-  ::java::io::InputStream * errorSink;
-  ::javax::net::ssl::HandshakeCompletedEvent * handshakeEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_HTTPURLConnection__
diff --git a/libjava/gnu/java/net/protocol/http/Handler.h b/libjava/gnu/java/net/protocol/http/Handler.h
deleted file mode 100644
index bd96f2d..0000000
--- a/libjava/gnu/java/net/protocol/http/Handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Handler__
-#define __gnu_java_net_protocol_http_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual jint getDefaultPort();
-public:
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Handler__
diff --git a/libjava/gnu/java/net/protocol/http/Headers$HeaderElement.h b/libjava/gnu/java/net/protocol/http/Headers$HeaderElement.h
deleted file mode 100644
index ecf4982..0000000
--- a/libjava/gnu/java/net/protocol/http/Headers$HeaderElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Headers$HeaderElement__
-#define __gnu_java_net_protocol_http_Headers$HeaderElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Headers$HeaderElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Headers$HeaderElement : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Headers$HeaderElement(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Headers$HeaderElement__
diff --git a/libjava/gnu/java/net/protocol/http/Headers.h b/libjava/gnu/java/net/protocol/http/Headers.h
deleted file mode 100644
index cad6e68..0000000
--- a/libjava/gnu/java/net/protocol/http/Headers.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Headers__
-#define __gnu_java_net_protocol_http_Headers__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Headers;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Headers : public ::java::lang::Object
-{
-
-public:
-  Headers();
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-  virtual jint getIntValue(::java::lang::String *);
-  virtual jlong getLongValue(::java::lang::String *);
-  virtual ::java::util::Date * getDateValue(::java::lang::String *);
-  virtual void put(::java::lang::String *, ::java::lang::String *);
-  virtual void putAll(::gnu::java::net::protocol::http::Headers *);
-  virtual void remove(::java::lang::String *);
-  virtual void parse(::java::io::InputStream *);
-  virtual void addValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::Map * getAsMap();
-  virtual ::java::lang::String * getHeaderName(jint);
-  virtual ::java::lang::String * getHeaderValue(jint);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) headers;
-  static ::java::text::DateFormat * dateFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Headers__
diff --git a/libjava/gnu/java/net/protocol/http/LimitedLengthInputStream.h b/libjava/gnu/java/net/protocol/http/LimitedLengthInputStream.h
deleted file mode 100644
index e70bbcc..0000000
--- a/libjava/gnu/java/net/protocol/http/LimitedLengthInputStream.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_LimitedLengthInputStream__
-#define __gnu_java_net_protocol_http_LimitedLengthInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class HTTPConnection;
-              class LimitedLengthInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::LimitedLengthInputStream : public ::java::io::InputStream
-{
-
-  void handleClose();
-public: // actually package-private
-  LimitedLengthInputStream(::java::io::InputStream *, jlong, jboolean, ::gnu::java::net::protocol::http::HTTPConnection *, jboolean);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual jint available();
-  virtual void close();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::io::InputStream)))) remainingLen;
-  jboolean restrictLen;
-  ::gnu::java::net::protocol::http::HTTPConnection * connection;
-  jboolean eof;
-  ::java::io::InputStream * in;
-  jboolean doClose;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_LimitedLengthInputStream__
diff --git a/libjava/gnu/java/net/protocol/http/Request.h b/libjava/gnu/java/net/protocol/http/Request.h
deleted file mode 100644
index 2cf4693..0000000
--- a/libjava/gnu/java/net/protocol/http/Request.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Request__
-#define __gnu_java_net_protocol_http_Request__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Authenticator;
-              class HTTPConnection;
-              class Headers;
-              class Request;
-              class RequestBodyWriter;
-              class Response;
-              class ResponseHeaderHandler;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Request : public ::java::lang::Object
-{
-
-public: // actually protected
-  Request(::gnu::java::net::protocol::http::HTTPConnection *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::gnu::java::net::protocol::http::HTTPConnection * getConnection();
-  virtual ::java::lang::String * getMethod();
-  virtual ::java::lang::String * getPath();
-  virtual ::java::lang::String * getRequestURI();
-  virtual ::gnu::java::net::protocol::http::Headers * getHeaders();
-  virtual ::java::lang::String * getHeader(::java::lang::String *);
-  virtual jint getIntHeader(::java::lang::String *);
-  virtual ::java::util::Date * getDateHeader(::java::lang::String *);
-  virtual void setHeader(::java::lang::String *, ::java::lang::String *);
-  virtual void setRequestBody(JArray< jbyte > *);
-  virtual void setRequestBodyWriter(::gnu::java::net::protocol::http::RequestBodyWriter *);
-  virtual void setResponseHeaderHandler(::java::lang::String *, ::gnu::java::net::protocol::http::ResponseHeaderHandler *);
-  virtual void setAuthenticator(::gnu::java::net::protocol::http::Authenticator *);
-  virtual ::gnu::java::net::protocol::http::Response * dispatch();
-public: // actually package-private
-  virtual ::gnu::java::net::protocol::http::Response * readResponse(::java::io::InputStream *);
-  virtual void notifyHeaderHandlers(::gnu::java::net::protocol::http::Headers *);
-private:
-  ::java::io::InputStream * createResponseBodyStream(::gnu::java::net::protocol::http::Headers *, jint, jint, ::java::io::InputStream *, jboolean);
-public: // actually package-private
-  virtual jboolean authenticate(::gnu::java::net::protocol::http::Response *, jint);
-  virtual ::java::util::Properties * parseAuthParams(::java::lang::String *);
-  virtual ::java::lang::String * unquote(::java::lang::String *);
-  virtual ::java::lang::String * getNonceCount(::java::lang::String *);
-  virtual JArray< jbyte > * generateNonce();
-  virtual ::java::lang::String * toHexString(JArray< jbyte > *);
-  virtual void handleSetCookie(::java::lang::String *);
-public: // actually protected
-  ::gnu::java::net::protocol::http::HTTPConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connection;
-  ::java::lang::String * method;
-  ::java::lang::String * path;
-  ::gnu::java::net::protocol::http::Headers * requestHeaders;
-  ::gnu::java::net::protocol::http::RequestBodyWriter * requestBodyWriter;
-  ::java::util::Map * responseHeaderHandlers;
-  ::gnu::java::net::protocol::http::Authenticator * authenticator;
-private:
-  jboolean dispatched;
-public: // actually package-private
-  JArray< jbyte > * nonce;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Request__
diff --git a/libjava/gnu/java/net/protocol/http/RequestBodyWriter.h b/libjava/gnu/java/net/protocol/http/RequestBodyWriter.h
deleted file mode 100644
index 1bd32bc..0000000
--- a/libjava/gnu/java/net/protocol/http/RequestBodyWriter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_RequestBodyWriter__
-#define __gnu_java_net_protocol_http_RequestBodyWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class RequestBodyWriter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::RequestBodyWriter : public ::java::lang::Object
-{
-
-public:
-  virtual jint getContentLength() = 0;
-  virtual void reset() = 0;
-  virtual jint write(JArray< jbyte > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_net_protocol_http_RequestBodyWriter__
diff --git a/libjava/gnu/java/net/protocol/http/Response.h b/libjava/gnu/java/net/protocol/http/Response.h
deleted file mode 100644
index 928b212..0000000
--- a/libjava/gnu/java/net/protocol/http/Response.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_Response__
-#define __gnu_java_net_protocol_http_Response__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Headers;
-              class Response;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::Response : public ::java::lang::Object
-{
-
-public: // actually protected
-  Response(jint, jint, jint, ::java::lang::String *, ::gnu::java::net::protocol::http::Headers *, ::java::io::InputStream *);
-public:
-  virtual jint getMajorVersion();
-  virtual jint getMinorVersion();
-  virtual jint getCode();
-  virtual jint getCodeClass();
-  virtual ::java::lang::String * getMessage();
-  virtual ::gnu::java::net::protocol::http::Headers * getHeaders();
-  virtual ::java::lang::String * getHeader(::java::lang::String *);
-  virtual jint getIntHeader(::java::lang::String *);
-  virtual jlong getLongHeader(::java::lang::String *);
-  virtual ::java::util::Date * getDateHeader(::java::lang::String *);
-  virtual jboolean isRedirect();
-  virtual jboolean isError();
-  virtual ::java::io::InputStream * getBody();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) majorVersion;
-  jint minorVersion;
-  jint code;
-  ::java::lang::String * message;
-  ::gnu::java::net::protocol::http::Headers * headers;
-  ::java::io::InputStream * body;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_Response__
diff --git a/libjava/gnu/java/net/protocol/http/ResponseHeaderHandler.h b/libjava/gnu/java/net/protocol/http/ResponseHeaderHandler.h
deleted file mode 100644
index 055c019..0000000
--- a/libjava/gnu/java/net/protocol/http/ResponseHeaderHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_ResponseHeaderHandler__
-#define __gnu_java_net_protocol_http_ResponseHeaderHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class ResponseHeaderHandler;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::ResponseHeaderHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_net_protocol_http_ResponseHeaderHandler__
diff --git a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h b/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h
deleted file mode 100644
index fc0b0bf..0000000
--- a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_http_SimpleCookieManager__
-#define __gnu_java_net_protocol_http_SimpleCookieManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace http
-          {
-              class Cookie;
-              class SimpleCookieManager;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::net::protocol::http::SimpleCookieManager : public ::java::lang::Object
-{
-
-public:
-  SimpleCookieManager();
-  virtual void setCookie(::gnu::java::net::protocol::http::Cookie *);
-  virtual JArray< ::gnu::java::net::protocol::http::Cookie * > * getCookies(::java::lang::String *, jboolean, ::java::lang::String *);
-private:
-  void addCookies(::java::util::ArrayList *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::util::Date *);
-public: // actually protected
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cookies;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_http_SimpleCookieManager__
diff --git a/libjava/gnu/java/net/protocol/https/Handler.h b/libjava/gnu/java/net/protocol/https/Handler.h
deleted file mode 100644
index ce077f0..0000000
--- a/libjava/gnu/java/net/protocol/https/Handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_https_Handler__
-#define __gnu_java_net_protocol_https_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace https
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::https::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual jint getDefaultPort();
-public:
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_https_Handler__
diff --git a/libjava/gnu/java/net/protocol/jar/Connection$JarFileCache.h b/libjava/gnu/java/net/protocol/jar/Connection$JarFileCache.h
deleted file mode 100644
index 03744bc..0000000
--- a/libjava/gnu/java/net/protocol/jar/Connection$JarFileCache.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_jar_Connection$JarFileCache__
-#define __gnu_java_net_protocol_jar_Connection$JarFileCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace jar
-          {
-              class Connection$JarFileCache;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::net::protocol::jar::Connection$JarFileCache : public ::java::lang::Object
-{
-
-public:
-  Connection$JarFileCache();
-  static ::java::util::jar::JarFile * get(::java::net::URL *, jboolean);
-private:
-  static ::java::util::Hashtable * cache;
-  static const jint READBUFSIZE = 4096;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_jar_Connection$JarFileCache__
diff --git a/libjava/gnu/java/net/protocol/jar/Connection.h b/libjava/gnu/java/net/protocol/jar/Connection.h
deleted file mode 100644
index 5456919..0000000
--- a/libjava/gnu/java/net/protocol/jar/Connection.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_jar_Connection__
-#define __gnu_java_net_protocol_jar_Connection__
-
-#pragma interface
-
-#include <java/net/JarURLConnection.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace jar
-          {
-              class Connection;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class gnu::java::net::protocol::jar::Connection : public ::java::net::JarURLConnection
-{
-
-public: // actually protected
-  Connection(::java::net::URL *);
-public:
-  void connect();
-  ::java::io::InputStream * getInputStream();
-  ::java::util::jar::JarFile * getJarFile();
-  ::java::lang::String * getHeaderField(::java::lang::String *);
-  jint getContentLength();
-  jlong getLastModified();
-private:
-  static ::java::text::SimpleDateFormat * dateFormat;
-  ::java::util::jar::JarFile * __attribute__((aligned(__alignof__( ::java::net::JarURLConnection)))) jar_file;
-  ::java::util::jar::JarEntry * jar_entry;
-  ::java::net::URL * jar_url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_jar_Connection__
diff --git a/libjava/gnu/java/net/protocol/jar/Handler.h b/libjava/gnu/java/net/protocol/jar/Handler.h
deleted file mode 100644
index b5fb6b6..0000000
--- a/libjava/gnu/java/net/protocol/jar/Handler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_protocol_jar_Handler__
-#define __gnu_java_net_protocol_jar_Handler__
-
-#pragma interface
-
-#include <java/net/URLStreamHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace protocol
-        {
-          namespace jar
-          {
-              class Handler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::java::net::protocol::jar::Handler : public ::java::net::URLStreamHandler
-{
-
-public:
-  Handler();
-public: // actually protected
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *);
-  virtual void parseURL(::java::net::URL *, ::java::lang::String *, jint, jint);
-private:
-  static ::java::lang::String * flat(::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::String * toExternalForm(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_protocol_jar_Handler__
diff --git a/libjava/gnu/java/nio/ChannelInputStream.h b/libjava/gnu/java/nio/ChannelInputStream.h
deleted file mode 100644
index 04b6244..0000000
--- a/libjava/gnu/java/nio/ChannelInputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ChannelInputStream__
-#define __gnu_java_nio_ChannelInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class ChannelInputStream;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ReadableByteChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ChannelInputStream : public ::java::io::InputStream
-{
-
-public:
-  ChannelInputStream(::java::nio::channels::ReadableByteChannel *);
-  jint read(JArray< jbyte > *, jint, jint);
-  jint read();
-private:
-  ::java::nio::channels::ReadableByteChannel * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ChannelInputStream__
diff --git a/libjava/gnu/java/nio/ChannelOutputStream.h b/libjava/gnu/java/nio/ChannelOutputStream.h
deleted file mode 100644
index 7ff1b8d..0000000
--- a/libjava/gnu/java/nio/ChannelOutputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ChannelOutputStream__
-#define __gnu_java_nio_ChannelOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class ChannelOutputStream;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class WritableByteChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ChannelOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  ChannelOutputStream(::java::nio::channels::WritableByteChannel *);
-  void write(jint);
-private:
-  ::java::nio::channels::WritableByteChannel * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ChannelOutputStream__
diff --git a/libjava/gnu/java/nio/ChannelReader.h b/libjava/gnu/java/nio/ChannelReader.h
deleted file mode 100644
index 337473f..0000000
--- a/libjava/gnu/java/nio/ChannelReader.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ChannelReader__
-#define __gnu_java_nio_ChannelReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class ChannelReader;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace channels
-      {
-          class ReadableByteChannel;
-      }
-      namespace charset
-      {
-          class CharsetDecoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ChannelReader : public ::java::io::Reader
-{
-
-public:
-  ChannelReader(::java::nio::channels::ReadableByteChannel *, ::java::nio::charset::CharsetDecoder *, jint);
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void close();
-private:
-  static const jint DEFAULT_BUFFER_CAP = 8192;
-  ::java::nio::channels::ReadableByteChannel * __attribute__((aligned(__alignof__( ::java::io::Reader)))) channel;
-  ::java::nio::charset::CharsetDecoder * decoder;
-  ::java::nio::ByteBuffer * byteBuffer;
-  ::java::nio::CharBuffer * charBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ChannelReader__
diff --git a/libjava/gnu/java/nio/ChannelWriter.h b/libjava/gnu/java/nio/ChannelWriter.h
deleted file mode 100644
index f78d294..0000000
--- a/libjava/gnu/java/nio/ChannelWriter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ChannelWriter__
-#define __gnu_java_nio_ChannelWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class ChannelWriter;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace channels
-      {
-          class WritableByteChannel;
-      }
-      namespace charset
-      {
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ChannelWriter : public ::java::io::Writer
-{
-
-  void writeBuffer();
-public:
-  ChannelWriter(::java::nio::channels::WritableByteChannel *, ::java::nio::charset::CharsetEncoder *, jint);
-  virtual void flush();
-  virtual void close();
-  virtual void write(JArray< jchar > *, jint, jint);
-private:
-  static const jint DEFAULT_BUFFER_CAP = 8192;
-  ::java::nio::channels::WritableByteChannel * __attribute__((aligned(__alignof__( ::java::io::Writer)))) byteChannel;
-  ::java::nio::charset::CharsetEncoder * enc;
-  ::java::nio::ByteBuffer * byteBuffer;
-  ::java::nio::CharBuffer * charBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ChannelWriter__
diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.h b/libjava/gnu/java/nio/DatagramChannelImpl.h
deleted file mode 100644
index 26595ca..0000000
--- a/libjava/gnu/java/nio/DatagramChannelImpl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_DatagramChannelImpl__
-#define __gnu_java_nio_DatagramChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/DatagramChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class DatagramChannelImpl;
-          class NIODatagramSocket;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramSocket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class DatagramChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::DatagramChannelImpl : public ::java::nio::channels::DatagramChannel
-{
-
-public:
-  jboolean isInChannelOperation();
-  void setInChannelOperation(jboolean);
-public: // actually protected
-  DatagramChannelImpl(::java::nio::channels::spi::SelectorProvider *);
-public:
-  jint getNativeFD();
-  ::java::net::DatagramSocket * socket();
-public: // actually protected
-  void implCloseSelectableChannel();
-  void implConfigureBlocking(jboolean);
-public:
-  ::java::nio::channels::DatagramChannel * connect(::java::net::SocketAddress *);
-  ::java::nio::channels::DatagramChannel * disconnect();
-  jboolean isConnected();
-  jint write(::java::nio::ByteBuffer *);
-  jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  jint read(::java::nio::ByteBuffer *);
-  jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  ::java::net::SocketAddress * receive(::java::nio::ByteBuffer *);
-  jint send(::java::nio::ByteBuffer *, ::java::net::SocketAddress *);
-private:
-  ::gnu::java::nio::NIODatagramSocket * __attribute__((aligned(__alignof__( ::java::nio::channels::DatagramChannel)))) socket__;
-  jboolean inChannelOperation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_DatagramChannelImpl__
diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java
deleted file mode 100644
index de1d2e6..0000000
--- a/libjava/gnu/java/nio/DatagramChannelImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/* DatagramChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.java.net.PlainDatagramSocketImpl;
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.DatagramChannel;
-import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.spi.SelectorProvider;
-
-/**
- * @author Michael Koch
- */
-public final class DatagramChannelImpl extends DatagramChannel
-{
-  private NIODatagramSocket socket;
-  
-  /**
-   * Indicates whether this channel initiated whatever operation
-   * is being invoked on our datagram socket.
-   */
-  private boolean inChannelOperation;
-
-  /**
-   * Indicates whether our datagram socket should ignore whether
-   * we are set to non-blocking mode. Certain operations on our
-   * socket throw an <code>IllegalBlockingModeException</code> if
-   * we are in non-blocking mode, <i>except</i> if the operation
-   * is initiated by us.
-   */
-  public final boolean isInChannelOperation()
-  {
-    return inChannelOperation;
-  }
-  
-  /**
-   * Sets our indicator of whether we are initiating an I/O operation
-   * on our socket.
-   */
-  public final void setInChannelOperation(boolean b)
-  {
-    inChannelOperation = b;
-  }
- 
-  protected DatagramChannelImpl (SelectorProvider provider)
-    throws IOException
-  {
-    super (provider);
-    socket = new NIODatagramSocket (new PlainDatagramSocketImpl(), this);
-    configureBlocking(true);
-  }
-
-  public int getNativeFD()
-  {
-    return socket.getPlainDatagramSocketImpl().getNativeFD();
-  }
-    
-  public DatagramSocket socket ()
-  {
-    return socket;
-  }
-    
-  protected void implCloseSelectableChannel ()
-    throws IOException
-  {
-    socket.close ();
-  }
-    
-  protected void implConfigureBlocking (boolean blocking)
-    throws IOException
-  {
-    socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-  }
-
-  public DatagramChannel connect (SocketAddress remote)
-    throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-    
-    socket.connect (remote);
-    return this;
-  }
-    
-  public DatagramChannel disconnect ()
-    throws IOException
-  {
-    socket.disconnect ();
-    return this;
-  }
-    
-  public boolean isConnected ()
-  {
-    return socket.isConnected ();
-  }
-    
-  public int write (ByteBuffer src)
-    throws IOException
-  {
-    if (!isConnected ())
-      throw new NotYetConnectedException ();
-    
-    return send (src, socket.getRemoteSocketAddress());
-  }
-
-  public long write (ByteBuffer[] srcs, int offset, int length)
-    throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-
-    if ((offset < 0)
-        || (offset > srcs.length)
-        || (length < 0)
-        || (length > (srcs.length - offset)))
-      throw new IndexOutOfBoundsException();
-      
-    long result = 0;
-
-    for (int index = offset; index < offset + length; index++)
-      result += write (srcs [index]);
-
-    return result;
-  }
-
-  public int read (ByteBuffer dst)
-    throws IOException
-  {
-    if (!isConnected ())
-      throw new NotYetConnectedException ();
-    
-    int remaining = dst.remaining();
-    receive (dst);
-    return remaining - dst.remaining();
-  }
-    
-  public long read (ByteBuffer[] dsts, int offset, int length)
-    throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-    
-    if ((offset < 0)
-        || (offset > dsts.length)
-        || (length < 0)
-        || (length > (dsts.length - offset)))
-      throw new IndexOutOfBoundsException();
-      
-    long result = 0;
-
-    for (int index = offset; index < offset + length; index++)
-      result += read (dsts [index]);
-
-    return result;
-  }
-    
-  public SocketAddress receive (ByteBuffer dst)
-    throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-    
-    try
-      {
-        DatagramPacket packet;
-        int len = dst.remaining();
-        
-        if (dst.hasArray())
-          {
-            packet = new DatagramPacket (dst.array(),
-                                         dst.arrayOffset() + dst.position(),
-                                         len);
-          }
-        else
-          {
-            packet = new DatagramPacket (new byte [len], len);
-          }
-
-        boolean completed = false;
-
-        try
-          {
-            begin();
-            setInChannelOperation(true);
-            socket.receive (packet);
-            completed = true;
-          }
-        finally
-          {
-            end (completed);
-            setInChannelOperation(false);
-          }
-
-        if (!dst.hasArray())
-          {
-            dst.put (packet.getData(), packet.getOffset(), packet.getLength());
-          }
-        else
-          {
-            dst.position (dst.position() + packet.getLength());
-          }
-
-        return packet.getSocketAddress();
-      }
-    catch (SocketTimeoutException e)
-      {
-        return null;
-      }
-  }
-    
-  public int send (ByteBuffer src, SocketAddress target)
-    throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-    
-    if (target instanceof InetSocketAddress
-	&& ((InetSocketAddress) target).isUnresolved())
-      throw new IOException("Target address not resolved");
-
-    byte[] buffer;
-    int offset = 0;
-    int len = src.remaining();
-    
-    if (src.hasArray())
-      {
-        buffer = src.array();
-        offset = src.arrayOffset() + src.position();
-      }
-    else
-      {
-        buffer = new byte [len];
-        src.get (buffer);
-      }
-
-    DatagramPacket packet = new DatagramPacket (buffer, offset, len, target);
-
-    boolean completed = false;
-    try
-      {
-        begin();
-        setInChannelOperation(true);
-        socket.send(packet);
-        completed = true;
-      }
-    finally
-      {
-        end (completed);
-        setInChannelOperation(false);
-      }
-      
-    if (src.hasArray())
-      {
-	src.position (src.position() + len);
-      }
-
-    return len;
-  }
-}
diff --git a/libjava/gnu/java/nio/DatagramChannelSelectionKey.h b/libjava/gnu/java/nio/DatagramChannelSelectionKey.h
deleted file mode 100644
index 629eed3..0000000
--- a/libjava/gnu/java/nio/DatagramChannelSelectionKey.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_DatagramChannelSelectionKey__
-#define __gnu_java_nio_DatagramChannelSelectionKey__
-
-#pragma interface
-
-#include <gnu/java/nio/SelectionKeyImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class DatagramChannelSelectionKey;
-          class SelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::DatagramChannelSelectionKey : public ::gnu::java::nio::SelectionKeyImpl
-{
-
-public:
-  DatagramChannelSelectionKey(::java::nio::channels::spi::AbstractSelectableChannel *, ::gnu::java::nio::SelectorImpl *);
-  jint getNativeFD();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_DatagramChannelSelectionKey__
diff --git a/libjava/gnu/java/nio/DatagramChannelSelectionKey.java b/libjava/gnu/java/nio/DatagramChannelSelectionKey.java
deleted file mode 100644
index 81b87e5..0000000
--- a/libjava/gnu/java/nio/DatagramChannelSelectionKey.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* DatagramChannelSelectionKey.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import java.nio.channels.spi.AbstractSelectableChannel;
-
-/**
- * @author Michael Koch
- */
-public final class DatagramChannelSelectionKey
-  extends SelectionKeyImpl
-{
-  public DatagramChannelSelectionKey (AbstractSelectableChannel channel,
-                                      SelectorImpl selector)
-  {
-    super (channel, selector);
-  }
-
-  public int getNativeFD()
-  {
-    return ((DatagramChannelImpl) ch).getNativeFD();
-  }
-}
diff --git a/libjava/gnu/java/nio/FileLockImpl.h b/libjava/gnu/java/nio/FileLockImpl.h
deleted file mode 100644
index 514f03e..0000000
--- a/libjava/gnu/java/nio/FileLockImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_FileLockImpl__
-#define __gnu_java_nio_FileLockImpl__
-
-#pragma interface
-
-#include <java/nio/channels/FileLock.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class FileLockImpl;
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::FileLockImpl : public ::java::nio::channels::FileLock
-{
-
-public:
-  FileLockImpl(::gnu::java::nio::channels::FileChannelImpl *, jlong, jlong, jboolean);
-public: // actually protected
-  void finalize();
-public:
-  jboolean isValid();
-  void close();
-  void release();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::channels::FileLock)))) valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_FileLockImpl__
diff --git a/libjava/gnu/java/nio/FileLockImpl.java b/libjava/gnu/java/nio/FileLockImpl.java
deleted file mode 100644
index 6af01f1..0000000
--- a/libjava/gnu/java/nio/FileLockImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* FileLockImpl.java -- FileLock associated with a FileChannelImpl.
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.java.nio.channels.FileChannelImpl;
-
-import java.io.IOException;
-import java.nio.channels.FileLock;
-
-/**
- * A FileLock associated with a FileChannelImpl.
- *
- * @author Michael Koch
- * @since 1.4
- */
-public final class FileLockImpl extends FileLock
-{
-  /**
-   * Whether or not this lock is valid, false when channel is closed or
-   * release has been explicitly called.
-   */
-  private boolean valid;
-
-  public FileLockImpl (FileChannelImpl channel, long position,
-                       long size, boolean shared)
-  {
-    super (channel, position, size, shared);
-    valid = true;
-  }
-
-  /**
-   * Releases this lock.
-   */
-  protected void finalize()
-  {
-    try
-      {
-	release();
-      }
-    catch (IOException e)
-      {
-	// Ignore this.
-      }
-  }
-  
-  /**
-   * Whether or not this lock is valid, false when channel is closed or
-   * release has been explicitly called.
-   */
-  public boolean isValid()
-  {
-    if (valid)
-      valid = channel().isOpen();
-    return valid;
-  }
-
-  public void close() throws Exception
-  {
-    release();
-  }
-
-  /**
-   * Releases the lock if it is still valid. Marks this lock as invalid.
-   */
-  public void release() throws IOException
-  {
-    if (isValid())
-      {
-	valid = false;
-	((FileChannelImpl) channel()).unlock(position(), size());
-      }
-  }
-}
diff --git a/libjava/gnu/java/nio/InputStreamChannel.h b/libjava/gnu/java/nio/InputStreamChannel.h
deleted file mode 100644
index b663169..0000000
--- a/libjava/gnu/java/nio/InputStreamChannel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_InputStreamChannel__
-#define __gnu_java_nio_InputStreamChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class InputStreamChannel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::nio::InputStreamChannel : public ::java::lang::Object
-{
-
-public:
-  InputStreamChannel(::java::io::InputStream *);
-  void close();
-  jboolean isOpen();
-  jint read(::java::nio::ByteBuffer *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) closed;
-  ::java::io::InputStream * in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_InputStreamChannel__
diff --git a/libjava/gnu/java/nio/NIOConstants.h b/libjava/gnu/java/nio/NIOConstants.h
deleted file mode 100644
index a27e428..0000000
--- a/libjava/gnu/java/nio/NIOConstants.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_NIOConstants__
-#define __gnu_java_nio_NIOConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class NIOConstants;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::NIOConstants : public ::java::lang::Object
-{
-
-public:
-  NIOConstants();
-  static const jint DEFAULT_TIMEOUT = 50;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_NIOConstants__
diff --git a/libjava/gnu/java/nio/NIODatagramSocket.h b/libjava/gnu/java/nio/NIODatagramSocket.h
deleted file mode 100644
index 3e76ec9..0000000
--- a/libjava/gnu/java/nio/NIODatagramSocket.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_NIODatagramSocket__
-#define __gnu_java_nio_NIODatagramSocket__
-
-#pragma interface
-
-#include <java/net/DatagramSocket.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainDatagramSocketImpl;
-      }
-      namespace nio
-      {
-          class DatagramChannelImpl;
-          class NIODatagramSocket;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class DatagramChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::NIODatagramSocket : public ::java::net::DatagramSocket
-{
-
-public:
-  NIODatagramSocket(::gnu::java::net::PlainDatagramSocketImpl *, ::gnu::java::nio::DatagramChannelImpl *);
-  ::gnu::java::net::PlainDatagramSocketImpl * getPlainDatagramSocketImpl();
-  ::java::nio::channels::DatagramChannel * getChannel();
-private:
-  ::gnu::java::net::PlainDatagramSocketImpl * __attribute__((aligned(__alignof__( ::java::net::DatagramSocket)))) impl;
-  ::gnu::java::nio::DatagramChannelImpl * channel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_NIODatagramSocket__
diff --git a/libjava/gnu/java/nio/NIOServerSocket.h b/libjava/gnu/java/nio/NIOServerSocket.h
deleted file mode 100644
index 908a664..0000000
--- a/libjava/gnu/java/nio/NIOServerSocket.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_NIOServerSocket__
-#define __gnu_java_nio_NIOServerSocket__
-
-#pragma interface
-
-#include <java/net/ServerSocket.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-      }
-      namespace nio
-      {
-          class NIOServerSocket;
-          class ServerSocketChannelImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class ServerSocketChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::NIOServerSocket : public ::java::net::ServerSocket
-{
-
-public: // actually protected
-  NIOServerSocket(::gnu::java::nio::ServerSocketChannelImpl *);
-public:
-  ::gnu::java::net::PlainSocketImpl * getPlainSocketImpl();
-  ::java::nio::channels::ServerSocketChannel * getChannel();
-  ::java::net::Socket * accept();
-private:
-  ::gnu::java::nio::ServerSocketChannelImpl * __attribute__((aligned(__alignof__( ::java::net::ServerSocket)))) channel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_NIOServerSocket__
diff --git a/libjava/gnu/java/nio/NIOServerSocket.java b/libjava/gnu/java/nio/NIOServerSocket.java
deleted file mode 100644
index 0383e1a..0000000
--- a/libjava/gnu/java/nio/NIOServerSocket.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* NIOServerSocket.java -- 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.java.net.PlainSocketImpl;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-
-/**
- * @author Michael Koch (konqueror@gmx.de)
- */
-public final class NIOServerSocket extends ServerSocket
-{
-  private ServerSocketChannelImpl channel;
-    
-  protected NIOServerSocket (ServerSocketChannelImpl channel)
-    throws IOException
-  {
-    super();
-    this.channel = channel;
-  }
-
-  public native PlainSocketImpl getPlainSocketImpl();
-
-  public ServerSocketChannel getChannel()
-  {
-    return channel;
-  }
-
-  public Socket accept() throws IOException
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkListen (getLocalPort());
-
-    SocketChannel socketChannel = channel.provider().openSocketChannel();
-    implAccept (socketChannel.socket());
-    return socketChannel.socket();
-  }
-}
diff --git a/libjava/gnu/java/nio/NIOSocket.h b/libjava/gnu/java/nio/NIOSocket.h
deleted file mode 100644
index b987a6c..0000000
--- a/libjava/gnu/java/nio/NIOSocket.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_NIOSocket__
-#define __gnu_java_nio_NIOSocket__
-
-#pragma interface
-
-#include <java/net/Socket.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-      }
-      namespace nio
-      {
-          class NIOSocket;
-          class SocketChannelImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::NIOSocket : public ::java::net::Socket
-{
-
-public: // actually protected
-  NIOSocket(::gnu::java::net::PlainSocketImpl *, ::gnu::java::nio::SocketChannelImpl *);
-public:
-  ::gnu::java::net::PlainSocketImpl * getPlainSocketImpl();
-public: // actually package-private
-  void setChannel(::gnu::java::nio::SocketChannelImpl *);
-public:
-  ::java::nio::channels::SocketChannel * getChannel();
-private:
-  ::gnu::java::net::PlainSocketImpl * __attribute__((aligned(__alignof__( ::java::net::Socket)))) impl;
-  ::gnu::java::nio::SocketChannelImpl * channel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_NIOSocket__
diff --git a/libjava/gnu/java/nio/NIOSocket.java b/libjava/gnu/java/nio/NIOSocket.java
deleted file mode 100644
index 4d812bf..0000000
--- a/libjava/gnu/java/nio/NIOSocket.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* NIOSocket.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.java.net.PlainSocketImpl;
-import java.io.IOException;
-import java.net.Socket;
-import java.nio.channels.SocketChannel;
-
-/**
- * @author Michael Koch
- */
-public final class NIOSocket extends Socket
-{
-  private PlainSocketImpl impl;
-  private SocketChannelImpl channel;
-    
-  protected NIOSocket (PlainSocketImpl impl, SocketChannelImpl channel)
-    throws IOException
-  {
-    super (impl);
-    this.impl = impl;
-    this.channel = channel;
-  }
-
-  public final PlainSocketImpl getPlainSocketImpl()
-  {
-    return impl;
-  }
-
-  final void setChannel (SocketChannelImpl channel)
-  {
-    this.impl = channel.getPlainSocketImpl();
-    this.channel = channel;
-  }
-  
-  public final SocketChannel getChannel()
-  {
-    return channel;
-  }
-}
diff --git a/libjava/gnu/java/nio/OutputStreamChannel.h b/libjava/gnu/java/nio/OutputStreamChannel.h
deleted file mode 100644
index 3a47ab9..0000000
--- a/libjava/gnu/java/nio/OutputStreamChannel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_OutputStreamChannel__
-#define __gnu_java_nio_OutputStreamChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class OutputStreamChannel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::nio::OutputStreamChannel : public ::java::lang::Object
-{
-
-public:
-  OutputStreamChannel(::java::io::OutputStream *);
-  void close();
-  jboolean isOpen();
-  jint write(::java::nio::ByteBuffer *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) closed;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_OutputStreamChannel__
diff --git a/libjava/gnu/java/nio/PipeImpl$SinkChannelImpl.h b/libjava/gnu/java/nio/PipeImpl$SinkChannelImpl.h
deleted file mode 100644
index 648de59..0000000
--- a/libjava/gnu/java/nio/PipeImpl$SinkChannelImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_PipeImpl$SinkChannelImpl__
-#define __gnu_java_nio_PipeImpl$SinkChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/Pipe$SinkChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class PipeImpl$SinkChannelImpl;
-          class VMChannel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::PipeImpl$SinkChannelImpl : public ::java::nio::channels::Pipe$SinkChannel
-{
-
-public:
-  PipeImpl$SinkChannelImpl(::java::nio::channels::spi::SelectorProvider *, jint);
-public: // actually protected
-  void implCloseSelectableChannel();
-  void implConfigureBlocking(jboolean);
-public:
-  jint write(::java::nio::ByteBuffer *);
-  jlong write(JArray< ::java::nio::ByteBuffer * > *);
-  jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  jint getNativeFD();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::Pipe$SinkChannel)))) native_fd;
-  ::gnu::java::nio::VMChannel * vmch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_PipeImpl$SinkChannelImpl__
diff --git a/libjava/gnu/java/nio/PipeImpl$SourceChannelImpl.h b/libjava/gnu/java/nio/PipeImpl$SourceChannelImpl.h
deleted file mode 100644
index fdc744b..0000000
--- a/libjava/gnu/java/nio/PipeImpl$SourceChannelImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_PipeImpl$SourceChannelImpl__
-#define __gnu_java_nio_PipeImpl$SourceChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/Pipe$SourceChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class PipeImpl$SourceChannelImpl;
-          class VMChannel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::PipeImpl$SourceChannelImpl : public ::java::nio::channels::Pipe$SourceChannel
-{
-
-public:
-  PipeImpl$SourceChannelImpl(::java::nio::channels::spi::SelectorProvider *, jint);
-public: // actually protected
-  void implCloseSelectableChannel();
-  void implConfigureBlocking(jboolean);
-public:
-  jint read(::java::nio::ByteBuffer *);
-  jlong read(JArray< ::java::nio::ByteBuffer * > *);
-  jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  jint getNativeFD();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::Pipe$SourceChannel)))) native_fd;
-  ::gnu::java::nio::VMChannel * vmch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_PipeImpl$SourceChannelImpl__
diff --git a/libjava/gnu/java/nio/PipeImpl.h b/libjava/gnu/java/nio/PipeImpl.h
deleted file mode 100644
index 63bfafb..0000000
--- a/libjava/gnu/java/nio/PipeImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_PipeImpl__
-#define __gnu_java_nio_PipeImpl__
-
-#pragma interface
-
-#include <java/nio/channels/Pipe.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class PipeImpl;
-          class PipeImpl$SinkChannelImpl;
-          class PipeImpl$SourceChannelImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class Pipe$SinkChannel;
-          class Pipe$SourceChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::PipeImpl : public ::java::nio::channels::Pipe
-{
-
-public:
-  PipeImpl(::java::nio::channels::spi::SelectorProvider *);
-  virtual ::java::nio::channels::Pipe$SinkChannel * sink();
-  virtual ::java::nio::channels::Pipe$SourceChannel * source();
-private:
-  ::gnu::java::nio::PipeImpl$SinkChannelImpl * __attribute__((aligned(__alignof__( ::java::nio::channels::Pipe)))) sink__;
-  ::gnu::java::nio::PipeImpl$SourceChannelImpl * source__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_PipeImpl__
diff --git a/libjava/gnu/java/nio/PipeImpl.java b/libjava/gnu/java/nio/PipeImpl.java
deleted file mode 100644
index cccaa39..0000000
--- a/libjava/gnu/java/nio/PipeImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* PipeImpl.java -- 
-   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.nio;
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.Pipe;
-import java.nio.channels.spi.SelectorProvider;
-
-class PipeImpl extends Pipe
-{
-  public static final class SourceChannelImpl extends Pipe.SourceChannel
-  {
-    private int native_fd;
-    private VMChannel vmch;
-    
-    public SourceChannelImpl (SelectorProvider selectorProvider,
-                              int native_fd)
-    {
-      super (selectorProvider);
-      this.native_fd = native_fd;
-      vmch = VMChannel.getVMChannel(this);
-    }
-
-    protected final void implCloseSelectableChannel()
-      throws IOException
-    {
-      throw new Error ("Not implemented");
-    }
-
-    protected void implConfigureBlocking (boolean blocking)
-      throws IOException
-    {
-      vmch.setBlocking(blocking);
-    }
-
-    public final int read (ByteBuffer src)
-      throws IOException
-    {
-      return vmch.read(src);
-    }
-
-    public final long read (ByteBuffer[] srcs)
-      throws IOException
-    {
-      return vmch.readScattering(srcs, 0, srcs.length);
-    }
-
-    public final synchronized long read (ByteBuffer[] srcs, int offset,
-					 int len)
-      throws IOException
-    {
-      if (offset < 0
-	  || offset > srcs.length
-	  || len < 0
-	  || len > srcs.length - offset)
-	throw new IndexOutOfBoundsException();
-
-      return vmch.readScattering(srcs, offset, len);
-    }
-
-    public final int getNativeFD()
-    {
-      return native_fd;
-    }
-  }
-
-  public static final class SinkChannelImpl extends Pipe.SinkChannel
-  {
-    private int native_fd;
-    private VMChannel vmch;
-    
-    public SinkChannelImpl (SelectorProvider selectorProvider,
-                            int native_fd)
-    {
-      super (selectorProvider);
-      this.native_fd = native_fd;
-      vmch = VMChannel.getVMChannel(this);
-    }
-
-    protected final void implCloseSelectableChannel()
-      throws IOException
-    {
-      throw new Error ("Not implemented");
-    }
-
-    protected final void implConfigureBlocking (boolean blocking)
-      throws IOException
-    {
-      vmch.setBlocking(blocking);
-    }
-
-    public final int write (ByteBuffer dst)
-      throws IOException
-    {
-      return vmch.write(dst);
-    }
-
-    public final long write (ByteBuffer[] srcs)
-      throws IOException
-    {
-      return vmch.writeGathering(srcs, 0, srcs.length);
-    }
-
-    public final synchronized long write (ByteBuffer[] srcs, int offset, int len)
-      throws IOException
-    {
-      if (offset < 0
-	  || offset > srcs.length
-	  || len < 0
-	  || len > srcs.length - offset)
-	throw new IndexOutOfBoundsException();
-      
-      return vmch.writeGathering(srcs, offset, len);
-    }
-
-    public final int getNativeFD()
-    {
-      return native_fd;
-    }
-  }
-
-  private SinkChannelImpl sink;
-  private SourceChannelImpl source;
-  
-  public PipeImpl (SelectorProvider provider)
-    throws IOException
-  {
-    super();
-    VMPipe.init (this, provider);
-  }
-
-  public Pipe.SinkChannel sink()
-  {
-    return sink;
-  }
-
-  public Pipe.SourceChannel source()
-  {
-    return source;
-  }
-}
diff --git a/libjava/gnu/java/nio/SelectionKeyImpl.h b/libjava/gnu/java/nio/SelectionKeyImpl.h
deleted file mode 100644
index 29e0dca..0000000
--- a/libjava/gnu/java/nio/SelectionKeyImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SelectionKeyImpl__
-#define __gnu_java_nio_SelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectionKeyImpl;
-          class SelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public:
-  SelectionKeyImpl(::java::nio::channels::SelectableChannel *, ::gnu::java::nio::SelectorImpl *);
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint readyOps();
-  virtual ::java::nio::channels::SelectionKey * readyOps(jint);
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual ::java::nio::channels::Selector * selector();
-  virtual jint getNativeFD() = 0;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) readyOps__;
-  jint interestOps__;
-  ::gnu::java::nio::SelectorImpl * impl;
-public: // actually package-private
-  ::java::nio::channels::SelectableChannel * ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/SelectorImpl.h b/libjava/gnu/java/nio/SelectorImpl.h
deleted file mode 100644
index 5db33c8..0000000
--- a/libjava/gnu/java/nio/SelectorImpl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SelectorImpl__
-#define __gnu_java_nio_SelectorImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelector.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SelectorImpl : public ::java::nio::channels::spi::AbstractSelector
-{
-
-public:
-  SelectorImpl(::java::nio::channels::spi::SelectorProvider *);
-public: // actually protected
-  virtual void finalize();
-  virtual void implCloseSelector();
-public:
-  virtual ::java::util::Set * keys();
-  virtual jint selectNow();
-  virtual jint select();
-private:
-  JArray< jint > * getFDsAsArray(jint);
-public:
-  virtual jint select(jlong);
-  virtual ::java::util::Set * selectedKeys();
-  virtual ::java::nio::channels::Selector * wakeup();
-private:
-  void deregisterCancelledKeys();
-public: // actually protected
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::SelectableChannel *, jint, ::java::lang::Object *);
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::spi::AbstractSelectableChannel *, jint, ::java::lang::Object *);
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelector)))) keys__;
-  ::java::util::Set * selected;
-  ::java::lang::Object * selectThreadMutex;
-  ::java::lang::Thread * selectThread;
-  jboolean unhandledWakeup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SelectorImpl__
diff --git a/libjava/gnu/java/nio/SelectorProviderImpl.h b/libjava/gnu/java/nio/SelectorProviderImpl.h
deleted file mode 100644
index e2ad8e4..0000000
--- a/libjava/gnu/java/nio/SelectorProviderImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SelectorProviderImpl__
-#define __gnu_java_nio_SelectorProviderImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/SelectorProvider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectorProviderImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class DatagramChannel;
-          class Pipe;
-          class ServerSocketChannel;
-          class SocketChannel;
-        namespace spi
-        {
-            class AbstractSelector;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SelectorProviderImpl : public ::java::nio::channels::spi::SelectorProvider
-{
-
-public:
-  SelectorProviderImpl();
-  virtual ::java::nio::channels::DatagramChannel * openDatagramChannel();
-  virtual ::java::nio::channels::Pipe * openPipe();
-  virtual ::java::nio::channels::spi::AbstractSelector * openSelector();
-  virtual ::java::nio::channels::ServerSocketChannel * openServerSocketChannel();
-  virtual ::java::nio::channels::SocketChannel * openSocketChannel();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SelectorProviderImpl__
diff --git a/libjava/gnu/java/nio/SelectorProviderImpl.java b/libjava/gnu/java/nio/SelectorProviderImpl.java
deleted file mode 100644
index 03da80e..0000000
--- a/libjava/gnu/java/nio/SelectorProviderImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* SelectorProviderImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.nio;
-
-import java.io.IOException;
-import java.nio.channels.DatagramChannel;
-import java.nio.channels.Pipe;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.AbstractSelector;
-import java.nio.channels.spi.SelectorProvider;
-
-public class SelectorProviderImpl extends SelectorProvider
-{
-  public SelectorProviderImpl ()
-  {
-  }
-
-  public DatagramChannel openDatagramChannel ()
-    throws IOException
-  {
-    return new DatagramChannelImpl (this);
-  }
-
-  public Pipe openPipe ()
-    throws IOException
-  {
-    return new PipeImpl (this);
-  }
-    
-  public AbstractSelector openSelector ()
-    throws IOException
-  {
-    return new SelectorImpl (this);
-  }
-
-  public ServerSocketChannel openServerSocketChannel ()
-    throws IOException
-  {
-    return new ServerSocketChannelImpl (this);
-  }
-
-  public SocketChannel openSocketChannel ()
-    throws IOException
-  {
-    return new SocketChannelImpl (this);
-  }
-
-}
diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.h b/libjava/gnu/java/nio/ServerSocketChannelImpl.h
deleted file mode 100644
index 28f6d98..0000000
--- a/libjava/gnu/java/nio/ServerSocketChannelImpl.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ServerSocketChannelImpl__
-#define __gnu_java_nio_ServerSocketChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/ServerSocketChannel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class NIOServerSocket;
-          class ServerSocketChannelImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ServerSocketChannelImpl : public ::java::nio::channels::ServerSocketChannel
-{
-
-public: // actually protected
-  ServerSocketChannelImpl(::java::nio::channels::spi::SelectorProvider *);
-public:
-  jint getNativeFD();
-  void finalizer();
-public: // actually protected
-  void implCloseSelectableChannel();
-  void implConfigureBlocking(jboolean);
-public:
-  ::java::nio::channels::SocketChannel * accept();
-  ::java::net::ServerSocket * socket();
-private:
-  ::gnu::java::nio::NIOServerSocket * __attribute__((aligned(__alignof__( ::java::nio::channels::ServerSocketChannel)))) serverSocket;
-  jboolean connected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ServerSocketChannelImpl__
diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/gnu/java/nio/ServerSocketChannelImpl.java
deleted file mode 100644
index 8b9499c..0000000
--- a/libjava/gnu/java/nio/ServerSocketChannelImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ServerSocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.SocketTimeoutException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.NotYetBoundException;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.SelectorProvider;
-
-public final class ServerSocketChannelImpl extends ServerSocketChannel
-{
-  private NIOServerSocket serverSocket;
-  private boolean connected;
-
-  protected ServerSocketChannelImpl (SelectorProvider provider)
-    throws IOException
-  {
-    super (provider);
-    serverSocket = new NIOServerSocket (this);
-    configureBlocking(true);
-  }
-
-  public int getNativeFD()
-  {
-    return serverSocket.getPlainSocketImpl().getNativeFD();
-  }
-  
-  public void finalizer()
-  {
-    if (connected)
-      {
-        try
-          {
-            close ();
-          }
-        catch (Exception e)
-          {
-          }
-      }
-  }
-
-  protected void implCloseSelectableChannel () throws IOException
-  {
-    connected = false;
-    serverSocket.close();
-  }
-
-  protected void implConfigureBlocking (boolean blocking) throws IOException
-  {
-    serverSocket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-  }
-
-  public SocketChannel accept () throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-
-    if (!serverSocket.isBound())
-      throw new NotYetBoundException();
-
-    boolean completed = false;
-    
-    try
-      {
-        begin();
-        serverSocket.getPlainSocketImpl().setInChannelOperation(true);
-          // indicate that a channel is initiating the accept operation
-          // so that the socket ignores the fact that we might be in
-          // non-blocking mode.
-        NIOSocket socket = (NIOSocket) serverSocket.accept();
-        completed = true;
-        return socket.getChannel();
-      }
-    catch (SocketTimeoutException e)
-      {
-        return null;
-      }
-    finally
-      {
-        serverSocket.getPlainSocketImpl().setInChannelOperation(false);
-        end (completed);
-      }
-  }
-
-  public ServerSocket socket ()
-  {
-    return serverSocket;
-  }
-}
diff --git a/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.h b/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.h
deleted file mode 100644
index 43e3593..0000000
--- a/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_ServerSocketChannelSelectionKey__
-#define __gnu_java_nio_ServerSocketChannelSelectionKey__
-
-#pragma interface
-
-#include <gnu/java/nio/SelectionKeyImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectorImpl;
-          class ServerSocketChannelSelectionKey;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::ServerSocketChannelSelectionKey : public ::gnu::java::nio::SelectionKeyImpl
-{
-
-public:
-  ServerSocketChannelSelectionKey(::java::nio::channels::spi::AbstractSelectableChannel *, ::gnu::java::nio::SelectorImpl *);
-  jint getNativeFD();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_ServerSocketChannelSelectionKey__
diff --git a/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.java b/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.java
deleted file mode 100644
index aa32900..0000000
--- a/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ServerSocketChannelSelectionKey.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import java.nio.channels.spi.AbstractSelectableChannel;
-
-public final class ServerSocketChannelSelectionKey
-  extends SelectionKeyImpl
-{
-  public ServerSocketChannelSelectionKey (AbstractSelectableChannel channel,
-                                          SelectorImpl selector)
-  {
-    super (channel, selector);
-  }
-
-  public int getNativeFD()
-  {
-    return ((ServerSocketChannelImpl) ch).getNativeFD();
-  }
-}
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.h b/libjava/gnu/java/nio/SocketChannelImpl.h
deleted file mode 100644
index b180918..0000000
--- a/libjava/gnu/java/nio/SocketChannelImpl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SocketChannelImpl__
-#define __gnu_java_nio_SocketChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/SocketChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-      }
-      namespace nio
-      {
-          class NIOSocket;
-          class SocketChannelImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SocketChannelImpl : public ::java::nio::channels::SocketChannel
-{
-
-public: // actually package-private
-  SocketChannelImpl(::java::nio::channels::spi::SelectorProvider *);
-  SocketChannelImpl(::java::nio::channels::spi::SelectorProvider *, ::gnu::java::nio::NIOSocket *);
-public:
-  void finalizer();
-public: // actually package-private
-  ::gnu::java::net::PlainSocketImpl * getPlainSocketImpl();
-  jint getNativeFD();
-public: // actually protected
-  void implCloseSelectableChannel();
-  void implConfigureBlocking(jboolean);
-public:
-  jboolean connect(::java::net::SocketAddress *);
-  jboolean finishConnect();
-  jboolean isConnected();
-  jboolean isConnectionPending();
-  ::java::net::Socket * socket();
-  jint read(::java::nio::ByteBuffer *);
-  jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  jint write(::java::nio::ByteBuffer *);
-  jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-private:
-  ::gnu::java::net::PlainSocketImpl * __attribute__((aligned(__alignof__( ::java::nio::channels::SocketChannel)))) impl;
-  ::gnu::java::nio::NIOSocket * socket__;
-  jboolean connectionPending;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SocketChannelImpl__
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java
deleted file mode 100644
index 5925712..0000000
--- a/libjava/gnu/java/nio/SocketChannelImpl.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/* SocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.java.net.PlainSocketImpl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.channels.AlreadyConnectedException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ConnectionPendingException;
-import java.nio.channels.NoConnectionPendingException;
-import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.UnresolvedAddressException;
-import java.nio.channels.UnsupportedAddressTypeException;
-import java.nio.channels.spi.SelectorProvider;
-
-public final class SocketChannelImpl extends SocketChannel
-{
-  private PlainSocketImpl impl;
-  private NIOSocket socket;
-  private boolean connectionPending;
-
-  SocketChannelImpl (SelectorProvider provider)
-    throws IOException
-  {
-    super (provider);
-    impl = new PlainSocketImpl();
-    impl.create(true);
-    socket = new NIOSocket (impl, this);
-    configureBlocking(true);
-  }
-  
-  SocketChannelImpl (SelectorProvider provider,
-                     NIOSocket socket)
-    throws IOException
-  {
-    super (provider);
-    this.impl = socket.getPlainSocketImpl();
-    this.socket = socket;
-  }
-
-  public void finalizer()
-  {
-    if (isConnected())
-      {
-        try
-          {
-            close ();
-          }
-        catch (Exception e)
-          {
-          }
-      }
-  }
-
-  PlainSocketImpl getPlainSocketImpl()
-  {
-    return impl;
-  }
-
-  int getNativeFD()
-  {
-    return socket.getPlainSocketImpl().getNativeFD();
-  }
-
-  protected void implCloseSelectableChannel () throws IOException
-  {
-    socket.close();
-  }
-
-  protected void implConfigureBlocking (boolean blocking) throws IOException
-  {
-    socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-  }   
-
-  public boolean connect (SocketAddress remote) throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-    
-    if (isConnected())
-      throw new AlreadyConnectedException();
-
-    if (connectionPending)
-      throw new ConnectionPendingException();
-
-    if (!(remote instanceof InetSocketAddress))
-      throw new UnsupportedAddressTypeException();
-
-    if (((InetSocketAddress) remote).isUnresolved())
-      throw new UnresolvedAddressException();
-    
-    try
-      {
-        socket.getPlainSocketImpl().setInChannelOperation(true);
-          // indicate that a channel is initiating the accept operation
-          // so that the socket ignores the fact that we might be in
-          // non-blocking mode.
-        
-        if (isBlocking())
-          {
-            // Do blocking connect.
-            socket.connect (remote);
-            return true;
-          }
-
-        // Do non-blocking connect.
-        try
-          {
-            socket.connect (remote, NIOConstants.DEFAULT_TIMEOUT);
-            return true;
-          }
-        catch (SocketTimeoutException e)
-          {
-            connectionPending = true;
-            return false;
-          }
-      }
-    finally
-      {
-        socket.getPlainSocketImpl().setInChannelOperation(false);
-      }
-  }
-    
-  public boolean finishConnect ()
-    throws IOException
-  {
-    if (!isOpen())
-      throw new ClosedChannelException();
-    
-    if (!isConnected() && !connectionPending)
-      throw new NoConnectionPendingException();
-    
-    if (isConnected())
-      return true;
-
-    // FIXME: Handle blocking/non-blocking mode.
-
-    Selector selector = provider().openSelector();
-    register(selector, SelectionKey.OP_CONNECT);
-
-    if (isBlocking())
-      {
-        selector.select(); // blocking until channel is connected.
-        connectionPending = false;
-        return true;
-      }
-
-    int ready = selector.selectNow(); // non-blocking
-    if (ready == 1)
-      {
-        connectionPending = false;
-        return true;
-      }
-
-    return false;
-  }
-
-  public boolean isConnected ()
-  {
-    return socket.isConnected();
-  }
-    
-  public boolean isConnectionPending ()
-  {
-    return connectionPending;
-  }
-    
-  public Socket socket ()
-  {
-    return socket;
-  }
-
-  public int read(ByteBuffer dst) throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-    
-    byte[] data;
-    int offset = 0;
-    InputStream input = socket.getInputStream();
-    int available = input.available();
-    int len = dst.remaining();
-	
-    if ((! isBlocking()) && available == 0)
-      return 0;
-    
-    if (dst.hasArray())
-      {
-        offset = dst.arrayOffset() + dst.position();
-        data = dst.array();
-      }
-    else
-      {
-        data = new byte [len];
-      }
-
-    int readBytes = 0;
-    boolean completed = false;
-
-    try
-      {
-        begin();
-        socket.getPlainSocketImpl().setInChannelOperation(true);
-        readBytes = input.read (data, offset, len);
-        completed = true;
-      }
-    finally
-      {
-        end (completed);
-        socket.getPlainSocketImpl().setInChannelOperation(false);
-      }
-
-    if (readBytes > 0)
-      if (dst.hasArray())
-	{
-	  dst.position (dst.position() + readBytes);
-	}
-      else
-        {
-          dst.put (data, offset, readBytes);
-        }
-
-    return readBytes;
-  }
-    
-  public long read (ByteBuffer[] dsts, int offset, int length)
-    throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-    
-    if ((offset < 0)
-        || (offset > dsts.length)
-        || (length < 0)
-        || (length > (dsts.length - offset)))
-      throw new IndexOutOfBoundsException();
-      
-    long readBytes = 0;
-
-    for (int index = offset; index < length; index++)
-      readBytes += read (dsts [index]);
-
-    return readBytes;
-  }
-     
-  public int write (ByteBuffer src)
-    throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-    
-    byte[] data;
-    int offset = 0;
-    int len = src.remaining();
-    
-    if (!src.hasArray())
-      {
-        data = new byte [len];
-        src.get (data, 0, len);
-      }
-    else
-      {
-        offset = src.arrayOffset() + src.position();
-        data = src.array();
-      }
-
-    OutputStream output = socket.getOutputStream();
-    boolean completed = false;
-
-    try
-      {
-        begin();
-        socket.getPlainSocketImpl().setInChannelOperation(true);
-        output.write (data, offset, len);
-        completed = true;
-      }
-    finally
-      {
-        end (completed);
-        socket.getPlainSocketImpl().setInChannelOperation(false);
-      }
-
-    if (src.hasArray())
-      {
-	src.position (src.position() + len);
-      }
-    
-    return len;
-  }
-
-  public long write (ByteBuffer[] srcs, int offset, int length)
-    throws IOException
-  {
-    if (!isConnected())
-      throw new NotYetConnectedException();
-    
-    if ((offset < 0)
-        || (offset > srcs.length)
-        || (length < 0)
-        || (length > (srcs.length - offset)))
-      throw new IndexOutOfBoundsException();
-      
-    long writtenBytes = 0;
-
-    for (int index = offset; index < length; index++)
-      writtenBytes += write (srcs [index]);
-
-    return writtenBytes;
-  }
-}
diff --git a/libjava/gnu/java/nio/SocketChannelSelectionKey.h b/libjava/gnu/java/nio/SocketChannelSelectionKey.h
deleted file mode 100644
index f9d5f29..0000000
--- a/libjava/gnu/java/nio/SocketChannelSelectionKey.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SocketChannelSelectionKey__
-#define __gnu_java_nio_SocketChannelSelectionKey__
-
-#pragma interface
-
-#include <gnu/java/nio/SelectionKeyImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectorImpl;
-          class SocketChannelSelectionKey;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SocketChannelSelectionKey : public ::gnu::java::nio::SelectionKeyImpl
-{
-
-public:
-  SocketChannelSelectionKey(::java::nio::channels::spi::AbstractSelectableChannel *, ::gnu::java::nio::SelectorImpl *);
-  jint getNativeFD();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SocketChannelSelectionKey__
diff --git a/libjava/gnu/java/nio/SocketChannelSelectionKey.java b/libjava/gnu/java/nio/SocketChannelSelectionKey.java
deleted file mode 100644
index 75b4dfd..0000000
--- a/libjava/gnu/java/nio/SocketChannelSelectionKey.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* SocketChannelSelectionKey.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import java.nio.channels.spi.AbstractSelectableChannel;
-
-public final class SocketChannelSelectionKey
-  extends SelectionKeyImpl
-{
-  public SocketChannelSelectionKey (AbstractSelectableChannel channel,
-                                    SelectorImpl selector)
-  {
-    super (channel, selector);
-  }
-    
-  public int getNativeFD()
-  {
-    NIOSocket socket =
-        (NIOSocket) ((SocketChannelImpl) ch).socket();
-    return socket.getPlainSocketImpl().getNativeFD();
-  }
-}
diff --git a/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.h b/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.h
deleted file mode 100644
index b3ab490..0000000
--- a/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_SocketChannelSelectionKeyImpl__
-#define __gnu_java_nio_SocketChannelSelectionKeyImpl__
-
-#pragma interface
-
-#include <gnu/java/nio/SelectionKeyImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class SelectorImpl;
-          class SocketChannelImpl;
-          class SocketChannelSelectionKeyImpl;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::SocketChannelSelectionKeyImpl : public ::gnu::java::nio::SelectionKeyImpl
-{
-
-public:
-  SocketChannelSelectionKeyImpl(::gnu::java::nio::SocketChannelImpl *, ::gnu::java::nio::SelectorImpl *);
-  virtual jint getNativeFD();
-public: // actually package-private
-  ::gnu::java::nio::SocketChannelImpl * __attribute__((aligned(__alignof__( ::gnu::java::nio::SelectionKeyImpl)))) ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_SocketChannelSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.java b/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.java
deleted file mode 100644
index 30fb2df..0000000
--- a/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* SocketChannelSelectionKey.java -- Selection key for Socket Channel
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-
-/**
- * @author Michael Barker <mike@middlesoft.co.uk>
- *
- */
-public class SocketChannelSelectionKeyImpl extends SelectionKeyImpl
-{
-
-  SocketChannelImpl ch;
-  
-  /**
-   * @param ch
-   * @param impl
-   */
-  public SocketChannelSelectionKeyImpl(SocketChannelImpl ch, SelectorImpl impl)
-  {
-    super(ch, impl);
-    this.ch = (SocketChannelImpl) ch;
-  }
-
-  /**
-   * Returns the native file/socket descriptor as an int.
-   */
-  public int getNativeFD()
-  {
-    return ch.getPlainSocketImpl().getNativeFD();
-  }
-
-}
diff --git a/libjava/gnu/java/nio/VMChannel.h b/libjava/gnu/java/nio/VMChannel.h
deleted file mode 100644
index 2888051..0000000
--- a/libjava/gnu/java/nio/VMChannel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_VMChannel__
-#define __gnu_java_nio_VMChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class PlainSocketImpl;
-      }
-      namespace nio
-      {
-          class PipeImpl$SinkChannelImpl;
-          class PipeImpl$SourceChannelImpl;
-          class VMChannel;
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::nio::VMChannel : public ::java::lang::Object
-{
-
-  VMChannel(jint);
-public:
-  static ::gnu::java::nio::VMChannel * getVMChannel(::gnu::java::net::PlainSocketImpl *);
-  static ::gnu::java::nio::VMChannel * getVMChannel(::gnu::java::nio::PipeImpl$SourceChannelImpl *);
-  static ::gnu::java::nio::VMChannel * getVMChannel(::gnu::java::nio::PipeImpl$SinkChannelImpl *);
-  static ::gnu::java::nio::VMChannel * getVMChannel(::gnu::java::nio::channels::FileChannelImpl *);
-  virtual void setBlocking(jint, jboolean);
-  virtual void setBlocking(jboolean);
-public: // actually package-private
-  virtual jint read(jint, ::java::nio::ByteBuffer *);
-public:
-  virtual jint read(::java::nio::ByteBuffer *);
-public: // actually package-private
-  virtual jlong readScattering(jint, JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-public:
-  virtual jlong readScattering(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-public: // actually package-private
-  virtual jint write(jint, ::java::nio::ByteBuffer *);
-public:
-  virtual jint write(::java::nio::ByteBuffer *);
-public: // actually package-private
-  virtual jlong writeGathering(jint, JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-public:
-  virtual jlong writeGathering(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-private:
-  static void initIDs();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_VMChannel__
diff --git a/libjava/gnu/java/nio/VMChannel.java b/libjava/gnu/java/nio/VMChannel.java
deleted file mode 100644
index fdea8ff..0000000
--- a/libjava/gnu/java/nio/VMChannel.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* VMChannel.java -- Native interface suppling channel operations.
-   Copyright (C) 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio;
-
-import gnu.classpath.Configuration;
-import gnu.java.net.PlainSocketImpl;
-import gnu.java.nio.PipeImpl.SinkChannelImpl;
-import gnu.java.nio.PipeImpl.SourceChannelImpl;
-import gnu.java.nio.channels.FileChannelImpl;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Native interface to support configuring of channel to run in a non-blocking
- * manner and support scatter/gather io operations.
- * 
- * @author Michael Barker <mike@middlesoft.co.uk>
- *
- */
-public class VMChannel
-{
-  private final int fd;
-  
-  private VMChannel(int fd)
-  {
-    this.fd = fd;
-  }
-  
-  public static VMChannel getVMChannel(PlainSocketImpl socket)
-  {
-    return new VMChannel(socket.getNativeFD());
-  }
-  
-  public static VMChannel getVMChannel(SourceChannelImpl source)
-  {
-    return new VMChannel(source.getNativeFD());
-  }
-  
-  public static VMChannel getVMChannel(SinkChannelImpl sink)
-  {
-    return new VMChannel(sink.getNativeFD());
-  }
-  
-  public static VMChannel getVMChannel(FileChannelImpl file)
-  {
-    return new VMChannel(file.getNativeFD());
-  }
-
-  static
-  {
-    // load the shared library needed for native methods.
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary ("javanio");
-      }
-    initIDs();
-  }
-  
-  /**
-   * Set the file descriptor to have the required blocking
-   * setting.
-   * 
-   * @param fd
-   * @param blocking
-   */
-  public native void setBlocking(int fd, boolean blocking);
-  
-  public void setBlocking(boolean blocking)
-  {
-    setBlocking(fd, blocking);
-  }
-  
-
-  /**
-   * Reads a byte buffer directly using the supplied file descriptor.
-   * Assumes that the buffer is a DirectBuffer.
-   * 
-   * @param fd Native file descriptor to read from.
-   * @param dst Direct Byte Buffer to read to.
-   * @return Number of bytes read.
-   * @throws IOException If an error occurs or dst is not a direct buffers. 
-   */
-  native int read(int fd, ByteBuffer dst)
-    throws IOException;
-  
-  public int read(ByteBuffer dst)
-    throws IOException
-  {
-    return read(fd, dst);
-  }
-  
-  /**
-   * Reads into byte buffers directly using the supplied file descriptor.
-   * Assumes that the buffer list contains DirectBuffers.  Will perform a
-   * scattering read.
-   * 
-   * @param fd Native file descriptor to read from.
-   * @param dsts An array direct byte buffers.
-   * @param offset Index of the first buffer to read to.
-   * @param length The number of buffers to read to.
-   * @return Number of bytes read.
-   * @throws IOException If an error occurs or the dsts are not direct buffers. 
-   */
-  native long readScattering(int fd, ByteBuffer[] dsts, int offset, int length)
-    throws IOException;
-
-  public long readScattering(ByteBuffer[] dsts, int offset, int length)
-    throws IOException
-  {
-    if (offset + length > dsts.length)
-      throw new IndexOutOfBoundsException("offset + length > dsts.length");
-    
-    return readScattering(fd, dsts, offset, length);
-  }
-  
-  /**
-   * Writes from a direct byte bufer using the supplied file descriptor.
-   * Assumes the buffer is a DirectBuffer.
-   * 
-   * @param fd
-   * @param src
-   * @return Number of bytes written.
-   * @throws IOException
-   */
-  native int write(int fd, ByteBuffer src)
-    throws IOException;
-
-  public int write(ByteBuffer src)
-    throws IOException
-  {
-    return write(fd, src);
-  }
-  
-  /**
-   * Writes from byte buffers directly using the supplied file descriptor.
-   * Assumes the that buffer list constains DirectBuffers.  Will perform
-   * as gathering write.
-   * 
-   * @param fd
-   * @param srcs
-   * @param offset
-   * @param length
-   * @return Number of bytes written.
-   * @throws IOException
-   */
-  native long writeGathering(int fd, ByteBuffer[] srcs, int offset, int length)
-    throws IOException;
-  
-  public long writeGathering(ByteBuffer[] srcs, int offset, int length)
-    throws IOException
-  {
-    if (offset + length > srcs.length)
-      throw new IndexOutOfBoundsException("offset + length > srcs.length");
-    
-    return writeGathering(fd, srcs, offset, length);
-  }
-  
-  private native static void initIDs();
-
-}
diff --git a/libjava/gnu/java/nio/VMChannelOwner.h b/libjava/gnu/java/nio/VMChannelOwner.h
deleted file mode 100644
index eca43b5..0000000
--- a/libjava/gnu/java/nio/VMChannelOwner.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_VMChannelOwner__
-#define __gnu_java_nio_VMChannelOwner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class VMChannel;
-          class VMChannelOwner;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::VMChannelOwner : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::java::nio::VMChannel * getVMChannel() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_nio_VMChannelOwner__
diff --git a/libjava/gnu/java/nio/VMPipe.h b/libjava/gnu/java/nio/VMPipe.h
deleted file mode 100644
index 3a94c1e..0000000
--- a/libjava/gnu/java/nio/VMPipe.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_VMPipe__
-#define __gnu_java_nio_VMPipe__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class PipeImpl;
-          class VMPipe;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::VMPipe : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMPipe();
-  static void init(::gnu::java::nio::PipeImpl *, ::java::nio::channels::spi::SelectorProvider *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_VMPipe__
diff --git a/libjava/gnu/java/nio/VMPipe.java b/libjava/gnu/java/nio/VMPipe.java
deleted file mode 100644
index 11dd2aa..0000000
--- a/libjava/gnu/java/nio/VMPipe.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* VMPipe.java -- Reference implementation for VM hooks used by PipeImpl
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.nio;
-
-import java.io.IOException;
-import java.nio.channels.spi.SelectorProvider;
-import gnu.classpath.Configuration;
-
-/**
- * This class contains the native methods for gnu.java.nio.PipeImpl
- * As such, it needs help from the VM.
- *
- * @author Patrik Reali
- */
-final class VMPipe
-{
-
-  static
-  {
-    // load the shared library needed for native methods.
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary ("javanio");
-      }
-  }
-
-  static native void init(PipeImpl self, SelectorProvider provider)
-    throws IOException;
-}
diff --git a/libjava/gnu/java/nio/VMSelector.h b/libjava/gnu/java/nio/VMSelector.h
deleted file mode 100644
index cc177ff..0000000
--- a/libjava/gnu/java/nio/VMSelector.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_VMSelector__
-#define __gnu_java_nio_VMSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class VMSelector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::VMSelector : public ::java::lang::Object
-{
-
-public:
-  VMSelector();
-public: // actually package-private
-  static jint select(JArray< jint > *, JArray< jint > *, JArray< jint > *, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_VMSelector__
diff --git a/libjava/gnu/java/nio/VMSelector.java b/libjava/gnu/java/nio/VMSelector.java
deleted file mode 100644
index 488132d..0000000
--- a/libjava/gnu/java/nio/VMSelector.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* VMSelector.java -- 
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.nio;
-
-import gnu.classpath.Configuration;
-import java.io.IOException;
-
-public final class VMSelector
-{
-  static
-  {
-    // load the shared library needed for native methods.
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary ("javanio");
-      }
-  }
-  
-  // A timeout value of 0 means block forever.
-  static native int select (int[] read, int[] write,
-                                        int[] except, long timeout)
-    throws IOException;
-
-}
diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.h b/libjava/gnu/java/nio/channels/FileChannelImpl.h
deleted file mode 100644
index 34099c5..0000000
--- a/libjava/gnu/java/nio/channels/FileChannelImpl.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_channels_FileChannelImpl__
-#define __gnu_java_nio_channels_FileChannelImpl__
-
-#pragma interface
-
-#include <java/nio/channels/FileChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class MappedByteBuffer;
-      namespace channels
-      {
-          class FileChannel;
-          class FileChannel$MapMode;
-          class FileLock;
-          class ReadableByteChannel;
-          class WritableByteChannel;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::channels::FileChannelImpl : public ::java::nio::channels::FileChannel
-{
-
-  static void init();
-public:
-  FileChannelImpl();
-  static ::gnu::java::nio::channels::FileChannelImpl * create(::java::io::File *, jint);
-private:
-  FileChannelImpl(::java::io::File *, jint);
-public: // actually package-private
-  FileChannelImpl(jint, jint);
-private:
-  jint open(::java::lang::String *, jint);
-public:
-  jint available();
-private:
-  jlong implPosition();
-  void seek(jlong);
-  void implTruncate(jlong);
-public:
-  void unlock(jlong, jlong);
-  jlong size();
-public: // actually protected
-  void implCloseChannel();
-  void finalize();
-public:
-  jint read(::java::nio::ByteBuffer *);
-  jint read(::java::nio::ByteBuffer *, jlong);
-  jint read();
-  jint read(JArray< jbyte > *, jint, jint);
-  jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  jint write(::java::nio::ByteBuffer *);
-  jint write(::java::nio::ByteBuffer *, jlong);
-  void write(JArray< jbyte > *, jint, jint);
-  void write(jint);
-  jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  ::java::nio::MappedByteBuffer * mapImpl(jchar, jlong, jint);
-  ::java::nio::MappedByteBuffer * map(::java::nio::channels::FileChannel$MapMode *, jlong, jlong);
-  void force(jboolean);
-private:
-  jint smallTransferTo(jlong, jint, ::java::nio::channels::WritableByteChannel *);
-public:
-  jlong transferTo(jlong, jlong, ::java::nio::channels::WritableByteChannel *);
-private:
-  jint smallTransferFrom(::java::nio::channels::ReadableByteChannel *, jlong, jint);
-public:
-  jlong transferFrom(::java::nio::channels::ReadableByteChannel *, jlong, jlong);
-  ::java::nio::channels::FileLock * tryLock(jlong, jlong, jboolean);
-private:
-  jboolean lock(jlong, jlong, jboolean, jboolean);
-public:
-  ::java::nio::channels::FileLock * lock(jlong, jlong, jboolean);
-  jlong position();
-  ::java::nio::channels::FileChannel * position(jlong);
-  ::java::nio::channels::FileChannel * truncate(jlong);
-  jint getNativeFD();
-  static const jint READ = 1;
-  static const jint WRITE = 2;
-  static const jint APPEND = 4;
-  static const jint EXCL = 8;
-  static const jint SYNC = 16;
-  static const jint DSYNC = 32;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::FileChannel)))) fd;
-  jlong pos;
-  jint mode;
-public:
-  static ::gnu::java::nio::channels::FileChannelImpl * in;
-  static ::gnu::java::nio::channels::FileChannelImpl * out;
-  static ::gnu::java::nio::channels::FileChannelImpl * err;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_channels_FileChannelImpl__
diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.java b/libjava/gnu/java/nio/channels/FileChannelImpl.java
deleted file mode 100644
index c1f79a4..0000000
--- a/libjava/gnu/java/nio/channels/FileChannelImpl.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/* FileChannelImpl.java -- 
-   Copyright (C) 2002, 2004, 2005, 2006  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.nio.channels;
-
-import gnu.classpath.Configuration;
-import gnu.java.nio.FileLockImpl;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.NonReadableChannelException;
-import java.nio.channels.NonWritableChannelException;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
-
-/**
- * This file is not user visible !
- * But alas, Java does not have a concept of friendly packages
- * so this class is public. 
- * Instances of this class are created by invoking getChannel
- * Upon a Input/Output/RandomAccessFile object.
- */
-public final class FileChannelImpl extends FileChannel
-{
-  // These are mode values for open().
-  public static final int READ   = 1;
-  public static final int WRITE  = 2;
-  public static final int APPEND = 4;
-
-  // EXCL is used only when making a temp file.
-  public static final int EXCL   = 8;
-  public static final int SYNC   = 16;
-  public static final int DSYNC  = 32;
-
-  private static native void init();
-
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary("javanio");
-      }
-    
-    init();
-  }
-
-  /**
-   * This is the actual native file descriptor value
-   */
-  // System's notion of file descriptor.  It might seem redundant to
-  // initialize this given that it is reassigned in the constructors.
-  // However, this is necessary because if open() throws an exception
-  // we want to make sure this has the value -1.  This is the most
-  // efficient way to accomplish that.
-  private int fd = -1;
-
-  private long pos;
-  private int mode;
-
-  public FileChannelImpl ()
-  {
-  }
-
-  /* Open a file.  MODE is a combination of the above mode flags. */
-  /* This is a static factory method, so that VM implementors can decide
-   * substitute subclasses of FileChannelImpl. */
-  public static FileChannelImpl create(File file, int mode)
-    throws FileNotFoundException
-  {
-    return new FileChannelImpl(file, mode);
-  }
-
-  /* Open a file.  MODE is a combination of the above mode flags. */
-  private FileChannelImpl (File file, int mode) throws FileNotFoundException
-  {
-    final String path = file.getPath();
-    fd = open (path, mode);
-    this.mode = mode;
-
-    // First open the file and then check if it is a a directory
-    // to avoid race condition.
-    if (file.isDirectory())
-      {
-	try 
-	  {
-	      close();
-	  }
-	catch (IOException e)
-	  {
-	      /* ignore it */
-	  }
-
-	throw new FileNotFoundException(path + " is a directory");
-      }
-  }
-
-  /* Used by init() (native code) */
-  FileChannelImpl (int fd, int mode)
-  {
-    this.fd = fd;
-    this.mode = mode;
-  }
-
-  public static FileChannelImpl in;
-  public static FileChannelImpl out;
-  public static FileChannelImpl err;
-
-  private native int open (String path, int mode) throws FileNotFoundException;
-
-  public native int available () throws IOException;
-  private native long implPosition () throws IOException;
-  private native void seek (long newPosition) throws IOException;
-  private native void implTruncate (long size) throws IOException;
-  
-  public native void unlock (long pos, long len) throws IOException;
-
-  public native long size () throws IOException;
-    
-  protected native void implCloseChannel() throws IOException;
-
-  /**
-   * Makes sure the Channel is properly closed.
-   */
-  protected void finalize() throws IOException
-  {
-    this.close();
-  }
-
-  public int read (ByteBuffer dst) throws IOException
-  {
-    int result;
-    byte[] buffer = new byte [dst.remaining ()];
-    
-    result = read (buffer, 0, buffer.length);
-
-    if (result > 0)
-      dst.put (buffer, 0, result);
-
-    return result;
-  }
-
-  public int read (ByteBuffer dst, long position)
-    throws IOException
-  {
-    if (position < 0)
-      throw new IllegalArgumentException ();
-    long oldPosition = implPosition ();
-    position (position);
-    int result = read(dst);
-    position (oldPosition);
-    
-    return result;
-  }
-
-  public native int read ()
-    throws IOException;
-
-  public native int read (byte[] buffer, int offset, int length)
-    throws IOException;
-
-  public long read (ByteBuffer[] dsts, int offset, int length)
-    throws IOException
-  {
-    long result = 0;
-
-    for (int i = offset; i < offset + length; i++)
-      {
-        result += read (dsts [i]);
-      }
-
-    return result;
-  }
-
-  public int write (ByteBuffer src) throws IOException
-  {
-    int len = src.remaining ();
-    if (src.hasArray())
-      {
-	byte[] buffer = src.array();
-	write(buffer, src.arrayOffset() + src.position(), len);
-	src.position(src.position() + len);
-      }
-    else
-      {
-	// Use a more efficient native method! FIXME!
-	byte[] buffer = new byte [len];
-    	src.get (buffer, 0, len);
-	write (buffer, 0, len);
-      }
-    return len;
-  }
-    
-  public int write (ByteBuffer src, long position)
-    throws IOException
-  {
-    if (position < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-    
-    if ((mode & WRITE) == 0)
-       throw new NonWritableChannelException ();
-
-    int result;
-    long oldPosition;
-
-    oldPosition = implPosition ();
-    seek (position);
-    result = write(src);
-    seek (oldPosition);
-    
-    return result;
-  }
-
-  public native void write (byte[] buffer, int offset, int length)
-    throws IOException;
-  
-  public native void write (int b) throws IOException;
-
-  public long write(ByteBuffer[] srcs, int offset, int length)
-    throws IOException
-  {
-    long result = 0;
-
-    for (int i = offset;i < offset + length;i++)
-      {
-        result += write (srcs[i]);
-      }
-    
-    return result;
-  }
-				   
-  public native MappedByteBuffer mapImpl (char mode, long position, int size)
-    throws IOException;
-
-  public MappedByteBuffer map (FileChannel.MapMode mode,
-			       long position, long size)
-    throws IOException
-  {
-    char nmode = 0;
-    if (mode == MapMode.READ_ONLY)
-      {
-	nmode = 'r';
-	if ((this.mode & READ) == 0)
-	  throw new NonReadableChannelException();
-      }
-    else if (mode == MapMode.READ_WRITE || mode == MapMode.PRIVATE)
-      {
-	nmode = mode == MapMode.READ_WRITE ? '+' : 'c';
-	if ((this.mode & (READ|WRITE)) != (READ|WRITE))
-	  throw new NonWritableChannelException();
-      }
-    else
-      throw new IllegalArgumentException ();
-    
-    if (position < 0 || size < 0 || size > Integer.MAX_VALUE)
-      throw new IllegalArgumentException ();
-    return mapImpl(nmode, position, (int) size);
-  }
-
-  /**
-   * msync with the disk
-   */
-  public void force (boolean metaData) throws IOException
-  {
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-  }
-
-  // like transferTo, but with a count of less than 2Gbytes
-  private int smallTransferTo (long position, int count, 
-			       WritableByteChannel target)
-    throws IOException
-  {
-    ByteBuffer buffer;
-    try
-      {
-	// Try to use a mapped buffer if we can.  If this fails for
-	// any reason we'll fall back to using a ByteBuffer.
-	buffer = map (MapMode.READ_ONLY, position, count);
-      }
-    catch (IOException e)
-      {
-	buffer = ByteBuffer.allocate (count);
-	read (buffer, position);
-	buffer.flip();
-      }
-
-    return target.write (buffer);
-  }
-
-  public long transferTo (long position, long count, 
-			  WritableByteChannel target)
-    throws IOException
-  {
-    if (position < 0
-        || count < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    if ((mode & READ) == 0)
-       throw new NonReadableChannelException ();
-   
-    final int pageSize = 65536;
-    long total = 0;
-
-    while (count > 0)
-      {
-	int transferred 
-	  = smallTransferTo (position, (int)Math.min (count, pageSize), 
-			     target);
-	if (transferred < 0)
-	  break;
-	total += transferred;
-	position += transferred;
-	count -= transferred;
-      }
-
-    return total;
-  }
-
-  // like transferFrom, but with a count of less than 2Gbytes
-  private int smallTransferFrom (ReadableByteChannel src, long position, 
-				 int count)
-    throws IOException
-  {
-    ByteBuffer buffer = null;
-
-    if (src instanceof FileChannel)
-      {
-	try
-	  {
-	    // Try to use a mapped buffer if we can.  If this fails
-	    // for any reason we'll fall back to using a ByteBuffer.
-	    buffer = ((FileChannel)src).map (MapMode.READ_ONLY, position, 
-					     count);
-	  }
-	catch (IOException e)
-	  {
-	  }
-      }
-
-    if (buffer == null)
-      {
-	buffer = ByteBuffer.allocate ((int) count);
-	src.read (buffer);
-	buffer.flip();
-      }
-
-    return write (buffer, position);
-  }
-
-  public long transferFrom (ReadableByteChannel src, long position, 
-			    long count)
-    throws IOException
-  {
-    if (position < 0
-        || count < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    if ((mode & WRITE) == 0)
-       throw new NonWritableChannelException ();
-
-    final int pageSize = 65536;
-    long total = 0;
-
-    while (count > 0)
-      {
-	int transferred = smallTransferFrom (src, position, 
-					     (int)Math.min (count, pageSize));
-	if (transferred < 0)
-	  break;
-	total += transferred;
-	position += transferred;
-	count -= transferred;
-      }
-
-    return total;
-  }
-
-  public FileLock tryLock (long position, long size, boolean shared)
-    throws IOException
-  {
-    if (position < 0
-        || size < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    if (shared && (mode & READ) == 0)
-      throw new NonReadableChannelException ();
-	
-    if (!shared && (mode & WRITE) == 0)
-      throw new NonWritableChannelException ();
-	
-    boolean completed = false;
-    
-    try
-      {
-	begin();
-	boolean lockable = lock(position, size, shared, false);
-	completed = true;
-	return (lockable
-		? new FileLockImpl(this, position, size, shared)
-		: null);
-      }
-    finally
-      {
-	end(completed);
-      }
-  }
-
-  /** Try to acquire a lock at the given position and size.
-   * On success return true.
-   * If wait as specified, block until we can get it.
-   * Otherwise return false.
-   */
-  private native boolean lock(long position, long size,
-			      boolean shared, boolean wait) throws IOException;
-  
-  public FileLock lock (long position, long size, boolean shared)
-    throws IOException
-  {
-    if (position < 0
-        || size < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    boolean completed = false;
-
-    try
-      {
-	boolean lockable = lock(position, size, shared, true);
-	completed = true;
-	return (lockable
-		? new FileLockImpl(this, position, size, shared)
-		: null);
-      }
-    finally
-      {
-	end(completed);
-      }
-  }
-
-  public long position ()
-    throws IOException
-  {
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    return implPosition ();
-  }
-  
-  public FileChannel position (long newPosition)
-    throws IOException
-  {
-    if (newPosition < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    // FIXME note semantics if seeking beyond eof.
-    // We should seek lazily - only on a write.
-    seek (newPosition);
-    return this;
-  }
-  
-  public FileChannel truncate (long size)
-    throws IOException
-  {
-    if (size < 0)
-      throw new IllegalArgumentException ();
-
-    if (!isOpen ())
-      throw new ClosedChannelException ();
-
-    if ((mode & WRITE) == 0)
-       throw new NonWritableChannelException ();
-
-    if (size < size ())
-      implTruncate (size);
-
-    return this;
-  }
-
-  /**
-   * @return The native file descriptor.
-   */
-  public int getNativeFD()
-  {
-    return fd;
-  }
-}
diff --git a/libjava/gnu/java/nio/channels/natFileChannelEcos.cc b/libjava/gnu/java/nio/channels/natFileChannelEcos.cc
deleted file mode 100644
index 78575e7..0000000
--- a/libjava/gnu/java/nio/channels/natFileChannelEcos.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-// natFileDescriptor.cc - Native part of FileDescriptor class.
-
-/* Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <java/io/FileDescriptor.h>
-#include <java/io/SyncFailedException.h>
-#include <java/io/IOException.h>
-#include <java/io/EOFException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/NullPointerException.h>
-#include <java/lang/String.h>
-#include <java/io/FileNotFoundException.h>
-#include <gnu/java/nio/MappedByteBufferImpl.h>
-#include <java/nio/channels/FileChannel.h>
-#include <java/nio/channels/FileLock.h>
-#include <gnu/java/nio/channels/FileChannelImpl.h>
-
-using gnu::gcj::RawData;
-using java::io::IOException;
-using gnu::java::nio::MappedByteBufferImpl;
-using java::io::InterruptedIOException;
-using java::io::FileNotFoundException;
-using java::lang::ArrayIndexOutOfBoundsException;
-using java::lang::NullPointerException;
-using gnu::java::nio::channels::FileChannelImpl;
-
-extern "C" void diag_write_char (char c);
-
-static void 
-diag_write (char *data, int len)
-{
-  while (len > 0)
-    {
-      diag_write_char (*data++);
-      len--;
-    }
-}
-
-#define NO_FSYNC_MESSAGE "sync unsupported"
-
-void
-FileChannelImpl::init(void)
-{
-  in = new FileChannelImpl((jint) 0, FileChannelImpl::READ);
-  out = new FileChannelImpl((jint) 1, FileChannelImpl::WRITE);
-  err = new FileChannelImpl((jint) 2, FileChannelImpl::WRITE);
-}
-
-#if 0
-jboolean
-FileChannelImpl::valid (void)
-{
-  return true;
-}
-
-void
-FileChannelImpl::sync (void)
-{
-  // Some files don't support fsync.  We don't bother reporting these
-  // as errors.
-#ifdef HAVE_FSYNC
-#else
-  throw new SyncFailedException (JvNewStringLatin1 (NO_FSYNC_MESSAGE));
-#endif
-}
-#endif
-
-jint
-FileChannelImpl::open (jstring, jint)
-{
-  return fd;
-}
-
-void
-FileChannelImpl::write (jint)
-{
-  char d = (char) b;
-  ::diag_write (&d, 1);
-}
-
-void
-FileChannelImpl::write (jbyteArray b, jint offset, jint len)
-{
-  if (! b)
-    throw new NullPointerException;
-  if (offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
-    throw new ArrayIndexOutOfBoundsException;
-  char *bytes = (char *)elements (b) + offset;
-  ::diag_write (bytes, len);
-}
-
-void
-FileChannelImpl::implCloseChannel (void)
-{
-}
-
-void
-FileChannelImpl::implTruncate (jlong)
-{
-}
-
-void
-FileChannelImpl::seek (jlong)
-{
-}
-
-jlong
-FileChannelImpl::size (void)
-{
-  return 0;
-}
-
-jlong
-FileChannelImpl::implPosition (void)
-{
-  return 0;
-}
-
-jint
-FileChannelImpl::read (void)
-{
-  return 0;
-}
-
-jint
-FileChannelImpl::read (jbyteArray buffer, jint offset, jint count)
-{
-  return 0;
-}
-
-jint
-FileChannelImpl::available (void)
-{
-  return 0;
-}
-
-jboolean
-FileChannelImpl::lock (jlong, jlong, jboolean, jboolean)
-{
-  throw new IOException (JvNewStringLatin1
-    ("gnu.java.nio.FileChannelImpl.lock() not implemented"));
-}
-
-void
-FileChannelImpl::unlock (jlong, jlong)
-{
-  throw new IOException (JvNewStringLatin1
-    ("gnu.java.nio.channels.FileChannelImpl.unlock() not implemented"));
-}
-
-java::nio::MappedByteBuffer *
-FileChannelImpl::mapImpl (jchar, jlong, jint)
-{
-  return NULL;
-}
-
-void
-MappedByteBufferImpl::unmapImpl ()
-{
-}
-
-void
-MappedByteBufferImpl::loadImpl ()
-{
-}
-
-jboolean
-MappedByteBufferImpl::isLoadedImpl ()
-{
-  return true;
-}
-
-void
-MappedByteBufferImpl::forceImpl ()
-{
-}
diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
deleted file mode 100644
index e05904c..0000000
--- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc
+++ /dev/null
@@ -1,557 +0,0 @@
-
-// natFileChannelImplPosix.cc - Native part of FileChannelImpl class.
-
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <gcj/javaprims.h>
-#include <jvm.h>
-
-#include "posix.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-
-#include <gnu/gcj/RawData.h>
-#include <gnu/java/nio/FileLockImpl.h>
-#include <gnu/java/nio/channels/FileChannelImpl.h>
-#include <java/io/FileNotFoundException.h>
-#include <java/io/IOException.h>
-#include <java/io/SyncFailedException.h>
-#include <java/io/InterruptedIOException.h>
-#include <java/io/EOFException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/NullPointerException.h>
-#include <java/lang/System.h>
-#include <java/lang/String.h>
-#include <java/lang/StringBuffer.h>
-#include <java/lang/Thread.h>
-#include <java/nio/ByteBuffer.h>
-#include <java/nio/MappedByteBufferImpl.h>
-#include <java/nio/channels/FileChannel.h>
-#include <java/nio/channels/FileLock.h>
-#include <gnu/java/nio/channels/FileChannelImpl.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-#define BSD_COMP /* Get FIONREAD on Solaris2. */
-#include <sys/ioctl.h>
-#endif
-
-// Pick up FIONREAD on Solaris 2.5.
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
-#ifdef HAVE_MMAP
-#include <sys/mman.h>
-
-// Use overload resolution to find out the argument types.
-// E.g. Solaris 2.6 uses different argument types for munmap and msync.
-// This is in case _POSIX_C_SOURCES is smaller than 3.
-
-template <typename T_implPtr, typename T_implLen>
-static inline int
-munmap_adaptor(int (*munmap)(T_implPtr caddr, T_implLen sizet),
-		 void* caddr, size_t sizet)
-{
-  return munmap ((T_implPtr) caddr, (T_implLen) sizet);
-}
-
-template <typename T_implPtr, typename T_implLen, typename T_msync>
-static inline int
-msync_adaptor(int (*msync)(T_implPtr caddr, T_implLen sizet, T_msync msynct),
-	      void* caddr, size_t sizet, int msynct)
-{
-  return msync ((T_implPtr) caddr, (T_implLen) sizet, (T_msync) msynct);
-}
-#endif
-
-using gnu::gcj::RawData;
-using java::io::IOException;
-using java::nio::MappedByteBufferImpl;
-using java::io::InterruptedIOException;
-using java::io::FileNotFoundException;
-using java::lang::ArrayIndexOutOfBoundsException;
-using gnu::java::nio::channels::FileChannelImpl;
-
-#define NO_FSYNC_MESSAGE "sync unsupported"
-
-void
-FileChannelImpl::init(void)
-{
-  in = new FileChannelImpl((jint) 0, FileChannelImpl::READ);
-  out = new FileChannelImpl((jint) 1, FileChannelImpl::WRITE);
-  err = new FileChannelImpl((jint) 2, FileChannelImpl::WRITE);
-}
-
-#if 0
-jboolean
-FileChannelImpl::valid (void)
-{
-  struct stat sb;
-  return fd >= 0 && ::fstat (fd, &sb) == 0;
-}
-
-void
-FileChannelImpl::sync (void)
-{
-  // Some files don't support fsync.  We don't bother reporting these
-  // as errors.
-#ifdef HAVE_FSYNC
-  if (::fsync (fd) && errno != EROFS && errno != EINVAL)
-    throw new SyncFailedException (JvNewStringLatin1 (strerror (errno)));
-#else
-  throw new SyncFailedException (JvNewStringLatin1 (NO_FSYNC_MESSAGE));
-#endif
-}
-#endif
-
-jint
-FileChannelImpl::open (jstring path, jint jflags)
-{
-  fd = -1;
-  char *buf = (char *) _Jv_AllocBytes (_Jv_GetStringUTFLength (path) + 1);
-  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
-  buf[total] = '\0';
-  int flags = 0;
-#ifdef O_BINARY
-  flags |= O_BINARY;
-#endif
-
-  JvAssert ((jflags & READ) || (jflags & WRITE));
-  int mode = 0666;
-  if ((jflags & READ) && (jflags & WRITE))
-    flags |= O_RDWR | O_CREAT;
-  else if ((jflags & READ))
-    flags |= O_RDONLY;
-  else
-    {
-      flags |= O_WRONLY | O_CREAT;
-      if ((jflags & APPEND))
-	flags |= O_APPEND;
-      else
-	flags |= O_TRUNC;
-
-      if ((jflags & EXCL))
-	{
-	  flags |= O_EXCL;
-	  // In this case we are making a temp file.
-	  mode = 0600;
-	}
-    }
-
-  if ((jflags & SYNC))
-    flags |= O_SYNC;
-
-  if ((jflags & DSYNC))
-    flags |= O_DSYNC;
-
-  int fd = ::open (buf, flags, mode);
-  if (fd == -1 && errno == EMFILE)
-    {
-      // Because finalize () calls close () we might be able to continue.
-      ::java::lang::System::gc ();
-      ::java::lang::System::runFinalization ();
-      fd = ::open (buf, flags, mode);
-    }
-  if (fd == -1)
-    {
-      // We choose the formatting here for JDK compatibility, believe
-      // it or not.
-      ::java::lang::StringBuffer *msg = new ::java::lang::StringBuffer (path);
-      msg->append (JvNewStringUTF (" ("));
-      msg->append (JvNewStringUTF (strerror (errno)));
-      msg->append (JvNewStringUTF (")"));
-      throw new ::java::io::FileNotFoundException (msg->toString ());
-    }
-
-  return fd;
-}
-
-void
-FileChannelImpl::write (jint b)
-{
-  jbyte d = (jbyte) b;
-  int r = 0;
-  while (r != 1)
-    {
-      r = ::write (fd, &d, 1);
-      if (r == -1)
-        {
-	  if (::java::lang::Thread::interrupted())
-	    {
-	      ::java::io::InterruptedIOException *iioe
-		= new ::java::io::InterruptedIOException (JvNewStringLatin1 (strerror (errno)));
-	      iioe->bytesTransferred = r == -1 ? 0 : r;
-	      throw iioe;
-	    }	    
-	  if (errno != EINTR)
-	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-	}
-    }
-  pos++;
-}
-
-void
-FileChannelImpl::write (jbyteArray b, jint offset, jint len)
-{
-  if (! b)
-    throw new ::java::lang::NullPointerException;
-  if (offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
-    throw new ArrayIndexOutOfBoundsException;
-  jbyte *bytes = elements (b) + offset;
-
-  int written = 0;
-  while (len > 0)
-    {
-      int r = ::write (fd, bytes, len);
-      if (r == -1)
-        {
-	  if (::java::lang::Thread::interrupted())
-	    {
-	      InterruptedIOException *iioe
-		= new InterruptedIOException (JvNewStringLatin1 (strerror (errno)));
-	      iioe->bytesTransferred = written;
-	      throw iioe;
-	    }
-	  if (errno != EINTR)
-	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-	  continue;
-	}
-
-      written += r;
-      len -= r;
-      bytes += r;
-      pos += r;
-    }
-}
-
-void
-FileChannelImpl::implCloseChannel (void)
-{
-  jint save = fd;
-  fd = -1;
-  if (::close (save))
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-}
-
-void
-FileChannelImpl::implTruncate (jlong size)
-{
-  struct stat sb;
-
-#ifdef HAVE_FTRUNCATE
-  if (::fstat (fd, &sb))
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-
-  if ((jlong) sb.st_size == size) 
-    return;
-
-  // If the file is too short, we extend it.  We can't rely on
-  // ftruncate() extending the file.  So we lseek() to 1 byte less
-  // than we want, and then we write a single byte at the end.
-  if ((jlong) sb.st_size < size)
-    {
-      if (::lseek (fd, (off_t) (size - 1), SEEK_SET) == -1)
-	throw new IOException (JvNewStringLatin1 (strerror (errno)));
-      char out = '\0';
-      int r = ::write (fd, &out, 1);
-      if (r <= 0 || ::lseek (fd, pos, SEEK_SET) == -1)
-	throw new IOException (JvNewStringLatin1 (strerror (errno)));
-    }
-  else
-    {
-      if (::ftruncate (fd, (off_t) size))
-	throw new IOException (JvNewStringLatin1 (strerror (errno)));
-      if (pos > size
-	  && ::lseek (fd, (off_t) size, SEEK_SET) == -1)
-	throw new IOException (JvNewStringLatin1 (strerror (errno)));
-      pos = size;
-    }
-#else /* HAVE_FTRUNCATE */
-  throw new IOException (JvNewStringLatin1 ("FileDescriptor.setLength not implemented"));
-#endif /* HAVE_FTRUNCATE */
-}
-
-void
-FileChannelImpl::seek (jlong newPos)
-{
-  off_t r = ::lseek (fd, (off_t) newPos, SEEK_SET);
-  if (r == -1)
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-  pos = r;
-}
-
-jlong
-FileChannelImpl::size (void)
-{
-  struct stat sb;
-  if (::fstat (fd, &sb))
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-  return sb.st_size;
-}
-
-jlong
-FileChannelImpl::implPosition (void)
-{
-  return pos;
-}
-
-jint
-FileChannelImpl::read (void)
-{
-  jbyte b;
-  int r;
-  do
-    {
-      r = ::read (fd, &b, 1);
-      if (r == 0)
-	return -1;
-      if (r == -1)
-	{
-	  if (::java::lang::Thread::interrupted())
-	    {
-	      InterruptedIOException *iioe
-		= new InterruptedIOException (JvNewStringLatin1 (strerror (errno)));
-	      iioe->bytesTransferred = r == -1 ? 0 : r;
-	      throw iioe;
-	    }
-	  if (errno != EINTR)
-	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-	}
-    }
-  while (r != 1);
-  pos++;
-  return b & 0xFF;
-}
-
-jint
-FileChannelImpl::read (jbyteArray buffer, jint offset, jint count)
-{
-  if (! buffer)
-    throw new ::java::lang::NullPointerException;
-  jsize bsize = JvGetArrayLength (buffer);
-  if (offset < 0 || count < 0 || offset + count > bsize)
-    throw new ::java::lang::ArrayIndexOutOfBoundsException;
-
-  // Must return 0 if an attempt is made to read 0 bytes.
-  if (count == 0)
-    return 0;
-
-  jbyte *bytes = elements (buffer) + offset;
-  int r;
-  do
-    {
-      r = ::read (fd, bytes, count);
-      if (r == 0)
-	return -1;
-      if (r == -1)
-	{
-	  if (::java::lang::Thread::interrupted())
-	    {
-	      InterruptedIOException *iioe
-		= new InterruptedIOException (JvNewStringLatin1 (strerror (errno)));
-	      iioe->bytesTransferred = r == -1 ? 0 : r;
-	      throw iioe;
-	    }
-	  if (errno != EINTR)
-	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-	}
-    }
-  while (r <= 0);
-  pos += r;
-  return r;
-}
-
-jint
-FileChannelImpl::available (void)
-{
-#if defined (FIONREAD) || defined (HAVE_SELECT) || defined (HAVE_FSTAT)
-  int num = 0;
-  int r = 0;
-  bool num_set = false;
-
-#if defined (FIONREAD)
-  r = ::ioctl (fd, FIONREAD, &num);
-  if (r == -1 && errno == ENOTTY)
-    {
-      // If the ioctl doesn't work, we don't care.
-      r = 0;
-      num = 0;
-    }
-  else
-    num_set = true;
-#elif defined (HAVE_SELECT)
-  if (fd < 0)
-    {
-      errno = EBADF;
-      r = -1;
-    }
-#endif
-
-  if (r == -1)
-    {
-    posix_error:
-      throw new IOException (JvNewStringLatin1 (strerror (errno)));
-    }
-
-  // If we didn't get anything, and we have fstat, then see if see if
-  // we're reading a regular file.  On many systems, FIONREAD does not
-  // work on regular files; select() likewise returns a useless
-  // result.  This is run incorrectly when FIONREAD does work on
-  // regular files and we are at the end of the file.  However, this
-  // case probably isn't very important.
-#if defined (HAVE_FSTAT)
-  if (! num_set)
-    {
-      struct stat sb;
-      off_t where = 0;
-      if (fstat (fd, &sb) != -1
-	  && S_ISREG (sb.st_mode)
-	  && (where = lseek (fd, 0, SEEK_CUR)) != (off_t) -1)
-	{
-	  num = (int) (sb.st_size - where);
-	  num_set = true;
-	}
-    }
-#endif /* HAVE_FSTAT */
-
-#if defined (HAVE_SELECT)
-  if (! num_set)
-    {
-      fd_set rd;
-      FD_ZERO (&rd);
-      FD_SET (fd, &rd);
-      struct timeval tv;
-      tv.tv_sec = 0;
-      tv.tv_usec = 0;
-      r = _Jv_select (fd + 1, &rd, NULL, NULL, &tv);
-      if (r == -1)
-	goto posix_error;
-      num = r == 0 ? 0 : 1;
-    }
-#endif /* HAVE_SELECT */
-
-  return (jint) num;
-#else
-  return 0;
-#endif
-}
-
-jboolean
-FileChannelImpl::lock
-(jlong pos, jlong len, jboolean shared, jboolean wait)
-{
-  struct flock lockdata;
-
-  lockdata.l_type = shared ? F_RDLCK : F_WRLCK;
-  lockdata.l_whence = SEEK_SET;
-  lockdata.l_start = pos;
-  lockdata.l_len = len;
-
-  if (::fcntl (fd, wait ? F_SETLKW : F_SETLK, &lockdata) == -1)
-    {
-      if (! wait && (errno == EACCES || errno == EAGAIN))
-	return false;
-      throw new IOException (JvNewStringLatin1 (strerror (errno)));
-    }
-  return true;
-}
-
-void
-FileChannelImpl::unlock (jlong pos, jlong len)
-{
-  struct flock lockdata;
-
-  lockdata.l_type = F_UNLCK;
-  lockdata.l_whence = SEEK_SET;
-  lockdata.l_start = pos;
-  lockdata.l_len = len;
-
-  if (::fcntl (fd, F_SETLK, &lockdata) == -1)
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-}
-
-java::nio::MappedByteBuffer *
-FileChannelImpl::mapImpl (jchar mmode, jlong position, jint size)
-{
-#if defined(HAVE_MMAP)
-  int prot, flags;
-  if (mmode == 'r')
-    {
-      prot = PROT_READ;
-      flags = MAP_PRIVATE;
-    }
-  else
-    {
-      prot = PROT_READ|PROT_WRITE;
-      flags = mmode == '+' ? MAP_SHARED : MAP_PRIVATE;
-
-      // If the file is too short, we must extend it.  While using
-      // ftruncate() to extend a file is not portable in general, it
-      // should work on all systems where you can mmap() a file.
-      struct stat st;
-      if (fstat (fd, &st) == -1)
-	throw new IOException (JvNewStringLatin1 (strerror (errno)));
-      if (position + size > st.st_size)
-	{
-	  if (ftruncate (fd, position + size) == -1)
-	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-	}
-    }
-  jint page_size = ::getpagesize();
-  jint offset = position & ~(page_size-1);
-  jint align = position - offset;
-  void* ptr = ::mmap(NULL, size + align, prot, flags, fd, offset);
-  MappedByteBufferImpl *buf
-    = new MappedByteBufferImpl ((RawData *) ((char *) ptr + align),
-				size, mmode == 'r');
-  if (ptr == (void *) MAP_FAILED)
-    throw new IOException (JvNewStringLatin1 (strerror (errno)));
-  buf->implPtr = reinterpret_cast<RawData*> (ptr);
-  buf->implLen = size+align;
-  return buf;
-#else
-  throw new IOException (JvNewStringUTF ("mmap not implemented"));
-#endif
-}
-
-void
-MappedByteBufferImpl::unmapImpl ()
-{
-#if defined(HAVE_MMAP)
-  munmap_adaptor(munmap, implPtr, implLen);
-#endif
-}
-
-void
-MappedByteBufferImpl::loadImpl ()
-{
-}
-
-jboolean
-MappedByteBufferImpl::isLoadedImpl ()
-{
-  return true;
-}
-
-void
-MappedByteBufferImpl::forceImpl ()
-{
-#if defined(HAVE_MMAP)
-  ::msync_adaptor(msync, implPtr, implLen, MS_SYNC);
-#endif
-}
diff --git a/libjava/gnu/java/nio/channels/natFileChannelWin32.cc b/libjava/gnu/java/nio/channels/natFileChannelWin32.cc
deleted file mode 100644
index ab238e6..0000000
--- a/libjava/gnu/java/nio/channels/natFileChannelWin32.cc
+++ /dev/null
@@ -1,466 +0,0 @@
-// natFileChannelImplWin32.cc - Native part of FileChannelImpl class.
-
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004  Free Software 
-   Foundation, Inc.
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-// FIXME: In order to support interrupting of IO operations, we
-// need to change to use the windows asynchronous IO functions
-
-#include <config.h>
-#include <platform.h>
-
-#include <gcj/cni.h>
-#include <gcj/javaprims.h>
-#include <jvm.h>
-
-#include <stdio.h>
-
-#include <gnu/gcj/RawData.h>
-#include <gnu/java/nio/FileLockImpl.h>
-#include <gnu/java/nio/channels/FileChannelImpl.h>
-#include <java/io/FileNotFoundException.h>
-#include <java/io/IOException.h>
-#include <java/io/SyncFailedException.h>
-#include <java/io/InterruptedIOException.h>
-#include <java/io/EOFException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/NullPointerException.h>
-#include <java/lang/System.h>
-#include <java/lang/String.h>
-#include <java/lang/Thread.h>
-#include <java/nio/ByteBuffer.h>
-#include <java/nio/MappedByteBufferImpl.h>
-#include <java/nio/channels/FileChannel.h>
-#include <java/nio/channels/FileLock.h>
-#include <gnu/java/nio/channels/FileChannelImpl.h>
-
-using gnu::gcj::RawData;
-using java::io::IOException;
-using java::nio::MappedByteBufferImpl;
-using java::io::InterruptedIOException;
-using java::io::FileNotFoundException;
-using java::lang::ArrayIndexOutOfBoundsException;
-using gnu::java::nio::channels::FileChannelImpl;
-
-#undef STRICT
-
-static bool testCanUseGetHandleInfo()
-{
-  /* Test to see whether GetHandleInformation can be used
-     for console input or screen buffers. This is better
-     a kludgy OS version check. */
-  DWORD dwFlags;
-  return GetHandleInformation (GetStdHandle (STD_INPUT_HANDLE),
-    &dwFlags) != 0;
-}
-
-// FIXME: casting a FILE (pointer) to a jint will not work on Win64 --
-//        we should be using gnu.gcj.RawData's.
-
-void
-FileChannelImpl::init(void)
-{
-  in = new FileChannelImpl((jint)(GetStdHandle (STD_INPUT_HANDLE)),
-			   FileChannelImpl::READ);
-  out = new FileChannelImpl((jint)(GetStdHandle (STD_OUTPUT_HANDLE)),
-			    FileChannelImpl::WRITE);
-  err = new FileChannelImpl((jint)(GetStdHandle (STD_ERROR_HANDLE)),
-			    FileChannelImpl::WRITE);
-}
-
-#if 0
-FileChannelImpl::sync (void) {
-  if (! FlushFileBuffers ((HANDLE)fd))
-  {
-    DWORD dwErrorCode = GetLastError ();
-    throw new SyncFailedException (_Jv_WinStrError (dwErrorCode));
-  }
-}
-#endif
-
-jint
-FileChannelImpl::open (jstring path, jint jflags) {
-
-  HANDLE handle = NULL;
-  DWORD access = 0;
-  DWORD create = OPEN_EXISTING;
-  
-  JV_TEMP_STRING_WIN32(cpath, path)
-
-  JvAssert((jflags & READ) || (jflags & WRITE));
-
-  if ((jflags & READ) && (jflags & WRITE))
-    {
-      access = GENERIC_READ | GENERIC_WRITE;
-      if (jflags & EXCL)
-        create = CREATE_NEW; // this will raise error if file exists.
-      else
-        create = OPEN_ALWAYS; // equivalent to O_CREAT
-    }
-  else if (jflags & READ)
-    {
-      access = GENERIC_READ;
-      create = OPEN_EXISTING; // ignore EXCL
-    }
-  else
-    { 
-      access = GENERIC_WRITE;
-      if (jflags & EXCL)
-        create = CREATE_NEW;
-      else if (jflags & APPEND)
-        create = OPEN_ALWAYS;
-      else
-        create = CREATE_ALWAYS;
-    }
-
-  handle = CreateFile(cpath, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
-    NULL, create, 0, NULL);
-
-  if (handle == INVALID_HANDLE_VALUE)
-    {
-       DWORD dwErrorCode = GetLastError ();
-       throw new FileNotFoundException (_Jv_WinStrError (cpath, dwErrorCode));
-    }
-
-  // For APPEND mode, move the file pointer to the end of the file.
-  if (jflags & APPEND)
-    {
-      DWORD low = SetFilePointer (handle, 0, NULL, FILE_END);
-      if ((low == (DWORD) 0xffffffff) && (GetLastError () != NO_ERROR)) 
-      {
-        DWORD dwErrorCode = GetLastError ();
-        throw new FileNotFoundException (_Jv_WinStrError (cpath, dwErrorCode));
-      }
-    }
-    
-  // Make this handle non-inheritable so that child
-  // processes don't inadvertently prevent us from
-  // closing this file.
-  _Jv_platform_close_on_exec (handle);
-
-  return (jint) handle;
-}
-
-void
-FileChannelImpl::write (jint b)
-{
-  DWORD bytesWritten;
-  jbyte buf = (jbyte)b;
-
-  if (WriteFile ((HANDLE)fd, &buf, 1, &bytesWritten, NULL))
-    {
-      if (::java::lang::Thread::interrupted())
-        {
-          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
-          iioe->bytesTransferred = bytesWritten;
-    throw iioe;
-        }
-      if (bytesWritten != 1)
-        _Jv_ThrowIOException ();
-    }
-  else
-    _Jv_ThrowIOException ();
-  // FIXME: loop until bytesWritten == 1
-}
-
-void
-FileChannelImpl::write(jbyteArray b, jint offset, jint len)
-{
-  if (! b)
-    throw new ::java::lang::NullPointerException;
-  if(offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
-    throw new ArrayIndexOutOfBoundsException;
-
-  jbyte *buf = elements (b) + offset;
-  DWORD bytesWritten;
-
-  if (WriteFile ((HANDLE)fd, buf, len, &bytesWritten, NULL))
-    {
-      if (::java::lang::Thread::interrupted())
-        {
-          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
-          iioe->bytesTransferred = bytesWritten;
-          throw iioe;
-        }
-    }
-  else
-    _Jv_ThrowIOException ();
-  // FIXME: loop until bytesWritten == len
-}
-
-void
-FileChannelImpl::implCloseChannel (void)
-{
-  HANDLE save = (HANDLE)fd;
-  fd = (jint)INVALID_HANDLE_VALUE;
-  if (! CloseHandle (save))
-    _Jv_ThrowIOException ();
-}
-
-void
-FileChannelImpl::implTruncate (jlong size)
-{
-  LONG liOrigFilePointer;
-  LONG liNewFilePointer;
-  LONG liEndFilePointer;
-
-  // Get the original file pointer.
-  if (SetFilePointer((HANDLE) fd, (LONG) 0, &liOrigFilePointer,
-         FILE_CURRENT) != (BOOL) 0
-      && (GetLastError() != NO_ERROR))
-    _Jv_ThrowIOException ();
-
-  // Get the length of the file.
-  if (SetFilePointer((HANDLE) fd, (LONG) 0, &liEndFilePointer,
-         FILE_END) != (BOOL) 0
-      && (GetLastError() != NO_ERROR))
-    _Jv_ThrowIOException ();
-
-  if ((jlong)liEndFilePointer == size)
-    {
-      // Restore the file pointer.
-      if (liOrigFilePointer != liEndFilePointer)
-  {
-    if (SetFilePointer((HANDLE) fd, liOrigFilePointer, &liNewFilePointer,
-           FILE_BEGIN) != (BOOL) 0
-        && (GetLastError() != NO_ERROR))
-      _Jv_ThrowIOException ();
-  }
-      return;
-    }
-
-  // Seek to the new end of file.
-  if (SetFilePointer((HANDLE) fd, (LONG) size, &liNewFilePointer,
-         FILE_BEGIN) != (BOOL) 0
-      && (GetLastError() != NO_ERROR))
-    _Jv_ThrowIOException ();
-
-  // Truncate the file at this point.
-  if (SetEndOfFile((HANDLE) fd) != (BOOL) 0 && (GetLastError() != NO_ERROR))
-    _Jv_ThrowIOException ();
-
-  if (liOrigFilePointer < liNewFilePointer)
-    {
-      // Restore the file pointer.
-      if (SetFilePointer((HANDLE) fd, liOrigFilePointer, &liNewFilePointer,
-        FILE_BEGIN) != (BOOL) 0
-        && (GetLastError() != NO_ERROR))
-        _Jv_ThrowIOException ();
-    }
-}
-
-void
-FileChannelImpl::seek (jlong newPos)
-{
-  LONG high = pos >> 32;
-  DWORD low = SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & newPos), &high, FILE_BEGIN);
-  if ((low == 0xffffffff) && (GetLastError () != NO_ERROR))
-    _Jv_ThrowIOException ();
-}
-
-jlong
-FileChannelImpl::implPosition (void)
-{
-  LONG high = 0;
-  DWORD low = SetFilePointer ((HANDLE)fd, 0, &high, FILE_CURRENT);
-  if ((low == 0xffffffff) && (GetLastError() != NO_ERROR))
-    _Jv_ThrowIOException ();
-  return (((jlong)high) << 32L) | (jlong)low;
-}
-
-jlong
-FileChannelImpl::size (void)
-{
-  DWORD high;
-  DWORD low;
-
-  low = GetFileSize ((HANDLE)fd, &high);
-  // FIXME: Error checking
-  return (((jlong)high) << 32L) | (jlong)low;
-}
-
-jint
-FileChannelImpl::read (void)
-{
-  CHAR buf;
-  DWORD read;
-
-  if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))
-    {
-      if (GetLastError () == ERROR_BROKEN_PIPE)
-        return -1;
-      else
-        _Jv_ThrowIOException ();
-    }
-
-  if (! read)
-    return -1;
-  else
-    return (jint)(buf & 0xff);
-}
-
-jint
-FileChannelImpl::read (jbyteArray buffer, jint offset, jint count)
-{
-  if (! buffer)
-    throw new ::java::lang::NullPointerException;
-
-  jsize bsize = JvGetArrayLength (buffer);
-  if (offset < 0 || count < 0 || offset + count > bsize)
-    throw new ArrayIndexOutOfBoundsException;
-
-  // Must return 0 if an attempt is made to read 0 bytes.
-  if (count == 0)
-    return 0;
-
-  jbyte *bytes = elements (buffer) + offset;
-
-  DWORD read;
-  if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
-    {
-      if (GetLastError () == ERROR_BROKEN_PIPE)
-        return -1;
-      else
-        _Jv_ThrowIOException ();
-    }
-
-  if (read == 0) return -1;
-
-  return (jint)read;
-}
-
-jint
-FileChannelImpl::available (void)
-{
-  // FIXME:
-  return size() - position();
-}
-
-jboolean
-FileChannelImpl::lock (jlong pos, jlong len, jboolean shared, jboolean wait)
-{
-  DWORD flags = 0;
-  OVERLAPPED ovlpd;
-
-  ZeroMemory(&ovlpd,sizeof(OVERLAPPED));
-
-  if(!shared)
-    flags |= LOCKFILE_EXCLUSIVE_LOCK;
-  if(!wait)
-    flags |= LOCKFILE_FAIL_IMMEDIATELY;
-
-  ovlpd.Offset = (DWORD)pos;
-  ovlpd.OffsetHigh = pos>>32;
-
-  DWORD lenlow = (DWORD)len;
-  DWORD lenhigh = len>>32;
-
-  BOOL ret = LockFileEx((HANDLE)fd,flags,0,lenlow,lenhigh,&ovlpd);
-
-  if(ret==ERROR_IO_PENDING && !shared && wait)
-    ret = GetOverlappedResult((HANDLE)fd,&ovlpd,NULL,wait);
-
-  if(!ret)
-    _Jv_ThrowIOException(GetLastError());
-
-  return true;
-}
-
-void
-FileChannelImpl::unlock (jlong pos, jlong len)
-{
-  OVERLAPPED ovlpd;
-
-  ZeroMemory(&ovlpd,sizeof(OVERLAPPED));
-
-  ovlpd.Offset = (DWORD)pos;
-  ovlpd.OffsetHigh = pos>>32;
-
-  DWORD lenlow = (DWORD)len;
-  DWORD lenhigh = len>>32;
-
-  BOOL ret = UnlockFileEx((HANDLE)fd,0,lenlow,lenhigh,&ovlpd);
-
-  if(!ret)
-    _Jv_ThrowIOException(GetLastError());
-}
-
-java::nio::MappedByteBuffer *
-FileChannelImpl::mapImpl (jchar mmode, jlong position, jint size)
-{
-  SYSTEM_INFO siSysInfo;
-  GetSystemInfo(&siSysInfo); 
-  DWORD page_size = siSysInfo.dwPageSize;
-  jlong offset = position & ~(page_size-1);
-  jint align = position - offset;
-  jlong high = position + size;
-  jlong max_size;
-  if (mmode == '+')
-    max_size = high - offset;
-  else
-    max_size = 0;
-  DWORD access, protect;
-  if (mmode == 'r')
-    {
-      access = FILE_MAP_READ;
-      protect = PAGE_READONLY;
-    }
-  else if (mmode == '+')
-    {
-      access = FILE_MAP_WRITE;
-      protect = PAGE_READWRITE;
-    }
-  else
-    {
-      access = FILE_MAP_COPY;
-      protect = PAGE_WRITECOPY;
-    }
-  HANDLE hFileMapping = CreateFileMapping((HANDLE) fd,
-					  (LPSECURITY_ATTRIBUTES) NULL,
-					  protect,
-					  (DWORD) (max_size >> 32),
-					  (DWORD) max_size,
-					  (LPCTSTR) NULL);
-  if (hFileMapping == NULL)
-    throw new IOException();
-  void *ptr = MapViewOfFile(hFileMapping, access,
-			    (DWORD) (offset >> 32), (DWORD) offset,
-			    (SIZE_T) (high - offset));
-  if (ptr == NULL)
-    throw new IOException();
-  MappedByteBufferImpl *buf
-    = new MappedByteBufferImpl((RawData *) ((char *) ptr + align),
-			       size, mode == 'r');
-  buf->implPtr = reinterpret_cast<RawData*> (ptr);
-  buf->implLen = (jlong) (size_t) hFileMapping;
-  return buf;
-}
-
-void
-MappedByteBufferImpl::unmapImpl ()
-{
-  UnmapViewOfFile((void*)implPtr);
-  CloseHandle((HANDLE) (size_t) implLen);
-}
-
-void
-MappedByteBufferImpl::loadImpl ()
-{
-}
-
-jboolean
-MappedByteBufferImpl::isLoadedImpl ()
-{
-  return true;
-}
-
-void
-MappedByteBufferImpl::forceImpl ()
-{
-}
diff --git a/libjava/gnu/java/nio/charset/ByteCharset$1.h b/libjava/gnu/java/nio/charset/ByteCharset$1.h
deleted file mode 100644
index d99d7fa..0000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteCharset$1__
-#define __gnu_java_nio_charset_ByteCharset$1__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteCharset$1;
-            class ByteCharset$Decoder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteCharset$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper
-{
-
-public: // actually package-private
-  ByteCharset$1(::gnu::java::nio::charset::ByteCharset$Decoder *);
-public: // actually protected
-  virtual jboolean isMappable(jbyte);
-  virtual jchar mapToChar(jbyte);
-public: // actually package-private
-  ::gnu::java::nio::charset::ByteCharset$Decoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteDecodeLoopHelper)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteCharset$1__
diff --git a/libjava/gnu/java/nio/charset/ByteCharset$2.h b/libjava/gnu/java/nio/charset/ByteCharset$2.h
deleted file mode 100644
index 4a1db52..0000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteCharset$2__
-#define __gnu_java_nio_charset_ByteCharset$2__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteCharset$2;
-            class ByteCharset$Encoder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteCharset$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper
-{
-
-public: // actually package-private
-  ByteCharset$2(::gnu::java::nio::charset::ByteCharset$Encoder *);
-public: // actually protected
-  virtual jboolean isMappable(jchar);
-  virtual jbyte mapToByte(jchar);
-public: // actually package-private
-  ::gnu::java::nio::charset::ByteCharset$Encoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteEncodeLoopHelper)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteCharset$2__
diff --git a/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h b/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h
deleted file mode 100644
index 0f5dd6c..0000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteCharset$Decoder__
-#define __gnu_java_nio_charset_ByteCharset$Decoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteCharset;
-            class ByteCharset$Decoder;
-            class ByteDecodeLoopHelper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteCharset$Decoder : public ::java::nio::charset::CharsetDecoder
-{
-
-public: // actually package-private
-  ByteCharset$Decoder(::gnu::java::nio::charset::ByteCharset *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-public: // actually package-private
-  static JArray< jchar > * access$0(::gnu::java::nio::charset::ByteCharset$Decoder *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetDecoder)))) lookup;
-  ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteCharset$Decoder__
diff --git a/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h b/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h
deleted file mode 100644
index 019bb4b..0000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteCharset$Encoder__
-#define __gnu_java_nio_charset_ByteCharset$Encoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetEncoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteCharset;
-            class ByteCharset$Encoder;
-            class ByteEncodeLoopHelper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteCharset$Encoder : public ::java::nio::charset::CharsetEncoder
-{
-
-public: // actually package-private
-  ByteCharset$Encoder(::gnu::java::nio::charset::ByteCharset *);
-public:
-  jboolean canEncode(jchar);
-  jboolean canEncode(::java::lang::CharSequence *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-public: // actually package-private
-  static JArray< jbyte > * access$0(::gnu::java::nio::charset::ByteCharset$Encoder *);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetEncoder)))) lookup;
-  ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteCharset$Encoder__
diff --git a/libjava/gnu/java/nio/charset/ByteCharset.h b/libjava/gnu/java/nio/charset/ByteCharset.h
deleted file mode 100644
index aa0890c..0000000
--- a/libjava/gnu/java/nio/charset/ByteCharset.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteCharset__
-#define __gnu_java_nio_charset_ByteCharset__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteCharset;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteCharset : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  ByteCharset(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< jchar > *);
-public:
-  virtual jboolean contains(::java::nio::charset::Charset *);
-public: // actually package-private
-  virtual JArray< jchar > * getLookupTable();
-public:
-  virtual ::java::nio::charset::CharsetDecoder * newDecoder();
-  virtual ::java::nio::charset::CharsetEncoder * newEncoder();
-public: // actually protected
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::nio::charset::Charset)))) lookupTable;
-  static const jchar NONE = 65533;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteCharset__
diff --git a/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h b/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h
deleted file mode 100644
index 1a373a1..0000000
--- a/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteDecodeLoopHelper__
-#define __gnu_java_nio_charset_ByteDecodeLoopHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteDecodeLoopHelper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteDecodeLoopHelper : public ::java::lang::Object
-{
-
-public:
-  ByteDecodeLoopHelper();
-public: // actually protected
-  virtual jboolean isMappable(jbyte) = 0;
-  virtual jchar mapToChar(jbyte) = 0;
-public: // actually package-private
-  virtual ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-private:
-  ::java::nio::charset::CoderResult * normalDecodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-  ::java::nio::charset::CoderResult * arrayDecodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteDecodeLoopHelper__
diff --git a/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h b/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h
deleted file mode 100644
index 0b67645..0000000
--- a/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ByteEncodeLoopHelper__
-#define __gnu_java_nio_charset_ByteEncodeLoopHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteEncodeLoopHelper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ByteEncodeLoopHelper : public ::java::lang::Object
-{
-
-public:
-  ByteEncodeLoopHelper();
-public: // actually protected
-  virtual jboolean isMappable(jchar) = 0;
-  virtual jbyte mapToByte(jchar) = 0;
-public: // actually package-private
-  virtual ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-private:
-  ::java::nio::charset::CoderResult * normalEncodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-  ::java::nio::charset::CoderResult * arrayEncodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ByteEncodeLoopHelper__
diff --git a/libjava/gnu/java/nio/charset/Cp424.h b/libjava/gnu/java/nio/charset/Cp424.h
deleted file mode 100644
index 29ea29f..0000000
--- a/libjava/gnu/java/nio/charset/Cp424.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp424__
-#define __gnu_java_nio_charset_Cp424__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp424;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp424 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp424();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp424__
diff --git a/libjava/gnu/java/nio/charset/Cp437.h b/libjava/gnu/java/nio/charset/Cp437.h
deleted file mode 100644
index 5593ff0..0000000
--- a/libjava/gnu/java/nio/charset/Cp437.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp437__
-#define __gnu_java_nio_charset_Cp437__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp437;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp437 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp437();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp437__
diff --git a/libjava/gnu/java/nio/charset/Cp737.h b/libjava/gnu/java/nio/charset/Cp737.h
deleted file mode 100644
index 583075b..0000000
--- a/libjava/gnu/java/nio/charset/Cp737.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp737__
-#define __gnu_java_nio_charset_Cp737__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp737;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp737 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp737();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp737__
diff --git a/libjava/gnu/java/nio/charset/Cp775.h b/libjava/gnu/java/nio/charset/Cp775.h
deleted file mode 100644
index 995b7f6..0000000
--- a/libjava/gnu/java/nio/charset/Cp775.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp775__
-#define __gnu_java_nio_charset_Cp775__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp775;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp775 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp775();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp775__
diff --git a/libjava/gnu/java/nio/charset/Cp850.h b/libjava/gnu/java/nio/charset/Cp850.h
deleted file mode 100644
index e1a17de..0000000
--- a/libjava/gnu/java/nio/charset/Cp850.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp850__
-#define __gnu_java_nio_charset_Cp850__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp850;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp850 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp850();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp850__
diff --git a/libjava/gnu/java/nio/charset/Cp852.h b/libjava/gnu/java/nio/charset/Cp852.h
deleted file mode 100644
index e5ff829..0000000
--- a/libjava/gnu/java/nio/charset/Cp852.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp852__
-#define __gnu_java_nio_charset_Cp852__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp852;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp852 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp852();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp852__
diff --git a/libjava/gnu/java/nio/charset/Cp855.h b/libjava/gnu/java/nio/charset/Cp855.h
deleted file mode 100644
index 2ff372c..0000000
--- a/libjava/gnu/java/nio/charset/Cp855.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp855__
-#define __gnu_java_nio_charset_Cp855__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp855;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp855 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp855();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp855__
diff --git a/libjava/gnu/java/nio/charset/Cp857.h b/libjava/gnu/java/nio/charset/Cp857.h
deleted file mode 100644
index eba0a48..0000000
--- a/libjava/gnu/java/nio/charset/Cp857.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp857__
-#define __gnu_java_nio_charset_Cp857__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp857;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp857 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp857();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp857__
diff --git a/libjava/gnu/java/nio/charset/Cp860.h b/libjava/gnu/java/nio/charset/Cp860.h
deleted file mode 100644
index a930983..0000000
--- a/libjava/gnu/java/nio/charset/Cp860.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp860__
-#define __gnu_java_nio_charset_Cp860__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp860;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp860 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp860();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp860__
diff --git a/libjava/gnu/java/nio/charset/Cp861.h b/libjava/gnu/java/nio/charset/Cp861.h
deleted file mode 100644
index 04d202c..0000000
--- a/libjava/gnu/java/nio/charset/Cp861.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp861__
-#define __gnu_java_nio_charset_Cp861__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp861;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp861 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp861();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp861__
diff --git a/libjava/gnu/java/nio/charset/Cp862.h b/libjava/gnu/java/nio/charset/Cp862.h
deleted file mode 100644
index 8ddc349..0000000
--- a/libjava/gnu/java/nio/charset/Cp862.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp862__
-#define __gnu_java_nio_charset_Cp862__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp862;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp862 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp862();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp862__
diff --git a/libjava/gnu/java/nio/charset/Cp863.h b/libjava/gnu/java/nio/charset/Cp863.h
deleted file mode 100644
index 76902574..0000000
--- a/libjava/gnu/java/nio/charset/Cp863.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp863__
-#define __gnu_java_nio_charset_Cp863__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp863;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp863 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp863();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp863__
diff --git a/libjava/gnu/java/nio/charset/Cp864.h b/libjava/gnu/java/nio/charset/Cp864.h
deleted file mode 100644
index 3f245f7..0000000
--- a/libjava/gnu/java/nio/charset/Cp864.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp864__
-#define __gnu_java_nio_charset_Cp864__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp864;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp864 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp864();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp864__
diff --git a/libjava/gnu/java/nio/charset/Cp865.h b/libjava/gnu/java/nio/charset/Cp865.h
deleted file mode 100644
index 78c4372..0000000
--- a/libjava/gnu/java/nio/charset/Cp865.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp865__
-#define __gnu_java_nio_charset_Cp865__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp865;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp865 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp865();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp865__
diff --git a/libjava/gnu/java/nio/charset/Cp866.h b/libjava/gnu/java/nio/charset/Cp866.h
deleted file mode 100644
index 2c6375a..0000000
--- a/libjava/gnu/java/nio/charset/Cp866.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp866__
-#define __gnu_java_nio_charset_Cp866__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp866;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp866 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp866();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp866__
diff --git a/libjava/gnu/java/nio/charset/Cp869.h b/libjava/gnu/java/nio/charset/Cp869.h
deleted file mode 100644
index bc67408..0000000
--- a/libjava/gnu/java/nio/charset/Cp869.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp869__
-#define __gnu_java_nio_charset_Cp869__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp869;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp869 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp869();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp869__
diff --git a/libjava/gnu/java/nio/charset/Cp874.h b/libjava/gnu/java/nio/charset/Cp874.h
deleted file mode 100644
index 590f84d..0000000
--- a/libjava/gnu/java/nio/charset/Cp874.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Cp874__
-#define __gnu_java_nio_charset_Cp874__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Cp874;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Cp874 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Cp874();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Cp874__
diff --git a/libjava/gnu/java/nio/charset/EncodingHelper.h b/libjava/gnu/java/nio/charset/EncodingHelper.h
deleted file mode 100644
index 7fbd289..0000000
--- a/libjava/gnu/java/nio/charset/EncodingHelper.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_EncodingHelper__
-#define __gnu_java_nio_charset_EncodingHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class EncodingHelper;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::EncodingHelper : public ::java::lang::Object
-{
-
-public:
-  EncodingHelper();
-  static ::java::lang::String * getDefaultEncoding();
-  static ::java::lang::String * getOldCanonical(::java::lang::String *);
-  static jboolean isISOLatin1(::java::lang::String *);
-  static ::java::nio::charset::Charset * getCharset(::java::lang::String *);
-  static ::java::nio::charset::Charset * getDefaultCharset();
-private:
-  static ::java::util::HashMap * canonicalNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_EncodingHelper__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$1.h b/libjava/gnu/java/nio/charset/ISO_8859_1$1.h
deleted file mode 100644
index a13c36d..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_1$1__
-#define __gnu_java_nio_charset_ISO_8859_1$1__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_1$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_1$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper
-{
-
-public: // actually package-private
-  ISO_8859_1$1();
-public: // actually protected
-  virtual jboolean isMappable(jbyte);
-  virtual jchar mapToChar(jbyte);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_1$1__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$2.h b/libjava/gnu/java/nio/charset/ISO_8859_1$2.h
deleted file mode 100644
index 5229426..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_1$2__
-#define __gnu_java_nio_charset_ISO_8859_1$2__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_1$2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_1$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper
-{
-
-public: // actually package-private
-  ISO_8859_1$2();
-public: // actually protected
-  virtual jboolean isMappable(jchar);
-  virtual jbyte mapToByte(jchar);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_1$2__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h b/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h
deleted file mode 100644
index 25e97ee..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_1$Decoder__
-#define __gnu_java_nio_charset_ISO_8859_1$Decoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteDecodeLoopHelper;
-            class ISO_8859_1$Decoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_1$Decoder : public ::java::nio::charset::CharsetDecoder
-{
-
-public: // actually package-private
-  ISO_8859_1$Decoder(::java::nio::charset::Charset *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-private:
-  static ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_1$Decoder__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h b/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h
deleted file mode 100644
index e4da289c..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_1$Encoder__
-#define __gnu_java_nio_charset_ISO_8859_1$Encoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteEncodeLoopHelper;
-            class ISO_8859_1$Encoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_1$Encoder : public ::java::nio::charset::CharsetEncoder
-{
-
-public: // actually package-private
-  ISO_8859_1$Encoder(::java::nio::charset::Charset *);
-public:
-  jboolean canEncode(jchar);
-  jboolean canEncode(::java::lang::CharSequence *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-private:
-  static ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_1$Encoder__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1.h b/libjava/gnu/java/nio/charset/ISO_8859_1.h
deleted file mode 100644
index dc03558..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_1__
-#define __gnu_java_nio_charset_ISO_8859_1__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_1;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_1 : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  ISO_8859_1();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_1__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_13.h b/libjava/gnu/java/nio/charset/ISO_8859_13.h
deleted file mode 100644
index dfe4240..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_13.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_13__
-#define __gnu_java_nio_charset_ISO_8859_13__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_13;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_13 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_13();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_13__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_15.h b/libjava/gnu/java/nio/charset/ISO_8859_15.h
deleted file mode 100644
index 617e227..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_15.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_15__
-#define __gnu_java_nio_charset_ISO_8859_15__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_15;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_15 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_15();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_15__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_2.h b/libjava/gnu/java/nio/charset/ISO_8859_2.h
deleted file mode 100644
index e201ddc..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_2__
-#define __gnu_java_nio_charset_ISO_8859_2__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_2 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_2();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_2__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_3.h b/libjava/gnu/java/nio/charset/ISO_8859_3.h
deleted file mode 100644
index 3c468fd..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_3.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_3__
-#define __gnu_java_nio_charset_ISO_8859_3__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_3;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_3 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_3();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_3__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_4.h b/libjava/gnu/java/nio/charset/ISO_8859_4.h
deleted file mode 100644
index f338bf0..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_4.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_4__
-#define __gnu_java_nio_charset_ISO_8859_4__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_4;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_4 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_4();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_4__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_5.h b/libjava/gnu/java/nio/charset/ISO_8859_5.h
deleted file mode 100644
index 4d626d0..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_5.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_5__
-#define __gnu_java_nio_charset_ISO_8859_5__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_5;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_5 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_5();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_5__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_6.h b/libjava/gnu/java/nio/charset/ISO_8859_6.h
deleted file mode 100644
index 0ce45f2..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_6.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_6__
-#define __gnu_java_nio_charset_ISO_8859_6__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_6;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_6 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_6();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_6__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_7.h b/libjava/gnu/java/nio/charset/ISO_8859_7.h
deleted file mode 100644
index 0c661fa..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_7.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_7__
-#define __gnu_java_nio_charset_ISO_8859_7__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_7;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_7 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_7();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_7__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_8.h b/libjava/gnu/java/nio/charset/ISO_8859_8.h
deleted file mode 100644
index 96a255e..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_8.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_8__
-#define __gnu_java_nio_charset_ISO_8859_8__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_8;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_8 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_8();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_8__
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_9.h b/libjava/gnu/java/nio/charset/ISO_8859_9.h
deleted file mode 100644
index a5030b7..0000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_9.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_ISO_8859_9__
-#define __gnu_java_nio_charset_ISO_8859_9__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ISO_8859_9;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::ISO_8859_9 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  ISO_8859_9();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_ISO_8859_9__
diff --git a/libjava/gnu/java/nio/charset/KOI_8.h b/libjava/gnu/java/nio/charset/KOI_8.h
deleted file mode 100644
index db07f14..0000000
--- a/libjava/gnu/java/nio/charset/KOI_8.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_KOI_8__
-#define __gnu_java_nio_charset_KOI_8__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class KOI_8;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::KOI_8 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  KOI_8();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_KOI_8__
diff --git a/libjava/gnu/java/nio/charset/MS874.h b/libjava/gnu/java/nio/charset/MS874.h
deleted file mode 100644
index c22c860..0000000
--- a/libjava/gnu/java/nio/charset/MS874.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MS874__
-#define __gnu_java_nio_charset_MS874__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MS874;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MS874 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MS874();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MS874__
diff --git a/libjava/gnu/java/nio/charset/MacCentralEurope.h b/libjava/gnu/java/nio/charset/MacCentralEurope.h
deleted file mode 100644
index c91c915..0000000
--- a/libjava/gnu/java/nio/charset/MacCentralEurope.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacCentralEurope__
-#define __gnu_java_nio_charset_MacCentralEurope__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacCentralEurope;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacCentralEurope : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacCentralEurope();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacCentralEurope__
diff --git a/libjava/gnu/java/nio/charset/MacCroatian.h b/libjava/gnu/java/nio/charset/MacCroatian.h
deleted file mode 100644
index 8c03767..0000000
--- a/libjava/gnu/java/nio/charset/MacCroatian.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacCroatian__
-#define __gnu_java_nio_charset_MacCroatian__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacCroatian;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacCroatian : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacCroatian();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacCroatian__
diff --git a/libjava/gnu/java/nio/charset/MacCyrillic.h b/libjava/gnu/java/nio/charset/MacCyrillic.h
deleted file mode 100644
index 4190da5..0000000
--- a/libjava/gnu/java/nio/charset/MacCyrillic.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacCyrillic__
-#define __gnu_java_nio_charset_MacCyrillic__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacCyrillic;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacCyrillic : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacCyrillic();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacCyrillic__
diff --git a/libjava/gnu/java/nio/charset/MacDingbat.h b/libjava/gnu/java/nio/charset/MacDingbat.h
deleted file mode 100644
index 0599539..0000000
--- a/libjava/gnu/java/nio/charset/MacDingbat.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacDingbat__
-#define __gnu_java_nio_charset_MacDingbat__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacDingbat;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacDingbat : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacDingbat();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacDingbat__
diff --git a/libjava/gnu/java/nio/charset/MacGreek.h b/libjava/gnu/java/nio/charset/MacGreek.h
deleted file mode 100644
index df1f52f..0000000
--- a/libjava/gnu/java/nio/charset/MacGreek.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacGreek__
-#define __gnu_java_nio_charset_MacGreek__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacGreek;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacGreek : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacGreek();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacGreek__
diff --git a/libjava/gnu/java/nio/charset/MacIceland.h b/libjava/gnu/java/nio/charset/MacIceland.h
deleted file mode 100644
index e8878e8..0000000
--- a/libjava/gnu/java/nio/charset/MacIceland.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacIceland__
-#define __gnu_java_nio_charset_MacIceland__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacIceland;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacIceland : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacIceland();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacIceland__
diff --git a/libjava/gnu/java/nio/charset/MacRoman.h b/libjava/gnu/java/nio/charset/MacRoman.h
deleted file mode 100644
index a648b80..0000000
--- a/libjava/gnu/java/nio/charset/MacRoman.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacRoman__
-#define __gnu_java_nio_charset_MacRoman__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacRoman;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacRoman : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacRoman();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacRoman__
diff --git a/libjava/gnu/java/nio/charset/MacRomania.h b/libjava/gnu/java/nio/charset/MacRomania.h
deleted file mode 100644
index ecc89ed..0000000
--- a/libjava/gnu/java/nio/charset/MacRomania.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacRomania__
-#define __gnu_java_nio_charset_MacRomania__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacRomania;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacRomania : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacRomania();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacRomania__
diff --git a/libjava/gnu/java/nio/charset/MacSymbol.h b/libjava/gnu/java/nio/charset/MacSymbol.h
deleted file mode 100644
index e9ca0b1..0000000
--- a/libjava/gnu/java/nio/charset/MacSymbol.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacSymbol__
-#define __gnu_java_nio_charset_MacSymbol__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacSymbol;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacSymbol : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacSymbol();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacSymbol__
diff --git a/libjava/gnu/java/nio/charset/MacThai.h b/libjava/gnu/java/nio/charset/MacThai.h
deleted file mode 100644
index dbf9166..0000000
--- a/libjava/gnu/java/nio/charset/MacThai.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacThai__
-#define __gnu_java_nio_charset_MacThai__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacThai;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacThai : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacThai();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacThai__
diff --git a/libjava/gnu/java/nio/charset/MacTurkish.h b/libjava/gnu/java/nio/charset/MacTurkish.h
deleted file mode 100644
index 077c35d..0000000
--- a/libjava/gnu/java/nio/charset/MacTurkish.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_MacTurkish__
-#define __gnu_java_nio_charset_MacTurkish__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class MacTurkish;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::MacTurkish : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  MacTurkish();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_MacTurkish__
diff --git a/libjava/gnu/java/nio/charset/Provider$1.h b/libjava/gnu/java/nio/charset/Provider$1.h
deleted file mode 100644
index 4db0425..0000000
--- a/libjava/gnu/java/nio/charset/Provider$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Provider$1__
-#define __gnu_java_nio_charset_Provider$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Provider;
-            class Provider$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Provider$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Provider$1();
-public:
-  virtual ::gnu::java::nio::charset::Provider * Provider$1$run();
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Provider$1__
diff --git a/libjava/gnu/java/nio/charset/Provider.h b/libjava/gnu/java/nio/charset/Provider.h
deleted file mode 100644
index 04495ed..0000000
--- a/libjava/gnu/java/nio/charset/Provider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Provider__
-#define __gnu_java_nio_charset_Provider__
-
-#pragma interface
-
-#include <java/nio/charset/spi/CharsetProvider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Provider;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Provider : public ::java::nio::charset::spi::CharsetProvider
-{
-
-public: // actually package-private
-  Provider();
-private:
-  void loadExtended();
-public:
-  ::java::util::Iterator * charsets();
-  ::java::nio::charset::Charset * charsetForName(::java::lang::String *);
-private:
-  void addCharset(::java::nio::charset::Charset *);
-public:
-  static ::gnu::java::nio::charset::Provider * provider();
-private:
-  static ::gnu::java::nio::charset::Provider * singleton;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::nio::charset::spi::CharsetProvider)))) canonicalNames;
-  ::java::util::HashMap * charsets__;
-  jboolean extendedLoaded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Provider__
diff --git a/libjava/gnu/java/nio/charset/US_ASCII$1.h b/libjava/gnu/java/nio/charset/US_ASCII$1.h
deleted file mode 100644
index ca8ff59..0000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_US_ASCII$1__
-#define __gnu_java_nio_charset_US_ASCII$1__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class US_ASCII$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::US_ASCII$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper
-{
-
-public: // actually package-private
-  US_ASCII$1();
-public: // actually protected
-  virtual jboolean isMappable(jbyte);
-  virtual jchar mapToChar(jbyte);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_US_ASCII$1__
diff --git a/libjava/gnu/java/nio/charset/US_ASCII$2.h b/libjava/gnu/java/nio/charset/US_ASCII$2.h
deleted file mode 100644
index 5a62bd9..0000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_US_ASCII$2__
-#define __gnu_java_nio_charset_US_ASCII$2__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class US_ASCII$2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::US_ASCII$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper
-{
-
-public: // actually package-private
-  US_ASCII$2();
-public: // actually protected
-  virtual jboolean isMappable(jchar);
-  virtual jbyte mapToByte(jchar);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_US_ASCII$2__
diff --git a/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h b/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h
deleted file mode 100644
index 9659ac2..0000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_US_ASCII$Decoder__
-#define __gnu_java_nio_charset_US_ASCII$Decoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteDecodeLoopHelper;
-            class US_ASCII$Decoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::US_ASCII$Decoder : public ::java::nio::charset::CharsetDecoder
-{
-
-public: // actually package-private
-  US_ASCII$Decoder(::java::nio::charset::Charset *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-private:
-  static ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_US_ASCII$Decoder__
diff --git a/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h b/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h
deleted file mode 100644
index 467f6b7..0000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_US_ASCII$Encoder__
-#define __gnu_java_nio_charset_US_ASCII$Encoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class ByteEncodeLoopHelper;
-            class US_ASCII$Encoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::US_ASCII$Encoder : public ::java::nio::charset::CharsetEncoder
-{
-
-public: // actually package-private
-  US_ASCII$Encoder(::java::nio::charset::Charset *);
-public:
-  jboolean canEncode(jchar);
-  jboolean canEncode(::java::lang::CharSequence *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-private:
-  static ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_US_ASCII$Encoder__
diff --git a/libjava/gnu/java/nio/charset/US_ASCII.h b/libjava/gnu/java/nio/charset/US_ASCII.h
deleted file mode 100644
index 297cf11..0000000
--- a/libjava/gnu/java/nio/charset/US_ASCII.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_US_ASCII__
-#define __gnu_java_nio_charset_US_ASCII__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class US_ASCII;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::US_ASCII : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  US_ASCII();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_US_ASCII__
diff --git a/libjava/gnu/java/nio/charset/UTF_16.h b/libjava/gnu/java/nio/charset/UTF_16.h
deleted file mode 100644
index afb0fd8..0000000
--- a/libjava/gnu/java/nio/charset/UTF_16.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_16__
-#define __gnu_java_nio_charset_UTF_16__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_16;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_16 : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  UTF_16();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_16__
diff --git a/libjava/gnu/java/nio/charset/UTF_16BE.h b/libjava/gnu/java/nio/charset/UTF_16BE.h
deleted file mode 100644
index 8b2bccf..0000000
--- a/libjava/gnu/java/nio/charset/UTF_16BE.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_16BE__
-#define __gnu_java_nio_charset_UTF_16BE__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_16BE;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_16BE : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  UTF_16BE();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_16BE__
diff --git a/libjava/gnu/java/nio/charset/UTF_16Decoder.h b/libjava/gnu/java/nio/charset/UTF_16Decoder.h
deleted file mode 100644
index b23c3e7..0000000
--- a/libjava/gnu/java/nio/charset/UTF_16Decoder.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_16Decoder__
-#define __gnu_java_nio_charset_UTF_16Decoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_16Decoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_16Decoder : public ::java::nio::charset::CharsetDecoder
-{
-
-public: // actually package-private
-  UTF_16Decoder(::java::nio::charset::Charset *, jint);
-public: // actually protected
-  ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-  void implReset();
-public: // actually package-private
-  static const jint BIG_ENDIAN = 0;
-  static const jint LITTLE_ENDIAN = 1;
-  static const jint UNKNOWN_ENDIAN = 2;
-  static const jint MAYBE_BIG_ENDIAN = 3;
-  static const jint MAYBE_LITTLE_ENDIAN = 4;
-private:
-  static const jchar BYTE_ORDER_MARK = 65279;
-  static const jchar REVERSED_BYTE_ORDER_MARK = 65534;
-  jint __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetDecoder)))) originalByteOrder;
-  jint byteOrder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_16Decoder__
diff --git a/libjava/gnu/java/nio/charset/UTF_16Encoder.h b/libjava/gnu/java/nio/charset/UTF_16Encoder.h
deleted file mode 100644
index 9dc4994..0000000
--- a/libjava/gnu/java/nio/charset/UTF_16Encoder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_16Encoder__
-#define __gnu_java_nio_charset_UTF_16Encoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_16Encoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_16Encoder : public ::java::nio::charset::CharsetEncoder
-{
-
-public: // actually package-private
-  UTF_16Encoder(::java::nio::charset::Charset *, jint, jboolean);
-public: // actually protected
-  ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-  void implReset();
-public: // actually package-private
-  static const jint BIG_ENDIAN = 0;
-  static const jint LITTLE_ENDIAN = 1;
-private:
-  static const jchar BYTE_ORDER_MARK = 65279;
-  ::java::nio::ByteOrder * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetEncoder)))) byteOrder;
-  jboolean useByteOrderMark;
-  jboolean needsByteOrderMark;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_16Encoder__
diff --git a/libjava/gnu/java/nio/charset/UTF_16LE.h b/libjava/gnu/java/nio/charset/UTF_16LE.h
deleted file mode 100644
index 8b5ee1b..0000000
--- a/libjava/gnu/java/nio/charset/UTF_16LE.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_16LE__
-#define __gnu_java_nio_charset_UTF_16LE__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_16LE;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_16LE : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  UTF_16LE();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_16LE__
diff --git a/libjava/gnu/java/nio/charset/UTF_8$Decoder.h b/libjava/gnu/java/nio/charset/UTF_8$Decoder.h
deleted file mode 100644
index 89ec732..0000000
--- a/libjava/gnu/java/nio/charset/UTF_8$Decoder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_8$Decoder__
-#define __gnu_java_nio_charset_UTF_8$Decoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_8$Decoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_8$Decoder : public ::java::nio::charset::CharsetDecoder
-{
-
-public: // actually package-private
-  UTF_8$Decoder(::java::nio::charset::Charset *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *);
-private:
-  static jboolean isContinuation(jbyte);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_8$Decoder__
diff --git a/libjava/gnu/java/nio/charset/UTF_8$Encoder.h b/libjava/gnu/java/nio/charset/UTF_8$Encoder.h
deleted file mode 100644
index 13745f2..0000000
--- a/libjava/gnu/java/nio/charset/UTF_8$Encoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_8$Encoder__
-#define __gnu_java_nio_charset_UTF_8$Encoder__
-
-#pragma interface
-
-#include <java/nio/charset/CharsetEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_8$Encoder;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CoderResult;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_8$Encoder : public ::java::nio::charset::CharsetEncoder
-{
-
-public: // actually package-private
-  UTF_8$Encoder(::java::nio::charset::Charset *);
-public: // actually protected
-  ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_8$Encoder__
diff --git a/libjava/gnu/java/nio/charset/UTF_8.h b/libjava/gnu/java/nio/charset/UTF_8.h
deleted file mode 100644
index 0be5e40..0000000
--- a/libjava/gnu/java/nio/charset/UTF_8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UTF_8__
-#define __gnu_java_nio_charset_UTF_8__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UTF_8;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UTF_8 : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  UTF_8();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UTF_8__
diff --git a/libjava/gnu/java/nio/charset/UnicodeLittle.h b/libjava/gnu/java/nio/charset/UnicodeLittle.h
deleted file mode 100644
index 8086fd8..0000000
--- a/libjava/gnu/java/nio/charset/UnicodeLittle.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_UnicodeLittle__
-#define __gnu_java_nio_charset_UnicodeLittle__
-
-#pragma interface
-
-#include <java/nio/charset/Charset.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class UnicodeLittle;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::UnicodeLittle : public ::java::nio::charset::Charset
-{
-
-public: // actually package-private
-  UnicodeLittle();
-public:
-  jboolean contains(::java::nio::charset::Charset *);
-  ::java::nio::charset::CharsetDecoder * newDecoder();
-  ::java::nio::charset::CharsetEncoder * newEncoder();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_UnicodeLittle__
diff --git a/libjava/gnu/java/nio/charset/Windows1250.h b/libjava/gnu/java/nio/charset/Windows1250.h
deleted file mode 100644
index 3e0bdae..0000000
--- a/libjava/gnu/java/nio/charset/Windows1250.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1250__
-#define __gnu_java_nio_charset_Windows1250__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1250;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1250 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1250();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1250__
diff --git a/libjava/gnu/java/nio/charset/Windows1251.h b/libjava/gnu/java/nio/charset/Windows1251.h
deleted file mode 100644
index 5671f5a..0000000
--- a/libjava/gnu/java/nio/charset/Windows1251.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1251__
-#define __gnu_java_nio_charset_Windows1251__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1251;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1251 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1251();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1251__
diff --git a/libjava/gnu/java/nio/charset/Windows1252.h b/libjava/gnu/java/nio/charset/Windows1252.h
deleted file mode 100644
index f1e18a5..0000000
--- a/libjava/gnu/java/nio/charset/Windows1252.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1252__
-#define __gnu_java_nio_charset_Windows1252__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1252;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1252 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1252();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1252__
diff --git a/libjava/gnu/java/nio/charset/Windows1253.h b/libjava/gnu/java/nio/charset/Windows1253.h
deleted file mode 100644
index 4c9199d..0000000
--- a/libjava/gnu/java/nio/charset/Windows1253.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1253__
-#define __gnu_java_nio_charset_Windows1253__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1253;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1253 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1253();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1253__
diff --git a/libjava/gnu/java/nio/charset/Windows1254.h b/libjava/gnu/java/nio/charset/Windows1254.h
deleted file mode 100644
index d14346d..0000000
--- a/libjava/gnu/java/nio/charset/Windows1254.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1254__
-#define __gnu_java_nio_charset_Windows1254__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1254;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1254 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1254();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1254__
diff --git a/libjava/gnu/java/nio/charset/Windows1255.h b/libjava/gnu/java/nio/charset/Windows1255.h
deleted file mode 100644
index e8367b4..0000000
--- a/libjava/gnu/java/nio/charset/Windows1255.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1255__
-#define __gnu_java_nio_charset_Windows1255__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1255;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1255 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1255();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1255__
diff --git a/libjava/gnu/java/nio/charset/Windows1256.h b/libjava/gnu/java/nio/charset/Windows1256.h
deleted file mode 100644
index c29502b..0000000
--- a/libjava/gnu/java/nio/charset/Windows1256.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1256__
-#define __gnu_java_nio_charset_Windows1256__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1256;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1256 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1256();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1256__
diff --git a/libjava/gnu/java/nio/charset/Windows1257.h b/libjava/gnu/java/nio/charset/Windows1257.h
deleted file mode 100644
index 6f9c0ec..0000000
--- a/libjava/gnu/java/nio/charset/Windows1257.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1257__
-#define __gnu_java_nio_charset_Windows1257__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1257;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1257 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1257();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1257__
diff --git a/libjava/gnu/java/nio/charset/Windows1258.h b/libjava/gnu/java/nio/charset/Windows1258.h
deleted file mode 100644
index 2c7ea31..0000000
--- a/libjava/gnu/java/nio/charset/Windows1258.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_charset_Windows1258__
-#define __gnu_java_nio_charset_Windows1258__
-
-#pragma interface
-
-#include <gnu/java/nio/charset/ByteCharset.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace charset
-        {
-            class Windows1258;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Windows1258 : public ::gnu::java::nio::charset::ByteCharset
-{
-
-public:
-  Windows1258();
-private:
-  static JArray< jchar > * lookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_charset_Windows1258__
diff --git a/libjava/gnu/java/nio/natNIOServerSocket.cc b/libjava/gnu/java/nio/natNIOServerSocket.cc
deleted file mode 100644
index 2d3fb2d..0000000
--- a/libjava/gnu/java/nio/natNIOServerSocket.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// natNIOServerSocket.cc
-
-/* Copyright (C) 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gnu/java/net/PlainSocketImpl.h>
-#include <gnu/java/nio/NIOServerSocket.h>
-#include <java/net/ServerSocket.h>
-#include <java/net/SocketImpl.h>
-
-gnu::java::net::PlainSocketImpl*
-gnu::java::nio::NIOServerSocket::getPlainSocketImpl()
-{
-  return (gnu::java::net::PlainSocketImpl*)
-    ::java::net::ServerSocket::getImpl();
-}
diff --git a/libjava/gnu/java/nio/natVMChannel.cc b/libjava/gnu/java/nio/natVMChannel.cc
deleted file mode 100644
index 4b4da78..0000000
--- a/libjava/gnu/java/nio/natVMChannel.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <config.h>
-
-#include <gnu/java/nio/VMChannel.h>
-#include <gcj/cni.h>
-#include <java/lang/UnsupportedOperationException.h>
-
-void
-gnu::java::nio::VMChannel::setBlocking (jint, jboolean)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::setBlocking (jint, jboolean) not implemented"));
-}
-
-
-jint
-gnu::java::nio::VMChannel::read (jint, ::java::nio::ByteBuffer *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::read (jint, ::java::nio::ByteBuffer *) not implemented"));
-}
-
-
-jlong
-gnu::java::nio::VMChannel::readScattering (jint, JArray< ::java::nio::ByteBuffer *> *, jint, jint)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::readScattering (jint, JArray< ::java::nio::ByteBuffer *> *, jint, jint) not implemented"));
-}
-
-
-jint
-gnu::java::nio::VMChannel::write (jint, ::java::nio::ByteBuffer *)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::write (jint, ::java::nio::ByteBuffer *) not implemented"));
-}
-
-
-jlong
-gnu::java::nio::VMChannel::writeGathering (jint, JArray< ::java::nio::ByteBuffer *> *, jint, jint)
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::writeGathering (jint, JArray< ::java::nio::ByteBuffer *> *, jint, jint) not implemented"));
-}
-
-
-void
-gnu::java::nio::VMChannel::initIDs ()
-{
-  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::nio::VMChannel::initIDs () not implemented"));
-}
diff --git a/libjava/gnu/java/nio/natVMPipeEcos.cc b/libjava/gnu/java/nio/natVMPipeEcos.cc
deleted file mode 100644
index c806fb4..0000000
--- a/libjava/gnu/java/nio/natVMPipeEcos.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// natVMPipeImplEcos.cc
-
-/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <gnu/java/nio/PipeImpl.h>
-#include <gnu/java/nio/VMPipe.h>
-#include <java/io/IOException.h>
-
-void
-gnu::java::nio::VMPipe::init (gnu::java::nio::PipeImpl *self,
-			      ::java::nio::channels::spi::SelectorProvider*)
-{
-  throw new ::java::io::IOException (JvNewStringUTF ("nativeInit() not implemented"));
-}
diff --git a/libjava/gnu/java/nio/natVMPipePosix.cc b/libjava/gnu/java/nio/natVMPipePosix.cc
deleted file mode 100644
index 3de136a..0000000
--- a/libjava/gnu/java/nio/natVMPipePosix.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// natVMPipeImplPosix.cc
-
-/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <gnu/java/nio/PipeImpl.h>
-#include <gnu/java/nio/VMPipe.h>
-//#include <gnu/java/nio/PipeImpl$SinkChannelImpl.h>
-//#include <gnu/java/nio/PipeImpl$SourceChannelImpl.h>
-#include <java/io/IOException.h>
-#include <java/nio/channels/spi/SelectorProvider.h>
-
-void
-gnu::java::nio::VMPipe::init (gnu::java::nio::PipeImpl*, /*self*/
-			      ::java::nio::channels::spi::SelectorProvider*
-			      /*provider*/)
-{
-  int filedes [2];
-
-  if (_Jv_pipe (filedes) < 0)
-    throw new ::java::io::IOException (JvNewStringUTF (strerror (errno)));
-
-  /* FIXME
-  source = new gnu::java::nio::PipeImpl$SourceChannelImpl
-    (this, provider, filedes [0]);
-  sink = new gnu::java::nio::PipeImpl$SinkChannelImpl
-    (this, provider, filedes [1]);
-  */
-}
diff --git a/libjava/gnu/java/nio/natVMPipeWin32.cc b/libjava/gnu/java/nio/natVMPipeWin32.cc
deleted file mode 100644
index 5278c7a..0000000
--- a/libjava/gnu/java/nio/natVMPipeWin32.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// natVMPipeImplWin32.cc
-
-/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <gnu/java/nio/PipeImpl.h>
-#include <gnu/java/nio/VMPipe.h>
-//#include <gnu/java/nio/PipeImpl$SinkChannelImpl.h>
-//#include <gnu/java/nio/PipeImpl$SourceChannelImpl.h>
-#include <java/io/IOException.h>
-#include <java/nio/channels/spi/SelectorProvider.h>
-
-void
-gnu::java::nio::VMPipe::init (gnu::java::nio::PipeImpl *self,
-			      ::java::nio::channels::spi::SelectorProvider* /*provider*/)
-{
-  int filedes [2];
-
-  if (_Jv_pipe (filedes) < 0)
-    throw new ::java::io::IOException (JvNewStringUTF (strerror (errno)));
-
-  /* FIXME
-  source = new gnu::java::nio::PipeImpl$SourceChannelImpl
-    (this, provider, filedes [0]);
-  sink = new gnu::java::nio::PipeImpl$SinkChannelImpl
-    (this, provider, filedes [1]);
-  */
-}
diff --git a/libjava/gnu/java/nio/natVMSelectorEcos.cc b/libjava/gnu/java/nio/natVMSelectorEcos.cc
deleted file mode 100644
index f2ebff8..0000000
--- a/libjava/gnu/java/nio/natVMSelectorEcos.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// natVMSelectorImplEcos.cc
-
-/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <gnu/java/nio/VMSelector.h>
-#include <java/io/IOException.h>
-
-jint
-gnu::java::nio::VMSelector::select (jintArray read, jintArray write,
-                                    jintArray except, jlong timeout)
-{
-  throw new ::java::io::IOException (JvNewStringUTF ("implSelect() not implemented"));
-}
diff --git a/libjava/gnu/java/nio/natVMSelectorPosix.cc b/libjava/gnu/java/nio/natVMSelectorPosix.cc
deleted file mode 100644
index 9f02679..0000000
--- a/libjava/gnu/java/nio/natVMSelectorPosix.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// natVMSelectorImplPosix.cc
-
-/* Copyright (C) 2002, 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <gnu/java/nio/VMSelector.h>
-#include <java/io/InterruptedIOException.h>
-#include <java/io/IOException.h>
-#include <java/lang/Thread.h>
-
-static void
-helper_put_filedescriptors (jintArray fdArray, fd_set& fds, int& max_fd)
-{
-  jint* tmpFDArray = elements (fdArray);
-
-  for (int index = 0; index < JvGetArrayLength (fdArray); index++)
-    {
-      int fd = tmpFDArray [index];
-      if (fd > 0)
-        {
-          FD_SET (tmpFDArray [index], &fds);
-
-          if (tmpFDArray [index] > max_fd)
-            max_fd = tmpFDArray [index];
-        }
-    }
-}
-
-static void
-helper_get_filedescriptors (jintArray& fdArray, fd_set fds)
-{
-  jint* tmpFDArray = elements (fdArray);
-  
-  for (int index = 0; index < JvGetArrayLength (fdArray); index++)
-    {
-      int fd = tmpFDArray [index];
-      if (fd < 0 || !FD_ISSET (fd, &fds))
-        tmpFDArray [index] = 0;
-    }
-}
-
-static void
-helper_reset (jintArray& fdArray)
-{
-  jint* tmpFDArray = elements (fdArray);
-  
-  for (int index = 0; index < JvGetArrayLength (fdArray); index++)
-    tmpFDArray [index] = 0;
-}
-
-jint
-gnu::java::nio::VMSelector::select (jintArray read, jintArray write,
-                                    jintArray except, jlong timeout)
-{
-  jint result;
-  int max_fd = 0;
-  fd_set read_fds;
-  fd_set write_fds;
-  fd_set except_fds;
-  struct timeval real_time_data;
-  struct timeval *time_data = NULL;
-
-  // If a legal timeout value isn't given, use NULL.
-  // This means an infinite timeout. The specification
-  // also says that a zero timeout should be treated
-  // as infinite. Otherwise (if the timeout value is legal),
-  // fill our timeval struct and use it for the select.
-  if (timeout > 0)
-    {
-      real_time_data.tv_sec = timeout / 1000;
-      real_time_data.tv_usec = (timeout % 1000) * 1000;
-      time_data = &real_time_data;
-    }
-
-  // Reset all fd_set structures
-  FD_ZERO (&read_fds);
-  FD_ZERO (&write_fds);
-  FD_ZERO (&except_fds);
-
-  // Fill the fd_set data structures for the _Jv_select() call.
-  helper_put_filedescriptors (read, read_fds, max_fd);
-  helper_put_filedescriptors (write, write_fds, max_fd);
-  helper_put_filedescriptors (except, except_fds, max_fd);
-
-  // Actually do the select
-  try
-    {
-      result = _Jv_select (max_fd + 1, &read_fds, &write_fds,
-                           &except_fds, time_data);
-    }
-  catch (::java::io::InterruptedIOException *e)
-    {
-      // The behavior of JRE 1.4.1 is that no exception is thrown
-      // when the thread is interrupted, but the thread's interrupt
-      // status is set. Clear all of our select sets and return 0,
-      // indicating that nothing was selected.
-      ::java::lang::Thread::currentThread ()->interrupt ();
-       helper_reset (read);
-       helper_reset (write);
-       helper_reset (except);
-       return 0;
-    }
-
-  if (result < 0)
-    {
-      char* strerr = strerror (errno);
-      throw new ::java::io::IOException (JvNewStringUTF (strerr));
-    }
-
-  // Set the file descriptors according to the values returned from select().
-  helper_get_filedescriptors (read, read_fds);
-  helper_get_filedescriptors (write, write_fds);
-  helper_get_filedescriptors (except, except_fds);
-
-  return result;
-}
diff --git a/libjava/gnu/java/nio/natVMSelectorWin32.cc b/libjava/gnu/java/nio/natVMSelectorWin32.cc
deleted file mode 100644
index 790de22..0000000
--- a/libjava/gnu/java/nio/natVMSelectorWin32.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// natVMSelectorImplWin32.cc
-
-/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <platform.h>
-
-#include <gnu/java/nio/VMSelector.h>
-#include <java/lang/Thread.h>
-
-jint
-gnu::java::nio::VMSelector::select (jintArray read, jintArray write,
-                                    jintArray except, jlong timeout)
-{
-  // FIXME: The API for implSelect is biased towards POSIX implementations.
-  jint* pReadFD = elements (read);
-  int nNbReadFDs = JvGetArrayLength (read);
-
-  jint* pWriteFD = elements (write);
-  int nNbWriteFDs = JvGetArrayLength (write);
-  
-  int nNbEvents = nNbReadFDs + nNbWriteFDs;
-  
-  // Create and initialize our event wrapper array
-  
-  // FIXME: We're creating fresh WSAEVENTs for each call.
-  // This is inefficient. It would probably be better to cache these
-  // in the Win32 socket implementation class.
-  WSAEventWrapper aArray[nNbEvents];
-
-  int nCurIndex = 0;
-  for (int i=0; i < nNbReadFDs; ++i)
-    aArray[nCurIndex++].init(pReadFD[i], FD_ACCEPT | FD_READ);
-
-  for (int i=0; i < nNbWriteFDs; ++i)
-    aArray[nCurIndex++].init(pWriteFD[i], FD_WRITE);
-
-  // Build our array of WSAEVENTs to wait on. Also throw in our thread's
-  // interrupt event in order to detect thread interruption.
-  HANDLE arh[nNbEvents + 1];
-  for (int i=0; i < nNbEvents; ++i)
-    arh[i] = aArray[i].getEventHandle();
-  arh[nNbEvents] = _Jv_Win32GetInterruptEvent ();
-  
-  // A timeout value of 0 needs to be treated as infinite.
-  if (timeout <= 0)
-    timeout = WSA_INFINITE;
-
-  // Do the select.
-  DWORD dwRet = WSAWaitForMultipleEvents (nNbEvents+1, arh, 0, timeout, false);
-  
-  if (dwRet == WSA_WAIT_FAILED)
-    _Jv_ThrowIOException ();
-
-  // Before we do anything else, clear output file descriptor arrays.
-  memset(pReadFD, 0, sizeof(jint) * nNbReadFDs);
-  memset(pWriteFD, 0, sizeof(jint) * nNbWriteFDs);
-  memset(elements (except), 0, sizeof(jint) * JvGetArrayLength (except));
-  
-  if (dwRet == DWORD(WSA_WAIT_EVENT_0 + nNbEvents))
-    {
-      // We were interrupted. Set the current thread's interrupt
-      // status and get out of here, with nothing selected..
-      ::java::lang::Thread::currentThread ()->interrupt ();
-      return 0;
-    }
-  else if (dwRet < DWORD(WSA_WAIT_EVENT_0 + nNbEvents))
-    {
-      int nSelectedEventIndex = dwRet - WSA_WAIT_EVENT_0;
-
-      // Record the selected file descriptor.
-      // FIXME: This implementation only allows one file descriptor
-      // to be selected at a time. Remedy this by looping on
-      // WSAWaitForMultipleEvents 'til nothing more is selected.
-      jint fd = aArray[nSelectedEventIndex].getFD();
-      if (nSelectedEventIndex < nNbReadFDs)
-        pReadFD[0] = fd;
-      else
-        pWriteFD[0] = fd;
-
-      return 1;  
-    }
-  else
-    // None of the event objects was signalled, so nothing was
-    // selected.
-    return 0;
-}
diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.h b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.h
deleted file mode 100644
index ad170da..0000000
--- a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_RMIMarshalledObjectInputStream__
-#define __gnu_java_rmi_RMIMarshalledObjectInputStream__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/RMIObjectInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-          class RMIMarshalledObjectInputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::RMIMarshalledObjectInputStream : public ::gnu::java::rmi::server::RMIObjectInputStream
-{
-
-public:
-  RMIMarshalledObjectInputStream(JArray< jbyte > *, JArray< jbyte > *);
-public: // actually protected
-  virtual ::java::lang::Object * getAnnotation();
-private:
-  ::java::io::ObjectInputStream * __attribute__((aligned(__alignof__( ::gnu::java::rmi::server::RMIObjectInputStream)))) locStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_RMIMarshalledObjectInputStream__
diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.h b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.h
deleted file mode 100644
index 6a1c87e..0000000
--- a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_RMIMarshalledObjectOutputStream__
-#define __gnu_java_rmi_RMIMarshalledObjectOutputStream__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/RMIObjectOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-          class RMIMarshalledObjectOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::RMIMarshalledObjectOutputStream : public ::gnu::java::rmi::server::RMIObjectOutputStream
-{
-
-public:
-  RMIMarshalledObjectOutputStream(::java::io::OutputStream *);
-public: // actually protected
-  virtual void setAnnotation(::java::lang::String *);
-public:
-  virtual void flush();
-  virtual JArray< jbyte > * getLocBytes();
-private:
-  ::java::io::ObjectOutputStream * __attribute__((aligned(__alignof__( ::gnu::java::rmi::server::RMIObjectOutputStream)))) locStream;
-  ::java::io::ByteArrayOutputStream * locBytesStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_RMIMarshalledObjectOutputStream__
diff --git a/libjava/gnu/java/rmi/activation/ActivationSystemTransient.h b/libjava/gnu/java/rmi/activation/ActivationSystemTransient.h
deleted file mode 100644
index 81607a3..0000000
--- a/libjava/gnu/java/rmi/activation/ActivationSystemTransient.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_activation_ActivationSystemTransient__
-#define __gnu_java_rmi_activation_ActivationSystemTransient__
-
-#pragma interface
-
-#include <gnu/java/rmi/activation/DefaultActivationSystem.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace activation
-        {
-            class ActivationSystemTransient;
-            class BidiTable;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroupDesc;
-          class ActivationGroupID;
-          class ActivationID;
-          class ActivationInstantiator;
-          class ActivationMonitor;
-          class ActivationSystem;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::activation::ActivationSystemTransient : public ::gnu::java::rmi::activation::DefaultActivationSystem
-{
-
-public: // actually protected
-  ActivationSystemTransient(::gnu::java::rmi::activation::BidiTable *, ::gnu::java::rmi::activation::BidiTable *);
-  ActivationSystemTransient();
-public:
-  static ::java::rmi::activation::ActivationSystem * getInstance();
-  virtual ::java::rmi::MarshalledObject * activate(::java::rmi::activation::ActivationID *, jboolean);
-  virtual ::java::rmi::activation::ActivationMonitor * activeGroup(::java::rmi::activation::ActivationGroupID *, ::java::rmi::activation::ActivationInstantiator *, jlong);
-  virtual ::java::rmi::activation::ActivationDesc * getActivationDesc(::java::rmi::activation::ActivationID *);
-  virtual ::java::rmi::activation::ActivationGroupDesc * getActivationGroupDesc(::java::rmi::activation::ActivationGroupID *);
-  virtual ::java::rmi::activation::ActivationGroupID * registerGroup(::java::rmi::activation::ActivationGroupDesc *);
-  virtual ::java::rmi::activation::ActivationID * registerObject(::java::rmi::activation::ActivationDesc *);
-  virtual ::java::rmi::activation::ActivationDesc * setActivationDesc(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *);
-  virtual ::java::rmi::activation::ActivationGroupDesc * setActivationGroupDesc(::java::rmi::activation::ActivationGroupID *, ::java::rmi::activation::ActivationGroupDesc *);
-  virtual void shutdown();
-  virtual void unregisterGroup(::java::rmi::activation::ActivationGroupID *);
-  virtual void unregisterObject(::java::rmi::activation::ActivationID *);
-  virtual void activeObject(::java::rmi::activation::ActivationID *, ::java::rmi::MarshalledObject *);
-  virtual void inactiveGroup(::java::rmi::activation::ActivationGroupID *, jlong);
-  virtual void inactiveObject(::java::rmi::activation::ActivationID *);
-public: // actually protected
-  ::gnu::java::rmi::activation::BidiTable * __attribute__((aligned(__alignof__( ::gnu::java::rmi::activation::DefaultActivationSystem)))) groupDescs;
-  ::gnu::java::rmi::activation::BidiTable * descriptions;
-  ::java::util::Map * groupInstantiators;
-  ::java::util::Map * activatedObjects;
-public: // actually package-private
-  static jlong groupIncarnations;
-  static ::java::rmi::activation::ActivationSystem * singleton;
-public:
-  static jboolean debug;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_activation_ActivationSystemTransient__
diff --git a/libjava/gnu/java/rmi/activation/BidiTable.h b/libjava/gnu/java/rmi/activation/BidiTable.h
deleted file mode 100644
index 74a78f1..0000000
--- a/libjava/gnu/java/rmi/activation/BidiTable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_activation_BidiTable__
-#define __gnu_java_rmi_activation_BidiTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace activation
-        {
-            class BidiTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::activation::BidiTable : public ::java::lang::Object
-{
-
-public:
-  BidiTable();
-public: // actually protected
-  BidiTable(jint);
-public:
-  virtual ::java::lang::Object * getKey(::java::lang::Object *);
-  virtual void put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual void removeKey(::java::lang::Object *);
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual void shutdown();
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * keys();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k2v;
-  ::java::util::Map * v2k;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_activation_BidiTable__
diff --git a/libjava/gnu/java/rmi/activation/DefaultActivationGroup.h b/libjava/gnu/java/rmi/activation/DefaultActivationGroup.h
deleted file mode 100644
index 2f1cb0e..0000000
--- a/libjava/gnu/java/rmi/activation/DefaultActivationGroup.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_activation_DefaultActivationGroup__
-#define __gnu_java_rmi_activation_DefaultActivationGroup__
-
-#pragma interface
-
-#include <java/rmi/activation/ActivationGroup.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace activation
-        {
-            class DefaultActivationGroup;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-        class Remote;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroupID;
-          class ActivationID;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::activation::DefaultActivationGroup : public ::java::rmi::activation::ActivationGroup
-{
-
-public:
-  DefaultActivationGroup(::java::rmi::activation::ActivationGroupID *, ::java::rmi::MarshalledObject *);
-  virtual void activeObject(::java::rmi::activation::ActivationID *, ::java::rmi::Remote *);
-  virtual ::java::rmi::MarshalledObject * newInstance(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  static JArray< ::java::lang::Class * > * cConstructorTypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_activation_DefaultActivationGroup__
diff --git a/libjava/gnu/java/rmi/activation/DefaultActivationSystem.h b/libjava/gnu/java/rmi/activation/DefaultActivationSystem.h
deleted file mode 100644
index 457c112..0000000
--- a/libjava/gnu/java/rmi/activation/DefaultActivationSystem.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_activation_DefaultActivationSystem__
-#define __gnu_java_rmi_activation_DefaultActivationSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace activation
-        {
-            class DefaultActivationSystem;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivationSystem;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::activation::DefaultActivationSystem : public ::java::lang::Object
-{
-
-public:
-  DefaultActivationSystem();
-  static ::java::rmi::activation::ActivationSystem * get();
-public: // actually package-private
-  static ::java::rmi::activation::ActivationSystem * system;
-  static jint ACTIVATION_REGISTRY_PORT;
-  static ::java::lang::String * AS_PORT_PROPERTY;
-  static ::java::lang::String * ACTIVATION_SYSTEM_NAME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_activation_DefaultActivationSystem__
diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl$RefProtector.h b/libjava/gnu/java/rmi/dgc/DGCImpl$RefProtector.h
deleted file mode 100644
index ed869a2..0000000
--- a/libjava/gnu/java/rmi/dgc/DGCImpl$RefProtector.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_DGCImpl$RefProtector__
-#define __gnu_java_rmi_dgc_DGCImpl$RefProtector__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class DGCImpl;
-            class DGCImpl$RefProtector;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ObjID;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::DGCImpl$RefProtector : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  DGCImpl$RefProtector(::gnu::java::rmi::dgc::DGCImpl *, JArray< ::java::rmi::server::ObjID * > *, jlong);
-public:
-  virtual void run();
-public: // actually package-private
-  JArray< ::java::util::Collection * > * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) references;
-  ::gnu::java::rmi::dgc::DGCImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_DGCImpl$RefProtector__
diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl.h b/libjava/gnu/java/rmi/dgc/DGCImpl.h
deleted file mode 100644
index e0f91a1..0000000
--- a/libjava/gnu/java/rmi/dgc/DGCImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_DGCImpl__
-#define __gnu_java_rmi_dgc_DGCImpl__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/UnicastServerRef.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class DGCImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class Lease;
-          class VMID;
-      }
-      namespace server
-      {
-          class ObjID;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::DGCImpl : public ::gnu::java::rmi::server::UnicastServerRef
-{
-
-public:
-  DGCImpl();
-  virtual ::java::rmi::dgc::Lease * dirty(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::Lease *);
-  virtual void clean(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::VMID *, jboolean);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  static const jlong LEASE_VALUE = 600000LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_DGCImpl__
diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl_Skel.h b/libjava/gnu/java/rmi/dgc/DGCImpl_Skel.h
deleted file mode 100644
index 3133f2c..0000000
--- a/libjava/gnu/java/rmi/dgc/DGCImpl_Skel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_DGCImpl_Skel__
-#define __gnu_java_rmi_dgc_DGCImpl_Skel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class DGCImpl_Skel;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteCall;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::DGCImpl_Skel : public ::java::lang::Object
-{
-
-public:
-  DGCImpl_Skel();
-  JArray< ::java::rmi::server::Operation * > * getOperations();
-  void dispatch(::java::rmi::Remote *, ::java::rmi::server::RemoteCall *, jint, jlong);
-private:
-  static const jlong interfaceHash = -669196253586618813LL;
-  static JArray< ::java::rmi::server::Operation * > * operations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_DGCImpl_Skel__
diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl_Stub.h b/libjava/gnu/java/rmi/dgc/DGCImpl_Stub.h
deleted file mode 100644
index f37555a..0000000
--- a/libjava/gnu/java/rmi/dgc/DGCImpl_Stub.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_DGCImpl_Stub__
-#define __gnu_java_rmi_dgc_DGCImpl_Stub__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteStub.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class DGCImpl_Stub;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class Lease;
-          class VMID;
-      }
-      namespace server
-      {
-          class ObjID;
-          class Operation;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::DGCImpl_Stub : public ::java::rmi::server::RemoteStub
-{
-
-public:
-  DGCImpl_Stub();
-  DGCImpl_Stub(::java::rmi::server::RemoteRef *);
-  void clean(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::VMID *, jboolean);
-  ::java::rmi::dgc::Lease * dirty(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::Lease *);
-private:
-  static const jlong serialVersionUID = 2LL;
-  static const jlong interfaceHash = -669196253586618813LL;
-  static jboolean useNewInvoke;
-  static JArray< ::java::rmi::server::Operation * > * operations;
-  static ::java::lang::reflect::Method * $method_clean_0;
-  static ::java::lang::reflect::Method * $method_dirty_1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_DGCImpl_Stub__
diff --git a/libjava/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.h b/libjava/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.h
deleted file mode 100644
index 7d319340..0000000
--- a/libjava/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_LeaseRenewingTask$LeaseTimerTask__
-#define __gnu_java_rmi_dgc_LeaseRenewingTask$LeaseTimerTask__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class LeaseRenewingTask;
-            class LeaseRenewingTask$LeaseTimerTask;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::LeaseRenewingTask$LeaseTimerTask : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  LeaseRenewingTask$LeaseTimerTask(::gnu::java::rmi::dgc::LeaseRenewingTask *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::java::rmi::dgc::LeaseRenewingTask * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_LeaseRenewingTask$LeaseTimerTask__
diff --git a/libjava/gnu/java/rmi/dgc/LeaseRenewingTask.h b/libjava/gnu/java/rmi/dgc/LeaseRenewingTask.h
deleted file mode 100644
index 506bdcc..0000000
--- a/libjava/gnu/java/rmi/dgc/LeaseRenewingTask.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_dgc_LeaseRenewingTask__
-#define __gnu_java_rmi_dgc_LeaseRenewingTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class LeaseRenewingTask;
-        }
-        namespace server
-        {
-            class UnicastRef;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class Lease;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::dgc::LeaseRenewingTask : public ::java::lang::Object
-{
-
-public:
-  LeaseRenewingTask(::gnu::java::rmi::server::UnicastRef *);
-  static void scheduleLeases(::gnu::java::rmi::server::UnicastRef *);
-  virtual void schedule(::java::rmi::dgc::Lease *);
-  virtual void renew();
-  virtual ::java::rmi::dgc::Lease * notifyDGC(::gnu::java::rmi::server::UnicastRef *);
-  static jlong REQUEST_LEASE_DURATION;
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ref;
-  ::java::rmi::dgc::Lease * lease;
-  static ::java::util::Timer * timer;
-  static ::java::util::WeakHashMap * existingTasks;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_dgc_LeaseRenewingTask__
diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.h b/libjava/gnu/java/rmi/registry/RegistryImpl.h
deleted file mode 100644
index d4ae019..0000000
--- a/libjava/gnu/java/rmi/registry/RegistryImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_registry_RegistryImpl__
-#define __gnu_java_rmi_registry_RegistryImpl__
-
-#pragma interface
-
-#include <java/rmi/server/UnicastRemoteObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace registry
-        {
-            class RegistryImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class RMIClientSocketFactory;
-          class RMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::registry::RegistryImpl : public ::java::rmi::server::UnicastRemoteObject
-{
-
-public:
-  RegistryImpl(jint);
-  RegistryImpl(jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  virtual ::java::rmi::Remote * lookup(::java::lang::String *);
-  virtual void bind(::java::lang::String *, ::java::rmi::Remote *);
-  virtual void unbind(::java::lang::String *);
-  virtual void rebind(::java::lang::String *, ::java::rmi::Remote *);
-  virtual JArray< ::java::lang::String * > * list();
-  static void version();
-  static void help();
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::rmi::server::UnicastRemoteObject)))) bindings;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_registry_RegistryImpl__
diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl_Skel.h b/libjava/gnu/java/rmi/registry/RegistryImpl_Skel.h
deleted file mode 100644
index 898d8e8..0000000
--- a/libjava/gnu/java/rmi/registry/RegistryImpl_Skel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_registry_RegistryImpl_Skel__
-#define __gnu_java_rmi_registry_RegistryImpl_Skel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace registry
-        {
-            class RegistryImpl_Skel;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteCall;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::registry::RegistryImpl_Skel : public ::java::lang::Object
-{
-
-public:
-  RegistryImpl_Skel();
-  JArray< ::java::rmi::server::Operation * > * getOperations();
-  void dispatch(::java::rmi::Remote *, ::java::rmi::server::RemoteCall *, jint, jlong);
-private:
-  static const jlong interfaceHash = 4905912898345647071LL;
-  static JArray< ::java::rmi::server::Operation * > * operations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_registry_RegistryImpl_Skel__
diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl_Stub.h b/libjava/gnu/java/rmi/registry/RegistryImpl_Stub.h
deleted file mode 100644
index 8983442..0000000
--- a/libjava/gnu/java/rmi/registry/RegistryImpl_Stub.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_registry_RegistryImpl_Stub__
-#define __gnu_java_rmi_registry_RegistryImpl_Stub__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteStub.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace registry
-        {
-            class RegistryImpl_Stub;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::registry::RegistryImpl_Stub : public ::java::rmi::server::RemoteStub
-{
-
-public:
-  RegistryImpl_Stub();
-  RegistryImpl_Stub(::java::rmi::server::RemoteRef *);
-  void bind(::java::lang::String *, ::java::rmi::Remote *);
-  JArray< ::java::lang::String * > * list();
-  ::java::rmi::Remote * lookup(::java::lang::String *);
-  void rebind(::java::lang::String *, ::java::rmi::Remote *);
-  void unbind(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2LL;
-  static const jlong interfaceHash = 4905912898345647071LL;
-  static jboolean useNewInvoke;
-  static JArray< ::java::rmi::server::Operation * > * operations;
-  static ::java::lang::reflect::Method * $method_bind_0;
-  static ::java::lang::reflect::Method * $method_list_1;
-  static ::java::lang::reflect::Method * $method_lookup_2;
-  static ::java::lang::reflect::Method * $method_rebind_3;
-  static ::java::lang::reflect::Method * $method_unbind_4;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_registry_RegistryImpl_Stub__
diff --git a/libjava/gnu/java/rmi/server/ActivatableRef.h b/libjava/gnu/java/rmi/server/ActivatableRef.h
deleted file mode 100644
index 6a9025ae..0000000
--- a/libjava/gnu/java/rmi/server/ActivatableRef.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_ActivatableRef__
-#define __gnu_java_rmi_server_ActivatableRef__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/UnicastRef.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class ActivatableRef;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace activation
-      {
-          class ActivationID;
-      }
-      namespace server
-      {
-          class ObjID;
-          class RMIClientSocketFactory;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::ActivatableRef : public ::gnu::java::rmi::server::UnicastRef
-{
-
-public:
-  ActivatableRef();
-  ActivatableRef(::java::rmi::server::ObjID *, ::java::lang::String *, jint, ::java::rmi::server::RMIClientSocketFactory *);
-  ActivatableRef(::java::rmi::server::ObjID *);
-  virtual ::java::lang::String * getRefClass(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-public: // actually protected
-  virtual ::java::lang::Object * invokeCommon(::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jint, jlong);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::java::rmi::activation::ActivationID * __attribute__((aligned(__alignof__( ::gnu::java::rmi::server::UnicastRef)))) actId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_ActivatableRef__
diff --git a/libjava/gnu/java/rmi/server/ActivatableServerRef.h b/libjava/gnu/java/rmi/server/ActivatableServerRef.h
deleted file mode 100644
index 5241331..0000000
--- a/libjava/gnu/java/rmi/server/ActivatableServerRef.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_ActivatableServerRef__
-#define __gnu_java_rmi_server_ActivatableServerRef__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/UnicastServerRef.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class ActivatableServerRef;
-            class UnicastConnection;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace activation
-      {
-          class ActivationID;
-      }
-      namespace server
-      {
-          class ObjID;
-          class RMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::ActivatableServerRef : public ::gnu::java::rmi::server::UnicastServerRef
-{
-
-public:
-  ActivatableServerRef();
-  ActivatableServerRef(::java::rmi::server::ObjID *, ::java::rmi::activation::ActivationID *, jint, ::java::rmi::server::RMIServerSocketFactory *);
-  virtual void inactivate();
-public: // actually protected
-  virtual void activate();
-public:
-  virtual ::java::lang::Object * incomingMessageCall(::gnu::java::rmi::server::UnicastConnection *, jint, jlong);
-  virtual ::java::rmi::Remote * exportObject(::java::rmi::Remote *);
-  virtual ::java::rmi::Remote * exportClass(::java::lang::Class *);
-  virtual ::java::lang::String * getRefClass(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::java::rmi::activation::ActivationID * __attribute__((aligned(__alignof__( ::gnu::java::rmi::server::UnicastServerRef)))) actId;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_ActivatableServerRef__
diff --git a/libjava/gnu/java/rmi/server/CombinedClassLoader.h b/libjava/gnu/java/rmi/server/CombinedClassLoader.h
deleted file mode 100644
index 5d4c6c9..0000000
--- a/libjava/gnu/java/rmi/server/CombinedClassLoader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_CombinedClassLoader__
-#define __gnu_java_rmi_server_CombinedClassLoader__
-
-#pragma interface
-
-#include <java/lang/ClassLoader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class CombinedClassLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::rmi::server::CombinedClassLoader : public ::java::lang::ClassLoader
-{
-
-public:
-  CombinedClassLoader(::java::util::Collection *);
-public: // actually protected
-  virtual ::java::lang::Class * findClass(::java::lang::String *);
-  virtual ::java::net::URL * findResource(::java::lang::String *);
-  virtual ::java::util::Enumeration * findResources(::java::lang::String *);
-public: // actually package-private
-  JArray< ::java::lang::ClassLoader * > * __attribute__((aligned(__alignof__( ::java::lang::ClassLoader)))) loaders;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_CombinedClassLoader__
diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h
deleted file mode 100644
index 664fc4e..0000000
--- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_ConnectionRunnerPool$ConnectionRunner__
-#define __gnu_java_rmi_server_ConnectionRunnerPool$ConnectionRunner__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class ConnectionRunnerPool$ConnectionRunner;
-            class UnicastConnection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::ConnectionRunnerPool$ConnectionRunner : public ::java::lang::Thread
-{
-
-public:
-  ConnectionRunnerPool$ConnectionRunner(::java::lang::ThreadGroup *, ::java::lang::String *);
-  virtual void run();
-  virtual void dispatch(::gnu::java::rmi::server::UnicastConnection *);
-public: // actually package-private
-  virtual void exit();
-private:
-  ::gnu::java::rmi::server::UnicastConnection * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) conn;
-  jboolean volatile exiting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_ConnectionRunnerPool$ConnectionRunner__
diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.h b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.h
deleted file mode 100644
index eccfb38..0000000
--- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_ConnectionRunnerPool__
-#define __gnu_java_rmi_server_ConnectionRunnerPool__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class ConnectionRunnerPool;
-            class ConnectionRunnerPool$ConnectionRunner;
-            class UnicastConnection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::ConnectionRunnerPool : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConnectionRunnerPool();
-public:
-  static void setSize(jint);
-  static void setMaxSize(jint);
-private:
-  static ::gnu::java::rmi::server::ConnectionRunnerPool$ConnectionRunner * getConnectionRunner();
-public:
-  static void dispatchConnection(::gnu::java::rmi::server::UnicastConnection *);
-  static void exit();
-private:
-  static jint size;
-  static jint max_size;
-public: // actually package-private
-  static ::java::util::ArrayList * freelist;
-private:
-  static ::java::lang::ThreadGroup * group;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_ConnectionRunnerPool__
diff --git a/libjava/gnu/java/rmi/server/ProtocolConstants.h b/libjava/gnu/java/rmi/server/ProtocolConstants.h
deleted file mode 100644
index d9b08e7..0000000
--- a/libjava/gnu/java/rmi/server/ProtocolConstants.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_ProtocolConstants__
-#define __gnu_java_rmi_server_ProtocolConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class ProtocolConstants;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::ProtocolConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint PROTOCOL_HEADER = 1246907721;
-  static const jint PROTOCOL_VERSION = 2;
-  static const jint STREAM_PROTOCOL = 75;
-  static const jint SINGLE_OP_PROTOCOL = 76;
-  static const jint MULTIPLEX_PROTOCOL = 77;
-  static const jint PROTOCOL_ACK = 78;
-  static const jint PROTOCOL_NACK = 79;
-  static const jint MESSAGE_CALL = 80;
-  static const jint MESSAGE_CALL_ACK = 81;
-  static const jint MESSAGE_PING = 82;
-  static const jint MESSAGE_PING_ACK = 83;
-  static const jint MESSAGE_DGCACK = 84;
-  static const jint RETURN_ACK = 1;
-  static const jint RETURN_NACK = 2;
-  static const jint DEFAULT_PROTOCOL = 75;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_rmi_server_ProtocolConstants__
diff --git a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.h b/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.h
deleted file mode 100644
index 4afe170..0000000
--- a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIClassLoaderImpl$CacheKey__
-#define __gnu_java_rmi_server_RMIClassLoaderImpl$CacheKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIClassLoaderImpl$CacheKey;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIClassLoaderImpl$CacheKey : public ::java::lang::Object
-{
-
-public:
-  RMIClassLoaderImpl$CacheKey(::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mCodeBase;
-  ::java::lang::ClassLoader * mContextClassLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIClassLoaderImpl$CacheKey__
diff --git a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h b/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h
deleted file mode 100644
index ed9b936..0000000
--- a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIClassLoaderImpl$MyClassLoader__
-#define __gnu_java_rmi_server_RMIClassLoaderImpl$MyClassLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIClassLoaderImpl$MyClassLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIClassLoaderImpl$MyClassLoader : public ::java::net::URLClassLoader
-{
-
-public: // actually package-private
-  RMIClassLoaderImpl$MyClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *, ::java::lang::String *);
-public:
-  static ::java::lang::String * urlToAnnotation(JArray< ::java::net::URL * > *);
-  virtual ::java::lang::String * getClassAnnotation();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader)))) annotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIClassLoaderImpl$MyClassLoader__
diff --git a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl.h b/libjava/gnu/java/rmi/server/RMIClassLoaderImpl.h
deleted file mode 100644
index abcb8fc..0000000
--- a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIClassLoaderImpl__
-#define __gnu_java_rmi_server_RMIClassLoaderImpl__
-
-#pragma interface
-
-#include <java/rmi/server/RMIClassLoaderSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIClassLoaderImpl;
-            class RMIClassLoaderImpl$MyClassLoader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIClassLoaderSpi;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIClassLoaderImpl : public ::java::rmi::server::RMIClassLoaderSpi
-{
-
-  RMIClassLoaderImpl();
-public:
-  static ::java::rmi::server::RMIClassLoaderSpi * getInstance();
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual ::java::lang::Class * loadProxyClass(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::ClassLoader *);
-  virtual ::java::lang::ClassLoader * getClassLoader(::java::lang::String *);
-  virtual ::java::lang::String * getClassAnnotation(::java::lang::Class *);
-private:
-  static ::gnu::java::rmi::server::RMIClassLoaderImpl * instance;
-  static ::java::util::Map * cacheLoaders;
-  static ::java::util::Map * cacheAnnotations;
-  static ::gnu::java::rmi::server::RMIClassLoaderImpl$MyClassLoader * defaultClassLoader;
-  static ::java::lang::String * defaultAnnotation;
-  static ::java::net::URL * defaultCodebase;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIClassLoaderImpl__
diff --git a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.h b/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.h
deleted file mode 100644
index 32da295..0000000
--- a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIDefaultSocketFactory__
-#define __gnu_java_rmi_server_RMIDefaultSocketFactory__
-
-#pragma interface
-
-#include <java/rmi/server/RMISocketFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIDefaultSocketFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-        class Socket;
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIDefaultSocketFactory : public ::java::rmi::server::RMISocketFactory
-{
-
-public:
-  RMIDefaultSocketFactory();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIDefaultSocketFactory__
diff --git a/libjava/gnu/java/rmi/server/RMIHashes.h b/libjava/gnu/java/rmi/server/RMIHashes.h
deleted file mode 100644
index 0bb00ec..0000000
--- a/libjava/gnu/java/rmi/server/RMIHashes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIHashes__
-#define __gnu_java_rmi_server_RMIHashes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIHashes;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIHashes : public ::java::lang::Object
-{
-
-public:
-  RMIHashes();
-  static jlong getMethodHash(::java::lang::reflect::Method *);
-  static jlong getInterfaceHash(::java::lang::Class *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIHashes__
diff --git a/libjava/gnu/java/rmi/server/RMIIncomingThread.h b/libjava/gnu/java/rmi/server/RMIIncomingThread.h
deleted file mode 100644
index 5938877..0000000
--- a/libjava/gnu/java/rmi/server/RMIIncomingThread.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIIncomingThread__
-#define __gnu_java_rmi_server_RMIIncomingThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIIncomingThread;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIIncomingThread : public ::java::lang::Thread
-{
-
-public:
-  RMIIncomingThread(::java::lang::Runnable *, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * getClientHost();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) clientHost;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIIncomingThread__
diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.h b/libjava/gnu/java/rmi/server/RMIObjectInputStream.h
deleted file mode 100644
index 3af69a2..0000000
--- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIObjectInputStream__
-#define __gnu_java_rmi_server_RMIObjectInputStream__
-
-#pragma interface
-
-#include <java/io/ObjectInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIObjectInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIObjectInputStream : public ::java::io::ObjectInputStream
-{
-
-public:
-  RMIObjectInputStream(::java::io::InputStream *);
-public: // actually protected
-  virtual ::java::lang::Class * resolveClass(::java::io::ObjectStreamClass *);
-  virtual ::java::lang::Object * getAnnotation();
-  virtual ::java::lang::Class * resolveProxyClass(JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Object * readValue(::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIObjectInputStream__
diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.h b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.h
deleted file mode 100644
index 6f6382d..0000000
--- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIObjectOutputStream__
-#define __gnu_java_rmi_server_RMIObjectOutputStream__
-
-#pragma interface
-
-#include <java/io/ObjectOutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIObjectOutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIObjectOutputStream : public ::java::io::ObjectOutputStream
-{
-
-public:
-  RMIObjectOutputStream(::java::io::OutputStream *);
-public: // actually protected
-  virtual void setAnnotation(::java::lang::String *);
-  virtual void annotateClass(::java::lang::Class *);
-  virtual void annotateProxyClass(::java::lang::Class *);
-  virtual ::java::lang::Object * replaceObject(::java::lang::Object *);
-  virtual void writeValue(::java::lang::Object *, ::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIObjectOutputStream__
diff --git a/libjava/gnu/java/rmi/server/RMIVoidValue.h b/libjava/gnu/java/rmi/server/RMIVoidValue.h
deleted file mode 100644
index fab4664..0000000
--- a/libjava/gnu/java/rmi/server/RMIVoidValue.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_RMIVoidValue__
-#define __gnu_java_rmi_server_RMIVoidValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class RMIVoidValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::RMIVoidValue : public ::java::lang::Object
-{
-
-  RMIVoidValue();
-public: // actually package-private
-  static ::gnu::java::rmi::server::RMIVoidValue * INSTANCE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_RMIVoidValue__
diff --git a/libjava/gnu/java/rmi/server/TripleKey.h b/libjava/gnu/java/rmi/server/TripleKey.h
deleted file mode 100644
index dbc2d42..0000000
--- a/libjava/gnu/java/rmi/server/TripleKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_TripleKey__
-#define __gnu_java_rmi_server_TripleKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class TripleKey;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::TripleKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TripleKey(::java::lang::String *, jint, ::java::lang::Object *);
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) host;
-  jint port;
-  ::java::lang::Object * other;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_TripleKey__
diff --git a/libjava/gnu/java/rmi/server/UnicastConnection.h b/libjava/gnu/java/rmi/server/UnicastConnection.h
deleted file mode 100644
index 98f5d0d..0000000
--- a/libjava/gnu/java/rmi/server/UnicastConnection.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastConnection__
-#define __gnu_java_rmi_server_UnicastConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnection;
-            class UnicastConnectionManager;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastConnection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicastConnection(::gnu::java::rmi::server::UnicastConnectionManager *, ::java::net::Socket *);
-  virtual void acceptConnection();
-  virtual void makeConnection(jint);
-  virtual ::java::io::DataInputStream * getDataInputStream();
-  virtual ::java::io::DataOutputStream * getDataOutputStream();
-  virtual ::java::io::ObjectInputStream * getObjectInputStream();
-  virtual ::java::io::ObjectInputStream * startObjectInputStream();
-  virtual ::java::io::ObjectOutputStream * getObjectOutputStream();
-  virtual ::java::io::ObjectOutputStream * startObjectOutputStream();
-  virtual void disconnect();
-  static jboolean isExpired(::gnu::java::rmi::server::UnicastConnection *, jlong);
-  static void resetTime(::gnu::java::rmi::server::UnicastConnection *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::java::rmi::server::UnicastConnectionManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) manager;
-  ::java::net::Socket * sock;
-  ::java::io::DataInputStream * din;
-  ::java::io::DataOutputStream * dout;
-  ::java::io::ObjectInputStream * oin;
-  ::java::io::ObjectOutputStream * oout;
-  jlong reviveTime;
-  jlong expireTime;
-public:
-  static const jlong CONNECTION_TIMEOUT = 10000LL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastConnection__
diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager$1.h b/libjava/gnu/java/rmi/server/UnicastConnectionManager$1.h
deleted file mode 100644
index 94deb02..0000000
--- a/libjava/gnu/java/rmi/server/UnicastConnectionManager$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastConnectionManager$1__
-#define __gnu_java_rmi_server_UnicastConnectionManager$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnectionManager$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastConnectionManager$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicastConnectionManager$1();
-public:
-  virtual void run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastConnectionManager$1__
diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h
deleted file mode 100644
index 26c19cc..0000000
--- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastConnectionManager__
-#define __gnu_java_rmi_server_UnicastConnectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnection;
-            class UnicastConnectionManager;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIClientSocketFactory;
-          class RMIServerSocketFactory;
-          class RMISocketFactory;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastConnectionManager : public ::java::lang::Object
-{
-
-  static void startScavenger();
-  UnicastConnectionManager(::java::lang::String *, jint, ::java::rmi::server::RMIClientSocketFactory *);
-  UnicastConnectionManager(jint, ::java::rmi::server::RMIServerSocketFactory *);
-public:
-  static ::gnu::java::rmi::server::UnicastConnectionManager * getInstance(::java::lang::String *, jint, ::java::rmi::server::RMIClientSocketFactory *);
-  static ::gnu::java::rmi::server::UnicastConnectionManager * getInstance(jint, ::java::rmi::server::RMIServerSocketFactory *);
-  virtual ::gnu::java::rmi::server::UnicastConnection * getConnection();
-private:
-  ::gnu::java::rmi::server::UnicastConnection * getServerConnection();
-  ::gnu::java::rmi::server::UnicastConnection * getClientConnection();
-public:
-  virtual ::java::lang::String * toString();
-  virtual void discardConnection(::gnu::java::rmi::server::UnicastConnection *);
-  virtual void startServer();
-  virtual void stopServer();
-  virtual void run();
-public: // actually package-private
-  virtual void write(::java::io::ObjectOutput *);
-  static ::gnu::java::rmi::server::UnicastConnectionManager * read(::java::io::ObjectInput *);
-private:
-  static ::java::lang::String * localhost;
-  static ::java::util::Hashtable * servers;
-public: // actually package-private
-  static ::java::util::Hashtable * clients;
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connections;
-private:
-  ::java::lang::Thread * volatile serverThread;
-  ::java::net::ServerSocket * ssock;
-public: // actually package-private
-  ::java::lang::String * serverName;
-  jint serverPort;
-  static ::java::lang::Thread * scavenger;
-  ::java::lang::Object * serverobj;
-private:
-  static ::java::rmi::server::RMISocketFactory * defaultSocketFactory;
-  ::java::rmi::server::RMIServerSocketFactory * serverFactory;
-  ::java::rmi::server::RMIClientSocketFactory * clientFactory;
-  static jint ncsock;
-  static jint nssock;
-  static jint ncmanager;
-  static jint nsmanager;
-  static const jboolean debug = 0;
-  static ::java::lang::Object * GLOBAL_LOCK;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastConnectionManager__
diff --git a/libjava/gnu/java/rmi/server/UnicastRef.h b/libjava/gnu/java/rmi/server/UnicastRef.h
deleted file mode 100644
index 089b35d..0000000
--- a/libjava/gnu/java/rmi/server/UnicastRef.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastRef__
-#define __gnu_java_rmi_server_UnicastRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnection;
-            class UnicastConnectionManager;
-            class UnicastRef;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace dgc
-      {
-          class Lease;
-      }
-      namespace server
-      {
-          class ObjID;
-          class Operation;
-          class RMIClientSocketFactory;
-          class RemoteCall;
-          class RemoteObject;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastRef : public ::java::lang::Object
-{
-
-public:
-  UnicastRef();
-  UnicastRef(::java::rmi::server::ObjID *, ::java::lang::String *, jint, ::java::rmi::server::RMIClientSocketFactory *);
-  UnicastRef(::java::rmi::server::ObjID *);
-  virtual ::java::lang::Object * invoke(::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jlong);
-  virtual ::java::rmi::dgc::Lease * notifyDGC(::java::rmi::dgc::Lease *);
-public: // actually protected
-  virtual ::java::lang::Object * invokeCommon(::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jint, jlong);
-  virtual ::java::lang::Object * invokeCommon(::gnu::java::rmi::server::UnicastConnection *, ::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jint, jlong);
-public:
-  virtual ::java::rmi::server::RemoteCall * newCall(::java::rmi::server::RemoteObject *, JArray< ::java::rmi::server::Operation * > *, jint, jlong);
-  virtual void invoke(::java::rmi::server::RemoteCall *);
-  virtual void done(::java::rmi::server::RemoteCall *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual jboolean remoteEquals(::java::rmi::server::RemoteRef *);
-  virtual jint remoteHashCode();
-  virtual ::java::lang::String * getRefClass(::java::io::ObjectOutput *);
-  virtual ::java::lang::String * remoteToString();
-  virtual void dump(::gnu::java::rmi::server::UnicastConnection *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::java::rmi::server::ObjID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) objid;
-public: // actually package-private
-  ::gnu::java::rmi::server::UnicastConnectionManager * manager;
-  static jlong dgcSequence;
-  static ::java::rmi::server::ObjID * dgcId;
-  JArray< ::java::rmi::server::ObjID * > * this_id;
-  static jint DIRTY;
-  static const jlong dgcInterfaceHash = -669196253586618813LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastRef__
diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.h b/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.h
deleted file mode 100644
index acf3480..0000000
--- a/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectInputStream__
-#define __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastRemoteCall;
-            class UnicastRemoteCall$DummyObjectInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastRemoteCall$DummyObjectInputStream : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicastRemoteCall$DummyObjectInputStream(::gnu::java::rmi::server::UnicastRemoteCall *);
-public:
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual jchar readChar();
-  virtual jdouble readDouble();
-  virtual jfloat readFloat();
-  virtual jint readInt();
-  virtual jlong readLong();
-  virtual jshort readShort();
-  virtual ::java::lang::Object * readObject();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read();
-  virtual jlong skip(jlong);
-  virtual jint available();
-  virtual void readFully(JArray< jbyte > *);
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * readLine();
-  virtual ::java::lang::String * readUTF();
-  virtual jint readUnsignedByte();
-  virtual jint readUnsignedShort();
-  virtual jint skipBytes(jint);
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::rmi::server::UnicastRemoteCall * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectInputStream__
diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.h b/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.h
deleted file mode 100644
index 7a903b6..0000000
--- a/libjava/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectOutputStream__
-#define __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectOutputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastRemoteCall;
-            class UnicastRemoteCall$DummyObjectOutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastRemoteCall$DummyObjectOutputStream : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicastRemoteCall$DummyObjectOutputStream(::gnu::java::rmi::server::UnicastRemoteCall *);
-public:
-  virtual void writeBoolean(jboolean);
-  virtual void writeByte(jint);
-  virtual void writeChar(jint);
-  virtual void writeDouble(jdouble);
-  virtual void writeFloat(jfloat);
-  virtual void writeInt(jint);
-  virtual void writeLong(jlong);
-  virtual void writeShort(jint);
-  virtual void writeObject(::java::lang::Object *);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeUTF(::java::lang::String *);
-  virtual void flush();
-  virtual void close();
-public: // actually package-private
-  ::gnu::java::rmi::server::UnicastRemoteCall * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastRemoteCall$DummyObjectOutputStream__
diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.h b/libjava/gnu/java/rmi/server/UnicastRemoteCall.h
deleted file mode 100644
index d6808a6..0000000
--- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastRemoteCall__
-#define __gnu_java_rmi_server_UnicastRemoteCall__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnection;
-            class UnicastRemoteCall;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ObjID;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastRemoteCall : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicastRemoteCall(::gnu::java::rmi::server::UnicastConnection *);
-  UnicastRemoteCall(::gnu::java::rmi::server::UnicastConnection *, ::java::rmi::server::ObjID *, jint, jlong);
-  virtual ::gnu::java::rmi::server::UnicastConnection * getConnection();
-public:
-  virtual ::java::io::ObjectOutput * getOutputStream();
-  virtual void releaseOutputStream();
-  virtual ::java::io::ObjectInput * startInputStream();
-  virtual ::java::io::ObjectInput * getInputStream();
-  virtual void releaseInputStream();
-  virtual ::java::io::ObjectOutput * getResultStream(jboolean);
-  virtual void executeCall();
-  virtual void done();
-public: // actually package-private
-  virtual jboolean isReturnValue();
-  virtual ::java::lang::Object * returnValue();
-  virtual JArray< ::java::lang::Object * > * getArguments();
-  virtual ::java::lang::Object * getObject();
-  virtual jint getOpnum();
-  virtual jlong getHash();
-  virtual void setReturnValue(::java::lang::Object *);
-private:
-  ::gnu::java::rmi::server::UnicastConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) conn;
-  ::java::lang::Object * result;
-  ::java::lang::Object * object;
-  jint opnum;
-  jlong hash;
-public: // actually package-private
-  ::java::util::Vector * vec;
-  jint ptr;
-private:
-  ::java::rmi::server::ObjID * objid;
-  ::java::io::ObjectOutput * oout;
-  ::java::io::ObjectInput * oin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastRemoteCall__
diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteStub.h b/libjava/gnu/java/rmi/server/UnicastRemoteStub.h
deleted file mode 100644
index 14c9e5a..0000000
--- a/libjava/gnu/java/rmi/server/UnicastRemoteStub.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastRemoteStub__
-#define __gnu_java_rmi_server_UnicastRemoteStub__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteStub.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastRemoteStub;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RemoteRef;
-          class RemoteStub;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastRemoteStub : public ::java::rmi::server::RemoteStub
-{
-
-public:
-  UnicastRemoteStub();
-  static void setStubRef(::java::rmi::server::RemoteStub *, ::java::rmi::server::RemoteRef *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastRemoteStub__
diff --git a/libjava/gnu/java/rmi/server/UnicastServer.h b/libjava/gnu/java/rmi/server/UnicastServer.h
deleted file mode 100644
index 5ebf363..0000000
--- a/libjava/gnu/java/rmi/server/UnicastServer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastServer__
-#define __gnu_java_rmi_server_UnicastServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace dgc
-        {
-            class DGCImpl;
-        }
-        namespace server
-        {
-            class ActivatableServerRef;
-            class UnicastConnection;
-            class UnicastServer;
-            class UnicastServerRef;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace activation
-      {
-          class ActivationID;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastServer : public ::java::lang::Object
-{
-
-public:
-  UnicastServer();
-  static void exportObject(::gnu::java::rmi::server::UnicastServerRef *);
-  static void registerActivatable(::gnu::java::rmi::server::ActivatableServerRef *);
-  static void exportActivatableObject(::gnu::java::rmi::server::ActivatableServerRef *);
-  static ::gnu::java::rmi::server::ActivatableServerRef * getActivatableRef(::java::rmi::activation::ActivationID *);
-  static void unregisterActivatable(::java::rmi::activation::ActivationID *);
-  static jboolean unexportObject(::gnu::java::rmi::server::UnicastServerRef *, jboolean);
-  static ::gnu::java::rmi::server::UnicastServerRef * getExportedRef(::java::rmi::Remote *);
-  static ::java::util::Collection * getExported(::java::lang::Object *);
-private:
-  static void startDGC();
-public:
-  static void dispatch(::gnu::java::rmi::server::UnicastConnection *);
-private:
-  static void incomingMessageCall(::gnu::java::rmi::server::UnicastConnection *);
-  static ::java::util::Map * objects;
-  static ::java::util::Map * refcache;
-public:
-  static ::java::util::Map * actIds;
-private:
-  static ::gnu::java::rmi::dgc::DGCImpl * dgc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastServer__
diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.h b/libjava/gnu/java/rmi/server/UnicastServerRef.h
deleted file mode 100644
index 62299d9..0000000
--- a/libjava/gnu/java/rmi/server/UnicastServerRef.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_rmi_server_UnicastServerRef__
-#define __gnu_java_rmi_server_UnicastServerRef__
-
-#pragma interface
-
-#include <gnu/java/rmi/server/UnicastRef.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace rmi
-      {
-        namespace server
-        {
-            class UnicastConnection;
-            class UnicastServerRef;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class ObjID;
-          class RMIServerSocketFactory;
-          class RemoteRef;
-          class Skeleton;
-      }
-    }
-  }
-}
-
-class gnu::java::rmi::server::UnicastServerRef : public ::gnu::java::rmi::server::UnicastRef
-{
-
-public: // actually package-private
-  UnicastServerRef();
-public:
-  UnicastServerRef(::java::rmi::server::ObjID *, jint, ::java::rmi::server::RMIServerSocketFactory *);
-  virtual ::java::rmi::Remote * exportObject(::java::rmi::Remote *);
-  virtual ::java::rmi::Remote * getStub();
-  virtual jboolean unexportObject(::java::rmi::Remote *, jboolean);
-public: // actually protected
-  virtual ::java::lang::Class * findStubSkelClass(::java::lang::Class *);
-  virtual ::java::lang::Object * getHelperClass(::java::lang::Class *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getClientHost();
-public: // actually protected
-  virtual void buildMethodHash(::java::lang::Class *, jboolean);
-public: // actually package-private
-  virtual ::java::lang::Class * getMethodReturnType(jint, jlong);
-public:
-  virtual ::java::lang::Object * incomingMessageCall(::gnu::java::rmi::server::UnicastConnection *, jint, jlong);
-public: // actually package-private
-  virtual ::java::rmi::Remote * createProxyStub(::java::lang::Class *, ::java::rmi::server::RemoteRef *);
-private:
-  static const jlong serialVersionUID = -5585608108300801246LL;
-  static JArray< ::java::lang::Class * > * stubprototype;
-public: // actually package-private
-  ::java::rmi::Remote * __attribute__((aligned(__alignof__( ::gnu::java::rmi::server::UnicastRef)))) myself;
-public: // actually protected
-  ::java::rmi::server::Skeleton * skel;
-  ::java::rmi::Remote * stub;
-  ::java::util::Hashtable * methods;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_rmi_server_UnicastServerRef__
diff --git a/libjava/gnu/java/security/Configuration.h b/libjava/gnu/java/security/Configuration.h
deleted file mode 100644
index ea2bb70..0000000
--- a/libjava/gnu/java/security/Configuration.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Configuration__
-#define __gnu_java_security_Configuration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Configuration;
-      }
-    }
-  }
-}
-
-class gnu::java::security::Configuration : public ::java::lang::Object
-{
-
-public:
-  static const jboolean DEBUG = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_Configuration__
diff --git a/libjava/gnu/java/security/Engine.h b/libjava/gnu/java/security/Engine.h
deleted file mode 100644
index 53447ec..0000000
--- a/libjava/gnu/java/security/Engine.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Engine__
-#define __gnu_java_security_Engine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Engine;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-    }
-  }
-}
-
-class gnu::java::security::Engine : public ::java::lang::Object
-{
-
-  Engine();
-public:
-  static ::java::lang::Object * getInstance(::java::lang::String *, ::java::lang::String *, ::java::security::Provider *);
-  static ::java::lang::Object * getInstance(::java::lang::String *, ::java::lang::String *, ::java::security::Provider *, JArray< ::java::lang::Object * > *);
-private:
-  static ::java::lang::reflect::Constructor * getCompatibleConstructor(::java::lang::Class *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::String * ALG_ALIAS;
-  static const jint MAX_ALIASES = 5;
-  static JArray< ::java::lang::Object * > * NO_ARGS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_Engine__
diff --git a/libjava/gnu/java/security/OID.h b/libjava/gnu/java/security/OID.h
deleted file mode 100644
index 4034773..0000000
--- a/libjava/gnu/java/security/OID.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_OID__
-#define __gnu_java_security_OID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-}
-
-class gnu::java::security::OID : public ::java::lang::Object
-{
-
-public:
-  OID(JArray< jint > *);
-  OID(JArray< jint > *, jboolean);
-  OID(::java::lang::String *);
-  OID(::java::lang::String *, jboolean);
-  OID(::java::io::InputStream *, jint);
-  OID(::java::io::InputStream *, jint, jboolean);
-  OID(JArray< jbyte > *);
-  OID(JArray< jbyte > *, jboolean);
-  virtual JArray< jint > * getIDs();
-  virtual JArray< jbyte > * getDER();
-  virtual ::gnu::java::security::OID * getParent();
-  virtual ::gnu::java::security::OID * getChild(jint);
-  virtual ::gnu::java::security::OID * getRoot();
-  virtual jboolean isRelative();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  static JArray< jint > * fromDER(JArray< jbyte > *, jboolean);
-  static JArray< jint > * fromString(::java::lang::String *);
-  static void encodeSubID(::java::io::ByteArrayOutputStream *, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 5722492029044597779LL;
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  ::java::lang::String * strRep;
-  JArray< jbyte > * der;
-  jboolean relative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_OID__
diff --git a/libjava/gnu/java/security/PolicyFile$1.h b/libjava/gnu/java/security/PolicyFile$1.h
deleted file mode 100644
index 9b16a0e..0000000
--- a/libjava/gnu/java/security/PolicyFile$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_PolicyFile$1__
-#define __gnu_java_security_PolicyFile$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class PolicyFile;
-          class PolicyFile$1;
-      }
-    }
-  }
-}
-
-class gnu::java::security::PolicyFile$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PolicyFile$1(::gnu::java::security::PolicyFile *, ::java::util::List *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::java::security::PolicyFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::List * val$policyFiles;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_PolicyFile$1__
diff --git a/libjava/gnu/java/security/PolicyFile.h b/libjava/gnu/java/security/PolicyFile.h
deleted file mode 100644
index 768e3d9..0000000
--- a/libjava/gnu/java/security/PolicyFile.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_PolicyFile__
-#define __gnu_java_security_PolicyFile__
-
-#pragma interface
-
-#include <java/security/Policy.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class PolicyFile;
-        namespace action
-        {
-            class GetPropertyAction;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class CodeSource;
-        class PermissionCollection;
-    }
-  }
-}
-
-class gnu::java::security::PolicyFile : public ::java::security::Policy
-{
-
-public:
-  PolicyFile();
-  ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *);
-  void refresh();
-  ::java::lang::String * toString();
-private:
-  void parse(::java::net::URL *);
-  static ::java::lang::String * expand(::java::lang::String *);
-  static void error(::java::net::URL *, ::java::io::StreamTokenizer *, ::java::lang::String *);
-public: // actually protected
-  static ::java::util::logging::Logger * logger;
-private:
-  static ::gnu::java::security::action::GetPropertyAction * prop;
-  static ::java::lang::String * fs;
-  static ::java::lang::String * DEFAULT_POLICY;
-  static ::java::lang::String * DEFAULT_USER_POLICY;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::security::Policy)))) cs2pc;
-  static const jint STATE_BEGIN = 0;
-  static const jint STATE_GRANT = 1;
-  static const jint STATE_PERMS = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_PolicyFile__
diff --git a/libjava/gnu/java/security/Properties$1.h b/libjava/gnu/java/security/Properties$1.h
deleted file mode 100644
index 30082876..0000000
--- a/libjava/gnu/java/security/Properties$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Properties$1__
-#define __gnu_java_security_Properties$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Properties;
-          class Properties$1;
-      }
-    }
-  }
-}
-
-class gnu::java::security::Properties$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Properties$1(::gnu::java::security::Properties *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::java::security::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_Properties$1__
diff --git a/libjava/gnu/java/security/Properties.h b/libjava/gnu/java/security/Properties.h
deleted file mode 100644
index d28d18e..0000000
--- a/libjava/gnu/java/security/Properties.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Properties__
-#define __gnu_java_security_Properties__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Properties;
-      }
-    }
-  }
-}
-
-class gnu::java::security::Properties : public ::java::lang::Object
-{
-
-  Properties();
-public:
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static void setProperty(::java::lang::String *, ::java::lang::String *);
-  static jboolean isReproducible();
-  static jboolean checkForWeakKeys();
-  static jboolean doRSABlinding();
-  static void setReproducible(jboolean);
-  static void setCheckForWeakKeys(jboolean);
-  static void setDoRSABlinding(jboolean);
-private:
-  static ::gnu::java::security::Properties * instance();
-  void init();
-  void handleBooleanProperty(::java::lang::String *);
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::String * VERSION;
-  static ::java::lang::String * PROPERTIES_FILE;
-  static ::java::lang::String * REPRODUCIBLE_PRNG;
-  static ::java::lang::String * CHECK_WEAK_KEYS;
-  static ::java::lang::String * DO_RSA_BLINDING;
-private:
-  static ::java::lang::String * TRUE;
-  static ::java::lang::String * FALSE;
-  static ::java::util::HashMap * props;
-  static ::gnu::java::security::Properties * singleton;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) reproducible;
-  jboolean checkForWeakKeys__;
-  jboolean doRSABlinding__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_Properties__
diff --git a/libjava/gnu/java/security/Registry.h b/libjava/gnu/java/security/Registry.h
deleted file mode 100644
index 164bb9f..0000000
--- a/libjava/gnu/java/security/Registry.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Registry__
-#define __gnu_java_security_Registry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Registry;
-      }
-    }
-  }
-}
-
-class gnu::java::security::Registry : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * GNU_SECURITY;
-  static ::java::lang::String * GNU_CRYPTO;
-  static ::java::lang::String * GNU_SASL;
-  static ::java::lang::String * VERSION_STRING;
-  static ::java::lang::String * ANUBIS_CIPHER;
-  static ::java::lang::String * BLOWFISH_CIPHER;
-  static ::java::lang::String * DES_CIPHER;
-  static ::java::lang::String * KHAZAD_CIPHER;
-  static ::java::lang::String * RIJNDAEL_CIPHER;
-  static ::java::lang::String * SERPENT_CIPHER;
-  static ::java::lang::String * SQUARE_CIPHER;
-  static ::java::lang::String * TRIPLEDES_CIPHER;
-  static ::java::lang::String * TWOFISH_CIPHER;
-  static ::java::lang::String * CAST5_CIPHER;
-  static ::java::lang::String * NULL_CIPHER;
-  static ::java::lang::String * AES_CIPHER;
-  static ::java::lang::String * DESEDE_CIPHER;
-  static ::java::lang::String * CAST128_CIPHER;
-  static ::java::lang::String * CAST_128_CIPHER;
-  static ::java::lang::String * KWA_PREFIX;
-  static ::java::lang::String * AES_KWA;
-  static ::java::lang::String * AES128_KWA;
-  static ::java::lang::String * AES192_KWA;
-  static ::java::lang::String * AES256_KWA;
-  static ::java::lang::String * RIJNDAEL_KWA;
-  static ::java::lang::String * TRIPLEDES_KWA;
-  static ::java::lang::String * DESEDE_KWA;
-  static ::java::lang::String * WHIRLPOOL_HASH;
-  static ::java::lang::String * RIPEMD128_HASH;
-  static ::java::lang::String * RIPEMD160_HASH;
-  static ::java::lang::String * SHA160_HASH;
-  static ::java::lang::String * SHA256_HASH;
-  static ::java::lang::String * SHA384_HASH;
-  static ::java::lang::String * SHA512_HASH;
-  static ::java::lang::String * TIGER_HASH;
-  static ::java::lang::String * HAVAL_HASH;
-  static ::java::lang::String * MD5_HASH;
-  static ::java::lang::String * MD4_HASH;
-  static ::java::lang::String * MD2_HASH;
-  static ::java::lang::String * RIPEMD_128_HASH;
-  static ::java::lang::String * RIPEMD_160_HASH;
-  static ::java::lang::String * SHA_1_HASH;
-  static ::java::lang::String * SHA1_HASH;
-  static ::java::lang::String * SHA_HASH;
-  static ::java::lang::String * ECB_MODE;
-  static ::java::lang::String * CTR_MODE;
-  static ::java::lang::String * ICM_MODE;
-  static ::java::lang::String * OFB_MODE;
-  static ::java::lang::String * CBC_MODE;
-  static ::java::lang::String * CFB_MODE;
-  static ::java::lang::String * EAX_MODE;
-  static ::java::lang::String * PKCS5_PAD;
-  static ::java::lang::String * PKCS7_PAD;
-  static ::java::lang::String * TBC_PAD;
-  static ::java::lang::String * EME_PKCS1_V1_5_PAD;
-  static ::java::lang::String * SSL3_PAD;
-  static ::java::lang::String * TLS1_PAD;
-  static ::java::lang::String * ISO10126_PAD;
-  static ::java::lang::String * ARCFOUR_PRNG;
-  static ::java::lang::String * RC4_PRNG;
-  static ::java::lang::String * ICM_PRNG;
-  static ::java::lang::String * MD_PRNG;
-  static ::java::lang::String * UMAC_PRNG;
-  static ::java::lang::String * PBKDF2_PRNG_PREFIX;
-  static ::java::lang::String * CSPRNG_PRNG;
-  static ::java::lang::String * FORTUNA_PRNG;
-  static ::java::lang::String * FORTUNA_GENERATOR_PRNG;
-  static ::java::lang::String * DSS_KPG;
-  static ::java::lang::String * RSA_KPG;
-  static ::java::lang::String * DH_KPG;
-  static ::java::lang::String * SRP_KPG;
-  static ::java::lang::String * DSA_KPG;
-  static ::java::lang::String * DSS_SIG;
-  static ::java::lang::String * RSA_SIG_PREFIX;
-  static ::java::lang::String * RSA_PSS_ENCODING;
-  static ::java::lang::String * RSA_PSS_SIG;
-  static ::java::lang::String * RSA_PKCS1_V1_5_ENCODING;
-  static ::java::lang::String * RSA_PKCS1_V1_5_SIG;
-  static ::java::lang::String * DSA_SIG;
-  static ::java::lang::String * DH_KA;
-  static ::java::lang::String * ELGAMAL_KA;
-  static ::java::lang::String * SRP6_KA;
-  static ::java::lang::String * SRP_SASL_KA;
-  static ::java::lang::String * SRP_TLS_KA;
-  static ::java::lang::String * HMAC_NAME_PREFIX;
-  static ::java::lang::String * OMAC_PREFIX;
-  static ::java::lang::String * UHASH32;
-  static ::java::lang::String * UMAC32;
-  static ::java::lang::String * TMMH16;
-  static ::java::lang::String * RAW_ENCODING;
-  static ::java::lang::String * X509_ENCODING;
-  static ::java::lang::String * PKCS8_ENCODING;
-  static ::java::lang::String * ASN1_ENCODING;
-  static ::java::lang::String * RAW_ENCODING_SHORT_NAME;
-  static ::java::lang::String * X509_ENCODING_SORT_NAME;
-  static ::java::lang::String * PKCS8_ENCODING_SHORT_NAME;
-  static ::java::lang::String * ASN1_ENCODING_SHORT_NAME;
-  static const jint RAW_ENCODING_ID = 1;
-  static const jint X509_ENCODING_ID = 2;
-  static const jint PKCS8_ENCODING_ID = 3;
-  static const jint ASN1_ENCODING_ID = 4;
-  static ::java::lang::String * DSA_OID_STRING;
-  static ::java::lang::String * RSA_OID_STRING;
-  static ::java::lang::String * DH_OID_STRING;
-  static JArray< jbyte > * MAGIC_RAW_DSS_PUBLIC_KEY;
-  static JArray< jbyte > * MAGIC_RAW_DSS_PRIVATE_KEY;
-  static JArray< jbyte > * MAGIC_RAW_DSS_SIGNATURE;
-  static JArray< jbyte > * MAGIC_RAW_RSA_PUBLIC_KEY;
-  static JArray< jbyte > * MAGIC_RAW_RSA_PRIVATE_KEY;
-  static JArray< jbyte > * MAGIC_RAW_RSA_PSS_SIGNATURE;
-  static JArray< jbyte > * MAGIC_RAW_RSA_PKCS1V1_5_SIGNATURE;
-  static JArray< jbyte > * MAGIC_RAW_DH_PUBLIC_KEY;
-  static JArray< jbyte > * MAGIC_RAW_DH_PRIVATE_KEY;
-  static JArray< jbyte > * MAGIC_RAW_SRP_PUBLIC_KEY;
-  static JArray< jbyte > * MAGIC_RAW_SRP_PRIVATE_KEY;
-  static ::java::lang::String * SASL_PREFIX;
-  static ::java::lang::String * SASL_USERNAME;
-  static ::java::lang::String * SASL_PASSWORD;
-  static ::java::lang::String * SASL_AUTH_INFO_PROVIDER_PKGS;
-  static ::java::lang::String * SASL_AUTHORISATION_ID;
-  static ::java::lang::String * SASL_PROTOCOL;
-  static ::java::lang::String * SASL_SERVER_NAME;
-  static ::java::lang::String * SASL_CALLBACK_HANDLER;
-  static ::java::lang::String * SASL_CHANNEL_BINDING;
-  static const jint SASL_ONE_BYTE_MAX_LIMIT = 255;
-  static const jint SASL_TWO_BYTE_MAX_LIMIT = 65535;
-  static const jint SASL_FOUR_BYTE_MAX_LIMIT = 2147483383;
-  static const jint SASL_BUFFER_MAX_LIMIT = 2147483643;
-  static ::java::lang::String * SASL_ANONYMOUS_MECHANISM;
-  static ::java::lang::String * SASL_CRAM_MD5_MECHANISM;
-  static ::java::lang::String * SASL_PLAIN_MECHANISM;
-  static ::java::lang::String * SASL_SRP_MECHANISM;
-  static ::java::lang::String * SASL_HMAC_MD5_IALG;
-  static ::java::lang::String * SASL_HMAC_SHA_IALG;
-  static ::java::lang::String * QOP_AUTH;
-  static ::java::lang::String * QOP_AUTH_INT;
-  static ::java::lang::String * QOP_AUTH_CONF;
-  static ::java::lang::String * STRENGTH_HIGH;
-  static ::java::lang::String * STRENGTH_MEDIUM;
-  static ::java::lang::String * STRENGTH_LOW;
-  static ::java::lang::String * SERVER_AUTH_TRUE;
-  static ::java::lang::String * SERVER_AUTH_FALSE;
-  static ::java::lang::String * REUSE_TRUE;
-  static ::java::lang::String * REUSE_FALSE;
-  static JArray< jbyte > * GKR_MAGIC;
-  static const jint GKR_PRIVATE_KEYS = 1;
-  static const jint GKR_PUBLIC_CREDENTIALS = 2;
-  static const jint GKR_CERTIFICATES = 4;
-  static const jint GKR_HMAC_MD5_128 = 0;
-  static const jint GKR_HMAC_SHA_160 = 1;
-  static const jint GKR_HMAC_MD5_96 = 2;
-  static const jint GKR_HMAC_SHA_96 = 3;
-  static const jint GKR_CIPHER_AES_128_OFB = 0;
-  static const jint GKR_CIPHER_AES_128_CBC = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_Registry__
diff --git a/libjava/gnu/java/security/Requires.h b/libjava/gnu/java/security/Requires.h
deleted file mode 100644
index 879a873..0000000
--- a/libjava/gnu/java/security/Requires.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_Requires__
-#define __gnu_java_security_Requires__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class Requires;
-      }
-    }
-  }
-}
-
-class gnu::java::security::Requires : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * permissionClass() = 0;
-  virtual ::java::lang::String * target() = 0;
-  virtual ::java::lang::String * action() = 0;
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_Requires__
diff --git a/libjava/gnu/java/security/action/GetPropertyAction.h b/libjava/gnu/java/security/action/GetPropertyAction.h
deleted file mode 100644
index e3ab183..0000000
--- a/libjava/gnu/java/security/action/GetPropertyAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_action_GetPropertyAction__
-#define __gnu_java_security_action_GetPropertyAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace action
-        {
-            class GetPropertyAction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::action::GetPropertyAction : public ::java::lang::Object
-{
-
-public:
-  GetPropertyAction();
-  GetPropertyAction(::java::lang::String *);
-  GetPropertyAction(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * GetPropertyAction$run();
-  virtual ::gnu::java::security::action::GetPropertyAction * setParameters(::java::lang::String *);
-  virtual ::gnu::java::security::action::GetPropertyAction * setParameters(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_action_GetPropertyAction__
diff --git a/libjava/gnu/java/security/action/GetSecurityPropertyAction.h b/libjava/gnu/java/security/action/GetSecurityPropertyAction.h
deleted file mode 100644
index b10ee5d..0000000
--- a/libjava/gnu/java/security/action/GetSecurityPropertyAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_action_GetSecurityPropertyAction__
-#define __gnu_java_security_action_GetSecurityPropertyAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace action
-        {
-            class GetSecurityPropertyAction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::action::GetSecurityPropertyAction : public ::java::lang::Object
-{
-
-public:
-  GetSecurityPropertyAction();
-  GetSecurityPropertyAction(::java::lang::String *);
-  GetSecurityPropertyAction(::java::lang::String *, ::java::lang::String *);
-  virtual ::gnu::java::security::action::GetSecurityPropertyAction * setParameters(::java::lang::String *);
-  virtual ::gnu::java::security::action::GetSecurityPropertyAction * setParameters(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * GetSecurityPropertyAction$run();
-  virtual ::java::lang::Object * run();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_action_GetSecurityPropertyAction__
diff --git a/libjava/gnu/java/security/action/SetAccessibleAction.h b/libjava/gnu/java/security/action/SetAccessibleAction.h
deleted file mode 100644
index 312a616..0000000
--- a/libjava/gnu/java/security/action/SetAccessibleAction.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_action_SetAccessibleAction__
-#define __gnu_java_security_action_SetAccessibleAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace action
-        {
-            class SetAccessibleAction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::action::SetAccessibleAction : public ::java::lang::Object
-{
-
-public:
-  SetAccessibleAction();
-  SetAccessibleAction(::java::lang::reflect::AccessibleObject *);
-  virtual ::java::lang::Object * run();
-  virtual ::gnu::java::security::action::SetAccessibleAction * setMember(::java::lang::reflect::AccessibleObject *);
-public: // actually package-private
-  ::java::lang::reflect::AccessibleObject * __attribute__((aligned(__alignof__( ::java::lang::Object)))) member;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_action_SetAccessibleAction__
diff --git a/libjava/gnu/java/security/ber/BER.h b/libjava/gnu/java/security/ber/BER.h
deleted file mode 100644
index ab1a66c..0000000
--- a/libjava/gnu/java/security/ber/BER.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_ber_BER__
-#define __gnu_java_security_ber_BER__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace ber
-        {
-            class BER;
-            class BERValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::ber::BER : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::java::security::ber::BERValue * END_OF_SEQUENCE;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_ber_BER__
diff --git a/libjava/gnu/java/security/ber/BEREncodingException.h b/libjava/gnu/java/security/ber/BEREncodingException.h
deleted file mode 100644
index 8eae41e..0000000
--- a/libjava/gnu/java/security/ber/BEREncodingException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_ber_BEREncodingException__
-#define __gnu_java_security_ber_BEREncodingException__
-
-#pragma interface
-
-#include <gnu/java/security/der/DEREncodingException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace ber
-        {
-            class BEREncodingException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::ber::BEREncodingException : public ::gnu::java::security::der::DEREncodingException
-{
-
-public:
-  BEREncodingException();
-  BEREncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_ber_BEREncodingException__
diff --git a/libjava/gnu/java/security/ber/BERReader.h b/libjava/gnu/java/security/ber/BERReader.h
deleted file mode 100644
index 06c0242..0000000
--- a/libjava/gnu/java/security/ber/BERReader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_ber_BERReader__
-#define __gnu_java_security_ber_BERReader__
-
-#pragma interface
-
-#include <gnu/java/security/der/DERReader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace ber
-        {
-            class BERReader;
-        }
-        namespace der
-        {
-            class DERValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::ber::BERReader : public ::gnu::java::security::der::DERReader
-{
-
-public:
-  BERReader(JArray< jbyte > *);
-  BERReader(JArray< jbyte > *, jint, jint);
-  BERReader(::java::io::InputStream *);
-  virtual ::gnu::java::security::der::DERValue * read();
-  virtual jint peek();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_ber_BERReader__
diff --git a/libjava/gnu/java/security/ber/BERValue.h b/libjava/gnu/java/security/ber/BERValue.h
deleted file mode 100644
index 34c3e7a..0000000
--- a/libjava/gnu/java/security/ber/BERValue.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_ber_BERValue__
-#define __gnu_java_security_ber_BERValue__
-
-#pragma interface
-
-#include <gnu/java/security/der/DERValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace ber
-        {
-            class BERValue;
-        }
-        namespace der
-        {
-            class DERValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::ber::BERValue : public ::gnu::java::security::der::DERValue
-{
-
-public:
-  BERValue(jint, ::java::lang::Object *, JArray< jbyte > *);
-  BERValue(jint, jint, ::java::lang::Object *, JArray< jbyte > *);
-  BERValue(jint, ::java::lang::Object *);
-  static jboolean isIndefinite(::gnu::java::security::der::DERValue *);
-  virtual jboolean getIndefinite();
-  virtual jint getLength();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::security::der::DERValue)))) indefinite;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_ber_BERValue__
diff --git a/libjava/gnu/java/security/der/BitString.h b/libjava/gnu/java/security/der/BitString.h
deleted file mode 100644
index 1bc7cbd..0000000
--- a/libjava/gnu/java/security/der/BitString.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_BitString__
-#define __gnu_java_security_der_BitString__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class BitString;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::der::BitString : public ::java::lang::Object
-{
-
-public:
-  BitString(JArray< jbyte > *, jint, jboolean);
-  BitString(JArray< jbyte > *, jint, jint, jint, jboolean);
-  BitString(JArray< jbyte > *, jint, jint, jint);
-  BitString(JArray< jbyte > *, jint);
-  BitString(JArray< jbyte > *, jint, jint);
-  BitString(JArray< jbyte > *);
-  virtual JArray< jbyte > * toByteArray();
-  virtual JArray< jbyte > * getShiftedByteArray();
-  virtual jint getIgnoredBits();
-  virtual jint size();
-  virtual JArray< jboolean > * toBooleanArray();
-  virtual ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bytes;
-  JArray< jbyte > * externBytes;
-  jint ignoredBits;
-  JArray< jboolean > * boolVal;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_der_BitString__
diff --git a/libjava/gnu/java/security/der/DER.h b/libjava/gnu/java/security/der/DER.h
deleted file mode 100644
index 1b59badb..0000000
--- a/libjava/gnu/java/security/der/DER.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_DER__
-#define __gnu_java_security_der_DER__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class DER;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::der::DER : public ::java::lang::Object
-{
-
-public:
-  static const jint UNIVERSAL = 0;
-  static const jint APPLICATION = 64;
-  static const jint CONTEXT = 128;
-  static const jint PRIVATE = 192;
-  static const jint CONSTRUCTED = 32;
-  static const jint ANY = 0;
-  static const jint BOOLEAN = 1;
-  static const jint INTEGER = 2;
-  static const jint BIT_STRING = 3;
-  static const jint OCTET_STRING = 4;
-  static const jint NULL = 5;
-  static const jint OBJECT_IDENTIFIER = 6;
-  static const jint REAL = 9;
-  static const jint ENUMERATED = 10;
-  static const jint RELATIVE_OID = 13;
-  static const jint SEQUENCE = 16;
-  static const jint SET = 17;
-  static ::java::lang::Object * CONSTRUCTED_VALUE;
-  static const jint NUMERIC_STRING = 18;
-  static const jint PRINTABLE_STRING = 19;
-  static const jint T61_STRING = 20;
-  static const jint VIDEOTEX_STRING = 21;
-  static const jint IA5_STRING = 22;
-  static const jint GRAPHIC_STRING = 25;
-  static const jint ISO646_STRING = 26;
-  static const jint GENERAL_STRING = 27;
-  static const jint UTF8_STRING = 12;
-  static const jint UNIVERSAL_STRING = 28;
-  static const jint BMP_STRING = 30;
-  static const jint UTC_TIME = 23;
-  static const jint GENERALIZED_TIME = 24;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_der_DER__
diff --git a/libjava/gnu/java/security/der/DEREncodingException.h b/libjava/gnu/java/security/der/DEREncodingException.h
deleted file mode 100644
index dc417bf..0000000
--- a/libjava/gnu/java/security/der/DEREncodingException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_DEREncodingException__
-#define __gnu_java_security_der_DEREncodingException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class DEREncodingException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::der::DEREncodingException : public ::java::io::IOException
-{
-
-public:
-  DEREncodingException();
-  DEREncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_der_DEREncodingException__
diff --git a/libjava/gnu/java/security/der/DERReader.h b/libjava/gnu/java/security/der/DERReader.h
deleted file mode 100644
index 7e59f85..0000000
--- a/libjava/gnu/java/security/der/DERReader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_DERReader__
-#define __gnu_java_security_der_DERReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class DERReader;
-            class DERValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::der::DERReader : public ::java::lang::Object
-{
-
-public:
-  DERReader(JArray< jbyte > *);
-  DERReader(JArray< jbyte > *, jint, jint);
-  DERReader(::java::io::InputStream *);
-  static ::gnu::java::security::der::DERValue * read(JArray< jbyte > *);
-  virtual void skip(jint);
-  virtual ::gnu::java::security::der::DERValue * read();
-public: // actually protected
-  virtual jint readLength();
-private:
-  ::java::lang::Object * readUniversal(jint, jint);
-  static ::java::lang::String * makeString(jint, JArray< jbyte > *);
-  static ::java::lang::String * fromIso88591(JArray< jbyte > *);
-  static ::java::lang::String * fromUtf16Be(JArray< jbyte > *);
-  static ::java::lang::String * fromUtf8(JArray< jbyte > *);
-  ::java::util::Date * makeTime(jint, JArray< jbyte > *);
-public: // actually protected
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::java::io::ByteArrayOutputStream * encBuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_der_DERReader__
diff --git a/libjava/gnu/java/security/der/DERValue.h b/libjava/gnu/java/security/der/DERValue.h
deleted file mode 100644
index a957254..0000000
--- a/libjava/gnu/java/security/der/DERValue.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_DERValue__
-#define __gnu_java_security_der_DERValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class DERValue;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::der::DERValue : public ::java::lang::Object
-{
-
-public:
-  DERValue(jint, jint, ::java::lang::Object *, JArray< jbyte > *);
-  DERValue(jint, ::java::lang::Object *);
-  virtual jint getExternalTag();
-  virtual jint getTag();
-  virtual jint getTagClass();
-  virtual jboolean isConstructed();
-  virtual jint getLength();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * getValueAs(jint);
-  virtual JArray< jbyte > * getEncoded();
-  virtual jint getEncodedLength();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) tagClass;
-  jboolean constructed;
-  jint tag;
-  jint length;
-  ::java::lang::Object * value;
-  JArray< jbyte > * encoded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_der_DERValue__
diff --git a/libjava/gnu/java/security/der/DERWriter.h b/libjava/gnu/java/security/der/DERWriter.h
deleted file mode 100644
index a7ea52c..0000000
--- a/libjava/gnu/java/security/der/DERWriter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_der_DERWriter__
-#define __gnu_java_security_der_DERWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class BitString;
-            class DERValue;
-            class DERWriter;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::der::DERWriter : public ::java::lang::Object
-{
-
-  DERWriter();
-public:
-  static jint write(::java::io::OutputStream *, ::gnu::java::security::der::DERValue *);
-  static jint definiteEncodingSize(jint);
-private:
-  static jint writeBoolean(::java::io::OutputStream *, ::java::lang::Boolean *);
-  static jint writeInteger(::java::io::OutputStream *, ::java::math::BigInteger *);
-  static jint writeSequence(::java::io::OutputStream *, ::java::util::List *);
-  static jint writeSet(::java::io::OutputStream *, ::java::util::Set *);
-  static jint writeOID(::java::io::OutputStream *, ::gnu::java::security::OID *);
-  static jint writeBitString(::java::io::OutputStream *, ::gnu::java::security::der::BitString *);
-  static jint writeString(::java::io::OutputStream *, jint, ::java::lang::String *);
-  static JArray< jbyte > * toIso88591(::java::lang::String *);
-  static JArray< jbyte > * toUtf16Be(::java::lang::String *);
-  static JArray< jbyte > * toUtf8(::java::lang::String *);
-  static jint writeDate(::java::io::OutputStream *, jint, ::java::util::Date *);
-public: // actually package-private
-  static void writeLength(::java::io::OutputStream *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_der_DERWriter__
diff --git a/libjava/gnu/java/security/hash/BaseHash.h b/libjava/gnu/java/security/hash/BaseHash.h
deleted file mode 100644
index f2ec075..0000000
--- a/libjava/gnu/java/security/hash/BaseHash.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_BaseHash__
-#define __gnu_java_security_hash_BaseHash__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class BaseHash;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::BaseHash : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseHash(::java::lang::String *, jint, jint);
-public:
-  virtual ::java::lang::String * name();
-  virtual jint hashSize();
-  virtual jint blockSize();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean selfTest() = 0;
-public: // actually protected
-  virtual JArray< jbyte > * padBuffer() = 0;
-  virtual JArray< jbyte > * getResult() = 0;
-  virtual void resetContext() = 0;
-  virtual void transform(JArray< jbyte > *, jint) = 0;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jint hashSize__;
-  jint blockSize__;
-  jlong count;
-  JArray< jbyte > * buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_BaseHash__
diff --git a/libjava/gnu/java/security/hash/HashFactory.h b/libjava/gnu/java/security/hash/HashFactory.h
deleted file mode 100644
index 265d03a..0000000
--- a/libjava/gnu/java/security/hash/HashFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_HashFactory__
-#define __gnu_java_security_hash_HashFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class HashFactory;
-            class IMessageDigest;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::HashFactory : public ::java::lang::Object
-{
-
-  HashFactory();
-public:
-  static ::gnu::java::security::hash::IMessageDigest * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_HashFactory__
diff --git a/libjava/gnu/java/security/hash/Haval.h b/libjava/gnu/java/security/hash/Haval.h
deleted file mode 100644
index 648a293..0000000
--- a/libjava/gnu/java/security/hash/Haval.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Haval__
-#define __gnu_java_security_hash_Haval__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Haval;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Haval : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Haval();
-  Haval(jint);
-  Haval(jint, jint);
-private:
-  Haval(::gnu::java::security::hash::Haval *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  void tailorDigestBits();
-  jint FF1(jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  jint FF2(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  jint FF3(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  jint FF4(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  jint FF5(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  jint f1(jint, jint, jint, jint, jint, jint, jint);
-  jint f2(jint, jint, jint, jint, jint, jint, jint);
-  jint f3(jint, jint, jint, jint, jint, jint, jint);
-  jint f4(jint, jint, jint, jint, jint, jint, jint);
-  jint f5(jint, jint, jint, jint, jint, jint, jint);
-public:
-  static const jint HAVAL_VERSION = 1;
-  static const jint HAVAL_128_BIT = 16;
-  static const jint HAVAL_160_BIT = 20;
-  static const jint HAVAL_192_BIT = 24;
-  static const jint HAVAL_224_BIT = 28;
-  static const jint HAVAL_256_BIT = 32;
-  static const jint HAVAL_3_ROUND = 3;
-  static const jint HAVAL_4_ROUND = 4;
-  static const jint HAVAL_5_ROUND = 5;
-private:
-  static const jint BLOCK_SIZE = 128;
-  static ::java::lang::String * DIGEST0;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) rounds;
-  jint h0;
-  jint h1;
-  jint h2;
-  jint h3;
-  jint h4;
-  jint h5;
-  jint h6;
-  jint h7;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Haval__
diff --git a/libjava/gnu/java/security/hash/IMessageDigest.h b/libjava/gnu/java/security/hash/IMessageDigest.h
deleted file mode 100644
index 044a202..0000000
--- a/libjava/gnu/java/security/hash/IMessageDigest.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_IMessageDigest__
-#define __gnu_java_security_hash_IMessageDigest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::IMessageDigest : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual jint hashSize() = 0;
-  virtual jint blockSize() = 0;
-  virtual void update(jbyte) = 0;
-  virtual void update(JArray< jbyte > *) = 0;
-  virtual void update(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * digest() = 0;
-  virtual void reset() = 0;
-  virtual jboolean selfTest() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_hash_IMessageDigest__
diff --git a/libjava/gnu/java/security/hash/MD2.h b/libjava/gnu/java/security/hash/MD2.h
deleted file mode 100644
index f8a735a..0000000
--- a/libjava/gnu/java/security/hash/MD2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_MD2__
-#define __gnu_java_security_hash_MD2__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class MD2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::MD2 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  MD2();
-private:
-  MD2(::gnu::java::security::hash::MD2 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-public: // actually protected
-  virtual JArray< jbyte > * padBuffer();
-  virtual void transform(JArray< jbyte > *, jint);
-private:
-  void encryptBlock(JArray< jbyte > *, jint);
-  void updateCheckSumAndEncryptBlock(JArray< jbyte > *, jint);
-  static const jint DIGEST_LENGTH = 16;
-  static const jint BLOCK_LENGTH = 16;
-  static JArray< jbyte > * PI;
-  static ::java::lang::String * DIGEST0;
-  static ::java::lang::Boolean * valid;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) checksum;
-  JArray< jbyte > * work;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_MD2__
diff --git a/libjava/gnu/java/security/hash/MD4.h b/libjava/gnu/java/security/hash/MD4.h
deleted file mode 100644
index 64ea592..0000000
--- a/libjava/gnu/java/security/hash/MD4.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_MD4__
-#define __gnu_java_security_hash_MD4__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class MD4;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::MD4 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  MD4();
-private:
-  MD4(::gnu::java::security::hash::MD4 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-public: // actually protected
-  virtual JArray< jbyte > * padBuffer();
-  virtual void transform(JArray< jbyte > *, jint);
-private:
-  static const jint DIGEST_LENGTH = 16;
-  static const jint BLOCK_LENGTH = 64;
-  static const jint A = 1732584193;
-  static const jint B = -271733879;
-  static const jint C = -1732584194;
-  static const jint D = 271733878;
-  static ::java::lang::String * DIGEST0;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) a;
-  jint b;
-  jint c;
-  jint d;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_MD4__
diff --git a/libjava/gnu/java/security/hash/MD5.h b/libjava/gnu/java/security/hash/MD5.h
deleted file mode 100644
index 8f6376e..0000000
--- a/libjava/gnu/java/security/hash/MD5.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_MD5__
-#define __gnu_java_security_hash_MD5__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class MD5;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::MD5 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  MD5();
-private:
-  MD5(::gnu::java::security::hash::MD5 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jint h1;
-  jint h2;
-  jint h3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_MD5__
diff --git a/libjava/gnu/java/security/hash/RipeMD128.h b/libjava/gnu/java/security/hash/RipeMD128.h
deleted file mode 100644
index e2d3274..0000000
--- a/libjava/gnu/java/security/hash/RipeMD128.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_RipeMD128__
-#define __gnu_java_security_hash_RipeMD128__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class RipeMD128;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::RipeMD128 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  RipeMD128();
-private:
-  RipeMD128(::gnu::java::security::hash::RipeMD128 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jint > * R;
-  static JArray< jint > * Rp;
-  static JArray< jint > * S;
-  static JArray< jint > * Sp;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jint h1;
-  jint h2;
-  jint h3;
-  JArray< jint > * X;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_RipeMD128__
diff --git a/libjava/gnu/java/security/hash/RipeMD160.h b/libjava/gnu/java/security/hash/RipeMD160.h
deleted file mode 100644
index f24e3fb..0000000
--- a/libjava/gnu/java/security/hash/RipeMD160.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_RipeMD160__
-#define __gnu_java_security_hash_RipeMD160__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class RipeMD160;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::RipeMD160 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  RipeMD160();
-private:
-  RipeMD160(::gnu::java::security::hash::RipeMD160 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jint > * R;
-  static JArray< jint > * Rp;
-  static JArray< jint > * S;
-  static JArray< jint > * Sp;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jint h1;
-  jint h2;
-  jint h3;
-  jint h4;
-  JArray< jint > * X;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_RipeMD160__
diff --git a/libjava/gnu/java/security/hash/Sha160.h b/libjava/gnu/java/security/hash/Sha160.h
deleted file mode 100644
index 96f261d..0000000
--- a/libjava/gnu/java/security/hash/Sha160.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Sha160__
-#define __gnu_java_security_hash_Sha160__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha160;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Sha160 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Sha160();
-private:
-  Sha160(::gnu::java::security::hash::Sha160 *);
-public:
-  static JArray< jint > * G(jint, jint, jint, jint, jint, JArray< jbyte > *, jint);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static JArray< jint > * sha(jint, jint, jint, jint, jint, JArray< jbyte > *, jint);
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jint > * w;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jint h1;
-  jint h2;
-  jint h3;
-  jint h4;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Sha160__
diff --git a/libjava/gnu/java/security/hash/Sha256.h b/libjava/gnu/java/security/hash/Sha256.h
deleted file mode 100644
index 628a43a..0000000
--- a/libjava/gnu/java/security/hash/Sha256.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Sha256__
-#define __gnu_java_security_hash_Sha256__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha256;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Sha256 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Sha256();
-private:
-  Sha256(::gnu::java::security::hash::Sha256 *);
-public:
-  static JArray< jint > * G(jint, jint, jint, jint, jint, jint, jint, jint, JArray< jbyte > *, jint);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static JArray< jint > * sha(jint, jint, jint, jint, jint, jint, jint, jint, JArray< jbyte > *, jint);
-  static JArray< jint > * k;
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jint > * w;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jint h1;
-  jint h2;
-  jint h3;
-  jint h4;
-  jint h5;
-  jint h6;
-  jint h7;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Sha256__
diff --git a/libjava/gnu/java/security/hash/Sha384.h b/libjava/gnu/java/security/hash/Sha384.h
deleted file mode 100644
index 503da66..0000000
--- a/libjava/gnu/java/security/hash/Sha384.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Sha384__
-#define __gnu_java_security_hash_Sha384__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha384;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Sha384 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Sha384();
-private:
-  Sha384(::gnu::java::security::hash::Sha384 *);
-public:
-  static JArray< jlong > * G(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong, JArray< jbyte > *, jint);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static JArray< jlong > * sha(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong, JArray< jbyte > *, jint);
-  static JArray< jlong > * k;
-  static const jint BLOCK_SIZE = 128;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jlong > * w;
-  static ::java::lang::Boolean * valid;
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jlong h1;
-  jlong h2;
-  jlong h3;
-  jlong h4;
-  jlong h5;
-  jlong h6;
-  jlong h7;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Sha384__
diff --git a/libjava/gnu/java/security/hash/Sha512.h b/libjava/gnu/java/security/hash/Sha512.h
deleted file mode 100644
index 764ed78..0000000
--- a/libjava/gnu/java/security/hash/Sha512.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Sha512__
-#define __gnu_java_security_hash_Sha512__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha512;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Sha512 : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Sha512();
-private:
-  Sha512(::gnu::java::security::hash::Sha512 *);
-public:
-  static JArray< jlong > * G(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong, JArray< jbyte > *, jint);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void transform(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-public:
-  virtual jboolean selfTest();
-private:
-  static JArray< jlong > * sha(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong, JArray< jbyte > *, jint);
-  static JArray< jlong > * k;
-  static const jint BLOCK_SIZE = 128;
-  static ::java::lang::String * DIGEST0;
-  static JArray< jlong > * w;
-  static ::java::lang::Boolean * valid;
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) h0;
-  jlong h1;
-  jlong h2;
-  jlong h3;
-  jlong h4;
-  jlong h5;
-  jlong h6;
-  jlong h7;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Sha512__
diff --git a/libjava/gnu/java/security/hash/Tiger.h b/libjava/gnu/java/security/hash/Tiger.h
deleted file mode 100644
index 93136ce..0000000
--- a/libjava/gnu/java/security/hash/Tiger.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Tiger__
-#define __gnu_java_security_hash_Tiger__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Tiger;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Tiger : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Tiger();
-private:
-  Tiger(::gnu::java::security::hash::Tiger *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jboolean selfTest();
-public: // actually protected
-  virtual JArray< jbyte > * padBuffer();
-  virtual JArray< jbyte > * getResult();
-  virtual void resetContext();
-  virtual void transform(JArray< jbyte > *, jint);
-private:
-  static const jint HASH_SIZE = 24;
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static const jlong A = 81985529216486895LL;
-  static const jlong B = -81985529216486896LL;
-  static const jlong C = -1110518062304271993LL;
-  static JArray< jlong > * T1;
-  static JArray< jlong > * T2;
-  static JArray< jlong > * T3;
-  static JArray< jlong > * T4;
-  static ::java::lang::Boolean * valid;
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) a;
-  jlong b;
-  jlong c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Tiger__
diff --git a/libjava/gnu/java/security/hash/Whirlpool.h b/libjava/gnu/java/security/hash/Whirlpool.h
deleted file mode 100644
index 436ff6b..0000000
--- a/libjava/gnu/java/security/hash/Whirlpool.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_hash_Whirlpool__
-#define __gnu_java_security_hash_Whirlpool__
-
-#pragma interface
-
-#include <gnu/java/security/hash/BaseHash.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Whirlpool;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::hash::Whirlpool : public ::gnu::java::security::hash::BaseHash
-{
-
-public:
-  Whirlpool();
-private:
-  Whirlpool(::gnu::java::security::hash::Whirlpool *);
-public:
-  ::java::lang::Object * clone();
-public: // actually protected
-  void transform(JArray< jbyte > *, jint);
-  JArray< jbyte > * padBuffer();
-  JArray< jbyte > * getResult();
-  void resetContext();
-public:
-  jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  static const jint BLOCK_SIZE = 64;
-  static ::java::lang::String * DIGEST0;
-  static const jint R = 10;
-  static ::java::lang::String * S_box;
-  static JArray< jlong > * T0;
-  static JArray< jlong > * T1;
-  static JArray< jlong > * T2;
-  static JArray< jlong > * T3;
-  static JArray< jlong > * T4;
-  static JArray< jlong > * T5;
-  static JArray< jlong > * T6;
-  static JArray< jlong > * T7;
-  static JArray< jlong > * rc;
-  static ::java::lang::Boolean * valid;
-  jlong __attribute__((aligned(__alignof__( ::gnu::java::security::hash::BaseHash)))) H0;
-  jlong H1;
-  jlong H2;
-  jlong H3;
-  jlong H4;
-  jlong H5;
-  jlong H6;
-  jlong H7;
-  jlong k00;
-  jlong k01;
-  jlong k02;
-  jlong k03;
-  jlong k04;
-  jlong k05;
-  jlong k06;
-  jlong k07;
-  jlong Kr0;
-  jlong Kr1;
-  jlong Kr2;
-  jlong Kr3;
-  jlong Kr4;
-  jlong Kr5;
-  jlong Kr6;
-  jlong Kr7;
-  jlong n0;
-  jlong n1;
-  jlong n2;
-  jlong n3;
-  jlong n4;
-  jlong n5;
-  jlong n6;
-  jlong n7;
-  jlong nn0;
-  jlong nn1;
-  jlong nn2;
-  jlong nn3;
-  jlong nn4;
-  jlong nn5;
-  jlong nn6;
-  jlong nn7;
-  jlong w0;
-  jlong w1;
-  jlong w2;
-  jlong w3;
-  jlong w4;
-  jlong w5;
-  jlong w6;
-  jlong w7;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_hash_Whirlpool__
diff --git a/libjava/gnu/java/security/jce/hash/HavalSpi.h b/libjava/gnu/java/security/jce/hash/HavalSpi.h
deleted file mode 100644
index 71d304a..0000000
--- a/libjava/gnu/java/security/jce/hash/HavalSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_HavalSpi__
-#define __gnu_java_security_jce_hash_HavalSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class HavalSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::HavalSpi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  HavalSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_HavalSpi__
diff --git a/libjava/gnu/java/security/jce/hash/MD2Spi.h b/libjava/gnu/java/security/jce/hash/MD2Spi.h
deleted file mode 100644
index 88aeccd..0000000
--- a/libjava/gnu/java/security/jce/hash/MD2Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_MD2Spi__
-#define __gnu_java_security_jce_hash_MD2Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class MD2Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::MD2Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  MD2Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_MD2Spi__
diff --git a/libjava/gnu/java/security/jce/hash/MD4Spi.h b/libjava/gnu/java/security/jce/hash/MD4Spi.h
deleted file mode 100644
index 0bc60f7..0000000
--- a/libjava/gnu/java/security/jce/hash/MD4Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_MD4Spi__
-#define __gnu_java_security_jce_hash_MD4Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class MD4Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::MD4Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  MD4Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_MD4Spi__
diff --git a/libjava/gnu/java/security/jce/hash/MD5Spi.h b/libjava/gnu/java/security/jce/hash/MD5Spi.h
deleted file mode 100644
index 06e97fc..0000000
--- a/libjava/gnu/java/security/jce/hash/MD5Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_MD5Spi__
-#define __gnu_java_security_jce_hash_MD5Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class MD5Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::MD5Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  MD5Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_MD5Spi__
diff --git a/libjava/gnu/java/security/jce/hash/MessageDigestAdapter.h b/libjava/gnu/java/security/jce/hash/MessageDigestAdapter.h
deleted file mode 100644
index f12d4ca..0000000
--- a/libjava/gnu/java/security/jce/hash/MessageDigestAdapter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_MessageDigestAdapter__
-#define __gnu_java_security_jce_hash_MessageDigestAdapter__
-
-#pragma interface
-
-#include <java/security/MessageDigestSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace jce
-        {
-          namespace hash
-          {
-              class MessageDigestAdapter;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::MessageDigestAdapter : public ::java::security::MessageDigestSpi
-{
-
-public: // actually protected
-  MessageDigestAdapter(::java::lang::String *);
-private:
-  MessageDigestAdapter(::gnu::java::security::hash::IMessageDigest *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jint engineGetDigestLength();
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineDigest();
-  virtual jint engineDigest(JArray< jbyte > *, jint, jint);
-  virtual void engineReset();
-private:
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::security::MessageDigestSpi)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_MessageDigestAdapter__
diff --git a/libjava/gnu/java/security/jce/hash/RipeMD128Spi.h b/libjava/gnu/java/security/jce/hash/RipeMD128Spi.h
deleted file mode 100644
index 35f1979..0000000
--- a/libjava/gnu/java/security/jce/hash/RipeMD128Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_RipeMD128Spi__
-#define __gnu_java_security_jce_hash_RipeMD128Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class RipeMD128Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::RipeMD128Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  RipeMD128Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_RipeMD128Spi__
diff --git a/libjava/gnu/java/security/jce/hash/RipeMD160Spi.h b/libjava/gnu/java/security/jce/hash/RipeMD160Spi.h
deleted file mode 100644
index 79f5e49..0000000
--- a/libjava/gnu/java/security/jce/hash/RipeMD160Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_RipeMD160Spi__
-#define __gnu_java_security_jce_hash_RipeMD160Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class RipeMD160Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::RipeMD160Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  RipeMD160Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_RipeMD160Spi__
diff --git a/libjava/gnu/java/security/jce/hash/Sha160Spi.h b/libjava/gnu/java/security/jce/hash/Sha160Spi.h
deleted file mode 100644
index d4fc392..0000000
--- a/libjava/gnu/java/security/jce/hash/Sha160Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_Sha160Spi__
-#define __gnu_java_security_jce_hash_Sha160Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class Sha160Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::Sha160Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  Sha160Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_Sha160Spi__
diff --git a/libjava/gnu/java/security/jce/hash/Sha256Spi.h b/libjava/gnu/java/security/jce/hash/Sha256Spi.h
deleted file mode 100644
index 206ff82..0000000
--- a/libjava/gnu/java/security/jce/hash/Sha256Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_Sha256Spi__
-#define __gnu_java_security_jce_hash_Sha256Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class Sha256Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::Sha256Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  Sha256Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_Sha256Spi__
diff --git a/libjava/gnu/java/security/jce/hash/Sha384Spi.h b/libjava/gnu/java/security/jce/hash/Sha384Spi.h
deleted file mode 100644
index 2270ffe..0000000
--- a/libjava/gnu/java/security/jce/hash/Sha384Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_Sha384Spi__
-#define __gnu_java_security_jce_hash_Sha384Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class Sha384Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::Sha384Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  Sha384Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_Sha384Spi__
diff --git a/libjava/gnu/java/security/jce/hash/Sha512Spi.h b/libjava/gnu/java/security/jce/hash/Sha512Spi.h
deleted file mode 100644
index f193304..0000000
--- a/libjava/gnu/java/security/jce/hash/Sha512Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_Sha512Spi__
-#define __gnu_java_security_jce_hash_Sha512Spi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class Sha512Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::Sha512Spi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  Sha512Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_Sha512Spi__
diff --git a/libjava/gnu/java/security/jce/hash/TigerSpi.h b/libjava/gnu/java/security/jce/hash/TigerSpi.h
deleted file mode 100644
index 42897e8..0000000
--- a/libjava/gnu/java/security/jce/hash/TigerSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_TigerSpi__
-#define __gnu_java_security_jce_hash_TigerSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class TigerSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::TigerSpi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  TigerSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_TigerSpi__
diff --git a/libjava/gnu/java/security/jce/hash/WhirlpoolSpi.h b/libjava/gnu/java/security/jce/hash/WhirlpoolSpi.h
deleted file mode 100644
index a8d883e..0000000
--- a/libjava/gnu/java/security/jce/hash/WhirlpoolSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_hash_WhirlpoolSpi__
-#define __gnu_java_security_jce_hash_WhirlpoolSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/hash/MessageDigestAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace hash
-          {
-              class WhirlpoolSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::hash::WhirlpoolSpi : public ::gnu::java::security::jce::hash::MessageDigestAdapter
-{
-
-public:
-  WhirlpoolSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_hash_WhirlpoolSpi__
diff --git a/libjava/gnu/java/security/jce/prng/HavalRandomSpi.h b/libjava/gnu/java/security/jce/prng/HavalRandomSpi.h
deleted file mode 100644
index 727d444..0000000
--- a/libjava/gnu/java/security/jce/prng/HavalRandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_HavalRandomSpi__
-#define __gnu_java_security_jce_prng_HavalRandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class HavalRandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::HavalRandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  HavalRandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_HavalRandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/MD2RandomSpi.h b/libjava/gnu/java/security/jce/prng/MD2RandomSpi.h
deleted file mode 100644
index 053a305..0000000
--- a/libjava/gnu/java/security/jce/prng/MD2RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_MD2RandomSpi__
-#define __gnu_java_security_jce_prng_MD2RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class MD2RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::MD2RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  MD2RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_MD2RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/MD4RandomSpi.h b/libjava/gnu/java/security/jce/prng/MD4RandomSpi.h
deleted file mode 100644
index 0f11deb..0000000
--- a/libjava/gnu/java/security/jce/prng/MD4RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_MD4RandomSpi__
-#define __gnu_java_security_jce_prng_MD4RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class MD4RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::MD4RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  MD4RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_MD4RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/MD5RandomSpi.h b/libjava/gnu/java/security/jce/prng/MD5RandomSpi.h
deleted file mode 100644
index 8e5cc27..0000000
--- a/libjava/gnu/java/security/jce/prng/MD5RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_MD5RandomSpi__
-#define __gnu_java_security_jce_prng_MD5RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class MD5RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::MD5RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  MD5RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_MD5RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/RipeMD128RandomSpi.h b/libjava/gnu/java/security/jce/prng/RipeMD128RandomSpi.h
deleted file mode 100644
index 51afaea..0000000
--- a/libjava/gnu/java/security/jce/prng/RipeMD128RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_RipeMD128RandomSpi__
-#define __gnu_java_security_jce_prng_RipeMD128RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class RipeMD128RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::RipeMD128RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  RipeMD128RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_RipeMD128RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/RipeMD160RandomSpi.h b/libjava/gnu/java/security/jce/prng/RipeMD160RandomSpi.h
deleted file mode 100644
index f590267..0000000
--- a/libjava/gnu/java/security/jce/prng/RipeMD160RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_RipeMD160RandomSpi__
-#define __gnu_java_security_jce_prng_RipeMD160RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class RipeMD160RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::RipeMD160RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  RipeMD160RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_RipeMD160RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/SecureRandomAdapter.h b/libjava/gnu/java/security/jce/prng/SecureRandomAdapter.h
deleted file mode 100644
index 7495038..0000000
--- a/libjava/gnu/java/security/jce/prng/SecureRandomAdapter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_SecureRandomAdapter__
-#define __gnu_java_security_jce_prng_SecureRandomAdapter__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class SecureRandomAdapter;
-          }
-        }
-        namespace prng
-        {
-            class MDGenerator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::SecureRandomAdapter : public ::java::security::SecureRandomSpi
-{
-
-public: // actually protected
-  SecureRandomAdapter(::java::lang::String *);
-public:
-  static JArray< jbyte > * getSeed(jint);
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) isSeeded;
-  ::gnu::java::security::prng::MDGenerator * adaptee;
-  ::java::lang::String * mdName;
-  static ::java::util::logging::Logger * logger;
-  static ::java::lang::String * SECURERANDOM_SOURCE;
-  static ::java::lang::String * JAVA_SECURITY_EGD;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_SecureRandomAdapter__
diff --git a/libjava/gnu/java/security/jce/prng/Sha160RandomSpi.h b/libjava/gnu/java/security/jce/prng/Sha160RandomSpi.h
deleted file mode 100644
index dc896ab..0000000
--- a/libjava/gnu/java/security/jce/prng/Sha160RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_Sha160RandomSpi__
-#define __gnu_java_security_jce_prng_Sha160RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class Sha160RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::Sha160RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  Sha160RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_Sha160RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/Sha256RandomSpi.h b/libjava/gnu/java/security/jce/prng/Sha256RandomSpi.h
deleted file mode 100644
index 73e676c..0000000
--- a/libjava/gnu/java/security/jce/prng/Sha256RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_Sha256RandomSpi__
-#define __gnu_java_security_jce_prng_Sha256RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class Sha256RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::Sha256RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  Sha256RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_Sha256RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/Sha384RandomSpi.h b/libjava/gnu/java/security/jce/prng/Sha384RandomSpi.h
deleted file mode 100644
index 2f76f69..0000000
--- a/libjava/gnu/java/security/jce/prng/Sha384RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_Sha384RandomSpi__
-#define __gnu_java_security_jce_prng_Sha384RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class Sha384RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::Sha384RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  Sha384RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_Sha384RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/Sha512RandomSpi.h b/libjava/gnu/java/security/jce/prng/Sha512RandomSpi.h
deleted file mode 100644
index 0209fec..0000000
--- a/libjava/gnu/java/security/jce/prng/Sha512RandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_Sha512RandomSpi__
-#define __gnu_java_security_jce_prng_Sha512RandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class Sha512RandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::Sha512RandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  Sha512RandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_Sha512RandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/TigerRandomSpi.h b/libjava/gnu/java/security/jce/prng/TigerRandomSpi.h
deleted file mode 100644
index 238685c..0000000
--- a/libjava/gnu/java/security/jce/prng/TigerRandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_TigerRandomSpi__
-#define __gnu_java_security_jce_prng_TigerRandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class TigerRandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::TigerRandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  TigerRandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_TigerRandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/VMSecureRandom.h b/libjava/gnu/java/security/jce/prng/VMSecureRandom.h
deleted file mode 100644
index b24c805..0000000
--- a/libjava/gnu/java/security/jce/prng/VMSecureRandom.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_VMSecureRandom__
-#define __gnu_java_security_jce_prng_VMSecureRandom__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class VMSecureRandom;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::VMSecureRandom : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMSecureRandom();
-  static jint generateSeed(JArray< jbyte > *, jint, jint);
-  static jint natGenerateSeed(JArray< jbyte > *, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_VMSecureRandom__
diff --git a/libjava/gnu/java/security/jce/prng/VMSecureRandom.java b/libjava/gnu/java/security/jce/prng/VMSecureRandom.java
deleted file mode 100644
index 62ff8b7..0000000
--- a/libjava/gnu/java/security/jce/prng/VMSecureRandom.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* VMSecureRandom.java -- random seed generator.
-   Copyright (C) 2006, 2009  Free Software Foundation, Inc.
-
-This file is a part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-GNU Classpath 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-USA
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version.  */
-
-
-package gnu.java.security.jce.prng;
-
-/**
- * VM-specific methods for generating real (or almost real) random
- * seeds. VM implementors should write a version of this class that
- * reads random bytes from some system source.
- */
-final class VMSecureRandom
-{
-
-  /**
-   * <p>
-   * Generate a random seed. Implementations are free to generate
-   * fewer random bytes than are requested, and leave the remaining
-   * bytes of the destination buffer as zeros. Implementations SHOULD,
-   * however, make a best-effort attempt to satisfy the request.
-   * </p>
-   * <p>
-   * The GCJ implementation uses a native method to read bytes from
-   * a system random source (e.g. /dev/random).
-   * </p>
-   *
-   * @param buffer The destination buffer.
-   * @param offset The offset in the buffer to start putting bytes.
-   * @param length The number of random bytes to generate.
-   * @return the number of bytes generated.
-   */
-  static int generateSeed(byte[] buffer, int offset, int length)
-  {
-    if (length < 0)
-      throw new IllegalArgumentException("length must be nonnegative");
-    if (offset < 0 || offset + length > buffer.length)
-      throw new IndexOutOfBoundsException();
-
-    return natGenerateSeed(buffer, offset, length);
-  }
-
-  static native int natGenerateSeed(byte[] buffer, int offset, int length);
- 
-}
\ No newline at end of file
diff --git a/libjava/gnu/java/security/jce/prng/WhirlpoolRandomSpi.h b/libjava/gnu/java/security/jce/prng/WhirlpoolRandomSpi.h
deleted file mode 100644
index 4d31a5e..0000000
--- a/libjava/gnu/java/security/jce/prng/WhirlpoolRandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_prng_WhirlpoolRandomSpi__
-#define __gnu_java_security_jce_prng_WhirlpoolRandomSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/prng/SecureRandomAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class WhirlpoolRandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::prng::WhirlpoolRandomSpi : public ::gnu::java::security::jce::prng::SecureRandomAdapter
-{
-
-public:
-  WhirlpoolRandomSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_prng_WhirlpoolRandomSpi__
diff --git a/libjava/gnu/java/security/jce/prng/natVMSecureRandomPosix.cc b/libjava/gnu/java/security/jce/prng/natVMSecureRandomPosix.cc
deleted file mode 100644
index a44f3f4..0000000
--- a/libjava/gnu/java/security/jce/prng/natVMSecureRandomPosix.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// natVMSecureRandomPosix.cc - Native part of VMSecureRandom class for POSIX.
-
-/* Copyright (C) 2009 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <gcj/cni.h>
-#include <java/lang/InternalError.h>
-#include <gnu/java/security/jce/prng/VMSecureRandom.h>
-
-jint
-gnu::java::security::jce::prng::VMSecureRandom::natGenerateSeed(jbyteArray byte_array, jint offset, jint length)
-{
-  int a, fd;
-  jbyte *bytes = elements (byte_array);
-  ssize_t count;
-
-  for (a = 0; a < offset; ++a)
-    bytes++;
-  fd = open ("/dev/random", O_RDONLY);
-  
-  if (fd == -1)
-    {
-      jstring oserr = JvNewStringLatin1 (strerror (errno));
-      throw new ::java::lang::InternalError 
-	(JvNewStringLatin1 ("Error opening /dev/random: ")->concat(oserr));
-    }
-
-  count = read (fd, bytes, length);
-  close (fd);
-
-  if (count == -1)
-    {
-      jstring oserr = JvNewStringLatin1 (strerror (errno));
-      throw new ::java::lang::InternalError 
-	(JvNewStringLatin1 ("Error reading /dev/random: ")->concat(oserr));
-    }
-
-  return count;
-}
-
diff --git a/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc b/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc
deleted file mode 100755
index 4c7c1f5..0000000
--- a/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// natVMSecureRandomWin32.cc - Native part of VMSecureRandom class for Win32.
-
-/* Copyright (C) 2009, 2010 Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <gcj/cni.h>
-#include <java/lang/InternalError.h>
-#include <java/lang/UnsupportedOperationException.h>
-#include <gnu/java/security/jce/prng/VMSecureRandom.h>
-
-jint
-gnu::java::security::jce::prng::VMSecureRandom::natGenerateSeed(jbyteArray byte_array, jint offset, jint length)
-{
-  if (length != 0)
-    throw new ::java::lang::UnsupportedOperationException (
-      JvNewStringLatin1 ("natGenerateSeed is not available for Win32 target."));
-  return 0;
-}
-
diff --git a/libjava/gnu/java/security/jce/sig/DSSKeyFactory.h b/libjava/gnu/java/security/jce/sig/DSSKeyFactory.h
deleted file mode 100644
index 139ee5d..0000000
--- a/libjava/gnu/java/security/jce/sig/DSSKeyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_DSSKeyFactory__
-#define __gnu_java_security_jce_sig_DSSKeyFactory__
-
-#pragma interface
-
-#include <java/security/KeyFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DSSKeyFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::DSSKeyFactory : public ::java::security::KeyFactorySpi
-{
-
-public:
-  DSSKeyFactory();
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_DSSKeyFactory__
diff --git a/libjava/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.h b/libjava/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.h
deleted file mode 100644
index 38a6a94..0000000
--- a/libjava/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_DSSKeyPairGeneratorSpi__
-#define __gnu_java_security_jce_sig_DSSKeyPairGeneratorSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DSSKeyPairGeneratorSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace interfaces
-      {
-          class DSAParams;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::DSSKeyPairGeneratorSpi : public ::gnu::java::security::jce::sig::KeyPairGeneratorAdapter
-{
-
-public:
-  DSSKeyPairGeneratorSpi();
-  virtual void initialize(jint, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::interfaces::DSAParams *, ::java::security::SecureRandom *);
-  virtual void initialize(jint, jboolean, ::java::security::SecureRandom *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_DSSKeyPairGeneratorSpi__
diff --git a/libjava/gnu/java/security/jce/sig/DSSParameters.h b/libjava/gnu/java/security/jce/sig/DSSParameters.h
deleted file mode 100644
index 6d6f612..0000000
--- a/libjava/gnu/java/security/jce/sig/DSSParameters.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_DSSParameters__
-#define __gnu_java_security_jce_sig_DSSParameters__
-
-#pragma interface
-
-#include <java/security/AlgorithmParametersSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DSSParameters;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::DSSParameters : public ::java::security::AlgorithmParametersSpi
-{
-
-public:
-  DSSParameters();
-public: // actually protected
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineInit(JArray< jbyte > *);
-  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *);
-  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *);
-  virtual JArray< jbyte > * engineGetEncoded();
-  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *);
-  virtual ::java::lang::String * engineToString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::AlgorithmParametersSpi)))) p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_DSSParameters__
diff --git a/libjava/gnu/java/security/jce/sig/DSSParametersGenerator.h b/libjava/gnu/java/security/jce/sig/DSSParametersGenerator.h
deleted file mode 100644
index 2920694..0000000
--- a/libjava/gnu/java/security/jce/sig/DSSParametersGenerator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_DSSParametersGenerator__
-#define __gnu_java_security_jce_sig_DSSParametersGenerator__
-
-#pragma interface
-
-#include <java/security/AlgorithmParameterGeneratorSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DSSParametersGenerator;
-          }
-        }
-        namespace key
-        {
-          namespace dss
-          {
-              class FIPS186;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::DSSParametersGenerator : public ::java::security::AlgorithmParameterGeneratorSpi
-{
-
-public:
-  DSSParametersGenerator();
-public: // actually protected
-  virtual void engineInit(jint, ::java::security::SecureRandom *);
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::AlgorithmParameters * engineGenerateParameters();
-private:
-  static ::java::security::Provider * GNU;
-  jint __attribute__((aligned(__alignof__( ::java::security::AlgorithmParameterGeneratorSpi)))) modulusLength;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::java::security::key::dss::FIPS186 * fips;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_DSSParametersGenerator__
diff --git a/libjava/gnu/java/security/jce/sig/DSSRawSignatureSpi.h b/libjava/gnu/java/security/jce/sig/DSSRawSignatureSpi.h
deleted file mode 100644
index d135b61..0000000
--- a/libjava/gnu/java/security/jce/sig/DSSRawSignatureSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_DSSRawSignatureSpi__
-#define __gnu_java_security_jce_sig_DSSRawSignatureSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DSSRawSignatureSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::DSSRawSignatureSpi : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  DSSRawSignatureSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_DSSRawSignatureSpi__
diff --git a/libjava/gnu/java/security/jce/sig/EncodedKeyFactory.h b/libjava/gnu/java/security/jce/sig/EncodedKeyFactory.h
deleted file mode 100644
index 23dced6..0000000
--- a/libjava/gnu/java/security/jce/sig/EncodedKeyFactory.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_EncodedKeyFactory__
-#define __gnu_java_security_jce_sig_EncodedKeyFactory__
-
-#pragma interface
-
-#include <java/security/KeyFactorySpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class EncodedKeyFactory;
-          }
-        }
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSPublicKey;
-          }
-          namespace rsa
-          {
-              class GnuRSAPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class DSAPrivateKeySpec;
-          class DSAPublicKeySpec;
-          class KeySpec;
-          class RSAPrivateCrtKeySpec;
-          class RSAPublicKeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPrivateKey;
-          class DHPublicKey;
-      }
-      namespace spec
-      {
-          class DHPrivateKeySpec;
-          class DHPublicKeySpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::EncodedKeyFactory : public ::java::security::KeyFactorySpi
-{
-
-public:
-  EncodedKeyFactory();
-private:
-  static ::java::lang::Object * invokeConstructor(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::Class * getConcreteClass(::java::lang::String *);
-  static ::java::lang::reflect::Constructor * getConcreteCtor(::java::lang::Class *);
-  static ::java::lang::Object * invokeValueOf(::java::lang::String *, JArray< jbyte > *);
-  static ::java::lang::reflect::Method * getValueOfMethod(::java::lang::Class *);
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *);
-private:
-  ::gnu::java::security::key::dss::DSSPublicKey * decodeDSSPublicKey(::java::security::spec::DSAPublicKeySpec *);
-  ::gnu::java::security::key::rsa::GnuRSAPublicKey * decodeRSAPublicKey(::java::security::spec::RSAPublicKeySpec *);
-  ::javax::crypto::interfaces::DHPublicKey * decodeDHPublicKey(::javax::crypto::spec::DHPublicKeySpec *);
-  ::javax::crypto::interfaces::DHPublicKey * decodeDHPublicKey(JArray< jbyte > *);
-  ::java::security::PrivateKey * decodeDSSPrivateKey(::java::security::spec::DSAPrivateKeySpec *);
-  ::java::security::PrivateKey * decodeRSAPrivateKey(::java::security::spec::RSAPrivateCrtKeySpec *);
-  ::javax::crypto::interfaces::DHPrivateKey * decodeDHPrivateKey(::javax::crypto::spec::DHPrivateKeySpec *);
-  ::javax::crypto::interfaces::DHPrivateKey * decodeDHPrivateKey(JArray< jbyte > *);
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_EncodedKeyFactory__
diff --git a/libjava/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h b/libjava/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h
deleted file mode 100644
index 9a77784..0000000
--- a/libjava/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_KeyPairGeneratorAdapter__
-#define __gnu_java_security_jce_sig_KeyPairGeneratorAdapter__
-
-#pragma interface
-
-#include <java/security/KeyPairGenerator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class KeyPairGeneratorAdapter;
-          }
-        }
-        namespace key
-        {
-            class IKeyPairGenerator;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::KeyPairGeneratorAdapter : public ::java::security::KeyPairGenerator
-{
-
-public: // actually protected
-  KeyPairGeneratorAdapter(::java::lang::String *);
-public:
-  virtual void initialize(jint, ::java::security::SecureRandom *) = 0;
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual ::java::security::KeyPair * generateKeyPair();
-public: // actually protected
-  ::gnu::java::security::key::IKeyPairGenerator * __attribute__((aligned(__alignof__( ::java::security::KeyPairGenerator)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_KeyPairGeneratorAdapter__
diff --git a/libjava/gnu/java/security/jce/sig/MD2withRSA.h b/libjava/gnu/java/security/jce/sig/MD2withRSA.h
deleted file mode 100644
index 68ae75f..0000000
--- a/libjava/gnu/java/security/jce/sig/MD2withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_MD2withRSA__
-#define __gnu_java_security_jce_sig_MD2withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class MD2withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::MD2withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  MD2withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_MD2withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/MD5withRSA.h b/libjava/gnu/java/security/jce/sig/MD5withRSA.h
deleted file mode 100644
index 919b74f..0000000
--- a/libjava/gnu/java/security/jce/sig/MD5withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_MD5withRSA__
-#define __gnu_java_security_jce_sig_MD5withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class MD5withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::MD5withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  MD5withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_MD5withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/RSAKeyFactory.h b/libjava/gnu/java/security/jce/sig/RSAKeyFactory.h
deleted file mode 100644
index 8c10a0a..0000000
--- a/libjava/gnu/java/security/jce/sig/RSAKeyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_RSAKeyFactory__
-#define __gnu_java_security_jce_sig_RSAKeyFactory__
-
-#pragma interface
-
-#include <java/security/KeyFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class RSAKeyFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::RSAKeyFactory : public ::java::security::KeyFactorySpi
-{
-
-public:
-  RSAKeyFactory();
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_RSAKeyFactory__
diff --git a/libjava/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.h b/libjava/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.h
deleted file mode 100644
index 97f6ace..0000000
--- a/libjava/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_RSAKeyPairGeneratorSpi__
-#define __gnu_java_security_jce_sig_RSAKeyPairGeneratorSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class RSAKeyPairGeneratorSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::RSAKeyPairGeneratorSpi : public ::gnu::java::security::jce::sig::KeyPairGeneratorAdapter
-{
-
-public:
-  RSAKeyPairGeneratorSpi();
-  virtual void initialize(jint, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_RSAKeyPairGeneratorSpi__
diff --git a/libjava/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.h b/libjava/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.h
deleted file mode 100644
index 56ad416..0000000
--- a/libjava/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_RSAPSSRawSignatureSpi__
-#define __gnu_java_security_jce_sig_RSAPSSRawSignatureSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class RSAPSSRawSignatureSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::RSAPSSRawSignatureSpi : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  RSAPSSRawSignatureSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_RSAPSSRawSignatureSpi__
diff --git a/libjava/gnu/java/security/jce/sig/SHA160withDSS.h b/libjava/gnu/java/security/jce/sig/SHA160withDSS.h
deleted file mode 100644
index fc595d4..0000000
--- a/libjava/gnu/java/security/jce/sig/SHA160withDSS.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SHA160withDSS__
-#define __gnu_java_security_jce_sig_SHA160withDSS__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SHA160withDSS;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SHA160withDSS : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  SHA160withDSS();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SHA160withDSS__
diff --git a/libjava/gnu/java/security/jce/sig/SHA160withRSA.h b/libjava/gnu/java/security/jce/sig/SHA160withRSA.h
deleted file mode 100644
index 93a886c..0000000
--- a/libjava/gnu/java/security/jce/sig/SHA160withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SHA160withRSA__
-#define __gnu_java_security_jce_sig_SHA160withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SHA160withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SHA160withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  SHA160withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SHA160withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/SHA256withRSA.h b/libjava/gnu/java/security/jce/sig/SHA256withRSA.h
deleted file mode 100644
index 9b73652..0000000
--- a/libjava/gnu/java/security/jce/sig/SHA256withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SHA256withRSA__
-#define __gnu_java_security_jce_sig_SHA256withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SHA256withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SHA256withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  SHA256withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SHA256withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/SHA384withRSA.h b/libjava/gnu/java/security/jce/sig/SHA384withRSA.h
deleted file mode 100644
index db01a6e..0000000
--- a/libjava/gnu/java/security/jce/sig/SHA384withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SHA384withRSA__
-#define __gnu_java_security_jce_sig_SHA384withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SHA384withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SHA384withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  SHA384withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SHA384withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/SHA512withRSA.h b/libjava/gnu/java/security/jce/sig/SHA512withRSA.h
deleted file mode 100644
index 13ea935..0000000
--- a/libjava/gnu/java/security/jce/sig/SHA512withRSA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SHA512withRSA__
-#define __gnu_java_security_jce_sig_SHA512withRSA__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/SignatureAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SHA512withRSA;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SHA512withRSA : public ::gnu::java::security::jce::sig::SignatureAdapter
-{
-
-public:
-  SHA512withRSA();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SHA512withRSA__
diff --git a/libjava/gnu/java/security/jce/sig/SignatureAdapter.h b/libjava/gnu/java/security/jce/sig/SignatureAdapter.h
deleted file mode 100644
index 68fdd64..0000000
--- a/libjava/gnu/java/security/jce/sig/SignatureAdapter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_jce_sig_SignatureAdapter__
-#define __gnu_java_security_jce_sig_SignatureAdapter__
-
-#pragma interface
-
-#include <java/security/SignatureSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class SignatureAdapter;
-          }
-        }
-        namespace sig
-        {
-            class ISignature;
-            class ISignatureCodec;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::jce::sig::SignatureAdapter : public ::java::security::SignatureSpi
-{
-
-public: // actually protected
-  SignatureAdapter(::java::lang::String *, ::gnu::java::security::sig::ISignatureCodec *);
-private:
-  SignatureAdapter(::gnu::java::security::sig::ISignature *, ::gnu::java::security::sig::ISignatureCodec *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void engineInitVerify(::java::security::PublicKey *);
-  virtual void engineInitSign(::java::security::PrivateKey *);
-  virtual void engineInitSign(::java::security::PrivateKey *, ::java::security::SecureRandom *);
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineSign();
-  virtual jint engineSign(JArray< jbyte > *, jint, jint);
-  virtual jboolean engineVerify(JArray< jbyte > *);
-  virtual void engineSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual void engineSetParameter(::java::security::spec::AlgorithmParameterSpec *);
-  virtual ::java::lang::Object * engineGetParameter(::java::lang::String *);
-private:
-  static ::java::util::logging::Logger * log;
-  ::gnu::java::security::sig::ISignature * __attribute__((aligned(__alignof__( ::java::security::SignatureSpi)))) adaptee;
-  ::gnu::java::security::sig::ISignatureCodec * codec;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_jce_sig_SignatureAdapter__
diff --git a/libjava/gnu/java/security/key/IKeyPairCodec.h b/libjava/gnu/java/security/key/IKeyPairCodec.h
deleted file mode 100644
index 61a4f18..0000000
--- a/libjava/gnu/java/security/key/IKeyPairCodec.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_IKeyPairCodec__
-#define __gnu_java_security_key_IKeyPairCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-            class IKeyPairCodec;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::IKeyPairCodec : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFormatID() = 0;
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *) = 0;
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *) = 0;
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *) = 0;
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *) = 0;
-  static const jint RAW_FORMAT = 1;
-  static const jint X509_FORMAT = 2;
-  static const jint PKCS8_FORMAT = 3;
-  static const jint ASN1_FORMAT = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_key_IKeyPairCodec__
diff --git a/libjava/gnu/java/security/key/IKeyPairGenerator.h b/libjava/gnu/java/security/key/IKeyPairGenerator.h
deleted file mode 100644
index 1ae2a48..0000000
--- a/libjava/gnu/java/security/key/IKeyPairGenerator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_IKeyPairGenerator__
-#define __gnu_java_security_key_IKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-            class IKeyPairGenerator;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::java::security::key::IKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void setup(::java::util::Map *) = 0;
-  virtual ::java::security::KeyPair * generate() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_key_IKeyPairGenerator__
diff --git a/libjava/gnu/java/security/key/KeyPairCodecFactory.h b/libjava/gnu/java/security/key/KeyPairCodecFactory.h
deleted file mode 100644
index e6ac55f..0000000
--- a/libjava/gnu/java/security/key/KeyPairCodecFactory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_KeyPairCodecFactory__
-#define __gnu_java_security_key_KeyPairCodecFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-            class IKeyPairCodec;
-            class KeyPairCodecFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-}
-
-class gnu::java::security::key::KeyPairCodecFactory : public ::java::lang::Object
-{
-
-  KeyPairCodecFactory();
-public:
-  static ::gnu::java::security::key::IKeyPairCodec * getInstance(::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getInstance(::java::lang::String *, jint);
-  static ::gnu::java::security::key::IKeyPairCodec * getInstance(::java::security::Key *);
-  static ::java::util::Set * getNames();
-private:
-  static ::gnu::java::security::key::IKeyPairCodec * makeInstance(::java::lang::String *);
-  static jboolean matches(::java::lang::Object *, ::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getRawCodec(::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getX509Codec(::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getPKCS8Codec(::java::lang::String *);
-  static ::gnu::java::security::key::IKeyPairCodec * getRawCodec(::java::security::Key *);
-  static ::gnu::java::security::key::IKeyPairCodec * getX509Codec(::java::security::Key *);
-  static ::gnu::java::security::key::IKeyPairCodec * getPKCS8Codec(::java::security::Key *);
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_KeyPairCodecFactory__
diff --git a/libjava/gnu/java/security/key/KeyPairGeneratorFactory.h b/libjava/gnu/java/security/key/KeyPairGeneratorFactory.h
deleted file mode 100644
index 4d877a3..0000000
--- a/libjava/gnu/java/security/key/KeyPairGeneratorFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_KeyPairGeneratorFactory__
-#define __gnu_java_security_key_KeyPairGeneratorFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-            class IKeyPairGenerator;
-            class KeyPairGeneratorFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::key::KeyPairGeneratorFactory : public ::java::lang::Object
-{
-
-  KeyPairGeneratorFactory();
-public:
-  static ::gnu::java::security::key::IKeyPairGenerator * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::gnu::java::security::key::IKeyPairGenerator * makeInstance(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_KeyPairGeneratorFactory__
diff --git a/libjava/gnu/java/security/key/dss/DSSKey.h b/libjava/gnu/java/security/key/dss/DSSKey.h
deleted file mode 100644
index de8ebb2..0000000
--- a/libjava/gnu/java/security/key/dss/DSSKey.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSKey__
-#define __gnu_java_security_key_dss_DSSKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSKey : public ::java::lang::Object
-{
-
-public: // actually protected
-  DSSKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::security::interfaces::DSAParams * getParams();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getEncoded(jint) = 0;
-  virtual jboolean hasInheritedParameters();
-public: // actually protected
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-  jint defaultFormat;
-private:
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSKey__
diff --git a/libjava/gnu/java/security/key/dss/DSSKeyPairGenerator.h b/libjava/gnu/java/security/key/dss/DSSKeyPairGenerator.h
deleted file mode 100644
index e78abe0..0000000
--- a/libjava/gnu/java/security/key/dss/DSSKeyPairGenerator.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSKeyPairGenerator__
-#define __gnu_java_security_key_dss_DSSKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSKeyPairGenerator;
-          }
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-      namespace spec
-      {
-          class DSAParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  DSSKeyPairGenerator();
-  virtual ::java::lang::String * name();
-  virtual void setup(::java::util::Map *);
-  virtual ::java::security::KeyPair * generate();
-private:
-  ::java::math::BigInteger * nextX();
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-  static ::java::math::BigInteger * TWO;
-public:
-  static ::java::lang::String * MODULUS_LENGTH;
-  static ::java::lang::String * USE_DEFAULTS;
-  static ::java::lang::String * STRICT_DEFAULTS;
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * DSS_PARAMETERS;
-  static ::java::lang::String * PREFERRED_ENCODING_FORMAT;
-  static const jint DEFAULT_MODULUS_LENGTH = 1024;
-private:
-  static const jint DEFAULT_ENCODING_FORMAT = 1;
-  static JArray< jint > * T_SHS;
-public:
-  static ::java::security::spec::DSAParameterSpec * KEY_PARAMS_512;
-  static ::java::security::spec::DSAParameterSpec * KEY_PARAMS_768;
-  static ::java::security::spec::DSAParameterSpec * KEY_PARAMS_1024;
-private:
-  static ::java::math::BigInteger * TWO_POW_160;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) L;
-  ::java::security::SecureRandom * rnd;
-  ::java::math::BigInteger * seed;
-  ::java::math::BigInteger * counter;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * e;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * XKEY;
-  ::gnu::java::security::util::PRNG * prng;
-  jint preferredFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSKeyPairGenerator__
diff --git a/libjava/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.h b/libjava/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.h
deleted file mode 100644
index 98813dc..0000000
--- a/libjava/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSKeyPairPKCS8Codec__
-#define __gnu_java_security_key_dss_DSSKeyPairPKCS8Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSKeyPairPKCS8Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSKeyPairPKCS8Codec : public ::java::lang::Object
-{
-
-public:
-  DSSKeyPairPKCS8Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::java::util::logging::Logger * log;
-  static ::gnu::java::security::OID * DSA_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSKeyPairPKCS8Codec__
diff --git a/libjava/gnu/java/security/key/dss/DSSKeyPairRawCodec.h b/libjava/gnu/java/security/key/dss/DSSKeyPairRawCodec.h
deleted file mode 100644
index cc22055..0000000
--- a/libjava/gnu/java/security/key/dss/DSSKeyPairRawCodec.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSKeyPairRawCodec__
-#define __gnu_java_security_key_dss_DSSKeyPairRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSKeyPairRawCodec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSKeyPairRawCodec : public ::java::lang::Object
-{
-
-public:
-  DSSKeyPairRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSKeyPairRawCodec__
diff --git a/libjava/gnu/java/security/key/dss/DSSKeyPairX509Codec.h b/libjava/gnu/java/security/key/dss/DSSKeyPairX509Codec.h
deleted file mode 100644
index c56ba1c..0000000
--- a/libjava/gnu/java/security/key/dss/DSSKeyPairX509Codec.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSKeyPairX509Codec__
-#define __gnu_java_security_key_dss_DSSKeyPairX509Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSKeyPairX509Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSKeyPairX509Codec : public ::java::lang::Object
-{
-
-public:
-  DSSKeyPairX509Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::gnu::java::security::OID * DSA_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSKeyPairX509Codec__
diff --git a/libjava/gnu/java/security/key/dss/DSSPrivateKey.h b/libjava/gnu/java/security/key/dss/DSSPrivateKey.h
deleted file mode 100644
index b7816b8..0000000
--- a/libjava/gnu/java/security/key/dss/DSSPrivateKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSPrivateKey__
-#define __gnu_java_security_key_dss_DSSPrivateKey__
-
-#pragma interface
-
-#include <gnu/java/security/key/dss/DSSKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSPrivateKey : public ::gnu::java::security::key::dss::DSSKey
-{
-
-public:
-  DSSPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  DSSPrivateKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::java::security::key::dss::DSSPrivateKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getX();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::java::security::key::dss::DSSKey)))) x;
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSPrivateKey__
diff --git a/libjava/gnu/java/security/key/dss/DSSPublicKey.h b/libjava/gnu/java/security/key/dss/DSSPublicKey.h
deleted file mode 100644
index bffd462..0000000
--- a/libjava/gnu/java/security/key/dss/DSSPublicKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_DSSPublicKey__
-#define __gnu_java_security_key_dss_DSSPublicKey__
-
-#pragma interface
-
-#include <gnu/java/security/key/dss/DSSKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace dss
-          {
-              class DSSPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::DSSPublicKey : public ::gnu::java::security::key::dss::DSSKey
-{
-
-public:
-  DSSPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  DSSPublicKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::java::security::key::dss::DSSPublicKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getY();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::java::security::key::dss::DSSKey)))) y;
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_DSSPublicKey__
diff --git a/libjava/gnu/java/security/key/dss/FIPS186.h b/libjava/gnu/java/security/key/dss/FIPS186.h
deleted file mode 100644
index 1b972d4..0000000
--- a/libjava/gnu/java/security/key/dss/FIPS186.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_dss_FIPS186__
-#define __gnu_java_security_key_dss_FIPS186__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha160;
-        }
-        namespace key
-        {
-          namespace dss
-          {
-              class FIPS186;
-          }
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::java::security::key::dss::FIPS186 : public ::java::lang::Object
-{
-
-public:
-  FIPS186(jint, ::java::security::SecureRandom *);
-  virtual JArray< ::java::math::BigInteger * > * generateParameters();
-private:
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-public:
-  static const jint DSA_PARAMS_SEED = 0;
-  static const jint DSA_PARAMS_COUNTER = 1;
-  static const jint DSA_PARAMS_Q = 2;
-  static const jint DSA_PARAMS_P = 3;
-  static const jint DSA_PARAMS_E = 4;
-  static const jint DSA_PARAMS_G = 5;
-private:
-  static ::java::math::BigInteger * TWO;
-  static ::java::math::BigInteger * TWO_POW_160;
-  ::gnu::java::security::hash::Sha160 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sha;
-  jint L;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_dss_FIPS186__
diff --git a/libjava/gnu/java/security/key/rsa/GnuRSAKey.h b/libjava/gnu/java/security/key/rsa/GnuRSAKey.h
deleted file mode 100644
index 77a57b0..0000000
--- a/libjava/gnu/java/security/key/rsa/GnuRSAKey.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_GnuRSAKey__
-#define __gnu_java_security_key_rsa_GnuRSAKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace rsa
-          {
-              class GnuRSAKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::GnuRSAKey : public ::java::lang::Object
-{
-
-public: // actually protected
-  GnuRSAKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual ::java::math::BigInteger * getN();
-  virtual ::java::math::BigInteger * getPublicExponent();
-  virtual ::java::math::BigInteger * getE();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getEncoded(jint) = 0;
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) n;
-  ::java::math::BigInteger * e;
-public: // actually protected
-  jint defaultFormat;
-private:
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_GnuRSAKey__
diff --git a/libjava/gnu/java/security/key/rsa/GnuRSAPrivateKey.h b/libjava/gnu/java/security/key/rsa/GnuRSAPrivateKey.h
deleted file mode 100644
index 3033418..0000000
--- a/libjava/gnu/java/security/key/rsa/GnuRSAPrivateKey.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_GnuRSAPrivateKey__
-#define __gnu_java_security_key_rsa_GnuRSAPrivateKey__
-
-#pragma interface
-
-#include <gnu/java/security/key/rsa/GnuRSAKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace rsa
-          {
-              class GnuRSAPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::GnuRSAPrivateKey : public ::gnu::java::security::key::rsa::GnuRSAKey
-{
-
-public:
-  GnuRSAPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  GnuRSAPrivateKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  GnuRSAPrivateKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::java::security::key::rsa::GnuRSAPrivateKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getPrimeP();
-  virtual ::java::math::BigInteger * getPrimeQ();
-  virtual ::java::math::BigInteger * getPrimeExponentP();
-  virtual ::java::math::BigInteger * getPrimeExponentQ();
-  virtual ::java::math::BigInteger * getCrtCoefficient();
-  virtual ::java::math::BigInteger * getPrivateExponent();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::java::security::key::rsa::GnuRSAKey)))) p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * d;
-  ::java::math::BigInteger * dP;
-  ::java::math::BigInteger * dQ;
-  ::java::math::BigInteger * qInv;
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_GnuRSAPrivateKey__
diff --git a/libjava/gnu/java/security/key/rsa/GnuRSAPublicKey.h b/libjava/gnu/java/security/key/rsa/GnuRSAPublicKey.h
deleted file mode 100644
index 149a685..0000000
--- a/libjava/gnu/java/security/key/rsa/GnuRSAPublicKey.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_GnuRSAPublicKey__
-#define __gnu_java_security_key_rsa_GnuRSAPublicKey__
-
-#pragma interface
-
-#include <gnu/java/security/key/rsa/GnuRSAKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace rsa
-          {
-              class GnuRSAPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::GnuRSAPublicKey : public ::gnu::java::security::key::rsa::GnuRSAKey
-{
-
-public:
-  GnuRSAPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *);
-  GnuRSAPublicKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::java::security::key::rsa::GnuRSAPublicKey * valueOf(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::security::key::rsa::GnuRSAKey)))) str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_GnuRSAPublicKey__
diff --git a/libjava/gnu/java/security/key/rsa/RSAKeyPairGenerator.h b/libjava/gnu/java/security/key/rsa/RSAKeyPairGenerator.h
deleted file mode 100644
index b59d0be..0000000
--- a/libjava/gnu/java/security/key/rsa/RSAKeyPairGenerator.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_RSAKeyPairGenerator__
-#define __gnu_java_security_key_rsa_RSAKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace rsa
-          {
-              class RSAKeyPairGenerator;
-          }
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::RSAKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  RSAKeyPairGenerator();
-  virtual ::java::lang::String * name();
-  virtual void setup(::java::util::Map *);
-  virtual ::java::security::KeyPair * generate();
-private:
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-  static ::java::math::BigInteger * ONE;
-  static ::java::math::BigInteger * TWO;
-public:
-  static ::java::lang::String * MODULUS_LENGTH;
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * RSA_PARAMETERS;
-  static ::java::lang::String * PREFERRED_ENCODING_FORMAT;
-private:
-  static const jint DEFAULT_MODULUS_LENGTH = 1024;
-  static const jint DEFAULT_ENCODING_FORMAT = 1;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) L;
-  ::java::math::BigInteger * e;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::java::security::util::PRNG * prng;
-  jint preferredFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_RSAKeyPairGenerator__
diff --git a/libjava/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.h b/libjava/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.h
deleted file mode 100644
index 174fea9..0000000
--- a/libjava/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_RSAKeyPairPKCS8Codec__
-#define __gnu_java_security_key_rsa_RSAKeyPairPKCS8Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace key
-        {
-          namespace rsa
-          {
-              class RSAKeyPairPKCS8Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::RSAKeyPairPKCS8Codec : public ::java::lang::Object
-{
-
-public:
-  RSAKeyPairPKCS8Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::java::util::logging::Logger * log;
-  static ::gnu::java::security::OID * RSA_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_RSAKeyPairPKCS8Codec__
diff --git a/libjava/gnu/java/security/key/rsa/RSAKeyPairRawCodec.h b/libjava/gnu/java/security/key/rsa/RSAKeyPairRawCodec.h
deleted file mode 100644
index 0715d81..0000000
--- a/libjava/gnu/java/security/key/rsa/RSAKeyPairRawCodec.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_RSAKeyPairRawCodec__
-#define __gnu_java_security_key_rsa_RSAKeyPairRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-          namespace rsa
-          {
-              class RSAKeyPairRawCodec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::RSAKeyPairRawCodec : public ::java::lang::Object
-{
-
-public:
-  RSAKeyPairRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_RSAKeyPairRawCodec__
diff --git a/libjava/gnu/java/security/key/rsa/RSAKeyPairX509Codec.h b/libjava/gnu/java/security/key/rsa/RSAKeyPairX509Codec.h
deleted file mode 100644
index 53abc9e..0000000
--- a/libjava/gnu/java/security/key/rsa/RSAKeyPairX509Codec.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_key_rsa_RSAKeyPairX509Codec__
-#define __gnu_java_security_key_rsa_RSAKeyPairX509Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace key
-        {
-          namespace rsa
-          {
-              class RSAKeyPairX509Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::key::rsa::RSAKeyPairX509Codec : public ::java::lang::Object
-{
-
-public:
-  RSAKeyPairX509Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::java::util::logging::Logger * log;
-  static ::gnu::java::security::OID * RSA_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_key_rsa_RSAKeyPairX509Codec__
diff --git a/libjava/gnu/java/security/pkcs/PKCS7Data.h b/libjava/gnu/java/security/pkcs/PKCS7Data.h
deleted file mode 100644
index 5ec26a05f..0000000
--- a/libjava/gnu/java/security/pkcs/PKCS7Data.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_pkcs_PKCS7Data__
-#define __gnu_java_security_pkcs_PKCS7Data__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace pkcs
-        {
-            class PKCS7Data;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::pkcs::PKCS7Data : public ::java::lang::Object
-{
-
-public:
-  PKCS7Data(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  static ::gnu::java::security::OID * PKCS7_DATA;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_pkcs_PKCS7Data__
diff --git a/libjava/gnu/java/security/pkcs/PKCS7SignedData.h b/libjava/gnu/java/security/pkcs/PKCS7SignedData.h
deleted file mode 100644
index 65b0b11e..0000000
--- a/libjava/gnu/java/security/pkcs/PKCS7SignedData.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_pkcs_PKCS7SignedData__
-#define __gnu_java_security_pkcs_PKCS7SignedData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace ber
-        {
-            class BERReader;
-        }
-        namespace pkcs
-        {
-            class PKCS7Data;
-            class PKCS7SignedData;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class Certificate;
-          class X509CRL;
-      }
-    }
-  }
-}
-
-class gnu::java::security::pkcs::PKCS7SignedData : public ::java::lang::Object
-{
-
-public:
-  PKCS7SignedData(::java::io::InputStream *);
-  PKCS7SignedData(::gnu::java::security::ber::BERReader *);
-  PKCS7SignedData(::java::util::Set *, ::gnu::java::security::pkcs::PKCS7Data *, JArray< ::java::security::cert::Certificate * > *, JArray< ::java::security::cert::X509CRL * > *, ::java::util::Set *);
-  virtual ::java::math::BigInteger * getVersion();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual ::gnu::java::security::OID * getContentType();
-  virtual JArray< jbyte > * getContent();
-  virtual ::java::util::Set * getDigestAlgorithms();
-  virtual ::java::util::Set * getSignerInfos();
-  virtual void encode(::java::io::OutputStream *);
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static ::gnu::java::security::OID * PKCS7_SIGNED_DATA;
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) version;
-  ::java::util::Set * digestAlgorithms;
-  ::gnu::java::security::OID * contentType;
-  JArray< jbyte > * content;
-  JArray< ::java::security::cert::Certificate * > * certificates;
-  JArray< ::java::security::cert::CRL * > * crls;
-  ::java::util::Set * signerInfos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_pkcs_PKCS7SignedData__
diff --git a/libjava/gnu/java/security/pkcs/SignerInfo.h b/libjava/gnu/java/security/pkcs/SignerInfo.h
deleted file mode 100644
index 5a020cf..0000000
--- a/libjava/gnu/java/security/pkcs/SignerInfo.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_pkcs_SignerInfo__
-#define __gnu_java_security_pkcs_SignerInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace ber
-        {
-            class BERReader;
-        }
-        namespace pkcs
-        {
-            class SignerInfo;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::pkcs::SignerInfo : public ::java::lang::Object
-{
-
-public:
-  SignerInfo(::gnu::java::security::ber::BERReader *);
-  SignerInfo(::javax::security::auth::x500::X500Principal *, ::java::math::BigInteger *, ::gnu::java::security::OID *, JArray< jbyte > *, ::gnu::java::security::OID *, JArray< jbyte > *, JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getVersion();
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual ::javax::security::auth::x500::X500Principal * getIssuer();
-  virtual ::gnu::java::security::OID * getDigestAlgorithmId();
-  virtual JArray< jbyte > * getDigestAlgorithmParams();
-  virtual JArray< jbyte > * getAuthenticatedAttributes();
-  virtual ::gnu::java::security::OID * getDigestEncryptionAlgorithmId();
-  virtual JArray< jbyte > * getDigestEncryptionAlgorithmParams();
-  virtual JArray< jbyte > * getEncryptedDigest();
-  virtual JArray< jbyte > * getUnauthenticatedAttributes();
-  virtual void encode(::java::io::OutputStream *);
-private:
-  static ::java::util::logging::Logger * log;
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) version;
-  ::java::math::BigInteger * serialNumber;
-  ::javax::security::auth::x500::X500Principal * issuer;
-  ::gnu::java::security::OID * digestAlgorithmId;
-  JArray< jbyte > * digestAlgorithmParams;
-  JArray< jbyte > * authenticatedAttributes;
-  ::gnu::java::security::OID * digestEncryptionAlgorithmId;
-  JArray< jbyte > * digestEncryptionAlgorithmParams;
-  JArray< jbyte > * encryptedDigest;
-  JArray< jbyte > * unauthenticatedAttributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_pkcs_SignerInfo__
diff --git a/libjava/gnu/java/security/prng/BasePRNG.h b/libjava/gnu/java/security/prng/BasePRNG.h
deleted file mode 100644
index 4b20623..0000000
--- a/libjava/gnu/java/security/prng/BasePRNG.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_BasePRNG__
-#define __gnu_java_security_prng_BasePRNG__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class BasePRNG;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::BasePRNG : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasePRNG(::java::lang::String *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void init(::java::util::Map *);
-  virtual jbyte nextByte();
-  virtual void nextBytes(JArray< jbyte > *);
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-  virtual jboolean isInitialised();
-private:
-  jbyte nextByteInternal();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup(::java::util::Map *) = 0;
-  virtual void fillBlock() = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jboolean initialised;
-  JArray< jbyte > * buffer;
-  jint ndx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_prng_BasePRNG__
diff --git a/libjava/gnu/java/security/prng/EntropySource.h b/libjava/gnu/java/security/prng/EntropySource.h
deleted file mode 100644
index 8f7377a..0000000
--- a/libjava/gnu/java/security/prng/EntropySource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_EntropySource__
-#define __gnu_java_security_prng_EntropySource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class EntropySource;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::EntropySource : public ::java::lang::Object
-{
-
-public:
-  virtual jdouble quality() = 0;
-  virtual JArray< jbyte > * nextBytes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_prng_EntropySource__
diff --git a/libjava/gnu/java/security/prng/IRandom.h b/libjava/gnu/java/security/prng/IRandom.h
deleted file mode 100644
index 54a7373..0000000
--- a/libjava/gnu/java/security/prng/IRandom.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_IRandom__
-#define __gnu_java_security_prng_IRandom__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::IRandom : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual jbyte nextByte() = 0;
-  virtual void nextBytes(JArray< jbyte > *, jint, jint) = 0;
-  virtual void addRandomByte(jbyte) = 0;
-  virtual void addRandomBytes(JArray< jbyte > *) = 0;
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_prng_IRandom__
diff --git a/libjava/gnu/java/security/prng/LimitReachedException.h b/libjava/gnu/java/security/prng/LimitReachedException.h
deleted file mode 100644
index 3dede83..0000000
--- a/libjava/gnu/java/security/prng/LimitReachedException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_LimitReachedException__
-#define __gnu_java_security_prng_LimitReachedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class LimitReachedException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::LimitReachedException : public ::java::lang::Exception
-{
-
-public:
-  LimitReachedException();
-  LimitReachedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_prng_LimitReachedException__
diff --git a/libjava/gnu/java/security/prng/MDGenerator.h b/libjava/gnu/java/security/prng/MDGenerator.h
deleted file mode 100644
index d14566c..0000000
--- a/libjava/gnu/java/security/prng/MDGenerator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_MDGenerator__
-#define __gnu_java_security_prng_MDGenerator__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace prng
-        {
-            class MDGenerator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::MDGenerator : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  MDGenerator();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * clone();
-  static ::java::lang::String * MD_NAME;
-  static ::java::lang::String * SEEED;
-private:
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) md;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_prng_MDGenerator__
diff --git a/libjava/gnu/java/security/prng/PRNGFactory.h b/libjava/gnu/java/security/prng/PRNGFactory.h
deleted file mode 100644
index a1e3f28..0000000
--- a/libjava/gnu/java/security/prng/PRNGFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_PRNGFactory__
-#define __gnu_java_security_prng_PRNGFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-            class PRNGFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::PRNGFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  PRNGFactory();
-public:
-  static ::gnu::java::security::prng::IRandom * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_prng_PRNGFactory__
diff --git a/libjava/gnu/java/security/prng/RandomEvent.h b/libjava/gnu/java/security/prng/RandomEvent.h
deleted file mode 100644
index 2b26396..0000000
--- a/libjava/gnu/java/security/prng/RandomEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_RandomEvent__
-#define __gnu_java_security_prng_RandomEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class RandomEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::RandomEvent : public ::java::util::EventObject
-{
-
-public:
-  RandomEvent(::java::lang::Object *, jbyte, jbyte, JArray< jbyte > *);
-  virtual jbyte getSourceNumber();
-  virtual jbyte getPoolNumber();
-  virtual JArray< jbyte > * getData();
-private:
-  jbyte __attribute__((aligned(__alignof__( ::java::util::EventObject)))) sourceNumber;
-  jbyte poolNumber;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_prng_RandomEvent__
diff --git a/libjava/gnu/java/security/prng/RandomEventListener.h b/libjava/gnu/java/security/prng/RandomEventListener.h
deleted file mode 100644
index 5aef74b..0000000
--- a/libjava/gnu/java/security/prng/RandomEventListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_prng_RandomEventListener__
-#define __gnu_java_security_prng_RandomEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class RandomEvent;
-            class RandomEventListener;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::prng::RandomEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void addRandomEvent(::gnu::java::security::prng::RandomEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_prng_RandomEventListener__
diff --git a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.h b/libjava/gnu/java/security/provider/CollectionCertStoreImpl.h
deleted file mode 100644
index 947bfe5..0000000
--- a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_CollectionCertStoreImpl__
-#define __gnu_java_security_provider_CollectionCertStoreImpl__
-
-#pragma interface
-
-#include <java/security/cert/CertStoreSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class CollectionCertStoreImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRLSelector;
-          class CertSelector;
-          class CertStoreParameters;
-      }
-    }
-  }
-}
-
-class gnu::java::security::provider::CollectionCertStoreImpl : public ::java::security::cert::CertStoreSpi
-{
-
-public:
-  CollectionCertStoreImpl(::java::security::cert::CertStoreParameters *);
-  ::java::util::Collection * engineGetCertificates(::java::security::cert::CertSelector *);
-  ::java::util::Collection * engineGetCRLs(::java::security::cert::CRLSelector *);
-private:
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::security::cert::CertStoreSpi)))) store;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_CollectionCertStoreImpl__
diff --git a/libjava/gnu/java/security/provider/DefaultPolicy.h b/libjava/gnu/java/security/provider/DefaultPolicy.h
deleted file mode 100644
index b225954..0000000
--- a/libjava/gnu/java/security/provider/DefaultPolicy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_DefaultPolicy__
-#define __gnu_java_security_provider_DefaultPolicy__
-
-#pragma interface
-
-#include <java/security/Policy.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class DefaultPolicy;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class gnu::java::security::provider::DefaultPolicy : public ::java::security::Policy
-{
-
-public:
-  DefaultPolicy();
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *);
-  virtual void refresh();
-public: // actually package-private
-  static ::java::security::Permission * allPermission;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_DefaultPolicy__
diff --git a/libjava/gnu/java/security/provider/Gnu$1.h b/libjava/gnu/java/security/provider/Gnu$1.h
deleted file mode 100644
index d9fda73..0000000
--- a/libjava/gnu/java/security/provider/Gnu$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_Gnu$1__
-#define __gnu_java_security_provider_Gnu$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class Gnu;
-            class Gnu$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::provider::Gnu$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Gnu$1(::gnu::java::security::provider::Gnu *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::java::security::provider::Gnu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_Gnu$1__
diff --git a/libjava/gnu/java/security/provider/Gnu.h b/libjava/gnu/java/security/provider/Gnu.h
deleted file mode 100644
index 78c78fa..0000000
--- a/libjava/gnu/java/security/provider/Gnu.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_Gnu__
-#define __gnu_java_security_provider_Gnu__
-
-#pragma interface
-
-#include <java/security/Provider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class Gnu;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::provider::Gnu : public ::java::security::Provider
-{
-
-public:
-  Gnu();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_Gnu__
diff --git a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.h b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.h
deleted file mode 100644
index 196a93a..0000000
--- a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_PKIXCertPathValidatorImpl__
-#define __gnu_java_security_provider_PKIXCertPathValidatorImpl__
-
-#pragma interface
-
-#include <java/security/cert/CertPathValidatorSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class PKIXCertPathValidatorImpl;
-        }
-        namespace x509
-        {
-            class PolicyNodeImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class CertPath;
-          class CertPathParameters;
-          class CertPathValidatorResult;
-          class PKIXParameters;
-          class X509CRL;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::security::provider::PKIXCertPathValidatorImpl : public ::java::security::cert::CertPathValidatorSpi
-{
-
-public:
-  PKIXCertPathValidatorImpl();
-  virtual ::java::security::cert::CertPathValidatorResult * engineValidate(::java::security::cert::CertPath *, ::java::security::cert::CertPathParameters *);
-private:
-  static jboolean checkCRL(::java::security::cert::X509CRL *, JArray< ::java::security::cert::X509Certificate * > *, ::java::util::Date *, ::java::security::cert::X509Certificate *, ::java::security::PublicKey *, ::java::util::List *);
-  static ::java::util::Set * getCritExts(::java::security::cert::X509Certificate *);
-  static void basicSanity(JArray< ::java::security::cert::X509Certificate * > *, jint);
-  static void updatePolicyTree(::java::security::cert::X509Certificate *, ::gnu::java::security::x509::PolicyNodeImpl *, jint, ::java::security::cert::PKIXParameters *, jboolean);
-  jboolean checkExplicitPolicy(jint, ::java::util::List *);
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::String * ANY_POLICY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_PKIXCertPathValidatorImpl__
diff --git a/libjava/gnu/java/security/provider/X509CertificateFactory.h b/libjava/gnu/java/security/provider/X509CertificateFactory.h
deleted file mode 100644
index 67fdd90..0000000
--- a/libjava/gnu/java/security/provider/X509CertificateFactory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_provider_X509CertificateFactory__
-#define __gnu_java_security_provider_X509CertificateFactory__
-
-#pragma interface
-
-#include <java/security/cert/CertificateFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace provider
-        {
-            class X509CertificateFactory;
-        }
-        namespace x509
-        {
-            class X509CRL;
-            class X509Certificate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class CertPath;
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::security::provider::X509CertificateFactory : public ::java::security::cert::CertificateFactorySpi
-{
-
-public:
-  X509CertificateFactory();
-  virtual ::java::security::cert::Certificate * engineGenerateCertificate(::java::io::InputStream *);
-  virtual ::java::util::Collection * engineGenerateCertificates(::java::io::InputStream *);
-  virtual ::java::security::cert::CRL * engineGenerateCRL(::java::io::InputStream *);
-  virtual ::java::util::Collection * engineGenerateCRLs(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::util::List *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::util::Iterator * engineGetCertPathEncodings();
-private:
-  ::gnu::java::security::x509::X509Certificate * generateCert(::java::io::InputStream *);
-  ::gnu::java::security::x509::X509CRL * generateCRL(::java::io::InputStream *);
-public:
-  static ::java::lang::String * BEGIN_CERTIFICATE;
-  static ::java::lang::String * END_CERTIFICATE;
-  static ::java::lang::String * BEGIN_X509_CRL;
-  static ::java::lang::String * END_X509_CRL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_provider_X509CertificateFactory__
diff --git a/libjava/gnu/java/security/sig/BaseSignature.h b/libjava/gnu/java/security/sig/BaseSignature.h
deleted file mode 100644
index 2f4ab0e..0000000
--- a/libjava/gnu/java/security/sig/BaseSignature.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_BaseSignature__
-#define __gnu_java_security_sig_BaseSignature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace prng
-        {
-            class IRandom;
-        }
-        namespace sig
-        {
-            class BaseSignature;
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::sig::BaseSignature : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseSignature(::java::lang::String *, ::gnu::java::security::hash::IMessageDigest *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void setupVerify(::java::util::Map *);
-  virtual void setupSign(::java::util::Map *);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * sign();
-  virtual jboolean verify(::java::lang::Object *);
-  virtual ::java::lang::Object * clone() = 0;
-public: // actually protected
-  virtual void setupForVerification(::java::security::PublicKey *) = 0;
-  virtual void setupForSigning(::java::security::PrivateKey *) = 0;
-  virtual ::java::lang::Object * generateSignature() = 0;
-  virtual jboolean verifySignature(::java::lang::Object *) = 0;
-  virtual void init();
-  virtual void nextRandomBytes(JArray< jbyte > *);
-private:
-  void setup(::java::util::Map *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schemeName;
-  ::gnu::java::security::hash::IMessageDigest * md;
-  ::java::security::PublicKey * publicKey;
-  ::java::security::PrivateKey * privateKey;
-private:
-  ::java::util::Random * rnd;
-  ::gnu::java::security::prng::IRandom * irnd;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_BaseSignature__
diff --git a/libjava/gnu/java/security/sig/ISignature.h b/libjava/gnu/java/security/sig/ISignature.h
deleted file mode 100644
index b02f28f..0000000
--- a/libjava/gnu/java/security/sig/ISignature.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_ISignature__
-#define __gnu_java_security_sig_ISignature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-            class ISignature;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::ISignature : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void setupVerify(::java::util::Map *) = 0;
-  virtual void setupSign(::java::util::Map *) = 0;
-  virtual void update(jbyte) = 0;
-  virtual void update(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * sign() = 0;
-  virtual jboolean verify(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::String * VERIFIER_KEY;
-  static ::java::lang::String * SIGNER_KEY;
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_sig_ISignature__
diff --git a/libjava/gnu/java/security/sig/ISignatureCodec.h b/libjava/gnu/java/security/sig/ISignatureCodec.h
deleted file mode 100644
index 8924c12..0000000
--- a/libjava/gnu/java/security/sig/ISignatureCodec.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_ISignatureCodec__
-#define __gnu_java_security_sig_ISignatureCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-            class ISignatureCodec;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::ISignatureCodec : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFormatID() = 0;
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *) = 0;
-  static const jint RAW_FORMAT = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_sig_ISignatureCodec__
diff --git a/libjava/gnu/java/security/sig/SignatureCodecFactory.h b/libjava/gnu/java/security/sig/SignatureCodecFactory.h
deleted file mode 100644
index 56295cb..0000000
--- a/libjava/gnu/java/security/sig/SignatureCodecFactory.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_SignatureCodecFactory__
-#define __gnu_java_security_sig_SignatureCodecFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-            class ISignatureCodec;
-            class SignatureCodecFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::SignatureCodecFactory : public ::java::lang::Object
-{
-
-  SignatureCodecFactory();
-public:
-  static ::gnu::java::security::sig::ISignatureCodec * getInstance(::java::lang::String *);
-  static ::gnu::java::security::sig::ISignatureCodec * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::gnu::java::security::sig::ISignatureCodec * getInstance(::java::lang::String *, jint);
-  static ::java::util::Set * getNames();
-private:
-  static ::gnu::java::security::sig::ISignatureCodec * getRawCodec(::java::lang::String *);
-  static ::gnu::java::security::sig::ISignatureCodec * getX509Codec(::java::lang::String *);
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_SignatureCodecFactory__
diff --git a/libjava/gnu/java/security/sig/SignatureFactory.h b/libjava/gnu/java/security/sig/SignatureFactory.h
deleted file mode 100644
index 344c34c..0000000
--- a/libjava/gnu/java/security/sig/SignatureFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_SignatureFactory__
-#define __gnu_java_security_sig_SignatureFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-            class ISignature;
-            class SignatureFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::SignatureFactory : public ::java::lang::Object
-{
-
-  SignatureFactory();
-public:
-  static ::gnu::java::security::sig::ISignature * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_SignatureFactory__
diff --git a/libjava/gnu/java/security/sig/dss/DSSSignature.h b/libjava/gnu/java/security/sig/dss/DSSSignature.h
deleted file mode 100644
index 96781ef..0000000
--- a/libjava/gnu/java/security/sig/dss/DSSSignature.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_dss_DSSSignature__
-#define __gnu_java_security_sig_dss_DSSSignature__
-
-#pragma interface
-
-#include <gnu/java/security/sig/BaseSignature.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-        namespace sig
-        {
-          namespace dss
-          {
-              class DSSSignature;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-      namespace interfaces
-      {
-          class DSAPrivateKey;
-          class DSAPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::dss::DSSSignature : public ::gnu::java::security::sig::BaseSignature
-{
-
-public:
-  DSSSignature();
-private:
-  DSSSignature(::gnu::java::security::sig::dss::DSSSignature *);
-public:
-  static JArray< ::java::math::BigInteger * > * sign(::java::security::interfaces::DSAPrivateKey *, JArray< jbyte > *);
-  static JArray< ::java::math::BigInteger * > * sign(::java::security::interfaces::DSAPrivateKey *, JArray< jbyte > *, ::java::util::Random *);
-  static JArray< ::java::math::BigInteger * > * sign(::java::security::interfaces::DSAPrivateKey *, JArray< jbyte > *, ::gnu::java::security::prng::IRandom *);
-  static jboolean verify(::java::security::interfaces::DSAPublicKey *, JArray< jbyte > *, JArray< ::java::math::BigInteger * > *);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void setupForVerification(::java::security::PublicKey *);
-  virtual void setupForSigning(::java::security::PrivateKey *);
-  virtual ::java::lang::Object * generateSignature();
-  virtual jboolean verifySignature(::java::lang::Object *);
-private:
-  ::java::lang::Object * encodeSignature(::java::math::BigInteger *, ::java::math::BigInteger *);
-  JArray< ::java::math::BigInteger * > * decodeSignature(::java::lang::Object *);
-  JArray< ::java::math::BigInteger * > * computeRS(JArray< jbyte > *);
-  jboolean checkRS(JArray< ::java::math::BigInteger * > *, JArray< jbyte > *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_dss_DSSSignature__
diff --git a/libjava/gnu/java/security/sig/dss/DSSSignatureRawCodec.h b/libjava/gnu/java/security/sig/dss/DSSSignatureRawCodec.h
deleted file mode 100644
index 5229cdd..0000000
--- a/libjava/gnu/java/security/sig/dss/DSSSignatureRawCodec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_dss_DSSSignatureRawCodec__
-#define __gnu_java_security_sig_dss_DSSSignatureRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace dss
-          {
-              class DSSSignatureRawCodec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::dss::DSSSignatureRawCodec : public ::java::lang::Object
-{
-
-public:
-  DSSSignatureRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *);
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_dss_DSSSignatureRawCodec__
diff --git a/libjava/gnu/java/security/sig/dss/DSSSignatureX509Codec.h b/libjava/gnu/java/security/sig/dss/DSSSignatureX509Codec.h
deleted file mode 100644
index d7428b3..0000000
--- a/libjava/gnu/java/security/sig/dss/DSSSignatureX509Codec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_dss_DSSSignatureX509Codec__
-#define __gnu_java_security_sig_dss_DSSSignatureX509Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace dss
-          {
-              class DSSSignatureX509Codec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::dss::DSSSignatureX509Codec : public ::java::lang::Object
-{
-
-public:
-  DSSSignatureX509Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *);
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_dss_DSSSignatureX509Codec__
diff --git a/libjava/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.h b/libjava/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.h
deleted file mode 100644
index a0c3987..0000000
--- a/libjava/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_EME_PKCS1_V1_5__
-#define __gnu_java_security_sig_rsa_EME_PKCS1_V1_5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EME_PKCS1_V1_5;
-          }
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAKey;
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::EME_PKCS1_V1_5 : public ::java::lang::Object
-{
-
-  EME_PKCS1_V1_5(jint);
-public:
-  static ::gnu::java::security::sig::rsa::EME_PKCS1_V1_5 * getInstance(jint);
-  static ::gnu::java::security::sig::rsa::EME_PKCS1_V1_5 * getInstance(::java::security::interfaces::RSAKey *);
-  virtual JArray< jbyte > * encode(JArray< jbyte > *);
-  virtual JArray< jbyte > * encode(JArray< jbyte > *, ::gnu::java::security::prng::IRandom *);
-  virtual JArray< jbyte > * encode(JArray< jbyte > *, ::java::util::Random *);
-  virtual JArray< jbyte > * decode(JArray< jbyte > *);
-private:
-  JArray< jbyte > * assembleEM(JArray< jbyte > *, JArray< jbyte > *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) k;
-  ::java::io::ByteArrayOutputStream * baos;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_EME_PKCS1_V1_5__
diff --git a/libjava/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.h b/libjava/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.h
deleted file mode 100644
index 780e29d..0000000
--- a/libjava/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_EMSA_PKCS1_V1_5__
-#define __gnu_java_security_sig_rsa_EMSA_PKCS1_V1_5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EMSA_PKCS1_V1_5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::EMSA_PKCS1_V1_5 : public ::java::lang::Object
-{
-
-  EMSA_PKCS1_V1_5(::gnu::java::security::hash::IMessageDigest *);
-public:
-  static ::gnu::java::security::sig::rsa::EMSA_PKCS1_V1_5 * getInstance(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< jbyte > * encode(JArray< jbyte > *, jint);
-private:
-  static JArray< jbyte > * MD2_PREFIX;
-  static JArray< jbyte > * MD5_PREFIX;
-  static JArray< jbyte > * SHA160_PREFIX;
-  static JArray< jbyte > * SHA256_PREFIX;
-  static JArray< jbyte > * SHA384_PREFIX;
-  static JArray< jbyte > * SHA512_PREFIX;
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hash;
-  jint hLen;
-  JArray< jbyte > * prefix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_EMSA_PKCS1_V1_5__
diff --git a/libjava/gnu/java/security/sig/rsa/EMSA_PSS.h b/libjava/gnu/java/security/sig/rsa/EMSA_PSS.h
deleted file mode 100644
index 3a85032..0000000
--- a/libjava/gnu/java/security/sig/rsa/EMSA_PSS.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_EMSA_PSS__
-#define __gnu_java_security_sig_rsa_EMSA_PSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EMSA_PSS;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::EMSA_PSS : public ::java::lang::Object
-{
-
-  EMSA_PSS(::gnu::java::security::hash::IMessageDigest *);
-public:
-  static ::gnu::java::security::sig::rsa::EMSA_PSS * getInstance(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< jbyte > * encode(JArray< jbyte > *, jint, JArray< jbyte > *);
-  virtual jboolean decode(JArray< jbyte > *, JArray< jbyte > *, jint, jint);
-private:
-  JArray< jbyte > * MGF(JArray< jbyte > *, jint);
-  static ::java::util::logging::Logger * log;
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hash;
-  jint hLen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_EMSA_PSS__
diff --git a/libjava/gnu/java/security/sig/rsa/RSA.h b/libjava/gnu/java/security/sig/rsa/RSA.h
deleted file mode 100644
index 5ad5114..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSA.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSA__
-#define __gnu_java_security_sig_rsa_RSA__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace rsa
-          {
-              class RSA;
-          }
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-          class RSAPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSA : public ::java::lang::Object
-{
-
-  RSA();
-public:
-  static ::java::math::BigInteger * sign(::java::security::PrivateKey *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * verify(::java::security::PublicKey *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * encrypt(::java::security::PublicKey *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * decrypt(::java::security::PrivateKey *, ::java::math::BigInteger *);
-  static JArray< jbyte > * I2OSP(::java::math::BigInteger *, jint);
-private:
-  static ::java::math::BigInteger * RSAEP(::java::security::interfaces::RSAPublicKey *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * RSADP(::java::security::interfaces::RSAPrivateKey *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * newR(::java::math::BigInteger *);
-  static ::java::math::BigInteger * ZERO;
-  static ::java::math::BigInteger * ONE;
-  static ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSA__
diff --git a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.h b/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.h
deleted file mode 100644
index 0822293..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSAPKCS1V1_5Signature__
-#define __gnu_java_security_sig_rsa_RSAPKCS1V1_5Signature__
-
-#pragma interface
-
-#include <gnu/java/security/sig/BaseSignature.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EMSA_PKCS1_V1_5;
-              class RSAPKCS1V1_5Signature;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSAPKCS1V1_5Signature : public ::gnu::java::security::sig::BaseSignature
-{
-
-public:
-  RSAPKCS1V1_5Signature();
-  RSAPKCS1V1_5Signature(::java::lang::String *);
-  RSAPKCS1V1_5Signature(::gnu::java::security::hash::IMessageDigest *);
-private:
-  RSAPKCS1V1_5Signature(::gnu::java::security::sig::rsa::RSAPKCS1V1_5Signature *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void setupForVerification(::java::security::PublicKey *);
-  virtual void setupForSigning(::java::security::PrivateKey *);
-  virtual ::java::lang::Object * generateSignature();
-  virtual jboolean verifySignature(::java::lang::Object *);
-private:
-  ::gnu::java::security::sig::rsa::EMSA_PKCS1_V1_5 * __attribute__((aligned(__alignof__( ::gnu::java::security::sig::BaseSignature)))) pkcs1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSAPKCS1V1_5Signature__
diff --git a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.h b/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.h
deleted file mode 100644
index 2fe018f..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureRawCodec__
-#define __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace rsa
-          {
-              class RSAPKCS1V1_5SignatureRawCodec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSAPKCS1V1_5SignatureRawCodec : public ::java::lang::Object
-{
-
-public:
-  RSAPKCS1V1_5SignatureRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *);
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureRawCodec__
diff --git a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.h b/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.h
deleted file mode 100644
index 4e9da2a..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureX509Codec__
-#define __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureX509Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace rsa
-          {
-              class RSAPKCS1V1_5SignatureX509Codec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSAPKCS1V1_5SignatureX509Codec : public ::java::lang::Object
-{
-
-public:
-  RSAPKCS1V1_5SignatureX509Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *);
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSAPKCS1V1_5SignatureX509Codec__
diff --git a/libjava/gnu/java/security/sig/rsa/RSAPSSSignature.h b/libjava/gnu/java/security/sig/rsa/RSAPSSSignature.h
deleted file mode 100644
index 4360889..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSAPSSSignature.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSAPSSSignature__
-#define __gnu_java_security_sig_rsa_RSAPSSSignature__
-
-#pragma interface
-
-#include <gnu/java/security/sig/BaseSignature.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EMSA_PSS;
-              class RSAPSSSignature;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSAPSSSignature : public ::gnu::java::security::sig::BaseSignature
-{
-
-public:
-  RSAPSSSignature();
-  RSAPSSSignature(::java::lang::String *);
-  RSAPSSSignature(::java::lang::String *, jint);
-  RSAPSSSignature(::gnu::java::security::hash::IMessageDigest *, jint);
-private:
-  RSAPSSSignature(::gnu::java::security::sig::rsa::RSAPSSSignature *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void setupForVerification(::java::security::PublicKey *);
-  virtual void setupForSigning(::java::security::PrivateKey *);
-  virtual ::java::lang::Object * generateSignature();
-  virtual jboolean verifySignature(::java::lang::Object *);
-private:
-  static ::java::util::logging::Logger * log;
-  ::gnu::java::security::sig::rsa::EMSA_PSS * __attribute__((aligned(__alignof__( ::gnu::java::security::sig::BaseSignature)))) pss;
-  jint sLen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSAPSSSignature__
diff --git a/libjava/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.h b/libjava/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.h
deleted file mode 100644
index a7efde3..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSAPSSSignatureRawCodec__
-#define __gnu_java_security_sig_rsa_RSAPSSSignatureRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace rsa
-          {
-              class RSAPSSSignatureRawCodec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSAPSSSignatureRawCodec : public ::java::lang::Object
-{
-
-public:
-  RSAPSSSignatureRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodeSignature(::java::lang::Object *);
-  virtual ::java::lang::Object * decodeSignature(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSAPSSSignatureRawCodec__
diff --git a/libjava/gnu/java/security/sig/rsa/RSASignatureFactory.h b/libjava/gnu/java/security/sig/rsa/RSASignatureFactory.h
deleted file mode 100644
index c8b9b24..0000000
--- a/libjava/gnu/java/security/sig/rsa/RSASignatureFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_sig_rsa_RSASignatureFactory__
-#define __gnu_java_security_sig_rsa_RSASignatureFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-            class ISignature;
-          namespace rsa
-          {
-              class RSASignatureFactory;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::sig::rsa::RSASignatureFactory : public ::java::lang::Object
-{
-
-  RSASignatureFactory();
-public:
-  static ::gnu::java::security::sig::ISignature * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::gnu::java::security::sig::ISignature * getPSSSignature(::java::lang::String *);
-  static ::gnu::java::security::sig::ISignature * getPKCS1Signature(::java::lang::String *);
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_sig_rsa_RSASignatureFactory__
diff --git a/libjava/gnu/java/security/util/ByteArray.h b/libjava/gnu/java/security/util/ByteArray.h
deleted file mode 100644
index 6eef185..0000000
--- a/libjava/gnu/java/security/util/ByteArray.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_ByteArray__
-#define __gnu_java_security_util_ByteArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class ByteArray;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::ByteArray : public ::java::lang::Object
-{
-
-public:
-  ByteArray(JArray< jbyte > *);
-  JArray< jbyte > * getValue();
-  ::java::lang::String * toString();
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jint, jint, jchar);
-  static ::java::lang::String * formatInt(jint, jint, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_ByteArray__
diff --git a/libjava/gnu/java/security/util/ByteBufferOutputStream.h b/libjava/gnu/java/security/util/ByteBufferOutputStream.h
deleted file mode 100644
index cfb43d3..0000000
--- a/libjava/gnu/java/security/util/ByteBufferOutputStream.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_ByteBufferOutputStream__
-#define __gnu_java_security_util_ByteBufferOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class ByteBufferOutputStream;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::java::security::util::ByteBufferOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  ByteBufferOutputStream();
-  ByteBufferOutputStream(jint);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::lang::String * toString();
-private:
-  void growBuffer();
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_ByteBufferOutputStream__
diff --git a/libjava/gnu/java/security/util/DerUtil.h b/libjava/gnu/java/security/util/DerUtil.h
deleted file mode 100644
index 42ec67e..0000000
--- a/libjava/gnu/java/security/util/DerUtil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_DerUtil__
-#define __gnu_java_security_util_DerUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace der
-        {
-            class DERValue;
-        }
-        namespace util
-        {
-            class DerUtil;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::DerUtil : public ::java::lang::Object
-{
-
-public:
-  DerUtil();
-  static void checkIsConstructed(::gnu::java::security::der::DERValue *, ::java::lang::String *);
-  static void checkIsBigInteger(::gnu::java::security::der::DERValue *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_DerUtil__
diff --git a/libjava/gnu/java/security/util/ExpirableObject$Destroyer.h b/libjava/gnu/java/security/util/ExpirableObject$Destroyer.h
deleted file mode 100644
index 8d39fbb..0000000
--- a/libjava/gnu/java/security/util/ExpirableObject$Destroyer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_ExpirableObject$Destroyer__
-#define __gnu_java_security_util_ExpirableObject$Destroyer__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class ExpirableObject;
-            class ExpirableObject$Destroyer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::ExpirableObject$Destroyer : public ::java::util::TimerTask
-{
-
-public: // actually package-private
-  ExpirableObject$Destroyer(::gnu::java::security::util::ExpirableObject *, ::gnu::java::security::util::ExpirableObject *);
-public:
-  void run();
-private:
-  ::gnu::java::security::util::ExpirableObject * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) target;
-public: // actually package-private
-  ::gnu::java::security::util::ExpirableObject * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_ExpirableObject$Destroyer__
diff --git a/libjava/gnu/java/security/util/ExpirableObject.h b/libjava/gnu/java/security/util/ExpirableObject.h
deleted file mode 100644
index 094dc71..0000000
--- a/libjava/gnu/java/security/util/ExpirableObject.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_ExpirableObject__
-#define __gnu_java_security_util_ExpirableObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class ExpirableObject;
-            class ExpirableObject$Destroyer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::ExpirableObject : public ::java::lang::Object
-{
-
-public: // actually protected
-  ExpirableObject();
-  ExpirableObject(jlong);
-public:
-  virtual void destroy();
-public: // actually protected
-  virtual void doDestroy() = 0;
-public:
-  virtual jboolean isDestroyed() = 0;
-  static const jlong DEFAULT_TIMEOUT = 3600000LL;
-private:
-  static ::java::util::Timer * EXPIRER;
-  ::gnu::java::security::util::ExpirableObject$Destroyer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) destroyer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_ExpirableObject__
diff --git a/libjava/gnu/java/security/util/FormatUtil.h b/libjava/gnu/java/security/util/FormatUtil.h
deleted file mode 100644
index 019395d..0000000
--- a/libjava/gnu/java/security/util/FormatUtil.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_FormatUtil__
-#define __gnu_java_security_util_FormatUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class FormatUtil;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::FormatUtil : public ::java::lang::Object
-{
-
-  FormatUtil();
-public:
-  static ::java::lang::String * getEncodingName(jint);
-  static ::java::lang::String * getEncodingShortName(jint);
-  static jint getFormatID(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_FormatUtil__
diff --git a/libjava/gnu/java/security/util/IntegerUtil$1.h b/libjava/gnu/java/security/util/IntegerUtil$1.h
deleted file mode 100644
index 03d9674..0000000
--- a/libjava/gnu/java/security/util/IntegerUtil$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_IntegerUtil$1__
-#define __gnu_java_security_util_IntegerUtil$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class IntegerUtil$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::IntegerUtil$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  IntegerUtil$1(jint, jfloat, jboolean);
-public:
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_IntegerUtil$1__
diff --git a/libjava/gnu/java/security/util/IntegerUtil.h b/libjava/gnu/java/security/util/IntegerUtil.h
deleted file mode 100644
index 96a7b24..0000000
--- a/libjava/gnu/java/security/util/IntegerUtil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_IntegerUtil__
-#define __gnu_java_security_util_IntegerUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class IntegerUtil;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::IntegerUtil : public ::java::lang::Object
-{
-
-  IntegerUtil();
-public:
-  static ::java::lang::Integer * valueOf(::java::lang::String *);
-  static ::java::lang::Integer * valueOf(jint);
-private:
-  static const jint CACHE_SIZE = 100;
-  static ::java::util::Map * cache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_IntegerUtil__
diff --git a/libjava/gnu/java/security/util/PRNG.h b/libjava/gnu/java/security/util/PRNG.h
deleted file mode 100644
index 48b45d7..0000000
--- a/libjava/gnu/java/security/util/PRNG.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_PRNG__
-#define __gnu_java_security_util_PRNG__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::PRNG : public ::java::lang::Object
-{
-
-  PRNG(::gnu::java::security::prng::IRandom *);
-public:
-  static ::gnu::java::security::util::PRNG * getInstance();
-  virtual void nextBytes(JArray< jbyte > *);
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_PRNG__
diff --git a/libjava/gnu/java/security/util/Prime.h b/libjava/gnu/java/security/util/Prime.h
deleted file mode 100644
index 3dd531300..0000000
--- a/libjava/gnu/java/security/util/Prime.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_Prime__
-#define __gnu_java_security_util_Prime__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class Prime;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::util::Prime : public ::java::lang::Object
-{
-
-public:
-  Prime();
-  static ::java::math::BigInteger * generateRandomPrime(jint, jint, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * generateRandomPrime(::java::math::BigInteger *, ::java::math::BigInteger *, jint, jint, ::java::math::BigInteger *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_Prime__
diff --git a/libjava/gnu/java/security/util/Sequence.h b/libjava/gnu/java/security/util/Sequence.h
deleted file mode 100644
index 881c5ff..0000000
--- a/libjava/gnu/java/security/util/Sequence.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_Sequence__
-#define __gnu_java_security_util_Sequence__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class Sequence;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::Sequence : public ::java::util::AbstractList
-{
-
-public:
-  Sequence(jint);
-  Sequence(jint, jint);
-  Sequence(jint, jint, jint);
-  ::java::lang::Object * get(jint);
-  jint size();
-  JArray< ::java::lang::Object * > * toArray();
-private:
-  JArray< ::java::lang::Integer * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) sequence;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_Sequence__
diff --git a/libjava/gnu/java/security/util/SimpleList.h b/libjava/gnu/java/security/util/SimpleList.h
deleted file mode 100644
index dc3c1c7..0000000
--- a/libjava/gnu/java/security/util/SimpleList.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_SimpleList__
-#define __gnu_java_security_util_SimpleList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class SimpleList;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::SimpleList : public ::java::util::AbstractList
-{
-
-public:
-  SimpleList(::java::lang::Object *);
-  SimpleList(::java::lang::Object *, ::java::lang::Object *);
-  SimpleList(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  SimpleList(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  SimpleList();
-  SimpleList(::java::util::Collection *);
-  jint size();
-  ::java::lang::Object * get(jint);
-  ::java::lang::String * toString();
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) elements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_SimpleList__
diff --git a/libjava/gnu/java/security/util/Util.h b/libjava/gnu/java/security/util/Util.h
deleted file mode 100644
index 5e7764e..0000000
--- a/libjava/gnu/java/security/util/Util.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_Util__
-#define __gnu_java_security_util_Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class Util;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::util::Util : public ::java::lang::Object
-{
-
-  Util();
-public:
-  static ::java::lang::String * toString(JArray< jbyte > *);
-  static ::java::lang::String * toString(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * toReversedString(JArray< jbyte > *);
-  static ::java::lang::String * toReversedString(JArray< jbyte > *, jint, jint);
-  static JArray< jbyte > * toBytesFromString(::java::lang::String *);
-  static JArray< jbyte > * toReversedBytesFromString(::java::lang::String *);
-  static jint fromDigit(jchar);
-  static ::java::lang::String * toString(jint);
-  static ::java::lang::String * toString(JArray< jint > *);
-  static ::java::lang::String * toString(jlong);
-  static ::java::lang::String * toUnicodeString(JArray< jbyte > *);
-  static ::java::lang::String * toUnicodeString(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * toUnicodeString(JArray< jint > *);
-  static JArray< jbyte > * toBytesFromUnicode(::java::lang::String *);
-  static ::java::lang::String * dumpString(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  static ::java::lang::String * dumpString(JArray< jbyte > *);
-  static ::java::lang::String * dumpString(JArray< jbyte > *, ::java::lang::String *);
-  static ::java::lang::String * dumpString(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * byteToString(jint);
-  static ::java::lang::String * toBase64(JArray< jbyte > *);
-  static JArray< jbyte > * fromBase64(::java::lang::String *);
-  static JArray< jbyte > * trim(::java::math::BigInteger *);
-  static ::java::lang::String * dump(::java::math::BigInteger *);
-private:
-  static JArray< jchar > * HEX_DIGITS;
-  static ::java::lang::String * BASE64_CHARS;
-  static JArray< jchar > * BASE64_CHARSET;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_Util__
diff --git a/libjava/gnu/java/security/x509/GnuPKIExtension.h b/libjava/gnu/java/security/x509/GnuPKIExtension.h
deleted file mode 100644
index d91dc7b..0000000
--- a/libjava/gnu/java/security/x509/GnuPKIExtension.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_GnuPKIExtension__
-#define __gnu_java_security_x509_GnuPKIExtension__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-            class GnuPKIExtension;
-          namespace ext
-          {
-              class Extension;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::GnuPKIExtension : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::java::security::x509::ext::Extension * getExtension(::gnu::java::security::OID *) = 0;
-  virtual ::java::util::Collection * getExtensions() = 0;
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_security_x509_GnuPKIExtension__
diff --git a/libjava/gnu/java/security/x509/PolicyNodeImpl.h b/libjava/gnu/java/security/x509/PolicyNodeImpl.h
deleted file mode 100644
index 1786e4b..0000000
--- a/libjava/gnu/java/security/x509/PolicyNodeImpl.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_PolicyNodeImpl__
-#define __gnu_java_security_x509_PolicyNodeImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class PolicyNodeImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class PolicyNode;
-          class PolicyQualifierInfo;
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::PolicyNodeImpl : public ::java::lang::Object
-{
-
-public:
-  PolicyNodeImpl();
-  void addChild(::gnu::java::security::x509::PolicyNodeImpl *);
-  ::java::util::Iterator * getChildren();
-  jint getDepth();
-  void setDepth(jint);
-  void addAllExpectedPolicies(::java::util::Set *);
-  void addExpectedPolicy(::java::lang::String *);
-  ::java::util::Set * getExpectedPolicies();
-  ::java::security::cert::PolicyNode * getParent();
-  void addAllPolicyQualifiers(::java::util::Collection *);
-  void addPolicyQualifier(::java::security::cert::PolicyQualifierInfo *);
-  ::java::util::Set * getPolicyQualifiers();
-  ::java::lang::String * getValidPolicy();
-  void setValidPolicy(::java::lang::String *);
-  jboolean isCritical();
-  void setCritical(jboolean);
-  void setReadOnly();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) policy;
-  ::java::util::Set * expectedPolicies;
-  ::java::util::Set * qualifiers;
-  ::java::util::Set * children;
-  ::gnu::java::security::x509::PolicyNodeImpl * parent;
-  jint depth;
-  jboolean critical;
-  jboolean readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_PolicyNodeImpl__
diff --git a/libjava/gnu/java/security/x509/Util.h b/libjava/gnu/java/security/x509/Util.h
deleted file mode 100644
index 4a6d4c2..0000000
--- a/libjava/gnu/java/security/x509/Util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_Util__
-#define __gnu_java_security_x509_Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class Util;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::Util : public ::java::lang::Object
-{
-
-public:
-  Util();
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * toHexString(JArray< jbyte > *);
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jint, jint, jchar);
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jchar);
-  static ::java::lang::String * hexDump(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  static ::java::lang::String * hexDump(JArray< jbyte > *, ::java::lang::String *);
-  static ::java::lang::String * formatInt(jint, jint, jint);
-  static JArray< jbyte > * toByteArray(::java::lang::String *);
-  static ::java::lang::String * HEX;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_Util__
diff --git a/libjava/gnu/java/security/x509/X500DistinguishedName.h b/libjava/gnu/java/security/x509/X500DistinguishedName.h
deleted file mode 100644
index c2e9496..0000000
--- a/libjava/gnu/java/security/x509/X500DistinguishedName.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X500DistinguishedName__
-#define __gnu_java_security_x509_X500DistinguishedName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class DERReader;
-        }
-        namespace x509
-        {
-            class X500DistinguishedName;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X500DistinguishedName : public ::java::lang::Object
-{
-
-public:
-  X500DistinguishedName();
-  X500DistinguishedName(::java::lang::String *);
-  X500DistinguishedName(JArray< jbyte > *);
-  X500DistinguishedName(::java::io::InputStream *);
-  virtual ::java::lang::String * getName();
-  virtual void newRelativeDistinguishedName();
-  virtual jint size();
-  virtual jint countComponents();
-  virtual jboolean containsComponent(::gnu::java::security::OID *, ::java::lang::String *);
-  virtual ::java::lang::String * getComponent(::gnu::java::security::OID *);
-  virtual ::java::lang::String * getComponent(::gnu::java::security::OID *, jint);
-  virtual void putComponent(::gnu::java::security::OID *, ::java::lang::String *);
-  virtual void putComponent(::java::lang::String *, ::java::lang::String *);
-  virtual void setUnmodifiable();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getDer();
-private:
-  void parseString(::java::lang::String *);
-  ::java::lang::String * readAttributeType(::java::io::Reader *);
-  ::java::lang::String * readAttributeValue(::java::io::Reader *);
-  void parseDer(::gnu::java::security::der::DERReader *);
-  static ::java::lang::String * compressWS(::java::lang::String *);
-public:
-  static ::gnu::java::security::OID * CN;
-  static ::gnu::java::security::OID * C;
-  static ::gnu::java::security::OID * L;
-  static ::gnu::java::security::OID * ST;
-  static ::gnu::java::security::OID * STREET;
-  static ::gnu::java::security::OID * O;
-  static ::gnu::java::security::OID * OU;
-  static ::gnu::java::security::OID * T;
-  static ::gnu::java::security::OID * DNQ;
-  static ::gnu::java::security::OID * NAME;
-  static ::gnu::java::security::OID * GIVENNAME;
-  static ::gnu::java::security::OID * INITIALS;
-  static ::gnu::java::security::OID * GENERATION;
-  static ::gnu::java::security::OID * EMAIL;
-  static ::gnu::java::security::OID * DC;
-  static ::gnu::java::security::OID * UID;
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  ::java::util::Map * currentRdn;
-  jboolean fixed;
-  ::java::lang::String * stringRep;
-  JArray< jbyte > * encoded;
-  jint sep;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X500DistinguishedName__
diff --git a/libjava/gnu/java/security/x509/X509CRL.h b/libjava/gnu/java/security/x509/X509CRL.h
deleted file mode 100644
index 76d5e1e..0000000
--- a/libjava/gnu/java/security/x509/X509CRL.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509CRL__
-#define __gnu_java_security_x509_X509CRL__
-
-#pragma interface
-
-#include <java/security/cert/X509CRL.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-            class X500DistinguishedName;
-            class X509CRL;
-          namespace ext
-          {
-              class Extension;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-        class Signature;
-      namespace cert
-      {
-          class Certificate;
-          class X509CRLEntry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X509CRL : public ::java::security::cert::X509CRL
-{
-
-public:
-  X509CRL(::java::io::InputStream *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded();
-  virtual void verify(::java::security::PublicKey *);
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *);
-  virtual jint getVersion();
-  virtual ::java::security::Principal * getIssuerDN();
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  virtual ::java::util::Date * getThisUpdate();
-  virtual ::java::util::Date * getNextUpdate();
-  virtual ::java::security::cert::X509CRLEntry * getRevokedCertificate(::java::math::BigInteger *);
-  virtual ::java::util::Set * getRevokedCertificates();
-  virtual JArray< jbyte > * getTBSCertList();
-  virtual JArray< jbyte > * getSignature();
-  virtual ::java::lang::String * getSigAlgName();
-  virtual ::java::lang::String * getSigAlgOID();
-  virtual JArray< jbyte > * getSigAlgParams();
-  virtual jboolean hasUnsupportedCriticalExtension();
-  virtual ::java::util::Set * getCriticalExtensionOIDs();
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs();
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *);
-  virtual ::gnu::java::security::x509::ext::Extension * getExtension(::gnu::java::security::OID *);
-  virtual ::java::util::Collection * getExtensions();
-  virtual ::java::lang::String * toString();
-  virtual jboolean isRevoked(::java::security::cert::Certificate *);
-private:
-  void doVerify(::java::security::Signature *, ::java::security::PublicKey *);
-  void parse(::java::io::InputStream *);
-  static ::java::util::logging::Logger * log;
-  static ::gnu::java::security::OID * ID_DSA;
-  static ::gnu::java::security::OID * ID_DSA_WITH_SHA1;
-  static ::gnu::java::security::OID * ID_RSA;
-  static ::gnu::java::security::OID * ID_RSA_WITH_MD2;
-  static ::gnu::java::security::OID * ID_RSA_WITH_MD5;
-  static ::gnu::java::security::OID * ID_RSA_WITH_SHA1;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::security::cert::X509CRL)))) encoded;
-  JArray< jbyte > * tbsCRLBytes;
-  jint version;
-  ::gnu::java::security::OID * algId;
-  JArray< jbyte > * algParams;
-  ::java::util::Date * thisUpdate;
-  ::java::util::Date * nextUpdate;
-  ::gnu::java::security::x509::X500DistinguishedName * issuerDN;
-  ::java::util::HashMap * revokedCerts;
-  ::java::util::HashMap * extensions;
-  ::gnu::java::security::OID * sigAlg;
-  JArray< jbyte > * sigAlgParams;
-  JArray< jbyte > * rawSig;
-  JArray< jbyte > * signature;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509CRL__
diff --git a/libjava/gnu/java/security/x509/X509CRLEntry.h b/libjava/gnu/java/security/x509/X509CRLEntry.h
deleted file mode 100644
index 7b272f7..0000000
--- a/libjava/gnu/java/security/x509/X509CRLEntry.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509CRLEntry__
-#define __gnu_java_security_x509_X509CRLEntry__
-
-#pragma interface
-
-#include <java/security/cert/X509CRLEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class DERReader;
-        }
-        namespace x509
-        {
-            class X509CRLEntry;
-          namespace ext
-          {
-              class Extension;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::x509::X509CRLEntry : public ::java::security::cert::X509CRLEntry
-{
-
-public: // actually package-private
-  X509CRLEntry(jint, ::gnu::java::security::der::DERReader *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual ::java::util::Date * getRevocationDate();
-  virtual jboolean hasExtensions();
-  virtual ::java::lang::String * toString();
-  virtual jboolean hasUnsupportedCriticalExtension();
-  virtual ::java::util::Set * getCriticalExtensionOIDs();
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs();
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *);
-  virtual ::gnu::java::security::x509::ext::Extension * getExtension(::gnu::java::security::OID *);
-  virtual ::java::util::Collection * getExtensions();
-private:
-  void parse(jint, ::gnu::java::security::der::DERReader *);
-  static ::java::util::logging::Logger * log;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::security::cert::X509CRLEntry)))) encoded;
-  ::java::math::BigInteger * serialNo;
-  ::java::util::Date * revocationDate;
-  ::java::util::HashMap * extensions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509CRLEntry__
diff --git a/libjava/gnu/java/security/x509/X509CRLSelectorImpl.h b/libjava/gnu/java/security/x509/X509CRLSelectorImpl.h
deleted file mode 100644
index 2fc9537..0000000
--- a/libjava/gnu/java/security/x509/X509CRLSelectorImpl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509CRLSelectorImpl__
-#define __gnu_java_security_x509_X509CRLSelectorImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class X509CRLSelectorImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class CRL;
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X509CRLSelectorImpl : public ::java::lang::Object
-{
-
-public:
-  X509CRLSelectorImpl();
-  virtual void addIssuerName(JArray< jbyte > *);
-  virtual void addIssuerName(::java::lang::String *);
-  virtual void addIssuerName(::java::security::Principal *);
-  virtual ::java::util::Collection * getIssuerNames();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean match(::java::security::cert::CRL *);
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) issuerNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509CRLSelectorImpl__
diff --git a/libjava/gnu/java/security/x509/X509CertPath.h b/libjava/gnu/java/security/x509/X509CertPath.h
deleted file mode 100644
index 5aaadc6d..0000000
--- a/libjava/gnu/java/security/x509/X509CertPath.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509CertPath__
-#define __gnu_java_security_x509_X509CertPath__
-
-#pragma interface
-
-#include <java/security/cert/CertPath.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-            class X509CertPath;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X509CertPath : public ::java::security::cert::CertPath
-{
-
-public:
-  X509CertPath(::java::util::List *);
-  X509CertPath(::java::io::InputStream *);
-  X509CertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::util::List * getCertificates();
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getEncoded(::java::lang::String *);
-  virtual ::java::util::Iterator * getEncodings();
-private:
-  void parse(::java::io::InputStream *, ::java::lang::String *);
-  JArray< jbyte > * encodePki();
-  JArray< jbyte > * encodePKCS();
-public:
-  static ::java::util::List * ENCODINGS;
-private:
-  static ::gnu::java::security::OID * PKCS7_SIGNED_DATA;
-  static ::gnu::java::security::OID * PKCS7_DATA;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::security::cert::CertPath)))) path;
-  JArray< jbyte > * pkcs_encoded;
-  JArray< jbyte > * pki_encoded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509CertPath__
diff --git a/libjava/gnu/java/security/x509/X509CertSelectorImpl.h b/libjava/gnu/java/security/x509/X509CertSelectorImpl.h
deleted file mode 100644
index 12a12af..0000000
--- a/libjava/gnu/java/security/x509/X509CertSelectorImpl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509CertSelectorImpl__
-#define __gnu_java_security_x509_X509CertSelectorImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class X509CertSelectorImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X509CertSelectorImpl : public ::java::lang::Object
-{
-
-public:
-  X509CertSelectorImpl();
-  virtual void addIssuerName(JArray< jbyte > *);
-  virtual void addIssuerName(::java::lang::String *);
-  virtual void addIssuerName(::java::security::Principal *);
-  virtual ::java::util::Collection * getIssuerNames();
-  virtual void addSubjectName(JArray< jbyte > *);
-  virtual void addSubjectName(::java::lang::String *);
-  virtual void addSubjectName(::java::security::Principal *);
-  virtual ::java::util::Collection * getSubjectNames();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean match(::java::security::cert::Certificate *);
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) issuerNames;
-  ::java::util::Set * subjectNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509CertSelectorImpl__
diff --git a/libjava/gnu/java/security/x509/X509Certificate.h b/libjava/gnu/java/security/x509/X509Certificate.h
deleted file mode 100644
index 68e9443..0000000
--- a/libjava/gnu/java/security/x509/X509Certificate.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_X509Certificate__
-#define __gnu_java_security_x509_X509Certificate__
-
-#pragma interface
-
-#include <java/security/cert/X509Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class BitString;
-        }
-        namespace x509
-        {
-            class X500DistinguishedName;
-            class X509Certificate;
-          namespace ext
-          {
-              class Extension;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-        class Signature;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::X509Certificate : public ::java::security::cert::X509Certificate
-{
-
-public:
-  X509Certificate(::java::io::InputStream *);
-public: // actually protected
-  X509Certificate();
-public:
-  virtual void checkValidity();
-  virtual void checkValidity(::java::util::Date *);
-  virtual jint getVersion();
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual ::java::security::Principal * getIssuerDN();
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  virtual ::java::security::Principal * getSubjectDN();
-  virtual ::javax::security::auth::x500::X500Principal * getSubjectX500Principal();
-  virtual ::java::util::Date * getNotBefore();
-  virtual ::java::util::Date * getNotAfter();
-  virtual JArray< jbyte > * getTBSCertificate();
-  virtual JArray< jbyte > * getSignature();
-  virtual ::java::lang::String * getSigAlgName();
-  virtual ::java::lang::String * getSigAlgOID();
-  virtual JArray< jbyte > * getSigAlgParams();
-  virtual JArray< jboolean > * getIssuerUniqueID();
-  virtual JArray< jboolean > * getSubjectUniqueID();
-  virtual JArray< jboolean > * getKeyUsage();
-  virtual ::java::util::List * getExtendedKeyUsage();
-  virtual jint getBasicConstraints();
-  virtual ::java::util::Collection * getSubjectAlternativeNames();
-  virtual ::java::util::Collection * getIssuerAlternativeNames();
-  virtual jboolean hasUnsupportedCriticalExtension();
-  virtual ::java::util::Set * getCriticalExtensionOIDs();
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs();
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *);
-  virtual ::gnu::java::security::x509::ext::Extension * getExtension(::gnu::java::security::OID *);
-  virtual ::java::util::Collection * getExtensions();
-  virtual JArray< jbyte > * getEncoded();
-  virtual void verify(::java::security::PublicKey *);
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::security::PublicKey * getPublicKey();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  void doVerify(::java::security::Signature *, ::java::security::PublicKey *);
-  void parse(::java::io::InputStream *);
-  static const jlong serialVersionUID = -2491127588187038216LL;
-  static ::java::util::logging::Logger * logger;
-public: // actually protected
-  static ::gnu::java::security::OID * ID_DSA;
-  static ::gnu::java::security::OID * ID_DSA_WITH_SHA1;
-  static ::gnu::java::security::OID * ID_RSA;
-  static ::gnu::java::security::OID * ID_RSA_WITH_MD2;
-  static ::gnu::java::security::OID * ID_RSA_WITH_MD5;
-  static ::gnu::java::security::OID * ID_RSA_WITH_SHA1;
-  static ::gnu::java::security::OID * ID_ECDSA_WITH_SHA1;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::security::cert::X509Certificate)))) encoded;
-  JArray< jbyte > * tbsCertBytes;
-  jint version;
-  ::java::math::BigInteger * serialNo;
-  ::gnu::java::security::OID * algId;
-  JArray< jbyte > * algVal;
-  ::gnu::java::security::x509::X500DistinguishedName * issuer;
-  ::java::util::Date * notBefore;
-  ::java::util::Date * notAfter;
-  ::gnu::java::security::x509::X500DistinguishedName * subject;
-  ::java::security::PublicKey * subjectKey;
-  ::gnu::java::security::der::BitString * issuerUniqueId;
-  ::gnu::java::security::der::BitString * subjectUniqueId;
-  ::java::util::Map * extensions;
-  ::gnu::java::security::OID * sigAlgId;
-  JArray< jbyte > * sigAlgVal;
-  JArray< jbyte > * signature;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_X509Certificate__
diff --git a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.h b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.h
deleted file mode 100644
index 71b6f60..0000000
--- a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_AuthorityKeyIdentifier__
-#define __gnu_java_security_x509_ext_AuthorityKeyIdentifier__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class AuthorityKeyIdentifier;
-              class GeneralNames;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::AuthorityKeyIdentifier : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  AuthorityKeyIdentifier(JArray< jbyte > *);
-  virtual JArray< jbyte > * getKeyIdentifier();
-  virtual ::gnu::java::security::x509::ext::GeneralNames * getAuthorityCertIssuer();
-  virtual ::java::math::BigInteger * getAuthorityCertSerialNumber();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) keyIdentifier;
-  ::gnu::java::security::x509::ext::GeneralNames * authorityCertIssuer;
-  ::java::math::BigInteger * authorityCertSerialNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_AuthorityKeyIdentifier__
diff --git a/libjava/gnu/java/security/x509/ext/BasicConstraints.h b/libjava/gnu/java/security/x509/ext/BasicConstraints.h
deleted file mode 100644
index 96fffb5..0000000
--- a/libjava/gnu/java/security/x509/ext/BasicConstraints.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_BasicConstraints__
-#define __gnu_java_security_x509_ext_BasicConstraints__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class BasicConstraints;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::BasicConstraints : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  BasicConstraints(JArray< jbyte > *);
-  BasicConstraints(jboolean, jint);
-  virtual jboolean isCA();
-  virtual jint getPathLengthConstraint();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) ca;
-  jint pathLenConstraint;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_BasicConstraints__
diff --git a/libjava/gnu/java/security/x509/ext/CRLNumber.h b/libjava/gnu/java/security/x509/ext/CRLNumber.h
deleted file mode 100644
index ef56baa..0000000
--- a/libjava/gnu/java/security/x509/ext/CRLNumber.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_CRLNumber__
-#define __gnu_java_security_x509_ext_CRLNumber__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class CRLNumber;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::CRLNumber : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  CRLNumber(JArray< jbyte > *);
-  CRLNumber(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getNumber();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_CRLNumber__
diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h b/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
deleted file mode 100644
index 5de6184..0000000
--- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_CertificatePolicies__
-#define __gnu_java_security_x509_ext_CertificatePolicies__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class CertificatePolicies;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::CertificatePolicies : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  CertificatePolicies(JArray< jbyte > *);
-  CertificatePolicies(::java::util::List *, ::java::util::Map *);
-  virtual ::java::util::List * getPolicies();
-  virtual ::java::util::List * getPolicyStrings();
-  virtual ::java::util::List * getPolicyQualifierInfos(::gnu::java::security::OID *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) policies;
-  ::java::util::Map * policyQualifierInfos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_CertificatePolicies__
diff --git a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.h b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.h
deleted file mode 100644
index 61f5f1d..0000000
--- a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_ExtendedKeyUsage__
-#define __gnu_java_security_x509_ext_ExtendedKeyUsage__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class ExtendedKeyUsage;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::ExtendedKeyUsage : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  ExtendedKeyUsage(JArray< jbyte > *);
-  virtual ::java::util::List * getPurposeIds();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) purposeIds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_ExtendedKeyUsage__
diff --git a/libjava/gnu/java/security/x509/ext/Extension$Value.h b/libjava/gnu/java/security/x509/ext/Extension$Value.h
deleted file mode 100644
index 04f069e..0000000
--- a/libjava/gnu/java/security/x509/ext/Extension$Value.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_Extension$Value__
-#define __gnu_java_security_x509_ext_Extension$Value__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-          namespace ext
-          {
-              class Extension$Value;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::Extension$Value : public ::java::lang::Object
-{
-
-public:
-  Extension$Value(JArray< jbyte > *);
-public: // actually protected
-  Extension$Value();
-public:
-  virtual JArray< jbyte > * getEncoded();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encoded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_Extension$Value__
diff --git a/libjava/gnu/java/security/x509/ext/Extension.h b/libjava/gnu/java/security/x509/ext/Extension.h
deleted file mode 100644
index 0e660f9..0000000
--- a/libjava/gnu/java/security/x509/ext/Extension.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_Extension__
-#define __gnu_java_security_x509_ext_Extension__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class DERValue;
-        }
-        namespace x509
-        {
-          namespace ext
-          {
-              class Extension;
-              class Extension$Value;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::Extension : public ::java::lang::Object
-{
-
-public:
-  Extension(JArray< jbyte > *);
-  Extension(::gnu::java::security::OID *, ::gnu::java::security::x509::ext::Extension$Value *, jboolean);
-  virtual ::gnu::java::security::OID * getOid();
-  virtual jboolean isCritical();
-  virtual jboolean isSupported();
-  virtual ::gnu::java::security::x509::ext::Extension$Value * getValue();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * toString();
-  virtual ::gnu::java::security::der::DERValue * getDerValue();
-private:
-  void encode();
-  static ::java::util::logging::Logger * log;
-public: // actually protected
-  ::gnu::java::security::OID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) oid;
-  jboolean critical;
-  jboolean isSupported__;
-  ::gnu::java::security::x509::ext::Extension$Value * value;
-  JArray< jbyte > * encoded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_Extension__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h b/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
deleted file mode 100644
index db98200..0000000
--- a/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_GeneralName$Kind__
-#define __gnu_java_security_x509_ext_GeneralName$Kind__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralName$Kind;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::GeneralName$Kind : public ::java::lang::Enum
-{
-
-  GeneralName$Kind(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * forTag(jint);
-  jint tag();
-  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * values();
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * valueOf(::java::lang::String *);
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * otherName;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * rfc822Name;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * dNSName;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * x400Address;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * directoryName;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * ediPartyName;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * uniformResourceIdentifier;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * iPAddress;
-  static ::gnu::java::security::x509::ext::GeneralName$Kind * registeredId;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) tag__;
-  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_GeneralName$Kind__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName.h b/libjava/gnu/java/security/x509/ext/GeneralName.h
deleted file mode 100644
index 018bd36..0000000
--- a/libjava/gnu/java/security/x509/ext/GeneralName.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_GeneralName__
-#define __gnu_java_security_x509_ext_GeneralName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralName;
-              class GeneralName$Kind;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::GeneralName : public ::java::lang::Object
-{
-
-public:
-  GeneralName(JArray< jbyte > *);
-  GeneralName(::gnu::java::security::x509::ext::GeneralName$Kind *, JArray< jbyte > *);
-  virtual ::gnu::java::security::x509::ext::GeneralName$Kind * kind();
-  virtual JArray< jbyte > * name();
-  virtual JArray< jbyte > * encoded();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind();
-private:
-  ::gnu::java::security::x509::ext::GeneralName$Kind * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kind__;
-  JArray< jbyte > * name__;
-  JArray< jbyte > * encoded__;
-  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_GeneralName__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.h b/libjava/gnu/java/security/x509/ext/GeneralNames.h
deleted file mode 100644
index e55113b..0000000
--- a/libjava/gnu/java/security/x509/ext/GeneralNames.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_GeneralNames__
-#define __gnu_java_security_x509_ext_GeneralNames__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralNames;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::GeneralNames : public ::java::lang::Object
-{
-
-public:
-  GeneralNames(JArray< jbyte > *);
-  virtual ::java::util::List * getNames();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_GeneralNames__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralSubtree.h b/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
deleted file mode 100644
index dae50e2..0000000
--- a/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_GeneralSubtree__
-#define __gnu_java_security_x509_ext_GeneralSubtree__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralName;
-              class GeneralSubtree;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::GeneralSubtree : public ::java::lang::Object
-{
-
-public:
-  GeneralSubtree(JArray< jbyte > *);
-  virtual ::gnu::java::security::x509::ext::GeneralName * base();
-  virtual jint minimum();
-  virtual jint maximum();
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::security::x509::ext::GeneralName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) base__;
-  jint minimum__;
-  jint maximum__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_GeneralSubtree__
diff --git a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.h b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.h
deleted file mode 100644
index 50b3f35..0000000
--- a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_IssuerAlternativeNames__
-#define __gnu_java_security_x509_ext_IssuerAlternativeNames__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralNames;
-              class IssuerAlternativeNames;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::IssuerAlternativeNames : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  IssuerAlternativeNames(JArray< jbyte > *);
-  virtual ::java::util::List * getNames();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::gnu::java::security::x509::ext::GeneralNames * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_IssuerAlternativeNames__
diff --git a/libjava/gnu/java/security/x509/ext/KeyUsage.h b/libjava/gnu/java/security/x509/ext/KeyUsage.h
deleted file mode 100644
index 4293755..0000000
--- a/libjava/gnu/java/security/x509/ext/KeyUsage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_KeyUsage__
-#define __gnu_java_security_x509_ext_KeyUsage__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class BitString;
-        }
-        namespace x509
-        {
-          namespace ext
-          {
-              class KeyUsage;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::KeyUsage : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  KeyUsage(JArray< jbyte > *);
-  virtual ::gnu::java::security::der::BitString * getKeyUsage();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-  static const jint DIGITAL_SIGNATURE = 0;
-  static const jint NON_REPUDIATION = 1;
-  static const jint KEY_ENCIPHERMENT = 2;
-  static const jint DATA_ENCIPHERMENT = 3;
-  static const jint KEY_AGREEMENT = 4;
-  static const jint KEY_CERT_SIGN = 5;
-  static const jint CRL_SIGN = 6;
-  static const jint ENCIPHER_ONLY = 7;
-  static const jint DECIPHER_ONLY = 8;
-private:
-  ::gnu::java::security::der::BitString * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) keyUsage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_KeyUsage__
diff --git a/libjava/gnu/java/security/x509/ext/NameConstraints.h b/libjava/gnu/java/security/x509/ext/NameConstraints.h
deleted file mode 100644
index f7bc778..0000000
--- a/libjava/gnu/java/security/x509/ext/NameConstraints.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_NameConstraints__
-#define __gnu_java_security_x509_ext_NameConstraints__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class NameConstraints;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::NameConstraints : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  NameConstraints(JArray< jbyte > *);
-  virtual ::java::util::List * permittedSubtrees();
-  virtual ::java::util::List * excludedSubtrees();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) permittedSubtrees__;
-  ::java::util::List * excludedSubtrees__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_NameConstraints__
diff --git a/libjava/gnu/java/security/x509/ext/PolicyConstraint.h b/libjava/gnu/java/security/x509/ext/PolicyConstraint.h
deleted file mode 100644
index 1846d46..0000000
--- a/libjava/gnu/java/security/x509/ext/PolicyConstraint.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_PolicyConstraint__
-#define __gnu_java_security_x509_ext_PolicyConstraint__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class PolicyConstraint;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::PolicyConstraint : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  PolicyConstraint(JArray< jbyte > *);
-  virtual jint getRequireExplicitPolicy();
-  virtual jint getInhibitPolicyMapping();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) requireExplicitPolicy;
-  jint inhibitPolicyMapping;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_PolicyConstraint__
diff --git a/libjava/gnu/java/security/x509/ext/PolicyMappings.h b/libjava/gnu/java/security/x509/ext/PolicyMappings.h
deleted file mode 100644
index 2741db3..0000000
--- a/libjava/gnu/java/security/x509/ext/PolicyMappings.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_PolicyMappings__
-#define __gnu_java_security_x509_ext_PolicyMappings__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class PolicyMappings;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::PolicyMappings : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  PolicyMappings(JArray< jbyte > *);
-  virtual ::gnu::java::security::OID * getSubjectDomainPolicy(::gnu::java::security::OID *);
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) mappings;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_PolicyMappings__
diff --git a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.h b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.h
deleted file mode 100644
index 0d14162..0000000
--- a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_PrivateKeyUsagePeriod__
-#define __gnu_java_security_x509_ext_PrivateKeyUsagePeriod__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class PrivateKeyUsagePeriod;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::PrivateKeyUsagePeriod : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  PrivateKeyUsagePeriod(JArray< jbyte > *);
-  virtual ::java::util::Date * getNotBefore();
-  virtual ::java::util::Date * getNotAfter();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) notBefore;
-  ::java::util::Date * notAfter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_PrivateKeyUsagePeriod__
diff --git a/libjava/gnu/java/security/x509/ext/ReasonCode.h b/libjava/gnu/java/security/x509/ext/ReasonCode.h
deleted file mode 100644
index 03a3c45..0000000
--- a/libjava/gnu/java/security/x509/ext/ReasonCode.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_ReasonCode__
-#define __gnu_java_security_x509_ext_ReasonCode__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class ReasonCode;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::ReasonCode : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  ReasonCode(JArray< jbyte > *);
-  virtual jint getReasonCode();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-  jint __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) reason;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_ReasonCode__
diff --git a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.h b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.h
deleted file mode 100644
index 80e9ac0..0000000
--- a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_SubjectAlternativeNames__
-#define __gnu_java_security_x509_ext_SubjectAlternativeNames__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralNames;
-              class SubjectAlternativeNames;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::SubjectAlternativeNames : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  SubjectAlternativeNames(JArray< jbyte > *);
-  virtual ::java::util::List * getNames();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  ::gnu::java::security::x509::ext::GeneralNames * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_SubjectAlternativeNames__
diff --git a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.h b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.h
deleted file mode 100644
index 46cb0f4..0000000
--- a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_x509_ext_SubjectKeyIdentifier__
-#define __gnu_java_security_x509_ext_SubjectKeyIdentifier__
-
-#pragma interface
-
-#include <gnu/java/security/x509/ext/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class SubjectKeyIdentifier;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::x509::ext::SubjectKeyIdentifier : public ::gnu::java::security::x509::ext::Extension$Value
-{
-
-public:
-  SubjectKeyIdentifier(JArray< jbyte > *);
-  virtual JArray< jbyte > * getKeyIdentifier();
-  virtual ::java::lang::String * toString();
-  static ::gnu::java::security::OID * ID;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) keyIdentifier;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_x509_ext_SubjectKeyIdentifier__
diff --git a/libjava/gnu/java/text/AttributedFormatBuffer.h b/libjava/gnu/java/text/AttributedFormatBuffer.h
deleted file mode 100644
index 3429391..0000000
--- a/libjava/gnu/java/text/AttributedFormatBuffer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_AttributedFormatBuffer__
-#define __gnu_java_text_AttributedFormatBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace text
-      {
-          class AttributedFormatBuffer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class gnu::java::text::AttributedFormatBuffer : public ::java::lang::Object
-{
-
-public:
-  AttributedFormatBuffer(::gnu::java::lang::CPStringBuilder *);
-  AttributedFormatBuffer(jint);
-  AttributedFormatBuffer();
-private:
-  void addAttribute(jint, ::java::text::AttributedCharacterIterator$Attribute *);
-public:
-  virtual void append(::java::lang::String *);
-  virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *);
-  virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *);
-  virtual void append(jchar);
-  virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *);
-  virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual ::java::text::AttributedCharacterIterator$Attribute * getDefaultAttribute();
-  virtual void cutTail(jint);
-  virtual jint length();
-  virtual void clear();
-  virtual void sync();
-  virtual ::gnu::java::lang::CPStringBuilder * getBuffer();
-  virtual JArray< jint > * getRanges();
-  virtual ::java::util::List * getAttributes();
-private:
-  ::gnu::java::lang::CPStringBuilder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::java::util::ArrayList * ranges;
-  ::java::util::ArrayList * attributes;
-  JArray< jint > * aRanges;
-  ::java::util::List * aAttributes;
-  jint startingRange;
-public: // actually package-private
-  ::java::text::AttributedCharacterIterator$Attribute * defaultAttr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_AttributedFormatBuffer__
diff --git a/libjava/gnu/java/text/BaseBreakIterator.h b/libjava/gnu/java/text/BaseBreakIterator.h
deleted file mode 100644
index 5099895..0000000
--- a/libjava/gnu/java/text/BaseBreakIterator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_BaseBreakIterator__
-#define __gnu_java_text_BaseBreakIterator__
-
-#pragma interface
-
-#include <java/text/BreakIterator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class BaseBreakIterator;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class gnu::java::text::BaseBreakIterator : public ::java::text::BreakIterator
-{
-
-public:
-  BaseBreakIterator();
-  virtual jint current();
-  virtual jint first();
-  virtual jint following(jint);
-  virtual ::java::text::CharacterIterator * getText();
-  virtual jint last();
-  virtual jint next(jint);
-  virtual void setText(::java::text::CharacterIterator *);
-public: // actually protected
-  ::java::text::CharacterIterator * __attribute__((aligned(__alignof__( ::java::text::BreakIterator)))) iter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_BaseBreakIterator__
diff --git a/libjava/gnu/java/text/CharacterBreakIterator.h b/libjava/gnu/java/text/CharacterBreakIterator.h
deleted file mode 100644
index 39d681c..0000000
--- a/libjava/gnu/java/text/CharacterBreakIterator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_CharacterBreakIterator__
-#define __gnu_java_text_CharacterBreakIterator__
-
-#pragma interface
-
-#include <gnu/java/text/BaseBreakIterator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class CharacterBreakIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::text::CharacterBreakIterator : public ::gnu::java::text::BaseBreakIterator
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  CharacterBreakIterator();
-private:
-  CharacterBreakIterator(::gnu::java::text::CharacterBreakIterator *);
-  jboolean isL(jchar);
-  jboolean isV(jchar);
-  jboolean isT(jchar);
-  jboolean isLVT(jchar);
-  jboolean isHighSurrogate(jchar);
-  jboolean isLowSurrogate(jchar);
-public:
-  virtual jint next();
-  virtual jint previous();
-private:
-  static const jint LBase = 4352;
-  static const jint VBase = 4449;
-  static const jint TBase = 4519;
-  static const jint LCount = 19;
-  static const jint VCount = 21;
-  static const jint TCount = 28;
-  static const jint highSurrogateStart = 55296;
-  static const jint highSurrogateEnd = 56319;
-  static const jint lowSurrogateStart = 56320;
-  static const jint lowSurrogateEnd = 57343;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_CharacterBreakIterator__
diff --git a/libjava/gnu/java/text/FormatBuffer.h b/libjava/gnu/java/text/FormatBuffer.h
deleted file mode 100644
index 14fcd5a..0000000
--- a/libjava/gnu/java/text/FormatBuffer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_FormatBuffer__
-#define __gnu_java_text_FormatBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class FormatBuffer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class gnu::java::text::FormatBuffer : public ::java::lang::Object
-{
-
-public:
-  virtual void append(::java::lang::String *) = 0;
-  virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *) = 0;
-  virtual void append(jchar) = 0;
-  virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual ::java::text::AttributedCharacterIterator$Attribute * getDefaultAttribute() = 0;
-  virtual void cutTail(jint) = 0;
-  virtual void clear() = 0;
-  virtual jint length() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_text_FormatBuffer__
diff --git a/libjava/gnu/java/text/FormatCharacterIterator.h b/libjava/gnu/java/text/FormatCharacterIterator.h
deleted file mode 100644
index dcb6838..0000000
--- a/libjava/gnu/java/text/FormatCharacterIterator.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_FormatCharacterIterator__
-#define __gnu_java_text_FormatCharacterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class FormatCharacterIterator;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class gnu::java::text::FormatCharacterIterator : public ::java::lang::Object
-{
-
-public:
-  FormatCharacterIterator();
-  FormatCharacterIterator(::java::lang::String *, JArray< jint > *, ::java::util::List *);
-  virtual ::java::util::Set * getAllAttributeKeys();
-  virtual ::java::util::Map * getAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual jint getRunLimit(::java::util::Set *);
-  virtual jint getRunLimit(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual jint getRunLimit();
-  virtual jint getRunStart(::java::util::Set *);
-  virtual jint getRunStart();
-  virtual jint getRunStart(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual ::java::lang::Object * clone();
-  virtual jchar current();
-  virtual jchar first();
-  virtual jint getBeginIndex();
-  virtual jint getEndIndex();
-  virtual jint getIndex();
-  virtual jchar last();
-  virtual jchar next();
-  virtual jchar previous();
-  virtual jchar setIndex(jint);
-  virtual void mergeAttributes(::java::util::List *, JArray< jint > *);
-  virtual void append(::java::text::AttributedCharacterIterator *);
-  virtual void append(::java::lang::String *, ::java::util::HashMap *);
-  virtual void append(::java::lang::String *);
-  virtual void addAttributes(::java::util::Map *, jint, jint);
-private:
-  void debug(::java::lang::String *);
-  void dumpTable();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formattedString;
-  jint charIndex;
-  jint attributeIndex;
-  JArray< jint > * ranges;
-  ::java::util::List * attributes;
-  static const jboolean DEBUG = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_FormatCharacterIterator__
diff --git a/libjava/gnu/java/text/LineBreakIterator.h b/libjava/gnu/java/text/LineBreakIterator.h
deleted file mode 100644
index 0c4c428..0000000
--- a/libjava/gnu/java/text/LineBreakIterator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_LineBreakIterator__
-#define __gnu_java_text_LineBreakIterator__
-
-#pragma interface
-
-#include <gnu/java/text/BaseBreakIterator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class LineBreakIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::text::LineBreakIterator : public ::gnu::java::text::BaseBreakIterator
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  LineBreakIterator();
-private:
-  LineBreakIterator(::gnu::java::text::LineBreakIterator *);
-  jboolean isNb(jchar);
-  jboolean isClose(jint);
-  jboolean isIdeo(jchar);
-public:
-  virtual jint next();
-  virtual jint previous();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_LineBreakIterator__
diff --git a/libjava/gnu/java/text/SentenceBreakIterator.h b/libjava/gnu/java/text/SentenceBreakIterator.h
deleted file mode 100644
index ae54389..0000000
--- a/libjava/gnu/java/text/SentenceBreakIterator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_SentenceBreakIterator__
-#define __gnu_java_text_SentenceBreakIterator__
-
-#pragma interface
-
-#include <gnu/java/text/BaseBreakIterator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class SentenceBreakIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::text::SentenceBreakIterator : public ::gnu::java::text::BaseBreakIterator
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  SentenceBreakIterator();
-private:
-  SentenceBreakIterator(::gnu::java::text::SentenceBreakIterator *);
-public:
-  virtual jint next();
-private:
-  jint previous_internal();
-public:
-  virtual jint previous();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::text::BaseBreakIterator)))) period;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_SentenceBreakIterator__
diff --git a/libjava/gnu/java/text/StringFormatBuffer.h b/libjava/gnu/java/text/StringFormatBuffer.h
deleted file mode 100644
index 945aa9b..0000000
--- a/libjava/gnu/java/text/StringFormatBuffer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_StringFormatBuffer__
-#define __gnu_java_text_StringFormatBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class StringFormatBuffer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class gnu::java::text::StringFormatBuffer : public ::java::lang::Object
-{
-
-public:
-  StringFormatBuffer(jint);
-  StringFormatBuffer(::java::lang::StringBuffer *);
-  virtual void append(::java::lang::String *);
-  virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *);
-  virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *);
-  virtual void append(jchar);
-  virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *);
-  virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual ::java::text::AttributedCharacterIterator$Attribute * getDefaultAttribute();
-  virtual void cutTail(jint);
-  virtual jint length();
-  virtual void clear();
-  virtual ::java::lang::StringBuffer * getBuffer();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::java::text::AttributedCharacterIterator$Attribute * defaultAttr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_StringFormatBuffer__
diff --git a/libjava/gnu/java/text/WordBreakIterator.h b/libjava/gnu/java/text/WordBreakIterator.h
deleted file mode 100644
index bcf75bd..0000000
--- a/libjava/gnu/java/text/WordBreakIterator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_text_WordBreakIterator__
-#define __gnu_java_text_WordBreakIterator__
-
-#pragma interface
-
-#include <gnu/java/text/BaseBreakIterator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class WordBreakIterator;
-      }
-    }
-  }
-}
-
-class gnu::java::text::WordBreakIterator : public ::gnu::java::text::BaseBreakIterator
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  WordBreakIterator();
-private:
-  WordBreakIterator(::gnu::java::text::WordBreakIterator *);
-  jboolean isHira(jchar);
-  jboolean isKata(jchar);
-  jboolean isHan(jchar);
-public:
-  virtual jint next();
-  virtual jint previous();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_text_WordBreakIterator__
diff --git a/libjava/gnu/java/util/Base64.h b/libjava/gnu/java/util/Base64.h
deleted file mode 100644
index 69c2a4f..0000000
--- a/libjava/gnu/java/util/Base64.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_Base64__
-#define __gnu_java_util_Base64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class Base64;
-      }
-    }
-  }
-}
-
-class gnu::java::util::Base64 : public ::java::lang::Object
-{
-
-  Base64();
-public:
-  static ::java::lang::String * encode(JArray< jbyte > *);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint, jint, jint);
-  static JArray< jbyte > * decode(::java::lang::String *);
-private:
-  static ::java::lang::String * BASE_64;
-  static const jchar BASE_64_PAD = 61;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_Base64__
diff --git a/libjava/gnu/java/util/DoubleEnumeration.h b/libjava/gnu/java/util/DoubleEnumeration.h
deleted file mode 100644
index d1ec0ca..0000000
--- a/libjava/gnu/java/util/DoubleEnumeration.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_DoubleEnumeration__
-#define __gnu_java_util_DoubleEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class DoubleEnumeration;
-      }
-    }
-  }
-}
-
-class gnu::java::util::DoubleEnumeration : public ::java::lang::Object
-{
-
-public:
-  DoubleEnumeration(::java::util::Enumeration *, ::java::util::Enumeration *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasMore;
-  jboolean hasChecked;
-  ::java::util::Enumeration * e1;
-  ::java::util::Enumeration * e2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_DoubleEnumeration__
diff --git a/libjava/gnu/java/util/EmptyEnumeration.h b/libjava/gnu/java/util/EmptyEnumeration.h
deleted file mode 100644
index c565096..0000000
--- a/libjava/gnu/java/util/EmptyEnumeration.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_EmptyEnumeration__
-#define __gnu_java_util_EmptyEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class EmptyEnumeration;
-      }
-    }
-  }
-}
-
-class gnu::java::util::EmptyEnumeration : public ::java::lang::Object
-{
-
-public:
-  EmptyEnumeration();
-  static ::gnu::java::util::EmptyEnumeration * getInstance();
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  static ::gnu::java::util::EmptyEnumeration * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_EmptyEnumeration__
diff --git a/libjava/gnu/java/util/LRUCache.h b/libjava/gnu/java/util/LRUCache.h
deleted file mode 100644
index fc524d0..0000000
--- a/libjava/gnu/java/util/LRUCache.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_LRUCache__
-#define __gnu_java_util_LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class LRUCache;
-      }
-    }
-  }
-}
-
-class gnu::java::util::LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) capacity;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_LRUCache__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$1.h b/libjava/gnu/java/util/WeakIdentityHashMap$1.h
deleted file mode 100644
index a25584d..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$1__
-#define __gnu_java_util_WeakIdentityHashMap$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$1;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WeakIdentityHashMap$1(::gnu::java::util::WeakIdentityHashMap$WeakEntrySet *);
-private:
-  void checkMod();
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * findNext(::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastEntry;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * nextEntry;
-  jint knownMod;
-  ::gnu::java::util::WeakIdentityHashMap$WeakEntrySet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$1__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h
deleted file mode 100644
index 5a7c0dd..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
-#define __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry : public ::java::lang::Object
-{
-
-public:
-  WeakIdentityHashMap$WeakBucket$WeakEntry(::gnu::java::util::WeakIdentityHashMap$WeakBucket *, ::java::lang::Object *);
-  virtual ::gnu::java::util::WeakIdentityHashMap$WeakBucket * getBucket();
-  virtual ::java::lang::Object * getKey();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * setValue(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h
deleted file mode 100644
index ec84add..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakBucket__
-#define __gnu_java_util_WeakIdentityHashMap$WeakBucket__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakBucket : public ::java::lang::ref::WeakReference
-{
-
-public:
-  WeakIdentityHashMap$WeakBucket(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *, ::java::lang::Object *, jint);
-public: // actually package-private
-  virtual ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * getEntry();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) value;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket * next;
-  jint slot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakBucket__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h
deleted file mode 100644
index 136c1de..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
-#define __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakEntrySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  WeakIdentityHashMap$WeakEntrySet(::gnu::java::util::WeakIdentityHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::gnu::java::util::WeakIdentityHashMap * access$0(::gnu::java::util::WeakIdentityHashMap$WeakEntrySet *);
-  ::gnu::java::util::WeakIdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap.h b/libjava/gnu/java/util/WeakIdentityHashMap.h
deleted file mode 100644
index 6bf3aeb7f..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap__
-#define __gnu_java_util_WeakIdentityHashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap;
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap : public ::java::util::AbstractMap
-{
-
-public:
-  WeakIdentityHashMap();
-  WeakIdentityHashMap(jint);
-  WeakIdentityHashMap(jint, jfloat);
-  WeakIdentityHashMap(::java::util::Map *);
-private:
-  jint hash(::java::lang::Object *);
-public: // actually package-private
-  virtual void cleanQueue();
-private:
-  void rehash();
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * internalGet(::java::lang::Object *);
-  void internalAdd(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void internalRemove(::gnu::java::util::WeakIdentityHashMap$WeakBucket *);
-public:
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual void clear();
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::util::Collection * values();
-private:
-  static const jint DEFAULT_CAPACITY = 11;
-  static jfloat DEFAULT_LOAD_FACTOR;
-public: // actually package-private
-  static ::java::lang::Object * NULL_KEY;
-private:
-  ::java::lang::ref::ReferenceQueue * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) queue;
-public: // actually package-private
-  jint size__;
-private:
-  jfloat loadFactor;
-  jint threshold;
-public: // actually package-private
-  jint modCount;
-private:
-  ::gnu::java::util::WeakIdentityHashMap$WeakEntrySet * theEntrySet;
-public: // actually package-private
-  JArray< ::gnu::java::util::WeakIdentityHashMap$WeakBucket * > * buckets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap__
diff --git a/libjava/gnu/java/util/ZoneInfo.h b/libjava/gnu/java/util/ZoneInfo.h
deleted file mode 100644
index 83a0bf8..0000000
--- a/libjava/gnu/java/util/ZoneInfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_ZoneInfo__
-#define __gnu_java_util_ZoneInfo__
-
-#pragma interface
-
-#include <java/util/TimeZone.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class ZoneInfo;
-      }
-    }
-  }
-}
-
-class gnu::java::util::ZoneInfo : public ::java::util::TimeZone
-{
-
-public:
-  ZoneInfo(jint, ::java::lang::String *, JArray< jlong > *, ::java::util::SimpleTimeZone *);
-  virtual jint getOffset(jint, jint, jint, jint, jint, jint);
-private:
-  jlong findTransition(jlong);
-public:
-  virtual jint getOffset(jlong);
-  virtual jint getRawOffset();
-  virtual void setRawOffset(jint);
-private:
-  void computeDSTSavings();
-public:
-  virtual jint getDSTSavings();
-  virtual jboolean useDaylightTime();
-  virtual jboolean inDaylightTime(::java::util::Date *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean hasSameRules(::java::util::TimeZone *);
-  virtual ::java::lang::String * toString();
-  static ::java::util::TimeZone * readTZFile(::java::lang::String *, ::java::lang::String *);
-private:
-  static void skipFully(::java::io::InputStream *, jlong);
-  static ::java::util::SimpleTimeZone * createLastRule(::java::lang::String *);
-  static JArray< jint > * getDateParams(::java::lang::String *);
-  static jint parseTime(::java::lang::String *);
-  static const jint SECS_SHIFT = 22;
-  static const jlong OFFSET_MASK = 2097151LL;
-  static const jint OFFSET_SHIFT = 43;
-  static const jlong IS_DST = 2097152LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::TimeZone)))) rawOffset;
-  jint dstSavings;
-  jboolean useDaylight;
-  JArray< jlong > * transitions;
-  ::java::util::SimpleTimeZone * lastRule;
-  static ::java::util::SimpleTimeZone * gmtZone;
-public: // actually package-private
-  static const jlong serialVersionUID = -3740626706860383657LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_ZoneInfo__
diff --git a/libjava/gnu/java/util/jar/JarUtils.h b/libjava/gnu/java/util/jar/JarUtils.h
deleted file mode 100644
index 1d12845..0000000
--- a/libjava/gnu/java/util/jar/JarUtils.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_jar_JarUtils__
-#define __gnu_java_util_jar_JarUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace jar
-        {
-            class JarUtils;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::jar::JarUtils : public ::java::lang::Object
-{
-
-public:
-  JarUtils();
-  static void readMFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::InputStream *);
-  static void readSFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::InputStream *);
-private:
-  static void readMainSection(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static void readIndividualSections(::java::util::Map *, ::java::io::BufferedReader *);
-  static void readVersionInfo(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static ::java::lang::String * expectHeader(::java::lang::String *, ::java::io::BufferedReader *);
-  static void read_attributes(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static void readAttribute(::java::util::jar::Attributes *, ::java::lang::String *, ::java::io::BufferedReader *);
-  static ::java::lang::String * readHeaderValue(::java::lang::String *, ::java::io::BufferedReader *);
-  static ::java::util::jar::Attributes * readSectionName(::java::lang::String *, ::java::io::BufferedReader *, ::java::util::Map *);
-  static ::java::lang::String * expectHeader(::java::lang::String *, ::java::io::BufferedReader *, ::java::lang::String *);
-public:
-  static void writeMFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::OutputStream *);
-  static void writeSFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::OutputStream *);
-private:
-  static void writeVersionInfo(::java::util::jar::Attributes *, ::java::io::OutputStream *);
-  static void writeAttributeEntry(::java::util::Map$Entry *, ::java::io::OutputStream *);
-  static void writeHeader(::java::lang::String *, ::java::lang::String *, ::java::io::OutputStream *);
-public:
-  static ::java::lang::String * META_INF;
-  static ::java::lang::String * DSA_SUFFIX;
-  static ::java::lang::String * SF_SUFFIX;
-  static ::java::lang::String * NAME;
-  static ::java::lang::String * MANIFEST_VERSION;
-  static ::java::lang::String * SIGNATURE_VERSION;
-  static JArray< jbyte > * CRLF;
-private:
-  static ::java::lang::String * DEFAULT_MF_VERSION;
-  static ::java::lang::String * DEFAULT_SF_VERSION;
-  static ::java::util::jar::Attributes$Name * CREATED_BY;
-  static ::java::lang::String * CREATOR;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_jar_JarUtils__
diff --git a/libjava/gnu/java/util/prefs/FileBasedFactory.h b/libjava/gnu/java/util/prefs/FileBasedFactory.h
deleted file mode 100644
index 9dfcca3..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedFactory__
-#define __gnu_java_util_prefs_FileBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedFactory : public ::java::lang::Object
-{
-
-public:
-  FileBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h b/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h
deleted file mode 100644
index 244914d..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedPreferences$1__
-#define __gnu_java_util_prefs_FileBasedPreferences$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedPreferences;
-            class FileBasedPreferences$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedPreferences$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FileBasedPreferences$1(::gnu::java::util::prefs::FileBasedPreferences *);
-public:
-  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
-public: // actually package-private
-  ::gnu::java::util::prefs::FileBasedPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedPreferences$1__
diff --git a/libjava/gnu/java/util/prefs/FileBasedPreferences.h b/libjava/gnu/java/util/prefs/FileBasedPreferences.h
deleted file mode 100644
index 0b69998..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedPreferences.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedPreferences__
-#define __gnu_java_util_prefs_FileBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedPreferences;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public: // actually package-private
-  FileBasedPreferences();
-  FileBasedPreferences(::gnu::java::util::prefs::FileBasedPreferences *, ::java::lang::String *);
-private:
-  void load();
-public:
-  virtual jboolean isUserNode();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * keysSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeSpi(::java::lang::String *);
-  virtual void flushSpi();
-  virtual void syncSpi();
-  virtual void removeNodeSpi();
-private:
-  static ::java::lang::String * DATA_FILE;
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) directory;
-  ::java::io::File * dataFile;
-  ::java::util::Properties * properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/GConfBasedFactory.h b/libjava/gnu/java/util/prefs/GConfBasedFactory.h
deleted file mode 100644
index eca98e3..0000000
--- a/libjava/gnu/java/util/prefs/GConfBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_GConfBasedFactory__
-#define __gnu_java_util_prefs_GConfBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class GConfBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::GConfBasedFactory : public ::java::lang::Object
-{
-
-public:
-  GConfBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_GConfBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/GConfBasedPreferences.h b/libjava/gnu/java/util/prefs/GConfBasedPreferences.h
deleted file mode 100644
index 54f9f01..0000000
--- a/libjava/gnu/java/util/prefs/GConfBasedPreferences.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_GConfBasedPreferences__
-#define __gnu_java_util_prefs_GConfBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class GConfBasedPreferences;
-          namespace gconf
-          {
-              class GConfNativePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class gnu::java::util::prefs::GConfBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public:
-  GConfBasedPreferences();
-  GConfBasedPreferences(jboolean);
-  GConfBasedPreferences(::java::util::prefs::AbstractPreferences *, ::java::lang::String *, jboolean);
-public: // actually protected
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-public:
-  virtual void flush();
-public: // actually protected
-  virtual void flushSpi();
-  virtual JArray< ::java::lang::String * > * keysSpi();
-private:
-  void postorderRemove(::java::lang::String *);
-public: // actually protected
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeNodeSpi();
-  virtual void removeSpi(::java::lang::String *);
-public:
-  virtual void sync();
-public: // actually protected
-  virtual void syncSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-public:
-  virtual jboolean isUserNode();
-private:
-  ::java::lang::String * getGConfKey(::java::lang::String *);
-  ::java::lang::String * getRealRoot(jboolean);
-  static ::java::security::Permission * PERMISSION;
-  static ::gnu::java::util::prefs::gconf::GConfNativePeer * backend;
-  static ::java::lang::String * DEFAULT_USER_ROOT;
-  static ::java::lang::String * DEFAULT_SYSTEM_ROOT;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) node;
-  jboolean isUser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_GConfBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/MemoryBasedFactory.h b/libjava/gnu/java/util/prefs/MemoryBasedFactory.h
deleted file mode 100644
index 7eb4c3d..0000000
--- a/libjava/gnu/java/util/prefs/MemoryBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_MemoryBasedFactory__
-#define __gnu_java_util_prefs_MemoryBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class MemoryBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::MemoryBasedFactory : public ::java::lang::Object
-{
-
-public:
-  MemoryBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_MemoryBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h b/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h
deleted file mode 100644
index 5e73aa0..0000000
--- a/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_MemoryBasedPreferences__
-#define __gnu_java_util_prefs_MemoryBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class MemoryBasedPreferences;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::MemoryBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public:
-  MemoryBasedPreferences(::gnu::java::util::prefs::MemoryBasedPreferences *, ::java::lang::String *, jboolean);
-  virtual jboolean isUserNode();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * keysSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeSpi(::java::lang::String *);
-  virtual void flushSpi();
-  virtual void syncSpi();
-  virtual void removeNodeSpi();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) isUser;
-  ::java::util::HashMap * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_MemoryBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/NodeReader.h b/libjava/gnu/java/util/prefs/NodeReader.h
deleted file mode 100644
index e62b023..0000000
--- a/libjava/gnu/java/util/prefs/NodeReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_NodeReader__
-#define __gnu_java_util_prefs_NodeReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class NodeReader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::NodeReader : public ::java::lang::Object
-{
-
-public:
-  NodeReader(::java::io::Reader *, ::java::util::prefs::PreferencesFactory *);
-  NodeReader(::java::io::InputStream *, ::java::util::prefs::PreferencesFactory *);
-  virtual void importPreferences();
-private:
-  void readPreferences();
-  void readRoot();
-  void readNodes(::java::util::prefs::Preferences *);
-  void readMap(::java::util::prefs::Preferences *);
-  void readEntries(::java::util::prefs::Preferences *);
-  void skipTill(::java::lang::String *);
-  ::java::lang::String * readTill(::java::lang::String *);
-  ::java::lang::String * nextTag();
-  ::java::io::BufferedReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) br;
-  ::java::lang::String * line;
-  ::java::util::prefs::PreferencesFactory * factory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_NodeReader__
diff --git a/libjava/gnu/java/util/prefs/NodeWriter.h b/libjava/gnu/java/util/prefs/NodeWriter.h
deleted file mode 100644
index 65b7380..0000000
--- a/libjava/gnu/java/util/prefs/NodeWriter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_NodeWriter__
-#define __gnu_java_util_prefs_NodeWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class NodeWriter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::NodeWriter : public ::java::lang::Object
-{
-
-public:
-  NodeWriter(::java::util::prefs::Preferences *, ::java::io::OutputStream *);
-  virtual void writePrefsTree();
-  virtual void writePrefs();
-private:
-  void writeHeader();
-  void writePreferences();
-  void writeRoot();
-  void writeRootMap();
-  jint writeParents();
-  void writeCloseParents(jint);
-  void writeNode();
-  void writeNode(::java::util::prefs::Preferences *, jint);
-  void writeMap(::java::util::prefs::Preferences *, jint);
-  void writeEntries(::java::util::prefs::Preferences *, ::java::lang::String *);
-  void indent(jint);
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
-  ::java::io::BufferedWriter * bw;
-  jboolean subtree;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_NodeWriter__
diff --git a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
deleted file mode 100644
index e0e37d7..0000000
--- a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_gconf_GConfNativePeer__
-#define __gnu_java_util_prefs_gconf_GConfNativePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-          namespace gconf
-          {
-              class GConfNativePeer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::gconf::GConfNativePeer : public ::java::lang::Object
-{
-
-public:
-  GConfNativePeer();
-  jboolean nodeExist(::java::lang::String *);
-  jboolean setString(::java::lang::String *, ::java::lang::String *);
-  jboolean unset(::java::lang::String *);
-  ::java::lang::String * getKey(::java::lang::String *);
-  ::java::util::List * getKeys(::java::lang::String *);
-  ::java::util::List * getChildrenNodes(::java::lang::String *);
-  static ::java::lang::String * escapeString(::java::lang::String *);
-  static ::java::lang::String * unescapeString(::java::lang::String *);
-  void suggestSync();
-public: // actually protected
-  void finalize();
-private:
-  static void init_id_cache();
-  static void init_class();
-  static void finalize_class();
-public: // actually protected
-  static jboolean gconf_dir_exists(::java::lang::String *);
-  static jboolean gconf_set_string(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * gconf_get_string(::java::lang::String *);
-  static jboolean gconf_unset(::java::lang::String *);
-  static void gconf_suggest_sync();
-  static ::java::util::List * gconf_all_nodes(::java::lang::String *);
-  static ::java::util::List * gconf_all_keys(::java::lang::String *);
-  static ::java::lang::String * gconf_escape_key(::java::lang::String *);
-  static ::java::lang::String * gconf_unescape_key(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_gconf_GConfNativePeer__
diff --git a/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h b/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h
deleted file mode 100644
index 00d9e51..0000000
--- a/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_BacktrackStack$Backtrack__
-#define __gnu_java_util_regex_BacktrackStack$Backtrack__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack$Backtrack;
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::BacktrackStack$Backtrack : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BacktrackStack$Backtrack(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) token;
-  ::gnu::java::util::regex::CharIndexed * input;
-  ::gnu::java::util::regex::REMatch * match;
-  ::java::lang::Object * param;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_BacktrackStack$Backtrack__
diff --git a/libjava/gnu/java/util/regex/BacktrackStack.h b/libjava/gnu/java/util/regex/BacktrackStack.h
deleted file mode 100644
index 94ab3fd..0000000
--- a/libjava/gnu/java/util/regex/BacktrackStack.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_BacktrackStack__
-#define __gnu_java_util_regex_BacktrackStack__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class BacktrackStack$Backtrack;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::BacktrackStack : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BacktrackStack();
-  jboolean empty();
-  ::gnu::java::util::regex::BacktrackStack$Backtrack * peek();
-  ::gnu::java::util::regex::BacktrackStack$Backtrack * pop();
-  void clear();
-  void push(::gnu::java::util::regex::BacktrackStack$Backtrack *);
-  JArray< ::gnu::java::util::regex::BacktrackStack$Backtrack * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stack;
-private:
-  jint size;
-  jint capacity;
-  static const jint INITIAL_CAPACITY = 32;
-  static const jint CAPACITY_INCREMENT = 16;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_BacktrackStack__
diff --git a/libjava/gnu/java/util/regex/CharIndexed.h b/libjava/gnu/java/util/regex/CharIndexed.h
deleted file mode 100644
index 0f2687a..0000000
--- a/libjava/gnu/java/util/regex/CharIndexed.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexed__
-#define __gnu_java_util_regex_CharIndexed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexed : public ::java::lang::Object
-{
-
-public:
-  virtual jchar charAt(jint) = 0;
-  virtual jboolean move(jint) = 0;
-  virtual jboolean move1(jint) = 0;
-  virtual jboolean isValid() = 0;
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint) = 0;
-  virtual jint length() = 0;
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *) = 0;
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch() = 0;
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *) = 0;
-  virtual jboolean hitEnd() = 0;
-  virtual jint getAnchor() = 0;
-  virtual void setAnchor(jint) = 0;
-  static const jchar OUT_OF_BOUNDS = 65535;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_util_regex_CharIndexed__
diff --git a/libjava/gnu/java/util/regex/CharIndexedCharArray.h b/libjava/gnu/java/util/regex/CharIndexedCharArray.h
deleted file mode 100644
index 30e97db..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedCharArray.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedCharArray__
-#define __gnu_java_util_regex_CharIndexedCharArray__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedCharArray;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedCharArray : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedCharArray(JArray< jchar > *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedCharArray__
diff --git a/libjava/gnu/java/util/regex/CharIndexedCharSequence.h b/libjava/gnu/java/util/regex/CharIndexedCharSequence.h
deleted file mode 100644
index f45b146..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedCharSequence.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedCharSequence__
-#define __gnu_java_util_regex_CharIndexedCharSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class CharIndexedCharSequence;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedCharSequence : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CharIndexedCharSequence(::java::lang::CharSequence *, jint);
-public:
-  virtual jchar charAt(jint);
-  virtual jboolean isValid();
-  virtual jboolean move(jint);
-  virtual jboolean move1(jint);
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint);
-  virtual jint length();
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch();
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *);
-  virtual jboolean hitEnd();
-  virtual jint getAnchor();
-  virtual void setAnchor(jint);
-private:
-  ::java::lang::CharSequence * __attribute__((aligned(__alignof__( ::java::lang::Object)))) s;
-  jint anchor;
-  jint len;
-  ::gnu::java::util::regex::REMatch * lastMatch;
-  jint rightmostTriedPosition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedCharSequence__
diff --git a/libjava/gnu/java/util/regex/CharIndexedInputStream.h b/libjava/gnu/java/util/regex/CharIndexedInputStream.h
deleted file mode 100644
index 46c8582..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedInputStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedInputStream__
-#define __gnu_java_util_regex_CharIndexedInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class CharIndexedInputStream;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedInputStream : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CharIndexedInputStream(::java::io::InputStream *, jint);
-private:
-  jboolean next();
-public:
-  virtual jchar charAt(jint);
-  virtual jboolean move(jint);
-  virtual jboolean isValid();
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint);
-  virtual jint length();
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch();
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *);
-  virtual jboolean hitEnd();
-  virtual jint getAnchor();
-  virtual void setAnchor(jint);
-  virtual jboolean move1(jint);
-private:
-  static const jint BUFFER_INCREMENT = 1024;
-  static const jint UNKNOWN = 2147483647;
-  ::java::io::BufferedInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) br;
-  jint index;
-  jint bufsize;
-  jint end;
-  jchar cached;
-  JArray< jchar > * lookBehind__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedInputStream__
diff --git a/libjava/gnu/java/util/regex/CharIndexedString.h b/libjava/gnu/java/util/regex/CharIndexedString.h
deleted file mode 100644
index e250a31..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedString.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedString__
-#define __gnu_java_util_regex_CharIndexedString__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedString;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedString : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedString(::java::lang::String *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedString__
diff --git a/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h b/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h
deleted file mode 100644
index 497422b..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedStringBuffer__
-#define __gnu_java_util_regex_CharIndexedStringBuffer__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedStringBuffer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedStringBuffer : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedStringBuffer(::java::lang::StringBuffer *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedStringBuffer__
diff --git a/libjava/gnu/java/util/regex/RE$CharExpression.h b/libjava/gnu/java/util/regex/RE$CharExpression.h
deleted file mode 100644
index d39ea7b..0000000
--- a/libjava/gnu/java/util/regex/RE$CharExpression.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$CharExpression__
-#define __gnu_java_util_regex_RE$CharExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$CharExpression;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$CharExpression : public ::java::lang::Object
-{
-
-  RE$CharExpression();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  RE$CharExpression(::gnu::java::util::regex::RE$CharExpression *);
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) ch;
-  ::java::lang::String * expr;
-  jint len;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$CharExpression__
diff --git a/libjava/gnu/java/util/regex/RE$CharUnit.h b/libjava/gnu/java/util/regex/RE$CharUnit.h
deleted file mode 100644
index 2ca3088..0000000
--- a/libjava/gnu/java/util/regex/RE$CharUnit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$CharUnit__
-#define __gnu_java_util_regex_RE$CharUnit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$CharUnit;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$CharUnit : public ::java::lang::Object
-{
-
-  RE$CharUnit();
-public: // actually package-private
-  RE$CharUnit(::gnu::java::util::regex::RE$CharUnit *);
-public:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) ch;
-  jboolean bk;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$CharUnit__
diff --git a/libjava/gnu/java/util/regex/RE$IntPair.h b/libjava/gnu/java/util/regex/RE$IntPair.h
deleted file mode 100644
index 88019c2..0000000
--- a/libjava/gnu/java/util/regex/RE$IntPair.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$IntPair__
-#define __gnu_java_util_regex_RE$IntPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$IntPair;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$IntPair : public ::java::lang::Object
-{
-
-  RE$IntPair();
-public: // actually package-private
-  RE$IntPair(::gnu::java::util::regex::RE$IntPair *);
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) first;
-  jint second;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$IntPair__
diff --git a/libjava/gnu/java/util/regex/RE$NamedProperty.h b/libjava/gnu/java/util/regex/RE$NamedProperty.h
deleted file mode 100644
index a874f85..0000000
--- a/libjava/gnu/java/util/regex/RE$NamedProperty.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$NamedProperty__
-#define __gnu_java_util_regex_RE$NamedProperty__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$NamedProperty;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$NamedProperty : public ::java::lang::Object
-{
-
-  RE$NamedProperty();
-public: // actually package-private
-  RE$NamedProperty(::gnu::java::util::regex::RE$NamedProperty *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jboolean negate;
-  jint len;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$NamedProperty__
diff --git a/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h b/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h
deleted file mode 100644
index 5395877..0000000
--- a/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$ParseCharClassResult__
-#define __gnu_java_util_regex_RE$ParseCharClassResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$ParseCharClassResult;
-            class RETokenOneOf;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$ParseCharClassResult : public ::java::lang::Object
-{
-
-  RE$ParseCharClassResult();
-public: // actually package-private
-  RE$ParseCharClassResult(::gnu::java::util::regex::RE$ParseCharClassResult *);
-  ::gnu::java::util::regex::RETokenOneOf * __attribute__((aligned(__alignof__( ::java::lang::Object)))) token;
-  jint index;
-  jboolean returnAtAndOperator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$ParseCharClassResult__
diff --git a/libjava/gnu/java/util/regex/RE.h b/libjava/gnu/java/util/regex/RE.h
deleted file mode 100644
index ee798b7..0000000
--- a/libjava/gnu/java/util/regex/RE.h
+++ /dev/null
@@ -1,150 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE__
-#define __gnu_java_util_regex_RE__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class RE;
-            class RE$CharExpression;
-            class RE$CharUnit;
-            class RE$IntPair;
-            class RE$NamedProperty;
-            class RE$ParseCharClassResult;
-            class REMatch;
-            class REMatchEnumeration;
-            class RESyntax;
-            class REToken;
-            class RETokenNamedProperty;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE : public ::gnu::java::util::regex::REToken
-{
-
-public:
-  static ::java::lang::String * version();
-public: // actually package-private
-  static ::java::lang::String * getLocalizedMessage(::java::lang::String *);
-public:
-  RE(::java::lang::Object *);
-  RE(::java::lang::Object *, jint);
-  RE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *);
-private:
-  RE(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::REToken *, jint, jint, jint, jint);
-  RE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *, jint, jint);
-public: // actually protected
-  RE();
-  virtual void initialize(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *, jint, jint);
-private:
-  static ::gnu::java::util::regex::RE$ParseCharClassResult * parseCharClass(jint, JArray< jchar > *, jint, jint, jint, ::gnu::java::util::regex::RESyntax *, jint);
-  static jint getCharUnit(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$CharUnit *, jboolean);
-  static jint parseInt(JArray< jchar > *, jint, jint, jint);
-  static ::gnu::java::util::regex::RE$CharExpression * getCharExpression(JArray< jchar > *, jint, jint, ::gnu::java::util::regex::RESyntax *);
-  static ::gnu::java::util::regex::RE$NamedProperty * getNamedProperty(JArray< jchar > *, jint, jint);
-  static ::gnu::java::util::regex::RETokenNamedProperty * getRETokenNamedProperty(jint, ::gnu::java::util::regex::RE$NamedProperty *, jboolean, jint);
-public:
-  virtual jboolean isMatch(::java::lang::Object *);
-  virtual jboolean isMatch(::java::lang::Object *, jint);
-  virtual jboolean isMatch(::java::lang::Object *, jint, jint);
-private:
-  jboolean isMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint);
-public:
-  virtual jint getNumSubs();
-public: // actually package-private
-  virtual void setUncle(::gnu::java::util::regex::REToken *);
-  virtual jboolean chain(::gnu::java::util::regex::REToken *);
-public:
-  virtual jint getMinimumLength();
-  virtual jint getMaximumLength();
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *);
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *, jint);
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *, jint, jint);
-private:
-  JArray< ::gnu::java::util::regex::REMatch * > * getAllMatchesImpl(::gnu::java::util::regex::CharIndexed *, jint, jint);
-public: // actually package-private
-  virtual jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public:
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::gnu::java::lang::CPStringBuilder *);
-public: // actually package-private
-  virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::gnu::java::lang::CPStringBuilder *);
-public:
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *);
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint);
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint, jint);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *, jint, jint);
-private:
-  ::java::lang::String * substituteImpl(::gnu::java::util::regex::CharIndexed *, ::java::lang::String *, jint, jint);
-public:
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *);
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *, jint, jint);
-private:
-  ::java::lang::String * substituteAllImpl(::gnu::java::util::regex::CharIndexed *, ::java::lang::String *, jint, jint);
-public:
-  static ::java::lang::String * getReplacement(::java::lang::String *, ::gnu::java::util::regex::REMatch *, jint);
-private:
-  void addToken(::gnu::java::util::regex::REToken *);
-  static ::gnu::java::util::regex::REToken * setRepeated(::gnu::java::util::regex::REToken *, jint, jint, jint);
-  static jint getPosixSet(JArray< jchar > *, jint, ::gnu::java::lang::CPStringBuilder *);
-  jint getMinMax(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$IntPair *, ::gnu::java::util::regex::RESyntax *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::gnu::java::util::regex::CharIndexed * makeCharIndexed(::java::lang::Object *, jint);
-private:
-  static ::java::lang::String * VERSION;
-  static ::java::util::ResourceBundle * messages;
-  static ::java::lang::String * bundle;
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) firstToken;
-  ::gnu::java::util::regex::REToken * lastToken;
-  jint numSubs;
-  jint minimumLength;
-  jint maximumLength;
-public:
-  static const jint REG_ICASE = 2;
-  static const jint REG_DOT_NEWLINE = 4;
-  static const jint REG_MULTILINE = 8;
-  static const jint REG_NOTBOL = 16;
-  static const jint REG_NOTEOL = 32;
-  static const jint REG_ANCHORINDEX = 64;
-  static const jint REG_NO_INTERPOLATE = 128;
-  static const jint REG_TRY_ENTIRE_MATCH = 256;
-  static const jint REG_REPLACE_USE_BACKSLASHESCAPE = 512;
-  static const jint REG_X_COMMENTS = 1024;
-  static const jint REG_ICASE_USASCII = 2048;
-  static const jint REG_FIX_STARTING_POSITION = 4096;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE__
diff --git a/libjava/gnu/java/util/regex/REException.h b/libjava/gnu/java/util/regex/REException.h
deleted file mode 100644
index dc91d47..0000000
--- a/libjava/gnu/java/util/regex/REException.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REException__
-#define __gnu_java_util_regex_REException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class REException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REException : public ::java::lang::Exception
-{
-
-public: // actually package-private
-  REException(::java::lang::String *, jint, jint);
-  REException(::java::lang::String *, ::java::lang::Throwable *, jint, jint);
-public:
-  virtual jint getType();
-  virtual jint getPosition();
-  virtual ::java::lang::String * getMessage();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) type;
-  jint pos;
-public:
-  static const jint REG_BADRPT = 1;
-  static const jint REG_BADBR = 2;
-  static const jint REG_EBRACE = 3;
-  static const jint REG_EBRACK = 4;
-  static const jint REG_ERANGE = 5;
-  static const jint REG_ECTYPE = 6;
-  static const jint REG_EPAREN = 7;
-  static const jint REG_ESUBREG = 8;
-  static const jint REG_EEND = 9;
-  static const jint REG_ESCAPE = 10;
-  static const jint REG_BADPAT = 11;
-  static const jint REG_ESIZE = 12;
-  static const jint REG_ESPACE = 13;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REException__
diff --git a/libjava/gnu/java/util/regex/REFilterInputStream.h b/libjava/gnu/java/util/regex/REFilterInputStream.h
deleted file mode 100644
index 2bed265..0000000
--- a/libjava/gnu/java/util/regex/REFilterInputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REFilterInputStream__
-#define __gnu_java_util_regex_REFilterInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedInputStream;
-            class RE;
-            class REFilterInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REFilterInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  REFilterInputStream(::java::io::InputStream *, ::gnu::java::util::regex::RE *, ::java::lang::String *);
-  virtual jint read();
-  virtual jboolean markSupported();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-private:
-  ::gnu::java::util::regex::RE * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) expr;
-  ::java::lang::String * replace;
-  ::java::lang::String * buffer;
-  jint bufpos;
-  jint offset;
-  ::gnu::java::util::regex::CharIndexedInputStream * stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REFilterInputStream__
diff --git a/libjava/gnu/java/util/regex/REMatch.h b/libjava/gnu/java/util/regex/REMatch.h
deleted file mode 100644
index 363bb74..0000000
--- a/libjava/gnu/java/util/regex/REMatch.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REMatch__
-#define __gnu_java_util_regex_REMatch__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class CharIndexed;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REMatch : public ::java::lang::Object
-{
-
-public:
-  ::java::lang::Object * clone();
-public: // actually package-private
-  void assignFrom(::gnu::java::util::regex::REMatch *);
-  REMatch(jint, jint, jint);
-  void finish(::gnu::java::util::regex::CharIndexed *);
-  void clear(jint);
-public:
-  ::java::lang::String * toString();
-  jint getStartIndex();
-  jint getEndIndex();
-  ::java::lang::String * toString(jint);
-  jint getSubStartIndex(jint);
-  jint getStartIndex(jint);
-  jint getSubEndIndex(jint);
-  jint getEndIndex(jint);
-  ::java::lang::String * substituteInto(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) matchedText;
-  ::gnu::java::util::regex::CharIndexed * matchedCharIndexed;
-public: // actually package-private
-  jint eflags;
-  jint offset;
-  jint anchor;
-  jint index;
-  JArray< jint > * start;
-  JArray< jint > * start1;
-  JArray< jint > * end;
-  jboolean empty;
-  ::gnu::java::util::regex::BacktrackStack * backtrackStack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REMatch__
diff --git a/libjava/gnu/java/util/regex/REMatchEnumeration.h b/libjava/gnu/java/util/regex/REMatchEnumeration.h
deleted file mode 100644
index 6b0d888..0000000
--- a/libjava/gnu/java/util/regex/REMatchEnumeration.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REMatchEnumeration__
-#define __gnu_java_util_regex_REMatchEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class RE;
-            class REMatch;
-            class REMatchEnumeration;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REMatchEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  REMatchEnumeration(::gnu::java::util::regex::RE *, ::gnu::java::util::regex::CharIndexed *, jint, jint);
-public:
-  virtual jboolean hasMoreElements();
-  virtual jboolean hasMoreMatches();
-  virtual jboolean hasMoreMatches(::gnu::java::lang::CPStringBuilder *);
-  virtual ::gnu::java::util::regex::REMatch * REMatchEnumeration$nextElement();
-  virtual ::java::lang::Object * nextElement();
-private:
-  static const jint YES = 1;
-  static const jint MAYBE = 0;
-  static const jint NO = -1;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) more;
-  ::gnu::java::util::regex::REMatch * match;
-  ::gnu::java::util::regex::RE * expr;
-  ::gnu::java::util::regex::CharIndexed * input;
-  jint eflags;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REMatchEnumeration__
diff --git a/libjava/gnu/java/util/regex/RESyntax.h b/libjava/gnu/java/util/regex/RESyntax.h
deleted file mode 100644
index 59c8de0..0000000
--- a/libjava/gnu/java/util/regex/RESyntax.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RESyntax__
-#define __gnu_java_util_regex_RESyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RESyntax;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RESyntax : public ::java::lang::Object
-{
-
-public:
-  RESyntax();
-  ::gnu::java::util::regex::RESyntax * makeFinal();
-  RESyntax(::gnu::java::util::regex::RESyntax *);
-  jboolean get(jint);
-  ::gnu::java::util::regex::RESyntax * set(jint);
-  ::gnu::java::util::regex::RESyntax * clear(jint);
-  ::gnu::java::util::regex::RESyntax * setLineSeparator(::java::lang::String *);
-  ::java::lang::String * getLineSeparator();
-public: // actually package-private
-  static ::java::lang::String * DEFAULT_LINE_SEPARATOR;
-private:
-  ::java::util::BitSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bits;
-  jboolean isFinal;
-  ::java::lang::String * lineSeparator;
-public:
-  static const jint RE_BACKSLASH_ESCAPE_IN_LISTS = 0;
-  static const jint RE_BK_PLUS_QM = 1;
-  static const jint RE_CHAR_CLASSES = 2;
-  static const jint RE_CONTEXT_INDEP_ANCHORS = 3;
-  static const jint RE_CONTEXT_INDEP_OPS = 4;
-  static const jint RE_CONTEXT_INVALID_OPS = 5;
-  static const jint RE_DOT_NEWLINE = 6;
-  static const jint RE_DOT_NOT_NULL = 7;
-  static const jint RE_INTERVALS = 8;
-  static const jint RE_LIMITED_OPS = 9;
-  static const jint RE_NEWLINE_ALT = 10;
-  static const jint RE_NO_BK_BRACES = 11;
-  static const jint RE_NO_BK_PARENS = 12;
-  static const jint RE_NO_BK_REFS = 13;
-  static const jint RE_NO_BK_VBAR = 14;
-  static const jint RE_NO_EMPTY_RANGES = 15;
-  static const jint RE_UNMATCHED_RIGHT_PAREN_ORD = 16;
-  static const jint RE_HAT_LISTS_NOT_NEWLINE = 17;
-  static const jint RE_STINGY_OPS = 18;
-  static const jint RE_CHAR_CLASS_ESCAPES = 19;
-  static const jint RE_PURE_GROUPING = 20;
-  static const jint RE_LOOKAHEAD = 21;
-  static const jint RE_STRING_ANCHORS = 22;
-  static const jint RE_COMMENTS = 23;
-  static const jint RE_CHAR_CLASS_ESC_IN_LISTS = 24;
-  static const jint RE_POSSESSIVE_OPS = 25;
-  static const jint RE_EMBEDDED_FLAGS = 26;
-  static const jint RE_OCTAL_CHAR = 27;
-  static const jint RE_HEX_CHAR = 28;
-  static const jint RE_UNICODE_CHAR = 29;
-  static const jint RE_NAMED_PROPERTY = 30;
-  static const jint RE_NESTED_CHARCLASS = 31;
-private:
-  static const jint BIT_TOTAL = 32;
-public:
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_AWK;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_ED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_EGREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_EMACS;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_GREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_AWK;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_BASIC;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_EGREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_EXTENDED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_MINIMAL_BASIC;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_MINIMAL_EXTENDED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_SED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL4;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL4_S;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL5;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL5_S;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_JAVA_1_4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RESyntax__
diff --git a/libjava/gnu/java/util/regex/REToken.h b/libjava/gnu/java/util/regex/REToken.h
deleted file mode 100644
index 552d47a..0000000
--- a/libjava/gnu/java/util/regex/REToken.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REToken__
-#define __gnu_java_util_regex_REToken__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REToken : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  REToken(jint);
-public: // actually package-private
-  virtual jint getMinimumLength();
-  virtual jint getMaximumLength();
-  virtual void setUncle(::gnu::java::util::regex::REToken *);
-  virtual jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean matchFake(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-public: // actually package-private
-  virtual void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually protected
-  virtual jboolean next(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually package-private
-  virtual ::gnu::java::util::regex::REToken * getNext();
-  virtual ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthMatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  virtual jboolean chain(::gnu::java::util::regex::REToken *);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *) = 0;
-  virtual void dumpAll(::gnu::java::lang::CPStringBuilder *);
-public:
-  virtual ::java::lang::String * toString();
-  static jchar toLowerCase(jchar, jboolean);
-  static jchar toUpperCase(jchar, jboolean);
-public: // actually protected
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next__;
-  ::gnu::java::util::regex::REToken * uncle;
-  jint subIndex;
-  jboolean unicodeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REToken__
diff --git a/libjava/gnu/java/util/regex/RETokenAny.h b/libjava/gnu/java/util/regex/RETokenAny.h
deleted file mode 100644
index 77f00aa..0000000
--- a/libjava/gnu/java/util/regex/RETokenAny.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenAny__
-#define __gnu_java_util_regex_RETokenAny__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenAny;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenAny : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenAny(jint, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean matchNull;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenAny__
diff --git a/libjava/gnu/java/util/regex/RETokenBackRef.h b/libjava/gnu/java/util/regex/RETokenBackRef.h
deleted file mode 100644
index 4cadd54..0000000
--- a/libjava/gnu/java/util/regex/RETokenBackRef.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenBackRef__
-#define __gnu_java_util_regex_RETokenBackRef__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenBackRef;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenBackRef : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenBackRef(jint, jint, jboolean);
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) num;
-  jboolean insens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenBackRef__
diff --git a/libjava/gnu/java/util/regex/RETokenChar.h b/libjava/gnu/java/util/regex/RETokenChar.h
deleted file mode 100644
index 723bed8..0000000
--- a/libjava/gnu/java/util/regex/RETokenChar.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenChar__
-#define __gnu_java_util_regex_RETokenChar__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenChar;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenChar : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenChar(jint, jchar, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchOneString(::gnu::java::util::regex::CharIndexed *, jint);
-  jboolean charEquals(jchar, jchar);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  jboolean chain(::gnu::java::util::regex::REToken *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) ch;
-  jboolean insens;
-  jint matchedLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenChar__
diff --git a/libjava/gnu/java/util/regex/RETokenEnd.h b/libjava/gnu/java/util/regex/RETokenEnd.h
deleted file mode 100644
index 975bb16..0000000
--- a/libjava/gnu/java/util/regex/RETokenEnd.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEnd__
-#define __gnu_java_util_regex_RETokenEnd__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEnd;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEnd : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenEnd(jint, ::java::lang::String *);
-  RETokenEnd(jint, ::java::lang::String *, jboolean);
-  void setFake(jboolean);
-  jint getMaximumLength();
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean check_java_line_terminators;
-  jboolean fake;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEnd__
diff --git a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h
deleted file mode 100644
index be56833..0000000
--- a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEndOfPreviousMatch__
-#define __gnu_java_util_regex_RETokenEndOfPreviousMatch__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenStart.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEndOfPreviousMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEndOfPreviousMatch : public ::gnu::java::util::regex::RETokenStart
-{
-
-public: // actually package-private
-  RETokenEndOfPreviousMatch(jint);
-  virtual jint getMaximumLength();
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthmatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEndOfPreviousMatch__
diff --git a/libjava/gnu/java/util/regex/RETokenEndSub.h b/libjava/gnu/java/util/regex/RETokenEndSub.h
deleted file mode 100644
index 109e28b..0000000
--- a/libjava/gnu/java/util/regex/RETokenEndSub.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEndSub__
-#define __gnu_java_util_regex_RETokenEndSub__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEndSub;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEndSub : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenEndSub(jint);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEndSub__
diff --git a/libjava/gnu/java/util/regex/RETokenIndependent.h b/libjava/gnu/java/util/regex/RETokenIndependent.h
deleted file mode 100644
index 7800296..0000000
--- a/libjava/gnu/java/util/regex/RETokenIndependent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenIndependent__
-#define __gnu_java_util_regex_RETokenIndependent__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenIndependent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenIndependent : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenIndependent(::gnu::java::util::regex::REToken *);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenIndependent__
diff --git a/libjava/gnu/java/util/regex/RETokenLookAhead.h b/libjava/gnu/java/util/regex/RETokenLookAhead.h
deleted file mode 100644
index b3e1a72..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookAhead.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookAhead__
-#define __gnu_java_util_regex_RETokenLookAhead__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenLookAhead;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookAhead : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenLookAhead(::gnu::java::util::regex::REToken *, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-  jboolean negative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookAhead__
diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h
deleted file mode 100644
index dc771b4..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
-#define __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenLookBehind$RETokenMatchHereOnly;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookBehind$RETokenMatchHereOnly : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  virtual jint getMaximumLength();
-  RETokenLookBehind$RETokenMatchHereOnly(jint);
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind.h b/libjava/gnu/java/util/regex/RETokenLookBehind.h
deleted file mode 100644
index 3aa8013..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookBehind__
-#define __gnu_java_util_regex_RETokenLookBehind__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenLookBehind;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookBehind : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenLookBehind(::gnu::java::util::regex::REToken *, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-  jboolean negative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookBehind__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h
deleted file mode 100644
index 559e061..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$1__
-#define __gnu_java_util_regex_RETokenNamedProperty$1__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty;
-            class RETokenNamedProperty$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$1 : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public: // actually package-private
-  RETokenNamedProperty$1(::gnu::java::util::regex::RETokenNamedProperty *);
-public:
-  virtual jboolean includes(jchar);
-public: // actually package-private
-  ::gnu::java::util::regex::RETokenNamedProperty * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$1__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h
deleted file mode 100644
index bc5efe1..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$Handler__
-#define __gnu_java_util_regex_RETokenNamedProperty$Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$Handler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$Handler : public ::java::lang::Object
-{
-
-  RETokenNamedProperty$Handler();
-public:
-  virtual jboolean includes(jchar) = 0;
-public: // actually package-private
-  RETokenNamedProperty$Handler(::gnu::java::util::regex::RETokenNamedProperty$Handler *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$Handler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h
deleted file mode 100644
index 8c9e229..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$JavaCategoryHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$JavaCategoryHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$JavaCategoryHandler(::java::lang::reflect::Method *);
-  virtual jboolean includes(jchar);
-private:
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) method;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h
deleted file mode 100644
index 121accc..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$POSIXHandler;
-            class RETokenPOSIX;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$POSIXHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$POSIXHandler(::java::lang::String *);
-  virtual jboolean includes(jchar);
-private:
-  ::gnu::java::util::regex::RETokenPOSIX * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) retoken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h
deleted file mode 100644
index c2890ed..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeBlockHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeBlockHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeBlockHandler(::java::lang::Character$UnicodeBlock *);
-  virtual jboolean includes(jchar);
-private:
-  ::java::lang::Character$UnicodeBlock * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) block;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h
deleted file mode 100644
index af6c5ae..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeCategoriesHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeCategoriesHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeCategoriesHandler(JArray< jbyte > *);
-  virtual jboolean includes(jchar);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) categories;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h
deleted file mode 100644
index f090dbd..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeCategoryHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeCategoryHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeCategoryHandler(jbyte);
-  virtual jboolean includes(jchar);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) category;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty.h b/libjava/gnu/java/util/regex/RETokenNamedProperty.h
deleted file mode 100644
index a20a1a3..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty__
-#define __gnu_java_util_regex_RETokenNamedProperty__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenNamedProperty;
-            class RETokenNamedProperty$Handler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenNamedProperty(jint, ::java::lang::String *, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchOneChar(jchar);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::gnu::java::util::regex::RETokenNamedProperty$Handler * getHandler(::java::lang::String *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) name;
-  jboolean insens;
-  jboolean negate;
-  ::gnu::java::util::regex::RETokenNamedProperty$Handler * handler;
-  static JArray< jbyte > * LETTER;
-  static JArray< jbyte > * MARK;
-  static JArray< jbyte > * SEPARATOR;
-  static JArray< jbyte > * SYMBOL;
-  static JArray< jbyte > * NUMBER;
-  static JArray< jbyte > * PUNCTUATION;
-  static JArray< jbyte > * OTHER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty__
diff --git a/libjava/gnu/java/util/regex/RETokenOneOf.h b/libjava/gnu/java/util/regex/RETokenOneOf.h
deleted file mode 100644
index b7f819d..0000000
--- a/libjava/gnu/java/util/regex/RETokenOneOf.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenOneOf__
-#define __gnu_java_util_regex_RETokenOneOf__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenOneOf;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenOneOf : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenOneOf(jint, ::java::lang::String *, jboolean, jboolean);
-  RETokenOneOf(jint, ::java::util::List *, jboolean);
-  RETokenOneOf(jint, ::java::util::List *, ::java::util::List *, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchN(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-  jboolean matchP(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-  jboolean matchOneRE(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually package-private
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-private:
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options;
-  jboolean negative;
-  jboolean matchesOneChar;
-  ::java::util::List * addition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenOneOf__
diff --git a/libjava/gnu/java/util/regex/RETokenPOSIX.h b/libjava/gnu/java/util/regex/RETokenPOSIX.h
deleted file mode 100644
index 5704ab8..0000000
--- a/libjava/gnu/java/util/regex/RETokenPOSIX.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenPOSIX__
-#define __gnu_java_util_regex_RETokenPOSIX__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenPOSIX;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenPOSIX : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  static jint intValue(::java::lang::String *);
-  RETokenPOSIX(jint, jint, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) type;
-  jboolean insens;
-  jboolean negated;
-  static const jint ALNUM = 0;
-  static const jint ALPHA = 1;
-  static const jint BLANK = 2;
-  static const jint CNTRL = 3;
-  static const jint DIGIT = 4;
-  static const jint GRAPH = 5;
-  static const jint LOWER = 6;
-  static const jint PRINT = 7;
-  static const jint PUNCT = 8;
-  static const jint SPACE = 9;
-  static const jint UPPER = 10;
-  static const jint XDIGIT = 11;
-  static JArray< ::java::lang::String * > * s_nameTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenPOSIX__
diff --git a/libjava/gnu/java/util/regex/RETokenRange.h b/libjava/gnu/java/util/regex/RETokenRange.h
deleted file mode 100644
index fa3c923..0000000
--- a/libjava/gnu/java/util/regex/RETokenRange.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRange__
-#define __gnu_java_util_regex_RETokenRange__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenRange;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRange : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenRange(jint, jchar, jchar, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jchar __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) lo;
-  jchar hi;
-  jboolean insens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRange__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h b/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h
deleted file mode 100644
index 8b92ce52..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
-#define __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenRepeated$DoablesFinder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$DoablesFinder : public ::java::lang::Object
-{
-
-  RETokenRepeated$DoablesFinder(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * find();
-public: // actually package-private
-  virtual jboolean noMore();
-  RETokenRepeated$DoablesFinder(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  static ::gnu::java::util::regex::REMatch * access$1(::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-private:
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tk;
-  ::gnu::java::util::regex::CharIndexed * input;
-  ::gnu::java::util::regex::REMatch * rematch;
-  jboolean findFirst;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h b/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h
deleted file mode 100644
index 5858aed..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
-#define __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$FindMatchControl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$FindMatchControl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RETokenRepeated$FindMatchControl(::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  ::gnu::java::util::regex::RETokenRepeated$DoablesFinder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) finder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h b/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h
deleted file mode 100644
index 6253b64..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$StackedInfo__
-#define __gnu_java_util_regex_RETokenRepeated$StackedInfo__
-
-#pragma interface
-
-#include <gnu/java/util/regex/BacktrackStack$Backtrack.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$StackedInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$StackedInfo : public ::gnu::java::util::regex::BacktrackStack$Backtrack
-{
-
-public: // actually package-private
-  RETokenRepeated$StackedInfo(::gnu::java::util::regex::CharIndexed *, jint, ::gnu::java::util::regex::REMatch *, JArray< jint > *, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::BacktrackStack$Backtrack)))) numRepeats;
-  JArray< jint > * visited;
-  ::gnu::java::util::regex::RETokenRepeated$DoablesFinder * finder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$StackedInfo__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h b/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h
deleted file mode 100644
index 5a6ef3b..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
-#define __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class REMatch;
-            class RETokenRepeated$TryAnotherResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$TryAnotherResult : public ::java::lang::Object
-{
-
-  RETokenRepeated$TryAnotherResult();
-public: // actually package-private
-  RETokenRepeated$TryAnotherResult(::gnu::java::util::regex::RETokenRepeated$TryAnotherResult *);
-  ::gnu::java::util::regex::REMatch * __attribute__((aligned(__alignof__( ::java::lang::Object)))) result;
-  jint status;
-  static const jint RESULT_FOUND = 1;
-  static const jint TRY_FURTHER = 2;
-  static const jint NOTHING_FOUND = 3;
-  JArray< jint > * visited;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated.h b/libjava/gnu/java/util/regex/RETokenRepeated.h
deleted file mode 100644
index 09aca7a..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated__
-#define __gnu_java_util_regex_RETokenRepeated__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenRepeated;
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$TryAnotherResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenRepeated(jint, ::gnu::java::util::regex::REToken *, jint, jint);
-  void makeStingy();
-  jboolean isStingy();
-  void makePossessive();
-  jboolean isPossessive();
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-private:
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *);
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::java::util::Deque *);
-  ::gnu::java::util::regex::RETokenRepeated$TryAnotherResult * tryAnother(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *, JArray< jint > *);
-public: // actually package-private
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  static JArray< jint > * initVisited();
-  static jboolean visitedContains(jint, JArray< jint > *);
-  static JArray< jint > * addVisited(jint, JArray< jint > *);
-  ::gnu::java::util::regex::REMatch * matchRest(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrackFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, jint);
-public: // actually package-private
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) token;
-  jint min;
-  jint max;
-  jboolean stingy;
-  jboolean possessive;
-  jint tokenFixedLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated__
diff --git a/libjava/gnu/java/util/regex/RETokenStart.h b/libjava/gnu/java/util/regex/RETokenStart.h
deleted file mode 100644
index 95654f7..0000000
--- a/libjava/gnu/java/util/regex/RETokenStart.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenStart__
-#define __gnu_java_util_regex_RETokenStart__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenStart;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenStart : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenStart(jint, ::java::lang::String *);
-  RETokenStart(jint, ::java::lang::String *, jboolean);
-  virtual jint getMaximumLength();
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthMatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean check_java_line_terminators;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenStart__
diff --git a/libjava/gnu/java/util/regex/RETokenWordBoundary.h b/libjava/gnu/java/util/regex/RETokenWordBoundary.h
deleted file mode 100644
index 18d5b2c..0000000
--- a/libjava/gnu/java/util/regex/RETokenWordBoundary.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenWordBoundary__
-#define __gnu_java_util_regex_RETokenWordBoundary__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenWordBoundary;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenWordBoundary : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenWordBoundary(jint, jint, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) negated;
-  jint where;
-public: // actually package-private
-  static const jint BEGIN = 1;
-  static const jint END = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenWordBoundary__
diff --git a/libjava/gnu/java/util/regex/UncheckedRE.h b/libjava/gnu/java/util/regex/UncheckedRE.h
deleted file mode 100644
index 23a2898..0000000
--- a/libjava/gnu/java/util/regex/UncheckedRE.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_UncheckedRE__
-#define __gnu_java_util_regex_UncheckedRE__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RE.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RESyntax;
-            class UncheckedRE;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::UncheckedRE : public ::gnu::java::util::regex::RE
-{
-
-public:
-  UncheckedRE(::java::lang::Object *);
-  UncheckedRE(::java::lang::Object *, jint);
-  UncheckedRE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_UncheckedRE__
diff --git a/libjava/gnu/javax/activation/viewers/ImageViewer.h b/libjava/gnu/javax/activation/viewers/ImageViewer.h
deleted file mode 100644
index bda76a6..0000000
--- a/libjava/gnu/javax/activation/viewers/ImageViewer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_activation_viewers_ImageViewer__
-#define __gnu_javax_activation_viewers_ImageViewer__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace activation
-      {
-        namespace viewers
-        {
-            class ImageViewer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataHandler;
-    }
-  }
-}
-
-class gnu::javax::activation::viewers::ImageViewer : public ::java::awt::Component
-{
-
-public:
-  ImageViewer();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *);
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual void paint(::java::awt::Graphics *);
-private:
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::Component)))) image;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_activation_viewers_ImageViewer__
diff --git a/libjava/gnu/javax/activation/viewers/TextEditor.h b/libjava/gnu/javax/activation/viewers/TextEditor.h
deleted file mode 100644
index 0047d43..0000000
--- a/libjava/gnu/javax/activation/viewers/TextEditor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_activation_viewers_TextEditor__
-#define __gnu_javax_activation_viewers_TextEditor__
-
-#pragma interface
-
-#include <java/awt/TextArea.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace activation
-      {
-        namespace viewers
-        {
-            class TextEditor;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataHandler;
-    }
-  }
-}
-
-class gnu::javax::activation::viewers::TextEditor : public ::java::awt::TextArea
-{
-
-public:
-  TextEditor();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::activation::DataHandler * __attribute__((aligned(__alignof__( ::java::awt::TextArea)))) dh;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_activation_viewers_TextEditor__
diff --git a/libjava/gnu/javax/activation/viewers/TextViewer.h b/libjava/gnu/javax/activation/viewers/TextViewer.h
deleted file mode 100644
index 56c5f79..0000000
--- a/libjava/gnu/javax/activation/viewers/TextViewer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_activation_viewers_TextViewer__
-#define __gnu_javax_activation_viewers_TextViewer__
-
-#pragma interface
-
-#include <java/awt/TextArea.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace activation
-      {
-        namespace viewers
-        {
-            class TextViewer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataHandler;
-    }
-  }
-}
-
-class gnu::javax::activation::viewers::TextViewer : public ::java::awt::TextArea
-{
-
-public:
-  TextViewer();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_activation_viewers_TextViewer__
diff --git a/libjava/gnu/javax/crypto/RSACipherImpl.h b/libjava/gnu/javax/crypto/RSACipherImpl.h
deleted file mode 100644
index 9f67759..0000000
--- a/libjava/gnu/javax/crypto/RSACipherImpl.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_RSACipherImpl__
-#define __gnu_javax_crypto_RSACipherImpl__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-          class RSACipherImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-          class RSAPublicKey;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::RSACipherImpl : public ::javax::crypto::CipherSpi
-{
-
-public:
-  RSACipherImpl();
-public: // actually protected
-  virtual void engineSetMode(::java::lang::String *);
-  virtual void engineSetPadding(::java::lang::String *);
-  virtual jint engineGetBlockSize();
-  virtual jint engineGetOutputSize(jint);
-  virtual jint engineGetKeySize(::java::security::Key *);
-  virtual JArray< jbyte > * engineGetIV();
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  virtual jint engineDoFinal(JArray< jbyte > *, jint);
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-private:
-  JArray< jbyte > * rsaDecrypt(::java::math::BigInteger *);
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  static JArray< jbyte > * EMPTY;
-  jint __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) opmode;
-  ::java::security::interfaces::RSAPrivateKey * decipherKey;
-  ::java::security::interfaces::RSAPublicKey * blindingKey;
-  ::java::security::interfaces::RSAPublicKey * encipherKey;
-  ::java::security::SecureRandom * random;
-  JArray< jbyte > * dataBuffer;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_RSACipherImpl__
diff --git a/libjava/gnu/javax/crypto/assembly/Assembly.h b/libjava/gnu/javax/crypto/assembly/Assembly.h
deleted file mode 100644
index 81c2fec..0000000
--- a/libjava/gnu/javax/crypto/assembly/Assembly.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Assembly__
-#define __gnu_javax_crypto_assembly_Assembly__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Assembly;
-            class Direction;
-            class Operation;
-            class Transformer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Assembly : public ::java::lang::Object
-{
-
-public:
-  Assembly();
-  virtual void addPreTransformer(::gnu::javax::crypto::assembly::Transformer *);
-  virtual void addPostTransformer(::gnu::javax::crypto::assembly::Transformer *);
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-  virtual JArray< jbyte > * update(jbyte);
-  virtual JArray< jbyte > * update(JArray< jbyte > *);
-  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * lastUpdate();
-  virtual JArray< jbyte > * lastUpdate(jbyte);
-  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *);
-  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *, jint, jint);
-private:
-  void wireTransformer(::gnu::javax::crypto::assembly::Transformer *, ::gnu::javax::crypto::assembly::Operation *);
-public:
-  static ::java::lang::String * DIRECTION;
-private:
-  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) wired;
-  ::gnu::javax::crypto::assembly::Transformer * head;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Assembly__
diff --git a/libjava/gnu/javax/crypto/assembly/Cascade.h b/libjava/gnu/javax/crypto/assembly/Cascade.h
deleted file mode 100644
index 88f8238..0000000
--- a/libjava/gnu/javax/crypto/assembly/Cascade.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Cascade__
-#define __gnu_javax_crypto_assembly_Cascade__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Cascade;
-            class Direction;
-            class Stage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Cascade : public ::java::lang::Object
-{
-
-public:
-  Cascade();
-private:
-  static jint lcm(jint, jint);
-public:
-  virtual ::java::lang::Object * append(::gnu::javax::crypto::assembly::Stage *);
-  virtual ::java::lang::Object * prepend(::gnu::javax::crypto::assembly::Stage *);
-  virtual ::java::lang::Object * insert(jint, ::gnu::javax::crypto::assembly::Stage *);
-  virtual jint size();
-  virtual ::java::util::Iterator * stages();
-  virtual ::java::util::Set * blockSizes();
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize();
-  virtual void reset();
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual jboolean selfTest();
-  static ::java::lang::String * DIRECTION;
-public: // actually protected
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stages__;
-  ::java::util::LinkedList * stageKeys;
-  ::gnu::javax::crypto::assembly::Direction * wired;
-  jint blockSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Cascade__
diff --git a/libjava/gnu/javax/crypto/assembly/CascadeStage.h b/libjava/gnu/javax/crypto/assembly/CascadeStage.h
deleted file mode 100644
index b36ee47..0000000
--- a/libjava/gnu/javax/crypto/assembly/CascadeStage.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_CascadeStage__
-#define __gnu_javax_crypto_assembly_CascadeStage__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Stage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Cascade;
-            class CascadeStage;
-            class Direction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::CascadeStage : public ::gnu::javax::crypto::assembly::Stage
-{
-
-public: // actually package-private
-  CascadeStage(::gnu::javax::crypto::assembly::Cascade *, ::gnu::javax::crypto::assembly::Direction *);
-public:
-  virtual ::java::util::Set * blockSizes();
-public: // actually package-private
-  virtual void initDelegate(::java::util::Map *);
-public:
-  virtual jint currentBlockSize();
-public: // actually package-private
-  virtual void resetDelegate();
-  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-public:
-  virtual jboolean selfTest();
-private:
-  ::gnu::javax::crypto::assembly::Cascade * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Stage)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_CascadeStage__
diff --git a/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h b/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h
deleted file mode 100644
index 780d258..0000000
--- a/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_CascadeTransformer__
-#define __gnu_javax_crypto_assembly_CascadeTransformer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Cascade;
-            class CascadeTransformer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::CascadeTransformer : public ::gnu::javax::crypto::assembly::Transformer
-{
-
-public: // actually package-private
-  CascadeTransformer(::gnu::javax::crypto::assembly::Cascade *);
-  virtual void initDelegate(::java::util::Map *);
-  virtual jint delegateBlockSize();
-  virtual void resetDelegate();
-  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * lastUpdateDelegate();
-private:
-  JArray< jbyte > * updateInternal(JArray< jbyte > *, jint, jint);
-  ::gnu::javax::crypto::assembly::Cascade * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) delegate;
-  jint blockSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_CascadeTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h b/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h
deleted file mode 100644
index 7021c17..0000000
--- a/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_DeflateTransformer__
-#define __gnu_javax_crypto_assembly_DeflateTransformer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class DeflateTransformer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::DeflateTransformer : public ::gnu::javax::crypto::assembly::Transformer
-{
-
-public: // actually package-private
-  DeflateTransformer();
-  virtual void initDelegate(::java::util::Map *);
-  virtual jint delegateBlockSize();
-  virtual void resetDelegate();
-  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * lastUpdateDelegate();
-private:
-  void compress();
-  void decompress(JArray< jbyte > *, jint, jint);
-  ::java::util::zip::Deflater * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) compressor;
-  ::java::util::zip::Inflater * decompressor;
-  jint outputBlockSize;
-  JArray< jbyte > * zlibBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_DeflateTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/Direction.h b/libjava/gnu/javax/crypto/assembly/Direction.h
deleted file mode 100644
index 207a55f..0000000
--- a/libjava/gnu/javax/crypto/assembly/Direction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Direction__
-#define __gnu_javax_crypto_assembly_Direction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Direction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Direction : public ::java::lang::Object
-{
-
-  Direction(jint);
-public:
-  static ::gnu::javax::crypto::assembly::Direction * reverse(::gnu::javax::crypto::assembly::Direction *);
-  ::java::lang::String * toString();
-  static ::gnu::javax::crypto::assembly::Direction * FORWARD;
-  static ::gnu::javax::crypto::assembly::Direction * REVERSED;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Direction__
diff --git a/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h b/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h
deleted file mode 100644
index bf6ccc9..0000000
--- a/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_LoopbackTransformer__
-#define __gnu_javax_crypto_assembly_LoopbackTransformer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class LoopbackTransformer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::LoopbackTransformer : public ::gnu::javax::crypto::assembly::Transformer
-{
-
-public: // actually package-private
-  LoopbackTransformer();
-public:
-  void init(::java::util::Map *);
-  void reset();
-  JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * lastUpdate();
-public: // actually package-private
-  void initDelegate(::java::util::Map *);
-  jint delegateBlockSize();
-  void resetDelegate();
-  JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * lastUpdateDelegate();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_LoopbackTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/ModeStage.h b/libjava/gnu/javax/crypto/assembly/ModeStage.h
deleted file mode 100644
index 760df95..0000000
--- a/libjava/gnu/javax/crypto/assembly/ModeStage.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_ModeStage__
-#define __gnu_javax_crypto_assembly_ModeStage__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Stage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Direction;
-            class ModeStage;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::ModeStage : public ::gnu::javax::crypto::assembly::Stage
-{
-
-public: // actually package-private
-  ModeStage(::gnu::javax::crypto::mode::IMode *, ::gnu::javax::crypto::assembly::Direction *);
-public:
-  virtual ::java::util::Set * blockSizes();
-public: // actually package-private
-  virtual void initDelegate(::java::util::Map *);
-public:
-  virtual jint currentBlockSize();
-public: // actually package-private
-  virtual void resetDelegate();
-  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-public:
-  virtual jboolean selfTest();
-private:
-  ::gnu::javax::crypto::mode::IMode * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Stage)))) delegate;
-  ::java::util::Set * cachedBlockSizes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_ModeStage__
diff --git a/libjava/gnu/javax/crypto/assembly/Operation.h b/libjava/gnu/javax/crypto/assembly/Operation.h
deleted file mode 100644
index 792a1ba..0000000
--- a/libjava/gnu/javax/crypto/assembly/Operation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Operation__
-#define __gnu_javax_crypto_assembly_Operation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Operation;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Operation : public ::java::lang::Object
-{
-
-  Operation(jint);
-public:
-  ::java::lang::String * toString();
-  static ::gnu::javax::crypto::assembly::Operation * PRE_PROCESSING;
-  static ::gnu::javax::crypto::assembly::Operation * POST_PROCESSING;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Operation__
diff --git a/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h b/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h
deleted file mode 100644
index 6a16b60..0000000
--- a/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_PaddingTransformer__
-#define __gnu_javax_crypto_assembly_PaddingTransformer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/assembly/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class PaddingTransformer;
-        }
-        namespace pad
-        {
-            class IPad;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::PaddingTransformer : public ::gnu::javax::crypto::assembly::Transformer
-{
-
-public: // actually package-private
-  PaddingTransformer(::gnu::javax::crypto::pad::IPad *);
-  virtual void initDelegate(::java::util::Map *);
-  virtual jint delegateBlockSize();
-  virtual void resetDelegate();
-  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * lastUpdateDelegate();
-private:
-  ::gnu::javax::crypto::pad::IPad * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) delegate;
-  jint outputBlockSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_PaddingTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/Stage.h b/libjava/gnu/javax/crypto/assembly/Stage.h
deleted file mode 100644
index 799ef5e..0000000
--- a/libjava/gnu/javax/crypto/assembly/Stage.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Stage__
-#define __gnu_javax_crypto_assembly_Stage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Cascade;
-            class Direction;
-            class Stage;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Stage : public ::java::lang::Object
-{
-
-public: // actually protected
-  Stage(::gnu::javax::crypto::assembly::Direction *);
-public:
-  static ::gnu::javax::crypto::assembly::Stage * getInstance(::gnu::javax::crypto::mode::IMode *, ::gnu::javax::crypto::assembly::Direction *);
-  static ::gnu::javax::crypto::assembly::Stage * getInstance(::gnu::javax::crypto::assembly::Cascade *, ::gnu::javax::crypto::assembly::Direction *);
-  virtual ::java::util::Set * blockSizes() = 0;
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize() = 0;
-  virtual void reset();
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual jboolean selfTest() = 0;
-public: // actually package-private
-  virtual void initDelegate(::java::util::Map *) = 0;
-  virtual void resetDelegate() = 0;
-  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-public:
-  static ::java::lang::String * DIRECTION;
-public: // actually protected
-  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) forward;
-  ::gnu::javax::crypto::assembly::Direction * wired;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Stage__
diff --git a/libjava/gnu/javax/crypto/assembly/Transformer.h b/libjava/gnu/javax/crypto/assembly/Transformer.h
deleted file mode 100644
index 1860d3d..0000000
--- a/libjava/gnu/javax/crypto/assembly/Transformer.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_Transformer__
-#define __gnu_javax_crypto_assembly_Transformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Cascade;
-            class Direction;
-            class Operation;
-            class Transformer;
-        }
-        namespace pad
-        {
-            class IPad;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::Transformer : public ::java::lang::Object
-{
-
-public: // actually protected
-  Transformer();
-public:
-  static ::gnu::javax::crypto::assembly::Transformer * getCascadeTransformer(::gnu::javax::crypto::assembly::Cascade *);
-  static ::gnu::javax::crypto::assembly::Transformer * getPaddingTransformer(::gnu::javax::crypto::pad::IPad *);
-  static ::gnu::javax::crypto::assembly::Transformer * getDeflateTransformer();
-  virtual void setMode(::gnu::javax::crypto::assembly::Operation *);
-  virtual jboolean isPreProcessing();
-  virtual jboolean isPostProcessing();
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize();
-  virtual void reset();
-  virtual JArray< jbyte > * update(jbyte);
-  virtual JArray< jbyte > * update(JArray< jbyte > *);
-  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * lastUpdate();
-  virtual JArray< jbyte > * lastUpdate(jbyte);
-  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *);
-  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *, jint, jint);
-private:
-  JArray< jbyte > * forwardUpdate(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * inverseUpdate(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * preTransform(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * postTransform(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * lastForwardUpdate();
-  JArray< jbyte > * lastInverseUpdate();
-  JArray< jbyte > * preLastTransform();
-  JArray< jbyte > * postLastTransform();
-public: // actually package-private
-  virtual void initDelegate(::java::util::Map *) = 0;
-  virtual jint delegateBlockSize() = 0;
-  virtual void resetDelegate() = 0;
-  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * lastUpdateDelegate() = 0;
-public:
-  static ::java::lang::String * DIRECTION;
-public: // actually protected
-  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) wired;
-  ::gnu::javax::crypto::assembly::Operation * mode;
-  ::gnu::javax::crypto::assembly::Transformer * tail;
-  ::java::io::ByteArrayOutputStream * inBuffer;
-  ::java::io::ByteArrayOutputStream * outBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_Transformer__
diff --git a/libjava/gnu/javax/crypto/assembly/TransformerException.h b/libjava/gnu/javax/crypto/assembly/TransformerException.h
deleted file mode 100644
index cb9e92a..0000000
--- a/libjava/gnu/javax/crypto/assembly/TransformerException.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_assembly_TransformerException__
-#define __gnu_javax_crypto_assembly_TransformerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class TransformerException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::assembly::TransformerException : public ::java::lang::Exception
-{
-
-public:
-  TransformerException();
-  TransformerException(::java::lang::String *);
-  TransformerException(::java::lang::Throwable *);
-  TransformerException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) _exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_assembly_TransformerException__
diff --git a/libjava/gnu/javax/crypto/cipher/Anubis.h b/libjava/gnu/javax/crypto/cipher/Anubis.h
deleted file mode 100644
index b9a40b8..0000000
--- a/libjava/gnu/javax/crypto/cipher/Anubis.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Anubis__
-#define __gnu_javax_crypto_cipher_Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Anubis;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Anubis : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Anubis();
-private:
-  static void anubis(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *);
-public:
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  static const jint DEFAULT_BLOCK_SIZE = 16;
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static ::java::lang::String * Sd;
-  static JArray< jbyte > * S;
-  static JArray< jint > * T0;
-  static JArray< jint > * T1;
-  static JArray< jint > * T2;
-  static JArray< jint > * T3;
-  static JArray< jint > * T4;
-  static JArray< jint > * T5;
-  static JArray< jint > * rc;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Anubis__
diff --git a/libjava/gnu/javax/crypto/cipher/BaseCipher.h b/libjava/gnu/javax/crypto/cipher/BaseCipher.h
deleted file mode 100644
index bb6437d..0000000
--- a/libjava/gnu/javax/crypto/cipher/BaseCipher.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_BaseCipher__
-#define __gnu_javax_crypto_cipher_BaseCipher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class BaseCipher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::BaseCipher : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseCipher(::java::lang::String *, jint, jint);
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual ::java::lang::String * name();
-  virtual jint defaultBlockSize();
-  virtual jint defaultKeySize();
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize();
-  virtual void reset();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual jboolean selfTest();
-private:
-  jboolean testSymmetry(jint, jint);
-public: // actually protected
-  virtual jboolean testKat(JArray< jbyte > *, JArray< jbyte > *);
-  virtual jboolean testKat(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-public:
-  virtual ::java::util::Iterator * blockSizes() = 0;
-  virtual ::java::util::Iterator * keySizes() = 0;
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint) = 0;
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
-private:
-  static ::java::util::logging::Logger * log;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jint defaultBlockSize__;
-  jint defaultKeySize__;
-  jint currentBlockSize__;
-  ::java::lang::Object * currentKey;
-  ::java::lang::Object * lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_BaseCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h b/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h
deleted file mode 100644
index 738cb37..0000000
--- a/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Blowfish$Block__
-#define __gnu_javax_crypto_cipher_Blowfish$Block__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Blowfish;
-            class Blowfish$Block;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Blowfish$Block : public ::java::lang::Object
-{
-
-  Blowfish$Block(::gnu::javax::crypto::cipher::Blowfish *);
-public: // actually package-private
-  Blowfish$Block(::gnu::javax::crypto::cipher::Blowfish *, ::gnu::javax::crypto::cipher::Blowfish$Block *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  jint right;
-  ::gnu::javax::crypto::cipher::Blowfish * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Blowfish$Block__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h b/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h
deleted file mode 100644
index 74c9087..0000000
--- a/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Blowfish$Context__
-#define __gnu_javax_crypto_cipher_Blowfish$Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Blowfish;
-            class Blowfish$Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Blowfish$Context : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Blowfish$Context(::gnu::javax::crypto::cipher::Blowfish *);
-private:
-  Blowfish$Context(::gnu::javax::crypto::cipher::Blowfish *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  JArray< jint > * s0;
-  JArray< jint > * s1;
-  JArray< jint > * s2;
-  JArray< jint > * s3;
-  ::gnu::javax::crypto::cipher::Blowfish * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Blowfish$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish.h b/libjava/gnu/javax/crypto/cipher/Blowfish.h
deleted file mode 100644
index dac15df..0000000
--- a/libjava/gnu/javax/crypto/cipher/Blowfish.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Blowfish__
-#define __gnu_javax_crypto_cipher_Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Blowfish;
-            class Blowfish$Block;
-            class Blowfish$Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Blowfish : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Blowfish();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Iterator * keySizes();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-private:
-  void blowfishEncrypt(::gnu::javax::crypto::cipher::Blowfish$Block *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
-  void blowfishDecrypt(::gnu::javax::crypto::cipher::Blowfish$Block *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
-public:
-  virtual jboolean selfTest();
-private:
-  static const jint DEFAULT_BLOCK_SIZE = 8;
-  static const jint DEFAULT_KEY_SIZE = 8;
-  static const jint MAX_KEY_LENGTH = 56;
-  static JArray< jint > * P;
-public: // actually package-private
-  static JArray< jint > * KS0;
-private:
-  static JArray< jint > * KS1;
-  static JArray< jint > * KS2;
-  static JArray< jint > * KS3;
-  static ::java::lang::Boolean * valid;
-  static JArray< jbyte > * TV_KEY;
-  static JArray< jbyte > * TV_CT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Blowfish__
diff --git a/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h b/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h
deleted file mode 100644
index 7f1ecc0..0000000
--- a/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Cast5$Cast5Key__
-#define __gnu_javax_crypto_cipher_Cast5$Cast5Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Cast5;
-            class Cast5$Cast5Key;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Cast5$Cast5Key : public ::java::lang::Object
-{
-
-  Cast5$Cast5Key(::gnu::javax::crypto::cipher::Cast5 *);
-public: // actually package-private
-  Cast5$Cast5Key(::gnu::javax::crypto::cipher::Cast5 *, ::gnu::javax::crypto::cipher::Cast5$Cast5Key *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rounds;
-  jint Km0;
-  jint Km1;
-  jint Km2;
-  jint Km3;
-  jint Km4;
-  jint Km5;
-  jint Km6;
-  jint Km7;
-  jint Km8;
-  jint Km9;
-  jint Km10;
-  jint Km11;
-  jint Km12;
-  jint Km13;
-  jint Km14;
-  jint Km15;
-  jint Kr0;
-  jint Kr1;
-  jint Kr2;
-  jint Kr3;
-  jint Kr4;
-  jint Kr5;
-  jint Kr6;
-  jint Kr7;
-  jint Kr8;
-  jint Kr9;
-  jint Kr10;
-  jint Kr11;
-  jint Kr12;
-  jint Kr13;
-  jint Kr14;
-  jint Kr15;
-  ::gnu::javax::crypto::cipher::Cast5 * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Cast5$Cast5Key__
diff --git a/libjava/gnu/javax/crypto/cipher/Cast5.h b/libjava/gnu/javax/crypto/cipher/Cast5.h
deleted file mode 100644
index 40cebee..0000000
--- a/libjava/gnu/javax/crypto/cipher/Cast5.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Cast5__
-#define __gnu_javax_crypto_cipher_Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Cast5;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Cast5 : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Cast5();
-private:
-  static JArray< jint > * unscramble(jint);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual jboolean selfTest();
-private:
-  jint f1(jint, jint, jint);
-  jint f2(jint, jint, jint);
-  jint f3(jint, jint, jint);
-  static const jint DEFAULT_BLOCK_SIZE = 8;
-  static const jint DEFAULT_KEY_SIZE = 5;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_PT;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-  static JArray< jint > * S1;
-  static JArray< jint > * S2;
-  static JArray< jint > * S3;
-  static JArray< jint > * S4;
-  static JArray< jint > * S5;
-  static JArray< jint > * S6;
-  static JArray< jint > * S7;
-  static JArray< jint > * S8;
-  static const jint _12_ROUNDS = 12;
-  static const jint _16_ROUNDS = 16;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Cast5__
diff --git a/libjava/gnu/javax/crypto/cipher/CipherFactory.h b/libjava/gnu/javax/crypto/cipher/CipherFactory.h
deleted file mode 100644
index 97f49ea..0000000
--- a/libjava/gnu/javax/crypto/cipher/CipherFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_CipherFactory__
-#define __gnu_javax_crypto_cipher_CipherFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class CipherFactory;
-            class IBlockCipher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::CipherFactory : public ::java::lang::Object
-{
-
-  CipherFactory();
-public:
-  static ::gnu::javax::crypto::cipher::IBlockCipher * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_CipherFactory__
diff --git a/libjava/gnu/javax/crypto/cipher/DES$Context.h b/libjava/gnu/javax/crypto/cipher/DES$Context.h
deleted file mode 100644
index f25456f..0000000
--- a/libjava/gnu/javax/crypto/cipher/DES$Context.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_DES$Context__
-#define __gnu_javax_crypto_cipher_DES$Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class DES;
-            class DES$Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::DES$Context : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DES$Context(::gnu::javax::crypto::cipher::DES *);
-  JArray< jbyte > * getEncryptionKeyBytes();
-  JArray< jbyte > * getDecryptionKeyBytes();
-  JArray< jbyte > * toByteArray(JArray< jint > *);
-private:
-  static const jint EXPANDED_KEY_SIZE = 32;
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ek;
-  JArray< jint > * dk;
-  ::gnu::javax::crypto::cipher::DES * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_DES$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/DES.h b/libjava/gnu/javax/crypto/cipher/DES.h
deleted file mode 100644
index a5830d8..0000000
--- a/libjava/gnu/javax/crypto/cipher/DES.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_DES__
-#define __gnu_javax_crypto_cipher_DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class DES;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::DES : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  DES();
-  static void adjustParity(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  static jboolean isWeak(JArray< jbyte > *);
-  static jboolean isSemiWeak(JArray< jbyte > *);
-  static jboolean isPossibleWeak(JArray< jbyte > *);
-private:
-  static void desFunc(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< jint > *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  static const jint BLOCK_SIZE = 8;
-  static const jint KEY_SIZE = 8;
-private:
-  static JArray< jint > * SP1;
-  static JArray< jint > * SP2;
-  static JArray< jint > * SP3;
-  static JArray< jint > * SP4;
-  static JArray< jint > * SP5;
-  static JArray< jint > * SP6;
-  static JArray< jint > * SP7;
-  static JArray< jint > * SP8;
-  static JArray< jbyte > * PARITY;
-  static JArray< jbyte > * ROTARS;
-  static JArray< jbyte > * PC1;
-  static JArray< jbyte > * PC2;
-public:
-  static JArray< JArray< jbyte > * > * WEAK_KEYS;
-  static JArray< JArray< jbyte > * > * SEMIWEAK_KEYS;
-  static JArray< JArray< jbyte > * > * POSSIBLE_WEAK_KEYS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_DES__
diff --git a/libjava/gnu/javax/crypto/cipher/IBlockCipher.h b/libjava/gnu/javax/crypto/cipher/IBlockCipher.h
deleted file mode 100644
index 662389b..0000000
--- a/libjava/gnu/javax/crypto/cipher/IBlockCipher.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_IBlockCipher__
-#define __gnu_javax_crypto_cipher_IBlockCipher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::IBlockCipher : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual jint defaultBlockSize() = 0;
-  virtual jint defaultKeySize() = 0;
-  virtual ::java::util::Iterator * blockSizes() = 0;
-  virtual ::java::util::Iterator * keySizes() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual jint currentBlockSize() = 0;
-  virtual void reset() = 0;
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual jboolean selfTest() = 0;
-  static ::java::lang::String * CIPHER_BLOCK_SIZE;
-  static ::java::lang::String * KEY_MATERIAL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_cipher_IBlockCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h b/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h
deleted file mode 100644
index 35e686d..0000000
--- a/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_IBlockCipherSpi__
-#define __gnu_javax_crypto_cipher_IBlockCipherSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipherSpi;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::IBlockCipherSpi : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Iterator * blockSizes() = 0;
-  virtual ::java::util::Iterator * keySizes() = 0;
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint) = 0;
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
-  virtual jboolean selfTest() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_cipher_IBlockCipherSpi__
diff --git a/libjava/gnu/javax/crypto/cipher/Khazad.h b/libjava/gnu/javax/crypto/cipher/Khazad.h
deleted file mode 100644
index 734bab2..0000000
--- a/libjava/gnu/javax/crypto/cipher/Khazad.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Khazad__
-#define __gnu_javax_crypto_cipher_Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Khazad;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Khazad : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Khazad();
-private:
-  static void khazad(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *);
-public:
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  static const jint DEFAULT_BLOCK_SIZE = 8;
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static const jint R = 8;
-  static ::java::lang::String * Sd;
-  static JArray< jbyte > * S;
-  static JArray< jint > * T0;
-  static JArray< jint > * T1;
-  static JArray< jint > * T2;
-  static JArray< jint > * T3;
-  static JArray< jint > * T4;
-  static JArray< jint > * T5;
-  static JArray< jint > * T6;
-  static JArray< jint > * T7;
-  static JArray< JArray< jint > * > * rc;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Khazad__
diff --git a/libjava/gnu/javax/crypto/cipher/NullCipher.h b/libjava/gnu/javax/crypto/cipher/NullCipher.h
deleted file mode 100644
index 5199488..0000000
--- a/libjava/gnu/javax/crypto/cipher/NullCipher.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_NullCipher__
-#define __gnu_javax_crypto_cipher_NullCipher__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class NullCipher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::NullCipher : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  NullCipher();
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_NullCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/Rijndael.h b/libjava/gnu/javax/crypto/cipher/Rijndael.h
deleted file mode 100644
index 2511bfe..0000000
--- a/libjava/gnu/javax/crypto/cipher/Rijndael.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Rijndael__
-#define __gnu_javax_crypto_cipher_Rijndael__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Rijndael;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Rijndael : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Rijndael();
-  static jint getRounds(jint, jint);
-private:
-  static void rijndaelEncrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  static void rijndaelDecrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  static void aesEncrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *);
-  static void aesDecrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *);
-public:
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  static const jint DEFAULT_BLOCK_SIZE = 16;
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static ::java::lang::String * SS;
-  static JArray< jbyte > * S;
-  static JArray< jbyte > * Si;
-  static JArray< jint > * T1;
-  static JArray< jint > * T2;
-  static JArray< jint > * T3;
-  static JArray< jint > * T4;
-  static JArray< jint > * T5;
-  static JArray< jint > * T6;
-  static JArray< jint > * T7;
-  static JArray< jint > * T8;
-  static JArray< jint > * U1;
-  static JArray< jint > * U2;
-  static JArray< jint > * U3;
-  static JArray< jint > * U4;
-  static JArray< jbyte > * rcon;
-  static JArray< JArray< JArray< jint > * > * > * shifts;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Rijndael__
diff --git a/libjava/gnu/javax/crypto/cipher/Serpent$Key.h b/libjava/gnu/javax/crypto/cipher/Serpent$Key.h
deleted file mode 100644
index ee098e0..0000000
--- a/libjava/gnu/javax/crypto/cipher/Serpent$Key.h
+++ /dev/null
@@ -1,175 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Serpent$Key__
-#define __gnu_javax_crypto_cipher_Serpent$Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Serpent;
-            class Serpent$Key;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Serpent$Key : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Serpent$Key(::gnu::javax::crypto::cipher::Serpent *);
-private:
-  Serpent$Key(::gnu::javax::crypto::cipher::Serpent *, ::gnu::javax::crypto::cipher::Serpent$Key *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) k0;
-  jint k1;
-  jint k2;
-  jint k3;
-  jint k4;
-  jint k5;
-  jint k6;
-  jint k7;
-  jint k8;
-  jint k9;
-  jint k10;
-  jint k11;
-  jint k12;
-  jint k13;
-  jint k14;
-  jint k15;
-  jint k16;
-  jint k17;
-  jint k18;
-  jint k19;
-  jint k20;
-  jint k21;
-  jint k22;
-  jint k23;
-  jint k24;
-  jint k25;
-  jint k26;
-  jint k27;
-  jint k28;
-  jint k29;
-  jint k30;
-  jint k31;
-  jint k32;
-  jint k33;
-  jint k34;
-  jint k35;
-  jint k36;
-  jint k37;
-  jint k38;
-  jint k39;
-  jint k40;
-  jint k41;
-  jint k42;
-  jint k43;
-  jint k44;
-  jint k45;
-  jint k46;
-  jint k47;
-  jint k48;
-  jint k49;
-  jint k50;
-  jint k51;
-  jint k52;
-  jint k53;
-  jint k54;
-  jint k55;
-  jint k56;
-  jint k57;
-  jint k58;
-  jint k59;
-  jint k60;
-  jint k61;
-  jint k62;
-  jint k63;
-  jint k64;
-  jint k65;
-  jint k66;
-  jint k67;
-  jint k68;
-  jint k69;
-  jint k70;
-  jint k71;
-  jint k72;
-  jint k73;
-  jint k74;
-  jint k75;
-  jint k76;
-  jint k77;
-  jint k78;
-  jint k79;
-  jint k80;
-  jint k81;
-  jint k82;
-  jint k83;
-  jint k84;
-  jint k85;
-  jint k86;
-  jint k87;
-  jint k88;
-  jint k89;
-  jint k90;
-  jint k91;
-  jint k92;
-  jint k93;
-  jint k94;
-  jint k95;
-  jint k96;
-  jint k97;
-  jint k98;
-  jint k99;
-  jint k100;
-  jint k101;
-  jint k102;
-  jint k103;
-  jint k104;
-  jint k105;
-  jint k106;
-  jint k107;
-  jint k108;
-  jint k109;
-  jint k110;
-  jint k111;
-  jint k112;
-  jint k113;
-  jint k114;
-  jint k115;
-  jint k116;
-  jint k117;
-  jint k118;
-  jint k119;
-  jint k120;
-  jint k121;
-  jint k122;
-  jint k123;
-  jint k124;
-  jint k125;
-  jint k126;
-  jint k127;
-  jint k128;
-  jint k129;
-  jint k130;
-  jint k131;
-  ::gnu::javax::crypto::cipher::Serpent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Serpent$Key__
diff --git a/libjava/gnu/javax/crypto/cipher/Serpent.h b/libjava/gnu/javax/crypto/cipher/Serpent.h
deleted file mode 100644
index 20b9a5b..0000000
--- a/libjava/gnu/javax/crypto/cipher/Serpent.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Serpent__
-#define __gnu_javax_crypto_cipher_Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Serpent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Serpent : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Serpent();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual jboolean selfTest();
-private:
-  void sbox0();
-  void sbox1();
-  void sbox2();
-  void sbox3();
-  void sbox4();
-  void sbox5();
-  void sbox6();
-  void sbox7();
-  void sbox7noLT();
-  void sboxI7noLT();
-  void sboxI6();
-  void sboxI5();
-  void sboxI4();
-  void sboxI3();
-  void sboxI2();
-  void sboxI1();
-  void sboxI0();
-  void sboxI7();
-  void sbox0(jint, jint, jint, jint);
-  void sbox1(jint, jint, jint, jint);
-  void sbox2(jint, jint, jint, jint);
-  void sbox3(jint, jint, jint, jint);
-  void sbox4(jint, jint, jint, jint);
-  void sbox5(jint, jint, jint, jint);
-  void sbox6(jint, jint, jint, jint);
-  void sbox7(jint, jint, jint, jint);
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static const jint DEFAULT_BLOCK_SIZE = 16;
-  static const jint ROUNDS = 32;
-  static const jint PHI = -1640531527;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::cipher::BaseCipher)))) x0;
-  jint x1;
-  jint x2;
-  jint x3;
-  jint x4;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Serpent__
diff --git a/libjava/gnu/javax/crypto/cipher/Square.h b/libjava/gnu/javax/crypto/cipher/Square.h
deleted file mode 100644
index cae545c..0000000
--- a/libjava/gnu/javax/crypto/cipher/Square.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Square__
-#define __gnu_javax_crypto_cipher_Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Square;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Square : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  Square();
-private:
-  static void square(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *, JArray< jint > *, JArray< jbyte > *);
-  static void transform(JArray< jint > *, JArray< jint > *);
-  static jint rot32L(jint, jint);
-  static jint rot32R(jint, jint);
-  static jint mul(jint, jint);
-public:
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-private:
-  static const jint DEFAULT_BLOCK_SIZE = 16;
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static const jint ROUNDS = 8;
-  static const jint ROOT = 501;
-  static JArray< jint > * OFFSET;
-  static ::java::lang::String * Sdata;
-  static JArray< jbyte > * Se;
-  static JArray< jbyte > * Sd;
-  static JArray< jint > * Te;
-  static JArray< jint > * Td;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Square__
diff --git a/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h b/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h
deleted file mode 100644
index f260215..0000000
--- a/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_TripleDES$Context__
-#define __gnu_javax_crypto_cipher_TripleDES$Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class DES$Context;
-            class TripleDES;
-            class TripleDES$Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::TripleDES$Context : public ::java::lang::Object
-{
-
-  TripleDES$Context(::gnu::javax::crypto::cipher::TripleDES *);
-public: // actually package-private
-  TripleDES$Context(::gnu::javax::crypto::cipher::TripleDES *, ::gnu::javax::crypto::cipher::TripleDES$Context *);
-  ::gnu::javax::crypto::cipher::DES$Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k1;
-  ::gnu::javax::crypto::cipher::DES$Context * k2;
-  ::gnu::javax::crypto::cipher::DES$Context * k3;
-  ::gnu::javax::crypto::cipher::TripleDES * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_TripleDES$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/TripleDES.h b/libjava/gnu/javax/crypto/cipher/TripleDES.h
deleted file mode 100644
index cbe5a6c..0000000
--- a/libjava/gnu/javax/crypto/cipher/TripleDES.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_TripleDES__
-#define __gnu_javax_crypto_cipher_TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class DES;
-            class TripleDES;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::TripleDES : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-public:
-  TripleDES();
-  static void adjustParity(JArray< jbyte > *, jint);
-  static void adjustParity(jint, JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(jint, JArray< jbyte > *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  static const jint BLOCK_SIZE = 8;
-  static const jint KEY_SIZE = 24;
-private:
-  ::gnu::javax::crypto::cipher::DES * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::cipher::BaseCipher)))) des;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_TripleDES__
diff --git a/libjava/gnu/javax/crypto/cipher/Twofish.h b/libjava/gnu/javax/crypto/cipher/Twofish.h
deleted file mode 100644
index 5c2d7cb..0000000
--- a/libjava/gnu/javax/crypto/cipher/Twofish.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_Twofish__
-#define __gnu_javax_crypto_cipher_Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/cipher/BaseCipher.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Twofish;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::Twofish : public ::gnu::javax::crypto::cipher::BaseCipher
-{
-
-  static jint LFSR1(jint);
-  static jint LFSR2(jint);
-  static jint Mx_X(jint);
-  static jint Mx_Y(jint);
-public:
-  Twofish();
-private:
-  static jint b0(jint);
-  static jint b1(jint);
-  static jint b2(jint);
-  static jint b3(jint);
-  static jint RS_MDS_Encode(jint, jint);
-  static jint RS_rem(jint);
-  static jint F32(jint, jint, JArray< jint > *);
-  static jint Fe32(JArray< jint > *, jint, jint);
-  static jint _b(jint, jint);
-public:
-  ::java::lang::Object * clone();
-  ::java::util::Iterator * blockSizes();
-  ::java::util::Iterator * keySizes();
-  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
-  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
-  jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  static const jint DEFAULT_BLOCK_SIZE = 16;
-  static const jint DEFAULT_KEY_SIZE = 16;
-  static const jint MAX_ROUNDS = 16;
-  static const jint ROUNDS = 16;
-  static const jint INPUT_WHITEN = 0;
-  static const jint OUTPUT_WHITEN = 4;
-  static const jint ROUND_SUBKEYS = 8;
-  static const jint SK_STEP = 33686018;
-  static const jint SK_BUMP = 16843009;
-  static const jint SK_ROTL = 9;
-  static JArray< ::java::lang::String * > * Pm;
-  static JArray< JArray< jbyte > * > * P;
-  static const jint P_00 = 1;
-  static const jint P_01 = 0;
-  static const jint P_02 = 0;
-  static const jint P_03 = 1;
-  static const jint P_04 = 1;
-  static const jint P_10 = 0;
-  static const jint P_11 = 0;
-  static const jint P_12 = 1;
-  static const jint P_13 = 1;
-  static const jint P_14 = 0;
-  static const jint P_20 = 1;
-  static const jint P_21 = 1;
-  static const jint P_22 = 0;
-  static const jint P_23 = 0;
-  static const jint P_24 = 0;
-  static const jint P_30 = 0;
-  static const jint P_31 = 1;
-  static const jint P_32 = 1;
-  static const jint P_33 = 0;
-  static const jint P_34 = 1;
-  static const jint GF256_FDBK_2 = 180;
-  static const jint GF256_FDBK_4 = 90;
-  static JArray< JArray< jint > * > * MDS;
-  static const jint RS_GF_FDBK = 333;
-  static JArray< jbyte > * KAT_KEY;
-  static JArray< jbyte > * KAT_CT;
-  static ::java::lang::Boolean * valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_Twofish__
diff --git a/libjava/gnu/javax/crypto/cipher/WeakKeyException.h b/libjava/gnu/javax/crypto/cipher/WeakKeyException.h
deleted file mode 100644
index 42d1210..0000000
--- a/libjava/gnu/javax/crypto/cipher/WeakKeyException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_cipher_WeakKeyException__
-#define __gnu_javax_crypto_cipher_WeakKeyException__
-
-#pragma interface
-
-#include <java/security/InvalidKeyException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class WeakKeyException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::cipher::WeakKeyException : public ::java::security::InvalidKeyException
-{
-
-public:
-  WeakKeyException();
-  WeakKeyException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_cipher_WeakKeyException__
diff --git a/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h b/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h
deleted file mode 100644
index 3cd0578..0000000
--- a/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_DiffieHellmanImpl__
-#define __gnu_javax_crypto_jce_DiffieHellmanImpl__
-
-#pragma interface
-
-#include <javax/crypto/KeyAgreementSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class DiffieHellmanImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::DiffieHellmanImpl : public ::javax::crypto::KeyAgreementSpi
-{
-
-public:
-  DiffieHellmanImpl();
-public: // actually protected
-  ::java::security::Key * engineDoPhase(::java::security::Key *, jboolean);
-  JArray< jbyte > * engineGenerateSecret();
-  jint engineGenerateSecret(JArray< jbyte > *, jint);
-  ::javax::crypto::SecretKey * engineGenerateSecret(::java::lang::String *);
-  void engineInit(::java::security::Key *, ::java::security::SecureRandom *);
-  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-private:
-  void reset();
-  void checkState();
-  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::javax::crypto::KeyAgreementSpi)))) key;
-  JArray< jbyte > * result;
-  jboolean last_phase_done;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_DiffieHellmanImpl__
diff --git a/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h b/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h
deleted file mode 100644
index bfd4f2d..0000000
--- a/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_GnuCrypto$1__
-#define __gnu_javax_crypto_jce_GnuCrypto$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class GnuCrypto;
-            class GnuCrypto$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::GnuCrypto$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnuCrypto$1(::gnu::javax::crypto::jce::GnuCrypto *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::javax::crypto::jce::GnuCrypto * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_GnuCrypto$1__
diff --git a/libjava/gnu/javax/crypto/jce/GnuCrypto.h b/libjava/gnu/javax/crypto/jce/GnuCrypto.h
deleted file mode 100644
index fa9cb57..0000000
--- a/libjava/gnu/javax/crypto/jce/GnuCrypto.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_GnuCrypto__
-#define __gnu_javax_crypto_jce_GnuCrypto__
-
-#pragma interface
-
-#include <java/security/Provider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class GnuCrypto;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::GnuCrypto : public ::java::security::Provider
-{
-
-public:
-  GnuCrypto();
-  static ::java::util::Set * getCipherNames();
-  static ::java::util::Set * getMacNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_GnuCrypto__
diff --git a/libjava/gnu/javax/crypto/jce/GnuSasl$1.h b/libjava/gnu/javax/crypto/jce/GnuSasl$1.h
deleted file mode 100644
index 149e7b2..0000000
--- a/libjava/gnu/javax/crypto/jce/GnuSasl$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_GnuSasl$1__
-#define __gnu_javax_crypto_jce_GnuSasl$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class GnuSasl;
-            class GnuSasl$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::GnuSasl$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnuSasl$1(::gnu::javax::crypto::jce::GnuSasl *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::javax::crypto::jce::GnuSasl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_GnuSasl$1__
diff --git a/libjava/gnu/javax/crypto/jce/GnuSasl.h b/libjava/gnu/javax/crypto/jce/GnuSasl.h
deleted file mode 100644
index bf624a1..0000000
--- a/libjava/gnu/javax/crypto/jce/GnuSasl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_GnuSasl__
-#define __gnu_javax_crypto_jce_GnuSasl__
-
-#pragma interface
-
-#include <java/security/Provider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class GnuSasl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::GnuSasl : public ::java::security::Provider
-{
-
-public:
-  GnuSasl();
-  static ::java::util::Set * getSaslClientMechanismNames();
-  static ::java::util::Set * getSaslServerMechanismNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_GnuSasl__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h
deleted file mode 100644
index 30227d8..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacHaval;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacHaval : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacHaval();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h
deleted file mode 100644
index 4d18fa3..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacMD2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD2 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacMD2();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h
deleted file mode 100644
index b55a29d..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacMD4;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD4 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacMD4();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h
deleted file mode 100644
index 2e8599c..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacMD5;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD5 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacMD5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h
deleted file mode 100644
index 5bfcdf3..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacRipeMD128;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacRipeMD128 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacRipeMD128();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h
deleted file mode 100644
index 9e058d6..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacRipeMD160;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacRipeMD160 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacRipeMD160();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h
deleted file mode 100644
index 70529e1..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacSHA1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA1 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacSHA1();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h
deleted file mode 100644
index 002272c..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacSHA256;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA256 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacSHA256();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h
deleted file mode 100644
index 6df181d..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacSHA384;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA384 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacSHA384();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h
deleted file mode 100644
index e035c27..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacSHA512;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA512 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacSHA512();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h
deleted file mode 100644
index bb08d2a..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacTiger;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacTiger : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacTiger();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h
deleted file mode 100644
index 4ad9b2e..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory$HMacWhirlpool;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacWhirlpool : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
-{
-
-public:
-  PBKDF2SecretKeyFactory$HMacWhirlpool();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h
deleted file mode 100644
index 97ef99b..0000000
--- a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
-#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
-
-#pragma interface
-
-#include <javax/crypto/SecretKeyFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-            class PBKDF2SecretKeyFactory;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory : public ::javax::crypto::SecretKeyFactorySpi
-{
-
-public: // actually protected
-  PBKDF2SecretKeyFactory(::java::lang::String *);
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::crypto::SecretKeyFactorySpi)))) macName;
-private:
-  static const jint DEFAULT_ITERATION_COUNT = 1000;
-  static const jint DEFAULT_KEY_LEN = 32;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h
deleted file mode 100644
index 524f2f9..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
-#define __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AES128KeyWrapSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AES128KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
-{
-
-public:
-  AES128KeyWrapSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h
deleted file mode 100644
index b19897b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
-#define __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AES192KeyWrapSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AES192KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
-{
-
-public:
-  AES192KeyWrapSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h
deleted file mode 100644
index f877005..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
-#define __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AES256KeyWrapSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AES256KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
-{
-
-public:
-  AES256KeyWrapSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h
deleted file mode 100644
index d20e506..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
-#define __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AESKeyWrapSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AESKeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter
-{
-
-public: // actually protected
-  AESKeyWrapSpi(::java::lang::String *, jint, ::java::lang::String *);
-  virtual jint getOutputSizeForWrap(jint);
-  virtual jint getOutputSizeForUnwrap(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h
deleted file mode 100644
index dd73ecc..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AESSpi__
-#define __gnu_javax_crypto_jce_cipher_AESSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AESSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  AESSpi();
-public: // actually protected
-  void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h b/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h
deleted file mode 100644
index 677f8e9..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_ARCFourSpi__
-#define __gnu_javax_crypto_jce_cipher_ARCFourSpi__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class ARCFourSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::ARCFourSpi : public ::javax::crypto::CipherSpi
-{
-
-public:
-  ARCFourSpi();
-public: // actually protected
-  virtual jint engineGetBlockSize();
-  virtual void engineSetMode(::java::lang::String *);
-  virtual void engineSetPadding(::java::lang::String *);
-  virtual JArray< jbyte > * engineGetIV();
-  virtual jint engineGetOutputSize(jint);
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-private:
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) keystream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_ARCFourSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h
deleted file mode 100644
index c7de480..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_AnubisSpi__
-#define __gnu_javax_crypto_jce_cipher_AnubisSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class AnubisSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::AnubisSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  AnubisSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_AnubisSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h b/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h
deleted file mode 100644
index aed783b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_BlowfishSpi__
-#define __gnu_javax_crypto_jce_cipher_BlowfishSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class BlowfishSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::BlowfishSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  BlowfishSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_BlowfishSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h b/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h
deleted file mode 100644
index dbba171..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_Cast5Spi__
-#define __gnu_javax_crypto_jce_cipher_Cast5Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class Cast5Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::Cast5Spi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  Cast5Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_Cast5Spi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h b/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h
deleted file mode 100644
index 751abfe..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_CipherAdapter__
-#define __gnu_javax_crypto_jce_cipher_CipherAdapter__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace jce
-        {
-          namespace cipher
-          {
-              class CipherAdapter;
-          }
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-        namespace pad
-        {
-            class IPad;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::CipherAdapter : public ::javax::crypto::CipherSpi
-{
-
-public: // actually protected
-  CipherAdapter(::java::lang::String *, jint);
-  CipherAdapter(::java::lang::String *);
-  virtual void engineSetMode(::java::lang::String *);
-  virtual void engineSetPadding(::java::lang::String *);
-  virtual jint engineGetBlockSize();
-  virtual jint engineGetOutputSize(jint);
-  virtual JArray< jbyte > * engineGetIV();
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-private:
-  void engineInitHandler(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-public: // actually protected
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-private:
-  void reset();
-public: // actually protected
-  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) cipher;
-  ::gnu::javax::crypto::mode::IMode * mode;
-  ::gnu::javax::crypto::pad::IPad * pad;
-  jint keyLen;
-  ::java::util::Map * attributes;
-  JArray< jbyte > * partBlock;
-  jint partLen;
-  jint blockLen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_CipherAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h
deleted file mode 100644
index 59a2c91..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_DESSpi__
-#define __gnu_javax_crypto_jce_cipher_DESSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class DESSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::DESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  DESSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_DESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h b/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h
deleted file mode 100644
index 43a5a6e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
-#define __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class KeyWrappingAlgorithmAdapter;
-          }
-        }
-        namespace kwa
-        {
-            class IKeyWrappingAlgorithm;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter : public ::javax::crypto::CipherSpi
-{
-
-public: // actually protected
-  KeyWrappingAlgorithmAdapter(::java::lang::String *, jint, jint, ::java::lang::String *);
-  virtual JArray< jbyte > * engineWrap(::java::security::Key *);
-  virtual ::java::security::Key * engineUnwrap(JArray< jbyte > *, ::java::lang::String *, jint);
-  virtual jint engineGetBlockSize();
-  virtual JArray< jbyte > * engineGetIV();
-  virtual jint engineGetOutputSize(jint);
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineSetMode(::java::lang::String *);
-  virtual void engineSetPadding(::java::lang::String *);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual jint getOutputSizeForWrap(jint);
-  virtual jint getOutputSizeForUnwrap(jint);
-private:
-  void checkOpMode(jint);
-  JArray< jbyte > * checkAndGetKekBytes(::java::security::Key *);
-  void initAlgorithm(jint, JArray< jbyte > *, JArray< jbyte > *, ::java::security::SecureRandom *);
-  static ::java::util::logging::Logger * log;
-  static ::java::lang::String * NO_PADDING;
-public: // actually protected
-  ::gnu::javax::crypto::kwa::IKeyWrappingAlgorithm * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) kwAlgorithm;
-  jint kwaBlockSize;
-  jint kwaKeySize;
-  ::java::lang::String * supportedMode;
-  jint opmode;
-public: // actually package-private
-  JArray< jbyte > * iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h b/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h
deleted file mode 100644
index 76ace58..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_KhazadSpi__
-#define __gnu_javax_crypto_jce_cipher_KhazadSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class KhazadSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::KhazadSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  KhazadSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_KhazadSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h b/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h
deleted file mode 100644
index 62c4749..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_NullCipherSpi__
-#define __gnu_javax_crypto_jce_cipher_NullCipherSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class NullCipherSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::NullCipherSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  NullCipherSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_NullCipherSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h
deleted file mode 100644
index eb6bb4c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h
deleted file mode 100644
index c90eb38..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h
deleted file mode 100644
index c370b08..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h
deleted file mode 100644
index 6252b4b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h
deleted file mode 100644
index 57eab6c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h
deleted file mode 100644
index cbec011..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h
deleted file mode 100644
index 242887a..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h
deleted file mode 100644
index e81b65b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h
deleted file mode 100644
index 1c4787f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h
deleted file mode 100644
index 42cd2c2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
-{
-
-public:
-  PBES2$HMacHaval$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h
deleted file mode 100644
index 9647388..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacHaval;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacHaval(::java::lang::String *, jint);
-  PBES2$HMacHaval(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h
deleted file mode 100644
index d8dc294..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h
deleted file mode 100644
index 777337b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h
deleted file mode 100644
index a4874de..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h
deleted file mode 100644
index e89caea..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h
deleted file mode 100644
index 8d1788e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h
deleted file mode 100644
index 1385a24..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h
deleted file mode 100644
index b56ce91..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h
deleted file mode 100644
index 18b4f26..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h
deleted file mode 100644
index 925414b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h
deleted file mode 100644
index 1299150..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
-{
-
-public:
-  PBES2$HMacMD2$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h
deleted file mode 100644
index 50db50f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD2;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacMD2(::java::lang::String *, jint);
-  PBES2$HMacMD2(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h
deleted file mode 100644
index 205e01e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h
deleted file mode 100644
index 8d03850..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h
deleted file mode 100644
index a5a2b23..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h
deleted file mode 100644
index 8727bc7..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h
deleted file mode 100644
index 10e3c7e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h
deleted file mode 100644
index 8bf6693..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h
deleted file mode 100644
index 5c92122..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h
deleted file mode 100644
index a14ef59..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h
deleted file mode 100644
index 851eedf..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h
deleted file mode 100644
index fe69d0d..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
-{
-
-public:
-  PBES2$HMacMD4$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h
deleted file mode 100644
index 95d6018..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD4;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacMD4(::java::lang::String *, jint);
-  PBES2$HMacMD4(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h
deleted file mode 100644
index 0e51830..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h
deleted file mode 100644
index 758d607..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h
deleted file mode 100644
index 66546b8..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h
deleted file mode 100644
index cc38df7..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h
deleted file mode 100644
index 14d6581..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h
deleted file mode 100644
index 1e3ee6c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h
deleted file mode 100644
index 2678cb2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h
deleted file mode 100644
index 212cfac..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h
deleted file mode 100644
index 9e7fedd..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h
deleted file mode 100644
index 5993341..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
-{
-
-public:
-  PBES2$HMacMD5$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h
deleted file mode 100644
index 27467b8..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacMD5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacMD5(::java::lang::String *, jint);
-  PBES2$HMacMD5(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h
deleted file mode 100644
index 4accfd6..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h
deleted file mode 100644
index dd5773e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h
deleted file mode 100644
index ea8859b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h
deleted file mode 100644
index 8874aa0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h
deleted file mode 100644
index db5b01b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h
deleted file mode 100644
index 128eb9c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h
deleted file mode 100644
index 266eb25..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h
deleted file mode 100644
index 7bcacce..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h
deleted file mode 100644
index 172cb92..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h
deleted file mode 100644
index 77ca273..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
-{
-
-public:
-  PBES2$HMacRipeMD128$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h
deleted file mode 100644
index db5652b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD128;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacRipeMD128(::java::lang::String *, jint);
-  PBES2$HMacRipeMD128(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h
deleted file mode 100644
index a5c78d3..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h
deleted file mode 100644
index d5fb9ee..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h
deleted file mode 100644
index 72d6031..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h
deleted file mode 100644
index 9c0119b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h
deleted file mode 100644
index 37045f2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h
deleted file mode 100644
index e0a3b3f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h
deleted file mode 100644
index e3fa086..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h
deleted file mode 100644
index 6d820e5..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h
deleted file mode 100644
index 40518b1..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h
deleted file mode 100644
index f2beac4..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
-{
-
-public:
-  PBES2$HMacRipeMD160$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h
deleted file mode 100644
index 416db1df..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacRipeMD160;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacRipeMD160(::java::lang::String *, jint);
-  PBES2$HMacRipeMD160(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h
deleted file mode 100644
index 35f8442..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h
deleted file mode 100644
index 52cbbeb..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h
deleted file mode 100644
index 9352b8d..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h
deleted file mode 100644
index c84c600..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h
deleted file mode 100644
index 2eb4abf..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h
deleted file mode 100644
index 9b74786..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h
deleted file mode 100644
index c8af0ca..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h
deleted file mode 100644
index a3f55da..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h
deleted file mode 100644
index 3f629b2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h
deleted file mode 100644
index 3bda01a..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
-{
-
-public:
-  PBES2$HMacSHA1$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h
deleted file mode 100644
index 06e4c96..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacSHA1(::java::lang::String *, jint);
-  PBES2$HMacSHA1(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h
deleted file mode 100644
index 523bb3a..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h
deleted file mode 100644
index 28fa73d..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h
deleted file mode 100644
index ab4b62b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h
deleted file mode 100644
index a8edc0c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h
deleted file mode 100644
index 4812a26..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h
deleted file mode 100644
index 04221e0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h
deleted file mode 100644
index 69f68c5..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h
deleted file mode 100644
index 30a4207..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h
deleted file mode 100644
index e05e6bc..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h
deleted file mode 100644
index 9e8b2c6..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
-{
-
-public:
-  PBES2$HMacSHA256$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h
deleted file mode 100644
index 7771d0b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA256;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacSHA256(::java::lang::String *, jint);
-  PBES2$HMacSHA256(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h
deleted file mode 100644
index 8b32b77..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h
deleted file mode 100644
index 6818d60..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h
deleted file mode 100644
index 80cf465..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h
deleted file mode 100644
index 6d8e479..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h
deleted file mode 100644
index c0a597e..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h
deleted file mode 100644
index 3444db0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h
deleted file mode 100644
index 3bb0a1c..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h
deleted file mode 100644
index 2b8b4c3..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h
deleted file mode 100644
index a5388f0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h
deleted file mode 100644
index 5b849ef..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
-{
-
-public:
-  PBES2$HMacSHA384$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h
deleted file mode 100644
index 1bdf680..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA384;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacSHA384(::java::lang::String *, jint);
-  PBES2$HMacSHA384(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h
deleted file mode 100644
index f338e2d..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h
deleted file mode 100644
index 1ff4f70..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h
deleted file mode 100644
index fada5cb..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h
deleted file mode 100644
index 9ecaadf..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h
deleted file mode 100644
index 466ccf0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h
deleted file mode 100644
index f342c69..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h
deleted file mode 100644
index 1c393d0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h
deleted file mode 100644
index f2f5601..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h
deleted file mode 100644
index 14b4b15..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h
deleted file mode 100644
index d492efc..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
-{
-
-public:
-  PBES2$HMacSHA512$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h
deleted file mode 100644
index f1db51a..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacSHA512;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512 : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacSHA512(::java::lang::String *, jint);
-  PBES2$HMacSHA512(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h
deleted file mode 100644
index baa9f27..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h
deleted file mode 100644
index bce1ed8..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h
deleted file mode 100644
index 6e0bfe2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h
deleted file mode 100644
index d171bdf1..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h
deleted file mode 100644
index a6ff799..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h
deleted file mode 100644
index 1516243..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h
deleted file mode 100644
index e7e49e5..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h
deleted file mode 100644
index 052f902..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h
deleted file mode 100644
index 3477866..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h
deleted file mode 100644
index b9a62a8..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
-{
-
-public:
-  PBES2$HMacTiger$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h
deleted file mode 100644
index 2b1ca59..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacTiger;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacTiger(::java::lang::String *, jint);
-  PBES2$HMacTiger(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h
deleted file mode 100644
index c2f5d6b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$AES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$AES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h
deleted file mode 100644
index c8fd00f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Anubis();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h
deleted file mode 100644
index 03f922f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Blowfish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h
deleted file mode 100644
index f9037b2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Cast5();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h
deleted file mode 100644
index 788ad9d..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$DES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h
deleted file mode 100644
index 7738c88..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Khazad();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h
deleted file mode 100644
index 2d53d0b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Serpent();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h
deleted file mode 100644
index ca4bb7f..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Square();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h
deleted file mode 100644
index 9a58b29..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$TripleDES();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h
deleted file mode 100644
index 8cb59eb..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
-{
-
-public:
-  PBES2$HMacWhirlpool$Twofish();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h
deleted file mode 100644
index d420db0..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
-#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/PBES2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2$HMacWhirlpool;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool : public ::gnu::javax::crypto::jce::cipher::PBES2
-{
-
-public:
-  PBES2$HMacWhirlpool(::java::lang::String *, jint);
-  PBES2$HMacWhirlpool(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2.h
deleted file mode 100644
index 15042c2..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/PBES2.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_PBES2__
-#define __gnu_javax_crypto_jce_cipher_PBES2__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class PBES2;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class PBEKey;
-      }
-      namespace spec
-      {
-          class SecretKeySpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::PBES2 : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public: // actually protected
-  PBES2(::java::lang::String *, jint, ::java::lang::String *);
-  PBES2(::java::lang::String *, ::java::lang::String *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-private:
-  ::javax::crypto::spec::SecretKeySpec * genkey(::javax::crypto::interfaces::PBEKey *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::cipher::CipherAdapter)))) macName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_PBES2__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h b/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h
deleted file mode 100644
index 6d13b2b..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_RijndaelSpi__
-#define __gnu_javax_crypto_jce_cipher_RijndaelSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class RijndaelSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::RijndaelSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  RijndaelSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_RijndaelSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h b/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h
deleted file mode 100644
index a7934c5..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_SerpentSpi__
-#define __gnu_javax_crypto_jce_cipher_SerpentSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class SerpentSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::SerpentSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  SerpentSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_SerpentSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h b/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h
deleted file mode 100644
index 9fb25ca..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_SquareSpi__
-#define __gnu_javax_crypto_jce_cipher_SquareSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class SquareSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::SquareSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  SquareSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_SquareSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h
deleted file mode 100644
index 7fcb2fd..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
-#define __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class TripleDESKeyWrapSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::TripleDESKeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter
-{
-
-public:
-  TripleDESKeyWrapSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h
deleted file mode 100644
index fc5eb29..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_TripleDESSpi__
-#define __gnu_javax_crypto_jce_cipher_TripleDESSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class TripleDESSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::TripleDESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  TripleDESSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_TripleDESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h
deleted file mode 100644
index ff0caf6..0000000
--- a/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_cipher_TwofishSpi__
-#define __gnu_javax_crypto_jce_cipher_TwofishSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace cipher
-          {
-              class TwofishSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::cipher::TwofishSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
-{
-
-public:
-  TwofishSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_cipher_TwofishSpi__
diff --git a/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h
deleted file mode 100644
index d961e5f..0000000
--- a/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class AnubisKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::AnubisKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  AnubisKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h
deleted file mode 100644
index 98d4e3f..0000000
--- a/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class AnubisSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::AnubisSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  AnubisSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h
deleted file mode 100644
index 28a40ee..0000000
--- a/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class BlowfishKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::BlowfishKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  BlowfishKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h
deleted file mode 100644
index d88dcde..0000000
--- a/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class BlowfishSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::BlowfishSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  BlowfishSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h
deleted file mode 100644
index 6dab8fe..0000000
--- a/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class Cast5KeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::Cast5KeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  Cast5KeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h
deleted file mode 100644
index 8f5b7b8..0000000
--- a/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class Cast5SecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::Cast5SecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  Cast5SecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h
deleted file mode 100644
index 59f82ea..0000000
--- a/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class DESKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::DESKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  DESKeyGeneratorImpl();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateKey();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h
deleted file mode 100644
index 1886826..0000000
--- a/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class DESSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::DESSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  DESSecretKeyFactoryImpl();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h
deleted file mode 100644
index 2521a3f..0000000
--- a/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class DESedeSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::DESedeSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  DESedeSecretKeyFactoryImpl();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h
deleted file mode 100644
index 732e311..0000000
--- a/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class KhazadKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::KhazadKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  KhazadKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h
deleted file mode 100644
index 258fae3..0000000
--- a/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class KhazadSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::KhazadSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  KhazadSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h
deleted file mode 100644
index 698a08d..0000000
--- a/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class RijndaelKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::RijndaelKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  RijndaelKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h
deleted file mode 100644
index f97734e..0000000
--- a/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class RijndaelSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::RijndaelSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  RijndaelSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h
deleted file mode 100644
index 87b5e58..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <javax/crypto/SecretKeyFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SecretKeyFactoryImpl : public ::javax::crypto::SecretKeyFactorySpi
-{
-
-public: // actually protected
-  SecretKeyFactoryImpl();
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h
deleted file mode 100644
index 9658a14..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
-
-#pragma interface
-
-#include <javax/crypto/KeyGeneratorSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SecretKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl : public ::javax::crypto::KeyGeneratorSpi
-{
-
-public: // actually protected
-  SecretKeyGeneratorImpl(::java::lang::String *);
-  virtual ::javax::crypto::SecretKey * engineGenerateKey();
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void engineInit(jint, ::java::security::SecureRandom *);
-  virtual void engineInit(::java::security::SecureRandom *);
-  jint __attribute__((aligned(__alignof__( ::javax::crypto::KeyGeneratorSpi)))) defaultKeySize;
-  ::java::util::List * keySizes;
-  ::java::lang::String * algorithm;
-  jboolean init;
-  jint currentKeySize;
-  ::java::security::SecureRandom * random;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h
deleted file mode 100644
index e74ccf6..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SerpentKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SerpentKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  SerpentKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h
deleted file mode 100644
index 1d63cfa..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SerpentSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SerpentSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  SerpentSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h
deleted file mode 100644
index a3a34ea..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SquareKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SquareKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  SquareKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h
deleted file mode 100644
index 36ea771..0000000
--- a/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class SquareSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::SquareSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  SquareSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h
deleted file mode 100644
index 535df83..0000000
--- a/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class TripleDESKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::TripleDESKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  TripleDESKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h
deleted file mode 100644
index aa31ef4..0000000
--- a/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
-#define __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class TwofishKeyGeneratorImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::TwofishKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
-{
-
-public:
-  TwofishKeyGeneratorImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h
deleted file mode 100644
index 13fad90..0000000
--- a/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
-#define __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace key
-          {
-              class TwofishSecretKeyFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::key::TwofishSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
-{
-
-public:
-  TwofishSecretKeyFactoryImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h b/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h
deleted file mode 100644
index 4f9b6f9..0000000
--- a/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_keyring_GnuKeyring__
-#define __gnu_javax_crypto_jce_keyring_GnuKeyring__
-
-#pragma interface
-
-#include <java/security/KeyStoreSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace keyring
-          {
-              class GnuKeyring;
-          }
-        }
-        namespace keyring
-        {
-            class IKeyring;
-            class IPrivateKeyring;
-            class IPublicKeyring;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::keyring::GnuKeyring : public ::java::security::KeyStoreSpi
-{
-
-public:
-  GnuKeyring();
-  virtual ::java::util::Enumeration * engineAliases();
-  virtual jboolean engineContainsAlias(::java::lang::String *);
-  virtual void engineDeleteEntry(::java::lang::String *);
-  virtual ::java::security::cert::Certificate * engineGetCertificate(::java::lang::String *);
-  virtual ::java::lang::String * engineGetCertificateAlias(::java::security::cert::Certificate *);
-  virtual void engineSetCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *);
-  virtual JArray< ::java::security::cert::Certificate * > * engineGetCertificateChain(::java::lang::String *);
-  virtual ::java::util::Date * engineGetCreationDate(::java::lang::String *);
-  virtual ::java::security::Key * engineGetKey(::java::lang::String *, JArray< jchar > *);
-  virtual void engineSetKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual void engineSetKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual jboolean engineIsCertificateEntry(::java::lang::String *);
-  virtual jboolean engineIsKeyEntry(::java::lang::String *);
-  virtual void engineLoad(::java::io::InputStream *, JArray< jchar > *);
-  virtual void engineStore(::java::io::OutputStream *, JArray< jchar > *);
-  virtual jint engineSize();
-private:
-  void ensureLoaded();
-  void loadPrivateKeyring(::java::io::InputStream *, JArray< jchar > *);
-  void loadPublicKeyring(::java::io::InputStream *, JArray< jchar > *);
-  ::java::util::Date * getCreationDate(::java::lang::String *, ::gnu::javax::crypto::keyring::IKeyring *);
-  void createNewKeyrings();
-  static ::java::util::logging::Logger * log;
-  static ::java::lang::String * NOT_LOADED;
-  jboolean __attribute__((aligned(__alignof__( ::java::security::KeyStoreSpi)))) loaded;
-  ::gnu::javax::crypto::keyring::IPrivateKeyring * privateKR;
-  ::gnu::javax::crypto::keyring::IPublicKeyring * publicKR;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_keyring_GnuKeyring__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h
deleted file mode 100644
index 4f5af33..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacHavalSpi__
-#define __gnu_javax_crypto_jce_mac_HMacHavalSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacHavalSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacHavalSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacHavalSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacHavalSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h
deleted file mode 100644
index c584ddb..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacMD2Spi__
-#define __gnu_javax_crypto_jce_mac_HMacMD2Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacMD2Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacMD2Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacMD2Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacMD2Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h
deleted file mode 100644
index 7cf2e14..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacMD4Spi__
-#define __gnu_javax_crypto_jce_mac_HMacMD4Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacMD4Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacMD4Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacMD4Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacMD4Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h
deleted file mode 100644
index dd54fe2..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacMD5Spi__
-#define __gnu_javax_crypto_jce_mac_HMacMD5Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacMD5Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacMD5Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacMD5Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacMD5Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h
deleted file mode 100644
index 195cf96..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
-#define __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacRipeMD128Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacRipeMD128Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacRipeMD128Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h
deleted file mode 100644
index 43dc026..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
-#define __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacRipeMD160Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacRipeMD160Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacRipeMD160Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h
deleted file mode 100644
index 8368207..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
-#define __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacSHA160Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacSHA160Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacSHA160Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h
deleted file mode 100644
index 5ec8ab0..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
-#define __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacSHA256Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacSHA256Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacSHA256Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h
deleted file mode 100644
index 2f6dbd9..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
-#define __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacSHA384Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacSHA384Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacSHA384Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h
deleted file mode 100644
index af69a4e..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
-#define __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacSHA512Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacSHA512Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacSHA512Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h
deleted file mode 100644
index c085185..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacTigerSpi__
-#define __gnu_javax_crypto_jce_mac_HMacTigerSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacTigerSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacTigerSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacTigerSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacTigerSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h
deleted file mode 100644
index 102ce51..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
-#define __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class HMacWhirlpoolSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::HMacWhirlpoolSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  HMacWhirlpoolSpi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h b/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h
deleted file mode 100644
index 1d4cadd..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_MacAdapter__
-#define __gnu_javax_crypto_jce_mac_MacAdapter__
-
-#pragma interface
-
-#include <javax/crypto/MacSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class MacAdapter;
-          }
-        }
-        namespace mac
-        {
-            class IMac;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::MacAdapter : public ::javax::crypto::MacSpi
-{
-
-public: // actually protected
-  MacAdapter(::java::lang::String *);
-private:
-  MacAdapter(::gnu::javax::crypto::mac::IMac *, ::java::util::Map *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal();
-  virtual jint engineGetMacLength();
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineReset();
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-  ::gnu::javax::crypto::mac::IMac * __attribute__((aligned(__alignof__( ::javax::crypto::MacSpi)))) mac;
-  ::java::util::Map * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_MacAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h
deleted file mode 100644
index 9581815..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
-#define __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacAnubisImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacAnubisImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacAnubisImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h
deleted file mode 100644
index 76e69d2..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
-#define __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacBlowfishImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacBlowfishImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacBlowfishImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h b/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h
deleted file mode 100644
index 9308b25..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacCast5Impl__
-#define __gnu_javax_crypto_jce_mac_OMacCast5Impl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacCast5Impl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacCast5Impl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacCast5Impl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacCast5Impl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h
deleted file mode 100644
index 614e645..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacDESImpl__
-#define __gnu_javax_crypto_jce_mac_OMacDESImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacDESImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacDESImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacDESImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacDESImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h
deleted file mode 100644
index 6eacd2d..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Anubis;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Anubis : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Anubis(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h
deleted file mode 100644
index 597aefa..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Blowfish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Blowfish : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Blowfish(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h
deleted file mode 100644
index 65b6f9d..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Cast5;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Cast5 : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Cast5(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h
deleted file mode 100644
index e5945e4..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$DES__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$DES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$DES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$DES : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$DES(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$DES__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h
deleted file mode 100644
index e15074a..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Khazad;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Khazad : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Khazad(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h
deleted file mode 100644
index e337ef9..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Rijndael;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Rijndael : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Rijndael(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h
deleted file mode 100644
index 8e5b064..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Serpent;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Serpent : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Serpent(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h
deleted file mode 100644
index 0f90c75..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Square__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Square__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Square;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Square : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Square(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Square__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h
deleted file mode 100644
index 0b7d3d9..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$TripleDES;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$TripleDES : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$TripleDES(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h
deleted file mode 100644
index c398f3d..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
-#define __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-              class OMacImpl$Twofish;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl$Twofish : public ::gnu::javax::crypto::jce::mac::OMacImpl
-{
-
-public:
-  OMacImpl$Twofish(::gnu::javax::crypto::jce::mac::OMacImpl *);
-public: // actually package-private
-  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h
deleted file mode 100644
index fce8e1a..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacImpl__
-#define __gnu_javax_crypto_jce_mac_OMacImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public: // actually protected
-  OMacImpl(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h
deleted file mode 100644
index 8177906..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
-#define __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacKhazadImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacKhazadImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacKhazadImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h
deleted file mode 100644
index d785945..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
-#define __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacRijndaelImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacRijndaelImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacRijndaelImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h
deleted file mode 100644
index d5a2f4c..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
-#define __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacSerpentImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacSerpentImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacSerpentImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h
deleted file mode 100644
index b7952b3..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacSquareImpl__
-#define __gnu_javax_crypto_jce_mac_OMacSquareImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacSquareImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacSquareImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacSquareImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacSquareImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h
deleted file mode 100644
index 1c907e1..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
-#define __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacTripleDESImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacTripleDESImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacTripleDESImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h
deleted file mode 100644
index 24189f0..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
-#define __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class OMacTwofishImpl;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::OMacTwofishImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  OMacTwofishImpl();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h b/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h
deleted file mode 100644
index e707008..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_TMMH16Spi__
-#define __gnu_javax_crypto_jce_mac_TMMH16Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class TMMH16Spi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::TMMH16Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  TMMH16Spi();
-public: // actually protected
-  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_TMMH16Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h b/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h
deleted file mode 100644
index 67449d4..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_UHash32Spi__
-#define __gnu_javax_crypto_jce_mac_UHash32Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class UHash32Spi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::UHash32Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  UHash32Spi();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_UHash32Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h b/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h
deleted file mode 100644
index 37daf31..0000000
--- a/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_mac_UMac32Spi__
-#define __gnu_javax_crypto_jce_mac_UMac32Spi__
-
-#pragma interface
-
-#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace mac
-          {
-              class UMac32Spi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::mac::UMac32Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
-{
-
-public:
-  UMac32Spi();
-public: // actually protected
-  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_mac_UMac32Spi__
diff --git a/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h b/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h
deleted file mode 100644
index 8a506c0..0000000
--- a/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_params_BlockCipherParameters__
-#define __gnu_javax_crypto_jce_params_BlockCipherParameters__
-
-#pragma interface
-
-#include <java/security/AlgorithmParametersSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace params
-          {
-              class BlockCipherParameters;
-          }
-          namespace spec
-          {
-              class BlockCipherParameterSpec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::params::BlockCipherParameters : public ::java::security::AlgorithmParametersSpi
-{
-
-public:
-  BlockCipherParameters();
-public: // actually protected
-  virtual JArray< jbyte > * engineGetEncoded();
-  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *);
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *);
-  virtual void engineInit(JArray< jbyte > *);
-  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *);
-  virtual ::java::lang::String * engineToString();
-private:
-  static ::java::util::logging::Logger * log;
-public: // actually protected
-  ::gnu::javax::crypto::jce::spec::BlockCipherParameterSpec * __attribute__((aligned(__alignof__( ::java::security::AlgorithmParametersSpi)))) cipherSpec;
-private:
-  static ::java::lang::String * DEFAULT_FORMAT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_params_BlockCipherParameters__
diff --git a/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h b/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h
deleted file mode 100644
index 6d47c98..0000000
--- a/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_params_DEREncodingException__
-#define __gnu_javax_crypto_jce_params_DEREncodingException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace params
-          {
-              class DEREncodingException;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::params::DEREncodingException : public ::java::io::IOException
-{
-
-public:
-  DEREncodingException();
-  DEREncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_params_DEREncodingException__
diff --git a/libjava/gnu/javax/crypto/jce/params/DERReader.h b/libjava/gnu/javax/crypto/jce/params/DERReader.h
deleted file mode 100644
index 1a85bc4..0000000
--- a/libjava/gnu/javax/crypto/jce/params/DERReader.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_params_DERReader__
-#define __gnu_javax_crypto_jce_params_DERReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace params
-          {
-              class DERReader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::params::DERReader : public ::java::lang::Object
-{
-
-public:
-  DERReader();
-  DERReader(JArray< jbyte > *);
-  virtual void init(::java::lang::String *);
-  virtual void init(JArray< jbyte > *);
-  virtual jboolean hasMorePrimitives();
-  virtual ::java::math::BigInteger * getBigInteger();
-private:
-  JArray< jbyte > * getPrimitive();
-  jint translateLeadIdentifierByte(jbyte);
-  jint getIdentifier(jint);
-public: // actually package-private
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
-  jint pos;
-  static const jint UNIVERSAL = 1;
-  static const jint APPLICATION = 2;
-  static const jint CONTEXT_SPECIFIC = 3;
-  static const jint PRIVATE = 4;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_params_DERReader__
diff --git a/libjava/gnu/javax/crypto/jce/params/DERWriter.h b/libjava/gnu/javax/crypto/jce/params/DERWriter.h
deleted file mode 100644
index 742d493..0000000
--- a/libjava/gnu/javax/crypto/jce/params/DERWriter.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_params_DERWriter__
-#define __gnu_javax_crypto_jce_params_DERWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace params
-          {
-              class DERWriter;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::params::DERWriter : public ::java::lang::Object
-{
-
-public:
-  DERWriter();
-  virtual JArray< jbyte > * writeBigInteger(::java::math::BigInteger *);
-private:
-  JArray< jbyte > * writePrimitive(jint, jint, jint, JArray< jbyte > *);
-public:
-  virtual JArray< jbyte > * joinarrays(JArray< jbyte > *, JArray< jbyte > *);
-  virtual JArray< jbyte > * joinarrays(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-private:
-  JArray< jbyte > * generateIdentifier(jint, jint);
-  jbyte translateLeadIdentifierByte(jint);
-  JArray< jbyte > * generateLength(jint);
-public: // actually package-private
-  static const jint UNIVERSAL = 1;
-  static const jint APPLICATION = 2;
-  static const jint CONTEXT_SPECIFIC = 3;
-  static const jint PRIVATE = 4;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_params_DERWriter__
diff --git a/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h
deleted file mode 100644
index e46dee3..0000000
--- a/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
-#define __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class ARCFourRandomSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::prng::ARCFourRandomSpi : public ::java::security::SecureRandomSpi
-{
-
-public:
-  ARCFourRandomSpi();
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h b/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h
deleted file mode 100644
index 6abf9be..0000000
--- a/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_prng_CSPRNGSpi__
-#define __gnu_javax_crypto_jce_prng_CSPRNGSpi__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class CSPRNGSpi;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::prng::CSPRNGSpi : public ::java::security::SecureRandomSpi
-{
-
-public:
-  CSPRNGSpi();
-public: // actually protected
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_prng_CSPRNGSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h b/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h
deleted file mode 100644
index d684e36..0000000
--- a/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_prng_FortunaImpl__
-#define __gnu_javax_crypto_jce_prng_FortunaImpl__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class FortunaImpl;
-          }
-        }
-        namespace prng
-        {
-            class Fortuna;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::prng::FortunaImpl : public ::java::security::SecureRandomSpi
-{
-
-public:
-  FortunaImpl();
-public: // actually protected
-  void engineSetSeed(JArray< jbyte > *);
-  void engineNextBytes(JArray< jbyte > *);
-  JArray< jbyte > * engineGenerateSeed(jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) virgin;
-  ::gnu::javax::crypto::prng::Fortuna * adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_prng_FortunaImpl__
diff --git a/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h
deleted file mode 100644
index 5403493..0000000
--- a/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_prng_ICMRandomSpi__
-#define __gnu_javax_crypto_jce_prng_ICMRandomSpi__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class ICMRandomSpi;
-          }
-        }
-        namespace prng
-        {
-            class ICMGenerator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::prng::ICMRandomSpi : public ::java::security::SecureRandomSpi
-{
-
-public:
-  ICMRandomSpi();
-private:
-  static void resetLocalPRNG();
-public:
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  static ::java::util::logging::Logger * log;
-  static ::gnu::javax::crypto::prng::ICMGenerator * prng;
-  static ::java::lang::String * MSG;
-  static ::java::lang::String * RETRY;
-  static ::java::lang::String * LIMIT_REACHED_MSG;
-  static ::java::lang::String * RESEED;
-  ::gnu::javax::crypto::prng::ICMGenerator * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_prng_ICMRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h
deleted file mode 100644
index e27425a..0000000
--- a/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_prng_UMacRandomSpi__
-#define __gnu_javax_crypto_jce_prng_UMacRandomSpi__
-
-#pragma interface
-
-#include <java/security/SecureRandomSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace prng
-          {
-              class UMacRandomSpi;
-          }
-        }
-        namespace prng
-        {
-            class UMacGenerator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::prng::UMacRandomSpi : public ::java::security::SecureRandomSpi
-{
-
-public:
-  UMacRandomSpi();
-private:
-  static void resetLocalPRNG();
-public:
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  static ::java::util::logging::Logger * log;
-  static ::gnu::javax::crypto::prng::UMacGenerator * prng;
-  static ::java::lang::String * MSG;
-  static ::java::lang::String * RETRY;
-  ::gnu::javax::crypto::prng::UMacGenerator * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_prng_UMacRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h b/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h
deleted file mode 100644
index 99e9373..0000000
--- a/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_sig_DHKeyFactory__
-#define __gnu_javax_crypto_jce_sig_DHKeyFactory__
-
-#pragma interface
-
-#include <java/security/KeyFactorySpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DHKeyFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::sig::DHKeyFactory : public ::java::security::KeyFactorySpi
-{
-
-public:
-  DHKeyFactory();
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_sig_DHKeyFactory__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h b/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h
deleted file mode 100644
index 9421af8..0000000
--- a/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
-#define __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
-
-#pragma interface
-
-#include <gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DHKeyPairGeneratorSpi;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::sig::DHKeyPairGeneratorSpi : public ::gnu::java::security::jce::sig::KeyPairGeneratorAdapter
-{
-
-public:
-  DHKeyPairGeneratorSpi();
-  virtual void initialize(jint, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHParameters.h b/libjava/gnu/javax/crypto/jce/sig/DHParameters.h
deleted file mode 100644
index 43f53fe..0000000
--- a/libjava/gnu/javax/crypto/jce/sig/DHParameters.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_sig_DHParameters__
-#define __gnu_javax_crypto_jce_sig_DHParameters__
-
-#pragma interface
-
-#include <java/security/AlgorithmParametersSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DHParameters;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::sig::DHParameters : public ::java::security::AlgorithmParametersSpi
-{
-
-public:
-  DHParameters();
-public: // actually protected
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineInit(JArray< jbyte > *);
-  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *);
-  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *);
-  virtual JArray< jbyte > * engineGetEncoded();
-  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *);
-  virtual ::java::lang::String * engineToString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::AlgorithmParametersSpi)))) p;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * q;
-  jint l;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_sig_DHParameters__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h b/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h
deleted file mode 100644
index 4c2b43b..0000000
--- a/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_sig_DHParametersGenerator__
-#define __gnu_javax_crypto_jce_sig_DHParametersGenerator__
-
-#pragma interface
-
-#include <java/security/AlgorithmParameterGeneratorSpi.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace sig
-          {
-              class DHParametersGenerator;
-          }
-        }
-        namespace key
-        {
-          namespace dh
-          {
-              class RFC2631;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::sig::DHParametersGenerator : public ::java::security::AlgorithmParameterGeneratorSpi
-{
-
-public:
-  DHParametersGenerator();
-public: // actually protected
-  virtual void engineInit(jint, ::java::security::SecureRandom *);
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::AlgorithmParameters * engineGenerateParameters();
-private:
-  static ::java::security::Provider * GNU_CRYPTO;
-  jint __attribute__((aligned(__alignof__( ::java::security::AlgorithmParameterGeneratorSpi)))) modulusSize;
-  jint exponentSize;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::javax::crypto::key::dh::RFC2631 * rfc2631;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_sig_DHParametersGenerator__
diff --git a/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h
deleted file mode 100644
index 166ed58..0000000
--- a/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
-#define __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace spec
-          {
-              class BlockCipherParameterSpec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::spec::BlockCipherParameterSpec : public ::java::lang::Object
-{
-
-public:
-  BlockCipherParameterSpec(JArray< jbyte > *, jint, jint);
-  BlockCipherParameterSpec(jint, jint);
-  virtual JArray< jbyte > * getIV();
-  virtual jint getBlockSize();
-  virtual jint getKeySize();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
-  jint blockSize;
-  jint keySize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
diff --git a/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h
deleted file mode 100644
index 26fca5d..0000000
--- a/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
-#define __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace spec
-          {
-              class TMMHParameterSpec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::spec::TMMHParameterSpec : public ::java::lang::Object
-{
-
-public:
-  TMMHParameterSpec(::gnu::java::security::prng::IRandom *, ::java::lang::Integer *, JArray< jbyte > *);
-  TMMHParameterSpec(::gnu::java::security::prng::IRandom *, ::java::lang::Integer *);
-  virtual ::gnu::java::security::prng::IRandom * getKeystream();
-  virtual ::java::lang::Integer * getTagLength();
-  virtual JArray< jbyte > * getPrefix();
-public: // actually protected
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keystream;
-  ::java::lang::Integer * tagLength;
-  JArray< jbyte > * prefix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
diff --git a/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h
deleted file mode 100644
index 81c2c21..0000000
--- a/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
-#define __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace jce
-        {
-          namespace spec
-          {
-              class UMac32ParameterSpec;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::jce::spec::UMac32ParameterSpec : public ::java::lang::Object
-{
-
-public:
-  UMac32ParameterSpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getNonce();
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nonce;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
diff --git a/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h b/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h
deleted file mode 100644
index 20d76e6..0000000
--- a/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_BaseKeyAgreementParty__
-#define __gnu_javax_crypto_key_BaseKeyAgreementParty__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class BaseKeyAgreementParty;
-            class IncomingMessage;
-            class OutgoingMessage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::BaseKeyAgreementParty : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseKeyAgreementParty(::java::lang::String *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void init(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * processMessage(::gnu::javax::crypto::key::IncomingMessage *);
-  virtual jboolean isComplete();
-  virtual JArray< jbyte > * getSharedSecret();
-  virtual void reset();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *) = 0;
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *) = 0;
-  virtual JArray< jbyte > * engineSharedSecret() = 0;
-  virtual void engineReset() = 0;
-  virtual void nextRandomBytes(JArray< jbyte > *);
-private:
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-public: // actually protected
-  static ::java::math::BigInteger * TWO;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jboolean initialised;
-  jint step;
-  jboolean complete;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::java::security::prng::IRandom * irnd;
-private:
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_BaseKeyAgreementParty__
diff --git a/libjava/gnu/javax/crypto/key/GnuPBEKey.h b/libjava/gnu/javax/crypto/key/GnuPBEKey.h
deleted file mode 100644
index e52cd5e..0000000
--- a/libjava/gnu/javax/crypto/key/GnuPBEKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_GnuPBEKey__
-#define __gnu_javax_crypto_key_GnuPBEKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class GnuPBEKey;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class PBEKeySpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::GnuPBEKey : public ::java::lang::Object
-{
-
-public:
-  GnuPBEKey(::javax::crypto::spec::PBEKeySpec *);
-  GnuPBEKey(JArray< jchar > *, JArray< jbyte > *, jint);
-  virtual jint getIterationCount();
-  virtual JArray< jchar > * getPassword();
-  virtual JArray< jbyte > * getSalt();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual JArray< jbyte > * getEncoded();
-private:
-  ::javax::crypto::spec::PBEKeySpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) spec;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_GnuPBEKey__
diff --git a/libjava/gnu/javax/crypto/key/GnuSecretKey.h b/libjava/gnu/javax/crypto/key/GnuSecretKey.h
deleted file mode 100644
index b9a3133..0000000
--- a/libjava/gnu/javax/crypto/key/GnuSecretKey.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_GnuSecretKey__
-#define __gnu_javax_crypto_key_GnuSecretKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class GnuSecretKey;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::GnuSecretKey : public ::java::lang::Object
-{
-
-public:
-  GnuSecretKey(JArray< jbyte > *, ::java::lang::String *);
-  GnuSecretKey(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_GnuSecretKey__
diff --git a/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h b/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h
deleted file mode 100644
index 4fb3019..0000000
--- a/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_IKeyAgreementParty__
-#define __gnu_javax_crypto_key_IKeyAgreementParty__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IKeyAgreementParty;
-            class IncomingMessage;
-            class OutgoingMessage;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::IKeyAgreementParty : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * processMessage(::gnu::javax::crypto::key::IncomingMessage *) = 0;
-  virtual jboolean isComplete() = 0;
-  virtual JArray< jbyte > * getSharedSecret() = 0;
-  virtual void reset() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_key_IKeyAgreementParty__
diff --git a/libjava/gnu/javax/crypto/key/IncomingMessage.h b/libjava/gnu/javax/crypto/key/IncomingMessage.h
deleted file mode 100644
index ed3f33a..0000000
--- a/libjava/gnu/javax/crypto/key/IncomingMessage.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_IncomingMessage__
-#define __gnu_javax_crypto_key_IncomingMessage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace key
-        {
-            class IKeyPairCodec;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::IncomingMessage : public ::java::lang::Object
-{
-
-public:
-  IncomingMessage(JArray< jbyte > *);
-private:
-  IncomingMessage();
-public:
-  static ::gnu::javax::crypto::key::IncomingMessage * getInstance(JArray< jbyte > *);
-  static ::gnu::javax::crypto::key::IncomingMessage * getInstance(JArray< jbyte > *, jint, jint);
-  static jint twoBytesToLength(JArray< jbyte > *);
-  static jint fourBytesToLength(JArray< jbyte > *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::security::PublicKey * readPublicKey();
-  virtual ::java::security::PrivateKey * readPrivateKey();
-  virtual ::java::math::BigInteger * readMPI();
-  virtual ::java::lang::String * readString();
-private:
-  ::gnu::java::security::key::IKeyPairCodec * getKeyPairCodec(jint);
-public: // actually protected
-  ::java::io::ByteArrayInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_IncomingMessage__
diff --git a/libjava/gnu/javax/crypto/key/KeyAgreementException.h b/libjava/gnu/javax/crypto/key/KeyAgreementException.h
deleted file mode 100644
index 77bc760..0000000
--- a/libjava/gnu/javax/crypto/key/KeyAgreementException.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_KeyAgreementException__
-#define __gnu_javax_crypto_key_KeyAgreementException__
-
-#pragma interface
-
-#include <java/security/KeyManagementException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class KeyAgreementException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::KeyAgreementException : public ::java::security::KeyManagementException
-{
-
-public:
-  KeyAgreementException();
-  KeyAgreementException(::java::lang::String *);
-  KeyAgreementException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::security::KeyManagementException)))) cause;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_KeyAgreementException__
diff --git a/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h b/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h
deleted file mode 100644
index abbfd28..0000000
--- a/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_KeyAgreementFactory__
-#define __gnu_javax_crypto_key_KeyAgreementFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IKeyAgreementParty;
-            class KeyAgreementFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::KeyAgreementFactory : public ::java::lang::Object
-{
-
-  KeyAgreementFactory();
-public:
-  static ::gnu::javax::crypto::key::IKeyAgreementParty * getPartyAInstance(::java::lang::String *);
-  static ::gnu::javax::crypto::key::IKeyAgreementParty * getPartyBInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_KeyAgreementFactory__
diff --git a/libjava/gnu/javax/crypto/key/OutgoingMessage.h b/libjava/gnu/javax/crypto/key/OutgoingMessage.h
deleted file mode 100644
index 8f46a1e..0000000
--- a/libjava/gnu/javax/crypto/key/OutgoingMessage.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_OutgoingMessage__
-#define __gnu_javax_crypto_key_OutgoingMessage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class OutgoingMessage;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Key;
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::OutgoingMessage : public ::java::lang::Object
-{
-
-public:
-  OutgoingMessage();
-  virtual JArray< jbyte > * toByteArray();
-  virtual JArray< jbyte > * wrap();
-  virtual void writePublicKey(::java::security::PublicKey *);
-  virtual void writePrivateKey(::java::security::PrivateKey *);
-  virtual void writeMPI(::java::math::BigInteger *);
-  virtual void writeString(::java::lang::String *);
-private:
-  void writeKey(::java::security::Key *);
-  jint getKeyType(::java::security::Key *);
-  ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_OutgoingMessage__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h
deleted file mode 100644
index 17e0cce..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
-#define __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class DHKeyPairPKCS8Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DHKeyPairPKCS8Codec : public ::java::lang::Object
-{
-
-public:
-  DHKeyPairPKCS8Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::gnu::java::security::OID * DH_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h
deleted file mode 100644
index 1c5507c..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
-#define __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class DHKeyPairRawCodec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DHKeyPairRawCodec : public ::java::lang::Object
-{
-
-public:
-  DHKeyPairRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h
deleted file mode 100644
index a52ab8a..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
-#define __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class DHKeyPairX509Codec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DHKeyPairX509Codec : public ::java::lang::Object
-{
-
-public:
-  DHKeyPairX509Codec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-private:
-  static ::gnu::java::security::OID * DH_ALG_OID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h
deleted file mode 100644
index c592f76..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
-#define __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class DiffieHellmanKeyAgreement;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
-{
-
-public: // actually protected
-  DiffieHellmanKeyAgreement();
-  virtual JArray< jbyte > * engineSharedSecret();
-  virtual void engineReset();
-public:
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * KA_DIFFIE_HELLMAN_OWNER_PRIVATE_KEY;
-public: // actually protected
-  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) ownerKey;
-  ::java::math::BigInteger * ZZ;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h
deleted file mode 100644
index 56bae1b..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
-#define __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace dh
-          {
-              class DiffieHellmanReceiver;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DiffieHellmanReceiver : public ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement
-{
-
-public:
-  DiffieHellmanReceiver();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement)))) y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h
deleted file mode 100644
index ff9ab29..0000000
--- a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanSender__
-#define __gnu_javax_crypto_key_dh_DiffieHellmanSender__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace dh
-          {
-              class DiffieHellmanSender;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::DiffieHellmanSender : public ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement
-{
-
-public:
-  DiffieHellmanSender();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * sendRandomSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement)))) x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_DiffieHellmanSender__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h b/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h
deleted file mode 100644
index d167c7c..0000000
--- a/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
-#define __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class ElGamalKeyAgreement;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::ElGamalKeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
-{
-
-public: // actually protected
-  ElGamalKeyAgreement();
-  virtual JArray< jbyte > * engineSharedSecret();
-  virtual void engineReset();
-public:
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * KA_ELGAMAL_RECIPIENT_PRIVATE_KEY;
-  static ::java::lang::String * KA_ELGAMAL_RECIPIENT_PUBLIC_KEY;
-public: // actually protected
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) ZZ;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h b/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h
deleted file mode 100644
index cba0013..0000000
--- a/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_ElGamalReceiver__
-#define __gnu_javax_crypto_key_dh_ElGamalReceiver__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace dh
-          {
-              class ElGamalReceiver;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::ElGamalReceiver : public ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement
-{
-
-public:
-  ElGamalReceiver();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement)))) B;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_ElGamalReceiver__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h b/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h
deleted file mode 100644
index 487867f..0000000
--- a/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_ElGamalSender__
-#define __gnu_javax_crypto_key_dh_ElGamalSender__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace dh
-          {
-              class ElGamalSender;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::ElGamalSender : public ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement
-{
-
-public:
-  ElGamalSender();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::javax::crypto::interfaces::DHPublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement)))) B;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_ElGamalSender__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h
deleted file mode 100644
index 2d8f292..0000000
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_GnuDHKey__
-#define __gnu_javax_crypto_key_dh_GnuDHKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class GnuDHKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::GnuDHKey : public ::java::lang::Object
-{
-
-public: // actually protected
-  GnuDHKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual ::java::math::BigInteger * getQ();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getEncoded(jint) = 0;
-public: // actually protected
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) q;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * g;
-  jint defaultFormat;
-private:
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_GnuDHKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
deleted file mode 100644
index 512560d..0000000
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
-#define __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class GnuDHKeyPairGenerator;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::GnuDHKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  GnuDHKeyPairGenerator();
-  virtual ::java::lang::String * name();
-  virtual void setup(::java::util::Map *);
-  virtual ::java::security::KeyPair * generate();
-private:
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * DH_PARAMETERS;
-  static ::java::lang::String * PRIME_SIZE;
-  static ::java::lang::String * EXPONENT_SIZE;
-  static ::java::lang::String * PREFERRED_ENCODING_FORMAT;
-  static const jint DEFAULT_PRIME_SIZE = 512;
-  static const jint DEFAULT_EXPONENT_SIZE = 160;
-private:
-  static const jint DEFAULT_ENCODING_FORMAT = 1;
-  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rnd;
-  jint l;
-  jint m;
-  ::java::math::BigInteger * seed;
-  ::java::math::BigInteger * counter;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * j;
-  ::java::math::BigInteger * g;
-  ::gnu::java::security::util::PRNG * prng;
-  jint preferredFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h
deleted file mode 100644
index 1422622..0000000
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
-#define __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/GnuDHKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class GnuDHPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::GnuDHPrivateKey : public ::gnu::javax::crypto::key::dh::GnuDHKey
-{
-
-public:
-  GnuDHPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  GnuDHPrivateKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::javax::crypto::key::dh::GnuDHPrivateKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getX();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::GnuDHKey)))) x;
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h
deleted file mode 100644
index 980e7f7..0000000
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_GnuDHPublicKey__
-#define __gnu_javax_crypto_key_dh_GnuDHPublicKey__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/dh/GnuDHKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class GnuDHPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::GnuDHPublicKey : public ::gnu::javax::crypto::key::dh::GnuDHKey
-{
-
-public:
-  GnuDHPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  GnuDHPublicKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::gnu::javax::crypto::key::dh::GnuDHPublicKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getY();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::GnuDHKey)))) y;
-  ::java::lang::String * str;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_GnuDHPublicKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/RFC2631.h b/libjava/gnu/javax/crypto/key/dh/RFC2631.h
deleted file mode 100644
index 36f1f46..0000000
--- a/libjava/gnu/javax/crypto/key/dh/RFC2631.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_dh_RFC2631__
-#define __gnu_javax_crypto_key_dh_RFC2631__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha160;
-        }
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class RFC2631;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::dh::RFC2631 : public ::java::lang::Object
-{
-
-public:
-  RFC2631(jint, jint, ::java::security::SecureRandom *);
-  virtual JArray< ::java::math::BigInteger * > * generateParameters();
-private:
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-public:
-  static const jint DH_PARAMS_SEED = 0;
-  static const jint DH_PARAMS_COUNTER = 1;
-  static const jint DH_PARAMS_Q = 2;
-  static const jint DH_PARAMS_P = 3;
-  static const jint DH_PARAMS_J = 4;
-  static const jint DH_PARAMS_G = 5;
-private:
-  static ::java::math::BigInteger * TWO;
-  ::gnu::java::security::hash::Sha160 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sha;
-  jint m;
-  jint L;
-  ::java::security::SecureRandom * rnd;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_dh_RFC2631__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h b/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h
deleted file mode 100644
index 34913f0..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6Host__
-#define __gnu_javax_crypto_key_srp6_SRP6Host__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6Host;
-          }
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SRPAuthInfoProvider;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6Host : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
-{
-
-public:
-  SRP6Host();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-  virtual void engineReset();
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::java::security::KeyPair * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) hostKeyPair;
-  ::gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider * passwordDB;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6Host__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h b/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h
deleted file mode 100644
index 7479d7e..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
-#define __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRP6KeyAgreement;
-          }
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SRP;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6KeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
-{
-
-public: // actually protected
-  SRP6KeyAgreement();
-  virtual JArray< jbyte > * engineSharedSecret();
-  virtual void engineReset();
-  virtual ::java::math::BigInteger * uValue(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::String * SHARED_MODULUS;
-  static ::java::lang::String * GENERATOR;
-  static ::java::lang::String * HASH_FUNCTION;
-  static ::java::lang::String * USER_IDENTITY;
-  static ::java::lang::String * USER_PASSWORD;
-  static ::java::lang::String * HOST_PASSWORD_DB;
-public: // actually protected
-  static ::java::math::BigInteger * THREE;
-  ::gnu::javax::crypto::sasl::srp::SRP * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) srp;
-  ::java::math::BigInteger * N;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * K;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h
deleted file mode 100644
index 1797415..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6SaslClient__
-#define __gnu_javax_crypto_key_srp6_SRP6SaslClient__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6TLSClient.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6SaslClient;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6SaslClient : public ::gnu::javax::crypto::key::srp6::SRP6TLSClient
-{
-
-public:
-  SRP6SaslClient();
-public: // actually protected
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6SaslClient__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h
deleted file mode 100644
index 5ac6a47..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6SaslServer__
-#define __gnu_javax_crypto_key_srp6_SRP6SaslServer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6TLSServer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6SaslServer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6SaslServer : public ::gnu::javax::crypto::key::srp6::SRP6TLSServer
-{
-
-public:
-  SRP6SaslServer();
-public: // actually protected
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6SaslServer__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h
deleted file mode 100644
index b5df351..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6TLSClient__
-#define __gnu_javax_crypto_key_srp6_SRP6TLSClient__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6TLSClient;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6TLSClient : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
-{
-
-public:
-  SRP6TLSClient();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-  virtual void engineReset();
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * sendIdentity(::gnu::javax::crypto::key::IncomingMessage *);
-public: // actually protected
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) I;
-  JArray< jbyte > * p;
-  ::java::security::KeyPair * userKeyPair;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6TLSClient__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h
deleted file mode 100644
index facb7cb..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6TLSServer__
-#define __gnu_javax_crypto_key_srp6_SRP6TLSServer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6TLSServer;
-          }
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SRPAuthInfoProvider;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6TLSServer : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
-{
-
-public:
-  SRP6TLSServer();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-  virtual void engineReset();
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * sendParameters(::gnu::javax::crypto::key::IncomingMessage *);
-public: // actually protected
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-private:
-  ::java::security::KeyPair * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) hostKeyPair;
-  ::gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider * passwordDB;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6TLSServer__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6User.h b/libjava/gnu/javax/crypto/key/srp6/SRP6User.h
deleted file mode 100644
index 2d9f725..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRP6User.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRP6User__
-#define __gnu_javax_crypto_key_srp6_SRP6User__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IncomingMessage;
-            class OutgoingMessage;
-          namespace srp6
-          {
-              class SRP6User;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRP6User : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
-{
-
-public:
-  SRP6User();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
-  virtual void engineReset();
-private:
-  ::gnu::javax::crypto::key::OutgoingMessage * sendIdentity(::gnu::javax::crypto::key::IncomingMessage *);
-  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) I;
-  JArray< jbyte > * p;
-  ::java::security::KeyPair * userKeyPair;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRP6User__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h b/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h
deleted file mode 100644
index 534c681..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPAlgorithm__
-#define __gnu_javax_crypto_key_srp6_SRPAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPAlgorithm;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPAlgorithm : public ::java::lang::Object
-{
-
-  SRPAlgorithm();
-public:
-  static void checkParams(::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * N_2048;
-  static ::java::math::BigInteger * N_1536;
-  static ::java::math::BigInteger * N_1280;
-  static ::java::math::BigInteger * N_1024;
-  static ::java::math::BigInteger * N_768;
-  static ::java::math::BigInteger * N_640;
-  static ::java::math::BigInteger * N_512;
-  static ::java::math::BigInteger * N_384;
-  static ::java::math::BigInteger * N_264;
-private:
-  static ::java::math::BigInteger * ZERO;
-  static ::java::math::BigInteger * ONE;
-  static ::java::math::BigInteger * TWO;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPAlgorithm__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPKey.h
deleted file mode 100644
index 9c4ef51..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPKey.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPKey__
-#define __gnu_javax_crypto_key_srp6_SRPKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPKey : public ::java::lang::Object
-{
-
-public: // actually protected
-  SRPKey(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual ::java::math::BigInteger * getN();
-  virtual ::java::math::BigInteger * getG();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< jbyte > * getEncoded(jint) = 0;
-public: // actually protected
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) N;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPKey__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h
deleted file mode 100644
index 2be95fb..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
-#define __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPKeyPairGenerator;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  SRPKeyPairGenerator();
-  virtual ::java::lang::String * name();
-  virtual void setup(::java::util::Map *);
-  virtual ::java::security::KeyPair * generate();
-private:
-  JArray< ::java::math::BigInteger * > * generateParameters();
-  ::java::security::KeyPair * hostKeyPair();
-  ::java::security::KeyPair * userKeyPair();
-  void nextRandomBytes(JArray< jbyte > *);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-  static ::java::math::BigInteger * ZERO;
-  static ::java::math::BigInteger * ONE;
-  static ::java::math::BigInteger * TWO;
-  static ::java::math::BigInteger * THREE;
-public:
-  static ::java::lang::String * MODULUS_LENGTH;
-  static ::java::lang::String * USE_DEFAULTS;
-  static ::java::lang::String * SHARED_MODULUS;
-  static ::java::lang::String * GENERATOR;
-  static ::java::lang::String * USER_VERIFIER;
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-private:
-  static const jint DEFAULT_MODULUS_LENGTH = 1024;
-  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rnd;
-  jint l;
-  ::java::math::BigInteger * N;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * v;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h
deleted file mode 100644
index 3f6f0db..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
-#define __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPKeyPairRawCodec;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPKeyPairRawCodec : public ::java::lang::Object
-{
-
-public:
-  SRPKeyPairRawCodec();
-  virtual jint getFormatID();
-  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
-  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
-  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
-  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h
deleted file mode 100644
index af942a1..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPPrivateKey__
-#define __gnu_javax_crypto_key_srp6_SRPPrivateKey__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRPKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPPrivateKey : public ::gnu::javax::crypto::key::srp6::SRPKey
-{
-
-public:
-  SRPPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  SRPPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-public: // actually package-private
-  SRPPrivateKey(JArray< ::java::math::BigInteger * > *);
-public:
-  static ::gnu::javax::crypto::key::srp6::SRPPrivateKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getX();
-  virtual ::java::math::BigInteger * getV();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRPKey)))) X;
-  ::java::math::BigInteger * v;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPPrivateKey__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h
deleted file mode 100644
index 8b1b7b0..0000000
--- a/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_key_srp6_SRPPublicKey__
-#define __gnu_javax_crypto_key_srp6_SRPPublicKey__
-
-#pragma interface
-
-#include <gnu/javax/crypto/key/srp6/SRPKey.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace srp6
-          {
-              class SRPPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::key::srp6::SRPPublicKey : public ::gnu::javax::crypto::key::srp6::SRPKey
-{
-
-public:
-  SRPPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-public: // actually package-private
-  SRPPublicKey(JArray< ::java::math::BigInteger * > *);
-public:
-  static ::gnu::javax::crypto::key::srp6::SRPPublicKey * valueOf(JArray< jbyte > *);
-  virtual ::java::math::BigInteger * getY();
-  virtual JArray< jbyte > * getEncoded(jint);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRPKey)))) Y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_key_srp6_SRPPublicKey__
diff --git a/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h b/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h
deleted file mode 100644
index 833bd3c..0000000
--- a/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_AuthenticatedEntry__
-#define __gnu_javax_crypto_keyring_AuthenticatedEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class AuthenticatedEntry;
-            class Properties;
-        }
-        namespace mac
-        {
-            class IMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::AuthenticatedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
-{
-
-public:
-  AuthenticatedEntry(::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  AuthenticatedEntry();
-public:
-  static ::gnu::javax::crypto::keyring::AuthenticatedEntry * decode(::java::io::DataInputStream *);
-  void authenticate(JArray< jbyte > *);
-  void verify(JArray< jbyte > *);
-public: // actually protected
-  void encodePayload();
-private:
-  ::gnu::javax::crypto::mac::IMac * getMac(JArray< jbyte > *);
-public:
-  static const jint TYPE = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_AuthenticatedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/BaseKeyring.h b/libjava/gnu/javax/crypto/keyring/BaseKeyring.h
deleted file mode 100644
index 6d5806e..0000000
--- a/libjava/gnu/javax/crypto/keyring/BaseKeyring.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_BaseKeyring__
-#define __gnu_javax_crypto_keyring_BaseKeyring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class BaseKeyring;
-            class CompressedEntry;
-            class Entry;
-            class PasswordAuthenticatedEntry;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::BaseKeyring : public ::java::lang::Object
-{
-
-public:
-  BaseKeyring();
-  virtual void load(::java::util::Map *);
-  virtual void store(::java::util::Map *);
-  virtual void reset();
-  virtual jint size();
-  virtual ::java::util::Enumeration * aliases();
-  virtual jboolean containsAlias(::java::lang::String *);
-  virtual ::java::util::List * get(::java::lang::String *);
-  virtual void add(::gnu::javax::crypto::keyring::Entry *);
-  virtual void remove(::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::String * fixAlias(::java::lang::String *);
-  virtual void load(::java::io::InputStream *, JArray< jchar > *) = 0;
-  virtual void store(::java::io::OutputStream *, JArray< jchar > *) = 0;
-  ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyring;
-  ::gnu::javax::crypto::keyring::CompressedEntry * keyring2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_BaseKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h b/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h
deleted file mode 100644
index 2235f18..0000000
--- a/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_BinaryDataEntry__
-#define __gnu_javax_crypto_keyring_BinaryDataEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class BinaryDataEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::BinaryDataEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
-{
-
-public:
-  BinaryDataEntry(::java::lang::String *, JArray< jbyte > *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  BinaryDataEntry();
-public:
-  static ::gnu::javax::crypto::keyring::BinaryDataEntry * decode(::java::io::DataInputStream *);
-  virtual ::java::lang::String * getContentType();
-  virtual JArray< jbyte > * getData();
-public: // actually protected
-  virtual void encodePayload();
-public:
-  static const jint TYPE = 9;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_BinaryDataEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CertPathEntry.h b/libjava/gnu/javax/crypto/keyring/CertPathEntry.h
deleted file mode 100644
index 67501a9..0000000
--- a/libjava/gnu/javax/crypto/keyring/CertPathEntry.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_CertPathEntry__
-#define __gnu_javax_crypto_keyring_CertPathEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class CertPathEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::CertPathEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
-{
-
-public:
-  CertPathEntry(JArray< ::java::security::cert::Certificate * > *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  CertPathEntry();
-public:
-  static ::gnu::javax::crypto::keyring::CertPathEntry * decode(::java::io::DataInputStream *);
-  JArray< ::java::security::cert::Certificate * > * getCertPath();
-public: // actually protected
-  void encodePayload();
-public:
-  static const jint TYPE = 8;
-private:
-  JArray< ::java::security::cert::Certificate * > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_CertPathEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CertificateEntry.h b/libjava/gnu/javax/crypto/keyring/CertificateEntry.h
deleted file mode 100644
index 48a4ecd..0000000
--- a/libjava/gnu/javax/crypto/keyring/CertificateEntry.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_CertificateEntry__
-#define __gnu_javax_crypto_keyring_CertificateEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class CertificateEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::CertificateEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
-{
-
-public:
-  CertificateEntry(::java::security::cert::Certificate *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  CertificateEntry();
-public:
-  static ::gnu::javax::crypto::keyring::CertificateEntry * decode(::java::io::DataInputStream *);
-  ::java::security::cert::Certificate * getCertificate();
-public: // actually protected
-  void encodePayload();
-public:
-  static const jint TYPE = 5;
-private:
-  ::java::security::cert::Certificate * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) certificate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_CertificateEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CompressedEntry.h b/libjava/gnu/javax/crypto/keyring/CompressedEntry.h
deleted file mode 100644
index e674b97..0000000
--- a/libjava/gnu/javax/crypto/keyring/CompressedEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_CompressedEntry__
-#define __gnu_javax_crypto_keyring_CompressedEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/EnvelopeEntry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class CompressedEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::CompressedEntry : public ::gnu::javax::crypto::keyring::EnvelopeEntry
-{
-
-public:
-  CompressedEntry(::gnu::javax::crypto::keyring::Properties *);
-private:
-  CompressedEntry();
-public:
-  static ::gnu::javax::crypto::keyring::CompressedEntry * decode(::java::io::DataInputStream *);
-public: // actually protected
-  virtual void encodePayload();
-public:
-  static const jint TYPE = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_CompressedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h b/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h
deleted file mode 100644
index e45fe22..0000000
--- a/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_EncryptedEntry__
-#define __gnu_javax_crypto_keyring_EncryptedEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class EncryptedEntry;
-            class Properties;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::EncryptedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
-{
-
-public:
-  EncryptedEntry(::java::lang::String *, ::java::lang::String *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  EncryptedEntry();
-public:
-  static ::gnu::javax::crypto::keyring::EncryptedEntry * decode(::java::io::DataInputStream *);
-  virtual void decrypt(JArray< jbyte > *, JArray< jbyte > *);
-  virtual void encrypt(JArray< jbyte > *, JArray< jbyte > *);
-  virtual void encodePayload();
-private:
-  ::gnu::javax::crypto::mode::IMode * getMode(JArray< jbyte > *, JArray< jbyte > *, jint);
-public:
-  static const jint TYPE = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_EncryptedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/Entry.h b/libjava/gnu/javax/crypto/keyring/Entry.h
deleted file mode 100644
index 3efab54..0000000
--- a/libjava/gnu/javax/crypto/keyring/Entry.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_Entry__
-#define __gnu_javax_crypto_keyring_Entry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::Entry : public ::java::lang::Object
-{
-
-public: // actually protected
-  Entry(jint, ::gnu::javax::crypto::keyring::Properties *);
-  Entry(jint);
-public:
-  virtual ::gnu::javax::crypto::keyring::Properties * getProperties();
-  virtual JArray< jbyte > * getPayload();
-  virtual void encode(::java::io::DataOutputStream *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void defaultDecode(::java::io::DataInputStream *);
-  virtual void encodePayload() = 0;
-private:
-  static ::java::util::logging::Logger * log;
-  static JArray< ::java::lang::String * > * TYPES;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::gnu::javax::crypto::keyring::Properties * properties;
-  JArray< jbyte > * payload;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_Entry__
diff --git a/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h b/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h
deleted file mode 100644
index 29bbb06..0000000
--- a/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_EnvelopeEntry__
-#define __gnu_javax_crypto_keyring_EnvelopeEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/Entry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class EnvelopeEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::EnvelopeEntry : public ::gnu::javax::crypto::keyring::Entry
-{
-
-public:
-  EnvelopeEntry(jint, ::gnu::javax::crypto::keyring::Properties *);
-public: // actually protected
-  EnvelopeEntry(jint);
-public:
-  virtual void add(::gnu::javax::crypto::keyring::Entry *);
-  virtual jboolean containsAlias(::java::lang::String *);
-  virtual jboolean containsEntry(::gnu::javax::crypto::keyring::Entry *);
-  virtual ::java::util::List * getEntries();
-  virtual ::java::util::List * get(::java::lang::String *);
-  virtual ::java::lang::String * getAliasList();
-  virtual jboolean remove(::gnu::javax::crypto::keyring::Entry *);
-  virtual jboolean remove(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void encodePayload();
-  virtual void setContainingEnvelope(::gnu::javax::crypto::keyring::EnvelopeEntry *);
-  virtual void decodeEnvelope(::java::io::DataInputStream *);
-private:
-  void makeAliasList();
-  static ::java::util::logging::Logger * log;
-public: // actually protected
-  ::gnu::javax::crypto::keyring::EnvelopeEntry * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::Entry)))) containingEnvelope;
-  ::java::util::List * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_EnvelopeEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h b/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h
deleted file mode 100644
index bb3317d..0000000
--- a/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_GnuPrivateKeyring__
-#define __gnu_javax_crypto_keyring_GnuPrivateKeyring__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/BaseKeyring.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class GnuPrivateKeyring;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::GnuPrivateKeyring : public ::gnu::javax::crypto::keyring::BaseKeyring
-{
-
-public:
-  GnuPrivateKeyring(::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, jint);
-  GnuPrivateKeyring();
-  virtual jboolean containsPrivateKey(::java::lang::String *);
-  virtual ::java::security::Key * getPrivateKey(::java::lang::String *, JArray< jchar > *);
-  virtual void putPrivateKey(::java::lang::String *, ::java::security::Key *, JArray< jchar > *);
-  virtual jboolean containsPublicKey(::java::lang::String *);
-  virtual ::java::security::PublicKey * getPublicKey(::java::lang::String *);
-  virtual void putPublicKey(::java::lang::String *, ::java::security::PublicKey *);
-  virtual jboolean containsCertPath(::java::lang::String *);
-  virtual JArray< ::java::security::cert::Certificate * > * getCertPath(::java::lang::String *);
-  virtual void putCertPath(::java::lang::String *, JArray< ::java::security::cert::Certificate * > *);
-public: // actually protected
-  virtual void load(::java::io::InputStream *, JArray< jchar > *);
-  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static const jint USAGE = 3;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::BaseKeyring)))) mac;
-  jint maclen;
-  ::java::lang::String * cipher;
-  ::java::lang::String * mode;
-  jint keylen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_GnuPrivateKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h b/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h
deleted file mode 100644
index 47abbac..0000000
--- a/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_GnuPublicKeyring__
-#define __gnu_javax_crypto_keyring_GnuPublicKeyring__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/BaseKeyring.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class GnuPublicKeyring;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::GnuPublicKeyring : public ::gnu::javax::crypto::keyring::BaseKeyring
-{
-
-public:
-  GnuPublicKeyring(::java::lang::String *, jint);
-  GnuPublicKeyring();
-  virtual jboolean containsCertificate(::java::lang::String *);
-  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *);
-  virtual void putCertificate(::java::lang::String *, ::java::security::cert::Certificate *);
-public: // actually protected
-  virtual void load(::java::io::InputStream *, JArray< jchar > *);
-  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static const jint USAGE = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_GnuPublicKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IKeyring.h b/libjava/gnu/javax/crypto/keyring/IKeyring.h
deleted file mode 100644
index a1827b3..0000000
--- a/libjava/gnu/javax/crypto/keyring/IKeyring.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_IKeyring__
-#define __gnu_javax_crypto_keyring_IKeyring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class IKeyring;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::IKeyring : public ::java::lang::Object
-{
-
-public:
-  virtual void load(::java::util::Map *) = 0;
-  virtual void store(::java::util::Map *) = 0;
-  virtual void reset() = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Enumeration * aliases() = 0;
-  virtual jboolean containsAlias(::java::lang::String *) = 0;
-  virtual ::java::util::List * get(::java::lang::String *) = 0;
-  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
-  virtual void remove(::java::lang::String *) = 0;
-  static ::java::lang::String * KEYRING_DATA_IN;
-  static ::java::lang::String * KEYRING_DATA_OUT;
-  static ::java::lang::String * KEYRING_PASSWORD;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_keyring_IKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h b/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h
deleted file mode 100644
index 9f9cb25..0000000
--- a/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_IPrivateKeyring__
-#define __gnu_javax_crypto_keyring_IPrivateKeyring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class IPrivateKeyring;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::IPrivateKeyring : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsPrivateKey(::java::lang::String *) = 0;
-  virtual ::java::security::Key * getPrivateKey(::java::lang::String *, JArray< jchar > *) = 0;
-  virtual void putPrivateKey(::java::lang::String *, ::java::security::Key *, JArray< jchar > *) = 0;
-  virtual jboolean containsPublicKey(::java::lang::String *) = 0;
-  virtual ::java::security::PublicKey * getPublicKey(::java::lang::String *) = 0;
-  virtual void putPublicKey(::java::lang::String *, ::java::security::PublicKey *) = 0;
-  virtual jboolean containsCertPath(::java::lang::String *) = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getCertPath(::java::lang::String *) = 0;
-  virtual void putCertPath(::java::lang::String *, JArray< ::java::security::cert::Certificate * > *) = 0;
-  virtual void load(::java::util::Map *) = 0;
-  virtual void store(::java::util::Map *) = 0;
-  virtual void reset() = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Enumeration * aliases() = 0;
-  virtual jboolean containsAlias(::java::lang::String *) = 0;
-  virtual ::java::util::List * get(::java::lang::String *) = 0;
-  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
-  virtual void remove(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_keyring_IPrivateKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h b/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h
deleted file mode 100644
index 06029e2..0000000
--- a/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_IPublicKeyring__
-#define __gnu_javax_crypto_keyring_IPublicKeyring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class IPublicKeyring;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::IPublicKeyring : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsCertificate(::java::lang::String *) = 0;
-  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *) = 0;
-  virtual void putCertificate(::java::lang::String *, ::java::security::cert::Certificate *) = 0;
-  virtual void load(::java::util::Map *) = 0;
-  virtual void store(::java::util::Map *) = 0;
-  virtual void reset() = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Enumeration * aliases() = 0;
-  virtual jboolean containsAlias(::java::lang::String *) = 0;
-  virtual ::java::util::List * get(::java::lang::String *) = 0;
-  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
-  virtual void remove(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_keyring_IPublicKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h b/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h
deleted file mode 100644
index 569911b..0000000
--- a/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_MalformedKeyringException__
-#define __gnu_javax_crypto_keyring_MalformedKeyringException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class MalformedKeyringException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::MalformedKeyringException : public ::java::io::IOException
-{
-
-public:
-  MalformedKeyringException();
-  MalformedKeyringException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_MalformedKeyringException__
diff --git a/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h b/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h
deleted file mode 100644
index 1d07ee2..0000000
--- a/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
-#define __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/EnvelopeEntry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Entry;
-            class MaskableEnvelopeEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::MaskableEnvelopeEntry : public ::gnu::javax::crypto::keyring::EnvelopeEntry
-{
-
-public:
-  MaskableEnvelopeEntry(jint, ::gnu::javax::crypto::keyring::Properties *);
-public: // actually protected
-  MaskableEnvelopeEntry(jint);
-  virtual void setMasked(jboolean);
-public:
-  virtual jboolean isMasked();
-  virtual void add(::gnu::javax::crypto::keyring::Entry *);
-  virtual jboolean containsEntry(::gnu::javax::crypto::keyring::Entry *);
-  virtual ::java::util::List * getEntries();
-  virtual ::java::util::List * get(::java::lang::String *);
-  virtual jboolean remove(::gnu::javax::crypto::keyring::Entry *);
-  virtual jboolean remove(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::EnvelopeEntry)))) masked;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h b/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h
deleted file mode 100644
index a6f3e4f..0000000
--- a/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_MeteredInputStream__
-#define __gnu_javax_crypto_keyring_MeteredInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class MeteredInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::MeteredInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  MeteredInputStream(::java::io::InputStream *, jint);
-public:
-  jboolean limitReached();
-  jint available();
-  void close();
-  void mark(jint);
-  jboolean markSupported();
-  jint read();
-  jint read(JArray< jbyte > *);
-  jint read(JArray< jbyte > *, jint, jint);
-  void reset();
-  jlong skip(jlong);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) count;
-  jint limit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_MeteredInputStream__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h
deleted file mode 100644
index b4a539a..0000000
--- a/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
-#define __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class PasswordAuthenticatedEntry;
-            class Properties;
-        }
-        namespace mac
-        {
-            class IMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PasswordAuthenticatedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
-{
-
-public:
-  PasswordAuthenticatedEntry(::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  PasswordAuthenticatedEntry();
-public:
-  static ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * decode(::java::io::DataInputStream *, JArray< jchar > *);
-  static ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * decode(::java::io::DataInputStream *);
-  void verify(JArray< jchar > *);
-  void authenticate(JArray< jchar > *);
-  void encode(::java::io::DataOutputStream *, JArray< jchar > *);
-public: // actually protected
-  void encodePayload(::java::io::DataOutputStream *);
-private:
-  ::gnu::javax::crypto::mac::IMac * getMac(JArray< jchar > *);
-  static ::java::util::logging::Logger * log;
-public:
-  static const jint TYPE = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h
deleted file mode 100644
index b05b31a..0000000
--- a/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
-#define __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class PasswordEncryptedEntry;
-            class Properties;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PasswordEncryptedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
-{
-
-public:
-  PasswordEncryptedEntry(::java::lang::String *, ::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  PasswordEncryptedEntry();
-public:
-  static ::gnu::javax::crypto::keyring::PasswordEncryptedEntry * decode(::java::io::DataInputStream *, JArray< jchar > *);
-  static ::gnu::javax::crypto::keyring::PasswordEncryptedEntry * decode(::java::io::DataInputStream *);
-  virtual void decrypt(JArray< jchar > *);
-  virtual void encrypt(JArray< jchar > *);
-  virtual void encode(::java::io::DataOutputStream *, JArray< jchar > *);
-public: // actually protected
-  virtual void encodePayload();
-private:
-  ::gnu::javax::crypto::mode::IMode * getMode(JArray< jchar > *, jint);
-  static ::java::util::logging::Logger * log;
-public:
-  static const jint TYPE = 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h
deleted file mode 100644
index 6b81878..0000000
--- a/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PasswordProtectedEntry__
-#define __gnu_javax_crypto_keyring_PasswordProtectedEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class PasswordProtectedEntry;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PasswordProtectedEntry : public ::java::lang::Object
-{
-
-public:
-  virtual void encode(::java::io::DataOutputStream *, JArray< jchar > *) = 0;
-  static ::java::lang::Integer * ITERATION_COUNT;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_keyring_PasswordProtectedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h b/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h
deleted file mode 100644
index 16d9d00..0000000
--- a/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PrimitiveEntry__
-#define __gnu_javax_crypto_keyring_PrimitiveEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/Entry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class PrimitiveEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PrimitiveEntry : public ::gnu::javax::crypto::keyring::Entry
-{
-
-public: // actually protected
-  PrimitiveEntry(jint, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-  PrimitiveEntry(jint);
-public:
-  virtual ::java::lang::String * getAlias();
-  virtual ::java::util::Date * getCreationDate();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually protected
-  virtual void makeCreationDate();
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::Entry)))) creationDate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_PrimitiveEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h b/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h
deleted file mode 100644
index 33f2f53..0000000
--- a/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PrivateKeyEntry__
-#define __gnu_javax_crypto_keyring_PrivateKeyEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class PrivateKeyEntry;
-            class Properties;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PrivateKeyEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
-{
-
-public:
-  PrivateKeyEntry(::java::security::Key *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  PrivateKeyEntry();
-public:
-  static ::gnu::javax::crypto::keyring::PrivateKeyEntry * decode(::java::io::DataInputStream *);
-  ::java::security::Key * getKey();
-public: // actually protected
-  void encodePayload();
-public:
-  ::java::lang::String * toString();
-  static const jint TYPE = 7;
-private:
-  ::java::security::Key * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_PrivateKeyEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/Properties.h b/libjava/gnu/javax/crypto/keyring/Properties.h
deleted file mode 100644
index 65d10a8..0000000
--- a/libjava/gnu/javax/crypto/keyring/Properties.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_Properties__
-#define __gnu_javax_crypto_keyring_Properties__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Properties;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::Properties : public ::java::lang::Object
-{
-
-public:
-  Properties();
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsKey(::java::lang::String *);
-  virtual jboolean containsValue(::java::lang::String *);
-  virtual ::java::lang::String * put(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * get(::java::lang::String *);
-  virtual ::java::lang::String * remove(::java::lang::String *);
-  virtual void decode(::java::io::DataInputStream *);
-  virtual void encode(::java::io::DataOutputStream *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * canonicalize(::java::lang::String *);
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) props;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_Properties__
diff --git a/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h b/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h
deleted file mode 100644
index 88d4744..0000000
--- a/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_keyring_PublicKeyEntry__
-#define __gnu_javax_crypto_keyring_PublicKeyEntry__
-
-#pragma interface
-
-#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace keyring
-        {
-            class Properties;
-            class PublicKeyEntry;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-    }
-  }
-}
-
-class gnu::javax::crypto::keyring::PublicKeyEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
-{
-
-public:
-  PublicKeyEntry(::java::security::PublicKey *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
-private:
-  PublicKeyEntry();
-public:
-  static ::gnu::javax::crypto::keyring::PublicKeyEntry * decode(::java::io::DataInputStream *);
-  ::java::security::PublicKey * getKey();
-public: // actually protected
-  void encodePayload();
-public:
-  static const jint TYPE = 6;
-private:
-  ::java::security::PublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_keyring_PublicKeyEntry__
diff --git a/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h b/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h
deleted file mode 100644
index 6e1528a..0000000
--- a/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_AESKeyWrap__
-#define __gnu_javax_crypto_kwa_AESKeyWrap__
-
-#pragma interface
-
-#include <gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class Rijndael;
-        }
-        namespace kwa
-        {
-            class AESKeyWrap;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::AESKeyWrap : public ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm
-{
-
-public:
-  AESKeyWrap();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-private:
-  static JArray< jbyte > * DEFAULT_IV;
-  ::gnu::javax::crypto::cipher::Rijndael * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm)))) aes;
-  JArray< jbyte > * iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_kwa_AESKeyWrap__
diff --git a/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h b/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h
deleted file mode 100644
index 34e1319..0000000
--- a/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
-#define __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace kwa
-        {
-            class BaseKeyWrappingAlgorithm;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseKeyWrappingAlgorithm(::java::lang::String *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void init(::java::util::Map *);
-  virtual jint wrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
-  virtual jint unwrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
-public: // actually protected
-  virtual void engineInit(::java::util::Map *) = 0;
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-private:
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
diff --git a/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h b/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h
deleted file mode 100644
index 56d032a..0000000
--- a/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
-#define __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace kwa
-        {
-            class IKeyWrappingAlgorithm;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::IKeyWrappingAlgorithm : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual jint wrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint unwrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::String * KEY_ENCRYPTION_KEY_MATERIAL;
-  static ::java::lang::String * INITIAL_VALUE;
-  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
diff --git a/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h b/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h
deleted file mode 100644
index b9d9039..0000000
--- a/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_KeyUnwrappingException__
-#define __gnu_javax_crypto_kwa_KeyUnwrappingException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace kwa
-        {
-            class KeyUnwrappingException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::KeyUnwrappingException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  KeyUnwrappingException();
-  KeyUnwrappingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_kwa_KeyUnwrappingException__
diff --git a/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h b/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h
deleted file mode 100644
index ab443db..0000000
--- a/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
-#define __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace kwa
-        {
-            class IKeyWrappingAlgorithm;
-            class KeyWrappingAlgorithmFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::KeyWrappingAlgorithmFactory : public ::java::lang::Object
-{
-
-  KeyWrappingAlgorithmFactory();
-public:
-  static ::gnu::javax::crypto::kwa::IKeyWrappingAlgorithm * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
diff --git a/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h b/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h
deleted file mode 100644
index 5f23a70..0000000
--- a/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_kwa_TripleDESKeyWrap__
-#define __gnu_javax_crypto_kwa_TripleDESKeyWrap__
-
-#pragma interface
-
-#include <gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class Sha160;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Assembly;
-        }
-        namespace kwa
-        {
-            class TripleDESKeyWrap;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::crypto::kwa::TripleDESKeyWrap : public ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm
-{
-
-public:
-  TripleDESKeyWrap();
-public: // actually protected
-  virtual void engineInit(::java::util::Map *);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-private:
-  void nextRandomBytes(JArray< jbyte > *);
-  static JArray< jbyte > * DEFAULT_IV;
-  ::gnu::javax::crypto::assembly::Assembly * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm)))) asm$;
-  ::java::util::HashMap * asmAttributes;
-  ::java::util::HashMap * modeAttributes;
-  ::gnu::java::security::hash::Sha160 * sha;
-  ::java::security::SecureRandom * rnd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_kwa_TripleDESKeyWrap__
diff --git a/libjava/gnu/javax/crypto/mac/BaseMac.h b/libjava/gnu/javax/crypto/mac/BaseMac.h
deleted file mode 100644
index aebe931..0000000
--- a/libjava/gnu/javax/crypto/mac/BaseMac.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_BaseMac__
-#define __gnu_javax_crypto_mac_BaseMac__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class BaseMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::BaseMac : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseMac(::java::lang::String *);
-  BaseMac(::java::lang::String *, ::gnu::java::security::hash::IMessageDigest *);
-public:
-  virtual ::java::lang::String * name();
-  virtual jint macSize();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual ::java::lang::Object * clone();
-  virtual void init(::java::util::Map *) = 0;
-  virtual JArray< jbyte > * digest() = 0;
-  virtual jboolean selfTest() = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  ::gnu::java::security::hash::IMessageDigest * underlyingHash;
-  jint truncatedSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_BaseMac__
diff --git a/libjava/gnu/javax/crypto/mac/HMac.h b/libjava/gnu/javax/crypto/mac/HMac.h
deleted file mode 100644
index c38a9e7..0000000
--- a/libjava/gnu/javax/crypto/mac/HMac.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_HMac__
-#define __gnu_javax_crypto_mac_HMac__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mac/BaseMac.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class HMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::HMac : public ::gnu::javax::crypto::mac::BaseMac
-{
-
-public: // actually protected
-  HMac(::gnu::java::security::hash::IMessageDigest *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-  virtual JArray< jbyte > * digest();
-  virtual jboolean selfTest();
-  static ::java::lang::String * USE_WITH_PKCS5_V2;
-private:
-  static const jbyte IPAD_BYTE = 54;
-  static const jbyte OPAD_BYTE = 92;
-  static ::java::lang::Boolean * valid;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) macSize;
-  jint blockSize;
-  ::gnu::java::security::hash::IMessageDigest * ipadHash;
-  ::gnu::java::security::hash::IMessageDigest * opadHash;
-  JArray< jbyte > * ipad;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_HMac__
diff --git a/libjava/gnu/javax/crypto/mac/HMacFactory.h b/libjava/gnu/javax/crypto/mac/HMacFactory.h
deleted file mode 100644
index e32104e..0000000
--- a/libjava/gnu/javax/crypto/mac/HMacFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_HMacFactory__
-#define __gnu_javax_crypto_mac_HMacFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class HMacFactory;
-            class IMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::HMacFactory : public ::java::lang::Object
-{
-
-  HMacFactory();
-public:
-  static ::gnu::javax::crypto::mac::IMac * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_HMacFactory__
diff --git a/libjava/gnu/javax/crypto/mac/IMac.h b/libjava/gnu/javax/crypto/mac/IMac.h
deleted file mode 100644
index 9bed61a..0000000
--- a/libjava/gnu/javax/crypto/mac/IMac.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_IMac__
-#define __gnu_javax_crypto_mac_IMac__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::IMac : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual jint macSize() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual void update(jbyte) = 0;
-  virtual void update(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * digest() = 0;
-  virtual void reset() = 0;
-  virtual jboolean selfTest() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::String * MAC_KEY_MATERIAL;
-  static ::java::lang::String * TRUNCATED_SIZE;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_mac_IMac__
diff --git a/libjava/gnu/javax/crypto/mac/MacFactory.h b/libjava/gnu/javax/crypto/mac/MacFactory.h
deleted file mode 100644
index 141a59c..0000000
--- a/libjava/gnu/javax/crypto/mac/MacFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_MacFactory__
-#define __gnu_javax_crypto_mac_MacFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-            class MacFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::MacFactory : public ::java::lang::Object
-{
-
-  MacFactory();
-public:
-  static ::gnu::javax::crypto::mac::IMac * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_MacFactory__
diff --git a/libjava/gnu/javax/crypto/mac/MacInputStream.h b/libjava/gnu/javax/crypto/mac/MacInputStream.h
deleted file mode 100644
index 52087df..0000000
--- a/libjava/gnu/javax/crypto/mac/MacInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_MacInputStream__
-#define __gnu_javax_crypto_mac_MacInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-            class MacInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::MacInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  MacInputStream(::java::io::InputStream *, ::gnu::javax::crypto::mac::IMac *);
-  virtual ::gnu::javax::crypto::mac::IMac * getMac();
-  virtual void setMac(::gnu::javax::crypto::mac::IMac *);
-  virtual void on(jboolean);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) digesting;
-  ::gnu::javax::crypto::mac::IMac * mac;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_MacInputStream__
diff --git a/libjava/gnu/javax/crypto/mac/MacOutputStream.h b/libjava/gnu/javax/crypto/mac/MacOutputStream.h
deleted file mode 100644
index 936a599..0000000
--- a/libjava/gnu/javax/crypto/mac/MacOutputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_MacOutputStream__
-#define __gnu_javax_crypto_mac_MacOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-            class MacOutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::MacOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  MacOutputStream(::java::io::OutputStream *, ::gnu::javax::crypto::mac::IMac *);
-  virtual ::gnu::javax::crypto::mac::IMac * getMac();
-  virtual void setMac(::gnu::javax::crypto::mac::IMac *);
-  virtual void on(jboolean);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) digesting;
-  ::gnu::javax::crypto::mac::IMac * mac;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_MacOutputStream__
diff --git a/libjava/gnu/javax/crypto/mac/OMAC.h b/libjava/gnu/javax/crypto/mac/OMAC.h
deleted file mode 100644
index e608c46..0000000
--- a/libjava/gnu/javax/crypto/mac/OMAC.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_OMAC__
-#define __gnu_javax_crypto_mac_OMAC__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mac
-        {
-            class OMAC;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::OMAC : public ::java::lang::Object
-{
-
-public:
-  OMAC(::gnu::javax::crypto::cipher::IBlockCipher *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * name();
-  virtual jint macSize();
-  virtual void init(::java::util::Map *);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void digest(JArray< jbyte > *, jint);
-  virtual void reset();
-  virtual jboolean selfTest();
-private:
-  void process();
-  static ::java::util::logging::Logger * log;
-  static const jbyte C1 = -121;
-  static const jbyte C2 = 27;
-  static JArray< jbyte > * KEY0;
-  static JArray< jbyte > * DIGEST0;
-  static ::java::lang::Boolean * valid;
-  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipher;
-  ::java::lang::String * name__;
-  ::gnu::javax::crypto::mode::IMode * mode;
-  jint blockSize;
-  jint outputSize;
-  JArray< jbyte > * Lu;
-  JArray< jbyte > * Lu2;
-  JArray< jbyte > * M;
-  JArray< jbyte > * Y;
-  jboolean init__;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_OMAC__
diff --git a/libjava/gnu/javax/crypto/mac/TMMH16.h b/libjava/gnu/javax/crypto/mac/TMMH16.h
deleted file mode 100644
index 9ca8a7a..0000000
--- a/libjava/gnu/javax/crypto/mac/TMMH16.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_TMMH16__
-#define __gnu_javax_crypto_mac_TMMH16__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mac/BaseMac.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class TMMH16;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::TMMH16 : public ::gnu::javax::crypto::mac::BaseMac
-{
-
-public:
-  TMMH16();
-  virtual jint macSize();
-  virtual void init(::java::util::Map *);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-  virtual jboolean selfTest();
-  virtual ::java::lang::Object * clone();
-  virtual void update(jbyte, ::gnu::java::security::prng::IRandom *);
-  virtual void update(JArray< jbyte > *, jint, jint, ::gnu::java::security::prng::IRandom *);
-  virtual JArray< jbyte > * digest(::gnu::java::security::prng::IRandom *);
-private:
-  jint getNextKeyWord(::gnu::java::security::prng::IRandom *);
-  void doFinalRound(::gnu::java::security::prng::IRandom *);
-public:
-  static ::java::lang::String * TAG_LENGTH;
-  static ::java::lang::String * KEYSTREAM;
-  static ::java::lang::String * PREFIX;
-private:
-  static const jint P = 65537;
-  static ::java::lang::Boolean * valid;
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) tagWords;
-  ::gnu::java::security::prng::IRandom * keystream;
-  JArray< jbyte > * prefix;
-  jlong keyWords;
-  jlong msgLength;
-  jlong msgWords;
-  JArray< jint > * context;
-  JArray< jint > * K0;
-  JArray< jint > * Ki;
-  jint Mi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_TMMH16__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h
deleted file mode 100644
index 8df8662..0000000
--- a/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_UHash32$L1Hash32__
-#define __gnu_javax_crypto_mac_UHash32$L1Hash32__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class UHash32;
-            class UHash32$L1Hash32;
-            class UHash32$L2Hash32;
-            class UHash32$L3Hash32;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::UHash32$L1Hash32 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UHash32$L1Hash32(::gnu::javax::crypto::mac::UHash32 *);
-private:
-  UHash32$L1Hash32(::gnu::javax::crypto::mac::UHash32 *, ::gnu::javax::crypto::mac::UHash32$L1Hash32 *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void init(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  virtual void update(jbyte);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-private:
-  JArray< jbyte > * nh32(jint);
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  JArray< jbyte > * buffer;
-  jint count;
-  ::java::io::ByteArrayOutputStream * Y;
-  jlong totalCount;
-  ::gnu::javax::crypto::mac::UHash32$L2Hash32 * l2hash;
-  ::gnu::javax::crypto::mac::UHash32$L3Hash32 * l3hash;
-public: // actually package-private
-  ::gnu::javax::crypto::mac::UHash32 * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_UHash32$L1Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h
deleted file mode 100644
index 1971add..0000000
--- a/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_UHash32$L2Hash32__
-#define __gnu_javax_crypto_mac_UHash32$L2Hash32__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class UHash32;
-            class UHash32$L2Hash32;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::UHash32$L2Hash32 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UHash32$L2Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jbyte > *);
-private:
-  UHash32$L2Hash32(::gnu::javax::crypto::mac::UHash32 *, ::gnu::javax::crypto::mac::UHash32$L2Hash32 *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-private:
-  JArray< jbyte > * yTo16bytes();
-  void poly(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< jbyte > *, jint, jint);
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k64;
-  ::java::math::BigInteger * k128;
-  ::java::math::BigInteger * y;
-  jboolean highBound;
-  jlong bytesSoFar;
-  ::java::io::ByteArrayOutputStream * buffer;
-public: // actually package-private
-  ::gnu::javax::crypto::mac::UHash32 * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_UHash32$L2Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h
deleted file mode 100644
index 4e6b580..0000000
--- a/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_UHash32$L3Hash32__
-#define __gnu_javax_crypto_mac_UHash32$L3Hash32__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class UHash32;
-            class UHash32$L3Hash32;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::UHash32$L3Hash32 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UHash32$L3Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jbyte > *, JArray< jbyte > *);
-private:
-  UHash32$L3Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jint > *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual JArray< jbyte > * digest(JArray< jbyte > *);
-private:
-  static const jlong PRIME_36 = 68719476731LL;
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k;
-public: // actually package-private
-  ::gnu::javax::crypto::mac::UHash32 * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_UHash32$L3Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32.h b/libjava/gnu/javax/crypto/mac/UHash32.h
deleted file mode 100644
index 0b2be15..0000000
--- a/libjava/gnu/javax/crypto/mac/UHash32.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_UHash32__
-#define __gnu_javax_crypto_mac_UHash32__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mac/BaseMac.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class UHash32;
-            class UHash32$L1Hash32;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::UHash32 : public ::gnu::javax::crypto::mac::BaseMac
-{
-
-public:
-  UHash32();
-private:
-  UHash32(::gnu::javax::crypto::mac::UHash32 *);
-public: // actually package-private
-  static ::java::math::BigInteger * prime(jint);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jint macSize();
-  virtual void init(::java::util::Map *);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-  virtual jboolean selfTest();
-private:
-  static ::java::math::BigInteger * PRIME_19;
-  static ::java::math::BigInteger * PRIME_32;
-  static ::java::math::BigInteger * PRIME_36;
-  static ::java::math::BigInteger * PRIME_64;
-  static ::java::math::BigInteger * PRIME_128;
-public: // actually package-private
-  static ::java::math::BigInteger * TWO;
-  static jlong BOUNDARY;
-  static ::java::math::BigInteger * LOWER_RANGE;
-  static ::java::math::BigInteger * UPPER_RANGE;
-  static JArray< jbyte > * ALL_ZEROES;
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) streams;
-  JArray< ::gnu::javax::crypto::mac::UHash32$L1Hash32 * > * l1hash;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_UHash32__
diff --git a/libjava/gnu/javax/crypto/mac/UMac32.h b/libjava/gnu/javax/crypto/mac/UMac32.h
deleted file mode 100644
index 7cec99e..0000000
--- a/libjava/gnu/javax/crypto/mac/UMac32.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mac_UMac32__
-#define __gnu_javax_crypto_mac_UMac32__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mac/BaseMac.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class UHash32;
-            class UMac32;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::mac::UMac32 : public ::gnu::javax::crypto::mac::BaseMac
-{
-
-public:
-  UMac32();
-private:
-  UMac32(::gnu::javax::crypto::mac::UMac32 *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jint macSize();
-  virtual void init(::java::util::Map *);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest();
-  virtual void reset();
-  virtual jboolean selfTest();
-private:
-  JArray< jbyte > * pdf();
-public:
-  static ::java::lang::String * NONCE_MATERIAL;
-private:
-  static ::java::lang::String * TV1;
-  static ::java::math::BigInteger * MAX_NONCE_ITERATIONS;
-public: // actually package-private
-  static const jint OUTPUT_LEN = 8;
-  static const jint L1_KEY_LEN = 1024;
-  static const jint KEY_LEN = 16;
-private:
-  static ::java::lang::Boolean * valid;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) nonce;
-  ::gnu::javax::crypto::mac::UHash32 * uhash32;
-  ::java::math::BigInteger * nonceReuseCount;
-  JArray< jbyte > * K;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mac_UMac32__
diff --git a/libjava/gnu/javax/crypto/mode/BaseMode.h b/libjava/gnu/javax/crypto/mode/BaseMode.h
deleted file mode 100644
index 25ad4aa..0000000
--- a/libjava/gnu/javax/crypto/mode/BaseMode.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_BaseMode__
-#define __gnu_javax_crypto_mode_BaseMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class BaseMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::BaseMode : public ::java::lang::Object
-{
-
-public: // actually protected
-  BaseMode(::java::lang::String *, ::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-public:
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual ::java::lang::String * name();
-  virtual jint defaultBlockSize();
-  virtual jint defaultKeySize();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize();
-  virtual void reset();
-  virtual jboolean selfTest();
-  virtual ::java::lang::Object * clone() = 0;
-  virtual void setup() = 0;
-  virtual void teardown() = 0;
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-private:
-  jboolean testSymmetry(jint, jint);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jint state;
-  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
-  jint cipherBlockSize;
-  jint modeBlockSize;
-  JArray< jbyte > * iv;
-  ::java::lang::Object * lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_BaseMode__
diff --git a/libjava/gnu/javax/crypto/mode/CBC.h b/libjava/gnu/javax/crypto/mode/CBC.h
deleted file mode 100644
index 24126a6..0000000
--- a/libjava/gnu/javax/crypto/mode/CBC.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_CBC__
-#define __gnu_javax_crypto_mode_CBC__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class CBC;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::CBC : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  CBC(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  CBC(::gnu::javax::crypto::mode::CBC *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) lastBlock;
-  JArray< jbyte > * scratch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_CBC__
diff --git a/libjava/gnu/javax/crypto/mode/CFB.h b/libjava/gnu/javax/crypto/mode/CFB.h
deleted file mode 100644
index 3931a9b..0000000
--- a/libjava/gnu/javax/crypto/mode/CFB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_CFB__
-#define __gnu_javax_crypto_mode_CFB__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class CFB;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::CFB : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  CFB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  CFB(::gnu::javax::crypto::mode::CFB *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) shiftRegister;
-  JArray< jbyte > * scratch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_CFB__
diff --git a/libjava/gnu/javax/crypto/mode/CTR.h b/libjava/gnu/javax/crypto/mode/CTR.h
deleted file mode 100644
index 3bb11e6..0000000
--- a/libjava/gnu/javax/crypto/mode/CTR.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_CTR__
-#define __gnu_javax_crypto_mode_CTR__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class CTR;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::CTR : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  CTR(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  CTR(::gnu::javax::crypto::mode::CTR *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual ::java::util::Iterator * blockSizes();
-private:
-  void ctr(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) off;
-  JArray< jbyte > * counter;
-  JArray< jbyte > * enc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_CTR__
diff --git a/libjava/gnu/javax/crypto/mode/EAX.h b/libjava/gnu/javax/crypto/mode/EAX.h
deleted file mode 100644
index d47f07b..0000000
--- a/libjava/gnu/javax/crypto/mode/EAX.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_EAX__
-#define __gnu_javax_crypto_mode_EAX__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mac
-        {
-            class IMac;
-        }
-        namespace mode
-        {
-            class EAX;
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::EAX : public ::java::lang::Object
-{
-
-public:
-  EAX(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * name();
-  virtual jint defaultBlockSize();
-  virtual jint defaultKeySize();
-  virtual ::java::util::Iterator * blockSizes();
-  virtual ::java::util::Iterator * keySizes();
-  virtual void init(::java::util::Map *);
-  virtual jint currentBlockSize();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void reset();
-  virtual jboolean selfTest();
-  virtual jint macSize();
-  virtual JArray< jbyte > * digest();
-  virtual void digest(JArray< jbyte > *, jint);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) tagSize;
-  ::gnu::javax::crypto::mac::IMac * nonceOmac;
-  ::gnu::javax::crypto::mac::IMac * headerOmac;
-  ::gnu::javax::crypto::mac::IMac * msgOmac;
-  ::gnu::javax::crypto::mode::IMode * ctr;
-  jint state;
-  jboolean init__;
-  jint cipherBlockSize;
-  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
-  JArray< jbyte > * t_n;
-  static jboolean valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_EAX__
diff --git a/libjava/gnu/javax/crypto/mode/ECB.h b/libjava/gnu/javax/crypto/mode/ECB.h
deleted file mode 100644
index ddde9c7..0000000
--- a/libjava/gnu/javax/crypto/mode/ECB.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_ECB__
-#define __gnu_javax_crypto_mode_ECB__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class ECB;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::ECB : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  ECB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  ECB(::gnu::javax::crypto::mode::ECB *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_ECB__
diff --git a/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h b/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h
deleted file mode 100644
index 7954ce8..0000000
--- a/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_IAuthenticatedMode__
-#define __gnu_javax_crypto_mode_IAuthenticatedMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mode
-        {
-            class IAuthenticatedMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::IAuthenticatedMode : public ::java::lang::Object
-{
-
-public:
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual ::java::lang::String * name() = 0;
-  virtual jint defaultBlockSize() = 0;
-  virtual jint defaultKeySize() = 0;
-  virtual ::java::util::Iterator * blockSizes() = 0;
-  virtual ::java::util::Iterator * keySizes() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual jint currentBlockSize() = 0;
-  virtual void reset() = 0;
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual jboolean selfTest() = 0;
-  virtual jint macSize() = 0;
-  virtual void update(jbyte) = 0;
-  virtual void update(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * digest() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_mode_IAuthenticatedMode__
diff --git a/libjava/gnu/javax/crypto/mode/ICM.h b/libjava/gnu/javax/crypto/mode/ICM.h
deleted file mode 100644
index ee18743..0000000
--- a/libjava/gnu/javax/crypto/mode/ICM.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_ICM__
-#define __gnu_javax_crypto_mode_ICM__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class ICM;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::ICM : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  ICM(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  ICM(::gnu::javax::crypto::mode::ICM *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-private:
-  void icm(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  static ::java::math::BigInteger * TWO_FIFTY_SIX;
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) maxBlocksPerSegment;
-  ::java::math::BigInteger * counterRange;
-  ::java::math::BigInteger * C0;
-  ::java::math::BigInteger * blockNdx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_ICM__
diff --git a/libjava/gnu/javax/crypto/mode/IMode.h b/libjava/gnu/javax/crypto/mode/IMode.h
deleted file mode 100644
index 8ee59c1..0000000
--- a/libjava/gnu/javax/crypto/mode/IMode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_IMode__
-#define __gnu_javax_crypto_mode_IMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::IMode : public ::java::lang::Object
-{
-
-public:
-  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual ::java::lang::String * name() = 0;
-  virtual jint defaultBlockSize() = 0;
-  virtual jint defaultKeySize() = 0;
-  virtual ::java::util::Iterator * blockSizes() = 0;
-  virtual ::java::util::Iterator * keySizes() = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual jint currentBlockSize() = 0;
-  virtual void reset() = 0;
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
-  virtual jboolean selfTest() = 0;
-  static ::java::lang::String * STATE;
-  static ::java::lang::String * MODE_BLOCK_SIZE;
-  static ::java::lang::String * IV;
-  static const jint ENCRYPTION = 1;
-  static const jint DECRYPTION = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_mode_IMode__
diff --git a/libjava/gnu/javax/crypto/mode/ModeFactory.h b/libjava/gnu/javax/crypto/mode/ModeFactory.h
deleted file mode 100644
index d3f694e..0000000
--- a/libjava/gnu/javax/crypto/mode/ModeFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_ModeFactory__
-#define __gnu_javax_crypto_mode_ModeFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class IMode;
-            class ModeFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::ModeFactory : public ::java::lang::Object
-{
-
-  ModeFactory();
-public:
-  static ::gnu::javax::crypto::mode::IMode * getInstance(::java::lang::String *, ::java::lang::String *, jint);
-  static ::gnu::javax::crypto::mode::IMode * getInstance(::java::lang::String *, ::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-  static ::java::util::Set * getNames();
-private:
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_ModeFactory__
diff --git a/libjava/gnu/javax/crypto/mode/OFB.h b/libjava/gnu/javax/crypto/mode/OFB.h
deleted file mode 100644
index 04bbaec..0000000
--- a/libjava/gnu/javax/crypto/mode/OFB.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_mode_OFB__
-#define __gnu_javax_crypto_mode_OFB__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mode/BaseMode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace mode
-        {
-            class OFB;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::mode::OFB : public ::gnu::javax::crypto::mode::BaseMode
-{
-
-public: // actually package-private
-  OFB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
-private:
-  OFB(::gnu::javax::crypto::mode::OFB *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup();
-  virtual void teardown();
-  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) outputBlock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_mode_OFB__
diff --git a/libjava/gnu/javax/crypto/pad/BasePad.h b/libjava/gnu/javax/crypto/pad/BasePad.h
deleted file mode 100644
index 130b400..0000000
--- a/libjava/gnu/javax/crypto/pad/BasePad.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_BasePad__
-#define __gnu_javax_crypto_pad_BasePad__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class BasePad;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::BasePad : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasePad(::java::lang::String *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void init(jint);
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-  virtual jboolean selfTest();
-public: // actually protected
-  virtual jboolean test1BlockSize(jint, JArray< jbyte > *);
-public:
-  virtual void setup() = 0;
-  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint unpad(JArray< jbyte > *, jint, jint) = 0;
-private:
-  static ::java::util::logging::Logger * log;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jint blockSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_BasePad__
diff --git a/libjava/gnu/javax/crypto/pad/IPad.h b/libjava/gnu/javax/crypto/pad/IPad.h
deleted file mode 100644
index 67e2989..0000000
--- a/libjava/gnu/javax/crypto/pad/IPad.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_IPad__
-#define __gnu_javax_crypto_pad_IPad__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class IPad;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::IPad : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * name() = 0;
-  virtual void init(jint) = 0;
-  virtual void init(::java::util::Map *) = 0;
-  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint unpad(JArray< jbyte > *, jint, jint) = 0;
-  virtual void reset() = 0;
-  virtual jboolean selfTest() = 0;
-  static ::java::lang::String * PADDING_BLOCK_SIZE;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_pad_IPad__
diff --git a/libjava/gnu/javax/crypto/pad/ISO10126.h b/libjava/gnu/javax/crypto/pad/ISO10126.h
deleted file mode 100644
index 2d7deba..0000000
--- a/libjava/gnu/javax/crypto/pad/ISO10126.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_ISO10126__
-#define __gnu_javax_crypto_pad_ISO10126__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class ISO10126;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::ISO10126 : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public: // actually package-private
-  ISO10126();
-public:
-  void setup();
-  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  jint unpad(JArray< jbyte > *, jint, jint);
-  jboolean selfTest();
-private:
-  ::gnu::java::security::util::PRNG * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::pad::BasePad)))) prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_ISO10126__
diff --git a/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h b/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h
deleted file mode 100644
index b681a0f..0000000
--- a/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_PKCS1_V1_5__
-#define __gnu_javax_crypto_pad_PKCS1_V1_5__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace sig
-        {
-          namespace rsa
-          {
-              class EME_PKCS1_V1_5;
-          }
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class PKCS1_V1_5;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::PKCS1_V1_5 : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public: // actually package-private
-  PKCS1_V1_5();
-public:
-  virtual void setup();
-  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  virtual jint unpad(JArray< jbyte > *, jint, jint);
-  virtual jboolean selfTest();
-private:
-  static ::java::util::logging::Logger * log;
-  ::gnu::java::security::sig::rsa::EME_PKCS1_V1_5 * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::pad::BasePad)))) codec;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_PKCS1_V1_5__
diff --git a/libjava/gnu/javax/crypto/pad/PKCS7.h b/libjava/gnu/javax/crypto/pad/PKCS7.h
deleted file mode 100644
index 609d4b3..0000000
--- a/libjava/gnu/javax/crypto/pad/PKCS7.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_PKCS7__
-#define __gnu_javax_crypto_pad_PKCS7__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class PKCS7;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::PKCS7 : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public: // actually package-private
-  PKCS7();
-public:
-  void setup();
-  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  jint unpad(JArray< jbyte > *, jint, jint);
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_PKCS7__
diff --git a/libjava/gnu/javax/crypto/pad/PadFactory.h b/libjava/gnu/javax/crypto/pad/PadFactory.h
deleted file mode 100644
index fea2a3b..0000000
--- a/libjava/gnu/javax/crypto/pad/PadFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_PadFactory__
-#define __gnu_javax_crypto_pad_PadFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class IPad;
-            class PadFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::PadFactory : public ::java::lang::Object
-{
-
-  PadFactory();
-public:
-  static ::gnu::javax::crypto::pad::IPad * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-private:
-  static ::java::util::Set * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_PadFactory__
diff --git a/libjava/gnu/javax/crypto/pad/SSL3.h b/libjava/gnu/javax/crypto/pad/SSL3.h
deleted file mode 100644
index 1154d8e..0000000
--- a/libjava/gnu/javax/crypto/pad/SSL3.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_SSL3__
-#define __gnu_javax_crypto_pad_SSL3__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class SSL3;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::SSL3 : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public:
-  SSL3();
-  virtual void setup();
-  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  virtual jint unpad(JArray< jbyte > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_SSL3__
diff --git a/libjava/gnu/javax/crypto/pad/TBC.h b/libjava/gnu/javax/crypto/pad/TBC.h
deleted file mode 100644
index 099c05a..0000000
--- a/libjava/gnu/javax/crypto/pad/TBC.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_TBC__
-#define __gnu_javax_crypto_pad_TBC__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class TBC;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::TBC : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public: // actually package-private
-  TBC();
-public:
-  void setup();
-  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  jint unpad(JArray< jbyte > *, jint, jint);
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_TBC__
diff --git a/libjava/gnu/javax/crypto/pad/TLS1.h b/libjava/gnu/javax/crypto/pad/TLS1.h
deleted file mode 100644
index 0f361fc..0000000
--- a/libjava/gnu/javax/crypto/pad/TLS1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_TLS1__
-#define __gnu_javax_crypto_pad_TLS1__
-
-#pragma interface
-
-#include <gnu/javax/crypto/pad/BasePad.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class TLS1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::TLS1 : public ::gnu::javax::crypto::pad::BasePad
-{
-
-public:
-  TLS1();
-  virtual void setup();
-  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
-  virtual jint unpad(JArray< jbyte > *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_TLS1__
diff --git a/libjava/gnu/javax/crypto/pad/WrongPaddingException.h b/libjava/gnu/javax/crypto/pad/WrongPaddingException.h
deleted file mode 100644
index 16a9b33..0000000
--- a/libjava/gnu/javax/crypto/pad/WrongPaddingException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_pad_WrongPaddingException__
-#define __gnu_javax_crypto_pad_WrongPaddingException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace pad
-        {
-            class WrongPaddingException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::pad::WrongPaddingException : public ::java::lang::Exception
-{
-
-public:
-  WrongPaddingException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_pad_WrongPaddingException__
diff --git a/libjava/gnu/javax/crypto/prng/ARCFour.h b/libjava/gnu/javax/crypto/prng/ARCFour.h
deleted file mode 100644
index 097b0b3..0000000
--- a/libjava/gnu/javax/crypto/prng/ARCFour.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_ARCFour__
-#define __gnu_javax_crypto_prng_ARCFour__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class ARCFour;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::ARCFour : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  ARCFour();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  static ::java::lang::String * ARCFOUR_KEY_MATERIAL;
-  static const jint ARCFOUR_SBOX_SIZE = 256;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) s;
-  jbyte m;
-  jbyte n;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_ARCFour__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$1.h b/libjava/gnu/javax/crypto/prng/CSPRNG$1.h
deleted file mode 100644
index bfad93a..0000000
--- a/libjava/gnu/javax/crypto/prng/CSPRNG$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_CSPRNG$1__
-#define __gnu_javax_crypto_prng_CSPRNG$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class CSPRNG$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::CSPRNG$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSPRNG$1(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * run();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_CSPRNG$1__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h b/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h
deleted file mode 100644
index 823b08b..0000000
--- a/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_CSPRNG$Poller__
-#define __gnu_javax_crypto_prng_CSPRNG$Poller__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class CSPRNG;
-            class CSPRNG$Poller;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::CSPRNG$Poller : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSPRNG$Poller(::gnu::javax::crypto::prng::CSPRNG *, ::java::util::List *, ::java::util::List *, ::java::util::List *, ::java::util::List *, ::gnu::javax::crypto::prng::CSPRNG *);
-public:
-  void run();
-  void stopUpdating();
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) files;
-  ::java::util::List * urls;
-  ::java::util::List * progs;
-  ::java::util::List * other;
-  ::gnu::javax::crypto::prng::CSPRNG * pool;
-  jboolean running;
-public: // actually package-private
-  ::gnu::javax::crypto::prng::CSPRNG * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_CSPRNG$Poller__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h b/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h
deleted file mode 100644
index 305d9ca..0000000
--- a/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_CSPRNG$Spinner__
-#define __gnu_javax_crypto_prng_CSPRNG$Spinner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class CSPRNG$Spinner;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::CSPRNG$Spinner : public ::java::lang::Object
-{
-
-  CSPRNG$Spinner();
-public:
-  virtual void run();
-public: // actually package-private
-  CSPRNG$Spinner(::gnu::javax::crypto::prng::CSPRNG$Spinner *);
-public: // actually protected
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) counter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_CSPRNG$Spinner__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG.h b/libjava/gnu/javax/crypto/prng/CSPRNG.h
deleted file mode 100644
index 4773413..0000000
--- a/libjava/gnu/javax/crypto/prng/CSPRNG.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_CSPRNG__
-#define __gnu_javax_crypto_prng_CSPRNG__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace prng
-        {
-            class CSPRNG;
-            class CSPRNG$Poller;
-            class CSPRNG$Spinner;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::CSPRNG : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  CSPRNG();
-  static ::gnu::java::security::prng::IRandom * getSystemInstance();
-private:
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static ::java::util::List * parseString(::java::lang::String *);
-  static ::java::util::List * parseURL(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-  virtual void addRandomByte(jbyte);
-public: // actually package-private
-  virtual void addQuality(jdouble);
-  virtual jdouble getQuality();
-private:
-  void mixRandomPool(JArray< jbyte > *);
-  void mixRandomPool();
-  void generateX917(JArray< jbyte > *);
-  void fastPoll();
-  void slowPoll();
-public: // actually protected
-  virtual void finalize();
-private:
-  static ::java::util::logging::Logger * log;
-public:
-  static ::java::lang::String * FILE_SOURCES;
-  static ::java::lang::String * URL_SOURCES;
-  static ::java::lang::String * PROGRAM_SOURCES;
-  static ::java::lang::String * OTHER_SOURCES;
-  static ::java::lang::String * BLOCKING;
-private:
-  static ::java::lang::String * FILES;
-  static ::java::lang::String * URLS;
-  static ::java::lang::String * PROGS;
-  static ::java::lang::String * OTHER;
-  static ::java::lang::String * BLOCK;
-  static const jint POOL_SIZE = 256;
-  static const jint ALLOC_SIZE = 260;
-  static const jint OUTPUT_SIZE = 128;
-  static const jint X917_POOL_SIZE = 16;
-  static ::java::lang::String * HASH_FUNCTION;
-  static ::java::lang::String * CIPHER;
-  static const jint MIX_COUNT = 10;
-  static const jint X917_LIFETIME = 8192;
-  static const jint SPINNER_COUNT = 8;
-  static JArray< ::gnu::javax::crypto::prng::CSPRNG$Spinner * > * SPINNERS;
-  static JArray< ::java::lang::Thread * > * SPINNER_THREADS;
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) hash;
-  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
-  jint mixCount;
-  JArray< jbyte > * pool;
-  jdouble quality;
-  jint index;
-  JArray< jbyte > * x917pool;
-  jint x917count;
-  jboolean x917init;
-  ::java::util::List * files;
-  ::java::util::List * urls;
-  ::java::util::List * progs;
-  ::java::util::List * other;
-  jboolean blocking;
-  ::gnu::javax::crypto::prng::CSPRNG$Poller * poller;
-  ::java::lang::Thread * pollerThread;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_CSPRNG__
diff --git a/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h b/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h
deleted file mode 100644
index 1507af3..0000000
--- a/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_Fortuna$Generator__
-#define __gnu_javax_crypto_prng_Fortuna$Generator__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace prng
-        {
-            class Fortuna$Generator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::Fortuna$Generator : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  Fortuna$Generator(::gnu::javax::crypto::cipher::IBlockCipher *, ::gnu::java::security::hash::IMessageDigest *);
-  virtual jbyte nextByte();
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-  virtual void fillBlock();
-  virtual void setup(::java::util::Map *);
-private:
-  void resetKey();
-  void incrementCounter();
-  static const jint LIMIT = 1048576;
-  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
-  ::gnu::java::security::hash::IMessageDigest * hash;
-  JArray< jbyte > * counter;
-  JArray< jbyte > * key;
-  jboolean seeded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_Fortuna$Generator__
diff --git a/libjava/gnu/javax/crypto/prng/Fortuna.h b/libjava/gnu/javax/crypto/prng/Fortuna.h
deleted file mode 100644
index aab98c7..0000000
--- a/libjava/gnu/javax/crypto/prng/Fortuna.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_Fortuna__
-#define __gnu_javax_crypto_prng_Fortuna__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace prng
-        {
-            class RandomEvent;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class Fortuna;
-            class Fortuna$Generator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::Fortuna : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  Fortuna();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-  virtual void addRandomEvent(::gnu::java::security::prng::RandomEvent *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 16435934LL;
-  static const jint SEED_FILE_SIZE = 64;
-  static const jint NUM_POOLS = 32;
-  static const jint MIN_POOL_SIZE = 64;
-  ::gnu::javax::crypto::prng::Fortuna$Generator * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) generator;
-  JArray< ::gnu::java::security::hash::IMessageDigest * > * pools;
-  jlong lastReseed;
-  jint pool;
-  jint pool0Count;
-  jint reseedCount;
-public:
-  static ::java::lang::String * SEED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_Fortuna__
diff --git a/libjava/gnu/javax/crypto/prng/ICMGenerator.h b/libjava/gnu/javax/crypto/prng/ICMGenerator.h
deleted file mode 100644
index e69f6c0..0000000
--- a/libjava/gnu/javax/crypto/prng/ICMGenerator.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_ICMGenerator__
-#define __gnu_javax_crypto_prng_ICMGenerator__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace prng
-        {
-            class ICMGenerator;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::ICMGenerator : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  ICMGenerator();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  static ::java::lang::String * CIPHER;
-  static ::java::lang::String * BLOCK_INDEX_LENGTH;
-  static ::java::lang::String * SEGMENT_INDEX_LENGTH;
-  static ::java::lang::String * OFFSET;
-  static ::java::lang::String * SEGMENT_INDEX;
-private:
-  static ::java::math::BigInteger * TWO_FIFTY_SIX;
-  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
-  jint blockNdxLength;
-  jint segmentNdxLength;
-  ::java::math::BigInteger * blockNdx;
-  ::java::math::BigInteger * segmentNdx;
-  ::java::math::BigInteger * C0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_ICMGenerator__
diff --git a/libjava/gnu/javax/crypto/prng/IPBE.h b/libjava/gnu/javax/crypto/prng/IPBE.h
deleted file mode 100644
index 4fae1c4..0000000
--- a/libjava/gnu/javax/crypto/prng/IPBE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_IPBE__
-#define __gnu_javax_crypto_prng_IPBE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class IPBE;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::IPBE : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * ITERATION_COUNT;
-  static ::java::lang::String * PASSWORD;
-  static ::java::lang::String * PASSWORD_ENCODING;
-  static ::java::lang::String * SALT;
-  static ::java::lang::String * DEFAULT_PASSWORD_ENCODING;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_prng_IPBE__
diff --git a/libjava/gnu/javax/crypto/prng/PBKDF2.h b/libjava/gnu/javax/crypto/prng/PBKDF2.h
deleted file mode 100644
index 209d695..0000000
--- a/libjava/gnu/javax/crypto/prng/PBKDF2.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_PBKDF2__
-#define __gnu_javax_crypto_prng_PBKDF2__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-        }
-        namespace prng
-        {
-            class PBKDF2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::PBKDF2 : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  PBKDF2(::gnu::javax::crypto::mac::IMac *);
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) in;
-  jint iterationCount;
-  JArray< jbyte > * salt;
-  ::gnu::javax::crypto::mac::IMac * mac;
-  jlong count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_PBKDF2__
diff --git a/libjava/gnu/javax/crypto/prng/PRNGFactory.h b/libjava/gnu/javax/crypto/prng/PRNGFactory.h
deleted file mode 100644
index 76d9e26..0000000
--- a/libjava/gnu/javax/crypto/prng/PRNGFactory.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_PRNGFactory__
-#define __gnu_javax_crypto_prng_PRNGFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class PRNGFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::PRNGFactory : public ::java::lang::Object
-{
-
-  PRNGFactory();
-public:
-  static ::gnu::java::security::prng::IRandom * getInstance(::java::lang::String *);
-  static ::java::util::Set * getNames();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_PRNGFactory__
diff --git a/libjava/gnu/javax/crypto/prng/UMacGenerator.h b/libjava/gnu/javax/crypto/prng/UMacGenerator.h
deleted file mode 100644
index 3da98cd..0000000
--- a/libjava/gnu/javax/crypto/prng/UMacGenerator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_prng_UMacGenerator__
-#define __gnu_javax_crypto_prng_UMacGenerator__
-
-#pragma interface
-
-#include <gnu/java/security/prng/BasePRNG.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace cipher
-        {
-            class IBlockCipher;
-        }
-        namespace prng
-        {
-            class UMacGenerator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::prng::UMacGenerator : public ::gnu::java::security::prng::BasePRNG
-{
-
-public:
-  UMacGenerator();
-  virtual void setup(::java::util::Map *);
-  virtual void fillBlock();
-  static ::java::lang::String * INDEX;
-  static ::java::lang::String * CIPHER;
-private:
-  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_prng_UMacGenerator__
diff --git a/libjava/gnu/javax/crypto/sasl/AuthInfo.h b/libjava/gnu/javax/crypto/sasl/AuthInfo.h
deleted file mode 100644
index 39fa49b..0000000
--- a/libjava/gnu/javax/crypto/sasl/AuthInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_AuthInfo__
-#define __gnu_javax_crypto_sasl_AuthInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class AuthInfo;
-            class IAuthInfoProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::AuthInfo : public ::java::lang::Object
-{
-
-  AuthInfo();
-public:
-  static ::gnu::javax::crypto::sasl::IAuthInfoProvider * getProvider(::java::lang::String *);
-private:
-  static ::java::util::ArrayList * factories;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_AuthInfo__
diff --git a/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h b/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h
deleted file mode 100644
index 5431e61..0000000
--- a/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
-#define __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class AuthInfoProviderFactory;
-            class IAuthInfoProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::AuthInfoProviderFactory : public ::java::lang::Object
-{
-
-public:
-  AuthInfoProviderFactory();
-  virtual ::gnu::javax::crypto::sasl::IAuthInfoProvider * getInstance(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ClientFactory.h b/libjava/gnu/javax/crypto/sasl/ClientFactory.h
deleted file mode 100644
index a74916a..0000000
--- a/libjava/gnu/javax/crypto/sasl/ClientFactory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_ClientFactory__
-#define __gnu_javax_crypto_sasl_ClientFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class ClientFactory;
-            class ClientMechanism;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslClient;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::ClientFactory : public ::java::lang::Object
-{
-
-public:
-  ClientFactory();
-  static ::java::util::Set * getNames();
-private:
-  static JArray< ::java::lang::String * > * getNamesInternal(::java::util::Map *);
-public:
-  static ::gnu::javax::crypto::sasl::ClientMechanism * getInstance(::java::lang::String *);
-  virtual ::javax::security::sasl::SaslClient * createSaslClient(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *);
-private:
-  static jboolean hasPolicy(::java::lang::String *, ::java::util::Map *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_ClientFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ClientMechanism.h b/libjava/gnu/javax/crypto/sasl/ClientMechanism.h
deleted file mode 100644
index b1bd010..0000000
--- a/libjava/gnu/javax/crypto/sasl/ClientMechanism.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_ClientMechanism__
-#define __gnu_javax_crypto_sasl_ClientMechanism__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class ClientMechanism;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::ClientMechanism : public ::java::lang::Object
-{
-
-public: // actually protected
-  ClientMechanism(::java::lang::String *);
-  virtual void initMechanism() = 0;
-  virtual void resetMechanism() = 0;
-public:
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *) = 0;
-  virtual jboolean hasInitialResponse() = 0;
-  virtual jboolean isComplete();
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * getMechanismName();
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *);
-  virtual void dispose();
-  virtual ::java::lang::String * getAuthorizationID();
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-  virtual ::java::lang::String * getNegotiatedStrength();
-  virtual ::java::lang::String * getNegotiatedServerAuth();
-  virtual ::java::lang::String * getNegotiatedMaxBuffer();
-  virtual ::java::lang::String * getNegotiatedRawSendSize();
-  virtual ::java::lang::String * getNegotiatedPolicyNoPlainText();
-  virtual ::java::lang::String * getNegotiatedPolicyNoActive();
-  virtual ::java::lang::String * getNegotiatedPolicyNoDictionary();
-  virtual ::java::lang::String * getNegotiatedPolicyNoAnonymous();
-  virtual ::java::lang::String * getNegotiatedPolicyForwardSecrecy();
-  virtual ::java::lang::String * getNegotiatedPolicyPassCredentials();
-  virtual ::java::lang::String * getReuse();
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-public:
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mechanism;
-  ::java::lang::String * authorizationID;
-  ::java::lang::String * protocol;
-  ::java::lang::String * serverName;
-  ::java::util::Map * properties;
-  ::javax::security::auth::callback::CallbackHandler * handler;
-  JArray< jbyte > * channelBinding;
-  jboolean complete;
-  jint state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_ClientMechanism__
diff --git a/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h b/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h
deleted file mode 100644
index 6c00193..0000000
--- a/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_ConfidentialityException__
-#define __gnu_javax_crypto_sasl_ConfidentialityException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class ConfidentialityException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::ConfidentialityException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  ConfidentialityException();
-  ConfidentialityException(::java::lang::String *);
-  ConfidentialityException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_ConfidentialityException__
diff --git a/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h
deleted file mode 100644
index fbf8cee..0000000
--- a/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_IAuthInfoProvider__
-#define __gnu_javax_crypto_sasl_IAuthInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class IAuthInfoProvider;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::IAuthInfoProvider : public ::java::lang::Object
-{
-
-public:
-  virtual void activate(::java::util::Map *) = 0;
-  virtual void passivate() = 0;
-  virtual jboolean contains(::java::lang::String *) = 0;
-  virtual ::java::util::Map * lookup(::java::util::Map *) = 0;
-  virtual void update(::java::util::Map *) = 0;
-  virtual ::java::util::Map * getConfiguration(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_sasl_IAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h b/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h
deleted file mode 100644
index 7fcb491..0000000
--- a/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
-#define __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class IAuthInfoProvider;
-            class IAuthInfoProviderFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::IAuthInfoProviderFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::javax::crypto::sasl::IAuthInfoProvider * getInstance(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h b/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h
deleted file mode 100644
index 0503f0d..0000000
--- a/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_IllegalMechanismStateException__
-#define __gnu_javax_crypto_sasl_IllegalMechanismStateException__
-
-#pragma interface
-
-#include <javax/security/sasl/AuthenticationException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class IllegalMechanismStateException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::IllegalMechanismStateException : public ::javax::security::sasl::AuthenticationException
-{
-
-public:
-  IllegalMechanismStateException();
-  IllegalMechanismStateException(::java::lang::String *);
-  IllegalMechanismStateException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_IllegalMechanismStateException__
diff --git a/libjava/gnu/javax/crypto/sasl/InputBuffer.h b/libjava/gnu/javax/crypto/sasl/InputBuffer.h
deleted file mode 100644
index d628f7a..0000000
--- a/libjava/gnu/javax/crypto/sasl/InputBuffer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_InputBuffer__
-#define __gnu_javax_crypto_sasl_InputBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class InputBuffer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::InputBuffer : public ::java::lang::Object
-{
-
-public:
-  InputBuffer(JArray< jbyte > *);
-private:
-  InputBuffer();
-public:
-  static ::gnu::javax::crypto::sasl::InputBuffer * getInstance(JArray< jbyte > *);
-  static ::gnu::javax::crypto::sasl::InputBuffer * getInstance(JArray< jbyte > *, jint, jint);
-  static jint twoBytesToLength(JArray< jbyte > *);
-  virtual jboolean hasMoreElements();
-  virtual jlong getScalar(jint);
-  virtual JArray< jbyte > * getOS();
-  virtual JArray< jbyte > * getEOS();
-  virtual ::java::math::BigInteger * getMPI();
-  virtual ::java::lang::String * getText();
-public: // actually protected
-  ::java::io::ByteArrayInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_InputBuffer__
diff --git a/libjava/gnu/javax/crypto/sasl/IntegrityException.h b/libjava/gnu/javax/crypto/sasl/IntegrityException.h
deleted file mode 100644
index 5c66cb4..0000000
--- a/libjava/gnu/javax/crypto/sasl/IntegrityException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_IntegrityException__
-#define __gnu_javax_crypto_sasl_IntegrityException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class IntegrityException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::IntegrityException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  IntegrityException();
-  IntegrityException(::java::lang::String *);
-  IntegrityException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_IntegrityException__
diff --git a/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h b/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h
deleted file mode 100644
index 0668d16..0000000
--- a/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_NoSuchMechanismException__
-#define __gnu_javax_crypto_sasl_NoSuchMechanismException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class NoSuchMechanismException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::NoSuchMechanismException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  NoSuchMechanismException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_NoSuchMechanismException__
diff --git a/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h b/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h
deleted file mode 100644
index 17bc8fc..0000000
--- a/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_NoSuchUserException__
-#define __gnu_javax_crypto_sasl_NoSuchUserException__
-
-#pragma interface
-
-#include <javax/security/sasl/AuthenticationException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class NoSuchUserException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::NoSuchUserException : public ::javax::security::sasl::AuthenticationException
-{
-
-public:
-  NoSuchUserException();
-  NoSuchUserException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_NoSuchUserException__
diff --git a/libjava/gnu/javax/crypto/sasl/OutputBuffer.h b/libjava/gnu/javax/crypto/sasl/OutputBuffer.h
deleted file mode 100644
index 40cd189..0000000
--- a/libjava/gnu/javax/crypto/sasl/OutputBuffer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_OutputBuffer__
-#define __gnu_javax_crypto_sasl_OutputBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class OutputBuffer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::OutputBuffer : public ::java::lang::Object
-{
-
-public:
-  OutputBuffer();
-  virtual void setScalar(jint, jint);
-  virtual void setOS(JArray< jbyte > *);
-  virtual void setEOS(JArray< jbyte > *);
-  virtual void setMPI(::java::math::BigInteger *);
-  virtual void setText(::java::lang::String *);
-  virtual JArray< jbyte > * encode();
-  virtual JArray< jbyte > * wrap();
-private:
-  ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_OutputBuffer__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h b/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h
deleted file mode 100644
index 000b367..0000000
--- a/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_SaslEncodingException__
-#define __gnu_javax_crypto_sasl_SaslEncodingException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class SaslEncodingException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::SaslEncodingException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  SaslEncodingException();
-  SaslEncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_SaslEncodingException__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslInputStream.h b/libjava/gnu/javax/crypto/sasl/SaslInputStream.h
deleted file mode 100644
index 6a5c653..0000000
--- a/libjava/gnu/javax/crypto/sasl/SaslInputStream.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_SaslInputStream__
-#define __gnu_javax_crypto_sasl_SaslInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class SaslInputStream;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslClient;
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::SaslInputStream : public ::java::io::InputStream
-{
-
-public:
-  SaslInputStream(::javax::security::sasl::SaslClient *, ::java::io::InputStream *);
-  SaslInputStream(::javax::security::sasl::SaslServer *, ::java::io::InputStream *);
-  virtual jint available();
-  virtual void close();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  JArray< jbyte > * readSaslBuffer();
-  static ::java::util::logging::Logger * log;
-  ::javax::security::sasl::SaslClient * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) client;
-  ::javax::security::sasl::SaslServer * server;
-  jint maxRawSendSize;
-  ::java::io::InputStream * source;
-  JArray< jbyte > * internalBuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_SaslInputStream__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h b/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h
deleted file mode 100644
index 8d55853..0000000
--- a/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_SaslOutputStream__
-#define __gnu_javax_crypto_sasl_SaslOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class SaslOutputStream;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslClient;
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::SaslOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  SaslOutputStream(::javax::security::sasl::SaslClient *, ::java::io::OutputStream *);
-  SaslOutputStream(::javax::security::sasl::SaslServer *, ::java::io::OutputStream *);
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  static ::java::util::logging::Logger * log;
-  ::javax::security::sasl::SaslClient * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) client;
-  ::javax::security::sasl::SaslServer * server;
-  jint maxRawSendSize;
-  ::java::io::OutputStream * dest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_SaslOutputStream__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslUtil.h b/libjava/gnu/javax/crypto/sasl/SaslUtil.h
deleted file mode 100644
index 3d043c0..0000000
--- a/libjava/gnu/javax/crypto/sasl/SaslUtil.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_SaslUtil__
-#define __gnu_javax_crypto_sasl_SaslUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class SaslUtil;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class MessageDigest;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::SaslUtil : public ::java::lang::Object
-{
-
-  SaslUtil();
-public:
-  static jboolean validEmailAddress(::java::lang::String *);
-  static ::java::lang::String * dump(::java::security::MessageDigest *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_SaslUtil__
diff --git a/libjava/gnu/javax/crypto/sasl/ServerFactory.h b/libjava/gnu/javax/crypto/sasl/ServerFactory.h
deleted file mode 100644
index 00ee645..0000000
--- a/libjava/gnu/javax/crypto/sasl/ServerFactory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_ServerFactory__
-#define __gnu_javax_crypto_sasl_ServerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class ServerFactory;
-            class ServerMechanism;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::ServerFactory : public ::java::lang::Object
-{
-
-public:
-  ServerFactory();
-  static ::java::util::Set * getNames();
-private:
-  static JArray< ::java::lang::String * > * getNamesInternal(::java::util::Map *);
-public:
-  static ::gnu::javax::crypto::sasl::ServerMechanism * getInstance(::java::lang::String *);
-  virtual ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *);
-private:
-  static jboolean hasPolicy(::java::lang::String *, ::java::util::Map *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_ServerFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ServerMechanism.h b/libjava/gnu/javax/crypto/sasl/ServerMechanism.h
deleted file mode 100644
index 4b7a196..0000000
--- a/libjava/gnu/javax/crypto/sasl/ServerMechanism.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_ServerMechanism__
-#define __gnu_javax_crypto_sasl_ServerMechanism__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class IAuthInfoProvider;
-            class ServerMechanism;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::ServerMechanism : public ::java::lang::Object
-{
-
-public: // actually protected
-  ServerMechanism(::java::lang::String *);
-  virtual void initMechanism() = 0;
-  virtual void resetMechanism() = 0;
-public:
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *) = 0;
-  virtual jboolean isComplete();
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * getMechanismName();
-  virtual ::java::lang::String * getAuthorizationID();
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *);
-  virtual void dispose();
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-  virtual ::java::lang::String * getNegotiatedStrength();
-  virtual ::java::lang::String * getNegotiatedServerAuth();
-  virtual ::java::lang::String * getNegotiatedMaxBuffer();
-  virtual ::java::lang::String * getNegotiatedPolicyNoPlainText();
-  virtual ::java::lang::String * getNegotiatedPolicyNoActive();
-  virtual ::java::lang::String * getNegotiatedPolicyNoDictionary();
-  virtual ::java::lang::String * getNegotiatedPolicyNoAnonymous();
-  virtual ::java::lang::String * getNegotiatedPolicyForwardSecrecy();
-  virtual ::java::lang::String * getNegotiatedPolicyPassCredentials();
-  virtual ::java::lang::String * getNegotiatedRawSendSize();
-  virtual ::java::lang::String * getReuse();
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-public:
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mechanism;
-  ::java::lang::String * protocol;
-  ::java::lang::String * serverName;
-  ::java::util::Map * properties;
-  ::javax::security::auth::callback::CallbackHandler * handler;
-  jboolean complete;
-  ::java::lang::String * authorizationID;
-  JArray< jbyte > * channelBinding;
-  jint state;
-  ::gnu::javax::crypto::sasl::IAuthInfoProvider * authenticator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_ServerMechanism__
diff --git a/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h b/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h
deleted file mode 100644
index 89622a0..0000000
--- a/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_UserAlreadyExistsException__
-#define __gnu_javax_crypto_sasl_UserAlreadyExistsException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-            class UserAlreadyExistsException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::UserAlreadyExistsException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  UserAlreadyExistsException();
-  UserAlreadyExistsException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_UserAlreadyExistsException__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h
deleted file mode 100644
index 87aaded..0000000
--- a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
-#define __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ClientMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace anonymous
-          {
-              class AnonymousClient;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::anonymous::AnonymousClient : public ::gnu::javax::crypto::sasl::ClientMechanism
-{
-
-public:
-  AnonymousClient();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual jboolean hasInitialResponse();
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
-private:
-  JArray< jbyte > * response();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h
deleted file mode 100644
index 3c3b183..0000000
--- a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
-#define __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ServerMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace anonymous
-          {
-              class AnonymousServer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::anonymous::AnonymousServer : public ::gnu::javax::crypto::sasl::ServerMechanism
-{
-
-public:
-  AnonymousServer();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h
deleted file mode 100644
index 45b0873..0000000
--- a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
-#define __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace anonymous
-          {
-              class AnonymousUtil;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::anonymous::AnonymousUtil : public ::java::lang::Object
-{
-
-  AnonymousUtil();
-public: // actually package-private
-  static jboolean isValidTraceInformation(::java::lang::String *);
-  static jboolean isValidToken(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h
deleted file mode 100644
index 3a5ae19..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
-#define __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class CramMD5AuthInfoProvider;
-              class PasswordFile;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::CramMD5AuthInfoProvider : public ::java::lang::Object
-{
-
-public:
-  CramMD5AuthInfoProvider();
-  virtual void activate(::java::util::Map *);
-  virtual void passivate();
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::java::util::Map * lookup(::java::util::Map *);
-  virtual void update(::java::util::Map *);
-  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
-private:
-  ::gnu::javax::crypto::sasl::crammd5::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h
deleted file mode 100644
index b524a65..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
-#define __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ClientMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class CramMD5Client;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::CramMD5Client : public ::gnu::javax::crypto::sasl::ClientMechanism
-{
-
-public:
-  CramMD5Client();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual jboolean hasInitialResponse();
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h
deleted file mode 100644
index 2858e05..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
-#define __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class CramMD5Registry;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::CramMD5Registry : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * PASSWORD_FILE;
-  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
-  static ::java::lang::String * UID_FIELD;
-  static ::java::lang::String * GID_FIELD;
-  static ::java::lang::String * GECOS_FIELD;
-  static ::java::lang::String * DIR_FIELD;
-  static ::java::lang::String * SHELL_FIELD;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h
deleted file mode 100644
index b6712fd..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
-#define __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ServerMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class CramMD5Server;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::CramMD5Server : public ::gnu::javax::crypto::sasl::ServerMechanism
-{
-
-public:
-  CramMD5Server();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
-  virtual jboolean isComplete();
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-private:
-  JArray< jchar > * lookupPassword(::java::lang::String *);
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ServerMechanism)))) msgID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h
deleted file mode 100644
index 4e33871..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
-#define __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class CramMD5Util;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::CramMD5Util : public ::java::lang::Object
-{
-
-  CramMD5Util();
-public: // actually package-private
-  static JArray< jbyte > * createMsgID();
-  static JArray< jbyte > * createHMac(JArray< jchar > *, JArray< jbyte > *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h
deleted file mode 100644
index cb97b2f..0000000
--- a/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_crammd5_PasswordFile__
-#define __gnu_javax_crypto_sasl_crammd5_PasswordFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace crammd5
-          {
-              class PasswordFile;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::crammd5::PasswordFile : public ::java::lang::Object
-{
-
-public:
-  PasswordFile();
-  PasswordFile(::java::io::File *);
-  PasswordFile(::java::lang::String *);
-  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *);
-  virtual jboolean contains(::java::lang::String *);
-private:
-  void update();
-  void checkCurrent();
-  void readPasswd(::java::io::InputStream *);
-  void savePasswd();
-  static ::java::lang::String * DEFAULT_FILE;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
-  ::java::io::File * passwdFile;
-  jlong lastmod;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_crammd5_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h
deleted file mode 100644
index 2269e48..0000000
--- a/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_plain_PasswordFile__
-#define __gnu_javax_crypto_sasl_plain_PasswordFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace plain
-          {
-              class PasswordFile;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::plain::PasswordFile : public ::java::lang::Object
-{
-
-public:
-  PasswordFile();
-  PasswordFile(::java::io::File *);
-  PasswordFile(::java::lang::String *);
-  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *);
-  virtual jboolean contains(::java::lang::String *);
-private:
-  void update();
-  void checkCurrent();
-  void readPasswd(::java::io::InputStream *);
-  void savePasswd();
-  static ::java::lang::String * DEFAULT_FILE;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
-  ::java::io::File * passwdFile;
-  jlong lastmod;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_plain_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h
deleted file mode 100644
index 179026d..0000000
--- a/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
-#define __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace plain
-          {
-              class PasswordFile;
-              class PlainAuthInfoProvider;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::plain::PlainAuthInfoProvider : public ::java::lang::Object
-{
-
-public:
-  PlainAuthInfoProvider();
-  virtual void activate(::java::util::Map *);
-  virtual void passivate();
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::java::util::Map * lookup(::java::util::Map *);
-  virtual void update(::java::util::Map *);
-  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
-private:
-  ::gnu::javax::crypto::sasl::plain::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h b/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h
deleted file mode 100644
index 0c3e6dd..0000000
--- a/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_plain_PlainClient__
-#define __gnu_javax_crypto_sasl_plain_PlainClient__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ClientMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace plain
-          {
-              class PlainClient;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::plain::PlainClient : public ::gnu::javax::crypto::sasl::ClientMechanism
-{
-
-public:
-  PlainClient();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual jboolean hasInitialResponse();
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_plain_PlainClient__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h b/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h
deleted file mode 100644
index d141b1e..0000000
--- a/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_plain_PlainRegistry__
-#define __gnu_javax_crypto_sasl_plain_PlainRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace plain
-          {
-              class PlainRegistry;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::plain::PlainRegistry : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * PASSWORD_FILE;
-  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
-  static ::java::lang::String * UID_FIELD;
-  static ::java::lang::String * GID_FIELD;
-  static ::java::lang::String * GECOS_FIELD;
-  static ::java::lang::String * DIR_FIELD;
-  static ::java::lang::String * SHELL_FIELD;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_sasl_plain_PlainRegistry__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h b/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h
deleted file mode 100644
index a9214a2..0000000
--- a/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_plain_PlainServer__
-#define __gnu_javax_crypto_sasl_plain_PlainServer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ServerMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace plain
-          {
-              class PlainServer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::plain::PlainServer : public ::gnu::javax::crypto::sasl::ServerMechanism
-{
-
-public:
-  PlainServer();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
-public: // actually protected
-  virtual ::java::lang::String * getNegotiatedQOP();
-private:
-  JArray< jchar > * lookupPassword(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_plain_PlainServer__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/CALG.h b/libjava/gnu/javax/crypto/sasl/srp/CALG.h
deleted file mode 100644
index 0b62538..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/CALG.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_CALG__
-#define __gnu_javax_crypto_sasl_srp_CALG__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace assembly
-        {
-            class Assembly;
-            class Direction;
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class CALG;
-              class KDF;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::CALG : public ::java::lang::Object
-{
-
-  CALG(jint, jint, ::java::lang::Object *, ::gnu::javax::crypto::assembly::Assembly *);
-public: // actually package-private
-  static ::gnu::javax::crypto::sasl::srp::CALG * getInstance(::java::lang::String *);
-public:
-  void init(::gnu::javax::crypto::sasl::srp::KDF *, JArray< jbyte > *, ::gnu::javax::crypto::assembly::Direction *);
-  JArray< jbyte > * doFinal(JArray< jbyte > *);
-  JArray< jbyte > * doFinal(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::javax::crypto::assembly::Assembly * __attribute__((aligned(__alignof__( ::java::lang::Object)))) assembly;
-  ::java::lang::Object * modeNdx;
-  jint blockSize;
-  jint keySize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_CALG__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h b/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h
deleted file mode 100644
index 3a5e0e60..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_ClientStore__
-#define __gnu_javax_crypto_sasl_srp_ClientStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class ClientStore;
-              class SecurityContext;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::ClientStore : public ::java::lang::Object
-{
-
-  ClientStore();
-public: // actually package-private
-  static ::gnu::javax::crypto::sasl::srp::ClientStore * instance();
-  virtual jboolean isAlive(::java::lang::String *);
-  virtual void cacheSession(::java::lang::String *, jint, ::gnu::javax::crypto::sasl::srp::SecurityContext *);
-  virtual void invalidateSession(::java::lang::String *);
-  virtual ::gnu::javax::crypto::sasl::srp::SecurityContext * restoreSession(::java::lang::String *);
-private:
-  static ::gnu::javax::crypto::sasl::srp::ClientStore * singleton;
-  static ::java::util::HashMap * uid2ssc;
-  static ::java::util::HashMap * uid2ttl;
-  static ::java::lang::Object * lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_ClientStore__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/IALG.h b/libjava/gnu/javax/crypto/sasl/srp/IALG.h
deleted file mode 100644
index faaa512..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/IALG.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_IALG__
-#define __gnu_javax_crypto_sasl_srp_IALG__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class IALG;
-              class KDF;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::IALG : public ::java::lang::Object
-{
-
-  IALG(::gnu::javax::crypto::mac::IMac *);
-public: // actually package-private
-  static ::gnu::javax::crypto::sasl::srp::IALG * getInstance(::java::lang::String *);
-public:
-  ::java::lang::Object * clone();
-  void init(::gnu::javax::crypto::sasl::srp::KDF *);
-  void update(JArray< jbyte > *);
-  void update(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * doFinal();
-  jint length();
-private:
-  ::gnu::javax::crypto::mac::IMac * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hmac;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_IALG__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/KDF.h b/libjava/gnu/javax/crypto/sasl/srp/KDF.h
deleted file mode 100644
index 3862fa0..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/KDF.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_KDF__
-#define __gnu_javax_crypto_sasl_srp_KDF__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace prng
-        {
-            class UMacGenerator;
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class KDF;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::KDF : public ::java::lang::Object
-{
-
-  KDF(JArray< jbyte > *, jint);
-public: // actually package-private
-  static ::gnu::javax::crypto::sasl::srp::KDF * getInstance(JArray< jbyte > *);
-private:
-  static jint nextByte();
-public:
-  virtual JArray< jbyte > * derive(jint);
-private:
-  static const jint AES_BLOCK_SIZE = 16;
-  static const jint AES_KEY_SIZE = 16;
-  static JArray< jbyte > * buffer;
-  static ::gnu::java::security::util::PRNG * prng;
-  ::gnu::javax::crypto::prng::UMacGenerator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) umac;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_KDF__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h
deleted file mode 100644
index 46cf783..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_PasswordFile__
-#define __gnu_javax_crypto_sasl_srp_PasswordFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class PasswordFile;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::PasswordFile : public ::java::lang::Object
-{
-
-public:
-  PasswordFile();
-  PasswordFile(::java::io::File *);
-  PasswordFile(::java::lang::String *);
-  PasswordFile(::java::lang::String *, ::java::lang::String *);
-  PasswordFile(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  static ::java::lang::String * nameToID(::java::lang::String *);
-public:
-  virtual jboolean containsConfig(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * lookupConfig(::java::lang::String *);
-  virtual jboolean contains(::java::lang::String *);
-  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, ::java::lang::String *);
-  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
-  virtual void savePasswd();
-  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *, ::java::lang::String *);
-private:
-  void readOrCreateConf();
-  void readConf(::java::io::InputStream *);
-  void writeConf(::java::io::PrintWriter *);
-  ::java::util::HashMap * newVerifiers(::java::lang::String *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *);
-  void update();
-  void checkCurrent();
-  void readPasswd(::java::io::InputStream *);
-  void readPasswd2(::java::io::InputStream *);
-  void writePasswd(::java::io::PrintWriter *, ::java::io::PrintWriter *);
-  static ::java::lang::String * USER_FIELD;
-  static ::java::lang::String * VERIFIERS_FIELD;
-  static ::java::lang::String * SALT_FIELD;
-  static ::java::lang::String * CONFIG_FIELD;
-  static ::java::lang::String * DEFAULT_FILE;
-  static ::java::util::HashMap * srps;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) confName;
-  ::java::lang::String * pwName;
-  ::java::lang::String * pw2Name;
-  ::java::io::File * configFile;
-  ::java::io::File * passwdFile;
-  ::java::io::File * passwd2File;
-  jlong lastmodPasswdFile;
-  jlong lastmodPasswd2File;
-  ::java::util::HashMap * entries;
-  ::java::util::HashMap * configurations;
-  static JArray< ::java::math::BigInteger * > * Nsrp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRP.h b/libjava/gnu/javax/crypto/sasl/srp/SRP.h
deleted file mode 100644
index b092d8a..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SRP.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SRP__
-#define __gnu_javax_crypto_sasl_srp_SRP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SRP;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SRP : public ::java::lang::Object
-{
-
-  SRP(::gnu::java::security::hash::IMessageDigest *);
-public:
-  static ::gnu::javax::crypto::sasl::srp::SRP * instance(::java::lang::String *);
-private:
-  static JArray< jbyte > * xor$(JArray< jbyte > *, JArray< jbyte > *, jint);
-public:
-  ::java::lang::String * getAlgorithm();
-  ::gnu::java::security::hash::IMessageDigest * newDigest();
-  JArray< jbyte > * digest(JArray< jbyte > *);
-  JArray< jbyte > * digest(::java::lang::String *);
-  JArray< jbyte > * xor$(JArray< jbyte > *, JArray< jbyte > *);
-  JArray< jbyte > * generateM1(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::lang::String *, JArray< jbyte > *, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, JArray< jbyte > *);
-  JArray< jbyte > * generateM2(::java::math::BigInteger *, JArray< jbyte > *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  JArray< jbyte > * generateKn(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  JArray< jbyte > * computeX(JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *);
-  JArray< jbyte > * computeX(JArray< jbyte > *, ::java::lang::String *, JArray< jbyte > *);
-private:
-  JArray< jbyte > * computeX(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  static ::java::util::HashMap * algorithms;
-  static const jbyte COLON = 58;
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mda;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_SRP__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h
deleted file mode 100644
index 630c80ef..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
-#define __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class PasswordFile;
-              class SRPAuthInfoProvider;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider : public ::java::lang::Object
-{
-
-public:
-  SRPAuthInfoProvider();
-  virtual void activate(::java::util::Map *);
-  virtual void passivate();
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::java::util::Map * lookup(::java::util::Map *);
-  virtual void update(::java::util::Map *);
-  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
-private:
-  ::gnu::javax::crypto::sasl::srp::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h b/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h
deleted file mode 100644
index ec13be6..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h
+++ /dev/null
@@ -1,129 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SRPClient__
-#define __gnu_javax_crypto_sasl_srp_SRPClient__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ClientMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IKeyAgreementParty;
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class CALG;
-              class IALG;
-              class SRP;
-              class SRPClient;
-          }
-        }
-      }
-      namespace security
-      {
-        namespace auth
-        {
-            class Password;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SRPClient : public ::gnu::javax::crypto::sasl::ClientMechanism
-{
-
-public:
-  SRPClient();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual jboolean hasInitialResponse();
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
-public: // actually protected
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * getNegotiatedQOP();
-  virtual ::java::lang::String * getNegotiatedStrength();
-  virtual ::java::lang::String * getNegotiatedRawSendSize();
-  virtual ::java::lang::String * getReuse();
-private:
-  JArray< jbyte > * sendIdentities();
-  JArray< jbyte > * sendPublicKey(JArray< jbyte > *);
-  JArray< jbyte > * receiveEvidence(JArray< jbyte > *);
-  void getUsernameAndPassword();
-  ::java::lang::String * createO(::java::lang::String *);
-  void setupSecurityServices(jboolean);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ClientMechanism)))) uid;
-  ::java::lang::String * U;
-public: // actually package-private
-  ::java::math::BigInteger * N;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * A;
-  ::java::math::BigInteger * B;
-private:
-  ::gnu::javax::security::auth::Password * password;
-  JArray< jbyte > * s;
-  JArray< jbyte > * cIV;
-  JArray< jbyte > * sIV;
-  JArray< jbyte > * M1;
-  JArray< jbyte > * M2;
-  JArray< jbyte > * cn;
-  JArray< jbyte > * sn;
-  ::gnu::javax::crypto::sasl::srp::SRP * srp;
-  JArray< jbyte > * sid;
-  jint ttl;
-  JArray< jbyte > * sCB;
-  ::java::lang::String * L;
-  ::java::lang::String * o;
-  ::java::lang::String * chosenIntegrityAlgorithm;
-  ::java::lang::String * chosenConfidentialityAlgorithm;
-  jint rawSendSize;
-  JArray< jbyte > * K;
-  jboolean replayDetection;
-  jint inCounter;
-  jint outCounter;
-  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
-  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
-  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
-  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
-  ::gnu::javax::crypto::key::IKeyAgreementParty * clientHandler;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_SRPClient__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h b/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h
deleted file mode 100644
index 22cd5d9..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SRPRegistry__
-#define __gnu_javax_crypto_sasl_srp_SRPRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SRPRegistry;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SRPRegistry : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * N_2048_BITS;
-  static ::java::lang::String * N_1536_BITS;
-  static ::java::lang::String * N_1280_BITS;
-  static ::java::lang::String * N_1024_BITS;
-  static ::java::lang::String * N_768_BITS;
-  static ::java::lang::String * N_640_BITS;
-  static ::java::lang::String * N_512_BITS;
-  static JArray< ::java::lang::String * > * SRP_ALGORITHMS;
-  static ::java::lang::String * SRP_DEFAULT_DIGEST_NAME;
-  static ::java::lang::String * SRP_DIGEST_NAME;
-  static ::java::lang::String * SHARED_MODULUS;
-  static ::java::lang::String * FIELD_GENERATOR;
-  static ::java::lang::String * AVAILABLE_OPTIONS;
-  static ::java::lang::String * CHOSEN_OPTIONS;
-  static ::java::lang::String * USER_NAME;
-  static ::java::lang::String * USER_ROLE;
-  static ::java::lang::String * USER_SALT;
-  static ::java::lang::String * PASSWORD_VERIFIER;
-  static ::java::lang::String * CLIENT_PUBLIC_KEY;
-  static ::java::lang::String * SERVER_PUBLIC_KEY;
-  static ::java::lang::String * CLIENT_EVIDENCE;
-  static ::java::lang::String * SERVER_EVIDENCE;
-  static ::java::lang::String * SRP_HASH;
-  static ::java::lang::String * SRP_MANDATORY;
-  static ::java::lang::String * SRP_REPLAY_DETECTION;
-  static ::java::lang::String * SRP_INTEGRITY_PROTECTION;
-  static ::java::lang::String * SRP_CONFIDENTIALITY;
-  static ::java::lang::String * PASSWORD_FILE;
-  static ::java::lang::String * PASSWORD_DB;
-  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
-  static const jboolean DEFAULT_REPLAY_DETECTION = 1;
-  static const jboolean DEFAULT_INTEGRITY = 1;
-  static const jboolean DEFAULT_CONFIDENTIALITY = 0;
-  static ::java::lang::String * HMAC_SHA1;
-  static ::java::lang::String * HMAC_MD5;
-  static ::java::lang::String * HMAC_RIPEMD_160;
-  static JArray< ::java::lang::String * > * INTEGRITY_ALGORITHMS;
-  static ::java::lang::String * AES;
-  static ::java::lang::String * BLOWFISH;
-  static JArray< ::java::lang::String * > * CONFIDENTIALITY_ALGORITHMS;
-  static ::java::lang::String * OPTION_MANDATORY;
-  static ::java::lang::String * OPTION_SRP_DIGEST;
-  static ::java::lang::String * OPTION_REPLAY_DETECTION;
-  static ::java::lang::String * OPTION_INTEGRITY;
-  static ::java::lang::String * OPTION_CONFIDENTIALITY;
-  static ::java::lang::String * OPTION_MAX_BUFFER_SIZE;
-  static ::java::lang::String * MANDATORY_NONE;
-  static ::java::lang::String * DEFAULT_MANDATORY;
-  static ::java::lang::String * MD_NAME_FIELD;
-  static ::java::lang::String * USER_VERIFIER_FIELD;
-  static ::java::lang::String * SALT_FIELD;
-  static ::java::lang::String * CONFIG_NDX_FIELD;
-  static const jint MINIMUM_MODULUS_BITLENGTH = 512;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_crypto_sasl_srp_SRPRegistry__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h b/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h
deleted file mode 100644
index b78a26b..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SRPServer__
-#define __gnu_javax_crypto_sasl_srp_SRPServer__
-
-#pragma interface
-
-#include <gnu/javax/crypto/sasl/ServerMechanism.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class PRNG;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-            class IKeyAgreementParty;
-        }
-        namespace sasl
-        {
-          namespace srp
-          {
-              class CALG;
-              class IALG;
-              class SRP;
-              class SRPServer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SRPServer : public ::gnu::javax::crypto::sasl::ServerMechanism
-{
-
-public:
-  SRPServer();
-public: // actually protected
-  virtual void initMechanism();
-  virtual void resetMechanism();
-public:
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
-public: // actually protected
-  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * getNegotiatedQOP();
-  virtual ::java::lang::String * getNegotiatedStrength();
-  virtual ::java::lang::String * getNegotiatedRawSendSize();
-  virtual ::java::lang::String * getReuse();
-private:
-  JArray< jbyte > * sendProtocolElements(JArray< jbyte > *);
-  JArray< jbyte > * sendEvidence(JArray< jbyte > *);
-  ::java::lang::String * createL();
-  void parseO(::java::lang::String *);
-  void setupSecurityServices(jboolean);
-  ::gnu::java::security::util::PRNG * getDefaultPRNG();
-  static ::java::util::logging::Logger * log;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ServerMechanism)))) U;
-  ::java::math::BigInteger * N;
-  ::java::math::BigInteger * g;
-  ::java::math::BigInteger * A;
-  ::java::math::BigInteger * B;
-  JArray< jbyte > * s;
-  JArray< jbyte > * cIV;
-  JArray< jbyte > * sIV;
-  JArray< jbyte > * cn;
-  JArray< jbyte > * sn;
-  ::gnu::javax::crypto::sasl::srp::SRP * srp;
-  JArray< jbyte > * sid;
-  jint ttl;
-  JArray< jbyte > * cCB;
-  ::java::lang::String * mandatory;
-  ::java::lang::String * L;
-  ::java::lang::String * o;
-  ::java::lang::String * chosenIntegrityAlgorithm;
-  ::java::lang::String * chosenConfidentialityAlgorithm;
-  jint rawSendSize;
-  JArray< jbyte > * K;
-  jboolean replayDetection;
-  jint inCounter;
-  jint outCounter;
-  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
-  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
-  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
-  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
-  ::gnu::javax::crypto::key::IKeyAgreementParty * serverHandler;
-  ::gnu::java::security::util::PRNG * prng;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_SRPServer__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h b/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h
deleted file mode 100644
index b4b4a22..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_SecurityContext__
-#define __gnu_javax_crypto_sasl_srp_SecurityContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class CALG;
-              class IALG;
-              class SecurityContext;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::SecurityContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SecurityContext(::java::lang::String *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jboolean, jint, jint, ::gnu::javax::crypto::sasl::srp::IALG *, ::gnu::javax::crypto::sasl::srp::IALG *, ::gnu::javax::crypto::sasl::srp::CALG *, ::gnu::javax::crypto::sasl::srp::CALG *);
-  virtual ::java::lang::String * getMdName();
-  virtual JArray< jbyte > * getSID();
-  virtual JArray< jbyte > * getK();
-  virtual JArray< jbyte > * getClientIV();
-  virtual JArray< jbyte > * getServerIV();
-  virtual jboolean hasReplayDetection();
-  virtual jint getInCounter();
-  virtual jint getOutCounter();
-  virtual ::gnu::javax::crypto::sasl::srp::IALG * getInMac();
-  virtual ::gnu::javax::crypto::sasl::srp::IALG * getOutMac();
-  virtual ::gnu::javax::crypto::sasl::srp::CALG * getInCipher();
-  virtual ::gnu::javax::crypto::sasl::srp::CALG * getOutCipher();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mdName;
-  JArray< jbyte > * sid;
-  JArray< jbyte > * K;
-  JArray< jbyte > * cIV;
-  JArray< jbyte > * sIV;
-  jboolean replayDetection;
-  jint inCounter;
-  jint outCounter;
-  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
-  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
-  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
-  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_SecurityContext__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h b/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h
deleted file mode 100644
index f93429b..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_ServerStore__
-#define __gnu_javax_crypto_sasl_srp_ServerStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class SecurityContext;
-              class ServerStore;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::ServerStore : public ::java::lang::Object
-{
-
-  ServerStore();
-public: // actually package-private
-  static ::gnu::javax::crypto::sasl::srp::ServerStore * instance();
-  static JArray< jbyte > * getNewSessionID();
-  virtual jboolean isAlive(JArray< jbyte > *);
-  virtual void cacheSession(jint, ::gnu::javax::crypto::sasl::srp::SecurityContext *);
-  virtual ::gnu::javax::crypto::sasl::srp::SecurityContext * restoreSession(JArray< jbyte > *);
-  virtual void invalidateSession(JArray< jbyte > *);
-private:
-  static ::gnu::javax::crypto::sasl::srp::ServerStore * singleton;
-  static ::java::util::HashMap * sid2ssc;
-  static ::java::util::HashMap * sid2ttl;
-  static ::java::lang::Object * lock;
-  static jint counter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_ServerStore__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h b/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h
deleted file mode 100644
index 19203bc..0000000
--- a/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_crypto_sasl_srp_StoreEntry__
-#define __gnu_javax_crypto_sasl_srp_StoreEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class StoreEntry;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::crypto::sasl::srp::StoreEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StoreEntry(jint);
-  virtual jboolean isAlive();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) perenial;
-  jlong timeToDie;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_crypto_sasl_srp_StoreEntry__
diff --git a/libjava/gnu/javax/imageio/IIOInputStream.h b/libjava/gnu/javax/imageio/IIOInputStream.h
deleted file mode 100644
index 2f0cbbd..0000000
--- a/libjava/gnu/javax/imageio/IIOInputStream.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_IIOInputStream__
-#define __gnu_javax_imageio_IIOInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-          class IIOInputStream;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::IIOInputStream : public ::java::io::InputStream
-{
-
-public:
-  IIOInputStream(::javax::imageio::stream::ImageInputStream *);
-  virtual jint available();
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-private:
-  ::javax::imageio::stream::ImageInputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) is;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_IIOInputStream__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPDecoder.h b/libjava/gnu/javax/imageio/bmp/BMPDecoder.h
deleted file mode 100644
index 34c486a..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPDecoder.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPDecoder__
-#define __gnu_javax_imageio_bmp_BMPDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPDecoder;
-            class BMPFileHeader;
-            class BMPInfoHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class IndexColorModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPDecoder : public ::java::lang::Object
-{
-
-public:
-  BMPDecoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  static ::gnu::javax::imageio::bmp::BMPDecoder * getDecoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *) = 0;
-public: // actually protected
-  virtual JArray< jint > * readBitMasks(::javax::imageio::stream::ImageInputStream *);
-  virtual ::java::awt::image::IndexColorModel * readPalette(::javax::imageio::stream::ImageInputStream *);
-  virtual void skipToImage(::javax::imageio::stream::ImageInputStream *);
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPDecoder__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPEncoder.h b/libjava/gnu/javax/imageio/bmp/BMPEncoder.h
deleted file mode 100644
index db60ff8..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPEncoder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPEncoder__
-#define __gnu_javax_imageio_bmp_BMPEncoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPEncoder;
-            class BMPFileHeader;
-            class BMPInfoHeader;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPEncoder : public ::java::lang::Object
-{
-
-public:
-  BMPEncoder();
-  static ::gnu::javax::imageio::bmp::BMPEncoder * getEncoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPEncoder__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPException.h b/libjava/gnu/javax/imageio/bmp/BMPException.h
deleted file mode 100644
index 9a51c41..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPException__
-#define __gnu_javax_imageio_bmp_BMPException__
-
-#pragma interface
-
-#include <javax/imageio/IIOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPException : public ::javax::imageio::IIOException
-{
-
-public:
-  BMPException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPException__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h b/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h
deleted file mode 100644
index 1fe5d3f..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPFileHeader__
-#define __gnu_javax_imageio_bmp_BMPFileHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-      namespace stream
-      {
-          class ImageInputStream;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPFileHeader : public ::java::lang::Object
-{
-
-public:
-  BMPFileHeader(::javax::imageio::stream::ImageInputStream *);
-  BMPFileHeader(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::IIOImage *);
-  virtual void write(::javax::imageio::stream::ImageOutputStream *);
-  virtual void setSize(jlong);
-  virtual void setOffset(jlong);
-  virtual jlong getSize();
-  virtual jlong getOffset();
-private:
-  static const jshort bfType = 16973;
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) bfSize;
-  jlong bfOffBits;
-public:
-  static const jint SIZE = 14;
-private:
-  static const jint BITMAPINFOHEADER_SIZE = 40;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPFileHeader__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageReader.h b/libjava/gnu/javax/imageio/bmp/BMPImageReader.h
deleted file mode 100644
index 972124e..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPImageReader.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPImageReader__
-#define __gnu_javax_imageio_bmp_BMPImageReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPDecoder;
-            class BMPFileHeader;
-            class BMPImageReader;
-            class BMPInfoHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPImageReader : public ::javax::imageio::ImageReader
-{
-
-public: // actually protected
-  BMPImageReader(::javax::imageio::spi::ImageReaderSpi *);
-private:
-  void validateIndex(jint);
-public:
-  virtual void setInput(::java::lang::Object *);
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual void setInput(::java::lang::Object *, jboolean);
-private:
-  void checkStream();
-  void readHeaders();
-public:
-  virtual jint getWidth(jint);
-  virtual jint getHeight(jint);
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getNumImages(jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-private:
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  ::gnu::javax::imageio::bmp::BMPDecoder * decoder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPImageReader__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h b/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h
deleted file mode 100644
index f7ac3a4..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPImageReaderSpi__
-#define __gnu_javax_imageio_bmp_BMPImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPImageReaderSpi;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  BMPImageReaderSpi();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-public: // actually package-private
-  static ::java::lang::String * vendorName;
-  static ::java::lang::String * version;
-  static ::java::lang::String * readerClassName;
-  static JArray< ::java::lang::String * > * names;
-  static JArray< ::java::lang::String * > * suffixes;
-  static JArray< ::java::lang::String * > * MIMETypes;
-  static JArray< ::java::lang::String * > * writerSpiNames;
-  static const jboolean supportsStandardStreamMetadataFormat = 0;
-  static ::java::lang::String * nativeStreamMetadataFormatName;
-  static ::java::lang::String * nativeStreamMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  static const jboolean supportsStandardImageMetadataFormat = 0;
-  static ::java::lang::String * nativeImageMetadataFormatName;
-  static ::java::lang::String * nativeImageMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h b/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h
deleted file mode 100644
index 1fb9795a..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPImageWriter__
-#define __gnu_javax_imageio_bmp_BMPImageWriter__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPEncoder;
-            class BMPFileHeader;
-            class BMPImageWriter;
-            class BMPInfoHeader;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageWriterSpi;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPImageWriter : public ::javax::imageio::ImageWriter
-{
-
-public: // actually protected
-  BMPImageWriter(::javax::imageio::spi::ImageWriterSpi *);
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *);
-  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  void checkStream();
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPEncoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriter)))) encoder;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * infoHeader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPImageWriter__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h b/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h
deleted file mode 100644
index 76ca4b0..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPImageWriterSpi__
-#define __gnu_javax_imageio_bmp_BMPImageWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageWriterSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPImageWriter;
-            class BMPImageWriterSpi;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-        class ImageWriter;
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPImageWriterSpi : public ::javax::imageio::spi::ImageWriterSpi
-{
-
-public:
-  BMPImageWriterSpi();
-  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *);
-  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *);
-  virtual ::gnu::javax::imageio::bmp::BMPImageWriter * getWriterInstance();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-public: // actually package-private
-  static ::java::lang::String * vendorName;
-  static ::java::lang::String * version;
-  static ::java::lang::String * writerClassName;
-  static JArray< ::java::lang::String * > * names;
-  static JArray< ::java::lang::String * > * suffixes;
-  static JArray< ::java::lang::String * > * MIMETypes;
-  static JArray< ::java::lang::String * > * readerSpiNames;
-  static const jboolean supportsStandardStreamMetadataFormat = 0;
-  static ::java::lang::String * nativeStreamMetadataFormatName;
-  static ::java::lang::String * nativeStreamMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  static const jboolean supportsStandardImageMetadataFormat = 0;
-  static ::java::lang::String * nativeImageMetadataFormatName;
-  static ::java::lang::String * nativeImageMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-private:
-  ::gnu::javax::imageio::bmp::BMPImageWriter * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageWriterSpi)))) writerInstance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPImageWriterSpi__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h b/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h
deleted file mode 100644
index d47843f..0000000
--- a/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_BMPInfoHeader__
-#define __gnu_javax_imageio_bmp_BMPInfoHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPInfoHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace stream
-      {
-          class ImageInputStream;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::BMPInfoHeader : public ::java::lang::Object
-{
-
-public:
-  BMPInfoHeader(::javax::imageio::stream::ImageInputStream *);
-  BMPInfoHeader(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  JArray< jbyte > * intToWord(jint);
-  JArray< jbyte > * intToDWord(jint);
-public:
-  virtual void setBitCount(jshort);
-  virtual jshort getBitCount();
-  virtual void setCompression(jint);
-  virtual jint getNumberOfPaletteEntries();
-  virtual jint getCompression();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual void setSize(::java::awt::Dimension *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) biSize;
-  jint biWidth;
-  jint biHeight;
-  jshort biPlanes;
-  jshort biBitCount;
-  jint biCompression;
-  jint biSizeImage;
-  jint biXPelsPerMeter;
-  jint biYPelsPerMeter;
-  jint biClrUsed;
-  jint biClrImportant;
-public:
-  static const jint SIZE = 40;
-  static const jint BI_RGB = 0;
-  static const jint BI_RLE8 = 1;
-  static const jint BI_RLE4 = 2;
-  static const jint BI_BITFIELDS = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_BMPInfoHeader__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeBF16.h b/libjava/gnu/javax/imageio/bmp/DecodeBF16.h
deleted file mode 100644
index 3051f0b..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeBF16.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeBF16__
-#define __gnu_javax_imageio_bmp_DecodeBF16__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeBF16;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeBF16 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeBF16(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *, jboolean);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPDecoder)))) bitmasks;
-  jboolean useDefaultMasks;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeBF16__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeBF32.h b/libjava/gnu/javax/imageio/bmp/DecodeBF32.h
deleted file mode 100644
index ac4f035..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeBF32.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeBF32__
-#define __gnu_javax_imageio_bmp_DecodeBF32__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeBF32;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeBF32 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeBF32(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *, jboolean);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPDecoder)))) bitmasks;
-  jboolean useDefaultMasks;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeBF32__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h
deleted file mode 100644
index ec4acf8..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRGB1__
-#define __gnu_javax_imageio_bmp_DecodeRGB1__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRGB1;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRGB1 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRGB1(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRGB1__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h
deleted file mode 100644
index da0e4df..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRGB24__
-#define __gnu_javax_imageio_bmp_DecodeRGB24__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRGB24;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRGB24 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRGB24(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRGB24__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h
deleted file mode 100644
index d0b7e08..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRGB4__
-#define __gnu_javax_imageio_bmp_DecodeRGB4__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRGB4;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRGB4 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRGB4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRGB4__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h
deleted file mode 100644
index e8a6300..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRGB8__
-#define __gnu_javax_imageio_bmp_DecodeRGB8__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRGB8;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRGB8 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRGB8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRGB8__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h b/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h
deleted file mode 100644
index f70a21b..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRLE4__
-#define __gnu_javax_imageio_bmp_DecodeRLE4__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRLE4;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRLE4 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRLE4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-private:
-  JArray< jbyte > * uncompress(jint, jint, ::javax::imageio::stream::ImageInputStream *);
-  static const jbyte ESCAPE = 0;
-  static const jbyte EOL = 0;
-  static const jbyte EOB = 1;
-  static const jbyte DELTA = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRLE4__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h b/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h
deleted file mode 100644
index bb23187..0000000
--- a/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_DecodeRLE8__
-#define __gnu_javax_imageio_bmp_DecodeRLE8__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPDecoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class DecodeRLE8;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::DecodeRLE8 : public ::gnu::javax::imageio::bmp::BMPDecoder
-{
-
-public:
-  DecodeRLE8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
-private:
-  JArray< jbyte > * uncompress(jint, jint, ::javax::imageio::stream::ImageInputStream *);
-  static const jbyte ESCAPE = 0;
-  static const jbyte EOL = 0;
-  static const jbyte EOB = 1;
-  static const jbyte DELTA = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_DecodeRLE8__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h
deleted file mode 100644
index 55f4f82..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB1__
-#define __gnu_javax_imageio_bmp_EncodeRGB1__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB1;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB1 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB1(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB1__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h
deleted file mode 100644
index ff3d782..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB16__
-#define __gnu_javax_imageio_bmp_EncodeRGB16__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB16;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB16 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB16(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB16__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h
deleted file mode 100644
index a40226c..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB24__
-#define __gnu_javax_imageio_bmp_EncodeRGB24__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB24;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB24 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB24(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB24__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h
deleted file mode 100644
index 7d170f7..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB32__
-#define __gnu_javax_imageio_bmp_EncodeRGB32__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB32;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB32 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB32(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB32__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h
deleted file mode 100644
index 15fe124..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB4__
-#define __gnu_javax_imageio_bmp_EncodeRGB4__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB4;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB4 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB4__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h
deleted file mode 100644
index f01e35f..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRGB8__
-#define __gnu_javax_imageio_bmp_EncodeRGB8__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRGB8;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRGB8 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRGB8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRGB8__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h b/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h
deleted file mode 100644
index 3b9c0f7..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRLE4__
-#define __gnu_javax_imageio_bmp_EncodeRLE4__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRLE4;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRLE4 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRLE4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  JArray< jbyte > * uncompress(jint, jint, ::java::nio::ByteBuffer *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-private:
-  static const jbyte ESCAPE = 0;
-  static const jbyte EOL = 0;
-  static const jbyte EOB = 1;
-  static const jbyte DELTA = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRLE4__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h b/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h
deleted file mode 100644
index d6e6e45..0000000
--- a/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_bmp_EncodeRLE8__
-#define __gnu_javax_imageio_bmp_EncodeRLE8__
-
-#pragma interface
-
-#include <gnu/javax/imageio/bmp/BMPEncoder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace bmp
-        {
-            class BMPFileHeader;
-            class BMPInfoHeader;
-            class EncodeRLE8;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::bmp::EncodeRLE8 : public ::gnu::javax::imageio::bmp::BMPEncoder
-{
-
-public:
-  EncodeRLE8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
-  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  JArray< jbyte > * uncompress(jint, jint, ::java::nio::ByteBuffer *);
-public: // actually protected
-  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
-  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
-  jlong offset;
-private:
-  static const jbyte ESCAPE = 0;
-  static const jbyte EOL = 0;
-  static const jbyte EOB = 1;
-  static const jbyte DELTA = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_bmp_EncodeRLE8__
diff --git a/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h b/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h
deleted file mode 100644
index d4468b9..0000000
--- a/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_gif_GIFFile$GIFException__
-#define __gnu_javax_imageio_gif_GIFFile$GIFException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace gif
-        {
-            class GIFFile$GIFException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::gif::GIFFile$GIFException : public ::java::lang::Exception
-{
-
-public:
-  GIFFile$GIFException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_gif_GIFFile$GIFException__
diff --git a/libjava/gnu/javax/imageio/gif/GIFFile.h b/libjava/gnu/javax/imageio/gif/GIFFile.h
deleted file mode 100644
index b574276..0000000
--- a/libjava/gnu/javax/imageio/gif/GIFFile.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_gif_GIFFile__
-#define __gnu_javax_imageio_gif_GIFFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace gif
-        {
-            class GIFFile;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::gif::GIFFile : public ::java::lang::Object
-{
-
-public:
-  GIFFile(::java::io::InputStream *);
-private:
-  GIFFile(::gnu::javax::imageio::gif::GIFFile *, ::java::io::InputStream *, jint);
-public:
-  static jboolean readSignature(::java::io::InputStream *);
-private:
-  void loadImage(::java::io::InputStream *);
-  void packPixels();
-public:
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNColors();
-  virtual jboolean hasTransparency();
-  virtual jint getTransparentIndex();
-  virtual ::java::lang::String * getComment();
-  virtual jint getDuration();
-private:
-  void deinterlace();
-  void readLocal(::java::io::InputStream *);
-public:
-  virtual JArray< jbyte > * getRawPalette();
-  virtual ::gnu::javax::imageio::gif::GIFFile * getImage(jint);
-  virtual JArray< jbyte > * getRawImage();
-  virtual jint nImages();
-private:
-  void readExtension(::java::io::InputStream *);
-  JArray< jbyte > * readData(::java::io::InputStream *);
-  void decodeRaster(::java::io::InputStream *);
-  jint getBits(jint);
-  static JArray< jbyte > * nsBlock;
-  static const jint EXTENSION = 33;
-  static const jint LOCAL = 44;
-  static const jint TERMINATOR = 59;
-  static const jint EXTENSION_COMMENT = 254;
-  static const jint EXTENSION_GCONTROL = 249;
-  static const jint EXTENSION_APPLICATION = 255;
-  static const jint UNDRAW_OVERWRITE = 1;
-  static const jint UNDRAW_RESTORE_BACKGROUND = 2;
-  static const jint UNDRAW_RESTORE_PREVIOUS = 3;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint width;
-  jint height;
-  jint globalWidth;
-  jint globalHeight;
-  jbyte bgIndex;
-  jint nColors;
-  JArray< jbyte > * globalPalette;
-  jboolean hasGlobalColorMap;
-  JArray< jbyte > * localPalette;
-  jboolean interlaced;
-  jboolean hasTransparency__;
-  jint undraw;
-  jint transparentIndex;
-  JArray< jbyte > * raster;
-  JArray< jbyte > * compressedData;
-  jint duration;
-  jint dataBlockIndex;
-  ::java::lang::String * comment;
-  jint remainingBits;
-  jint currentBits;
-  jboolean isLooped;
-  jint loops;
-  ::java::util::Vector * animationFrames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_gif_GIFFile__
diff --git a/libjava/gnu/javax/imageio/gif/GIFImageReader.h b/libjava/gnu/javax/imageio/gif/GIFImageReader.h
deleted file mode 100644
index 4fc8c7b..0000000
--- a/libjava/gnu/javax/imageio/gif/GIFImageReader.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_gif_GIFImageReader__
-#define __gnu_javax_imageio_gif_GIFImageReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace gif
-        {
-            class GIFFile;
-            class GIFImageReader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class IndexColorModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::gif::GIFImageReader : public ::javax::imageio::ImageReader
-{
-
-public: // actually protected
-  GIFImageReader(::javax::imageio::spi::ImageReaderSpi *);
-private:
-  void readImage();
-  ::java::awt::image::IndexColorModel * getPalette(jint);
-  void validateIndex(jint);
-public:
-  virtual void setInput(::java::lang::Object *);
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual void setInput(::java::lang::Object *, jboolean);
-private:
-  void checkStream();
-public:
-  virtual jint getWidth(jint);
-  virtual jint getHeight(jint);
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getNumImages(jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-private:
-  ::gnu::javax::imageio::gif::GIFFile * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_gif_GIFImageReader__
diff --git a/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h b/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h
deleted file mode 100644
index 027faea..0000000
--- a/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_gif_GIFImageReaderSpi__
-#define __gnu_javax_imageio_gif_GIFImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace gif
-        {
-            class GIFImageReaderSpi;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-    }
-  }
-}
-
-class gnu::javax::imageio::gif::GIFImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  GIFImageReaderSpi();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-public: // actually package-private
-  static ::java::lang::String * vendorName;
-  static ::java::lang::String * version;
-  static ::java::lang::String * readerClassName;
-  static JArray< ::java::lang::String * > * names;
-  static JArray< ::java::lang::String * > * suffixes;
-  static JArray< ::java::lang::String * > * MIMETypes;
-  static JArray< ::java::lang::String * > * writerSpiNames;
-  static const jboolean supportsStandardStreamMetadataFormat = 0;
-  static ::java::lang::String * nativeStreamMetadataFormatName;
-  static ::java::lang::String * nativeStreamMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  static const jboolean supportsStandardImageMetadataFormat = 0;
-  static ::java::lang::String * nativeImageMetadataFormatName;
-  static ::java::lang::String * nativeImageMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_gif_GIFImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/jpeg/DCT.h b/libjava/gnu/javax/imageio/jpeg/DCT.h
deleted file mode 100644
index 16636be..0000000
--- a/libjava/gnu/javax/imageio/jpeg/DCT.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_DCT__
-#define __gnu_javax_imageio_jpeg_DCT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class DCT;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::DCT : public ::java::lang::Object
-{
-
-public:
-  DCT();
-  static jdouble C(jint);
-private:
-  void initMatrix();
-public:
-  static JArray< JArray< jdouble > * > * slow_idct(JArray< JArray< jdouble > * > *);
-  static JArray< JArray< jfloat > * > * slow_fdct(JArray< JArray< jfloat > * > *);
-  virtual JArray< JArray< jfloat > * > * fast_fdct(JArray< JArray< jfloat > * > *);
-  virtual JArray< JArray< jdouble > * > * fast_idct(JArray< JArray< jdouble > * > *);
-  virtual JArray< JArray< jdouble > * > * idj_fast_fdct(JArray< JArray< jfloat > * > *);
-  JArray< JArray< jdouble > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) c;
-  JArray< JArray< jdouble > * > * cT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_DCT__
diff --git a/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h b/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h
deleted file mode 100644
index 794b262..0000000
--- a/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_HuffmanTable__
-#define __gnu_javax_imageio_jpeg_HuffmanTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class HuffmanTable;
-            class JPEGImageInputStream;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::HuffmanTable : public ::java::lang::Object
-{
-
-public:
-  HuffmanTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
-private:
-  void generateSizeTable();
-  void generateCodeTable();
-  void generateDecoderTables();
-public:
-  virtual void orderCodes(jboolean);
-  static jint extend(jint, jint);
-  virtual jint decode(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
-  static const jint HUFFMAN_MAX_TABLES = 4;
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) huffcode;
-  JArray< jshort > * huffsize;
-  JArray< jshort > * EHUFCO;
-  JArray< jshort > * EHUFSI;
-  JArray< jshort > * valptr;
-  JArray< jshort > * mincode;
-  JArray< jshort > * maxcode;
-  JArray< jshort > * huffval;
-  JArray< jshort > * bits;
-public: // actually package-private
-  static jbyte JPEG_DC_TABLE;
-  static jbyte JPEG_AC_TABLE;
-private:
-  jshort lastk;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_HuffmanTable__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h b/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h
deleted file mode 100644
index 36ff5f6..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGComponent__
-#define __gnu_javax_imageio_jpeg_JPEGComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class DCT;
-            class HuffmanTable;
-            class JPEGComponent;
-            class JPEGImageInputStream;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class WritableRaster;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGComponent : public ::java::lang::Object
-{
-
-public:
-  JPEGComponent(jbyte, jbyte, jbyte, jbyte);
-  virtual void padMCU(jint, jint);
-  virtual void resetInterval();
-  virtual void quantitizeData();
-  virtual void setDCTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
-  virtual void setACTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
-  virtual void idctData(::gnu::javax::imageio::jpeg::DCT *);
-  virtual void scaleByFactors();
-  virtual void writeBlock(::java::awt::image::WritableRaster *, JArray< JArray< jdouble > * > *, jint, jint, jint);
-  virtual void writeData(::java::awt::image::WritableRaster *, jint);
-  virtual void setQuantizationTable(JArray< jint > *);
-  virtual void readComponentMCU(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
-  virtual jdouble decode_dc_coefficient(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
-  virtual JArray< jdouble > * decode_ac_coefficients(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) factorH;
-  jbyte factorV;
-  jbyte component_id;
-  jbyte quant_id;
-  jint width;
-  jint height;
-  jint maxV;
-  jint maxH;
-  ::gnu::javax::imageio::jpeg::HuffmanTable * ACTable;
-  ::gnu::javax::imageio::jpeg::HuffmanTable * DCTable;
-  JArray< jint > * quantizationTable;
-  jdouble previousDC;
-public: // actually package-private
-  ::java::util::ArrayList * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGComponent__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h b/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h
deleted file mode 100644
index 4eef890..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGDecoder__
-#define __gnu_javax_imageio_jpeg_JPEGDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGDecoder;
-            class JPEGImageInputStream;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-            class JPEGQTable;
-        }
-      }
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGDecoder : public ::java::lang::Object
-{
-
-public:
-  virtual jint getHeight();
-  virtual jint getWidth();
-  JPEGDecoder(::javax::imageio::stream::ImageInputStream *);
-  virtual void decode();
-private:
-  void decodeJFIFExtension();
-public:
-  virtual ::java::awt::image::BufferedImage * getImage();
-public: // actually package-private
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) majorVersion;
-  jbyte minorVersion;
-  jbyte units;
-  jshort Xdensity;
-  jshort Ydensity;
-  jbyte Xthumbnail;
-  jbyte Ythumbnail;
-  JArray< jbyte > * thumbnail;
-  ::java::awt::image::BufferedImage * image;
-  jint width;
-  jint height;
-  jbyte marker;
-public:
-  static const jbyte MAJOR_VERSION = 1;
-  static const jbyte MINOR_VERSION = 2;
-  static const jshort JFIF_FIXED_LENGTH = 16;
-  static const jshort JFXX_FIXED_LENGTH = 8;
-private:
-  ::gnu::javax::imageio::jpeg::JPEGImageInputStream * jpegStream;
-public: // actually package-private
-  ::java::util::ArrayList * jpegFrames;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * dcTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * acTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * qTables;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGDecoder__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGException.h b/libjava/gnu/javax/imageio/jpeg/JPEGException.h
deleted file mode 100644
index b2a9d5a..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGException__
-#define __gnu_javax_imageio_jpeg_JPEGException__
-
-#pragma interface
-
-#include <javax/imageio/IIOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGException : public ::javax::imageio::IIOException
-{
-
-public:
-  JPEGException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGException__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h b/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h
deleted file mode 100644
index 5aad0a2..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGFrame__
-#define __gnu_javax_imageio_jpeg_JPEGFrame__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGFrame;
-            class JPEGScan;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGFrame : public ::java::lang::Object
-{
-
-public:
-  JPEGFrame();
-  virtual void addComponent(jbyte, jbyte, jbyte);
-  virtual void setPrecision(jbyte);
-  virtual void setScanLines(jshort);
-  virtual void setSamplesPerLine(jshort);
-  virtual void setColorMode(jbyte);
-  virtual void setComponentCount(jbyte);
-  virtual jbyte getComponentCount();
-  virtual void setHuffmanTables(jbyte, ::javax::imageio::plugins::jpeg::JPEGHuffmanTable *, ::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
-  static const jbyte JPEG_COLOR_GRAY = 1;
-  static const jbyte JPEG_COLOR_RGB = 2;
-  static const jbyte JPEG_COLOR_YCbCr = 3;
-  static const jbyte JPEG_COLOR_CMYK = 4;
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) precision;
-  jbyte colorMode;
-  jbyte componentCount;
-  jshort width;
-  jshort height;
-  ::gnu::javax::imageio::jpeg::JPEGScan * components;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGFrame__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h
deleted file mode 100644
index 19304c0..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGImageInputStream__
-#define __gnu_javax_imageio_jpeg_JPEGImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGImageInputStream;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  JPEGImageInputStream(::javax::imageio::stream::ImageInputStream *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  jbyte pullByte();
-public:
-  virtual jbyte getMarker();
-  virtual jint readBit();
-  virtual jbyte findNextMarker();
-private:
-  ::javax::imageio::stream::ImageInputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) in;
-public: // actually package-private
-  jbyte marker;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGImageInputStream__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h
deleted file mode 100644
index f7deeb8..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGImageReader__
-#define __gnu_javax_imageio_jpeg_JPEGImageReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGDecoder;
-            class JPEGImageReader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGImageReader : public ::javax::imageio::ImageReader
-{
-
-public: // actually protected
-  JPEGImageReader(::javax::imageio::spi::ImageReaderSpi *);
-public:
-  virtual jint getHeight(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getNumImages(jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-  virtual jint getWidth(jint);
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-private:
-  void checkIndex(jint);
-  void checkStream();
-  void decodeStream();
-public: // actually package-private
-  ::gnu::javax::imageio::jpeg::JPEGDecoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) decoder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGImageReader__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h
deleted file mode 100644
index 6cb33fe..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
-#define __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGImageReaderSpi;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  JPEGImageReaderSpi();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-  static void registerSpis(::javax::imageio::spi::IIORegistry *);
-  static ::gnu::javax::imageio::jpeg::JPEGImageReaderSpi * getReaderSpi();
-public: // actually package-private
-  static ::java::lang::String * vendorName;
-  static ::java::lang::String * version;
-  static ::java::lang::String * readerClassName;
-  static JArray< ::java::lang::String * > * names;
-  static JArray< ::java::lang::String * > * suffixes;
-  static JArray< ::java::lang::String * > * MIMETypes;
-  static JArray< ::java::lang::String * > * writerSpiNames;
-  static const jboolean supportsStandardStreamMetadataFormat = 0;
-  static ::java::lang::String * nativeStreamMetadataFormatName;
-  static ::java::lang::String * nativeStreamMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  static const jboolean supportsStandardImageMetadataFormat = 0;
-  static ::java::lang::String * nativeImageMetadataFormatName;
-  static ::java::lang::String * nativeImageMetadataFormatClassName;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-private:
-  static ::gnu::javax::imageio::jpeg::JPEGImageReaderSpi * readerSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h b/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h
deleted file mode 100644
index bbfb11e..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGMarker__
-#define __gnu_javax_imageio_jpeg_JPEGMarker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGMarker;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGMarker : public ::java::lang::Object
-{
-
-public:
-  JPEGMarker();
-  static const jbyte JFIF_J = 74;
-  static const jbyte JFIF_F = 70;
-  static const jbyte JFIF_I = 73;
-  static const jbyte JFIF_X = 70;
-  static const jbyte JFXX_JPEG = 16;
-  static const jbyte JFXX_ONE_BPP = 17;
-  static const jbyte JFXX_THREE_BPP = 19;
-  static const jbyte XFF = -1;
-  static const jbyte X00 = 0;
-  static const jbyte APP0 = -32;
-  static const jbyte APP1 = -31;
-  static const jbyte APP2 = -30;
-  static const jbyte APP3 = -29;
-  static const jbyte APP4 = -28;
-  static const jbyte APP5 = -27;
-  static const jbyte APP6 = -26;
-  static const jbyte APP7 = -25;
-  static const jbyte APP8 = -24;
-  static const jbyte APP9 = -23;
-  static const jbyte APP10 = -22;
-  static const jbyte APP11 = -21;
-  static const jbyte APP12 = -20;
-  static const jbyte APP13 = -19;
-  static const jbyte APP14 = -18;
-  static const jbyte APP15 = -17;
-  static const jbyte RST0 = -48;
-  static const jbyte RST1 = -47;
-  static const jbyte RST2 = -46;
-  static const jbyte RST3 = -45;
-  static const jbyte RST4 = -44;
-  static const jbyte RST5 = -43;
-  static const jbyte RST6 = -42;
-  static const jbyte RST7 = -41;
-  static const jbyte SOF0 = -64;
-  static const jbyte SOF1 = -63;
-  static const jbyte SOF2 = -62;
-  static const jbyte SOF3 = -61;
-  static const jbyte SOF5 = -59;
-  static const jbyte SOF6 = -58;
-  static const jbyte SOF7 = -57;
-  static const jbyte SOF9 = -55;
-  static const jbyte SOF10 = -54;
-  static const jbyte SOF11 = -53;
-  static const jbyte SOF13 = -51;
-  static const jbyte SOF14 = -50;
-  static const jbyte SOF15 = -49;
-  static const jbyte DHT = -60;
-  static const jbyte DQT = -37;
-  static const jbyte SOS = -38;
-  static const jbyte DRI = -35;
-  static const jbyte COM = -2;
-  static const jbyte SOI = -40;
-  static const jbyte EOI = -39;
-  static const jbyte DNL = -36;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGMarker__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h b/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h
deleted file mode 100644
index d7c376c..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
-#define __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGMarkerFoundException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGMarkerFoundException : public ::java::io::IOException
-{
-
-public:
-  JPEGMarkerFoundException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGScan.h b/libjava/gnu/javax/imageio/jpeg/JPEGScan.h
deleted file mode 100644
index 5023286..0000000
--- a/libjava/gnu/javax/imageio/jpeg/JPEGScan.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_JPEGScan__
-#define __gnu_javax_imageio_jpeg_JPEGScan__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class JPEGComponent;
-            class JPEGScan;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::JPEGScan : public ::java::lang::Object
-{
-
-public:
-  JPEGScan();
-  JPEGScan(jint, jint);
-private:
-  void recalculateDimensions();
-public:
-  virtual void addComponent(jbyte, jbyte, jbyte, jbyte);
-  virtual ::gnu::javax::imageio::jpeg::JPEGComponent * getComponentByID(jbyte);
-  virtual ::gnu::javax::imageio::jpeg::JPEGComponent * get(jint);
-  virtual jint getX(jbyte);
-  virtual jint getY(jbyte);
-  virtual jint getMaxV();
-  virtual jint getMaxH();
-  virtual void setWidth(jint);
-  virtual void setHeight(jint);
-  virtual jint size();
-  virtual jint sizeComponentBlocks();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) maxHeight;
-  jint maxWidth;
-  jint maxV;
-  jint maxH;
-  jint numOfComponents;
-  jint numOfComponentBlocks;
-  ::java::util::ArrayList * components;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_JPEGScan__
diff --git a/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h b/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h
deleted file mode 100644
index 0d107f2..0000000
--- a/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
-#define __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
-
-#pragma interface
-
-#include <java/awt/color/ColorSpace.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class YCbCr_ColorSpace;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::YCbCr_ColorSpace : public ::java::awt::color::ColorSpace
-{
-
-public:
-  YCbCr_ColorSpace();
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  static JArray< jfloat > * toYCbCr(JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
diff --git a/libjava/gnu/javax/imageio/jpeg/ZigZag.h b/libjava/gnu/javax/imageio/jpeg/ZigZag.h
deleted file mode 100644
index 6111088..0000000
--- a/libjava/gnu/javax/imageio/jpeg/ZigZag.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_jpeg_ZigZag__
-#define __gnu_javax_imageio_jpeg_ZigZag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace jpeg
-        {
-            class ZigZag;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::jpeg::ZigZag : public ::java::lang::Object
-{
-
-public:
-  ZigZag();
-  static JArray< jbyte > * encode(JArray< JArray< jbyte > * > *);
-  static JArray< jdouble > * encode(JArray< JArray< jdouble > * > *);
-  static JArray< jfloat > * encode(JArray< JArray< jfloat > * > *);
-  static JArray< jshort > * encode(JArray< JArray< jshort > * > *);
-  static JArray< JArray< jdouble > * > * decode(JArray< jdouble > *);
-  static JArray< JArray< jbyte > * > * decode(JArray< jbyte > *);
-  static JArray< JArray< jint > * > * decode(JArray< jint > *);
-  static JArray< JArray< jbyte > * > * decode(JArray< jbyte > *, jint, jint);
-  static JArray< JArray< jdouble > * > * decode(JArray< jdouble > *, jint, jint);
-  static JArray< JArray< jfloat > * > * decode(JArray< jfloat > *, jint, jint);
-  static JArray< JArray< jint > * > * decode(JArray< jint > *, jint, jint);
-  static JArray< JArray< jdouble > * > * decode8x8_map(JArray< jdouble > *);
-  static const jboolean ZIGZAG_FORWARD = 1;
-  static const jboolean ZIGZAG_BACKWARD = 0;
-  static JArray< jint > * ZIGZAG_8X8_MAP;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_jpeg_ZigZag__
diff --git a/libjava/gnu/javax/imageio/png/PNGChunk.h b/libjava/gnu/javax/imageio/png/PNGChunk.h
deleted file mode 100644
index 849b436..0000000
--- a/libjava/gnu/javax/imageio/png/PNGChunk.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGChunk__
-#define __gnu_javax_imageio_png_PNGChunk__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGChunk;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGChunk : public ::java::lang::Object
-{
-
-public: // actually protected
-  PNGChunk(jint, JArray< jbyte > *, jint);
-  PNGChunk(jint);
-public:
-  static ::gnu::javax::imageio::png::PNGChunk * readChunk(::java::io::InputStream *, jboolean);
-private:
-  static ::gnu::javax::imageio::png::PNGChunk * getChunk(jint, JArray< jbyte > *, jint);
-  static jboolean isEssentialChunk(jint);
-public:
-  virtual jboolean isValidChunk();
-  virtual jint getType();
-  virtual void writeChunk(::java::io::OutputStream *);
-  virtual jboolean isEmpty();
-  static JArray< jbyte > * getInt(jint);
-private:
-  jint calcCRC();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static JArray< jlong > * crcTable;
-public:
-  static const jint TYPE_HEADER = 1229472850;
-  static const jint TYPE_PALETTE = 1347179589;
-  static const jint TYPE_DATA = 1229209940;
-  static const jint TYPE_TIME = 1950960965;
-  static const jint TYPE_END = 1229278788;
-  static const jint TYPE_PHYS = 1883789683;
-  static const jint TYPE_GAMMA = 1732332865;
-  static const jint TYPE_PROFILE = 1766015824;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public: // actually protected
-  JArray< jbyte > * data;
-private:
-  jint crc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGChunk__
diff --git a/libjava/gnu/javax/imageio/png/PNGData.h b/libjava/gnu/javax/imageio/png/PNGData.h
deleted file mode 100644
index 16a04a2..0000000
--- a/libjava/gnu/javax/imageio/png/PNGData.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGData__
-#define __gnu_javax_imageio_png_PNGData__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGData;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGData : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGData(jint, JArray< jbyte > *, jint);
-  PNGData(jint);
-public:
-  virtual void deflateToChunk(::java::util::zip::Deflater *);
-  virtual jboolean chunkFull();
-  virtual void shrink();
-  virtual void feedToInflater(::java::util::zip::Inflater *);
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGData__
diff --git a/libjava/gnu/javax/imageio/png/PNGDecoder.h b/libjava/gnu/javax/imageio/png/PNGDecoder.h
deleted file mode 100644
index 70e6f39..0000000
--- a/libjava/gnu/javax/imageio/png/PNGDecoder.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGDecoder__
-#define __gnu_javax_imageio_png_PNGDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGData;
-            class PNGDecoder;
-            class PNGHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class DataBuffer;
-          class IndexColorModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGDecoder : public ::java::lang::Object
-{
-
-public:
-  PNGDecoder(::gnu::javax::imageio::png::PNGHeader *);
-private:
-  jint getBytes(JArray< jbyte > *, jint);
-public:
-  virtual void addData(::gnu::javax::imageio::png::PNGData *);
-  virtual ::java::awt::image::WritableRaster * getRaster(::gnu::javax::imageio::png::PNGHeader *);
-private:
-  ::java::awt::image::DataBuffer * getShortBuffer();
-  ::java::awt::image::DataBuffer * getByteBuffer();
-public:
-  virtual ::java::awt::image::ColorModel * getColorModel(::java::awt::color::ColorSpace *, jint, jint);
-private:
-  ::java::awt::image::IndexColorModel * grayPalette(jint);
-public:
-  virtual JArray< jbyte > * getRaster();
-  virtual jboolean isFinished();
-private:
-  ::gnu::javax::imageio::png::PNGHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
-  JArray< jbyte > * raster;
-  JArray< jbyte > * scanline;
-  JArray< jbyte > * lastScanline;
-  JArray< jbyte > * filterType;
-  jint offset;
-  jint length;
-  jint currentScanline;
-  jint stride;
-  ::java::util::zip::Inflater * inflater;
-  jboolean readFilter;
-  jint bpp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGDecoder__
diff --git a/libjava/gnu/javax/imageio/png/PNGEncoder.h b/libjava/gnu/javax/imageio/png/PNGEncoder.h
deleted file mode 100644
index e985ee1..0000000
--- a/libjava/gnu/javax/imageio/png/PNGEncoder.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGEncoder__
-#define __gnu_javax_imageio_png_PNGEncoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGEncoder;
-            class PNGHeader;
-            class PNGICCProfile;
-            class PNGPalette;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGEncoder : public ::java::lang::Object
-{
-
-public:
-  PNGEncoder(::java::awt::image::BufferedImage *);
-  virtual ::gnu::javax::imageio::png::PNGHeader * getHeader();
-  virtual ::gnu::javax::imageio::png::PNGPalette * getPalette();
-  virtual ::gnu::javax::imageio::png::PNGICCProfile * getProfile();
-  virtual ::java::util::Vector * encodeImage();
-private:
-  void getRawData(::java::awt::image::BufferedImage *);
-  static const jint defaultChunkSize = 8192;
-  ::gnu::javax::imageio::png::PNGHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
-  ::gnu::javax::imageio::png::PNGPalette * palette;
-  jint stride;
-  jint bpp;
-  JArray< jbyte > * rawData;
-  ::gnu::javax::imageio::png::PNGICCProfile * profile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGEncoder__
diff --git a/libjava/gnu/javax/imageio/png/PNGException.h b/libjava/gnu/javax/imageio/png/PNGException.h
deleted file mode 100644
index d024069..0000000
--- a/libjava/gnu/javax/imageio/png/PNGException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGException__
-#define __gnu_javax_imageio_png_PNGException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGException : public ::java::io::IOException
-{
-
-public:
-  PNGException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGException__
diff --git a/libjava/gnu/javax/imageio/png/PNGFile.h b/libjava/gnu/javax/imageio/png/PNGFile.h
deleted file mode 100644
index a1b5fdf..0000000
--- a/libjava/gnu/javax/imageio/png/PNGFile.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGFile__
-#define __gnu_javax_imageio_png_PNGFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGDecoder;
-            class PNGEncoder;
-            class PNGFile;
-            class PNGHeader;
-            class PNGPalette;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGFile : public ::java::lang::Object
-{
-
-public:
-  PNGFile(::java::io::InputStream *);
-  PNGFile(::java::awt::image::BufferedImage *);
-  virtual void writePNG(::java::io::OutputStream *);
-private:
-  jboolean validateHeader(JArray< jbyte > *);
-public:
-  virtual ::java::awt::image::BufferedImage * getBufferedImage();
-private:
-  ::gnu::javax::imageio::png::PNGPalette * getPalette();
-  ::java::awt::color::ColorSpace * getColorSpace();
-  static JArray< jbyte > * signature;
-  static JArray< jbyte > * endChunk;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) chunks;
-  ::gnu::javax::imageio::png::PNGHeader * header;
-  jboolean hasPalette;
-  jint width;
-  jint height;
-  ::gnu::javax::imageio::png::PNGDecoder * decoder;
-  ::gnu::javax::imageio::png::PNGEncoder * encoder;
-  ::java::awt::image::BufferedImage * sourceImage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGFile__
diff --git a/libjava/gnu/javax/imageio/png/PNGFilter.h b/libjava/gnu/javax/imageio/png/PNGFilter.h
deleted file mode 100644
index c461f59..0000000
--- a/libjava/gnu/javax/imageio/png/PNGFilter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGFilter__
-#define __gnu_javax_imageio_png_PNGFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGFilter;
-            class PNGHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGFilter : public ::java::lang::Object
-{
-
-public:
-  PNGFilter();
-  static jboolean useFilter(::gnu::javax::imageio::png::PNGHeader *);
-  static jbyte chooseFilter(JArray< jbyte > *, JArray< jbyte > *, jint);
-  static JArray< jbyte > * filterScanline(jbyte, JArray< jbyte > *, JArray< jbyte > *, jint);
-  static JArray< jbyte > * unFilterScanline(jint, JArray< jbyte > *, JArray< jbyte > *, jint);
-  static const jbyte FILTER_NONE = 0;
-  static const jbyte FILTER_SUB = 1;
-  static const jbyte FILTER_UP = 2;
-  static const jbyte FILTER_AVERAGE = 3;
-  static const jbyte FILTER_PAETH = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGFilter__
diff --git a/libjava/gnu/javax/imageio/png/PNGGamma.h b/libjava/gnu/javax/imageio/png/PNGGamma.h
deleted file mode 100644
index e6458f4..0000000
--- a/libjava/gnu/javax/imageio/png/PNGGamma.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGGamma__
-#define __gnu_javax_imageio_png_PNGGamma__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGGamma;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGGamma : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGGamma(jint, JArray< jbyte > *, jint);
-public:
-  PNGGamma(jdouble);
-  virtual ::java::awt::color::ColorSpace * getColorSpace(jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  jdouble __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) gamma;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGGamma__
diff --git a/libjava/gnu/javax/imageio/png/PNGHeader.h b/libjava/gnu/javax/imageio/png/PNGHeader.h
deleted file mode 100644
index 1902680..0000000
--- a/libjava/gnu/javax/imageio/png/PNGHeader.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGHeader__
-#define __gnu_javax_imageio_png_PNGHeader__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGHeader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGHeader : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGHeader(jint, JArray< jbyte > *, jint);
-public:
-  PNGHeader(jint, jint, jint, jint, jboolean);
-  virtual jboolean isValidChunk();
-  virtual jboolean isIndexed();
-  virtual jboolean isGrayscale();
-  virtual jint getColorType();
-  virtual jboolean isInterlaced();
-  virtual jint bytesPerPixel();
-  virtual jint getScanlineStride();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getDepth();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) width;
-  jint height;
-  jint depth;
-  jint colorType;
-  jint compression;
-  jint filter;
-  jint interlace;
-public:
-  static const jint INTERLACE_NONE = 0;
-  static const jint INTERLACE_ADAM7 = 1;
-  static const jint GRAYSCALE = 0;
-  static const jint RGB = 2;
-  static const jint INDEXED = 3;
-  static const jint GRAYSCALE_WITH_ALPHA = 4;
-  static const jint RGB_WITH_ALPHA = 6;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGHeader__
diff --git a/libjava/gnu/javax/imageio/png/PNGICCProfile.h b/libjava/gnu/javax/imageio/png/PNGICCProfile.h
deleted file mode 100644
index 1495ded..0000000
--- a/libjava/gnu/javax/imageio/png/PNGICCProfile.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGICCProfile__
-#define __gnu_javax_imageio_png_PNGICCProfile__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGICCProfile;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGICCProfile : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGICCProfile(jint, JArray< jbyte > *, jint);
-public:
-  PNGICCProfile(::java::awt::color::ICC_Profile *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) name;
-  ::java::awt::color::ICC_Profile * profile;
-  static JArray< jbyte > * genericName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGICCProfile__
diff --git a/libjava/gnu/javax/imageio/png/PNGImageReader.h b/libjava/gnu/javax/imageio/png/PNGImageReader.h
deleted file mode 100644
index 5ef99a7..0000000
--- a/libjava/gnu/javax/imageio/png/PNGImageReader.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGImageReader__
-#define __gnu_javax_imageio_png_PNGImageReader__
-
-#pragma interface
-
-#include <javax/imageio/ImageReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGFile;
-            class PNGImageReader;
-            class PNGImageReaderSpi;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGImageReader : public ::javax::imageio::ImageReader
-{
-
-public:
-  PNGImageReader(::gnu::javax::imageio::png::PNGImageReaderSpi *);
-  virtual jint getHeight(jint);
-  virtual jint getWidth(jint);
-  virtual ::java::util::Iterator * getImageTypes(jint);
-  virtual jint getNumImages(jboolean);
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
-private:
-  void checkIndex(jint);
-  void readImage();
-  ::gnu::javax::imageio::png::PNGFile * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) pngFile;
-  ::java::awt::image::BufferedImage * image;
-  ::java::util::ArrayList * imageTypes;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGImageReader__
diff --git a/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h b/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h
deleted file mode 100644
index 61b6b3f..0000000
--- a/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGImageReaderSpi__
-#define __gnu_javax_imageio_png_PNGImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGImageReaderSpi;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
-{
-
-public:
-  PNGImageReaderSpi();
-  virtual jboolean canDecodeInput(::java::lang::Object *);
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::util::Locale *);
-private:
-  static JArray< jbyte > * SIGNATURE;
-  static ::java::lang::String * VENDOR_NAME;
-public: // actually package-private
-  static ::java::lang::String * VERSION;
-  static ::java::lang::String * READER_CLASSNAME;
-  static JArray< ::java::lang::String * > * NAMES;
-  static JArray< ::java::lang::String * > * SUFFIXES;
-  static JArray< ::java::lang::String * > * MIME_TYPES;
-  static JArray< ::java::lang::String * > * WRITER_SPI_NAMES;
-  static JArray< ::java::lang::Class * > * INPUT_TYPES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/png/PNGPalette.h b/libjava/gnu/javax/imageio/png/PNGPalette.h
deleted file mode 100644
index d216b1b..0000000
--- a/libjava/gnu/javax/imageio/png/PNGPalette.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGPalette__
-#define __gnu_javax_imageio_png_PNGPalette__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGPalette;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class IndexColorModel;
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGPalette : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGPalette(jint, JArray< jbyte > *, jint);
-public:
-  PNGPalette(::java::awt::image::IndexColorModel *);
-  virtual ::java::awt::image::IndexColorModel * getPalette(::java::awt::color::ColorSpace *);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) red;
-  JArray< jint > * green;
-  JArray< jint > * blue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGPalette__
diff --git a/libjava/gnu/javax/imageio/png/PNGPhys.h b/libjava/gnu/javax/imageio/png/PNGPhys.h
deleted file mode 100644
index fa4476d..0000000
--- a/libjava/gnu/javax/imageio/png/PNGPhys.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGPhys__
-#define __gnu_javax_imageio_png_PNGPhys__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGPhys;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGPhys : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGPhys(jint, JArray< jbyte > *, jint);
-public:
-  PNGPhys(jdouble);
-  PNGPhys(jint, jint);
-private:
-  void makeData();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) x;
-  jlong y;
-  jdouble ratio;
-  jboolean usesRatio;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGPhys__
diff --git a/libjava/gnu/javax/imageio/png/PNGTime.h b/libjava/gnu/javax/imageio/png/PNGTime.h
deleted file mode 100644
index 1e07099..0000000
--- a/libjava/gnu/javax/imageio/png/PNGTime.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_imageio_png_PNGTime__
-#define __gnu_javax_imageio_png_PNGTime__
-
-#pragma interface
-
-#include <gnu/javax/imageio/png/PNGChunk.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace imageio
-      {
-        namespace png
-        {
-            class PNGTime;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::imageio::png::PNGTime : public ::gnu::javax::imageio::png::PNGChunk
-{
-
-public: // actually protected
-  PNGTime(jint, JArray< jbyte > *, jint);
-public:
-  PNGTime(::java::util::Date *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) date;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_imageio_png_PNGTime__
diff --git a/libjava/gnu/javax/management/ListenerData.h b/libjava/gnu/javax/management/ListenerData.h
deleted file mode 100644
index ff1b8f0..0000000
--- a/libjava/gnu/javax/management/ListenerData.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_ListenerData__
-#define __gnu_javax_management_ListenerData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class ListenerData;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class gnu::javax::management::ListenerData : public ::java::lang::Object
-{
-
-public:
-  ListenerData(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual ::javax::management::NotificationListener * getListener();
-  virtual ::javax::management::NotificationFilter * getFilter();
-  virtual ::java::lang::Object * getPassback();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::javax::management::NotificationListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listener;
-  ::javax::management::NotificationFilter * filter;
-  ::java::lang::Object * passback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_ListenerData__
diff --git a/libjava/gnu/javax/management/Server$LazyListenersHolder.h b/libjava/gnu/javax/management/Server$LazyListenersHolder.h
deleted file mode 100644
index dfe8618..0000000
--- a/libjava/gnu/javax/management/Server$LazyListenersHolder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Server$LazyListenersHolder__
-#define __gnu_javax_management_Server$LazyListenersHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Server$LazyListenersHolder;
-      }
-    }
-  }
-}
-
-class gnu::javax::management::Server$LazyListenersHolder : public ::java::lang::Object
-{
-
-  Server$LazyListenersHolder();
-public: // actually package-private
-  static ::java::util::Map * access$0();
-private:
-  static ::java::util::Map * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server$LazyListenersHolder__
diff --git a/libjava/gnu/javax/management/Server$ServerInfo.h b/libjava/gnu/javax/management/Server$ServerInfo.h
deleted file mode 100644
index da1eb3b..0000000
--- a/libjava/gnu/javax/management/Server$ServerInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Server$ServerInfo__
-#define __gnu_javax_management_Server$ServerInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Server;
-          class Server$ServerInfo;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectInstance;
-    }
-  }
-}
-
-class gnu::javax::management::Server$ServerInfo : public ::java::lang::Object
-{
-
-public:
-  Server$ServerInfo(::gnu::javax::management::Server *, ::javax::management::ObjectInstance *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObject();
-  virtual ::javax::management::ObjectInstance * getInstance();
-private:
-  ::javax::management::ObjectInstance * __attribute__((aligned(__alignof__( ::java::lang::Object)))) instance;
-  ::java::lang::Object * object;
-public: // actually package-private
-  ::gnu::javax::management::Server * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server$ServerInfo__
diff --git a/libjava/gnu/javax/management/Server$ServerInputStream.h b/libjava/gnu/javax/management/Server$ServerInputStream.h
deleted file mode 100644
index 1b2bc0e..0000000
--- a/libjava/gnu/javax/management/Server$ServerInputStream.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Server$ServerInputStream__
-#define __gnu_javax_management_Server$ServerInputStream__
-
-#pragma interface
-
-#include <java/io/ObjectInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Server;
-          class Server$ServerInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::management::Server$ServerInputStream : public ::java::io::ObjectInputStream
-{
-
-public:
-  Server$ServerInputStream(::gnu::javax::management::Server *, ::java::io::InputStream *, ::java::lang::ClassLoader *);
-public: // actually protected
-  virtual ::java::lang::Class * resolveClass(::java::io::ObjectStreamClass *);
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::io::ObjectInputStream)))) cl;
-public: // actually package-private
-  ::gnu::javax::management::Server * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server$ServerInputStream__
diff --git a/libjava/gnu/javax/management/Server$ServerNotificationListener.h b/libjava/gnu/javax/management/Server$ServerNotificationListener.h
deleted file mode 100644
index a699261..0000000
--- a/libjava/gnu/javax/management/Server$ServerNotificationListener.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Server$ServerNotificationListener__
-#define __gnu_javax_management_Server$ServerNotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Server;
-          class Server$ServerNotificationListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationListener;
-        class ObjectName;
-    }
-  }
-}
-
-class gnu::javax::management::Server$ServerNotificationListener : public ::java::lang::Object
-{
-
-public:
-  Server$ServerNotificationListener(::gnu::javax::management::Server *, ::java::lang::Object *, ::javax::management::ObjectName *, ::javax::management::NotificationListener *);
-  virtual void handleNotification(::javax::management::Notification *, ::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bean;
-  ::javax::management::ObjectName * name;
-  ::javax::management::NotificationListener * listener;
-  ::gnu::javax::management::Server * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server$ServerNotificationListener__
diff --git a/libjava/gnu/javax/management/Server.h b/libjava/gnu/javax/management/Server.h
deleted file mode 100644
index e23fe02..0000000
--- a/libjava/gnu/javax/management/Server.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Server__
-#define __gnu_javax_management_Server__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Server;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanInfo;
-        class MBeanServer;
-        class MBeanServerDelegate;
-        class NotificationFilter;
-        class NotificationListener;
-        class ObjectInstance;
-        class ObjectName;
-        class QueryExp;
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class gnu::javax::management::Server : public ::java::lang::Object
-{
-
-public:
-  Server(::java::lang::String *, ::javax::management::MBeanServer *, ::javax::management::MBeanServerDelegate *);
-private:
-  void checkSecurity(::javax::management::ObjectName *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::Object * getBean(::javax::management::ObjectName *);
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *);
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *);
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual ::java::io::ObjectInputStream * deserialize(::javax::management::ObjectName *, JArray< jbyte > *);
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, JArray< jbyte > *);
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, ::javax::management::ObjectName *, JArray< jbyte > *);
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *);
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::ClassLoader * getClassLoader(::javax::management::ObjectName *);
-  virtual ::java::lang::ClassLoader * getClassLoaderFor(::javax::management::ObjectName *);
-  virtual ::javax::management::loading::ClassLoaderRepository * getClassLoaderRepository();
-  virtual ::java::lang::String * getDefaultDomain();
-  virtual JArray< ::java::lang::String * > * getDomains();
-  virtual ::java::lang::Integer * getMBeanCount();
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *);
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *);
-  virtual ::java::lang::Object * instantiate(::java::lang::String *);
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *);
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *);
-  virtual jboolean isRegistered(::javax::management::ObjectName *);
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::javax::management::QueryExp *);
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::javax::management::QueryExp *);
-  virtual ::javax::management::ObjectInstance * registerMBean(::java::lang::Object *, ::javax::management::ObjectName *);
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *);
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *);
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void setAttribute(::javax::management::ObjectName *, ::javax::management::Attribute *);
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::javax::management::AttributeList *);
-  virtual void unregisterMBean(::javax::management::ObjectName *);
-private:
-  void notify(::javax::management::ObjectName *, ::java::lang::String *);
-  static ::javax::management::ObjectName * DELEGATE_NAME;
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beans;
-  ::java::lang::String * defaultDomain;
-  ::javax::management::MBeanServer * outer;
-  ::javax::management::loading::ClassLoaderRepository * repository;
-  ::javax::management::MBeanServerDelegate * delegate;
-  static ::java::util::concurrent::atomic::AtomicLong * sequenceNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server__
diff --git a/libjava/gnu/javax/management/Translator.h b/libjava/gnu/javax/management/Translator.h
deleted file mode 100644
index dce0165..0000000
--- a/libjava/gnu/javax/management/Translator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_management_Translator__
-#define __gnu_javax_management_Translator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class Translator;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class gnu::javax::management::Translator : public ::java::lang::Object
-{
-
-public:
-  Translator();
-  static JArray< ::java::lang::Object * > * fromJava(JArray< ::java::lang::Object * > *, ::java::lang::reflect::Method *);
-  static ::java::lang::Object * fromJava(::java::lang::Object *, ::java::lang::reflect::Type *);
-  static ::java::lang::Object * toJava(::java::lang::Object *, ::java::lang::reflect::Method *);
-private:
-  static JArray< ::java::lang::Object * > * makeArraySpecific(JArray< ::java::lang::Object * > *);
-public:
-  static ::javax::management::openmbean::OpenMBeanParameterInfo * translate(::java::lang::String *);
-private:
-  static ::javax::management::openmbean::OpenType * getTypeFromClass(::java::lang::Class *);
-  static ::java::lang::String * getTypeName(::java::lang::reflect::Type *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Translator__
diff --git a/libjava/gnu/javax/naming/giop/ContextContinuation.h b/libjava/gnu/javax/naming/giop/ContextContinuation.h
deleted file mode 100644
index 546a256..0000000
--- a/libjava/gnu/javax/naming/giop/ContextContinuation.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_ContextContinuation__
-#define __gnu_javax_naming_giop_ContextContinuation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameTransformer;
-      }
-    }
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class ContextContinuation;
-            class GiopNamingServiceFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NamingContextExt;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::ContextContinuation : public ::java::lang::Object
-{
-
-public:
-  ContextContinuation(::org::omg::CORBA::Object *, ::java::util::Hashtable *, ::org::omg::CORBA::ORB *, ::gnu::javax::naming::giop::GiopNamingServiceFactory *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual void close();
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * toGiop(::javax::naming::Name *);
-  virtual jint getBatchSize();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) DEFAULT_BATCH_SIZE;
-public: // actually package-private
-  ::org::omg::CosNaming::NamingContextExt * service;
-  ::org::omg::CORBA::ORB * orb;
-  ::java::util::Hashtable * properties;
-  ::gnu::javax::naming::giop::GiopNamingServiceFactory * factory;
-  static ::gnu::CORBA::NamingService::NameTransformer * transformer;
-public:
-  jint howMany;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_ContextContinuation__
diff --git a/libjava/gnu/javax/naming/giop/CorbalocParser.h b/libjava/gnu/javax/naming/giop/CorbalocParser.h
deleted file mode 100644
index cad411d..0000000
--- a/libjava/gnu/javax/naming/giop/CorbalocParser.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_CorbalocParser__
-#define __gnu_javax_naming_giop_CorbalocParser__
-
-#pragma interface
-
-#include <gnu/CORBA/NamingService/NameTransformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameTransformer;
-      }
-    }
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class CorbalocParser;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::CorbalocParser : public ::gnu::CORBA::NamingService::NameTransformer
-{
-
-public:
-  CorbalocParser();
-  virtual JArray< ::java::lang::String * > * corbaloc(::java::lang::String *, ::org::omg::CORBA::ORB *);
-private:
-  JArray< ::java::lang::String * > * corbaloc(::java::lang::String *, ::org::omg::CORBA::ORB *, jint);
-public: // actually package-private
-  virtual ::java::lang::String * readFile(::java::lang::String *);
-  virtual ::java::lang::String * readUrl(::java::lang::String *);
-private:
-  JArray< ::java::lang::String * > * resolve(::java::lang::String *);
-  ::java::lang::String * readKey(::java::lang::String *);
-public:
-  static ::java::lang::String * pxCORBALOC;
-  static ::java::lang::String * pxCORBANAME;
-  static ::java::lang::String * pxIOR;
-  static ::java::lang::String * pxFILE;
-  static ::java::lang::String * pxFTP;
-  static ::java::lang::String * pxHTTP;
-  static ::java::lang::String * IIOP;
-  static ::java::lang::String * RIR;
-  static const jint DEFAULT_PORT = 2809;
-  static ::java::lang::String * DEFAULT_NAME;
-public: // actually package-private
-  static ::gnu::CORBA::NamingService::NameTransformer * converter;
-  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::NamingService::NameTransformer)))) p;
-  JArray< ::java::lang::String * > * t;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_CorbalocParser__
diff --git a/libjava/gnu/javax/naming/giop/GiopNamingEnumeration.h b/libjava/gnu/javax/naming/giop/GiopNamingEnumeration.h
deleted file mode 100644
index 409975c..0000000
--- a/libjava/gnu/javax/naming/giop/GiopNamingEnumeration.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_GiopNamingEnumeration__
-#define __gnu_javax_naming_giop_GiopNamingEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class GiopNamingEnumeration;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingIterator;
-          class BindingIteratorHolder;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::GiopNamingEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GiopNamingEnumeration(::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *, jint);
-public:
-  virtual ::java::lang::Object * convert(::org::omg::CosNaming::Binding *) = 0;
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  virtual jboolean getMore();
-  JArray< ::org::omg::CosNaming::Binding * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-  ::org::omg::CosNaming::BindingIterator * iterator;
-  jint batch;
-  jint p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_GiopNamingEnumeration__
diff --git a/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory$1.h b/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory$1.h
deleted file mode 100644
index f51db75..0000000
--- a/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory$1.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_GiopNamingServiceFactory$1__
-#define __gnu_javax_naming_giop_GiopNamingServiceFactory$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class GiopNamingServiceFactory;
-            class GiopNamingServiceFactory$1;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::GiopNamingServiceFactory$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  GiopNamingServiceFactory$1(::gnu::javax::naming::giop::GiopNamingServiceFactory *, ::org::omg::CORBA::ORB *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::javax::naming::giop::GiopNamingServiceFactory * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-private:
-  ::org::omg::CORBA::ORB * val$runIt;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_GiopNamingServiceFactory$1__
diff --git a/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory.h b/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory.h
deleted file mode 100644
index d3afb0d..0000000
--- a/libjava/gnu/javax/naming/giop/GiopNamingServiceFactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_GiopNamingServiceFactory__
-#define __gnu_javax_naming_giop_GiopNamingServiceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class GiopNamingServiceFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::GiopNamingServiceFactory : public ::java::lang::Object
-{
-
-public:
-  GiopNamingServiceFactory();
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  virtual void checkIfReferenced(::org::omg::CORBA::ORB *);
-  virtual ::java::lang::String * getOrbSignature(::java::util::Map *);
-  static ::java::lang::String * DEFAULT_PROVIDER;
-  static ::java::util::Hashtable * orbs;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_GiopNamingServiceFactory__
diff --git a/libjava/gnu/javax/naming/giop/GiopNamingServiceURLContext.h b/libjava/gnu/javax/naming/giop/GiopNamingServiceURLContext.h
deleted file mode 100644
index ae1544c..0000000
--- a/libjava/gnu/javax/naming/giop/GiopNamingServiceURLContext.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_GiopNamingServiceURLContext__
-#define __gnu_javax_naming_giop_GiopNamingServiceURLContext__
-
-#pragma interface
-
-#include <gnu/javax/naming/giop/CorbalocParser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameTransformer;
-      }
-    }
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class GiopNamingServiceFactory;
-            class GiopNamingServiceURLContext;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NamingContextExt;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::GiopNamingServiceURLContext : public ::gnu::javax::naming::giop::CorbalocParser
-{
-
-public:
-  GiopNamingServiceURLContext(::java::util::Hashtable *, ::gnu::javax::naming::giop::GiopNamingServiceFactory *, ::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CosNaming::NamingContextExt * getService(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * split(::java::lang::String *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual void close();
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * toGiop(::javax::naming::Name *);
-  virtual jint getBatchSize();
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::naming::giop::CorbalocParser)))) DEFAULT_BATCH_SIZE;
-public: // actually package-private
-  ::org::omg::CORBA::ORB * orb;
-  ::java::util::Hashtable * properties;
-  ::gnu::javax::naming::giop::GiopNamingServiceFactory * factory;
-  static ::gnu::CORBA::NamingService::NameTransformer * transformer;
-public:
-  jint howMany;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_GiopNamingServiceURLContext__
diff --git a/libjava/gnu/javax/naming/giop/ListBindingsEnumeration.h b/libjava/gnu/javax/naming/giop/ListBindingsEnumeration.h
deleted file mode 100644
index 325f19a..0000000
--- a/libjava/gnu/javax/naming/giop/ListBindingsEnumeration.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_ListBindingsEnumeration__
-#define __gnu_javax_naming_giop_ListBindingsEnumeration__
-
-#pragma interface
-
-#include <gnu/javax/naming/giop/GiopNamingEnumeration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class ListBindingsEnumeration;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NamingContext;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::ListBindingsEnumeration : public ::gnu::javax::naming::giop::GiopNamingEnumeration
-{
-
-public:
-  ListBindingsEnumeration(::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *, jint, ::org::omg::CosNaming::NamingContext *);
-  virtual ::java::lang::Object * convert(::org::omg::CosNaming::Binding *);
-public: // actually package-private
-  ::org::omg::CosNaming::NamingContext * __attribute__((aligned(__alignof__( ::gnu::javax::naming::giop::GiopNamingEnumeration)))) service;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_ListBindingsEnumeration__
diff --git a/libjava/gnu/javax/naming/giop/ListEnumeration.h b/libjava/gnu/javax/naming/giop/ListEnumeration.h
deleted file mode 100644
index 5ed2c7f..0000000
--- a/libjava/gnu/javax/naming/giop/ListEnumeration.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_giop_ListEnumeration__
-#define __gnu_javax_naming_giop_ListEnumeration__
-
-#pragma interface
-
-#include <gnu/javax/naming/giop/GiopNamingEnumeration.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace giop
-        {
-            class ListEnumeration;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingIteratorHolder;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::giop::ListEnumeration : public ::gnu::javax::naming::giop::GiopNamingEnumeration
-{
-
-public:
-  ListEnumeration(::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *, jint);
-  virtual ::java::lang::Object * convert(::org::omg::CosNaming::Binding *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_giop_ListEnumeration__
diff --git a/libjava/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.h b/libjava/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.h
deleted file mode 100644
index 138c63a..0000000
--- a/libjava/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_ictxImpl_trans_GnuName$GnuNameEnum__
-#define __gnu_javax_naming_ictxImpl_trans_GnuName$GnuNameEnum__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace ictxImpl
-        {
-          namespace trans
-          {
-              class GnuName;
-              class GnuName$GnuNameEnum;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::ictxImpl::trans::GnuName$GnuNameEnum : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnuName$GnuNameEnum(::gnu::javax::naming::ictxImpl::trans::GnuName *, jint);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nxt;
-  ::gnu::javax::naming::ictxImpl::trans::GnuName * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_ictxImpl_trans_GnuName$GnuNameEnum__
diff --git a/libjava/gnu/javax/naming/ictxImpl/trans/GnuName.h b/libjava/gnu/javax/naming/ictxImpl/trans/GnuName.h
deleted file mode 100644
index dd2b2d6..0000000
--- a/libjava/gnu/javax/naming/ictxImpl/trans/GnuName.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_ictxImpl_trans_GnuName__
-#define __gnu_javax_naming_ictxImpl_trans_GnuName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace ictxImpl
-        {
-          namespace trans
-          {
-              class GnuName;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-    }
-  }
-}
-
-class gnu::javax::naming::ictxImpl::trans::GnuName : public ::java::lang::Object
-{
-
-public: // actually protected
-  GnuName();
-public:
-  GnuName(JArray< ::java::lang::String * > *);
-  GnuName(JArray< ::java::lang::String * > *, jint, jint);
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *);
-  virtual ::javax::naming::Name * add(::java::lang::String *);
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *);
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3617482732056931635LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) hash;
-  JArray< ::java::lang::String * > * content;
-  jint from;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_ictxImpl_trans_GnuName__
diff --git a/libjava/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.h b/libjava/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.h
deleted file mode 100644
index f1e3844..0000000
--- a/libjava/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_corbaname_corbanameURLContextFactory__
-#define __gnu_javax_naming_jndi_url_corbaname_corbanameURLContextFactory__
-
-#pragma interface
-
-#include <gnu/javax/naming/giop/GiopNamingServiceFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace corbaname
-            {
-                class corbanameURLContextFactory;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::corbaname::corbanameURLContextFactory : public ::gnu::javax::naming::giop::GiopNamingServiceFactory
-{
-
-public:
-  corbanameURLContextFactory();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_corbaname_corbanameURLContextFactory__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/ContextContinuation.h b/libjava/gnu/javax/naming/jndi/url/rmi/ContextContinuation.h
deleted file mode 100644
index 87f6699..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/ContextContinuation.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_ContextContinuation__
-#define __gnu_javax_naming_jndi_url_rmi_ContextContinuation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class ContextContinuation;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::ContextContinuation : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual void removeRegistry();
-  virtual ::java::rmi::registry::Registry * getRegistry();
-  ContextContinuation(::java::util::Map *, ::java::rmi::registry::Registry *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void close();
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  static ::java::lang::String * DEFAULT_REGISTRY_LOCATION;
-public: // actually package-private
-  ::java::rmi::registry::Registry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) registry;
-  ::java::util::Properties * properties;
-  jboolean lookupCalled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_ContextContinuation__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.h b/libjava/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.h
deleted file mode 100644
index 96b173a..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_ListBindingsEnumeration__
-#define __gnu_javax_naming_jndi_url_rmi_ListBindingsEnumeration__
-
-#pragma interface
-
-#include <gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class ListBindingsEnumeration;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::ListBindingsEnumeration : public ::gnu::javax::naming::jndi::url::rmi::RmiNamingEnumeration
-{
-
-public:
-  ListBindingsEnumeration(JArray< ::java::lang::String * > *, ::java::rmi::registry::Registry *);
-  virtual ::java::lang::Object * convert(::java::lang::String *);
-public: // actually package-private
-  ::java::rmi::registry::Registry * __attribute__((aligned(__alignof__( ::gnu::javax::naming::jndi::url::rmi::RmiNamingEnumeration)))) service;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_ListBindingsEnumeration__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/ListEnumeration.h b/libjava/gnu/javax/naming/jndi/url/rmi/ListEnumeration.h
deleted file mode 100644
index a09dc19..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/ListEnumeration.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_ListEnumeration__
-#define __gnu_javax_naming_jndi_url_rmi_ListEnumeration__
-
-#pragma interface
-
-#include <gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class ListEnumeration;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::ListEnumeration : public ::gnu::javax::naming::jndi::url::rmi::RmiNamingEnumeration
-{
-
-public:
-  ListEnumeration(JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Object * convert(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_ListEnumeration__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/RmiContinuation.h b/libjava/gnu/javax/naming/jndi/url/rmi/RmiContinuation.h
deleted file mode 100644
index 756fa05..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/RmiContinuation.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_RmiContinuation__
-#define __gnu_javax_naming_jndi_url_rmi_RmiContinuation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class RmiContinuation;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::RmiContinuation : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual void removeRegistry();
-  virtual ::java::rmi::registry::Registry * getRegistry();
-  RmiContinuation(::java::util::Map *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void close();
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  static ::java::lang::String * DEFAULT_REGISTRY_LOCATION;
-public: // actually package-private
-  ::java::rmi::registry::Registry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) registry;
-  ::java::util::Properties * properties;
-  jboolean lookupCalled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_RmiContinuation__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.h b/libjava/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.h
deleted file mode 100644
index 27447c7..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_RmiNamingEnumeration__
-#define __gnu_javax_naming_jndi_url_rmi_RmiNamingEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class RmiNamingEnumeration;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::RmiNamingEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RmiNamingEnumeration(JArray< ::java::lang::String * > *);
-public:
-  virtual ::java::lang::Object * convert(::java::lang::String *) = 0;
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-  virtual void close();
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-  jint p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_RmiNamingEnumeration__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContext.h b/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContext.h
deleted file mode 100644
index 732295d5..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContext.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_rmiURLContext__
-#define __gnu_javax_naming_jndi_url_rmi_rmiURLContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class rmiURLContext;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::rmiURLContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual ::java::rmi::registry::Registry * getRegistry(::java::lang::String *);
-  rmiURLContext(::java::util::Map *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void close();
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * split(::java::lang::String *);
-  static ::java::lang::String * DEFAULT_REGISTRY_LOCATION;
-public: // actually package-private
-  static ::java::util::WeakHashMap * registryCache;
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) properties;
-  jboolean lookupCalled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_rmiURLContext__
diff --git a/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.h b/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.h
deleted file mode 100644
index d29e51c..0000000
--- a/libjava/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_naming_jndi_url_rmi_rmiURLContextFactory__
-#define __gnu_javax_naming_jndi_url_rmi_rmiURLContextFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace naming
-      {
-        namespace jndi
-        {
-          namespace url
-          {
-            namespace rmi
-            {
-                class rmiURLContextFactory;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-    }
-  }
-}
-
-class gnu::javax::naming::jndi::url::rmi::rmiURLContextFactory : public ::java::lang::Object
-{
-
-public:
-  rmiURLContextFactory();
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_naming_jndi_url_rmi_rmiURLContextFactory__
diff --git a/libjava/gnu/javax/net/ssl/AbstractSessionContext.h b/libjava/gnu/javax/net/ssl/AbstractSessionContext.h
deleted file mode 100644
index 06d145e..0000000
--- a/libjava/gnu/javax/net/ssl/AbstractSessionContext.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_AbstractSessionContext__
-#define __gnu_javax_net_ssl_AbstractSessionContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class AbstractSessionContext;
-            class Session;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::AbstractSessionContext : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::javax::net::ssl::AbstractSessionContext * newInstance();
-  static void setImplClass(::java::lang::Class *);
-public: // actually protected
-  AbstractSessionContext(jint);
-public:
-  virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *);
-  virtual ::javax::net::ssl::SSLSession * getSession(::java::lang::String *, jint);
-public: // actually protected
-  virtual ::gnu::javax::net::ssl::Session * implGet(JArray< jbyte > *) = 0;
-public:
-  virtual jint getSessionTimeout();
-  virtual void load(JArray< jchar > *) = 0;
-  virtual void put(::gnu::javax::net::ssl::Session *) = 0;
-  virtual void remove(JArray< jbyte > *) = 0;
-  virtual void setSessionTimeout(jint);
-  virtual void store(JArray< jchar > *) = 0;
-  virtual ::java::util::Enumeration * getIds() = 0;
-  virtual jint getSessionCacheSize() = 0;
-  virtual void setSessionCacheSize(jint) = 0;
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) timeout;
-private:
-  static ::java::lang::Class * implClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_AbstractSessionContext__
diff --git a/libjava/gnu/javax/net/ssl/EntropySource.h b/libjava/gnu/javax/net/ssl/EntropySource.h
deleted file mode 100644
index d44398c..0000000
--- a/libjava/gnu/javax/net/ssl/EntropySource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_EntropySource__
-#define __gnu_javax_net_ssl_EntropySource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class EntropySource;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::EntropySource : public ::java::lang::Object
-{
-
-public:
-  virtual jdouble quality() = 0;
-  virtual JArray< jbyte > * nextBytes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_EntropySource__
diff --git a/libjava/gnu/javax/net/ssl/NullManagerParameters.h b/libjava/gnu/javax/net/ssl/NullManagerParameters.h
deleted file mode 100644
index 519138e..0000000
--- a/libjava/gnu/javax/net/ssl/NullManagerParameters.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_NullManagerParameters__
-#define __gnu_javax_net_ssl_NullManagerParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class NullManagerParameters;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::NullManagerParameters : public ::java::lang::Object
-{
-
-public:
-  NullManagerParameters();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_NullManagerParameters__
diff --git a/libjava/gnu/javax/net/ssl/PreSharedKeyManager.h b/libjava/gnu/javax/net/ssl/PreSharedKeyManager.h
deleted file mode 100644
index 8ced9ef..0000000
--- a/libjava/gnu/javax/net/ssl/PreSharedKeyManager.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_PreSharedKeyManager__
-#define __gnu_javax_net_ssl_PreSharedKeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class PreSharedKeyManager;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::PreSharedKeyManager : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::crypto::SecretKey * getKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * chooseIdentityHint() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_PreSharedKeyManager__
diff --git a/libjava/gnu/javax/net/ssl/PreSharedKeyManagerParameters.h b/libjava/gnu/javax/net/ssl/PreSharedKeyManagerParameters.h
deleted file mode 100644
index 5f2e23b..0000000
--- a/libjava/gnu/javax/net/ssl/PreSharedKeyManagerParameters.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_PreSharedKeyManagerParameters__
-#define __gnu_javax_net_ssl_PreSharedKeyManagerParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class PreSharedKeyManagerParameters;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::PreSharedKeyManagerParameters : public ::java::lang::Object
-{
-
-public:
-  PreSharedKeyManagerParameters();
-  virtual ::javax::crypto::SecretKey * getKey(::java::lang::String *);
-  virtual void putKey(::java::lang::String *, ::javax::crypto::SecretKey *);
-  virtual jboolean removeKey(::java::lang::String *);
-  virtual ::java::util::Iterator * identities();
-private:
-  ::java::util::LinkedHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keys;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_PreSharedKeyManagerParameters__
diff --git a/libjava/gnu/javax/net/ssl/PrivateCredentials.h b/libjava/gnu/javax/net/ssl/PrivateCredentials.h
deleted file mode 100644
index ab47f4f..0000000
--- a/libjava/gnu/javax/net/ssl/PrivateCredentials.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_PrivateCredentials__
-#define __gnu_javax_net_ssl_PrivateCredentials__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class PrivateCredentials;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::PrivateCredentials : public ::java::lang::Object
-{
-
-public:
-  PrivateCredentials();
-  virtual void add(::java::io::InputStream *, ::java::io::InputStream *);
-  virtual ::java::util::List * getPrivateKeys();
-  virtual ::java::util::List * getCertChains();
-  virtual void destroy();
-  virtual jboolean isDestroyed();
-private:
-  ::java::lang::String * readLine(::java::io::InputStream *);
-  JArray< jbyte > * decryptKey(JArray< jbyte > *, ::java::lang::String *, JArray< jbyte > *);
-  JArray< jbyte > * deriveKey(JArray< jbyte > *, jint);
-  JArray< jbyte > * toByteArray(::java::lang::String *);
-public:
-  static ::java::lang::String * BEGIN_DSA;
-  static ::java::lang::String * END_DSA;
-  static ::java::lang::String * BEGIN_RSA;
-  static ::java::lang::String * END_RSA;
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) privateKeys;
-  ::java::util::List * certChains;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_PrivateCredentials__
diff --git a/libjava/gnu/javax/net/ssl/SRPManagerParameters.h b/libjava/gnu/javax/net/ssl/SRPManagerParameters.h
deleted file mode 100644
index 16a617b..0000000
--- a/libjava/gnu/javax/net/ssl/SRPManagerParameters.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SRPManagerParameters__
-#define __gnu_javax_net_ssl_SRPManagerParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class PasswordFile;
-          }
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPManagerParameters;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SRPManagerParameters : public ::java::lang::Object
-{
-
-public:
-  SRPManagerParameters(::gnu::javax::crypto::sasl::srp::PasswordFile *);
-  virtual ::gnu::javax::crypto::sasl::srp::PasswordFile * getPasswordFile();
-private:
-  ::gnu::javax::crypto::sasl::srp::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_SRPManagerParameters__
diff --git a/libjava/gnu/javax/net/ssl/SRPTrustManager.h b/libjava/gnu/javax/net/ssl/SRPTrustManager.h
deleted file mode 100644
index 740ae3b..0000000
--- a/libjava/gnu/javax/net/ssl/SRPTrustManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SRPTrustManager__
-#define __gnu_javax_net_ssl_SRPTrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class PasswordFile;
-          }
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SRPTrustManager : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean contains(::java::lang::String *) = 0;
-  virtual ::java::security::KeyPair * getKeyPair(::java::lang::String *) = 0;
-  virtual JArray< jbyte > * getSalt(::java::lang::String *) = 0;
-  virtual ::java::math::BigInteger * getVerifier(::java::lang::String *) = 0;
-  virtual ::gnu::javax::crypto::sasl::srp::PasswordFile * getPasswordFile() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_SRPTrustManager__
diff --git a/libjava/gnu/javax/net/ssl/SSLCipherSuite.h b/libjava/gnu/javax/net/ssl/SSLCipherSuite.h
deleted file mode 100644
index de863b7..0000000
--- a/libjava/gnu/javax/net/ssl/SSLCipherSuite.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SSLCipherSuite__
-#define __gnu_javax_net_ssl_SSLCipherSuite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SSLCipherSuite;
-            class SSLProtocolVersion;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class Provider;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SSLCipherSuite : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLCipherSuite(::java::lang::String *, JArray< jbyte > *, ::gnu::javax::net::ssl::SSLProtocolVersion *);
-public:
-  static ::gnu::javax::net::ssl::SSLCipherSuite * getInstance(::gnu::javax::net::ssl::SSLProtocolVersion *, JArray< jbyte > *);
-  static ::gnu::javax::net::ssl::SSLCipherSuite * getInstance(::gnu::javax::net::ssl::SSLProtocolVersion *, JArray< jbyte > *, ::java::security::Provider *);
-  static ::gnu::javax::net::ssl::SSLCipherSuite * getInstance(::java::lang::String *);
-  static ::gnu::javax::net::ssl::SSLCipherSuite * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getId();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::gnu::javax::net::ssl::SSLProtocolVersion * getProtocolVersion();
-  virtual void encipher(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *) = 0;
-private:
-  static ::java::lang::String * SERVICE;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) algorithm;
-  JArray< jbyte > * id;
-  ::gnu::javax::net::ssl::SSLProtocolVersion * version;
-  ::java::security::Provider * provider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_SSLCipherSuite__
diff --git a/libjava/gnu/javax/net/ssl/SSLProtocolVersion.h b/libjava/gnu/javax/net/ssl/SSLProtocolVersion.h
deleted file mode 100644
index f7feac9..0000000
--- a/libjava/gnu/javax/net/ssl/SSLProtocolVersion.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SSLProtocolVersion__
-#define __gnu_javax_net_ssl_SSLProtocolVersion__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SSLProtocolVersion;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SSLProtocolVersion : public ::java::lang::Enum
-{
-
-  SSLProtocolVersion(::java::lang::String *, jint, jint, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::SSLProtocolVersion * > * values();
-  static ::gnu::javax::net::ssl::SSLProtocolVersion * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::SSLProtocolVersion * SSLv3;
-  static ::gnu::javax::net::ssl::SSLProtocolVersion * TLSv1;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) major;
-  jint minor;
-private:
-  static JArray< ::gnu::javax::net::ssl::SSLProtocolVersion * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_SSLProtocolVersion__
diff --git a/libjava/gnu/javax/net/ssl/SSLRecordHandler.h b/libjava/gnu/javax/net/ssl/SSLRecordHandler.h
deleted file mode 100644
index f4fab15..0000000
--- a/libjava/gnu/javax/net/ssl/SSLRecordHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SSLRecordHandler__
-#define __gnu_javax_net_ssl_SSLRecordHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SSLRecordHandler;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SSLRecordHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLRecordHandler(jbyte);
-public:
-  virtual void handle(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *) = 0;
-  virtual jbyte contentType();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) contentType__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_SSLRecordHandler__
diff --git a/libjava/gnu/javax/net/ssl/Session$ID.h b/libjava/gnu/javax/net/ssl/Session$ID.h
deleted file mode 100644
index cccfb02..0000000
--- a/libjava/gnu/javax/net/ssl/Session$ID.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_Session$ID__
-#define __gnu_javax_net_ssl_Session$ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class Session$ID;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::Session$ID : public ::java::lang::Object
-{
-
-public:
-  Session$ID(JArray< jbyte > *);
-  JArray< jbyte > * id();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jint compareTo(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 7887036954666565936LL;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_Session$ID__
diff --git a/libjava/gnu/javax/net/ssl/Session.h b/libjava/gnu/javax/net/ssl/Session.h
deleted file mode 100644
index 1061db2..0000000
--- a/libjava/gnu/javax/net/ssl/Session.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_Session__
-#define __gnu_javax_net_ssl_Session__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class Session;
-            class Session$ID;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-        class SecureRandom;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SealedObject;
-    }
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSessionContext;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::Session : public ::java::lang::Object
-{
-
-public: // actually protected
-  Session();
-public:
-  virtual void access();
-  virtual jint getApplicationBufferSize();
-  virtual ::java::lang::String * getCipherSuite();
-  virtual jlong getCreationTime();
-  virtual JArray< jbyte > * getId();
-  virtual ::gnu::javax::net::ssl::Session$ID * id();
-  virtual jlong getLastAccessedTime();
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates();
-  virtual ::java::security::Principal * getLocalPrincipal();
-  virtual jint getPacketBufferSize();
-  virtual JArray< ::java::security::cert::Certificate * > * getPeerCertificates();
-  virtual JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain();
-  virtual ::java::lang::String * getPeerHost();
-  virtual jint getPeerPort();
-  virtual ::java::security::Principal * getPeerPrincipal();
-  virtual ::javax::net::ssl::SSLSessionContext * getSessionContext();
-  virtual JArray< ::java::lang::String * > * getValueNames();
-  virtual ::java::lang::Object * getValue(::java::lang::String *);
-  virtual void invalidate();
-  virtual jboolean isValid();
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *);
-  virtual void removeValue(::java::lang::String *);
-  virtual jboolean isTruncatedMac();
-  virtual void prepare(JArray< jchar > *) = 0;
-  virtual void repair(JArray< jchar > *) = 0;
-  virtual ::javax::crypto::SealedObject * privateData() = 0;
-  virtual void setPrivateData(::javax::crypto::SealedObject *) = 0;
-  virtual ::java::lang::String * getProtocol() = 0;
-public: // actually protected
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) creationTime;
-  jlong lastAccessedTime;
-  jint applicationBufferSize;
-  ::gnu::javax::net::ssl::Session$ID * sessionId;
-  JArray< ::java::security::cert::Certificate * > * localCerts;
-  JArray< ::java::security::cert::Certificate * > * peerCerts;
-  JArray< ::javax::security::cert::X509Certificate * > * peerCertChain;
-  ::java::lang::String * peerHost;
-  jint peerPort;
-  jboolean peerVerified;
-  ::java::util::HashMap * values;
-  jboolean valid;
-  jboolean truncatedMac;
-  ::java::security::SecureRandom * random;
-  ::javax::net::ssl::SSLSessionContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_Session__
diff --git a/libjava/gnu/javax/net/ssl/SessionStoreException.h b/libjava/gnu/javax/net/ssl/SessionStoreException.h
deleted file mode 100644
index 50049b7..0000000
--- a/libjava/gnu/javax/net/ssl/SessionStoreException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_SessionStoreException__
-#define __gnu_javax_net_ssl_SessionStoreException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SessionStoreException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::SessionStoreException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SessionStoreException(::java::lang::String *);
-  SessionStoreException(::java::lang::String *, ::java::lang::Throwable *);
-  SessionStoreException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_SessionStoreException__
diff --git a/libjava/gnu/javax/net/ssl/StaticTrustAnchors.h b/libjava/gnu/javax/net/ssl/StaticTrustAnchors.h
deleted file mode 100644
index ac00c81..0000000
--- a/libjava/gnu/javax/net/ssl/StaticTrustAnchors.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_StaticTrustAnchors__
-#define __gnu_javax_net_ssl_StaticTrustAnchors__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class StaticTrustAnchors;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateFactory;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::StaticTrustAnchors : public ::java::lang::Object
-{
-
-public:
-  StaticTrustAnchors(JArray< ::java::security::cert::X509Certificate * > *);
-  static ::java::security::cert::X509Certificate * generate(::java::security::cert::CertificateFactory *, ::java::lang::String *);
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificates();
-private:
-  JArray< ::java::security::cert::X509Certificate * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) certs;
-public:
-  static ::gnu::javax::net::ssl::StaticTrustAnchors * CA_CERTS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_StaticTrustAnchors__
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h
deleted file mode 100644
index d0eaad2..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AbstractHandshake$1__
-#define __gnu_javax_net_ssl_provider_AbstractHandshake$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake$1;
-              class AbstractHandshake$CertVerifier;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AbstractHandshake$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractHandshake$1(::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier *);
-public:
-  virtual ::java::lang::ClassLoader * AbstractHandshake$1$run();
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AbstractHandshake$1__
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.h
deleted file mode 100644
index 56b6f9c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AbstractHandshake$CertVerifier__
-#define __gnu_javax_net_ssl_provider_AbstractHandshake$CertVerifier__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake;
-              class AbstractHandshake$CertVerifier;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually protected
-  AbstractHandshake$CertVerifier(::gnu::javax::net::ssl::provider::AbstractHandshake *, jboolean, JArray< ::java::security::cert::X509Certificate * > *);
-public: // actually package-private
-  virtual jboolean verified();
-public: // actually protected
-  virtual void implRun();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) clientSide;
-  JArray< ::java::security::cert::X509Certificate * > * chain;
-  jboolean verified__;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::AbstractHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AbstractHandshake$CertVerifier__
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.h
deleted file mode 100644
index d5f0278..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AbstractHandshake$DHE_PSKGen__
-#define __gnu_javax_net_ssl_provider_AbstractHandshake$DHE_PSKGen__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake;
-              class AbstractHandshake$DHE_PSKGen;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AbstractHandshake$DHE_PSKGen : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually protected
-  AbstractHandshake$DHE_PSKGen(::gnu::javax::net::ssl::provider::AbstractHandshake *, ::javax::crypto::interfaces::DHPublicKey *, ::javax::crypto::SecretKey *, jboolean);
-  virtual void implRun();
-private:
-  ::javax::crypto::interfaces::DHPublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) dhKey;
-  ::javax::crypto::SecretKey * psKey;
-  jboolean isClient;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::AbstractHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AbstractHandshake$DHE_PSKGen__
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.h
deleted file mode 100644
index a344f39..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AbstractHandshake$DHPhase__
-#define __gnu_javax_net_ssl_provider_AbstractHandshake$DHPhase__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake;
-              class AbstractHandshake$DHPhase;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AbstractHandshake$DHPhase : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually protected
-  AbstractHandshake$DHPhase(::gnu::javax::net::ssl::provider::AbstractHandshake *, ::javax::crypto::interfaces::DHPublicKey *);
-  AbstractHandshake$DHPhase(::gnu::javax::net::ssl::provider::AbstractHandshake *, ::javax::crypto::interfaces::DHPublicKey *, jboolean);
-  virtual void implRun();
-private:
-  ::javax::crypto::interfaces::DHPublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) key;
-  jboolean full;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::AbstractHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AbstractHandshake$DHPhase__
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake.h
deleted file mode 100644
index c0501a7..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AbstractHandshake__
-#define __gnu_javax_net_ssl_provider_AbstractHandshake__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake;
-              class CompressionMethod;
-              class InputSecurityParameters;
-              class OutputSecurityParameters;
-              class Random;
-              class SSLEngineImpl;
-              class SessionImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class MessageDigest;
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyAgreement;
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-    }
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$HandshakeStatus;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AbstractHandshake : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractHandshake(::gnu::javax::net::ssl::provider::SSLEngineImpl *);
-public:
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * handleInput(::java::nio::ByteBuffer *);
-public: // actually protected
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleInput() = 0;
-public:
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * handleOutput(::java::nio::ByteBuffer *);
-public: // actually protected
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleOutput(::java::nio::ByteBuffer *) = 0;
-public: // actually package-private
-  virtual ::gnu::javax::net::ssl::provider::InputSecurityParameters * getInputParams();
-  virtual ::gnu::javax::net::ssl::provider::OutputSecurityParameters * getOutputParams();
-  virtual ::java::lang::Runnable * getTask();
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * status() = 0;
-  virtual void checkKeyExchange() = 0;
-  virtual void handleV2Hello(::java::nio::ByteBuffer *) = 0;
-public: // actually protected
-  virtual jboolean pollHandshake(::java::nio::ByteBuffer *);
-  virtual jboolean doHash();
-  virtual jboolean hasMessage();
-private:
-  void reallocateBuffer(jint);
-public: // actually protected
-  virtual JArray< jbyte > * genV3CertificateVerify(::java::security::MessageDigest *, ::java::security::MessageDigest *, ::gnu::javax::net::ssl::provider::SessionImpl *);
-  virtual JArray< JArray< jbyte > * > * generateKeys(::gnu::javax::net::ssl::provider::Random *, ::gnu::javax::net::ssl::provider::Random *, ::gnu::javax::net::ssl::provider::SessionImpl *);
-  virtual ::java::nio::ByteBuffer * generateFinished(::java::security::MessageDigest *, ::java::security::MessageDigest *, jboolean, ::gnu::javax::net::ssl::provider::SessionImpl *);
-  virtual void initDiffieHellman(::javax::crypto::interfaces::DHPrivateKey *, ::java::security::SecureRandom *);
-  virtual void generateMasterSecret(::gnu::javax::net::ssl::provider::Random *, ::gnu::javax::net::ssl::provider::Random *, ::gnu::javax::net::ssl::provider::SessionImpl *);
-  virtual void setupSecurityParameters(JArray< JArray< jbyte > * > *, jboolean, ::gnu::javax::net::ssl::provider::SSLEngineImpl *, ::gnu::javax::net::ssl::provider::CompressionMethod *);
-  virtual void generatePSKSecret(::java::lang::String *, JArray< jbyte > *, jboolean);
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  static JArray< jbyte > * SERVER_FINISHED;
-  static JArray< jbyte > * CLIENT_FINISHED;
-private:
-  static JArray< jbyte > * KEY_EXPANSION;
-  static JArray< jbyte > * MASTER_SECRET;
-  static JArray< jbyte > * CLIENT_WRITE_KEY;
-  static JArray< jbyte > * SERVER_WRITE_KEY;
-  static JArray< jbyte > * IV_BLOCK;
-  static JArray< jbyte > * SENDER_CLIENT;
-  static JArray< jbyte > * SENDER_SERVER;
-public: // actually protected
-  static JArray< jbyte > * PAD1;
-  static JArray< jbyte > * PAD2;
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handshakeBuffer;
-  jint handshakeOffset;
-  ::java::security::MessageDigest * sha;
-  ::java::security::MessageDigest * md5;
-  ::gnu::javax::net::ssl::provider::SSLEngineImpl * engine;
-  ::javax::crypto::KeyAgreement * keyAgreement;
-  JArray< jbyte > * preMasterSecret;
-  ::gnu::javax::net::ssl::provider::InputSecurityParameters * inParams;
-  ::gnu::javax::net::ssl::provider::OutputSecurityParameters * outParams;
-  ::java::util::LinkedList * tasks;
-  ::gnu::javax::net::ssl::provider::Random * serverRandom;
-  ::gnu::javax::net::ssl::provider::Random * clientRandom;
-  ::gnu::javax::net::ssl::provider::CompressionMethod * compression;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AbstractHandshake__
diff --git a/libjava/gnu/javax/net/ssl/provider/Alert$Description.h b/libjava/gnu/javax/net/ssl/provider/Alert$Description.h
deleted file mode 100644
index 90a6526..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Alert$Description.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Alert$Description__
-#define __gnu_javax_net_ssl_provider_Alert$Description__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Alert$Description;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Alert$Description : public ::java::lang::Enum
-{
-
-  Alert$Description(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::Alert$Description * forInteger(jint);
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::Alert$Description * > * values();
-  static ::gnu::javax::net::ssl::provider::Alert$Description * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::Alert$Description * CLOSE_NOTIFY;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNEXPECTED_MESSAGE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * BAD_RECORD_MAC;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * DECRYPTION_FAILED;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * RECORD_OVERFLOW;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * DECOMPRESSION_FAILURE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * HANDSHAKE_FAILURE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * NO_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * BAD_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNSUPPORTED_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * CERTIFICATE_REVOKED;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * CERTIFICATE_EXPIRED;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * CERTIFICATE_UNKNOWN;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * ILLEGAL_PARAMETER;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNKNOWN_CA;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * ACCESS_DENIED;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * DECODE_ERROR;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * DECRYPT_ERROR;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * EXPORT_RESTRICTION;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * PROTOCOL_VERSION;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * INSUFFICIENT_SECURITY;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * INTERNAL_ERROR;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * USER_CANCELED;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * NO_RENEGOTIATION;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNSUPPORTED_EXTENSION;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * CERTIFICATE_UNOBTAINABLE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNRECOGNIZED_NAME;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * BAD_CERTIFICATE_STATUS_RESPONSE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * BAD_CERTIFICATE_HASH_VALUE;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * UNKNOWN_SRP_USERNAME;
-  static ::gnu::javax::net::ssl::provider::Alert$Description * MISSING_SRP_USERNAME;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::Alert$Description * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Alert$Description__
diff --git a/libjava/gnu/javax/net/ssl/provider/Alert$Level.h b/libjava/gnu/javax/net/ssl/provider/Alert$Level.h
deleted file mode 100644
index 6c31c4e..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Alert$Level.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Alert$Level__
-#define __gnu_javax_net_ssl_provider_Alert$Level__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Alert$Level;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Alert$Level : public ::java::lang::Enum
-{
-
-  Alert$Level(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::Alert$Level * forInteger(jint);
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::Alert$Level * > * values();
-  static ::gnu::javax::net::ssl::provider::Alert$Level * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::Alert$Level * WARNING;
-  static ::gnu::javax::net::ssl::provider::Alert$Level * FATAL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::Alert$Level * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Alert$Level__
diff --git a/libjava/gnu/javax/net/ssl/provider/Alert.h b/libjava/gnu/javax/net/ssl/provider/Alert.h
deleted file mode 100644
index 02a4371..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Alert.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Alert__
-#define __gnu_javax_net_ssl_provider_Alert__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Alert;
-              class Alert$Description;
-              class Alert$Level;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Alert : public ::java::lang::Object
-{
-
-public:
-  Alert(::java::nio::ByteBuffer *);
-  Alert(::gnu::javax::net::ssl::provider::Alert$Level *, ::gnu::javax::net::ssl::provider::Alert$Description *);
-  jint length();
-public: // actually package-private
-  JArray< jbyte > * getEncoded();
-public:
-  ::gnu::javax::net::ssl::provider::Alert$Level * level();
-  ::gnu::javax::net::ssl::provider::Alert$Description * description();
-  void setLevel(::gnu::javax::net::ssl::provider::Alert$Level *);
-  void setDescription(::gnu::javax::net::ssl::provider::Alert$Description *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Alert__
diff --git a/libjava/gnu/javax/net/ssl/provider/AlertException.h b/libjava/gnu/javax/net/ssl/provider/AlertException.h
deleted file mode 100644
index bb335b8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/AlertException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_AlertException__
-#define __gnu_javax_net_ssl_provider_AlertException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Alert;
-              class AlertException;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::AlertException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  AlertException(::gnu::javax::net::ssl::provider::Alert *, jboolean);
-  AlertException(::gnu::javax::net::ssl::provider::Alert *);
-  AlertException(::gnu::javax::net::ssl::provider::Alert *, jboolean, ::java::lang::Throwable *);
-  AlertException(::gnu::javax::net::ssl::provider::Alert *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::gnu::javax::net::ssl::provider::Alert * alert();
-  virtual jboolean isLocal();
-private:
-  ::gnu::javax::net::ssl::provider::Alert * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLException)))) alert__;
-  jboolean isLocal__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_AlertException__
diff --git a/libjava/gnu/javax/net/ssl/provider/Builder.h b/libjava/gnu/javax/net/ssl/provider/Builder.h
deleted file mode 100644
index 4c6b795..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Builder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Builder__
-#define __gnu_javax_net_ssl_provider_Builder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Builder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Builder : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::nio::ByteBuffer * buffer() = 0;
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_Builder__
diff --git a/libjava/gnu/javax/net/ssl/provider/Certificate.h b/libjava/gnu/javax/net/ssl/provider/Certificate.h
deleted file mode 100644
index 2ad08db..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Certificate.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Certificate__
-#define __gnu_javax_net_ssl_provider_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Certificate;
-              class CertificateType;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Certificate : public ::java::lang::Object
-{
-
-public:
-  Certificate(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::CertificateType *);
-  virtual jint length();
-  virtual ::java::util::List * certificates();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::CertificateType * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Certificate__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateBuilder.h b/libjava/gnu/javax/net/ssl/provider/CertificateBuilder.h
deleted file mode 100644
index 136fd69..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateBuilder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateBuilder__
-#define __gnu_javax_net_ssl_provider_CertificateBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Certificate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateBuilder;
-              class CertificateType;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateBuilder : public ::gnu::javax::net::ssl::provider::Certificate
-{
-
-public:
-  CertificateBuilder(::gnu::javax::net::ssl::provider::CertificateType *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setCertificates(::java::util::List *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.h b/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.h
deleted file mode 100644
index b6e51c8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateRequest$ClientCertificateType__
-#define __gnu_javax_net_ssl_provider_CertificateRequest$ClientCertificateType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequest$ClientCertificateType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType : public ::java::lang::Enum
-{
-
-  CertificateRequest$ClientCertificateType(::java::lang::String *, jint, jint);
-public: // actually package-private
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * forValue(jint);
-public:
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * > * values();
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * RSA_SIGN;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * DSS_SIGN;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * RSA_FIXED_DH;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * DSS_FIXED_DH;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateRequest$ClientCertificateType__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateRequest.h b/libjava/gnu/javax/net/ssl/provider/CertificateRequest.h
deleted file mode 100644
index 08e7f19..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateRequest.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateRequest__
-#define __gnu_javax_net_ssl_provider_CertificateRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequest;
-              class ClientCertificateTypeList;
-              class X500PrincipalList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateRequest : public ::java::lang::Object
-{
-
-public:
-  CertificateRequest(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ClientCertificateTypeList * types();
-  virtual ::gnu::javax::net::ssl::provider::X500PrincipalList * authorities();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateRequest__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateRequestBuilder.h b/libjava/gnu/javax/net/ssl/provider/CertificateRequestBuilder.h
deleted file mode 100644
index 3be6cea..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateRequestBuilder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateRequestBuilder__
-#define __gnu_javax_net_ssl_provider_CertificateRequestBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/CertificateRequest.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequestBuilder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateRequestBuilder : public ::gnu::javax::net::ssl::provider::CertificateRequest
-{
-
-public:
-  CertificateRequestBuilder();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setTypes(::java::util::List *);
-  virtual void setAuthorities(::java::util::List *);
-  virtual void ensureCapacity(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateRequestBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h b/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h
deleted file mode 100644
index b19a13f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateStatusRequest$ResponderIdIterator__
-#define __gnu_javax_net_ssl_provider_CertificateStatusRequest$ResponderIdIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateStatusRequest;
-              class CertificateStatusRequest$ResponderIdIterator;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateStatusRequest$ResponderIdIterator : public ::java::lang::Object
-{
-
-public:
-  CertificateStatusRequest$ResponderIdIterator(::gnu::javax::net::ssl::provider::CertificateStatusRequest *);
-  virtual JArray< jbyte > * CertificateStatusRequest$ResponderIdIterator$next();
-  virtual jboolean hasNext();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::CertificateStatusRequest * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateStatusRequest$ResponderIdIterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest.h b/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest.h
deleted file mode 100644
index 3d9ee96..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateStatusRequest__
-#define __gnu_javax_net_ssl_provider_CertificateStatusRequest__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateStatusRequest;
-              class CertificateStatusType;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateStatusRequest : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  CertificateStatusRequest(::java::nio::ByteBuffer *);
-  CertificateStatusRequest(::gnu::javax::net::ssl::provider::CertificateStatusType *, ::java::util::List *, JArray< jbyte > *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::gnu::javax::net::ssl::provider::CertificateStatusType * statusType();
-  virtual jint size();
-  virtual JArray< jbyte > * responderId(jint);
-  virtual JArray< jbyte > * requestExtensions();
-  virtual void setStatusType(::gnu::javax::net::ssl::provider::CertificateStatusType *);
-  virtual void setRequestIdListLength(jint);
-  virtual void putRequestId(jint, JArray< jbyte > *);
-  virtual void setRequestExtensions(jint, JArray< jbyte > *);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateStatusRequest__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateStatusType.h b/libjava/gnu/javax/net/ssl/provider/CertificateStatusType.h
deleted file mode 100644
index fedeebe..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateStatusType.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateStatusType__
-#define __gnu_javax_net_ssl_provider_CertificateStatusType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateStatusType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateStatusType : public ::java::lang::Enum
-{
-
-  CertificateStatusType(::java::lang::String *, jint, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateStatusType * > * values();
-  static ::gnu::javax::net::ssl::provider::CertificateStatusType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CertificateStatusType * OCSP;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-private:
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateStatusType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateStatusType__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateType.h b/libjava/gnu/javax/net/ssl/provider/CertificateType.h
deleted file mode 100644
index e7cc0f6..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateType.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateType__
-#define __gnu_javax_net_ssl_provider_CertificateType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateType : public ::java::lang::Enum
-{
-
-  CertificateType(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::CertificateType * forValue(jint);
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateType * > * values();
-  static ::gnu::javax::net::ssl::provider::CertificateType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CertificateType * X509;
-  static ::gnu::javax::net::ssl::provider::CertificateType * OPEN_PGP;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateType__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.h b/libjava/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.h
deleted file mode 100644
index ea65ea4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateURL$CertChainType__
-#define __gnu_javax_net_ssl_provider_CertificateURL$CertChainType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateURL$CertChainType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateURL$CertChainType : public ::java::lang::Enum
-{
-
-  CertificateURL$CertChainType(::java::lang::String *, jint, jint);
-public:
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * > * values();
-  static ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * INDIVIDUAL_CERTS;
-  static ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * PKIPATH;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateURL$CertChainType__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h
deleted file mode 100644
index 059ea01..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateURL$Iterator__
-#define __gnu_javax_net_ssl_provider_CertificateURL$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateURL;
-              class CertificateURL$Iterator;
-              class CertificateURL$URLAndOptionalHash;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateURL$Iterator : public ::java::lang::Object
-{
-
-public:
-  CertificateURL$Iterator(::gnu::javax::net::ssl::provider::CertificateURL *);
-  virtual ::gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash * CertificateURL$Iterator$next();
-  virtual jboolean hasNext();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::CertificateURL * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateURL$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.h b/libjava/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.h
deleted file mode 100644
index 4cc2a8e..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateURL$URLAndOptionalHash__
-#define __gnu_javax_net_ssl_provider_CertificateURL$URLAndOptionalHash__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateURL$URLAndOptionalHash;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash : public ::java::lang::Object
-{
-
-public:
-  CertificateURL$URLAndOptionalHash(::java::nio::ByteBuffer *);
-  CertificateURL$URLAndOptionalHash(::java::lang::String *);
-  CertificateURL$URLAndOptionalHash(::java::lang::String *, JArray< jbyte > *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::lang::String * url();
-  virtual jint urlLength();
-  virtual ::java::nio::ByteBuffer * urlBuffer();
-  virtual jboolean hashPresent();
-  virtual JArray< jbyte > * sha1Hash();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateURL$URLAndOptionalHash__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateURL.h b/libjava/gnu/javax/net/ssl/provider/CertificateURL.h
deleted file mode 100644
index d2eab48..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateURL.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateURL__
-#define __gnu_javax_net_ssl_provider_CertificateURL__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateURL;
-              class CertificateURL$CertChainType;
-              class CertificateURL$URLAndOptionalHash;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateURL : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  CertificateURL(::java::nio::ByteBuffer *);
-  CertificateURL(::gnu::javax::net::ssl::provider::CertificateURL$CertChainType *, ::java::util::List *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::gnu::javax::net::ssl::provider::CertificateURL$CertChainType * type();
-  virtual jint size();
-  virtual ::gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash * get(jint);
-  virtual void set(jint, ::gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash *);
-  virtual void setLength(jint);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual ::java::util::Iterator * iterator();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateURL__
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateVerify.h b/libjava/gnu/javax/net/ssl/provider/CertificateVerify.h
deleted file mode 100644
index e130b5c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateVerify.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateVerify__
-#define __gnu_javax_net_ssl_provider_CertificateVerify__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Signature.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateVerify;
-              class SignatureAlgorithm;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateVerify : public ::gnu::javax::net::ssl::provider::Signature
-{
-
-public:
-  CertificateVerify(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *);
-  CertificateVerify(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateVerify__
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherAlgorithm.h b/libjava/gnu/javax/net/ssl/provider/CipherAlgorithm.h
deleted file mode 100644
index 54395bd..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CipherAlgorithm.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CipherAlgorithm__
-#define __gnu_javax_net_ssl_provider_CipherAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherAlgorithm;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CipherAlgorithm : public ::java::lang::Enum
-{
-
-  CipherAlgorithm(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::CipherAlgorithm * > * values();
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * NULL;
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * RC4;
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * DES;
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * DESede;
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * CAST5;
-  static ::gnu::javax::net::ssl::provider::CipherAlgorithm * AES;
-private:
-  static JArray< ::gnu::javax::net::ssl::provider::CipherAlgorithm * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CipherAlgorithm__
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherSuite.h b/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
deleted file mode 100644
index a54ec5e..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CipherSuite__
-#define __gnu_javax_net_ssl_provider_CipherSuite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherAlgorithm;
-              class CipherSuite;
-              class KeyExchangeAlgorithm;
-              class MacAlgorithm;
-              class ProtocolVersion;
-              class SignatureAlgorithm;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class Mac;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CipherSuite : public ::java::lang::Object
-{
-
-  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *, jboolean);
-  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, jboolean, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *, jboolean);
-  CipherSuite(JArray< jbyte > *);
-public:
-  static ::gnu::javax::net::ssl::provider::CipherSuite * forName(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CipherSuite * forValue(jshort);
-  static ::java::util::List * availableSuiteNames();
-  ::gnu::javax::net::ssl::provider::CipherAlgorithm * cipherAlgorithm();
-  ::javax::crypto::Cipher * cipher();
-  ::gnu::javax::net::ssl::provider::MacAlgorithm * macAlgorithm();
-  ::javax::crypto::Mac * mac(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::gnu::javax::net::ssl::provider::SignatureAlgorithm * signatureAlgorithm();
-  ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * keyExchangeAlgorithm();
-  jboolean isEphemeralDH();
-  jint length();
-  void write(::java::io::OutputStream *);
-  void put(::java::nio::ByteBuffer *);
-  ::gnu::javax::net::ssl::provider::CipherSuite * resolve();
-  jboolean isResolved();
-  jint keyLength();
-  jboolean isExportable();
-  jboolean isStreamCipher();
-  JArray< jbyte > * id();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString(::java::lang::String *);
-  ::java::lang::String * toString();
-  jboolean isCBCMode();
-private:
-  static ::java::util::List * tlsSuiteNames;
-  static ::java::util::HashMap * namesToSuites;
-public:
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_NULL_WITH_NULL_NULL;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_NULL_MD5;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_NULL_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_EXPORT_WITH_RC4_40_MD5;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_RC4_128_MD5;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_RC4_128_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_EXPORT_WITH_DES40_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_DES_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_DSS_WITH_DES_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_RSA_WITH_DES_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_DSS_WITH_DES_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_RSA_WITH_DES_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_DSS_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_RSA_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_DSS_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_DSS_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DH_RSA_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_PSK_WITH_RC4_128_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_PSK_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_PSK_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_PSK_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_PSK_WITH_RC4_128_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_PSK_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_DHE_PSK_WITH_AES_256_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_PSK_WITH_RC4_128_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_PSK_WITH_AES_128_CBC_SHA;
-  static ::gnu::javax::net::ssl::provider::CipherSuite * TLS_RSA_PSK_WITH_AES_256_CBC_SHA;
-private:
-  ::gnu::javax::net::ssl::provider::CipherAlgorithm * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipherAlgorithm__;
-  ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * keyExchangeAlgorithm__;
-  ::gnu::javax::net::ssl::provider::SignatureAlgorithm * signatureAlgorithm__;
-  ::gnu::javax::net::ssl::provider::MacAlgorithm * macAlgorithm__;
-  jboolean ephemeralDH;
-  jboolean exportable;
-  jboolean isStream;
-  jboolean isCBCMode__;
-  jint keyLength__;
-  JArray< jbyte > * id__;
-  ::java::lang::String * name;
-  jboolean isResolved__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CipherSuite__
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h
deleted file mode 100644
index 2cf1f2f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CipherSuiteList$Iterator__
-#define __gnu_javax_net_ssl_provider_CipherSuiteList$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class CipherSuiteList;
-              class CipherSuiteList$Iterator;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CipherSuiteList$Iterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CipherSuiteList$Iterator(::gnu::javax::net::ssl::provider::CipherSuiteList *);
-public:
-  virtual void CipherSuiteList$Iterator$add(::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * CipherSuiteList$Iterator$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * CipherSuiteList$Iterator$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void CipherSuiteList$Iterator$set(::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * previous();
-  virtual void add(::java::lang::Object *);
-  virtual void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modCount;
-  jint index;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::CipherSuiteList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CipherSuiteList$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList.h b/libjava/gnu/javax/net/ssl/provider/CipherSuiteList.h
deleted file mode 100644
index 3262080..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CipherSuiteList__
-#define __gnu_javax_net_ssl_provider_CipherSuiteList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class CipherSuiteList;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CipherSuiteList : public ::java::lang::Object
-{
-
-public:
-  CipherSuiteList(::java::nio::ByteBuffer *);
-  CipherSuiteList(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  jint size();
-  ::gnu::javax::net::ssl::provider::CipherSuite * get(jint);
-  void put(jint, ::gnu::javax::net::ssl::provider::CipherSuite *);
-  void setSize(jint);
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static jint access$0(::gnu::javax::net::ssl::provider::CipherSuiteList *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-  jint modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CipherSuiteList__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h
deleted file mode 100644
index 7d9d7ad..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientCertificateTypeList$Iterator__
-#define __gnu_javax_net_ssl_provider_ClientCertificateTypeList$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequest$ClientCertificateType;
-              class ClientCertificateTypeList;
-              class ClientCertificateTypeList$Iterator;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientCertificateTypeList$Iterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ClientCertificateTypeList$Iterator(::gnu::javax::net::ssl::provider::ClientCertificateTypeList *);
-public:
-  virtual void ClientCertificateTypeList$Iterator$add(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * ClientCertificateTypeList$Iterator$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * ClientCertificateTypeList$Iterator$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void ClientCertificateTypeList$Iterator$set(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * previous();
-  virtual void add(::java::lang::Object *);
-  virtual void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint modCount;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientCertificateTypeList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientCertificateTypeList$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList.h b/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList.h
deleted file mode 100644
index 975b227..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientCertificateTypeList__
-#define __gnu_javax_net_ssl_provider_ClientCertificateTypeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequest$ClientCertificateType;
-              class ClientCertificateTypeList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientCertificateTypeList : public ::java::lang::Object
-{
-
-public:
-  ClientCertificateTypeList(::java::nio::ByteBuffer *);
-  virtual jint size();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * get(jint);
-  virtual ::java::util::Iterator * iterator();
-  virtual void put(jint, ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
-  virtual void setSize(jint);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static jint access$0(::gnu::javax::net::ssl::provider::ClientCertificateTypeList *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientCertificateTypeList__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.h
deleted file mode 100644
index bd4fd88..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientDHE_PSKParameters__
-#define __gnu_javax_net_ssl_provider_ClientDHE_PSKParameters__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientDHE_PSKParameters;
-              class ClientDiffieHellmanPublic;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientDHE_PSKParameters : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  ClientDHE_PSKParameters(::java::nio::ByteBuffer *);
-  ClientDHE_PSKParameters(::java::lang::String *, ::gnu::javax::net::ssl::provider::ClientDiffieHellmanPublic *);
-  virtual ::java::nio::ByteBuffer * buffer();
-private:
-  jint identityLength();
-public:
-  virtual ::java::lang::String * identity();
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ClientDiffieHellmanPublic * params();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientDHE_PSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.h b/libjava/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.h
deleted file mode 100644
index 77bd040..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientDiffieHellmanPublic__
-#define __gnu_javax_net_ssl_provider_ClientDiffieHellmanPublic__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientDiffieHellmanPublic;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientDiffieHellmanPublic : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  ClientDiffieHellmanPublic(::java::nio::ByteBuffer *);
-  ClientDiffieHellmanPublic(::java::math::BigInteger *);
-private:
-  static ::java::nio::ByteBuffer * wrap(::java::math::BigInteger *);
-public:
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::math::BigInteger * publicValue();
-  virtual void setPublicValue(::java::math::BigInteger *);
-  virtual jint length();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientDiffieHellmanPublic__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.h
deleted file mode 100644
index dc42fab..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$CertLoader__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$CertLoader__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake;
-              class ClientHandshake$CertLoader;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$CertLoader : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ClientHandshake$CertLoader(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::util::List *, ::java::util::List *);
-public:
-  virtual void implRun();
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) keyTypes;
-  ::java::util::List * issuers;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$CertLoader__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.h
deleted file mode 100644
index 8f33e96..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$ClientDHGen__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$ClientDHGen__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake;
-              class ClientHandshake$ClientDHGen;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$ClientDHGen : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ClientHandshake$ClientDHGen(::gnu::javax::net::ssl::provider::ClientHandshake *, ::javax::crypto::interfaces::DHPublicKey *, ::javax::crypto::spec::DHParameterSpec *, jboolean);
-public:
-  virtual void implRun();
-public: // actually package-private
-  virtual ::javax::crypto::interfaces::DHPublicKey * serverKey();
-private:
-  ::javax::crypto::interfaces::DHPublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) serverKey__;
-  ::javax::crypto::spec::DHParameterSpec * params;
-  jboolean full;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$ClientDHGen__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.h
deleted file mode 100644
index 4c4e8f1..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$GenCertVerify__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$GenCertVerify__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake;
-              class ClientHandshake$GenCertVerify;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class MessageDigest;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$GenCertVerify : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ClientHandshake$GenCertVerify(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::security::MessageDigest *, ::java::security::MessageDigest *);
-public:
-  virtual void implRun();
-public: // actually package-private
-  virtual JArray< jbyte > * signed$();
-private:
-  ::java::security::MessageDigest * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) md5;
-  ::java::security::MessageDigest * sha;
-  JArray< jbyte > * signed$__;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$GenCertVerify__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.h
deleted file mode 100644
index d1830a0..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$ParamsVerifier__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$ParamsVerifier__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake;
-              class ClientHandshake$ParamsVerifier;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$ParamsVerifier : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ClientHandshake$ParamsVerifier(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::nio::ByteBuffer *, JArray< jbyte > *);
-public:
-  virtual void implRun();
-public: // actually package-private
-  virtual jboolean verified();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) paramsBuffer;
-  JArray< jbyte > * signature;
-  jboolean verified__;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$ParamsVerifier__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.h
deleted file mode 100644
index 02cde17..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$RSAGen__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$RSAGen__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake;
-              class ClientHandshake$RSAGen;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$RSAGen : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ClientHandshake$RSAGen(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  ClientHandshake$RSAGen(::gnu::javax::net::ssl::provider::ClientHandshake *, jboolean);
-public:
-  virtual void implRun();
-public: // actually package-private
-  virtual JArray< jbyte > * encryptedSecret();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) encryptedPreMasterSecret;
-  jboolean full;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ClientHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$RSAGen__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$State.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake$State.h
deleted file mode 100644
index 26e9346..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake$State.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake$State__
-#define __gnu_javax_net_ssl_provider_ClientHandshake$State__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHandshake$State;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake$State : public ::java::lang::Enum
-{
-
-  ClientHandshake$State(::java::lang::String *, jint, jboolean, jboolean);
-public: // actually package-private
-  jboolean isReadState();
-  jboolean isWriteState();
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::ClientHandshake$State * > * values();
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * WRITE_CLIENT_HELLO;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_SERVER_HELLO;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_SERVER_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_CERTIFICATE_REQUEST;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_SERVER_HELLO_DONE;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * WRITE_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * WRITE_CLIENT_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * WRITE_CERTIFICATE_VERIFY;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * WRITE_FINISHED;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * READ_FINISHED;
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$State * DONE;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Enum)))) isWriteState__;
-  jboolean isReadState__;
-  static JArray< ::gnu::javax::net::ssl::provider::ClientHandshake$State * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake$State__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHandshake.h b/libjava/gnu/javax/net/ssl/provider/ClientHandshake.h
deleted file mode 100644
index ad331b8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHandshake.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHandshake__
-#define __gnu_javax_net_ssl_provider_ClientHandshake__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/AbstractHandshake.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake$CertVerifier;
-              class ClientHandshake;
-              class ClientHandshake$CertLoader;
-              class ClientHandshake$GenCertVerify;
-              class ClientHandshake$ParamsVerifier;
-              class ClientHandshake$State;
-              class DelegatedTask;
-              class MaxFragmentLength;
-              class ProtocolVersion;
-              class SSLEngineImpl;
-              class SessionImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class PrivateKey;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$HandshakeStatus;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHandshake : public ::gnu::javax::net::ssl::provider::AbstractHandshake
-{
-
-public:
-  ClientHandshake(::gnu::javax::net::ssl::provider::SSLEngineImpl *);
-public: // actually protected
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleInput();
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleOutput(::java::nio::ByteBuffer *);
-public: // actually package-private
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * status();
-  virtual void checkKeyExchange();
-  virtual void handleV2Hello(::java::nio::ByteBuffer *);
-private:
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * chooseVersion();
-  ::java::util::List * getSuites();
-  ::java::util::List * getCompressionMethods();
-  jboolean enableExtensions();
-  ::gnu::javax::net::ssl::provider::MaxFragmentLength * maxFragmentLength();
-  jboolean truncatedHMac();
-  ::java::lang::String * getPSKIdentity();
-public: // actually package-private
-  static ::gnu::javax::net::ssl::provider::ClientHandshake$ParamsVerifier * access$0(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static void access$1(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::security::KeyPair *);
-  static ::java::security::KeyPair * access$2(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static void access$3(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::lang::String *);
-  static ::java::lang::String * access$4(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static void access$5(::gnu::javax::net::ssl::provider::ClientHandshake *, ::java::security::PrivateKey *);
-  static ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * access$6(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * access$7(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static ::java::security::PrivateKey * access$8(::gnu::javax::net::ssl::provider::ClientHandshake *);
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type();
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$ClientHandshake$State();
-private:
-  ::gnu::javax::net::ssl::provider::ClientHandshake$State * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::AbstractHandshake)))) state;
-  ::java::nio::ByteBuffer * outBuffer;
-  jboolean continuedSession;
-  ::gnu::javax::net::ssl::provider::SessionImpl * continued;
-  ::java::security::KeyPair * dhPair;
-  ::java::lang::String * keyAlias;
-  ::java::security::PrivateKey * privateKey;
-  ::gnu::javax::net::ssl::provider::MaxFragmentLength * maxFragmentLengthSent;
-  jboolean truncatedHMacSent;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * sentVersion;
-  ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * certVerifier;
-  ::gnu::javax::net::ssl::provider::ClientHandshake$ParamsVerifier * paramsVerifier;
-  ::gnu::javax::net::ssl::provider::DelegatedTask * keyExchange;
-  ::gnu::javax::net::ssl::provider::ClientHandshake$CertLoader * certLoader;
-  ::gnu::javax::net::ssl::provider::ClientHandshake$GenCertVerify * genCertVerify;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type__;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$ClientHandshake$State__;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHandshake__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHello.h b/libjava/gnu/javax/net/ssl/provider/ClientHello.h
deleted file mode 100644
index a13e8826..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHello.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHello__
-#define __gnu_javax_net_ssl_provider_ClientHello__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuiteList;
-              class ClientHello;
-              class CompressionMethodList;
-              class ExtensionList;
-              class ProtocolVersion;
-              class Random;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHello : public ::java::lang::Object
-{
-
-public:
-  ClientHello(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * version();
-  virtual ::gnu::javax::net::ssl::provider::Random * random();
-  virtual JArray< jbyte > * sessionId();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuiteList * cipherSuites();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethodList * compressionMethods();
-  virtual jboolean hasExtensions();
-  virtual ::gnu::javax::net::ssl::provider::ExtensionList * extensions();
-  virtual jint extensionsLength();
-public: // actually protected
-  virtual jint getCipherSuitesOffset();
-  virtual jint getCompressionMethodsOffset();
-  virtual jint getExtensionsOffset();
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  static const jint RANDOM_OFFSET = 2;
-  static const jint SESSID_OFFSET = 34;
-  static const jint SESSID_OFFSET2 = 35;
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jboolean disableExtensions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHello__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHelloBuilder.h b/libjava/gnu/javax/net/ssl/provider/ClientHelloBuilder.h
deleted file mode 100644
index cfc33f1..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHelloBuilder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHelloBuilder__
-#define __gnu_javax_net_ssl_provider_ClientHelloBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ClientHello.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHelloBuilder;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHelloBuilder : public ::gnu::javax::net::ssl::provider::ClientHello
-{
-
-public:
-  ClientHelloBuilder();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual void setSessionId(JArray< jbyte > *);
-  virtual void setSessionId(JArray< jbyte > *, jint, jint);
-  virtual void setCipherSuites(::java::util::List *);
-  virtual void setCompressionMethods(::java::util::List *);
-  virtual void setExtensionsLength(jint);
-  virtual void setExtensions(::java::nio::ByteBuffer *);
-  virtual void setDisableExtensions(jboolean);
-  virtual void ensureCapacity(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHelloBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientHelloV2.h b/libjava/gnu/javax/net/ssl/provider/ClientHelloV2.h
deleted file mode 100644
index 75831ab..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientHelloV2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientHelloV2__
-#define __gnu_javax_net_ssl_provider_ClientHelloV2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientHelloV2;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientHelloV2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ClientHelloV2(::java::nio::ByteBuffer *);
-public:
-  virtual jint length();
-public: // actually package-private
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * version();
-  virtual jint cipherSpecsLength();
-  virtual jint sessionIdLength();
-  virtual jint challengeLength();
-public:
-  virtual ::java::util::List * cipherSpecs();
-public: // actually package-private
-  virtual JArray< jbyte > * sessionId();
-  virtual JArray< jbyte > * challenge();
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientHelloV2__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientKeyExchange.h b/libjava/gnu/javax/net/ssl/provider/ClientKeyExchange.h
deleted file mode 100644
index 1ab6b2e..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientKeyExchange.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientKeyExchange__
-#define __gnu_javax_net_ssl_provider_ClientKeyExchange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class ClientKeyExchange;
-              class ExchangeKeys;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientKeyExchange : public ::java::lang::Object
-{
-
-public:
-  ClientKeyExchange(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::CipherSuite *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual ::gnu::javax::net::ssl::provider::ExchangeKeys * exchangeKeys();
-  virtual jint length();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::CipherSuite * suite;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientKeyExchange__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.h b/libjava/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.h
deleted file mode 100644
index eb2b8f3..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientKeyExchangeBuilder__
-#define __gnu_javax_net_ssl_provider_ClientKeyExchangeBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ClientKeyExchange.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class ClientKeyExchangeBuilder;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientKeyExchangeBuilder : public ::gnu::javax::net::ssl::provider::ClientKeyExchange
-{
-
-public:
-  ClientKeyExchangeBuilder(::gnu::javax::net::ssl::provider::CipherSuite *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setExchangeKeys(::java::nio::ByteBuffer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientKeyExchangeBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientPSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ClientPSKParameters.h
deleted file mode 100644
index 5397432..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientPSKParameters.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientPSKParameters__
-#define __gnu_javax_net_ssl_provider_ClientPSKParameters__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientPSKParameters;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientPSKParameters : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  ClientPSKParameters(::java::nio::ByteBuffer *);
-  ClientPSKParameters(::java::lang::String *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint length();
-  virtual ::java::lang::String * identity();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientPSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.h
deleted file mode 100644
index 6531431..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ClientRSA_PSKParameters__
-#define __gnu_javax_net_ssl_provider_ClientRSA_PSKParameters__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ClientRSA_PSKParameters;
-              class EncryptedPreMasterSecret;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ClientRSA_PSKParameters : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  ClientRSA_PSKParameters(::java::nio::ByteBuffer *);
-  ClientRSA_PSKParameters(::java::lang::String *, ::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::lang::String * identity();
-private:
-  jint identityLength();
-public:
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::EncryptedPreMasterSecret * secret();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ClientRSA_PSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/CompressionMethod.h b/libjava/gnu/javax/net/ssl/provider/CompressionMethod.h
deleted file mode 100644
index c8a2c1e..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CompressionMethod.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CompressionMethod__
-#define __gnu_javax_net_ssl_provider_CompressionMethod__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CompressionMethod;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CompressionMethod : public ::java::lang::Enum
-{
-
-  CompressionMethod(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::CompressionMethod * getInstance(jint);
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::CompressionMethod * > * values();
-  static ::gnu::javax::net::ssl::provider::CompressionMethod * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::CompressionMethod * NULL;
-  static ::gnu::javax::net::ssl::provider::CompressionMethod * ZLIB;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::CompressionMethod * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CompressionMethod__
diff --git a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h
deleted file mode 100644
index 6eff62d..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CompressionMethodList$Iterator__
-#define __gnu_javax_net_ssl_provider_CompressionMethodList$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CompressionMethod;
-              class CompressionMethodList;
-              class CompressionMethodList$Iterator;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CompressionMethodList$Iterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CompressionMethodList$Iterator(::gnu::javax::net::ssl::provider::CompressionMethodList *);
-public:
-  virtual void CompressionMethodList$Iterator$add(::gnu::javax::net::ssl::provider::CompressionMethod *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * CompressionMethodList$Iterator$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * CompressionMethodList$Iterator$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void CompressionMethodList$Iterator$set(::gnu::javax::net::ssl::provider::CompressionMethod *);
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * previous();
-  virtual void add(::java::lang::Object *);
-  virtual void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint modCount;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::CompressionMethodList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CompressionMethodList$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList.h b/libjava/gnu/javax/net/ssl/provider/CompressionMethodList.h
deleted file mode 100644
index 5e1addb..0000000
--- a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CompressionMethodList__
-#define __gnu_javax_net_ssl_provider_CompressionMethodList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CompressionMethod;
-              class CompressionMethodList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CompressionMethodList : public ::java::lang::Object
-{
-
-public:
-  CompressionMethodList(::java::nio::ByteBuffer *);
-  jint size();
-  ::gnu::javax::net::ssl::provider::CompressionMethod * get(jint);
-  void put(jint, ::gnu::javax::net::ssl::provider::CompressionMethod *);
-  void setSize(jint);
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static jint access$0(::gnu::javax::net::ssl::provider::CompressionMethodList *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CompressionMethodList__
diff --git a/libjava/gnu/javax/net/ssl/provider/Constructed.h b/libjava/gnu/javax/net/ssl/provider/Constructed.h
deleted file mode 100644
index d5b527f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Constructed.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Constructed__
-#define __gnu_javax_net_ssl_provider_Constructed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Constructed;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Constructed : public ::java::lang::Object
-{
-
-public:
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_Constructed__
diff --git a/libjava/gnu/javax/net/ssl/provider/ContentType.h b/libjava/gnu/javax/net/ssl/provider/ContentType.h
deleted file mode 100644
index 4f3067b..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ContentType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ContentType__
-#define __gnu_javax_net_ssl_provider_ContentType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ContentType : public ::java::lang::Enum
-{
-
-  ContentType(::java::lang::String *, jint, jint);
-public: // actually package-private
-  static ::gnu::javax::net::ssl::provider::ContentType * forInteger(jint);
-public:
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::ContentType * > * values();
-  static ::gnu::javax::net::ssl::provider::ContentType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::ContentType * CLIENT_HELLO_V2;
-  static ::gnu::javax::net::ssl::provider::ContentType * CHANGE_CIPHER_SPEC;
-  static ::gnu::javax::net::ssl::provider::ContentType * ALERT;
-  static ::gnu::javax::net::ssl::provider::ContentType * HANDSHAKE;
-  static ::gnu::javax::net::ssl::provider::ContentType * APPLICATION_DATA;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::ContentType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ContentType__
diff --git a/libjava/gnu/javax/net/ssl/provider/Debug.h b/libjava/gnu/javax/net/ssl/provider/Debug.h
deleted file mode 100644
index 6421a67..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Debug.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Debug__
-#define __gnu_javax_net_ssl_provider_Debug__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Debug;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Debug : public ::java::lang::Object
-{
-
-public:
-  Debug();
-  static const jboolean DEBUG = 1;
-  static const jboolean DEBUG_KEY_EXCHANGE = 1;
-  static const jboolean DEBUG_DECRYPTION = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Debug__
diff --git a/libjava/gnu/javax/net/ssl/provider/DelegatedTask.h b/libjava/gnu/javax/net/ssl/provider/DelegatedTask.h
deleted file mode 100644
index 72debfc..0000000
--- a/libjava/gnu/javax/net/ssl/provider/DelegatedTask.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_DelegatedTask__
-#define __gnu_javax_net_ssl_provider_DelegatedTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class DelegatedTask;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::DelegatedTask : public ::java::lang::Object
-{
-
-public: // actually protected
-  DelegatedTask();
-public:
-  virtual void run();
-  virtual jboolean hasRun();
-  virtual ::java::lang::Throwable * thrown();
-public: // actually protected
-  virtual void implRun() = 0;
-private:
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasRun__;
-public: // actually protected
-  ::java::lang::Throwable * thrown__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_DelegatedTask__
diff --git a/libjava/gnu/javax/net/ssl/provider/DiffieHellman.h b/libjava/gnu/javax/net/ssl/provider/DiffieHellman.h
deleted file mode 100644
index 6f85801..0000000
--- a/libjava/gnu/javax/net/ssl/provider/DiffieHellman.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_DiffieHellman__
-#define __gnu_javax_net_ssl_provider_DiffieHellman__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace key
-        {
-          namespace dh
-          {
-              class GnuDHPrivateKey;
-          }
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class DiffieHellman;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::DiffieHellman : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DiffieHellman();
-  static ::gnu::javax::crypto::key::dh::GnuDHPrivateKey * getParams();
-  static ::java::math::BigInteger * DH_G;
-  static ::java::math::BigInteger * GROUP_1;
-  static ::java::math::BigInteger * GROUP_2;
-  static ::java::math::BigInteger * GROUP_5;
-  static ::java::math::BigInteger * GROUP_14;
-  static ::java::math::BigInteger * GROUP_15;
-  static ::java::math::BigInteger * GROUP_16;
-  static ::java::math::BigInteger * GROUP_17;
-  static ::java::math::BigInteger * GROUP_18;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_DiffieHellman__
diff --git a/libjava/gnu/javax/net/ssl/provider/EmptyExchangeKeys.h b/libjava/gnu/javax/net/ssl/provider/EmptyExchangeKeys.h
deleted file mode 100644
index 5459775..0000000
--- a/libjava/gnu/javax/net/ssl/provider/EmptyExchangeKeys.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_EmptyExchangeKeys__
-#define __gnu_javax_net_ssl_provider_EmptyExchangeKeys__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class EmptyExchangeKeys;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::EmptyExchangeKeys : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  EmptyExchangeKeys();
-  virtual jint length();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_EmptyExchangeKeys__
diff --git a/libjava/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.h b/libjava/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.h
deleted file mode 100644
index ae93821..0000000
--- a/libjava/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_EncryptedPreMasterSecret__
-#define __gnu_javax_net_ssl_provider_EncryptedPreMasterSecret__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ExchangeKeys.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class EncryptedPreMasterSecret;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::EncryptedPreMasterSecret : public ::gnu::javax::net::ssl::provider::ExchangeKeys
-{
-
-public:
-  EncryptedPreMasterSecret(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  EncryptedPreMasterSecret(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::java::nio::ByteBuffer * buffer();
-  JArray< jbyte > * encryptedSecret();
-  void setEncryptedSecret(JArray< jbyte > *, jint, jint);
-  jint length();
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::ExchangeKeys)))) version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_EncryptedPreMasterSecret__
diff --git a/libjava/gnu/javax/net/ssl/provider/ExchangeKeys.h b/libjava/gnu/javax/net/ssl/provider/ExchangeKeys.h
deleted file mode 100644
index 8d3bbb8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ExchangeKeys.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ExchangeKeys__
-#define __gnu_javax_net_ssl_provider_ExchangeKeys__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ExchangeKeys;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ExchangeKeys : public ::java::lang::Object
-{
-
-public:
-  ExchangeKeys(::java::nio::ByteBuffer *);
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ExchangeKeys__
diff --git a/libjava/gnu/javax/net/ssl/provider/Extension$Type.h b/libjava/gnu/javax/net/ssl/provider/Extension$Type.h
deleted file mode 100644
index dfefe3f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Extension$Type.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Extension$Type__
-#define __gnu_javax_net_ssl_provider_Extension$Type__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Extension$Type;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Extension$Type : public ::java::lang::Enum
-{
-
-  Extension$Type(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::Extension$Type * forValue(jint);
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::Extension$Type * > * values();
-  static ::gnu::javax::net::ssl::provider::Extension$Type * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::Extension$Type * SERVER_NAME;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * MAX_FRAGMENT_LENGTH;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * CLIENT_CERTIFICATE_URL;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * TRUSTED_CA_KEYS;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * TRUNCATED_HMAC;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * STATUS_REQUEST;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * SRP;
-  static ::gnu::javax::net::ssl::provider::Extension$Type * CERT_TYPE;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::Extension$Type * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Extension$Type__
diff --git a/libjava/gnu/javax/net/ssl/provider/Extension$Value.h b/libjava/gnu/javax/net/ssl/provider/Extension$Value.h
deleted file mode 100644
index f00248a..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Extension$Value.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Extension$Value__
-#define __gnu_javax_net_ssl_provider_Extension$Value__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Extension$Value;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Extension$Value : public ::java::lang::Object
-{
-
-public:
-  Extension$Value();
-  virtual ::java::nio::ByteBuffer * buffer() = 0;
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Extension$Value__
diff --git a/libjava/gnu/javax/net/ssl/provider/Extension.h b/libjava/gnu/javax/net/ssl/provider/Extension.h
deleted file mode 100644
index 5407542..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Extension.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Extension__
-#define __gnu_javax_net_ssl_provider_Extension__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Extension;
-              class Extension$Type;
-              class Extension$Value;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Extension : public ::java::lang::Object
-{
-
-public:
-  Extension(::java::nio::ByteBuffer *);
-  Extension(::gnu::javax::net::ssl::provider::Extension$Type *, ::gnu::javax::net::ssl::provider::Extension$Value *);
-  jint length();
-  ::java::nio::ByteBuffer * buffer();
-  ::gnu::javax::net::ssl::provider::Extension$Type * type();
-  JArray< jbyte > * valueBytes();
-  ::java::nio::ByteBuffer * valueBuffer();
-  ::gnu::javax::net::ssl::provider::Extension$Value * value();
-  void setLength(jint);
-  void setType(::gnu::javax::net::ssl::provider::Extension$Type *);
-  void setValue(JArray< jbyte > *);
-  void setValue(JArray< jbyte > *, jint, jint);
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Extension__
diff --git a/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h b/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h
deleted file mode 100644
index d658578..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ExtensionList$ExtensionsIterator__
-#define __gnu_javax_net_ssl_provider_ExtensionList$ExtensionsIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Extension;
-              class ExtensionList;
-              class ExtensionList$ExtensionsIterator;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ExtensionList$ExtensionsIterator : public ::java::lang::Object
-{
-
-public:
-  ExtensionList$ExtensionsIterator(::gnu::javax::net::ssl::provider::ExtensionList *);
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::gnu::javax::net::ssl::provider::Extension * ExtensionList$ExtensionsIterator$next();
-  ::gnu::javax::net::ssl::provider::Extension * ExtensionList$ExtensionsIterator$previous();
-  jint nextIndex();
-  jint previousIndex();
-  void ExtensionList$ExtensionsIterator$add(::gnu::javax::net::ssl::provider::Extension *);
-  void remove();
-  void ExtensionList$ExtensionsIterator$set(::gnu::javax::net::ssl::provider::Extension *);
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  void add(::java::lang::Object *);
-  void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modCount;
-  jint index;
-  jint size;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ExtensionList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ExtensionList$ExtensionsIterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/ExtensionList.h b/libjava/gnu/javax/net/ssl/provider/ExtensionList.h
deleted file mode 100644
index c4235f3..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ExtensionList.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ExtensionList__
-#define __gnu_javax_net_ssl_provider_ExtensionList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Extension;
-              class Extension$Type;
-              class ExtensionList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ExtensionList : public ::java::lang::Object
-{
-
-public:
-  ExtensionList(::java::nio::ByteBuffer *);
-  ExtensionList(::java::util::List *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::gnu::javax::net::ssl::provider::Extension * get(jint);
-  virtual jint size();
-  virtual jint length();
-  virtual void set(jint, ::gnu::javax::net::ssl::provider::Extension *);
-  virtual void set(jint, ::gnu::javax::net::ssl::provider::Extension$Type *, jint);
-  virtual void setLength(jint);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually package-private
-  static jint access$0(::gnu::javax::net::ssl::provider::ExtensionList *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-  jint modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ExtensionList__
diff --git a/libjava/gnu/javax/net/ssl/provider/Finished.h b/libjava/gnu/javax/net/ssl/provider/Finished.h
deleted file mode 100644
index 37e01c4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Finished.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Finished__
-#define __gnu_javax_net_ssl_provider_Finished__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Finished;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Finished : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Finished(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-public:
-  jint length();
-public: // actually package-private
-  JArray< jbyte > * verifyData();
-  JArray< jbyte > * md5Hash();
-  JArray< jbyte > * shaHash();
-  void setVerifyData(JArray< jbyte > *, jint);
-  void setMD5Hash(JArray< jbyte > *, jint);
-  void setShaHash(JArray< jbyte > *, jint);
-public:
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Finished__
diff --git a/libjava/gnu/javax/net/ssl/provider/Handshake$Body.h b/libjava/gnu/javax/net/ssl/provider/Handshake$Body.h
deleted file mode 100644
index 8fe4e85..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Handshake$Body.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Handshake$Body__
-#define __gnu_javax_net_ssl_provider_Handshake$Body__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Handshake$Body;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Handshake$Body : public ::java::lang::Object
-{
-
-public:
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_Handshake$Body__
diff --git a/libjava/gnu/javax/net/ssl/provider/Handshake$Type.h b/libjava/gnu/javax/net/ssl/provider/Handshake$Type.h
deleted file mode 100644
index 1296e24..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Handshake$Type.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Handshake$Type__
-#define __gnu_javax_net_ssl_provider_Handshake$Type__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Handshake$Type;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Handshake$Type : public ::java::lang::Enum
-{
-
-  Handshake$Type(::java::lang::String *, jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * forInteger(jint);
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::Handshake$Type * > * values();
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * HELLO_REQUEST;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CLIENT_HELLO;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * SERVER_HELLO;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * SERVER_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CERTIFICATE_REQUEST;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * SERVER_HELLO_DONE;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CERTIFICATE_VERIFY;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CLIENT_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * FINISHED;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CERTIFICATE_URL;
-  static ::gnu::javax::net::ssl::provider::Handshake$Type * CERTIFICATE_STATUS;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::Handshake$Type * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Handshake$Type__
diff --git a/libjava/gnu/javax/net/ssl/provider/Handshake.h b/libjava/gnu/javax/net/ssl/provider/Handshake.h
deleted file mode 100644
index 498e377..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Handshake.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Handshake__
-#define __gnu_javax_net_ssl_provider_Handshake__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class Handshake;
-              class Handshake$Body;
-              class Handshake$Type;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Handshake : public ::java::lang::Object
-{
-
-public:
-  Handshake(::java::nio::ByteBuffer *);
-  Handshake(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::CipherSuite *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::gnu::javax::net::ssl::provider::Handshake$Type * type();
-  jint length();
-  ::gnu::javax::net::ssl::provider::Handshake$Body * body();
-  ::java::nio::ByteBuffer * bodyBuffer();
-  void setType(::gnu::javax::net::ssl::provider::Handshake$Type *);
-  void setLength(jint);
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Handshake$Type();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::CipherSuite * suite;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Handshake$Type__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Handshake__
diff --git a/libjava/gnu/javax/net/ssl/provider/HelloRequest.h b/libjava/gnu/javax/net/ssl/provider/HelloRequest.h
deleted file mode 100644
index 32ff951..0000000
--- a/libjava/gnu/javax/net/ssl/provider/HelloRequest.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_HelloRequest__
-#define __gnu_javax_net_ssl_provider_HelloRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class HelloRequest;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::HelloRequest : public ::java::lang::Object
-{
-
-public:
-  HelloRequest();
-  ::java::lang::String * toString(::java::lang::String *);
-  jint length();
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_HelloRequest__
diff --git a/libjava/gnu/javax/net/ssl/provider/InputSecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/InputSecurityParameters.h
deleted file mode 100644
index 2881a0f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/InputSecurityParameters.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_InputSecurityParameters__
-#define __gnu_javax_net_ssl_provider_InputSecurityParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class ByteBufferOutputStream;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class InputSecurityParameters;
-              class Record;
-              class SessionImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class Mac;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::InputSecurityParameters : public ::java::lang::Object
-{
-
-public:
-  InputSecurityParameters(::javax::crypto::Cipher *, ::javax::crypto::Mac *, ::java::util::zip::Inflater *, ::gnu::javax::net::ssl::provider::SessionImpl *, ::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual jint decrypt(::gnu::javax::net::ssl::provider::Record *, JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  virtual jint decrypt(::gnu::javax::net::ssl::provider::Record *, ::gnu::java::security::util::ByteBufferOutputStream *);
-private:
-  jint decrypt(::gnu::javax::net::ssl::provider::Record *, JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::gnu::java::security::util::ByteBufferOutputStream *);
-public: // actually package-private
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * cipherSuite();
-private:
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipher;
-  ::javax::crypto::Mac * mac;
-  ::java::util::zip::Inflater * inflater;
-  ::gnu::javax::net::ssl::provider::SessionImpl * session;
-  ::gnu::javax::net::ssl::provider::CipherSuite * suite;
-  jlong sequence;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_InputSecurityParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/Jessie$1.h b/libjava/gnu/javax/net/ssl/provider/Jessie$1.h
deleted file mode 100644
index b42a627..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Jessie$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Jessie$1__
-#define __gnu_javax_net_ssl_provider_Jessie$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Jessie;
-              class Jessie$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Jessie$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Jessie$1(::gnu::javax::net::ssl::provider::Jessie *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::Jessie * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Jessie$1__
diff --git a/libjava/gnu/javax/net/ssl/provider/Jessie.h b/libjava/gnu/javax/net/ssl/provider/Jessie.h
deleted file mode 100644
index 3f0cf9c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Jessie.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Jessie__
-#define __gnu_javax_net_ssl_provider_Jessie__
-
-#pragma interface
-
-#include <java/security/Provider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Jessie;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Jessie : public ::java::security::Provider
-{
-
-public:
-  Jessie();
-private:
-  static const jlong serialVersionUID = -1LL;
-public:
-  static ::java::lang::String * VERSION;
-  static jdouble VERSION_DOUBLE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Jessie__
diff --git a/libjava/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.h b/libjava/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.h
deleted file mode 100644
index 60dec2a..0000000
--- a/libjava/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_KeyExchangeAlgorithm__
-#define __gnu_javax_net_ssl_provider_KeyExchangeAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::KeyExchangeAlgorithm : public ::java::lang::Enum
-{
-
-  KeyExchangeAlgorithm(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * > * values();
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * NONE;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * RSA;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DH_DSS;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DH_RSA;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DH_anon;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DHE_DSS;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DHE_RSA;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * PSK;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * DHE_PSK;
-  static ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * RSA_PSK;
-private:
-  static JArray< ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_KeyExchangeAlgorithm__
diff --git a/libjava/gnu/javax/net/ssl/provider/MacAlgorithm.h b/libjava/gnu/javax/net/ssl/provider/MacAlgorithm.h
deleted file mode 100644
index 7926121..0000000
--- a/libjava/gnu/javax/net/ssl/provider/MacAlgorithm.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_MacAlgorithm__
-#define __gnu_javax_net_ssl_provider_MacAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class MacAlgorithm;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::MacAlgorithm : public ::java::lang::Enum
-{
-
-  MacAlgorithm(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::MacAlgorithm * > * values();
-  static ::gnu::javax::net::ssl::provider::MacAlgorithm * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::MacAlgorithm * NULL;
-  static ::gnu::javax::net::ssl::provider::MacAlgorithm * MD5;
-  static ::gnu::javax::net::ssl::provider::MacAlgorithm * SHA;
-private:
-  static JArray< ::gnu::javax::net::ssl::provider::MacAlgorithm * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_MacAlgorithm__
diff --git a/libjava/gnu/javax/net/ssl/provider/MacException.h b/libjava/gnu/javax/net/ssl/provider/MacException.h
deleted file mode 100644
index b1707eed..0000000
--- a/libjava/gnu/javax/net/ssl/provider/MacException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_MacException__
-#define __gnu_javax_net_ssl_provider_MacException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class MacException;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::MacException : public ::java::io::IOException
-{
-
-public: // actually package-private
-  MacException();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_MacException__
diff --git a/libjava/gnu/javax/net/ssl/provider/MaxFragmentLength.h b/libjava/gnu/javax/net/ssl/provider/MaxFragmentLength.h
deleted file mode 100644
index 81c1aca..0000000
--- a/libjava/gnu/javax/net/ssl/provider/MaxFragmentLength.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_MaxFragmentLength__
-#define __gnu_javax_net_ssl_provider_MaxFragmentLength__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class MaxFragmentLength;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::MaxFragmentLength : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-  MaxFragmentLength(jint, jint);
-public:
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint length();
-  virtual jint getValue();
-  virtual jint maxLength();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::MaxFragmentLength * LEN_2_9;
-  static ::gnu::javax::net::ssl::provider::MaxFragmentLength * LEN_2_10;
-  static ::gnu::javax::net::ssl::provider::MaxFragmentLength * LEN_2_11;
-  static ::gnu::javax::net::ssl::provider::MaxFragmentLength * LEN_2_12;
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) value;
-  jint length__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_MaxFragmentLength__
diff --git a/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
deleted file mode 100644
index cd28544..0000000
--- a/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_OutputSecurityParameters__
-#define __gnu_javax_net_ssl_provider_OutputSecurityParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class ContentType;
-              class OutputSecurityParameters;
-              class SessionImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class Mac;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::OutputSecurityParameters : public ::java::lang::Object
-{
-
-public:
-  OutputSecurityParameters(::javax::crypto::Cipher *, ::javax::crypto::Mac *, ::java::util::zip::Deflater *, ::gnu::javax::net::ssl::provider::SessionImpl *, ::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual JArray< jint > * encrypt(JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *, ::java::nio::ByteBuffer *);
-public: // actually package-private
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * suite();
-  virtual jboolean needToSplitPayload();
-private:
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipher;
-  ::javax::crypto::Mac * mac;
-  ::java::util::zip::Deflater * deflater;
-  ::gnu::javax::net::ssl::provider::SessionImpl * session;
-  ::gnu::javax::net::ssl::provider::CipherSuite * suite__;
-  jlong sequence;
-public: // actually package-private
-  static jboolean enableCBCProtection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_OutputSecurityParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.h b/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.h
deleted file mode 100644
index 7c8ceac..0000000
--- a/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl$Manager__
-#define __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl$Manager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class PreSharedKeyManagerFactoryImpl;
-              class PreSharedKeyManagerFactoryImpl$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::PreSharedKeyManagerFactoryImpl$Manager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PreSharedKeyManagerFactoryImpl$Manager(::gnu::javax::net::ssl::provider::PreSharedKeyManagerFactoryImpl *);
-public:
-  virtual ::javax::crypto::SecretKey * getKey(::java::lang::String *);
-  virtual ::java::lang::String * chooseIdentityHint();
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::PreSharedKeyManagerFactoryImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl$Manager__
diff --git a/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.h
deleted file mode 100644
index 4e267db..0000000
--- a/libjava/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl__
-#define __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/KeyManagerFactorySpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class PreSharedKeyManagerParameters;
-          namespace provider
-          {
-              class PreSharedKeyManagerFactoryImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::PreSharedKeyManagerFactoryImpl : public ::javax::net::ssl::KeyManagerFactorySpi
-{
-
-public:
-  PreSharedKeyManagerFactoryImpl();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::KeyManager * > * engineGetKeyManagers();
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void engineInit(::java::security::KeyStore *, JArray< jchar > *);
-public: // actually package-private
-  ::gnu::javax::net::ssl::PreSharedKeyManagerParameters * __attribute__((aligned(__alignof__( ::javax::net::ssl::KeyManagerFactorySpi)))) params;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_PreSharedKeyManagerFactoryImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h b/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h
deleted file mode 100644
index 79230e2..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ProtocolVersion__
-#define __gnu_javax_net_ssl_provider_ProtocolVersion__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ProtocolVersion : public ::java::lang::Object
-{
-
-  ProtocolVersion(jint, jint);
-public:
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * read(::java::io::InputStream *);
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * forName(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * getInstance(jint, jint);
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * getInstance(jshort);
-  jint length();
-  JArray< jbyte > * getEncoded();
-  jint major();
-  jint minor();
-  jint rawValue();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jint ProtocolVersion$compareTo(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::java::lang::String * toString(::java::lang::String *);
-  ::java::lang::String * toString();
-  jint compareTo(::java::lang::Object *);
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * SSL_3;
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * TLS_1;
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * TLS_1_1;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) major__;
-  jint minor__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ProtocolVersion__
diff --git a/libjava/gnu/javax/net/ssl/provider/Random.h b/libjava/gnu/javax/net/ssl/provider/Random.h
deleted file mode 100644
index 1553624..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Random.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Random__
-#define __gnu_javax_net_ssl_provider_Random__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Random;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Random : public ::java::lang::Object
-{
-
-public:
-  Random(::java::nio::ByteBuffer *);
-  virtual ::gnu::javax::net::ssl::provider::Random * copy();
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint gmtUnixTime();
-  virtual JArray< jbyte > * randomBytes();
-  virtual void setGmtUnixTime(jint);
-  virtual void setRandomBytes(JArray< jbyte > *);
-  virtual void setRandomBytes(JArray< jbyte > *, jint);
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint RANDOM_LENGTH = 28;
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Random__
diff --git a/libjava/gnu/javax/net/ssl/provider/Record.h b/libjava/gnu/javax/net/ssl/provider/Record.h
deleted file mode 100644
index 59f9041..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Record.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Record__
-#define __gnu_javax_net_ssl_provider_Record__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class ProtocolVersion;
-              class Record;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Record : public ::java::lang::Object
-{
-
-public:
-  Record(::java::nio::ByteBuffer *);
-  virtual ::gnu::javax::net::ssl::provider::ContentType * getContentType();
-  virtual ::gnu::javax::net::ssl::provider::ContentType * contentType();
-  virtual jint fragment(::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteBuffer * fragment();
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * version();
-  virtual void setContentType(::gnu::javax::net::ssl::provider::ContentType *);
-  virtual void setLength(jint);
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Record__
diff --git a/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.h b/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.h
deleted file mode 100644
index 9425426..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SRPTrustManagerFactory$Manager__
-#define __gnu_javax_net_ssl_provider_SRPTrustManagerFactory$Manager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace sasl
-        {
-          namespace srp
-          {
-              class PasswordFile;
-          }
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SRPTrustManagerFactory;
-              class SRPTrustManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SRPTrustManagerFactory$Manager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SRPTrustManagerFactory$Manager(::gnu::javax::net::ssl::provider::SRPTrustManagerFactory *, ::gnu::javax::crypto::sasl::srp::PasswordFile *);
-public:
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::java::security::KeyPair * getKeyPair(::java::lang::String *);
-  virtual JArray< jbyte > * getSalt(::java::lang::String *);
-  virtual ::java::math::BigInteger * getVerifier(::java::lang::String *);
-  virtual ::gnu::javax::crypto::sasl::srp::PasswordFile * getPasswordFile();
-private:
-  ::gnu::javax::crypto::sasl::srp::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) file;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SRPTrustManagerFactory * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SRPTrustManagerFactory$Manager__
diff --git a/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.h b/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.h
deleted file mode 100644
index a1f10fb..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SRPTrustManagerFactory__
-#define __gnu_javax_net_ssl_provider_SRPTrustManagerFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/TrustManagerFactorySpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SRPTrustManagerFactory;
-              class SRPTrustManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SRPTrustManagerFactory : public ::javax::net::ssl::TrustManagerFactorySpi
-{
-
-public:
-  SRPTrustManagerFactory();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::TrustManager * > * engineGetTrustManagers();
-  virtual void engineInit(::java::security::KeyStore *);
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *);
-private:
-  ::gnu::javax::net::ssl::provider::SRPTrustManagerFactory$Manager * __attribute__((aligned(__alignof__( ::javax::net::ssl::TrustManagerFactorySpi)))) current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SRPTrustManagerFactory__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLContextImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLContextImpl.h
deleted file mode 100644
index bdb7e80..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLContextImpl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLContextImpl__
-#define __gnu_javax_net_ssl_provider_SSLContextImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLContextSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class AbstractSessionContext;
-            class PreSharedKeyManager;
-            class SRPTrustManager;
-          namespace provider
-          {
-              class SSLContextImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLEngine;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-          class X509ExtendedKeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLContextImpl : public ::javax::net::ssl::SSLContextSpi
-{
-
-public:
-  SSLContextImpl();
-public: // actually protected
-  ::javax::net::ssl::SSLEngine * engineCreateSSLEngine();
-  ::javax::net::ssl::SSLEngine * engineCreateSSLEngine(::java::lang::String *, jint);
-  ::javax::net::ssl::SSLSessionContext * engineGetClientSessionContext();
-  ::javax::net::ssl::SSLSessionContext * engineGetServerSessionContext();
-  ::javax::net::ssl::SSLServerSocketFactory * engineGetServerSocketFactory();
-  ::javax::net::ssl::SSLSocketFactory * engineGetSocketFactory();
-  void engineInit(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *);
-private:
-  ::javax::net::ssl::X509ExtendedKeyManager * defaultKeyManager();
-  ::javax::net::ssl::X509TrustManager * defaultTrustManager();
-  ::java::security::SecureRandom * defaultRandom();
-public: // actually package-private
-  ::gnu::javax::net::ssl::AbstractSessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLContextSpi)))) serverContext;
-  ::gnu::javax::net::ssl::AbstractSessionContext * clientContext;
-  ::gnu::javax::net::ssl::PreSharedKeyManager * pskManager;
-  ::javax::net::ssl::X509ExtendedKeyManager * keyManager;
-  ::javax::net::ssl::X509TrustManager * trustManager;
-  ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager;
-  ::java::security::SecureRandom * random;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLContextImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.h b/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.h
deleted file mode 100644
index a2a8163..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLEngineImpl$Mode__
-#define __gnu_javax_net_ssl_provider_SSLEngineImpl$Mode__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLEngineImpl$Mode;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLEngineImpl$Mode : public ::java::lang::Enum
-{
-
-  SSLEngineImpl$Mode(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * > * values();
-  static ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * SERVER;
-  static ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * CLIENT;
-private:
-  static JArray< ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLEngineImpl$Mode__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl.h
deleted file mode 100644
index f62525cc..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLEngineImpl.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLEngineImpl__
-#define __gnu_javax_net_ssl_provider_SSLEngineImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLEngine.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SSLRecordHandler;
-          namespace provider
-          {
-              class AbstractHandshake;
-              class Alert;
-              class InputSecurityParameters;
-              class OutputSecurityParameters;
-              class SSLContextImpl;
-              class SSLEngineImpl;
-              class SSLEngineImpl$Mode;
-              class SessionImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult;
-          class SSLEngineResult$HandshakeStatus;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLEngineImpl : public ::javax::net::ssl::SSLEngine
-{
-
-public: // actually package-private
-  SSLEngineImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *, ::java::lang::String *, jint);
-  static JArray< ::java::lang::String * > * defaultSuites();
-public:
-  void beginHandshake();
-  void closeInbound();
-  void closeOutbound();
-  ::java::lang::Runnable * getDelegatedTask();
-  JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  JArray< ::java::lang::String * > * getEnabledProtocols();
-  jboolean getEnableSessionCreation();
-  ::javax::net::ssl::SSLEngineResult$HandshakeStatus * getHandshakeStatus();
-  jboolean getNeedClientAuth();
-  ::javax::net::ssl::SSLSession * getSession();
-  jboolean getUseClientMode();
-  jboolean getWantClientAuth();
-  jboolean isInboundDone();
-  jboolean isOutboundDone();
-  void setEnableSessionCreation(jboolean);
-  void setEnabledCipherSuites(JArray< ::java::lang::String * > *);
-  void setEnabledProtocols(JArray< ::java::lang::String * > *);
-  JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  JArray< ::java::lang::String * > * getSupportedProtocols();
-  void setNeedClientAuth(jboolean);
-  void setUseClientMode(jboolean);
-  void setWantClientAuth(jboolean);
-  ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, JArray< ::java::nio::ByteBuffer * > *, jint, jint);
-  ::javax::net::ssl::SSLEngineResult * wrap(JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::java::nio::ByteBuffer *);
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SessionImpl * session();
-  void setSession(::gnu::javax::net::ssl::provider::SessionImpl *);
-  void changeCipherSpec();
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$SSLEngineImpl$Mode();
-  ::gnu::javax::net::ssl::provider::SSLContextImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLEngine)))) contextImpl;
-private:
-  JArray< ::gnu::javax::net::ssl::SSLRecordHandler * > * handlers;
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  ::gnu::javax::net::ssl::provider::SessionImpl * session__;
-  ::gnu::javax::net::ssl::provider::InputSecurityParameters * insec;
-  ::gnu::javax::net::ssl::provider::OutputSecurityParameters * outsec;
-  jboolean inClosed;
-  jboolean outClosed;
-  jboolean createSessions;
-  jboolean needClientAuth;
-  jboolean wantClientAuth;
-  jboolean initialHandshakeDone;
-  ::gnu::javax::net::ssl::provider::AbstractHandshake * handshake;
-  ::gnu::javax::net::ssl::provider::Alert * lastAlert;
-  ::javax::net::ssl::SSLEngineResult$HandshakeStatus * handshakeStatus;
-  jboolean changeCipherSpec__;
-  JArray< ::java::lang::String * > * enabledSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  ::java::nio::ByteBuffer * alertBuffer;
-  ::gnu::javax::net::ssl::provider::SSLEngineImpl$Mode * mode;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$SSLEngineImpl$Mode__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLEngineImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLHMac.h b/libjava/gnu/javax/net/ssl/provider/SSLHMac.h
deleted file mode 100644
index 7e9ad36..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLHMac.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLHMac__
-#define __gnu_javax_net_ssl_provider_SSLHMac__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLHMac;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLHMac : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SSLHMac(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * name();
-  virtual jint macSize();
-  virtual void init(::java::util::Map *);
-  virtual void reset();
-  virtual JArray< jbyte > * digest();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual jboolean selfTest();
-public: // actually package-private
-  static const jbyte PAD1 = 54;
-  static const jbyte PAD2 = 92;
-public: // actually protected
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) md;
-  JArray< jbyte > * key;
-  JArray< jbyte > * pad1;
-  JArray< jbyte > * pad2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLHMac__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.h
deleted file mode 100644
index 26da5be..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLRSASignatureImpl__
-#define __gnu_javax_net_ssl_provider_SSLRSASignatureImpl__
-
-#pragma interface
-
-#include <java/security/SignatureSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLRSASignatureImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class MessageDigest;
-        class PrivateKey;
-        class PublicKey;
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-          class RSAPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLRSASignatureImpl : public ::java::security::SignatureSpi
-{
-
-public:
-  SSLRSASignatureImpl();
-public: // actually protected
-  virtual void engineInitVerify(::java::security::PublicKey *);
-  virtual void engineInitSign(::java::security::PrivateKey *);
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * engineSign();
-  virtual jboolean engineVerify(JArray< jbyte > *);
-  virtual void engineSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * engineGetParameter(::java::lang::String *);
-private:
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  ::java::security::interfaces::RSAPublicKey * __attribute__((aligned(__alignof__( ::java::security::SignatureSpi)))) pubkey;
-  ::java::security::interfaces::RSAPrivateKey * privkey;
-  ::java::security::MessageDigest * md5;
-  ::java::security::MessageDigest * sha;
-  jboolean initSign;
-  jboolean initVerify;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLRSASignatureImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLRandom.h b/libjava/gnu/javax/net/ssl/provider/SSLRandom.h
deleted file mode 100644
index 1a4abf1..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLRandom.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLRandom__
-#define __gnu_javax_net_ssl_provider_SSLRandom__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLRandom;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLRandom : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SSLRandom();
-public:
-  virtual void init(::java::util::Map *);
-  virtual ::java::lang::String * name();
-  virtual ::java::lang::Object * clone();
-  virtual jbyte nextByte();
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-  virtual jboolean selfTest();
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-private:
-  JArray< jbyte > * nextBlock();
-public: // actually package-private
-  static ::java::lang::String * SECRET;
-  static ::java::lang::String * SEED;
-private:
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) md5;
-  ::gnu::java::security::hash::IMessageDigest * sha;
-  JArray< jbyte > * secret;
-  JArray< jbyte > * buffer;
-  jbyte pad;
-  JArray< jbyte > * seed;
-  jint idx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLRandom__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h
deleted file mode 100644
index 411d009..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLServerSocketFactoryImpl__
-#define __gnu_javax_net_ssl_provider_SSLServerSocketFactoryImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLServerSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLContextImpl;
-              class SSLServerSocketFactoryImpl;
-              class SSLServerSocketImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLServerSocketFactoryImpl : public ::javax::net::ssl::SSLServerSocketFactory
-{
-
-public:
-  SSLServerSocketFactoryImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *);
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint, jint, ::java::net::InetAddress *);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-private:
-  ::gnu::javax::net::ssl::provider::SSLContextImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocketFactory)))) contextImpl;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLServerSocketFactoryImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h
deleted file mode 100644
index 3302def..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLServerSocketImpl__
-#define __gnu_javax_net_ssl_provider_SSLServerSocketImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLServerSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLContextImpl;
-              class SSLServerSocketImpl;
-              class SSLSocketImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLServerSocketImpl : public ::javax::net::ssl::SSLServerSocket
-{
-
-public:
-  SSLServerSocketImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *);
-  virtual jboolean getEnableSessionCreation();
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols();
-  virtual jboolean getNeedClientAuth();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols();
-  virtual jboolean getUseClientMode();
-  virtual jboolean getWantClientAuth();
-  virtual void setEnableSessionCreation(jboolean);
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *);
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *);
-  virtual void setNeedClientAuth(jboolean);
-  virtual void setUseClientMode(jboolean);
-  virtual void setWantClientAuth(jboolean);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLServerSocketImpl$accept();
-  virtual ::java::net::Socket * accept();
-private:
-  ::gnu::javax::net::ssl::provider::SSLContextImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocket)))) contextImpl;
-  jboolean enableSessionCreation;
-  JArray< ::java::lang::String * > * enabledCipherSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  jboolean needClientAuth;
-  jboolean wantClientAuth;
-  jboolean clientMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLServerSocketImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
deleted file mode 100644
index c0263be..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketFactoryImpl__
-#define __gnu_javax_net_ssl_provider_SSLSocketFactoryImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLContextImpl;
-              class SSLSocketFactoryImpl;
-              class SSLSocketImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketFactoryImpl : public ::javax::net::ssl::SSLSocketFactory
-{
-
-public:
-  SSLSocketFactoryImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *);
-  virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::lang::String *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-private:
-  ::gnu::javax::net::ssl::provider::SSLContextImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocketFactory)))) contextImpl;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketFactoryImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$1.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$1.h
deleted file mode 100644
index 3df9121..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketImpl$1__
-#define __gnu_javax_net_ssl_provider_SSLSocketImpl$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLSocketImpl;
-              class SSLSocketImpl$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketImpl$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SSLSocketImpl$1(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SSLSocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketImpl$1__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.h
deleted file mode 100644
index 3ad9ae0..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketInputStream__
-#define __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLSocketImpl;
-              class SSLSocketImpl$SocketInputStream;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketImpl$SocketInputStream : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  SSLSocketImpl$SocketInputStream(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-public:
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) inBuffer;
-  ::java::nio::ByteBuffer * appBuffer;
-  ::java::io::DataInputStream * in;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SSLSocketImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketInputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.h
deleted file mode 100644
index 987eaf8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketOutputStream__
-#define __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLSocketImpl;
-              class SSLSocketImpl$SocketOutputStream;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketImpl$SocketOutputStream : public ::java::io::OutputStream
-{
-
-public: // actually package-private
-  SSLSocketImpl$SocketOutputStream(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-public:
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-  virtual void close();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) buffer;
-  ::java::io::OutputStream * out;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SSLSocketImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketImpl$SocketOutputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl.h
deleted file mode 100644
index 309706b..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketImpl.h
+++ /dev/null
@@ -1,160 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketImpl__
-#define __gnu_javax_net_ssl_provider_SSLSocketImpl__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace debug
-      {
-          class SystemLogger;
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLContextImpl;
-              class SSLEngineImpl;
-              class SSLSocketImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedListener;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketImpl : public ::javax::net::ssl::SSLSocket
-{
-
-public:
-  SSLSocketImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *, ::java::lang::String *, jint);
-  SSLSocketImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *, ::java::lang::String *, jint, ::java::net::Socket *, jboolean);
-  virtual void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-  virtual jboolean getEnableSessionCreation();
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols();
-  virtual jboolean getNeedClientAuth();
-  virtual ::javax::net::ssl::SSLSession * getSession();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols();
-  virtual jboolean getUseClientMode();
-  virtual jboolean getWantClientAuth();
-  virtual void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-  virtual void setEnableSessionCreation(jboolean);
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *);
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *);
-  virtual void setNeedClientAuth(jboolean);
-  virtual void setUseClientMode(jboolean);
-  virtual void setWantClientAuth(jboolean);
-  virtual void startHandshake();
-public: // actually package-private
-  virtual void doHandshake();
-public:
-  virtual void bind(::java::net::SocketAddress *);
-  virtual void connect(::java::net::SocketAddress *);
-  virtual void connect(::java::net::SocketAddress *, jint);
-  virtual ::java::net::InetAddress * getInetAddress();
-  virtual ::java::net::InetAddress * getLocalAddress();
-  virtual jint getPort();
-  virtual jint getLocalPort();
-  virtual ::java::net::SocketAddress * getRemoteSocketAddress();
-  virtual ::java::net::SocketAddress * getLocalSocketAddress();
-  virtual ::java::nio::channels::SocketChannel * getChannel();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual void setTcpNoDelay(jboolean);
-  virtual jboolean getTcpNoDelay();
-  virtual void setSoLinger(jboolean, jint);
-  virtual jint getSoLinger();
-  virtual void sendUrgentData(jint);
-  virtual void setOOBInline(jboolean);
-  virtual jboolean getOOBInline();
-  virtual void setSoTimeout(jint);
-  virtual jint getSoTimeout();
-  virtual void setSendBufferSize(jint);
-  virtual jint getSendBufferSize();
-  virtual void setReceiveBufferSize(jint);
-  virtual jint getReceiveBufferSize();
-  virtual void setKeepAlive(jboolean);
-  virtual jboolean getKeepAlive();
-  virtual void setTrafficClass(jint);
-  virtual jint getTrafficClass();
-  virtual void setReuseAddress(jboolean);
-  virtual jboolean getReuseAddress();
-  virtual void close();
-  virtual void shutdownInput();
-  virtual void shutdownOutput();
-  virtual jboolean isConnected();
-  virtual jboolean isBound();
-  virtual jboolean isClosed();
-  virtual jboolean isInputShutdown();
-  virtual jboolean isOutputShutdown();
-public: // actually package-private
-  static ::java::net::Socket * access$0(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static ::java::io::OutputStream * access$1(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static jboolean access$2(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static ::gnu::javax::net::ssl::provider::SSLEngineImpl * access$3(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static ::java::io::IOException * access$4(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static ::java::io::InputStream * access$5(::gnu::javax::net::ssl::provider::SSLSocketImpl *);
-  static void access$6(::gnu::javax::net::ssl::provider::SSLSocketImpl *, ::java::io::IOException *);
-  static JArray< jint > * $SWITCH_TABLE$javax$net$ssl$SSLEngineResult$HandshakeStatus();
-private:
-  static ::gnu::classpath::debug::SystemLogger * logger;
-  ::gnu::javax::net::ssl::provider::SSLEngineImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocket)))) engine;
-  ::java::util::Set * listeners;
-  ::java::net::Socket * underlyingSocket;
-  jboolean isHandshaking;
-  ::java::io::IOException * handshakeException;
-  jboolean initialHandshakeDone;
-  jboolean autoClose;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-private:
-  static JArray< jint > * $SWITCH_TABLE$javax$net$ssl$SSLEngineResult$HandshakeStatus__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.h b/libjava/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.h
deleted file mode 100644
index bdc243a..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLv3HMacMD5Impl__
-#define __gnu_javax_net_ssl_provider_SSLv3HMacMD5Impl__
-
-#pragma interface
-
-#include <javax/crypto/MacSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLHMac;
-              class SSLv3HMacMD5Impl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLv3HMacMD5Impl : public ::javax::crypto::MacSpi
-{
-
-public:
-  SSLv3HMacMD5Impl();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal();
-  virtual jint engineGetMacLength();
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineReset();
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::javax::net::ssl::provider::SSLHMac * __attribute__((aligned(__alignof__( ::javax::crypto::MacSpi)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLv3HMacMD5Impl__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.h
deleted file mode 100644
index 698d880..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLv3HMacSHAImpl__
-#define __gnu_javax_net_ssl_provider_SSLv3HMacSHAImpl__
-
-#pragma interface
-
-#include <javax/crypto/MacSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLHMac;
-              class SSLv3HMacSHAImpl;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLv3HMacSHAImpl : public ::javax::crypto::MacSpi
-{
-
-public:
-  SSLv3HMacSHAImpl();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal();
-  virtual jint engineGetMacLength();
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void engineReset();
-  virtual void engineUpdate(jbyte);
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::javax::net::ssl::provider::SSLHMac * __attribute__((aligned(__alignof__( ::javax::crypto::MacSpi)))) adaptee;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLv3HMacSHAImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.h
deleted file mode 100644
index 5d35d5c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerDHE_PSKParameters__
-#define __gnu_javax_net_ssl_provider_ServerDHE_PSKParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerDHE_PSKParameters;
-              class ServerDHParams;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerDHE_PSKParameters : public ::java::lang::Object
-{
-
-public:
-  ServerDHE_PSKParameters(::java::nio::ByteBuffer *);
-  ServerDHE_PSKParameters(::java::lang::String *, ::gnu::javax::net::ssl::provider::ServerDHParams *);
-  ServerDHE_PSKParameters(::java::lang::String *, ::java::nio::ByteBuffer *);
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm();
-  virtual jint length();
-private:
-  jint hintLength();
-public:
-  virtual ::java::lang::String * identityHint();
-  virtual ::gnu::javax::net::ssl::provider::ServerDHParams * params();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerDHE_PSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerDHParams.h b/libjava/gnu/javax/net/ssl/provider/ServerDHParams.h
deleted file mode 100644
index 9585ab8..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerDHParams.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerDHParams__
-#define __gnu_javax_net_ssl_provider_ServerDHParams__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerDHParams;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerDHParams : public ::java::lang::Object
-{
-
-public:
-  ServerDHParams(::java::nio::ByteBuffer *);
-  ServerDHParams(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm();
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::math::BigInteger * p();
-  virtual ::java::math::BigInteger * g();
-  virtual ::java::math::BigInteger * y();
-  virtual void setP(::java::math::BigInteger *);
-  virtual void setG(::java::math::BigInteger *);
-  virtual void setY(::java::math::BigInteger *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerDHParams__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.h
deleted file mode 100644
index 270ea85..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake$CertLoader__
-#define __gnu_javax_net_ssl_provider_ServerHandshake$CertLoader__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHandshake;
-              class ServerHandshake$CertLoader;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake$CertLoader : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ServerHandshake$CertLoader(::gnu::javax::net::ssl::provider::ServerHandshake *);
-public:
-  virtual void implRun();
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ServerHandshake * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake$CertLoader__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.h
deleted file mode 100644
index 35b1fdc..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake$GenDH__
-#define __gnu_javax_net_ssl_provider_ServerHandshake$GenDH__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHandshake;
-              class ServerHandshake$GenDH;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake$GenDH : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-  ServerHandshake$GenDH(::gnu::javax::net::ssl::provider::ServerHandshake *);
-public: // actually protected
-  virtual void implRun();
-public: // actually package-private
-  ServerHandshake$GenDH(::gnu::javax::net::ssl::provider::ServerHandshake *, ::gnu::javax::net::ssl::provider::ServerHandshake$GenDH *);
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) paramsBuffer;
-  ::java::nio::ByteBuffer * sigBuffer;
-  ::gnu::javax::net::ssl::provider::ServerHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake$GenDH__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.h
deleted file mode 100644
index d3c84a7..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake$RSAKeyExchange__
-#define __gnu_javax_net_ssl_provider_ServerHandshake$RSAKeyExchange__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHandshake;
-              class ServerHandshake$RSAKeyExchange;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake$RSAKeyExchange : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ServerHandshake$RSAKeyExchange(::gnu::javax::net::ssl::provider::ServerHandshake *, JArray< jbyte > *);
-public:
-  virtual void implRun();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) encryptedPreMasterSecret;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ServerHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake$RSAKeyExchange__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.h
deleted file mode 100644
index ef5374f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake$RSA_PSKExchange__
-#define __gnu_javax_net_ssl_provider_ServerHandshake$RSA_PSKExchange__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/DelegatedTask.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHandshake;
-              class ServerHandshake$RSA_PSKExchange;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake$RSA_PSKExchange : public ::gnu::javax::net::ssl::provider::DelegatedTask
-{
-
-public: // actually package-private
-  ServerHandshake$RSA_PSKExchange(::gnu::javax::net::ssl::provider::ServerHandshake *, JArray< jbyte > *, ::javax::crypto::SecretKey *);
-public:
-  virtual void implRun();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::DelegatedTask)))) encryptedPreMasterSecret;
-  ::javax::crypto::SecretKey * psKey;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ServerHandshake * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake$RSA_PSKExchange__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$State.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake$State.h
deleted file mode 100644
index b993c08..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake$State.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake$State__
-#define __gnu_javax_net_ssl_provider_ServerHandshake$State__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHandshake$State;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake$State : public ::java::lang::Enum
-{
-
-  ServerHandshake$State(::java::lang::String *, jint, jboolean, jboolean);
-public: // actually package-private
-  jboolean isReadState();
-  jboolean isWriteState();
-public:
-  static JArray< ::gnu::javax::net::ssl::provider::ServerHandshake$State * > * values();
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_HELLO_REQUEST;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_SERVER_HELLO;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_SERVER_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_CERTIFICATE_REQUEST;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_SERVER_HELLO_DONE;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * WRITE_FINISHED;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * READ_CLIENT_HELLO;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * READ_CERTIFICATE;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * READ_CLIENT_KEY_EXCHANGE;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * READ_CERTIFICATE_VERIFY;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * READ_FINISHED;
-  static ::gnu::javax::net::ssl::provider::ServerHandshake$State * DONE;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Enum)))) isWriteState__;
-  jboolean isReadState__;
-  static JArray< ::gnu::javax::net::ssl::provider::ServerHandshake$State * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake$State__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHandshake.h b/libjava/gnu/javax/net/ssl/provider/ServerHandshake.h
deleted file mode 100644
index cf32a8d..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHandshake.h
+++ /dev/null
@@ -1,129 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHandshake__
-#define __gnu_javax_net_ssl_provider_ServerHandshake__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/AbstractHandshake.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class AbstractHandshake$CertVerifier;
-              class CipherSuite;
-              class CipherSuiteList;
-              class CompressionMethod;
-              class CompressionMethodList;
-              class DelegatedTask;
-              class ProtocolVersion;
-              class SSLEngineImpl;
-              class ServerHandshake;
-              class ServerHandshake$CertLoader;
-              class ServerHandshake$GenDH;
-              class ServerHandshake$State;
-              class ServerNameList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$HandshakeStatus;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHandshake : public ::gnu::javax::net::ssl::provider::AbstractHandshake
-{
-
-public: // actually package-private
-  ServerHandshake(jboolean, ::gnu::javax::net::ssl::provider::SSLEngineImpl *);
-private:
-  static ::gnu::javax::net::ssl::provider::ProtocolVersion * chooseProtocol(::gnu::javax::net::ssl::provider::ProtocolVersion *, JArray< ::java::lang::String * > *);
-  ::gnu::javax::net::ssl::provider::CipherSuite * chooseSuite(::gnu::javax::net::ssl::provider::CipherSuiteList *, JArray< ::java::lang::String * > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  static ::gnu::javax::net::ssl::provider::CompressionMethod * chooseCompression(::gnu::javax::net::ssl::provider::CompressionMethodList *);
-public: // actually protected
-  virtual jboolean doHash();
-public:
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleInput();
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * implHandleOutput(::java::nio::ByteBuffer *);
-public: // actually package-private
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * status();
-  virtual void checkKeyExchange();
-  virtual void handleV2Hello(::java::nio::ByteBuffer *);
-private:
-  ::java::nio::ByteBuffer * signParams(::java::nio::ByteBuffer *);
-  void verifyClient(JArray< jbyte > *);
-public: // actually package-private
-  static void access$0(::gnu::javax::net::ssl::provider::ServerHandshake *, ::java::lang::String *);
-  static ::java::lang::String * access$1(::gnu::javax::net::ssl::provider::ServerHandshake *);
-  static void access$2(::gnu::javax::net::ssl::provider::ServerHandshake *, ::java::security::cert::X509Certificate *);
-  static void access$3(::gnu::javax::net::ssl::provider::ServerHandshake *, ::java::security::PrivateKey *);
-  static ::java::security::cert::X509Certificate * access$4(::gnu::javax::net::ssl::provider::ServerHandshake *);
-  static void access$5(::gnu::javax::net::ssl::provider::ServerHandshake *, ::java::security::KeyPair *);
-  static ::java::security::KeyPair * access$6(::gnu::javax::net::ssl::provider::ServerHandshake *);
-  static ::java::nio::ByteBuffer * access$7(::gnu::javax::net::ssl::provider::ServerHandshake *, ::java::nio::ByteBuffer *);
-  static ::java::security::PrivateKey * access$8(::gnu::javax::net::ssl::provider::ServerHandshake *);
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type();
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$KeyExchangeAlgorithm();
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$ServerHandshake$State();
-private:
-  ::gnu::javax::net::ssl::provider::ServerHandshake$State * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::AbstractHandshake)))) state;
-  ::java::nio::ByteBuffer * outBuffer;
-  jboolean clientHadExtensions;
-  jboolean continuedSession;
-  ::gnu::javax::net::ssl::provider::ServerNameList * requestedNames;
-  ::java::lang::String * keyAlias;
-  ::java::security::cert::X509Certificate * clientCert;
-  ::java::security::cert::X509Certificate * localCert;
-  jboolean helloV2;
-  ::java::security::KeyPair * dhPair;
-  ::java::security::PrivateKey * serverKey;
-  ::gnu::javax::net::ssl::provider::ServerHandshake$GenDH * genDH;
-  ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * certVerifier;
-  ::gnu::javax::net::ssl::provider::ServerHandshake$CertLoader * certLoader;
-  ::gnu::javax::net::ssl::provider::DelegatedTask * keyExchangeTask;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$Extension$Type__;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$KeyExchangeAlgorithm__;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$ServerHandshake$State__;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHandshake__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHello.h b/libjava/gnu/javax/net/ssl/provider/ServerHello.h
deleted file mode 100644
index a26dd82..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHello.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHello__
-#define __gnu_javax_net_ssl_provider_ServerHello__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class CompressionMethod;
-              class ExtensionList;
-              class ProtocolVersion;
-              class Random;
-              class ServerHello;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHello : public ::java::lang::Object
-{
-
-public:
-  ServerHello(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * version();
-  virtual ::gnu::javax::net::ssl::provider::Random * random();
-  virtual JArray< jbyte > * sessionId();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * cipherSuite();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * compressionMethod();
-  virtual jint extensionsLength();
-  virtual ::gnu::javax::net::ssl::provider::ExtensionList * extensions();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  static const jint RANDOM_OFFSET = 2;
-  static const jint SESSID_OFFSET = 34;
-  static const jint SESSID_OFFSET2 = 35;
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jboolean disableExtensions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHello__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHelloBuilder.h b/libjava/gnu/javax/net/ssl/provider/ServerHelloBuilder.h
deleted file mode 100644
index 8d55e6a..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHelloBuilder.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHelloBuilder__
-#define __gnu_javax_net_ssl_provider_ServerHelloBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ServerHello.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class CompressionMethod;
-              class ProtocolVersion;
-              class ServerHelloBuilder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHelloBuilder : public ::gnu::javax::net::ssl::provider::ServerHello
-{
-
-public:
-  ServerHelloBuilder();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual void setSessionId(JArray< jbyte > *);
-  virtual void setSessionId(JArray< jbyte > *, jint, jint);
-  virtual void setCipherSuite(::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual void setCompressionMethod(::gnu::javax::net::ssl::provider::CompressionMethod *);
-  virtual void setDisableExtensions(jboolean);
-  virtual void setExtensionsLength(jint);
-  virtual void setExtensions(::java::nio::ByteBuffer *);
-  virtual void ensureCapacity(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHelloBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerHelloDone.h b/libjava/gnu/javax/net/ssl/provider/ServerHelloDone.h
deleted file mode 100644
index 51550c7..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerHelloDone.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerHelloDone__
-#define __gnu_javax_net_ssl_provider_ServerHelloDone__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerHelloDone;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerHelloDone : public ::java::lang::Object
-{
-
-public:
-  ServerHelloDone();
-  virtual jint length();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerHelloDone__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchange.h b/libjava/gnu/javax/net/ssl/provider/ServerKeyExchange.h
deleted file mode 100644
index 04ec69c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchange.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerKeyExchange__
-#define __gnu_javax_net_ssl_provider_ServerKeyExchange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class ServerKeyExchange;
-              class ServerKeyExchangeParams;
-              class Signature;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerKeyExchange : public ::java::lang::Object
-{
-
-public:
-  ServerKeyExchange(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual jint length();
-  virtual ::gnu::javax::net::ssl::provider::ServerKeyExchangeParams * params();
-  virtual ::gnu::javax::net::ssl::provider::Signature * signature();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-public: // actually protected
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::gnu::javax::net::ssl::provider::CipherSuite * suite;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerKeyExchange__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.h b/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.h
deleted file mode 100644
index abc1363..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerKeyExchangeBuilder__
-#define __gnu_javax_net_ssl_provider_ServerKeyExchangeBuilder__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ServerKeyExchange.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CipherSuite;
-              class ServerKeyExchangeBuilder;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerKeyExchangeBuilder : public ::gnu::javax::net::ssl::provider::ServerKeyExchange
-{
-
-public:
-  ServerKeyExchangeBuilder(::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual void setParams(::java::nio::ByteBuffer *);
-  virtual void setSignature(::java::nio::ByteBuffer *);
-  virtual void ensureCapacity(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerKeyExchangeBuilder__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.h b/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.h
deleted file mode 100644
index 4ff4d20..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerKeyExchangeParams__
-#define __gnu_javax_net_ssl_provider_ServerKeyExchangeParams__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerKeyExchangeParams;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerKeyExchangeParams : public ::java::lang::Object
-{
-
-public:
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm() = 0;
-  virtual jint length() = 0;
-  virtual ::java::lang::String * toString(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_ServerKeyExchangeParams__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h
deleted file mode 100644
index 6289bfd..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerNameList$Iterator__
-#define __gnu_javax_net_ssl_provider_ServerNameList$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerNameList;
-              class ServerNameList$Iterator;
-              class ServerNameList$ServerName;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerNameList$Iterator : public ::java::lang::Object
-{
-
-public:
-  ServerNameList$Iterator(::gnu::javax::net::ssl::provider::ServerNameList *);
-  virtual jboolean hasNext();
-  virtual ::gnu::javax::net::ssl::provider::ServerNameList$ServerName * ServerNameList$Iterator$next();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::ServerNameList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerNameList$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerNameList$NameType.h b/libjava/gnu/javax/net/ssl/provider/ServerNameList$NameType.h
deleted file mode 100644
index 363e89f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerNameList$NameType.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerNameList$NameType__
-#define __gnu_javax_net_ssl_provider_ServerNameList$NameType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerNameList$NameType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerNameList$NameType : public ::java::lang::Enum
-{
-
-  ServerNameList$NameType(::java::lang::String *, jint, jint);
-public:
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::ServerNameList$NameType * > * values();
-  static ::gnu::javax::net::ssl::provider::ServerNameList$NameType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::ServerNameList$NameType * HOST_NAME;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::ServerNameList$NameType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerNameList$NameType__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerNameList$ServerName.h b/libjava/gnu/javax/net/ssl/provider/ServerNameList$ServerName.h
deleted file mode 100644
index 1aa13b4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerNameList$ServerName.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerNameList$ServerName__
-#define __gnu_javax_net_ssl_provider_ServerNameList$ServerName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerNameList$NameType;
-              class ServerNameList$ServerName;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerNameList$ServerName : public ::java::lang::Object
-{
-
-public:
-  ServerNameList$ServerName(::java::nio::ByteBuffer *);
-  ServerNameList$ServerName(::gnu::javax::net::ssl::provider::ServerNameList$NameType *, ::java::lang::String *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::gnu::javax::net::ssl::provider::ServerNameList$NameType * type();
-  virtual ::java::lang::String * name();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerNameList$ServerName__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerNameList.h b/libjava/gnu/javax/net/ssl/provider/ServerNameList.h
deleted file mode 100644
index a808e0d..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerNameList.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerNameList__
-#define __gnu_javax_net_ssl_provider_ServerNameList__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ServerNameList;
-              class ServerNameList$ServerName;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerNameList : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  ServerNameList(::java::nio::ByteBuffer *);
-  ServerNameList(::java::util::List *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint size();
-  virtual ::gnu::javax::net::ssl::provider::ServerNameList$ServerName * get(jint);
-  virtual void setLength(jint);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual ::java::util::Iterator * iterator();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerNameList__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerPSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ServerPSKParameters.h
deleted file mode 100644
index bf1bc27..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerPSKParameters.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerPSKParameters__
-#define __gnu_javax_net_ssl_provider_ServerPSKParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerPSKParameters;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerPSKParameters : public ::java::lang::Object
-{
-
-public:
-  ServerPSKParameters(::java::nio::ByteBuffer *);
-  ServerPSKParameters(::java::lang::String *);
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint length();
-  virtual ::java::lang::String * identityHint();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerPSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerRSAParams.h b/libjava/gnu/javax/net/ssl/provider/ServerRSAParams.h
deleted file mode 100644
index 21201fe..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerRSAParams.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerRSAParams__
-#define __gnu_javax_net_ssl_provider_ServerRSAParams__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerRSAParams;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerRSAParams : public ::java::lang::Object
-{
-
-public:
-  ServerRSAParams(::java::nio::ByteBuffer *);
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm();
-  virtual jint length();
-  virtual ::java::math::BigInteger * modulus();
-  virtual ::java::math::BigInteger * exponent();
-  virtual void setModulus(::java::math::BigInteger *);
-  virtual void setExponent(::java::math::BigInteger *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerRSAParams__
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.h b/libjava/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.h
deleted file mode 100644
index ac7fca2..0000000
--- a/libjava/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_ServerRSA_PSKParameters__
-#define __gnu_javax_net_ssl_provider_ServerRSA_PSKParameters__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/ServerPSKParameters.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyExchangeAlgorithm;
-              class ServerRSA_PSKParameters;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::ServerRSA_PSKParameters : public ::gnu::javax::net::ssl::provider::ServerPSKParameters
-{
-
-public:
-  ServerRSA_PSKParameters(::java::nio::ByteBuffer *);
-  ServerRSA_PSKParameters(::java::lang::String *);
-  virtual ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm * algorithm();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_ServerRSA_PSKParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.h b/libjava/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.h
deleted file mode 100644
index 287944c..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SessionImpl$PrivateData__
-#define __gnu_javax_net_ssl_provider_SessionImpl$PrivateData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SessionImpl$PrivateData;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SessionImpl$PrivateData : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SessionImpl$PrivateData();
-  static const jlong serialVersionUID = -8040597659545984581LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) masterSecret;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SessionImpl$PrivateData__
diff --git a/libjava/gnu/javax/net/ssl/provider/SessionImpl.h b/libjava/gnu/javax/net/ssl/provider/SessionImpl.h
deleted file mode 100644
index d3d5a07..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SessionImpl.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SessionImpl__
-#define __gnu_javax_net_ssl_provider_SessionImpl__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/Session.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class Session$ID;
-          namespace provider
-          {
-              class CipherSuite;
-              class MaxFragmentLength;
-              class ProtocolVersion;
-              class SessionImpl;
-              class SessionImpl$PrivateData;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SealedObject;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SessionImpl : public ::gnu::javax::net::ssl::Session
-{
-
-public:
-  SessionImpl();
-public: // actually package-private
-  virtual ::java::security::SecureRandom * random();
-public:
-  virtual ::java::lang::String * getProtocol();
-  virtual void prepare(JArray< jchar > *);
-  virtual void repair(JArray< jchar > *);
-  virtual ::javax::crypto::SealedObject * privateData();
-  virtual void setPrivateData(::javax::crypto::SealedObject *);
-public: // actually package-private
-  virtual void setApplicationBufferSize(jint);
-  virtual void setRandom(::java::security::SecureRandom *);
-  virtual void setTruncatedMac(jboolean);
-  virtual void setId(::gnu::javax::net::ssl::Session$ID *);
-  virtual void setLocalCertificates(JArray< ::java::security::cert::Certificate * > *);
-  virtual void setPeerCertificates(JArray< ::java::security::cert::Certificate * > *);
-  virtual void setPeerVerified(jboolean);
-  static const jlong serialVersionUID = 8932976607588442485LL;
-  ::gnu::javax::net::ssl::provider::CipherSuite * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::Session)))) suite;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-  JArray< jbyte > * privateDataSalt;
-  ::javax::crypto::SealedObject * sealedPrivateData;
-  ::gnu::javax::net::ssl::provider::MaxFragmentLength * maxLength;
-  ::gnu::javax::net::ssl::provider::SessionImpl$PrivateData * privateData__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SessionImpl__
diff --git a/libjava/gnu/javax/net/ssl/provider/Signature.h b/libjava/gnu/javax/net/ssl/provider/Signature.h
deleted file mode 100644
index 4b87ea4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Signature.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Signature__
-#define __gnu_javax_net_ssl_provider_Signature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Signature;
-              class SignatureAlgorithm;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Signature : public ::java::lang::Object
-{
-
-public:
-  Signature(::java::nio::ByteBuffer *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *);
-  Signature(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual JArray< jbyte > * signature();
-  virtual void setSignature(JArray< jbyte > *);
-  virtual void setSignature(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer__;
-  ::gnu::javax::net::ssl::provider::SignatureAlgorithm * alg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Signature__
diff --git a/libjava/gnu/javax/net/ssl/provider/SignatureAlgorithm.h b/libjava/gnu/javax/net/ssl/provider/SignatureAlgorithm.h
deleted file mode 100644
index adca380..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SignatureAlgorithm.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SignatureAlgorithm__
-#define __gnu_javax_net_ssl_provider_SignatureAlgorithm__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SignatureAlgorithm;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SignatureAlgorithm : public ::java::lang::Enum
-{
-
-  SignatureAlgorithm(::java::lang::String *, jint);
-public:
-  ::java::lang::String * algorithm();
-  static JArray< ::gnu::javax::net::ssl::provider::SignatureAlgorithm * > * values();
-  static ::gnu::javax::net::ssl::provider::SignatureAlgorithm * valueOf(::java::lang::String *);
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$SignatureAlgorithm();
-public:
-  static ::gnu::javax::net::ssl::provider::SignatureAlgorithm * ANONYMOUS;
-  static ::gnu::javax::net::ssl::provider::SignatureAlgorithm * RSA;
-  static ::gnu::javax::net::ssl::provider::SignatureAlgorithm * DSA;
-private:
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$net$ssl$provider$SignatureAlgorithm__;
-  static JArray< ::gnu::javax::net::ssl::provider::SignatureAlgorithm * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SignatureAlgorithm__
diff --git a/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext$1.h b/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext$1.h
deleted file mode 100644
index 3c8c784..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext$1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SimpleSessionContext$1__
-#define __gnu_javax_net_ssl_provider_SimpleSessionContext$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SimpleSessionContext;
-              class SimpleSessionContext$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SimpleSessionContext$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SimpleSessionContext$1(::gnu::javax::net::ssl::provider::SimpleSessionContext *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-  ::gnu::javax::net::ssl::provider::SimpleSessionContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SimpleSessionContext$1__
diff --git a/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext.h b/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext.h
deleted file mode 100644
index 68795de..0000000
--- a/libjava/gnu/javax/net/ssl/provider/SimpleSessionContext.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SimpleSessionContext__
-#define __gnu_javax_net_ssl_provider_SimpleSessionContext__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/AbstractSessionContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class Session;
-          namespace provider
-          {
-              class SimpleSessionContext;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SimpleSessionContext : public ::gnu::javax::net::ssl::AbstractSessionContext
-{
-
-public:
-  SimpleSessionContext();
-public: // actually protected
-  ::gnu::javax::net::ssl::Session * implGet(JArray< jbyte > *);
-public:
-  void load(JArray< jchar > *);
-  void put(::gnu::javax::net::ssl::Session *);
-  void remove(JArray< jbyte > *);
-  void store(JArray< jchar > *);
-  ::java::util::Enumeration * getIds();
-  jint getSessionCacheSize();
-  void setSessionCacheSize(jint);
-public: // actually package-private
-  static ::java::util::HashMap * access$0(::gnu::javax::net::ssl::provider::SimpleSessionContext *);
-public:
-  static const jint DEFAULT_TIMEOUT = 300;
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::AbstractSessionContext)))) store__;
-  jint storeLimit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SimpleSessionContext__
diff --git a/libjava/gnu/javax/net/ssl/provider/TLSHMac.h b/libjava/gnu/javax/net/ssl/provider/TLSHMac.h
deleted file mode 100644
index 6948f3f..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TLSHMac.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TLSHMac__
-#define __gnu_javax_net_ssl_provider_TLSHMac__
-
-#pragma interface
-
-#include <gnu/javax/crypto/mac/HMac.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TLSHMac;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TLSHMac : public ::gnu::javax::crypto::mac::HMac
-{
-
-public: // actually package-private
-  TLSHMac(::gnu::java::security::hash::IMessageDigest *);
-public:
-  virtual void init(::java::util::Map *);
-private:
-  static const jbyte IPAD_BYTE = 54;
-  static const jbyte OPAD_BYTE = 92;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TLSHMac__
diff --git a/libjava/gnu/javax/net/ssl/provider/TLSRandom.h b/libjava/gnu/javax/net/ssl/provider/TLSRandom.h
deleted file mode 100644
index 737d6c4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TLSRandom.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TLSRandom__
-#define __gnu_javax_net_ssl_provider_TLSRandom__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TLSRandom;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TLSRandom : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TLSRandom();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void init(::java::util::Map *);
-  virtual ::java::lang::String * name();
-  virtual jbyte nextByte();
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-private:
-  void fillBuffer();
-public: // actually package-private
-  static ::java::lang::String * SECRET;
-  static ::java::lang::String * SEED;
-private:
-  ::gnu::javax::crypto::mac::IMac * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hmac_sha;
-  ::gnu::javax::crypto::mac::IMac * hmac_md5;
-  JArray< jbyte > * sha_a;
-  JArray< jbyte > * md5_a;
-  JArray< jbyte > * seed;
-  JArray< jbyte > * buffer;
-  jint idx;
-  jboolean init__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TLSRandom__
diff --git a/libjava/gnu/javax/net/ssl/provider/TruncatedHMAC.h b/libjava/gnu/javax/net/ssl/provider/TruncatedHMAC.h
deleted file mode 100644
index 73b4d25..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TruncatedHMAC.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TruncatedHMAC__
-#define __gnu_javax_net_ssl_provider_TruncatedHMAC__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TruncatedHMAC;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TruncatedHMAC : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  TruncatedHMAC();
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TruncatedHMAC__
diff --git a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h
deleted file mode 100644
index 89969b1..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TrustedAuthorities$AuthoritiesIterator__
-#define __gnu_javax_net_ssl_provider_TrustedAuthorities$AuthoritiesIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TrustedAuthorities;
-              class TrustedAuthorities$AuthoritiesIterator;
-              class TrustedAuthorities$TrustedAuthority;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TrustedAuthorities$AuthoritiesIterator : public ::java::lang::Object
-{
-
-public:
-  TrustedAuthorities$AuthoritiesIterator(::gnu::javax::net::ssl::provider::TrustedAuthorities *);
-  virtual ::gnu::javax::net::ssl::provider::TrustedAuthorities$TrustedAuthority * TrustedAuthorities$AuthoritiesIterator$next();
-  virtual jboolean hasNext();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::TrustedAuthorities * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TrustedAuthorities$AuthoritiesIterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.h b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.h
deleted file mode 100644
index e2b0188..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TrustedAuthorities$IdentifierType__
-#define __gnu_javax_net_ssl_provider_TrustedAuthorities$IdentifierType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TrustedAuthorities$IdentifierType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType : public ::java::lang::Enum
-{
-
-  TrustedAuthorities$IdentifierType(::java::lang::String *, jint, jint);
-public:
-  jint getValue();
-  static JArray< ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * > * values();
-  static ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * valueOf(::java::lang::String *);
-  static ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * PRE_AGREED;
-  static ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * KEY_SHA1_HASH;
-  static ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * X509_NAME;
-  static ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * CERT_SHA1_HASH;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) value;
-  static JArray< ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TrustedAuthorities$IdentifierType__
diff --git a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.h b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.h
deleted file mode 100644
index 6101a82..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TrustedAuthorities$TrustedAuthority__
-#define __gnu_javax_net_ssl_provider_TrustedAuthorities$TrustedAuthority__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TrustedAuthorities$IdentifierType;
-              class TrustedAuthorities$TrustedAuthority;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TrustedAuthorities$TrustedAuthority : public ::java::lang::Object
-{
-
-public:
-  TrustedAuthorities$TrustedAuthority(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual JArray< jbyte > * sha1Hash();
-  virtual ::javax::security::auth::x500::X500Principal * name();
-  virtual ::gnu::javax::net::ssl::provider::TrustedAuthorities$IdentifierType * type();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TrustedAuthorities$TrustedAuthority__
diff --git a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities.h b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities.h
deleted file mode 100644
index 0aeabe4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_TrustedAuthorities__
-#define __gnu_javax_net_ssl_provider_TrustedAuthorities__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class TrustedAuthorities;
-              class TrustedAuthorities$TrustedAuthority;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::TrustedAuthorities : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  TrustedAuthorities(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual jint size();
-  virtual ::gnu::javax::net::ssl::provider::TrustedAuthorities$TrustedAuthority * get(jint);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual ::java::util::Iterator * iterator();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_TrustedAuthorities__
diff --git a/libjava/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.h b/libjava/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.h
deleted file mode 100644
index 9c75dd0..0000000
--- a/libjava/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_UnresolvedExtensionValue__
-#define __gnu_javax_net_ssl_provider_UnresolvedExtensionValue__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/Extension$Value.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class UnresolvedExtensionValue;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::UnresolvedExtensionValue : public ::gnu::javax::net::ssl::provider::Extension$Value
-{
-
-public:
-  UnresolvedExtensionValue(::java::nio::ByteBuffer *);
-  virtual jint length();
-  virtual ::java::nio::ByteBuffer * buffer();
-  virtual ::java::nio::ByteBuffer * value();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::Extension$Value)))) buffer__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_UnresolvedExtensionValue__
diff --git a/libjava/gnu/javax/net/ssl/provider/Util$1.h b/libjava/gnu/javax/net/ssl/provider/Util$1.h
deleted file mode 100644
index d8e7863..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Util$1.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Util$1__
-#define __gnu_javax_net_ssl_provider_Util$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Util$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Util$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Util$1(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * run();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Util$1__
diff --git a/libjava/gnu/javax/net/ssl/provider/Util$2.h b/libjava/gnu/javax/net/ssl/provider/Util$2.h
deleted file mode 100644
index 034b13b..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Util$2.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Util$2__
-#define __gnu_javax_net_ssl_provider_Util$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Util$2;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Util$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Util$2(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * run();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Util$2__
diff --git a/libjava/gnu/javax/net/ssl/provider/Util$WrappedBuffer.h b/libjava/gnu/javax/net/ssl/provider/Util$WrappedBuffer.h
deleted file mode 100644
index ad7d244..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Util$WrappedBuffer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Util$WrappedBuffer__
-#define __gnu_javax_net_ssl_provider_Util$WrappedBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Util$WrappedBuffer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Util$WrappedBuffer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Util$WrappedBuffer(::java::nio::ByteBuffer *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::java::lang::String * prefix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Util$WrappedBuffer__
diff --git a/libjava/gnu/javax/net/ssl/provider/Util.h b/libjava/gnu/javax/net/ssl/provider/Util.h
deleted file mode 100644
index 6e54af1..0000000
--- a/libjava/gnu/javax/net/ssl/provider/Util.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Util__
-#define __gnu_javax_net_ssl_provider_Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Util;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Util : public ::java::lang::Object
-{
-
-  Util();
-public:
-  static ::java::lang::Object * wrapBuffer(::java::nio::ByteBuffer *);
-  static ::java::lang::Object * wrapBuffer(::java::nio::ByteBuffer *, ::java::lang::String *);
-  static JArray< jbyte > * toByteArray(::java::lang::String *);
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * toHexString(JArray< jbyte > *);
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jint, jint, jchar);
-  static ::java::lang::String * toHexString(JArray< jbyte > *, jchar);
-  static ::java::lang::String * hexDump(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  static ::java::lang::String * hexDump(::java::nio::ByteBuffer *);
-  static ::java::lang::String * hexDump(::java::nio::ByteBuffer *, ::java::lang::String *);
-  static ::java::lang::String * hexDump(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * hexDump(JArray< jbyte > *, ::java::lang::String *);
-  static ::java::lang::String * hexDump(JArray< jbyte > *);
-  static ::java::lang::String * formatInt(jint, jint, jint);
-  static JArray< jbyte > * concat(JArray< jbyte > *, JArray< jbyte > *);
-  static JArray< jbyte > * trim(JArray< jbyte > *, jint);
-  static JArray< jbyte > * trim(JArray< jbyte > *, jint, jint);
-  static JArray< jbyte > * trim(::java::math::BigInteger *);
-  static jint unixTime();
-public: // actually package-private
-  static JArray< ::java::lang::Object * > * transform(JArray< ::java::lang::Object * > *, ::java::lang::Class *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static ::java::lang::String * getSecurityProperty(::java::lang::String *);
-  static ::java::lang::String * HEX;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Util__
diff --git a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h
deleted file mode 100644
index f41f17b..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X500PrincipalList$Iterator__
-#define __gnu_javax_net_ssl_provider_X500PrincipalList$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X500PrincipalList;
-              class X500PrincipalList$Iterator;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X500PrincipalList$Iterator : public ::java::lang::Object
-{
-
-public:
-  X500PrincipalList$Iterator(::gnu::javax::net::ssl::provider::X500PrincipalList *);
-  virtual void X500PrincipalList$Iterator$add(::javax::security::auth::x500::X500Principal *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::javax::security::auth::x500::X500Principal * X500PrincipalList$Iterator$next();
-  virtual jint nextIndex();
-  virtual ::javax::security::auth::x500::X500Principal * X500PrincipalList$Iterator$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void X500PrincipalList$Iterator$set(::javax::security::auth::x500::X500Principal *);
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * previous();
-  virtual void add(::java::lang::Object *);
-  virtual void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modCount;
-  jint index;
-  jint count;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::X500PrincipalList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X500PrincipalList$Iterator__
diff --git a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList.h b/libjava/gnu/javax/net/ssl/provider/X500PrincipalList.h
deleted file mode 100644
index 080b5e4..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X500PrincipalList__
-#define __gnu_javax_net_ssl_provider_X500PrincipalList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X500PrincipalList;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X500PrincipalList : public ::java::lang::Object
-{
-
-public:
-  X500PrincipalList(::java::nio::ByteBuffer *);
-  jint size();
-  jint count();
-  ::javax::security::auth::x500::X500Principal * get(jint);
-  void put(jint, ::javax::security::auth::x500::X500Principal *);
-  void put(jint, JArray< jbyte > *);
-  void setSize(jint, jint);
-  ::java::lang::String * toString();
-  ::java::lang::String * toString(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static jint access$0(::gnu::javax::net::ssl::provider::X500PrincipalList *);
-private:
-  ::java::nio::ByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X500PrincipalList__
diff --git a/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.h b/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.h
deleted file mode 100644
index 6455f80..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X509KeyManagerFactory$Manager__
-#define __gnu_javax_net_ssl_provider_X509KeyManagerFactory$Manager__
-
-#pragma interface
-
-#include <javax/net/ssl/X509ExtendedKeyManager.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X509KeyManagerFactory;
-              class X509KeyManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace security
-    {
-        class Principal;
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngine;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X509KeyManagerFactory$Manager : public ::javax::net::ssl::X509ExtendedKeyManager
-{
-
-public: // actually package-private
-  X509KeyManagerFactory$Manager(::gnu::javax::net::ssl::provider::X509KeyManagerFactory *, ::java::util::Map *, ::java::util::Map *);
-public:
-  virtual ::java::lang::String * chooseClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::java::net::Socket *);
-  virtual ::java::lang::String * chooseEngineClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual JArray< ::java::lang::String * > * getClientAliases(::java::lang::String *, JArray< ::java::security::Principal * > *);
-  virtual ::java::lang::String * chooseServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::java::net::Socket *);
-  virtual ::java::lang::String * chooseEngineServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual JArray< ::java::lang::String * > * getServerAliases(::java::lang::String *, JArray< ::java::security::Principal * > *);
-private:
-  JArray< ::java::lang::String * > * getAliases(::java::lang::String *, JArray< ::java::security::Principal * > *);
-public:
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificateChain(::java::lang::String *);
-  virtual ::java::security::PrivateKey * getPrivateKey(::java::lang::String *);
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::javax::net::ssl::X509ExtendedKeyManager)))) privateKeys;
-  ::java::util::Map * certChains;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::X509KeyManagerFactory * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X509KeyManagerFactory$Manager__
diff --git a/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory.h b/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory.h
deleted file mode 100644
index a261c27..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X509KeyManagerFactory.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X509KeyManagerFactory__
-#define __gnu_javax_net_ssl_provider_X509KeyManagerFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/KeyManagerFactorySpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X509KeyManagerFactory;
-              class X509KeyManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-      namespace cert
-      {
-          class Certificate;
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X509KeyManagerFactory : public ::javax::net::ssl::KeyManagerFactorySpi
-{
-
-public:
-  X509KeyManagerFactory();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::KeyManager * > * engineGetKeyManagers();
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void engineInit(::java::security::KeyStore *, JArray< jchar > *);
-private:
-  static JArray< ::java::security::cert::X509Certificate * > * toX509Chain(JArray< ::java::security::cert::Certificate * > *);
-  ::gnu::javax::net::ssl::provider::X509KeyManagerFactory$Manager * __attribute__((aligned(__alignof__( ::javax::net::ssl::KeyManagerFactorySpi)))) current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X509KeyManagerFactory__
diff --git a/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.h b/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.h
deleted file mode 100644
index c34c2c5..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X509TrustManagerFactory$Manager__
-#define __gnu_javax_net_ssl_provider_X509TrustManagerFactory$Manager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X509TrustManagerFactory;
-              class X509TrustManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X509TrustManagerFactory$Manager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  X509TrustManagerFactory$Manager(::gnu::javax::net::ssl::provider::X509TrustManagerFactory *, JArray< ::java::security::cert::X509Certificate * > *);
-public:
-  virtual void checkClientTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *);
-  virtual void checkServerTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *);
-  virtual JArray< ::java::security::cert::X509Certificate * > * getAcceptedIssuers();
-private:
-  void checkTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *);
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) anchors;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::X509TrustManagerFactory * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X509TrustManagerFactory$Manager__
diff --git a/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory.h b/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory.h
deleted file mode 100644
index f65c049..0000000
--- a/libjava/gnu/javax/net/ssl/provider/X509TrustManagerFactory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_X509TrustManagerFactory__
-#define __gnu_javax_net_ssl_provider_X509TrustManagerFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/TrustManagerFactorySpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class X509TrustManagerFactory;
-              class X509TrustManagerFactory$Manager;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::X509TrustManagerFactory : public ::javax::net::ssl::TrustManagerFactorySpi
-{
-
-public:
-  X509TrustManagerFactory();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::TrustManager * > * engineGetTrustManagers();
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void engineInit(::java::security::KeyStore *);
-private:
-  static ::java::lang::String * sep;
-  static ::java::lang::String * JSSE_CERTS;
-  static ::java::lang::String * CA_CERTS;
-  ::gnu::javax::net::ssl::provider::X509TrustManagerFactory$Manager * __attribute__((aligned(__alignof__( ::javax::net::ssl::TrustManagerFactorySpi)))) current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_X509TrustManagerFactory__
diff --git a/libjava/gnu/javax/print/CupsIppOperation.h b/libjava/gnu/javax/print/CupsIppOperation.h
deleted file mode 100644
index f328a19..0000000
--- a/libjava/gnu/javax/print/CupsIppOperation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_CupsIppOperation__
-#define __gnu_javax_print_CupsIppOperation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsIppOperation;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::CupsIppOperation : public ::java::lang::Object
-{
-
-  CupsIppOperation();
-public:
-  static const jint CUPS_GET_DEFAULT = 16385;
-  static const jint CUPS_GET_PRINTERS = 16386;
-  static const jint CUPS_ADD_MODIFY_PRINTER = 16387;
-  static const jint CUPS_DELETE_PRINTER = 16388;
-  static const jint CUPS_GET_CLASSES = 16389;
-  static const jint CUPS_ADD_MODIFY_CLASS = 16390;
-  static const jint CUPS_DELETE_CLASS = 16391;
-  static const jint CUPS_ACCEPT_JOBS = 16392;
-  static const jint CUPS_REJECT_JOBS = 16393;
-  static const jint CUPS_SET_DEFAULT = 16394;
-  static const jint CUPS_GET_DEVICES = 16395;
-  static const jint CUPS_GET_PPDS = 16396;
-  static const jint CUPS_MOVE_JOB = 16397;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_CupsIppOperation__
diff --git a/libjava/gnu/javax/print/CupsMediaMapping.h b/libjava/gnu/javax/print/CupsMediaMapping.h
deleted file mode 100644
index 3d5f593..0000000
--- a/libjava/gnu/javax/print/CupsMediaMapping.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_CupsMediaMapping__
-#define __gnu_javax_print_CupsMediaMapping__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsMediaMapping;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::CupsMediaMapping : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * getIppName(::java::lang::String *);
-  static ::java::util::Map * getMappingMap();
-private:
-  CupsMediaMapping();
-  static ::java::util::HashMap * ippByCups;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_CupsMediaMapping__
diff --git a/libjava/gnu/javax/print/CupsPrintService.h b/libjava/gnu/javax/print/CupsPrintService.h
deleted file mode 100644
index 68bf4b7..0000000
--- a/libjava/gnu/javax/print/CupsPrintService.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_CupsPrintService__
-#define __gnu_javax_print_CupsPrintService__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/IppMultiDocPrintService.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsPrintService;
-        namespace ipp
-        {
-            class IppResponse;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-      namespace attribute
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::CupsPrintService : public ::gnu::javax::print::ipp::IppMultiDocPrintService
-{
-
-public:
-  CupsPrintService(::java::net::URI *, ::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  ::java::lang::Object * handleSupportedAttributeValuesResponse(::gnu::javax::print::ipp::IppResponse *, ::java::lang::Class *);
-public:
-  ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *);
-  ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_CupsPrintService__
diff --git a/libjava/gnu/javax/print/CupsPrintServiceLookup.h b/libjava/gnu/javax/print/CupsPrintServiceLookup.h
deleted file mode 100644
index b4f9836..0000000
--- a/libjava/gnu/javax/print/CupsPrintServiceLookup.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_CupsPrintServiceLookup__
-#define __gnu_javax_print_CupsPrintServiceLookup__
-
-#pragma interface
-
-#include <javax/print/PrintServiceLookup.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsPrintServiceLookup;
-          class CupsServer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class MultiDocPrintService;
-        class PrintService;
-      namespace attribute
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::CupsPrintServiceLookup : public ::javax::print::PrintServiceLookup
-{
-
-public:
-  CupsPrintServiceLookup();
-  virtual ::javax::print::PrintService * getDefaultPrintService();
-  virtual JArray< ::javax::print::MultiDocPrintService * > * getMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *);
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices();
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  virtual jboolean checkPrintService(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *, ::javax::print::PrintService *);
-  virtual jboolean checkMultiDocPrintService(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *, ::javax::print::PrintService *);
-private:
-  ::gnu::javax::print::CupsServer * __attribute__((aligned(__alignof__( ::javax::print::PrintServiceLookup)))) server;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_CupsPrintServiceLookup__
diff --git a/libjava/gnu/javax/print/CupsServer.h b/libjava/gnu/javax/print/CupsServer.h
deleted file mode 100644
index c31d236..0000000
--- a/libjava/gnu/javax/print/CupsServer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_CupsServer__
-#define __gnu_javax_print_CupsServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsServer;
-        namespace ipp
-        {
-            class IppPrintService;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::CupsServer : public ::java::lang::Object
-{
-
-public:
-  CupsServer(::java::lang::String *, ::java::lang::String *);
-  CupsServer(::java::net::URI *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::gnu::javax::print::ipp::IppPrintService * getDefaultPrinter();
-  virtual ::java::util::List * getAllPrinters();
-  virtual ::java::util::List * getAllClasses();
-private:
-  ::java::net::URI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-  ::java::lang::String * username;
-  ::java::lang::String * password;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_CupsServer__
diff --git a/libjava/gnu/javax/print/PrintAttributeException.h b/libjava/gnu/javax/print/PrintAttributeException.h
deleted file mode 100644
index d1613f8..0000000
--- a/libjava/gnu/javax/print/PrintAttributeException.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrintAttributeException__
-#define __gnu_javax_print_PrintAttributeException__
-
-#pragma interface
-
-#include <javax/print/PrintException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrintAttributeException;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrintAttributeException : public ::javax::print::PrintException
-{
-
-public:
-  PrintAttributeException(JArray< ::java::lang::Class * > *, JArray< ::javax::print::attribute::Attribute * > *);
-  PrintAttributeException(::java::lang::Exception *, JArray< ::java::lang::Class * > *, JArray< ::javax::print::attribute::Attribute * > *);
-  PrintAttributeException(::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::javax::print::attribute::Attribute * > *);
-  PrintAttributeException(::java::lang::String *, ::java::lang::Exception *, JArray< ::java::lang::Class * > *, JArray< ::javax::print::attribute::Attribute * > *);
-  JArray< ::java::lang::Class * > * getUnsupportedAttributes();
-  JArray< ::javax::print::attribute::Attribute * > * getUnsupportedValues();
-private:
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::javax::print::PrintException)))) categories;
-  JArray< ::javax::print::attribute::Attribute * > * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrintAttributeException__
diff --git a/libjava/gnu/javax/print/PrintFlavorException.h b/libjava/gnu/javax/print/PrintFlavorException.h
deleted file mode 100644
index 0c16fdf..0000000
--- a/libjava/gnu/javax/print/PrintFlavorException.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrintFlavorException__
-#define __gnu_javax_print_PrintFlavorException__
-
-#pragma interface
-
-#include <javax/print/PrintException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrintFlavorException;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-    }
-  }
-}
-
-class gnu::javax::print::PrintFlavorException : public ::javax::print::PrintException
-{
-
-public:
-  PrintFlavorException(JArray< ::javax::print::DocFlavor * > *);
-  PrintFlavorException(::java::lang::Exception *, JArray< ::javax::print::DocFlavor * > *);
-  PrintFlavorException(::java::lang::String *, JArray< ::javax::print::DocFlavor * > *);
-  PrintFlavorException(::java::lang::String *, ::java::lang::Exception *, JArray< ::javax::print::DocFlavor * > *);
-  virtual JArray< ::javax::print::DocFlavor * > * getUnsupportedFlavors();
-private:
-  JArray< ::javax::print::DocFlavor * > * __attribute__((aligned(__alignof__( ::javax::print::PrintException)))) flavors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrintFlavorException__
diff --git a/libjava/gnu/javax/print/PrintUriException.h b/libjava/gnu/javax/print/PrintUriException.h
deleted file mode 100644
index 716edb8..0000000
--- a/libjava/gnu/javax/print/PrintUriException.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrintUriException__
-#define __gnu_javax_print_PrintUriException__
-
-#pragma interface
-
-#include <javax/print/PrintException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrintUriException;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::PrintUriException : public ::javax::print::PrintException
-{
-
-public:
-  PrintUriException(jint, ::java::net::URI *);
-  PrintUriException(::java::lang::Exception *, jint, ::java::net::URI *);
-  PrintUriException(::java::lang::String *, jint, ::java::net::URI *);
-  PrintUriException(::java::lang::String *, ::java::lang::Exception *, jint, ::java::net::URI *);
-  jint getReason();
-  ::java::net::URI * getUnsupportedURI();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::print::PrintException)))) reason;
-  ::java::net::URI * uri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrintUriException__
diff --git a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Color.h b/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Color.h
deleted file mode 100644
index e05e7e9..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Color.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$AppearancePanel$Color__
-#define __gnu_javax_print_PrinterDialog$AppearancePanel$Color__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$AppearancePanel$Color;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRadioButton;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$AppearancePanel$Color : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$AppearancePanel$Color(::gnu::javax::print::PrinterDialog$AppearancePanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) bw;
-  ::javax::swing::JRadioButton * color;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$AppearancePanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$AppearancePanel$Color__
diff --git a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.h b/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.h
deleted file mode 100644
index c5570cf..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$AppearancePanel$JobAttributes__
-#define __gnu_javax_print_PrinterDialog$AppearancePanel$JobAttributes__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$AppearancePanel$JobAttributes;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JCheckBox;
-        class JLabel;
-        class JSpinner;
-        class JTextField;
-        class SpinnerNumberModel;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$AppearancePanel$JobAttributes : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$AppearancePanel$JobAttributes(::gnu::javax::print::PrinterDialog$AppearancePanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void updateTextfields(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) jobname;
-  ::javax::swing::JLabel * username;
-  ::javax::swing::JLabel * priority_lb;
-  ::javax::swing::JTextField * jobname_tf;
-  ::javax::swing::JTextField * username_tf;
-  ::javax::swing::JCheckBox * cover;
-  ::javax::swing::JSpinner * priority;
-  ::javax::swing::SpinnerNumberModel * model;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$AppearancePanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$AppearancePanel$JobAttributes__
diff --git a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.h b/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.h
deleted file mode 100644
index 65ca5ac..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$AppearancePanel$Quality__
-#define __gnu_javax_print_PrinterDialog$AppearancePanel$Quality__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$AppearancePanel$Quality;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ButtonGroup;
-        class JRadioButton;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$AppearancePanel$Quality : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$AppearancePanel$Quality(::gnu::javax::print::PrinterDialog$AppearancePanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) low;
-  ::javax::swing::JRadioButton * normal;
-  ::javax::swing::JRadioButton * high;
-  ::javax::swing::ButtonGroup * group;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$AppearancePanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$AppearancePanel$Quality__
diff --git a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.h b/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.h
deleted file mode 100644
index 2720064..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$AppearancePanel$SidesPanel__
-#define __gnu_javax_print_PrinterDialog$AppearancePanel$SidesPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$AppearancePanel$SidesPanel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRadioButton;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$AppearancePanel$SidesPanel : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$AppearancePanel$SidesPanel(::gnu::javax::print::PrinterDialog$AppearancePanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) oneside;
-  ::javax::swing::JRadioButton * calendar;
-  ::javax::swing::JRadioButton * duplex;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$AppearancePanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$AppearancePanel$SidesPanel__
diff --git a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel.h b/libjava/gnu/javax/print/PrinterDialog$AppearancePanel.h
deleted file mode 100644
index 6e77b26..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$AppearancePanel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$AppearancePanel__
-#define __gnu_javax_print_PrinterDialog$AppearancePanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog;
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$AppearancePanel$Color;
-          class PrinterDialog$AppearancePanel$JobAttributes;
-          class PrinterDialog$AppearancePanel$Quality;
-          class PrinterDialog$AppearancePanel$SidesPanel;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$AppearancePanel : public ::javax::swing::JPanel
-{
-
-public:
-  PrinterDialog$AppearancePanel(::gnu::javax::print::PrinterDialog *);
-public: // actually package-private
-  void update();
-  static ::gnu::javax::print::PrinterDialog * access$0(::gnu::javax::print::PrinterDialog$AppearancePanel *);
-private:
-  ::gnu::javax::print::PrinterDialog$AppearancePanel$Quality * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) quality_panel;
-  ::gnu::javax::print::PrinterDialog$AppearancePanel$JobAttributes * jobAttr_panel;
-  ::gnu::javax::print::PrinterDialog$AppearancePanel$SidesPanel * sides_panel;
-  ::gnu::javax::print::PrinterDialog$AppearancePanel$Color * chromaticy_panel;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$AppearancePanel__
diff --git a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.h b/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.h
deleted file mode 100644
index 4e95c93..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$GeneralPanel$CopiesAndSorted__
-#define __gnu_javax_print_PrinterDialog$GeneralPanel$CopiesAndSorted__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$GeneralPanel;
-          class PrinterDialog$GeneralPanel$CopiesAndSorted;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JCheckBox;
-        class JLabel;
-        class JSpinner;
-        class SpinnerNumberModel;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$GeneralPanel$CopiesAndSorted : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$GeneralPanel$CopiesAndSorted(::gnu::javax::print::PrinterDialog$GeneralPanel *);
-public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) sort;
-  ::javax::swing::JSpinner * copies;
-  ::javax::swing::JLabel * copies_lb;
-  ::javax::swing::SpinnerNumberModel * copiesModel;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$GeneralPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$GeneralPanel$CopiesAndSorted__
diff --git a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.h b/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.h
deleted file mode 100644
index dd9e76f..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$GeneralPanel$PrintRange__
-#define __gnu_javax_print_PrinterDialog$GeneralPanel$PrintRange__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$GeneralPanel;
-          class PrinterDialog$GeneralPanel$PrintRange;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLabel;
-        class JRadioButton;
-        class JTextField;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$GeneralPanel$PrintRange : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$GeneralPanel$PrintRange(::gnu::javax::print::PrinterDialog$GeneralPanel *);
-public:
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void updatePageRanges();
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) to;
-  ::javax::swing::JRadioButton * all_rb;
-  ::javax::swing::JRadioButton * pages_rb;
-  ::javax::swing::JTextField * from_tf;
-  ::javax::swing::JTextField * to_tf;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$GeneralPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$GeneralPanel$PrintRange__
diff --git a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.h b/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.h
deleted file mode 100644
index 1ef5241..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$GeneralPanel$PrintServices__
-#define __gnu_javax_print_PrinterDialog$GeneralPanel$PrintServices__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$GeneralPanel;
-          class PrinterDialog$GeneralPanel$PrintServices;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JCheckBox;
-        class JComboBox;
-        class JLabel;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$GeneralPanel$PrintServices : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$GeneralPanel$PrintServices(::gnu::javax::print::PrinterDialog$GeneralPanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) name;
-  ::javax::swing::JLabel * status;
-  ::javax::swing::JLabel * typ;
-  ::javax::swing::JLabel * info;
-  ::javax::swing::JLabel * statusValue;
-  ::javax::swing::JLabel * typValue;
-  ::javax::swing::JLabel * infoValue;
-  ::javax::swing::JButton * attributes;
-  ::javax::swing::JComboBox * services_cob;
-  ::javax::swing::JCheckBox * fileRedirection_cb;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$GeneralPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$GeneralPanel$PrintServices__
diff --git a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel.h b/libjava/gnu/javax/print/PrinterDialog$GeneralPanel.h
deleted file mode 100644
index c4161e0..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$GeneralPanel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$GeneralPanel__
-#define __gnu_javax_print_PrinterDialog$GeneralPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog;
-          class PrinterDialog$GeneralPanel;
-          class PrinterDialog$GeneralPanel$CopiesAndSorted;
-          class PrinterDialog$GeneralPanel$PrintRange;
-          class PrinterDialog$GeneralPanel$PrintServices;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$GeneralPanel : public ::javax::swing::JPanel
-{
-
-public:
-  PrinterDialog$GeneralPanel(::gnu::javax::print::PrinterDialog *);
-public: // actually package-private
-  void update();
-  static ::gnu::javax::print::PrinterDialog * access$0(::gnu::javax::print::PrinterDialog$GeneralPanel *);
-private:
-  ::gnu::javax::print::PrinterDialog$GeneralPanel$PrintServices * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) printserv_panel;
-  ::gnu::javax::print::PrinterDialog$GeneralPanel$PrintRange * printrange_panel;
-  ::gnu::javax::print::PrinterDialog$GeneralPanel$CopiesAndSorted * copies;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$GeneralPanel__
diff --git a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.h b/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.h
deleted file mode 100644
index 988f224..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$PageSetupPanel$Margins__
-#define __gnu_javax_print_PrinterDialog$PageSetupPanel$Margins__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$PageSetupPanel;
-          class PrinterDialog$PageSetupPanel$Margins;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLabel;
-        class JTextField;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$PageSetupPanel$Margins : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$PageSetupPanel$Margins(::gnu::javax::print::PrinterDialog$PageSetupPanel *);
-public:
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void updateMargins();
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) left;
-  ::javax::swing::JLabel * right;
-  ::javax::swing::JLabel * top;
-  ::javax::swing::JLabel * bottom;
-  ::javax::swing::JTextField * left_tf;
-  ::javax::swing::JTextField * right_tf;
-  ::javax::swing::JTextField * top_tf;
-  ::javax::swing::JTextField * bottom_tf;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$PageSetupPanel$Margins__
diff --git a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.h b/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.h
deleted file mode 100644
index 0cfdca9..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$PageSetupPanel$MediaTypes__
-#define __gnu_javax_print_PrinterDialog$PageSetupPanel$MediaTypes__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$PageSetupPanel;
-          class PrinterDialog$PageSetupPanel$MediaTypes;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-        class JLabel;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$PageSetupPanel$MediaTypes : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$PageSetupPanel$MediaTypes(::gnu::javax::print::PrinterDialog$PageSetupPanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) size_lb;
-  ::javax::swing::JLabel * source_lb;
-  ::javax::swing::JComboBox * size;
-  ::javax::swing::JComboBox * source;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$PageSetupPanel$MediaTypes__
diff --git a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.h b/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.h
deleted file mode 100644
index 3a665d5..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$PageSetupPanel$Orientation__
-#define __gnu_javax_print_PrinterDialog$PageSetupPanel$Orientation__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog$PageSetupPanel;
-          class PrinterDialog$PageSetupPanel$Orientation;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRadioButton;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$PageSetupPanel$Orientation : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  PrinterDialog$PageSetupPanel$Orientation(::gnu::javax::print::PrinterDialog$PageSetupPanel *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  void updateForSelectedService();
-private:
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) portrait;
-  ::javax::swing::JRadioButton * landscape;
-  ::javax::swing::JRadioButton * rev_portrait;
-  ::javax::swing::JRadioButton * rev_landscape;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$PageSetupPanel$Orientation__
diff --git a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel.h b/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel.h
deleted file mode 100644
index d875194..0000000
--- a/libjava/gnu/javax/print/PrinterDialog$PageSetupPanel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog$PageSetupPanel__
-#define __gnu_javax_print_PrinterDialog$PageSetupPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog;
-          class PrinterDialog$PageSetupPanel;
-          class PrinterDialog$PageSetupPanel$Margins;
-          class PrinterDialog$PageSetupPanel$MediaTypes;
-          class PrinterDialog$PageSetupPanel$Orientation;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog$PageSetupPanel : public ::javax::swing::JPanel
-{
-
-public:
-  PrinterDialog$PageSetupPanel(::gnu::javax::print::PrinterDialog *);
-public: // actually package-private
-  void update();
-  static ::gnu::javax::print::PrinterDialog * access$0(::gnu::javax::print::PrinterDialog$PageSetupPanel *);
-private:
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel$MediaTypes * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) media_panel;
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel$Orientation * orientation_panel;
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel$Margins * margins_panel;
-public: // actually package-private
-  ::gnu::javax::print::PrinterDialog * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog$PageSetupPanel__
diff --git a/libjava/gnu/javax/print/PrinterDialog.h b/libjava/gnu/javax/print/PrinterDialog.h
deleted file mode 100644
index 4c11411..0000000
--- a/libjava/gnu/javax/print/PrinterDialog.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_PrinterDialog__
-#define __gnu_javax_print_PrinterDialog__
-
-#pragma interface
-
-#include <javax/swing/JDialog.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class PrinterDialog;
-          class PrinterDialog$AppearancePanel;
-          class PrinterDialog$GeneralPanel;
-          class PrinterDialog$PageSetupPanel;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class PrintService;
-      namespace attribute
-      {
-          class Attribute;
-          class PrintRequestAttributeSet;
-      }
-    }
-    namespace swing
-    {
-        class JButton;
-    }
-  }
-}
-
-class gnu::javax::print::PrinterDialog : public ::javax::swing::JDialog
-{
-
-  PrinterDialog(::java::awt::GraphicsConfiguration *, JArray< ::javax::print::PrintService * > *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *, jboolean, ::java::lang::String *);
-public:
-  PrinterDialog(::java::awt::GraphicsConfiguration *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  PrinterDialog(::java::awt::GraphicsConfiguration *, JArray< ::javax::print::PrintService * > *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *);
-private:
-  void initUI(jboolean);
-public:
-  ::javax::print::attribute::PrintRequestAttributeSet * getAttributes();
-  ::javax::print::PrintService * getSelectedPrintService();
-public: // actually protected
-  void setSelectedPrintService(::javax::print::PrintService *);
-  JArray< ::javax::print::PrintService * > * getPrintServices();
-public: // actually package-private
-  void updateAll();
-  jboolean categorySupported(::java::lang::Class *);
-  ::java::lang::Object * defaultValue(::java::lang::Class *);
-  ::javax::print::attribute::Attribute * attribute(::java::lang::Class *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  static ::java::lang::String * getLocalizedString(::java::lang::String *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * access$0(::gnu::javax::print::PrinterDialog *);
-  static ::javax::print::DocFlavor * access$1(::gnu::javax::print::PrinterDialog *);
-private:
-  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::JDialog)))) ok_bt;
-  ::javax::swing::JButton * cancel_bt;
-  ::gnu::javax::print::PrinterDialog$GeneralPanel * general_panel;
-  ::gnu::javax::print::PrinterDialog$PageSetupPanel * pagesetup_panel;
-  ::gnu::javax::print::PrinterDialog$AppearancePanel * appearance_panel;
-  JArray< ::javax::print::PrintService * > * services;
-  ::javax::print::PrintService * defaultService;
-  ::javax::print::PrintService * selectedService;
-  ::javax::print::DocFlavor * flavor;
-  ::javax::print::attribute::PrintRequestAttributeSet * attributes;
-  jboolean onlyPageDialog;
-  ::javax::print::attribute::PrintRequestAttributeSet * atts;
-  static ::java::util::ResourceBundle * messages;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_PrinterDialog__
diff --git a/libjava/gnu/javax/print/ipp/DocPrintJobImpl.h b/libjava/gnu/javax/print/ipp/DocPrintJobImpl.h
deleted file mode 100644
index a0d6a89..0000000
--- a/libjava/gnu/javax/print/ipp/DocPrintJobImpl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_DocPrintJobImpl__
-#define __gnu_javax_print_ipp_DocPrintJobImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class DocPrintJobImpl;
-            class IppPrintService;
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobId;
-                class JobUri;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-        namespace standard
-        {
-            class RequestingUserName;
-        }
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobEvent;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::DocPrintJobImpl : public ::java::lang::Object
-{
-
-public:
-  DocPrintJobImpl(::gnu::javax::print::ipp::IppPrintService *, ::java::lang::String *, ::java::lang::String *);
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *);
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *);
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes();
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *);
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *);
-  virtual void cancel();
-private:
-  void notifyPrintJobListeners(::javax::print::event::PrintJobEvent *);
-  ::gnu::javax::print::ipp::IppPrintService * __attribute__((aligned(__alignof__( ::java::lang::Object)))) service;
-  ::java::util::HashSet * printJobListener;
-  ::java::util::ArrayList * attributesListener;
-  ::java::util::ArrayList * attributesListenerAttributes;
-  ::java::lang::String * username;
-  ::java::lang::String * password;
-  ::gnu::javax::print::ipp::attribute::job::JobUri * jobUri;
-  ::gnu::javax::print::ipp::attribute::job::JobId * jobId;
-  ::javax::print::attribute::standard::RequestingUserName * requestingUser;
-  ::javax::print::attribute::PrintJobAttributeSet * oldSet;
-  ::javax::print::attribute::PrintJobAttributeSet * currentSet;
-  jboolean printing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_DocPrintJobImpl__
diff --git a/libjava/gnu/javax/print/ipp/IppDelimiterTag.h b/libjava/gnu/javax/print/ipp/IppDelimiterTag.h
deleted file mode 100644
index cd8a06d..0000000
--- a/libjava/gnu/javax/print/ipp/IppDelimiterTag.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppDelimiterTag__
-#define __gnu_javax_print_ipp_IppDelimiterTag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppDelimiterTag;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppDelimiterTag : public ::java::lang::Object
-{
-
-  IppDelimiterTag();
-public:
-  static jboolean isDelimiterTag(jbyte);
-  static const jbyte OPERATION_ATTRIBUTES_TAG = 1;
-  static const jbyte JOB_ATTRIBUTES_TAG = 2;
-  static const jbyte END_OF_ATTRIBUTES_TAG = 3;
-  static const jbyte PRINTER_ATTRIBUTES_TAG = 4;
-  static const jbyte UNSUPPORTED_ATTRIBUTES_TAG = 5;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppDelimiterTag__
diff --git a/libjava/gnu/javax/print/ipp/IppException.h b/libjava/gnu/javax/print/ipp/IppException.h
deleted file mode 100644
index 8e38d40..0000000
--- a/libjava/gnu/javax/print/ipp/IppException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppException__
-#define __gnu_javax_print_ipp_IppException__
-
-#pragma interface
-
-#include <javax/print/PrintException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppException : public ::javax::print::PrintException
-{
-
-public:
-  IppException();
-  IppException(::java::lang::String *);
-  IppException(::java::lang::Exception *);
-  IppException(::java::lang::String *, ::java::lang::Exception *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppException__
diff --git a/libjava/gnu/javax/print/ipp/IppMultiDocPrintService.h b/libjava/gnu/javax/print/ipp/IppMultiDocPrintService.h
deleted file mode 100644
index e9da502..0000000
--- a/libjava/gnu/javax/print/ipp/IppMultiDocPrintService.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppMultiDocPrintService__
-#define __gnu_javax_print_ipp_IppMultiDocPrintService__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/IppPrintService.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppMultiDocPrintService;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class MultiDocPrintJob;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppMultiDocPrintService : public ::gnu::javax::print::ipp::IppPrintService
-{
-
-public:
-  IppMultiDocPrintService(::java::net::URI *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::print::MultiDocPrintJob * createMultiDocPrintJob();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::print::ipp::IppPrintService)))) user;
-  ::java::lang::String * passwd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppMultiDocPrintService__
diff --git a/libjava/gnu/javax/print/ipp/IppPrintService.h b/libjava/gnu/javax/print/ipp/IppPrintService.h
deleted file mode 100644
index cbe6022..0000000
--- a/libjava/gnu/javax/print/ipp/IppPrintService.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppPrintService__
-#define __gnu_javax_print_ipp_IppPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppPrintService;
-            class IppResponse;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-        namespace standard
-        {
-            class JobName;
-            class PrinterURI;
-            class RequestingUserName;
-        }
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppPrintService : public ::java::lang::Object
-{
-
-public:
-  IppPrintService(::java::net::URI *, ::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::util::Map * getPrinterAttributes();
-  ::java::util::Set * getPrinterAttributeSet(::java::lang::Class *);
-  ::javax::print::attribute::Attribute * getPrinterDefaultAttribute(::java::lang::Class *);
-  void processResponse();
-public:
-  virtual ::javax::print::DocPrintJob * createPrintJob();
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *);
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes();
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory();
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories();
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-public: // actually protected
-  virtual ::java::lang::Object * handleSupportedAttributeValuesResponse(::gnu::javax::print::ipp::IppResponse *, ::java::lang::Class *);
-public:
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors();
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *);
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *);
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *);
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *);
-  virtual ::java::lang::String * toString();
-  virtual ::javax::print::attribute::standard::PrinterURI * getPrinterURI();
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printerAttr;
-  ::java::util::HashSet * printServiceAttributeListener;
-  ::java::lang::String * user;
-  ::java::lang::String * passwd;
-  ::java::lang::String * name;
-  ::java::util::List * flavors;
-  ::javax::print::attribute::standard::PrinterURI * printerUri;
-  ::java::util::ArrayList * printerUris;
-public: // actually package-private
-  static ::java::util::logging::Logger * logger;
-public:
-  static ::javax::print::attribute::standard::RequestingUserName * REQUESTING_USER_NAME;
-  static ::javax::print::attribute::standard::JobName * JOB_NAME;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppPrintService__
diff --git a/libjava/gnu/javax/print/ipp/IppRequest$RequestWriter.h b/libjava/gnu/javax/print/ipp/IppRequest$RequestWriter.h
deleted file mode 100644
index 515c231..0000000
--- a/libjava/gnu/javax/print/ipp/IppRequest$RequestWriter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppRequest$RequestWriter__
-#define __gnu_javax_print_ipp_IppRequest$RequestWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppRequest;
-            class IppRequest$RequestWriter;
-          namespace attribute
-          {
-              class CharsetSyntax;
-              class NaturalLanguageSyntax;
-              class RequestedAttributes;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSet;
-          class DateTimeSyntax;
-          class EnumSyntax;
-          class IntegerSyntax;
-          class ResolutionSyntax;
-          class SetOfIntegerSyntax;
-          class TextSyntax;
-          class URISyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppRequest$RequestWriter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  IppRequest$RequestWriter(::gnu::javax::print::ipp::IppRequest *, ::java::io::DataOutputStream *);
-private:
-  void write(::javax::print::attribute::IntegerSyntax *);
-  void write(::javax::print::attribute::EnumSyntax *);
-  void write(::javax::print::attribute::SetOfIntegerSyntax *);
-  void write(::javax::print::attribute::ResolutionSyntax *);
-  void write(::javax::print::attribute::DateTimeSyntax *);
-  void write(::javax::print::attribute::TextSyntax *);
-  void write(::javax::print::attribute::URISyntax *);
-  void write(::gnu::javax::print::ipp::attribute::CharsetSyntax *);
-  void write(::gnu::javax::print::ipp::attribute::NaturalLanguageSyntax *);
-  void write(::gnu::javax::print::ipp::attribute::RequestedAttributes *);
-public:
-  virtual void writeOperationAttributes(::javax::print::attribute::AttributeSet *);
-  virtual void writeAttributes(::javax::print::attribute::AttributeSet *);
-private:
-  ::java::io::DataOutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
-public: // actually package-private
-  ::gnu::javax::print::ipp::IppRequest * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppRequest$RequestWriter__
diff --git a/libjava/gnu/javax/print/ipp/IppRequest.h b/libjava/gnu/javax/print/ipp/IppRequest.h
deleted file mode 100644
index 069f964..0000000
--- a/libjava/gnu/javax/print/ipp/IppRequest.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppRequest__
-#define __gnu_javax_print_ipp_IppRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppRequest;
-            class IppResponse;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class HttpURLConnection;
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppRequest : public ::java::lang::Object
-{
-
-public:
-  IppRequest(::java::net::URI *, ::java::lang::String *, ::java::lang::String *);
-private:
-  jint incrementRequestIdCounter();
-public:
-  virtual jint getRequestID();
-  virtual void setData(::java::io::InputStream *);
-  virtual void setData(JArray< jbyte > *);
-  virtual void setOperationID(jshort);
-  virtual void setOperationAttributeDefaults();
-  virtual void addJobAttribute(::javax::print::attribute::Attribute *);
-  virtual void addPrinterAttributes(::javax::print::attribute::Attribute *);
-  virtual void addOperationAttribute(::javax::print::attribute::Attribute *);
-  virtual void addAndFilterJobOperationAttributes(::javax::print::attribute::AttributeSet *);
-  virtual void addAndFilterJobTemplateAttributes(::javax::print::attribute::AttributeSet *);
-  virtual ::gnu::javax::print::ipp::IppResponse * send();
-private:
-  static const jint timeout = 1000;
-public: // actually package-private
-  static ::java::util::logging::Logger * logger;
-private:
-  static jint requestIdCounter;
-  static const jshort VERSION = 257;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) alreadySent;
-  jshort operation_id;
-  jint request_id;
-  ::javax::print::attribute::AttributeSet * operationAttributes;
-  ::javax::print::attribute::AttributeSet * printerAttributes;
-  ::javax::print::attribute::AttributeSet * jobAttributes;
-  ::java::lang::Object * data;
-  ::java::net::URI * requestUri;
-  ::java::net::HttpURLConnection * connection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppRequest__
diff --git a/libjava/gnu/javax/print/ipp/IppResponse$ResponseReader.h b/libjava/gnu/javax/print/ipp/IppResponse$ResponseReader.h
deleted file mode 100644
index 5f7dc2f..0000000
--- a/libjava/gnu/javax/print/ipp/IppResponse$ResponseReader.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppResponse$ResponseReader__
-#define __gnu_javax_print_ipp_IppResponse$ResponseReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppResponse;
-            class IppResponse$ResponseReader;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-        namespace standard
-        {
-            class JobStateReasons;
-            class PrinterStateReasons;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppResponse$ResponseReader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  IppResponse$ResponseReader(::gnu::javax::print::ipp::IppResponse *);
-public:
-  virtual void parseResponse(::java::io::InputStream *);
-private:
-  jbyte parseAttributes(::java::util::Map *, ::java::io::DataInputStream *);
-  void addAttribute(::java::util::Map *, ::javax::print::attribute::Attribute *);
-  ::javax::print::attribute::standard::PrinterStateReasons * parsePrinterStateReasons(JArray< jbyte > *, ::javax::print::attribute::Attribute *);
-  ::javax::print::attribute::standard::JobStateReasons * parseJobStateReasons(JArray< jbyte > *, ::javax::print::attribute::Attribute *);
-  ::java::util::Date * parseDate(JArray< jbyte > *);
-  static const jshort VERSION = 257;
-public: // actually package-private
-  ::gnu::javax::print::ipp::IppResponse * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppResponse$ResponseReader__
diff --git a/libjava/gnu/javax/print/ipp/IppResponse.h b/libjava/gnu/javax/print/ipp/IppResponse.h
deleted file mode 100644
index 468b713..0000000
--- a/libjava/gnu/javax/print/ipp/IppResponse.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppResponse__
-#define __gnu_javax_print_ipp_IppResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppResponse;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppResponse : public ::java::lang::Object
-{
-
-public:
-  IppResponse(::java::net::URI *, jshort);
-public: // actually protected
-  virtual void setResponseData(::java::io::InputStream *);
-public:
-  virtual ::java::net::URI * getURI();
-  virtual jint getOperationID();
-  virtual ::java::util::List * getJobAttributes();
-  virtual ::java::util::List * getOperationAttributes();
-  virtual ::java::util::List * getPrinterAttributes();
-  virtual jint getRequestID();
-  virtual jshort getStatusCode();
-  virtual ::java::util::List * getUnsupportedAttributes();
-  virtual JArray< jbyte > * getData();
-public: // actually package-private
-  static ::java::util::logging::Logger * logger;
-  ::java::net::URI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-  jshort operation_id;
-  jshort status_code;
-  jint request_id;
-  ::java::util::List * operationAttributes;
-  ::java::util::List * printerAttributes;
-  ::java::util::List * jobAttributes;
-  ::java::util::List * unsupportedAttributes;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppResponse__
diff --git a/libjava/gnu/javax/print/ipp/IppStatusCode.h b/libjava/gnu/javax/print/ipp/IppStatusCode.h
deleted file mode 100644
index dd3eb0d..0000000
--- a/libjava/gnu/javax/print/ipp/IppStatusCode.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppStatusCode__
-#define __gnu_javax_print_ipp_IppStatusCode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppStatusCode;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppStatusCode : public ::java::lang::Object
-{
-
-  IppStatusCode();
-public:
-  static const jint SUCCESSFUL_OK = 0;
-  static const jint SUCCESSFUL_OK_IGNORED_OR_SUBSTITUED_ATTRIBUTES = 1;
-  static const jint SUCCESSFUL_OK_CONFLICTING_ATTRIBUTES = 2;
-  static const jint CLIENT_ERROR_BAD_REQUEST = 1024;
-  static const jint CLIENT_ERROR_FORBIDDEN = 1025;
-  static const jint CLIENT_ERROR_NOT_AUTHENTICATED = 1026;
-  static const jint CLIENT_ERROR_NOT_AUTHORIZED = 1027;
-  static const jint CLIENT_ERROR_NOT_POSSIBLE = 1028;
-  static const jint CLIENT_ERROR_TIMEOUT = 1029;
-  static const jint CLIENT_ERROR_NOT_FOUND = 1030;
-  static const jint CLIENT_ERROR_GONE = 1031;
-  static const jint CLIENT_ERROR_REQUEST_ENTITY_TOO_LONG = 1032;
-  static const jint CLIENT_ERROR_REQUEST_VALUE_TOO_LONG = 1033;
-  static const jint CLIENT_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED = 1034;
-  static const jint CLIENT_ERROR_ATTRIBUTES_OR_VALUES_NOT_SUPPORTED = 1035;
-  static const jint CLIENT_ERROR_URI_SCHEME_NOT_SUPPORTED = 1036;
-  static const jint CLIENT_ERROR_CHARSET_NOT_SUPPORTED = 1037;
-  static const jint CLIENT_ERROR_CONFLICTING_ATTRIBUTES = 1038;
-  static const jint CLIENT_ERROR_COMPRESSION_NOT_SUPPORTED = 1039;
-  static const jint CLIENT_ERROR_COMPRESSION_ERROR = 1040;
-  static const jint CLIENT_ERROR_DOCUMENT_FORMAT_ERROR = 1041;
-  static const jint CLIENT_ERROR_DOCUMENT_ACCESS_ERROR = 1042;
-  static const jint SERVER_ERROR_INTERNAL_ERROR = 1280;
-  static const jint SERVER_ERROR_OPERATION_NOT_SUPPORTED = 1281;
-  static const jint SERVER_ERROR_SERVICE_UNAVAILABLE = 1282;
-  static const jint SERVER_ERROR_VERSION_NOT_SUPPORTED = 1283;
-  static const jint SERVER_ERROR_DEVICE_ERROR = 1284;
-  static const jint SERVER_ERROR_TEMPORARY_ERROR = 1285;
-  static const jint SERVER_ERROR_NOT_ACCEPTING_JOBS = 1286;
-  static const jint SERVER_ERROR_BUSY = 1287;
-  static const jint SERVER_ERROR_JOB_CANCELED = 1288;
-  static const jint SERVER_ERROR_MULTIPLE_DOCUMENT_JOBS_NOT_SUPPORTED = 1289;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppStatusCode__
diff --git a/libjava/gnu/javax/print/ipp/IppUtilities.h b/libjava/gnu/javax/print/ipp/IppUtilities.h
deleted file mode 100644
index 000723f..0000000
--- a/libjava/gnu/javax/print/ipp/IppUtilities.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppUtilities__
-#define __gnu_javax_print_ipp_IppUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppUtilities;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppUtilities : public ::java::lang::Object
-{
-
-  IppUtilities();
-public:
-  static ::java::lang::Class * getClass(::java::lang::String *);
-  static ::java::lang::String * getSupportedAttrName(::java::lang::Class *);
-  static ::java::lang::Class * getSupportedCategory(::java::lang::Class *);
-  static jint convertToInt(JArray< jbyte > *);
-  static jint convertToInt(jbyte, jbyte, jbyte, jbyte);
-  static jshort convertToShort(jbyte, jbyte);
-  static ::javax::print::attribute::Attribute * getEnumAttribute(::java::lang::String *, ::java::lang::Object *);
-  static ::javax::print::attribute::Attribute * getIntegerAttribute(::java::lang::String *, jint);
-  static ::javax::print::attribute::Attribute * getTextAttribute(::java::lang::String *, jbyte, JArray< jbyte > *);
-private:
-  static JArray< ::java::lang::Object * > * INTEGER_ATT_VALUE;
-  static JArray< ::java::lang::Class * > * INTEGER_CLASS_ARRAY;
-  static JArray< ::java::lang::Object * > * TEXT_ATT_VALUE;
-  static JArray< ::java::lang::Class * > * TEXT_CLASS_ARRAY;
-  static ::java::util::HashMap * classesByName;
-  static ::java::util::HashMap * instanceByClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppUtilities__
diff --git a/libjava/gnu/javax/print/ipp/IppValueTag.h b/libjava/gnu/javax/print/ipp/IppValueTag.h
deleted file mode 100644
index 341f87c..0000000
--- a/libjava/gnu/javax/print/ipp/IppValueTag.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_IppValueTag__
-#define __gnu_javax_print_ipp_IppValueTag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppValueTag;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::IppValueTag : public ::java::lang::Object
-{
-
-  IppValueTag();
-public:
-  static jboolean isValueTag(jbyte);
-  static const jbyte UNSUPPORTED = 16;
-  static const jbyte UNKNOWN = 18;
-  static const jbyte NO_VALUE = 19;
-  static const jbyte INTEGER = 33;
-  static const jbyte BOOLEAN = 34;
-  static const jbyte ENUM = 35;
-  static const jbyte OCTECTSTRING_UNSPECIFIED = 48;
-  static const jbyte DATETIME = 49;
-  static const jbyte RESOLUTION = 50;
-  static const jbyte RANGEOFINTEGER = 51;
-  static const jbyte TEXT_WITH_LANGUAGE = 53;
-  static const jbyte NAME_WITH_LANGUAGE = 54;
-  static const jbyte TEXT_WITHOUT_LANGUAGE = 65;
-  static const jbyte NAME_WITHOUT_LANGUAGE = 66;
-  static const jbyte KEYWORD = 68;
-  static const jbyte URI = 69;
-  static const jbyte URI_SCHEME = 70;
-  static const jbyte CHARSET = 71;
-  static const jbyte NATURAL_LANGUAGE = 72;
-  static const jbyte MIME_MEDIA_TYPE = 73;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_IppValueTag__
diff --git a/libjava/gnu/javax/print/ipp/MultiDocPrintJobImpl.h b/libjava/gnu/javax/print/ipp/MultiDocPrintJobImpl.h
deleted file mode 100644
index dbe7cd8..0000000
--- a/libjava/gnu/javax/print/ipp/MultiDocPrintJobImpl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_MultiDocPrintJobImpl__
-#define __gnu_javax_print_ipp_MultiDocPrintJobImpl__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/DocPrintJobImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-            class IppPrintService;
-            class MultiDocPrintJobImpl;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class MultiDoc;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::MultiDocPrintJobImpl : public ::gnu::javax::print::ipp::DocPrintJobImpl
-{
-
-public:
-  MultiDocPrintJobImpl(::gnu::javax::print::ipp::IppPrintService *, ::java::lang::String *, ::java::lang::String *);
-  virtual void print(::javax::print::MultiDoc *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_MultiDocPrintJobImpl__
diff --git a/libjava/gnu/javax/print/ipp/attribute/CharsetSyntax.h b/libjava/gnu/javax/print/ipp/attribute/CharsetSyntax.h
deleted file mode 100644
index bc02d4b..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/CharsetSyntax.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_CharsetSyntax__
-#define __gnu_javax_print_ipp_attribute_CharsetSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class CharsetSyntax;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::CharsetSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  CharsetSyntax(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getValue();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_CharsetSyntax__
diff --git a/libjava/gnu/javax/print/ipp/attribute/DefaultValueAttribute.h b/libjava/gnu/javax/print/ipp/attribute/DefaultValueAttribute.h
deleted file mode 100644
index 25c1c01..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/DefaultValueAttribute.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_DefaultValueAttribute__
-#define __gnu_javax_print_ipp_attribute_DefaultValueAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class DefaultValueAttribute;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::DefaultValueAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::attribute::Attribute * getAssociatedAttribute() = 0;
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_print_ipp_attribute_DefaultValueAttribute__
diff --git a/libjava/gnu/javax/print/ipp/attribute/DetailedStatusMessage.h b/libjava/gnu/javax/print/ipp/attribute/DetailedStatusMessage.h
deleted file mode 100644
index 0b0be10..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/DetailedStatusMessage.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_DetailedStatusMessage__
-#define __gnu_javax_print_ipp_attribute_DetailedStatusMessage__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class DetailedStatusMessage;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::DetailedStatusMessage : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DetailedStatusMessage(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_DetailedStatusMessage__
diff --git a/libjava/gnu/javax/print/ipp/attribute/DocumentAccessError.h b/libjava/gnu/javax/print/ipp/attribute/DocumentAccessError.h
deleted file mode 100644
index 8a641a0..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/DocumentAccessError.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_DocumentAccessError__
-#define __gnu_javax_print_ipp_attribute_DocumentAccessError__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class DocumentAccessError;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::DocumentAccessError : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentAccessError(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_DocumentAccessError__
diff --git a/libjava/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h b/libjava/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h
deleted file mode 100644
index 7913233..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_NaturalLanguageSyntax__
-#define __gnu_javax_print_ipp_attribute_NaturalLanguageSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class NaturalLanguageSyntax;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::NaturalLanguageSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  NaturalLanguageSyntax(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getValue();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_NaturalLanguageSyntax__
diff --git a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h b/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
deleted file mode 100644
index 9a4b256..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_RequestedAttributes__
-#define __gnu_javax_print_ipp_attribute_RequestedAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class RequestedAttributes;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::RequestedAttributes : public ::java::lang::Object
-{
-
-public:
-  RequestedAttributes(::java::lang::String *);
-  void addValue(::java::lang::String *);
-  JArray< ::java::lang::String * > * getValues();
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::java::lang::String * toString();
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_RequestedAttributes__
diff --git a/libjava/gnu/javax/print/ipp/attribute/StatusMessage.h b/libjava/gnu/javax/print/ipp/attribute/StatusMessage.h
deleted file mode 100644
index b87c980..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/StatusMessage.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_StatusMessage__
-#define __gnu_javax_print_ipp_attribute_StatusMessage__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class StatusMessage;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::StatusMessage : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  StatusMessage(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_StatusMessage__
diff --git a/libjava/gnu/javax/print/ipp/attribute/UnknownAttribute.h b/libjava/gnu/javax/print/ipp/attribute/UnknownAttribute.h
deleted file mode 100644
index dc6aa65..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/UnknownAttribute.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_UnknownAttribute__
-#define __gnu_javax_print_ipp_attribute_UnknownAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-              class UnknownAttribute;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::UnknownAttribute : public ::java::lang::Object
-{
-
-public:
-  UnknownAttribute(jbyte, ::java::lang::String *, JArray< jbyte > *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jbyte getValueTag();
-  ::java::lang::String * getAttributeName();
-  JArray< jbyte > * getAttributeValue();
-  ::java::lang::String * getAttributeValueAsString();
-  jint getAttributeValueAsInt();
-  ::java::net::URI * getAttributeValueAsUri();
-  ::java::lang::String * toString();
-private:
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) tag;
-  ::java::lang::String * name;
-  JArray< jbyte > * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_UnknownAttribute__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.h
deleted file mode 100644
index 2a0c003..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_CopiesDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_CopiesDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class CopiesDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::CopiesDefault : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  CopiesDefault(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_CopiesDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.h
deleted file mode 100644
index d86ecde..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_DocumentFormatDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_DocumentFormatDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class DocumentFormatDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::DocumentFormatDefault : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentFormatDefault(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_DocumentFormatDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.h
deleted file mode 100644
index 97a6f4a..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_FinishingsDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_FinishingsDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class FinishingsDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::FinishingsDefault : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  FinishingsDefault(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * NONE;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * COVER;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * BIND;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * SADDLE_STITCH;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * EDGE_STITCH;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_TOP_LEFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_BOTTOM_LEFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_TOP_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_BOTTOM_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * EDGE_STITCH_LEFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * EDGE_STITCH_TOP;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * EDGE_STITCH_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * EDGE_STITCH_BOTTOM;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_DUAL_LEFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_DUAL_TOP;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_DUAL_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * STAPLE_DUAL_BOTTOM;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::defaults::FinishingsDefault * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_FinishingsDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.h
deleted file mode 100644
index 5a059dc..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_JobHoldUntilDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_JobHoldUntilDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class JobHoldUntilDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobHoldUntilDefault(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * NO_HOLD;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * INDEFINITE;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * DAY_TIME;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * EVENING;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * NIGHT;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * WEEKEND;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * SECOND_SHIFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobHoldUntilDefault * THIRD_SHIFT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_JobHoldUntilDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.h
deleted file mode 100644
index 22f5030..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_JobPriorityDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_JobPriorityDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class JobPriorityDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::JobPriorityDefault : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPriorityDefault(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_JobPriorityDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.h
deleted file mode 100644
index d8f4cb2..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_JobSheetsDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_JobSheetsDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class JobSheetsDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::JobSheetsDefault : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobSheetsDefault(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::JobSheetsDefault * NONE;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobSheetsDefault * STANDARD;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_JobSheetsDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/MediaDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/MediaDefault.h
deleted file mode 100644
index 9825da3..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/MediaDefault.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_MediaDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_MediaDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class MediaDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::MediaDefault : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  MediaDefault(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_MediaDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.h
deleted file mode 100644
index 9ffc184..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_MultipleDocumentHandlingDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_MultipleDocumentHandlingDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class MultipleDocumentHandlingDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentHandlingDefault(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault * SINGLE_DOCUMENT;
-  static ::gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault * SINGLE_DOCUMENT_NEW_SHEET;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::defaults::MultipleDocumentHandlingDefault * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_MultipleDocumentHandlingDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.h
deleted file mode 100644
index cc4d01d..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_NumberUpDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_NumberUpDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class NumberUpDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::NumberUpDefault : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberUpDefault(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_NumberUpDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.h
deleted file mode 100644
index 7b53cec..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_OrientationRequestedDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_OrientationRequestedDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class OrientationRequestedDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OrientationRequestedDefault(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault * PORTRAIT;
-  static ::gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault * LANDSCAPE;
-  static ::gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault * REVERSE_LANDSCAPE;
-  static ::gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault * REVERSE_PORTRAIT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::defaults::OrientationRequestedDefault * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_OrientationRequestedDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.h
deleted file mode 100644
index 0c0bf5a..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_PrintQualityDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_PrintQualityDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class PrintQualityDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::PrintQualityDefault : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrintQualityDefault(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::PrintQualityDefault * DRAFT;
-  static ::gnu::javax::print::ipp::attribute::defaults::PrintQualityDefault * NORMAL;
-  static ::gnu::javax::print::ipp::attribute::defaults::PrintQualityDefault * HIGH;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::defaults::PrintQualityDefault * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_PrintQualityDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.h
deleted file mode 100644
index faeeb6d..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_PrinterResolutionDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_PrinterResolutionDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/ResolutionSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class PrinterResolutionDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::PrinterResolutionDefault : public ::javax::print::attribute::ResolutionSyntax
-{
-
-public:
-  PrinterResolutionDefault(jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_PrinterResolutionDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/defaults/SidesDefault.h b/libjava/gnu/javax/print/ipp/attribute/defaults/SidesDefault.h
deleted file mode 100644
index 836ca61..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/defaults/SidesDefault.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_defaults_SidesDefault__
-#define __gnu_javax_print_ipp_attribute_defaults_SidesDefault__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class SidesDefault;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::defaults::SidesDefault : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  SidesDefault(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  ::javax::print::attribute::Attribute * getAssociatedAttribute();
-  static ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * ONE_SIDED;
-  static ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * TWO_SIDED_LONG_EDGE;
-  static ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * TWO_SIDED_SHORT_EDGE;
-  static ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * DUPLEX;
-  static ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * TUMBLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::defaults::SidesDefault * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_defaults_SidesDefault__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/AttributesCharset.h b/libjava/gnu/javax/print/ipp/attribute/job/AttributesCharset.h
deleted file mode 100644
index 82cb55b..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/AttributesCharset.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_AttributesCharset__
-#define __gnu_javax_print_ipp_attribute_job_AttributesCharset__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/CharsetSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class AttributesCharset;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::AttributesCharset : public ::gnu::javax::print::ipp::attribute::CharsetSyntax
-{
-
-public:
-  AttributesCharset(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::gnu::javax::print::ipp::attribute::job::AttributesCharset * UTF8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_AttributesCharset__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.h b/libjava/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.h
deleted file mode 100644
index e69e1c86..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_AttributesNaturalLanguage__
-#define __gnu_javax_print_ipp_attribute_job_AttributesNaturalLanguage__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class AttributesNaturalLanguage;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::AttributesNaturalLanguage : public ::gnu::javax::print::ipp::attribute::NaturalLanguageSyntax
-{
-
-public:
-  AttributesNaturalLanguage(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::gnu::javax::print::ipp::attribute::job::AttributesNaturalLanguage * EN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_AttributesNaturalLanguage__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.h b/libjava/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.h
deleted file mode 100644
index c21c942..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobDetailedStatusMessages__
-#define __gnu_javax_print_ipp_attribute_job_JobDetailedStatusMessages__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobDetailedStatusMessages;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobDetailedStatusMessages : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobDetailedStatusMessages(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobDetailedStatusMessages__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.h b/libjava/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.h
deleted file mode 100644
index 9aaaf03..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobDocumentAccessErrors__
-#define __gnu_javax_print_ipp_attribute_job_JobDocumentAccessErrors__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobDocumentAccessErrors;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobDocumentAccessErrors : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobDocumentAccessErrors(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobDocumentAccessErrors__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobId.h b/libjava/gnu/javax/print/ipp/attribute/job/JobId.h
deleted file mode 100644
index 6141d51..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobId.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobId__
-#define __gnu_javax_print_ipp_attribute_job_JobId__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobId;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobId : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobId(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobId__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobMoreInfo.h b/libjava/gnu/javax/print/ipp/attribute/job/JobMoreInfo.h
deleted file mode 100644
index 61a5364..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobMoreInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobMoreInfo__
-#define __gnu_javax_print_ipp_attribute_job_JobMoreInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobMoreInfo;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobMoreInfo : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  JobMoreInfo(::java::net::URI *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobMoreInfo__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobPrinterUri.h b/libjava/gnu/javax/print/ipp/attribute/job/JobPrinterUri.h
deleted file mode 100644
index 7ac6adf..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobPrinterUri.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobPrinterUri__
-#define __gnu_javax_print_ipp_attribute_job_JobPrinterUri__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobPrinterUri;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobPrinterUri : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  JobPrinterUri(::java::net::URI *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobPrinterUri__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobStateMessage.h b/libjava/gnu/javax/print/ipp/attribute/job/JobStateMessage.h
deleted file mode 100644
index 3eb3c36..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobStateMessage.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobStateMessage__
-#define __gnu_javax_print_ipp_attribute_job_JobStateMessage__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobStateMessage;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobStateMessage : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobStateMessage(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobStateMessage__
diff --git a/libjava/gnu/javax/print/ipp/attribute/job/JobUri.h b/libjava/gnu/javax/print/ipp/attribute/job/JobUri.h
deleted file mode 100644
index 42551e0..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/job/JobUri.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_job_JobUri__
-#define __gnu_javax_print_ipp_attribute_job_JobUri__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace job
-            {
-                class JobUri;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::job::JobUri : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  JobUri(::java::net::URI *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_job_JobUri__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.h b/libjava/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.h
deleted file mode 100644
index 4d4da68..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_CharsetConfigured__
-#define __gnu_javax_print_ipp_attribute_printer_CharsetConfigured__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/CharsetSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class CharsetConfigured;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::CharsetConfigured : public ::gnu::javax::print::ipp::attribute::CharsetSyntax
-{
-
-public:
-  CharsetConfigured(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_CharsetConfigured__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/DocumentFormat.h b/libjava/gnu/javax/print/ipp/attribute/printer/DocumentFormat.h
deleted file mode 100644
index 24ed619..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/DocumentFormat.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_DocumentFormat__
-#define __gnu_javax_print_ipp_attribute_printer_DocumentFormat__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class DocumentFormat;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::DocumentFormat : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentFormat(::java::lang::String *, ::java::util::Locale *);
-  static ::gnu::javax::print::ipp::attribute::printer::DocumentFormat * createDocumentFormat(::javax::print::DocFlavor *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_DocumentFormat__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.h b/libjava/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.h
deleted file mode 100644
index ecce212..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_MultipleOperationTimeOut__
-#define __gnu_javax_print_ipp_attribute_printer_MultipleOperationTimeOut__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class MultipleOperationTimeOut;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::MultipleOperationTimeOut : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  MultipleOperationTimeOut(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_MultipleOperationTimeOut__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.h b/libjava/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.h
deleted file mode 100644
index 4e520a5..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_NaturalLanguageConfigured__
-#define __gnu_javax_print_ipp_attribute_printer_NaturalLanguageConfigured__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class NaturalLanguageConfigured;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::NaturalLanguageConfigured : public ::gnu::javax::print::ipp::attribute::NaturalLanguageSyntax
-{
-
-public:
-  NaturalLanguageConfigured(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_NaturalLanguageConfigured__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.h b/libjava/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.h
deleted file mode 100644
index a473cf1..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_PrinterCurrentTime__
-#define __gnu_javax_print_ipp_attribute_printer_PrinterCurrentTime__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class PrinterCurrentTime;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::PrinterCurrentTime : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  PrinterCurrentTime(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_PrinterCurrentTime__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.h b/libjava/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.h
deleted file mode 100644
index 5095732..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_PrinterDriverInstaller__
-#define __gnu_javax_print_ipp_attribute_printer_PrinterDriverInstaller__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class PrinterDriverInstaller;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::PrinterDriverInstaller : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterDriverInstaller(::java::net::URI *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_PrinterDriverInstaller__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.h b/libjava/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.h
deleted file mode 100644
index 286c445..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_PrinterStateMessage__
-#define __gnu_javax_print_ipp_attribute_printer_PrinterStateMessage__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class PrinterStateMessage;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::PrinterStateMessage : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterStateMessage(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_PrinterStateMessage__
diff --git a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.h b/libjava/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.h
deleted file mode 100644
index 4fba7e0..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_printer_PrinterUpTime__
-#define __gnu_javax_print_ipp_attribute_printer_PrinterUpTime__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace printer
-            {
-                class PrinterUpTime;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::printer::PrinterUpTime : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PrinterUpTime(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_printer_PrinterUpTime__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/CharsetSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/CharsetSupported.h
deleted file mode 100644
index f9a87b5..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/CharsetSupported.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_CharsetSupported__
-#define __gnu_javax_print_ipp_attribute_supported_CharsetSupported__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/CharsetSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class CharsetSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::CharsetSupported : public ::gnu::javax::print::ipp::attribute::CharsetSyntax
-{
-
-public:
-  CharsetSupported(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_CharsetSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/CompressionSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/CompressionSupported.h
deleted file mode 100644
index c3e5b8c..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/CompressionSupported.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_CompressionSupported__
-#define __gnu_javax_print_ipp_attribute_supported_CompressionSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class CompressionSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Compression;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::CompressionSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  CompressionSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  ::javax::print::attribute::standard::Compression * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::Compression * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::supported::CompressionSupported * NONE;
-  static ::gnu::javax::print::ipp::attribute::supported::CompressionSupported * DEFLATE;
-  static ::gnu::javax::print::ipp::attribute::supported::CompressionSupported * GZIP;
-  static ::gnu::javax::print::ipp::attribute::supported::CompressionSupported * COMPRESS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::CompressionSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_CompressionSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.h
deleted file mode 100644
index 16add8c..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_DocumentFormatSupported__
-#define __gnu_javax_print_ipp_attribute_supported_DocumentFormatSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class DocumentFormatSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::DocumentFormatSupported : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentFormatSupported(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_DocumentFormatSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.h
deleted file mode 100644
index ec98145..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_FinishingsSupported__
-#define __gnu_javax_print_ipp_attribute_supported_FinishingsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class FinishingsSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Finishings;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::FinishingsSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  FinishingsSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::standard::Finishings * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::Finishings * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * NONE;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * COVER;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * BIND;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * SADDLE_STITCH;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * EDGE_STITCH;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_TOP_LEFT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_BOTTOM_LEFT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_TOP_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_BOTTOM_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * EDGE_STITCH_LEFT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * EDGE_STITCH_TOP;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * EDGE_STITCH_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * EDGE_STITCH_BOTTOM;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_DUAL_LEFT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_DUAL_TOP;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_DUAL_RIGHT;
-  static ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * STAPLE_DUAL_BOTTOM;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::FinishingsSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_FinishingsSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.h
deleted file mode 100644
index 9a1c3c4..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_GeneratedNaturalLanguageSupported__
-#define __gnu_javax_print_ipp_attribute_supported_GeneratedNaturalLanguageSupported__
-
-#pragma interface
-
-#include <gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class GeneratedNaturalLanguageSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::GeneratedNaturalLanguageSupported : public ::gnu::javax::print::ipp::attribute::NaturalLanguageSyntax
-{
-
-public:
-  GeneratedNaturalLanguageSupported(::java::lang::String *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_GeneratedNaturalLanguageSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.h
deleted file mode 100644
index 058b8d1..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_IppVersionsSupported__
-#define __gnu_javax_print_ipp_attribute_supported_IppVersionsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class IppVersionsSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::IppVersionsSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public:
-  IppVersionsSupported(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::IppVersionsSupported * V_1_0;
-  static ::gnu::javax::print::ipp::attribute::supported::IppVersionsSupported * V_1_1;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::IppVersionsSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_IppVersionsSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.h
deleted file mode 100644
index 2e7e6cd..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_JobHoldUntilSupported__
-#define __gnu_javax_print_ipp_attribute_supported_JobHoldUntilSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class JobHoldUntilSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobHoldUntilSupported(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * NO_HOLD;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * INDEFINITE;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * DAY_TIME;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * EVENING;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * NIGHT;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * WEEKEND;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * SECOND_SHIFT;
-  static ::gnu::javax::print::ipp::attribute::supported::JobHoldUntilSupported * THIRD_SHIFT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_JobHoldUntilSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.h
deleted file mode 100644
index 38ab8a7..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_JobSheetsSupported__
-#define __gnu_javax_print_ipp_attribute_supported_JobSheetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace defaults
-            {
-                class JobSheetsDefault;
-            }
-            namespace supported
-            {
-                class JobSheetsSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobSheets;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::JobSheetsSupported : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobSheetsSupported(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::standard::JobSheets * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::JobSheets * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::defaults::JobSheetsDefault * NONE;
-  static ::gnu::javax::print::ipp::attribute::defaults::JobSheetsDefault * STANDARD;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_JobSheetsSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/MediaSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/MediaSupported.h
deleted file mode 100644
index be9ad30..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/MediaSupported.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_MediaSupported__
-#define __gnu_javax_print_ipp_attribute_supported_MediaSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class MediaSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Media;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::MediaSupported : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  MediaSupported(::java::lang::String *, ::java::util::Locale *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static JArray< ::javax::print::attribute::standard::Media * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_MediaSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.h
deleted file mode 100644
index 2c378c2..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_MultipleDocumentHandlingSupported__
-#define __gnu_javax_print_ipp_attribute_supported_MultipleDocumentHandlingSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class MultipleDocumentHandlingSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MultipleDocumentHandling;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentHandlingSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  ::javax::print::attribute::standard::MultipleDocumentHandling * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::MultipleDocumentHandling * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported * SINGLE_DOCUMENT;
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported * SINGLE_DOCUMENT_NEW_SHEET;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentHandlingSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_MultipleDocumentHandlingSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.h
deleted file mode 100644
index 66920c0..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_MultipleDocumentJobsSupported__
-#define __gnu_javax_print_ipp_attribute_supported_MultipleDocumentJobsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class MultipleDocumentJobsSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::MultipleDocumentJobsSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentJobsSupported(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentJobsSupported * NOT_SUPPORTED;
-  static ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentJobsSupported * SUPPORTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::MultipleDocumentJobsSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_MultipleDocumentJobsSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/OperationsSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/OperationsSupported.h
deleted file mode 100644
index 655d7ed..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/OperationsSupported.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_OperationsSupported__
-#define __gnu_javax_print_ipp_attribute_supported_OperationsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class OperationsSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::OperationsSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OperationsSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * PRINT_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * PRINT_URI;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * VALIDATE_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * CREATE_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * SEND_DOCUMENT;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * SEND_URI;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * CANCEL_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * GET_JOB_ATTRIBUTES;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * PAUSE_PRINTER;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * GET_JOBS;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * GET_PRINTER_ATTRIBUTES;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * HOLD_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * RELEASE_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * RESTART_JOB;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * RESERVED;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * RESUME_PRINTER;
-  static ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * PURGE_JOBS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::OperationsSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_OperationsSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.h
deleted file mode 100644
index bbb90a4..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_OrientationRequestedSupported__
-#define __gnu_javax_print_ipp_attribute_supported_OrientationRequestedSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class OrientationRequestedSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class OrientationRequested;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OrientationRequestedSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::standard::OrientationRequested * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::OrientationRequested * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported * PORTRAIT;
-  static ::gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported * LANDSCAPE;
-  static ::gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported * REVERSE_LANDSCAPE;
-  static ::gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported * REVERSE_PORTRAIT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::OrientationRequestedSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_OrientationRequestedSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.h
deleted file mode 100644
index 3baf062..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_PageRangesSupported__
-#define __gnu_javax_print_ipp_attribute_supported_PageRangesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class PageRangesSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::PageRangesSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PageRangesSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::PageRangesSupported * NOT_SUPPORTED;
-  static ::gnu::javax::print::ipp::attribute::supported::PageRangesSupported * SUPPORTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::PageRangesSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_PageRangesSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.h
deleted file mode 100644
index 5f40779..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_PrintQualitySupported__
-#define __gnu_javax_print_ipp_attribute_supported_PrintQualitySupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class PrintQualitySupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrintQuality;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::PrintQualitySupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrintQualitySupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-public:
-  ::javax::print::attribute::standard::PrintQuality * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::PrintQuality * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::gnu::javax::print::ipp::attribute::supported::PrintQualitySupported * DRAFT;
-  static ::gnu::javax::print::ipp::attribute::supported::PrintQualitySupported * NORMAL;
-  static ::gnu::javax::print::ipp::attribute::supported::PrintQualitySupported * HIGH;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::PrintQualitySupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_PrintQualitySupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.h
deleted file mode 100644
index c978467..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_PrinterResolutionSupported__
-#define __gnu_javax_print_ipp_attribute_supported_PrinterResolutionSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/ResolutionSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class PrinterResolutionSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterResolution;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::PrinterResolutionSupported : public ::javax::print::attribute::ResolutionSyntax
-{
-
-public:
-  PrinterResolutionSupported(jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::javax::print::attribute::standard::PrinterResolution * getAssociatedAttribute();
-  static JArray< ::javax::print::attribute::standard::PrinterResolution * > * getAssociatedAttributeArray(::java::util::Set *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_PrinterResolutionSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.h
deleted file mode 100644
index 3c7b99d..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_PrinterUriSupported__
-#define __gnu_javax_print_ipp_attribute_supported_PrinterUriSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class PrinterUriSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::PrinterUriSupported : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterUriSupported(::java::net::URI *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_PrinterUriSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/SidesSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/SidesSupported.h
deleted file mode 100644
index dbb186c..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/SidesSupported.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_SidesSupported__
-#define __gnu_javax_print_ipp_attribute_supported_SidesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class SidesSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::SidesSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  SidesSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::SidesSupported * ONE_SIDED;
-  static ::gnu::javax::print::ipp::attribute::supported::SidesSupported * TWO_SIDED_LONG_EDGE;
-  static ::gnu::javax::print::ipp::attribute::supported::SidesSupported * TWO_SIDED_SHORT_EDGE;
-  static ::gnu::javax::print::ipp::attribute::supported::SidesSupported * DUPLEX;
-  static ::gnu::javax::print::ipp::attribute::supported::SidesSupported * TUMBLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::SidesSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_SidesSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.h
deleted file mode 100644
index 254a20a..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_UriAuthenticationSupported__
-#define __gnu_javax_print_ipp_attribute_supported_UriAuthenticationSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class UriAuthenticationSupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public:
-  UriAuthenticationSupported(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * NONE;
-  static ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * REQUESTING_USER_NAME;
-  static ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * BASIC;
-  static ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * DIGEST;
-  static ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * CERTIFICATE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::UriAuthenticationSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_UriAuthenticationSupported__
diff --git a/libjava/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.h b/libjava/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.h
deleted file mode 100644
index 32f571f..0000000
--- a/libjava/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_print_ipp_attribute_supported_UriSecuritySupported__
-#define __gnu_javax_print_ipp_attribute_supported_UriSecuritySupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-        namespace ipp
-        {
-          namespace attribute
-          {
-            namespace supported
-            {
-                class UriSecuritySupported;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class gnu::javax::print::ipp::attribute::supported::UriSecuritySupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public:
-  UriSecuritySupported(jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-public:
-  static ::gnu::javax::print::ipp::attribute::supported::UriSecuritySupported * NONE;
-  static ::gnu::javax::print::ipp::attribute::supported::UriSecuritySupported * SSL3;
-  static ::gnu::javax::print::ipp::attribute::supported::UriSecuritySupported * TLS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::gnu::javax::print::ipp::attribute::supported::UriSecuritySupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_print_ipp_attribute_supported_UriSecuritySupported__
diff --git a/libjava/gnu/javax/rmi/CORBA/CorbaInput.h b/libjava/gnu/javax/rmi/CORBA/CorbaInput.h
deleted file mode 100644
index 8467a1c..0000000
--- a/libjava/gnu/javax/rmi/CORBA/CorbaInput.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_CorbaInput__
-#define __gnu_javax_rmi_CORBA_CorbaInput__
-
-#pragma interface
-
-#include <java/io/ObjectInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime;
-      }
-    }
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class CorbaInput;
-            class RmiUtilities;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::CorbaInput : public ::java::io::ObjectInputStream
-{
-
-public:
-  CorbaInput(::org::omg::CORBA_2_3::portable::InputStream *, ::java::lang::Object *, ::gnu::javax::rmi::CORBA::RmiUtilities *, jint, ::java::lang::String *, ::gnu::CORBA::CDR::gnuRuntime *);
-  virtual jint available();
-  virtual void close();
-  virtual void defaultReadObject();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual jchar readChar();
-  virtual jdouble readDouble();
-  virtual jfloat readFloat();
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual void readFully(JArray< jbyte > *);
-  virtual jint readInt();
-  virtual ::java::lang::String * readLine();
-  virtual jlong readLong();
-  virtual jshort read_short();
-  virtual jint readUnsignedByte();
-  virtual jint readUnsignedShort();
-  virtual ::java::lang::String * readUTF();
-  virtual void reset();
-  virtual jlong skip(jlong);
-  virtual jint skipBytes(jint);
-public: // actually protected
-  virtual ::java::lang::Object * readObjectOverride();
-public:
-  ::org::omg::CORBA_2_3::portable::InputStream * __attribute__((aligned(__alignof__( ::java::io::ObjectInputStream)))) stream;
-public: // actually package-private
-  ::gnu::javax::rmi::CORBA::RmiUtilities * util;
-  ::java::lang::Object * current;
-  jint offset;
-  ::java::lang::String * rid;
-  ::gnu::CORBA::CDR::gnuRuntime * runtime;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_CorbaInput__
diff --git a/libjava/gnu/javax/rmi/CORBA/CorbaOutput.h b/libjava/gnu/javax/rmi/CORBA/CorbaOutput.h
deleted file mode 100644
index adbe74f..0000000
--- a/libjava/gnu/javax/rmi/CORBA/CorbaOutput.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_CorbaOutput__
-#define __gnu_javax_rmi_CORBA_CorbaOutput__
-
-#pragma interface
-
-#include <java/io/ObjectOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class CorbaOutput;
-            class RmiUtilities;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::CorbaOutput : public ::java::io::ObjectOutputStream
-{
-
-public:
-  CorbaOutput(::org::omg::CORBA_2_3::portable::OutputStream *, ::java::lang::Object *, ::gnu::javax::rmi::CORBA::RmiUtilities *);
-  virtual void close();
-  virtual void flush();
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(jint);
-  virtual void writeBoolean(jboolean);
-  virtual void writeByte(jint);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChar(jint);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeDouble(jdouble);
-  virtual void writeFloat(jfloat);
-  virtual void writeInt(jint);
-  virtual void writeLong(jlong);
-public: // actually protected
-  virtual void writeObjectOverride(::java::lang::Object *);
-public:
-  virtual void writeShort(jint);
-  virtual void writeUTF(::java::lang::String *);
-  virtual void defaultWriteObject();
-public: // actually package-private
-  ::org::omg::CORBA_2_3::portable::OutputStream * __attribute__((aligned(__alignof__( ::java::io::ObjectOutputStream)))) stream;
-  ::gnu::javax::rmi::CORBA::RmiUtilities * util;
-  ::java::lang::Object * current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_CorbaOutput__
diff --git a/libjava/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.h b/libjava/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.h
deleted file mode 100644
index 6234e88..0000000
--- a/libjava/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_DefaultWriteObjectTester__
-#define __gnu_javax_rmi_CORBA_DefaultWriteObjectTester__
-
-#pragma interface
-
-#include <gnu/javax/rmi/CORBA/CorbaOutput.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class DefaultWriteObjectTester;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::DefaultWriteObjectTester : public ::gnu::javax::rmi::CORBA::CorbaOutput
-{
-
-public:
-  DefaultWriteObjectTester(::java::lang::Object *);
-  virtual void defaultWriteObject();
-public: // actually protected
-  virtual void writeObjectOverride(::java::lang::Object *);
-public:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::javax::rmi::CORBA::CorbaOutput)))) dwo_called;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_DefaultWriteObjectTester__
diff --git a/libjava/gnu/javax/rmi/CORBA/DelegateFactory.h b/libjava/gnu/javax/rmi/CORBA/DelegateFactory.h
deleted file mode 100644
index a1b4492..0000000
--- a/libjava/gnu/javax/rmi/CORBA/DelegateFactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_DelegateFactory__
-#define __gnu_javax_rmi_CORBA_DelegateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class DelegateFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::DelegateFactory : public ::java::lang::Object
-{
-
-public:
-  DelegateFactory();
-  static ::java::lang::Object * getInstance(::java::lang::String *);
-  static ::java::lang::String * STUB;
-  static ::java::lang::String * UTIL;
-  static ::java::lang::String * VALUEHANDLER;
-  static ::java::lang::String * PORTABLE_REMOTE_OBJECT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_DelegateFactory__
diff --git a/libjava/gnu/javax/rmi/CORBA/GetDelegateInstanceException.h b/libjava/gnu/javax/rmi/CORBA/GetDelegateInstanceException.h
deleted file mode 100644
index 3f2b34c..0000000
--- a/libjava/gnu/javax/rmi/CORBA/GetDelegateInstanceException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_GetDelegateInstanceException__
-#define __gnu_javax_rmi_CORBA_GetDelegateInstanceException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class GetDelegateInstanceException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::GetDelegateInstanceException : public ::java::lang::Exception
-{
-
-public:
-  GetDelegateInstanceException(::java::lang::String *);
-  GetDelegateInstanceException(::java::lang::String *, ::java::lang::Throwable *);
-private:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_GetDelegateInstanceException__
diff --git a/libjava/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.h b/libjava/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.h
deleted file mode 100644
index 750b4fb..0000000
--- a/libjava/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_PortableRemoteObjectDelegateImpl__
-#define __gnu_javax_rmi_CORBA_PortableRemoteObjectDelegateImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class PortableRemoteObjectDelegateImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::PortableRemoteObjectDelegateImpl : public ::java::lang::Object
-{
-
-public:
-  PortableRemoteObjectDelegateImpl();
-  virtual void connect(::java::rmi::Remote *, ::java::rmi::Remote *);
-  virtual ::java::lang::Object * narrow(::java::lang::Object *, ::java::lang::Class *);
-public: // actually package-private
-  static ::java::lang::String * getStubClassName(::java::lang::String *);
-public:
-  virtual ::java::rmi::Remote * toStub(::java::rmi::Remote *);
-  virtual void unexportObject(::java::rmi::Remote *);
-  virtual void exportObject(::java::rmi::Remote *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_PortableRemoteObjectDelegateImpl__
diff --git a/libjava/gnu/javax/rmi/CORBA/RmiUtilities$1.h b/libjava/gnu/javax/rmi/CORBA/RmiUtilities$1.h
deleted file mode 100644
index 0c89137..0000000
--- a/libjava/gnu/javax/rmi/CORBA/RmiUtilities$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_RmiUtilities$1__
-#define __gnu_javax_rmi_CORBA_RmiUtilities$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class RmiUtilities$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::RmiUtilities$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RmiUtilities$1();
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_RmiUtilities$1__
diff --git a/libjava/gnu/javax/rmi/CORBA/RmiUtilities$2.h b/libjava/gnu/javax/rmi/CORBA/RmiUtilities$2.h
deleted file mode 100644
index 7503891..0000000
--- a/libjava/gnu/javax/rmi/CORBA/RmiUtilities$2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_RmiUtilities$2__
-#define __gnu_javax_rmi_CORBA_RmiUtilities$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class RmiUtilities$2;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::RmiUtilities$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RmiUtilities$2();
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_RmiUtilities$2__
diff --git a/libjava/gnu/javax/rmi/CORBA/RmiUtilities.h b/libjava/gnu/javax/rmi/CORBA/RmiUtilities.h
deleted file mode 100644
index 8dd5c60..0000000
--- a/libjava/gnu/javax/rmi/CORBA/RmiUtilities.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_RmiUtilities__
-#define __gnu_javax_rmi_CORBA_RmiUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace CDR
-      {
-          class gnuRuntime;
-      }
-    }
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class RmiUtilities;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class WStringValueHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::RmiUtilities : public ::java::lang::Object
-{
-
-public:
-  RmiUtilities();
-public: // actually package-private
-  virtual void writeFields(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  virtual void writeMember(::org::omg::CORBA_2_3::portable::OutputStream *, ::java::lang::Object *, ::java::lang::Class *);
-public:
-  virtual jboolean isTieRequired(::java::lang::Object *);
-public: // actually package-private
-  virtual ::java::lang::Class * getExportedInterface(::java::lang::Object *);
-public:
-  static jlong getHashCode(::java::lang::Class *);
-  static ::java::lang::String * toHex(jlong);
-public: // actually package-private
-  static ::java::lang::String * getDescriptor(::java::lang::Class *);
-public:
-  static JArray< ::java::lang::reflect::Field * > * getWritableFields(::java::lang::Class *);
-public: // actually package-private
-  virtual void exportTie(::org::omg::CORBA_2_3::portable::OutputStream *, ::java::lang::Object *, ::java::lang::Class *);
-  virtual void ensureOrbRunning(::org::omg::CORBA_2_3::portable::OutputStream *);
-public:
-  virtual void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  virtual ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Class *, ::java::lang::String *, ::org::omg::SendingContext::RunTime *);
-public: // actually package-private
-  virtual ::java::io::Serializable * instantiate(jint, ::java::lang::Class *, ::gnu::CORBA::CDR::gnuRuntime *);
-  virtual void readFields(jint, ::java::lang::String *, ::java::io::Serializable *, ::org::omg::CORBA_2_3::portable::InputStream *, ::gnu::CORBA::CDR::gnuRuntime *);
-public:
-  static jbyte VERSION;
-public: // actually package-private
-  static const jint NON_WRITABLE = 136;
-public:
-  static ::java::lang::String * RMI_STRING_ID;
-  static ::java::lang::String * RMI_CLASS_ID;
-  static ::java::lang::String * RMI_STRING_ARRAY_ID;
-public: // actually package-private
-  static ::org::omg::CORBA::WStringValueHelper * wStringValueHelper;
-  ::java::util::WeakHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) io_format;
-  static ::java::lang::Object * STANDARD;
-  static ::java::lang::Object * CUSTOM_DWO;
-  static ::java::lang::Object * CUSTOM_NO_DWO;
-  static JArray< ::java::lang::Class * > * READ_OBJECT_ARGS;
-  static JArray< ::java::lang::Class * > * WRITE_OBJECT_ARGS;
-  static const jint S_X = 16908034;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_RmiUtilities__
diff --git a/libjava/gnu/javax/rmi/CORBA/StubDelegateImpl.h b/libjava/gnu/javax/rmi/CORBA/StubDelegateImpl.h
deleted file mode 100644
index c8712e2..0000000
--- a/libjava/gnu/javax/rmi/CORBA/StubDelegateImpl.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_StubDelegateImpl__
-#define __gnu_javax_rmi_CORBA_StubDelegateImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class StubDelegateImpl;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-      namespace PortableServer
-      {
-          class POA;
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::StubDelegateImpl : public ::java::lang::Object
-{
-
-public:
-  StubDelegateImpl();
-  virtual void connect(::javax::rmi::CORBA::Stub *, ::org::omg::CORBA::ORB *);
-  static void connect(::javax::rmi::CORBA::Stub *, ::org::omg::CORBA::ORB *, ::org::omg::PortableServer::POA *);
-  static ::javax::rmi::CORBA::Tie * getTieFromStub(::java::lang::Object *);
-  virtual jboolean equals(::javax::rmi::CORBA::Stub *, ::java::lang::Object *);
-  virtual jint hashCode(::javax::rmi::CORBA::Stub *);
-  virtual ::java::lang::String * toString(::javax::rmi::CORBA::Stub *);
-  virtual void readObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectInputStream *);
-  virtual void readObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectInputStream *, ::org::omg::CORBA::ORB *);
-  virtual void writeObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectOutputStream *);
-  virtual void writeObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectOutputStream *, ::org::omg::CORBA::ORB *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_StubDelegateImpl__
diff --git a/libjava/gnu/javax/rmi/CORBA/TieTargetRecord.h b/libjava/gnu/javax/rmi/CORBA/TieTargetRecord.h
deleted file mode 100644
index 684b4e4..0000000
--- a/libjava/gnu/javax/rmi/CORBA/TieTargetRecord.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_TieTargetRecord__
-#define __gnu_javax_rmi_CORBA_TieTargetRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class TieTargetRecord;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Tie;
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::TieTargetRecord : public ::java::lang::Object
-{
-
-public:
-  TieTargetRecord(::javax::rmi::CORBA::Tie *);
-  virtual void add(::java::lang::Object *);
-  virtual void remove(::java::lang::Object *);
-  virtual jboolean unused();
-  ::javax::rmi::CORBA::Tie * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tie;
-  ::java::util::HashSet * targets;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_TieTargetRecord__
diff --git a/libjava/gnu/javax/rmi/CORBA/UtilDelegateImpl.h b/libjava/gnu/javax/rmi/CORBA/UtilDelegateImpl.h
deleted file mode 100644
index b463493..0000000
--- a/libjava/gnu/javax/rmi/CORBA/UtilDelegateImpl.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_UtilDelegateImpl__
-#define __gnu_javax_rmi_CORBA_UtilDelegateImpl__
-
-#pragma interface
-
-#include <gnu/javax/rmi/CORBA/RmiUtilities.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class UtilDelegateImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-        class RemoteException;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class SystemException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::UtilDelegateImpl : public ::gnu::javax::rmi::CORBA::RmiUtilities
-{
-
-public:
-  UtilDelegateImpl();
-  virtual ::java::lang::Object * copyObject(::java::lang::Object *, ::org::omg::CORBA::ORB *);
-  virtual JArray< ::java::lang::Object * > * copyObjects(JArray< ::java::lang::Object * > *, ::org::omg::CORBA::ORB *);
-  virtual ::javax::rmi::CORBA::ValueHandler * createValueHandler();
-  virtual ::java::lang::String * getCodebase(::java::lang::Class *);
-  virtual ::javax::rmi::CORBA::Tie * getTie(::java::rmi::Remote *);
-private:
-  ::java::lang::String * getTieClassName(::java::lang::String *);
-public:
-  virtual void registerTarget(::javax::rmi::CORBA::Tie *, ::java::rmi::Remote *);
-  virtual void unexportObject(::java::rmi::Remote *);
-  virtual jboolean isLocal(::javax::rmi::CORBA::Stub *);
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual ::java::rmi::RemoteException * mapSystemException(::org::omg::CORBA::SystemException *);
-  virtual ::java::rmi::RemoteException * wrapException(::java::lang::Throwable *);
-  virtual void writeAbstractObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  virtual void writeAny(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void writeAnyAsRemote(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  virtual ::java::lang::String * getName(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * readAny(::org::omg::CORBA::portable::InputStream *);
-  virtual void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::ValueHandler * m_ValueHandler;
-  static ::java::util::Hashtable * m_Ties;
-  static ::java::util::Hashtable * m_Targets;
-  static ::java::lang::String * m_StandardPackage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_UtilDelegateImpl__
diff --git a/libjava/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.h b/libjava/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.h
deleted file mode 100644
index 715322d..0000000
--- a/libjava/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_rmi_CORBA_ValueHandlerDelegateImpl__
-#define __gnu_javax_rmi_CORBA_ValueHandlerDelegateImpl__
-
-#pragma interface
-
-#include <gnu/javax/rmi/CORBA/RmiUtilities.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace rmi
-      {
-        namespace CORBA
-        {
-            class ValueHandlerDelegateImpl;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class gnu::javax::rmi::CORBA::ValueHandlerDelegateImpl : public ::gnu::javax::rmi::CORBA::RmiUtilities
-{
-
-public:
-  ValueHandlerDelegateImpl();
-  virtual jbyte getMaximumStreamFormatVersion();
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, jbyte);
-  virtual ::org::omg::SendingContext::RunTime * getRunTimeCodeBase();
-  virtual jboolean isCustomMarshaled(::java::lang::Class *);
-  virtual ::java::io::Serializable * writeReplace(::java::io::Serializable *);
-  virtual ::java::lang::String * getRMIRepositoryID(::java::lang::Class *);
-public: // actually package-private
-  virtual jlong getSid(::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_rmi_CORBA_ValueHandlerDelegateImpl__
diff --git a/libjava/gnu/javax/security/auth/Password.h b/libjava/gnu/javax/security/auth/Password.h
deleted file mode 100644
index 76c282e..0000000
--- a/libjava/gnu/javax/security/auth/Password.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_Password__
-#define __gnu_javax_security_auth_Password__
-
-#pragma interface
-
-#include <gnu/java/security/util/ExpirableObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-            class Password;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::Password : public ::gnu::java::security::util::ExpirableObject
-{
-
-public:
-  Password(JArray< jchar > *);
-  Password(JArray< jchar > *, jlong);
-  Password(JArray< jchar > *, jint, jint);
-  Password(JArray< jchar > *, jint, jint, jlong);
-  Password(JArray< jbyte > *);
-  Password(JArray< jbyte > *, jlong);
-  Password(JArray< jbyte > *, jint, jint);
-  Password(JArray< jbyte > *, jint, jint, jlong);
-  JArray< jchar > * getPassword();
-  JArray< jbyte > * getBytes();
-public: // actually protected
-  void doDestroy();
-public:
-  jboolean isDestroyed();
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::security::util::ExpirableObject)))) password;
-  JArray< jbyte > * bPassword;
-  jboolean mIsDestroyed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_Password__
diff --git a/libjava/gnu/javax/security/auth/callback/AWTCallbackHandler.h b/libjava/gnu/javax/security/auth/callback/AWTCallbackHandler.h
deleted file mode 100644
index 5f3bb82..0000000
--- a/libjava/gnu/javax/security/auth/callback/AWTCallbackHandler.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_AWTCallbackHandler__
-#define __gnu_javax_security_auth_callback_AWTCallbackHandler__
-
-#pragma interface
-
-#include <gnu/javax/security/auth/callback/AbstractCallbackHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class AWTCallbackHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-            class ConfirmationCallback;
-            class LanguageCallback;
-            class NameCallback;
-            class PasswordCallback;
-            class TextInputCallback;
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::AWTCallbackHandler : public ::gnu::javax::security::auth::callback::AbstractCallbackHandler
-{
-
-public:
-  AWTCallbackHandler();
-public: // actually protected
-  virtual void handleChoice(::javax::security::auth::callback::ChoiceCallback *);
-  virtual void handleConfirmation(::javax::security::auth::callback::ConfirmationCallback *);
-  virtual void handleLanguage(::javax::security::auth::callback::LanguageCallback *);
-  virtual void handleName(::javax::security::auth::callback::NameCallback *);
-  virtual void handlePassword(::javax::security::auth::callback::PasswordCallback *);
-  virtual void handleTextInput(::javax::security::auth::callback::TextInputCallback *);
-  virtual void handleTextOutput(::javax::security::auth::callback::TextOutputCallback *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-  virtual void windowOpened(::java::awt::event::WindowEvent *);
-  virtual void windowClosed(::java::awt::event::WindowEvent *);
-  virtual void windowIconified(::java::awt::event::WindowEvent *);
-  virtual void windowDeiconified(::java::awt::event::WindowEvent *);
-  virtual void windowActivated(::java::awt::event::WindowEvent *);
-  virtual void windowDeactivated(::java::awt::event::WindowEvent *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::security::auth::callback::AbstractCallbackHandler)))) actionCommand;
-private:
-  static ::java::lang::String * ACTION_CANCEL;
-  static ::java::lang::String * ACTION_NO;
-  static ::java::lang::String * ACTION_NONE;
-  static ::java::lang::String * ACTION_OK;
-  static ::java::lang::String * ACTION_YES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_AWTCallbackHandler__
diff --git a/libjava/gnu/javax/security/auth/callback/AbstractCallbackHandler.h b/libjava/gnu/javax/security/auth/callback/AbstractCallbackHandler.h
deleted file mode 100644
index f63c02f..0000000
--- a/libjava/gnu/javax/security/auth/callback/AbstractCallbackHandler.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_AbstractCallbackHandler__
-#define __gnu_javax_security_auth_callback_AbstractCallbackHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class AbstractCallbackHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class CallbackHandler;
-            class ChoiceCallback;
-            class ConfirmationCallback;
-            class LanguageCallback;
-            class NameCallback;
-            class PasswordCallback;
-            class TextInputCallback;
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::AbstractCallbackHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractCallbackHandler(::java::lang::String *);
-public:
-  static ::javax::security::auth::callback::CallbackHandler * getInstance(::java::lang::String *);
-  static ::javax::security::auth::callback::CallbackHandler * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::security::auth::callback::CallbackHandler * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual void handle(JArray< ::javax::security::auth::callback::Callback * > *);
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual void handleChoice(::javax::security::auth::callback::ChoiceCallback *) = 0;
-  virtual void handleConfirmation(::javax::security::auth::callback::ConfirmationCallback *) = 0;
-  virtual void handleLanguage(::javax::security::auth::callback::LanguageCallback *) = 0;
-  virtual void handleName(::javax::security::auth::callback::NameCallback *) = 0;
-  virtual void handlePassword(::javax::security::auth::callback::PasswordCallback *) = 0;
-  virtual void handleTextInput(::javax::security::auth::callback::TextInputCallback *) = 0;
-  virtual void handleTextOutput(::javax::security::auth::callback::TextOutputCallback *) = 0;
-  virtual void handleOther(::javax::security::auth::callback::Callback *);
-private:
-  static ::java::lang::String * SERVICE;
-public: // actually protected
-  ::java::util::ResourceBundle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) messages;
-private:
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_AbstractCallbackHandler__
diff --git a/libjava/gnu/javax/security/auth/callback/CertificateCallback.h b/libjava/gnu/javax/security/auth/callback/CertificateCallback.h
deleted file mode 100644
index b416d0c..0000000
--- a/libjava/gnu/javax/security/auth/callback/CertificateCallback.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_CertificateCallback__
-#define __gnu_javax_security_auth_callback_CertificateCallback__
-
-#pragma interface
-
-#include <javax/security/auth/callback/ConfirmationCallback.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class CertificateCallback;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::CertificateCallback : public ::javax::security::auth::callback::ConfirmationCallback
-{
-
-public:
-  CertificateCallback(::java::security::cert::Certificate *, ::java::lang::String *);
-public: // actually package-private
-  static const jlong serialVersionUID = 8343869651419225634LL;
-public:
-  ::java::security::cert::Certificate * __attribute__((aligned(__alignof__( ::javax::security::auth::callback::ConfirmationCallback)))) certificate;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_CertificateCallback__
diff --git a/libjava/gnu/javax/security/auth/callback/ConsoleCallbackHandler.h b/libjava/gnu/javax/security/auth/callback/ConsoleCallbackHandler.h
deleted file mode 100644
index bd068a6..0000000
--- a/libjava/gnu/javax/security/auth/callback/ConsoleCallbackHandler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_ConsoleCallbackHandler__
-#define __gnu_javax_security_auth_callback_ConsoleCallbackHandler__
-
-#pragma interface
-
-#include <gnu/javax/security/auth/callback/AbstractCallbackHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class ConsoleCallbackHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-            class ConfirmationCallback;
-            class LanguageCallback;
-            class NameCallback;
-            class PasswordCallback;
-            class TextInputCallback;
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::ConsoleCallbackHandler : public ::gnu::javax::security::auth::callback::AbstractCallbackHandler
-{
-
-public:
-  ConsoleCallbackHandler();
-  ConsoleCallbackHandler(::java::io::PrintStream *);
-public: // actually protected
-  virtual void handleChoice(::javax::security::auth::callback::ChoiceCallback *);
-  virtual void handleConfirmation(::javax::security::auth::callback::ConfirmationCallback *);
-  virtual void handleLanguage(::javax::security::auth::callback::LanguageCallback *);
-  virtual void handleName(::javax::security::auth::callback::NameCallback *);
-  virtual void handlePassword(::javax::security::auth::callback::PasswordCallback *);
-  virtual void handleTextInput(::javax::security::auth::callback::TextInputCallback *);
-  virtual void handleTextOutput(::javax::security::auth::callback::TextOutputCallback *);
-private:
-  ::java::io::PrintStream * __attribute__((aligned(__alignof__( ::gnu::javax::security::auth::callback::AbstractCallbackHandler)))) out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_ConsoleCallbackHandler__
diff --git a/libjava/gnu/javax/security/auth/callback/DefaultCallbackHandler.h b/libjava/gnu/javax/security/auth/callback/DefaultCallbackHandler.h
deleted file mode 100644
index bd3d0dc..0000000
--- a/libjava/gnu/javax/security/auth/callback/DefaultCallbackHandler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_DefaultCallbackHandler__
-#define __gnu_javax_security_auth_callback_DefaultCallbackHandler__
-
-#pragma interface
-
-#include <gnu/javax/security/auth/callback/AbstractCallbackHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class DefaultCallbackHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-            class ConfirmationCallback;
-            class LanguageCallback;
-            class NameCallback;
-            class PasswordCallback;
-            class TextInputCallback;
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::DefaultCallbackHandler : public ::gnu::javax::security::auth::callback::AbstractCallbackHandler
-{
-
-public:
-  DefaultCallbackHandler();
-public: // actually protected
-  virtual void handleChoice(::javax::security::auth::callback::ChoiceCallback *);
-  virtual void handleConfirmation(::javax::security::auth::callback::ConfirmationCallback *);
-  virtual void handleLanguage(::javax::security::auth::callback::LanguageCallback *);
-  virtual void handleName(::javax::security::auth::callback::NameCallback *);
-  virtual void handlePassword(::javax::security::auth::callback::PasswordCallback *);
-  virtual void handleTextInput(::javax::security::auth::callback::TextInputCallback *);
-  virtual void handleTextOutput(::javax::security::auth::callback::TextOutputCallback *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_DefaultCallbackHandler__
diff --git a/libjava/gnu/javax/security/auth/callback/GnuCallbacks$1.h b/libjava/gnu/javax/security/auth/callback/GnuCallbacks$1.h
deleted file mode 100644
index 0a037c7..0000000
--- a/libjava/gnu/javax/security/auth/callback/GnuCallbacks$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_GnuCallbacks$1__
-#define __gnu_javax_security_auth_callback_GnuCallbacks$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class GnuCallbacks;
-              class GnuCallbacks$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::GnuCallbacks$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnuCallbacks$1(::gnu::javax::security::auth::callback::GnuCallbacks *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::GnuCallbacks * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_GnuCallbacks$1__
diff --git a/libjava/gnu/javax/security/auth/callback/GnuCallbacks.h b/libjava/gnu/javax/security/auth/callback/GnuCallbacks.h
deleted file mode 100644
index d7bb1df..0000000
--- a/libjava/gnu/javax/security/auth/callback/GnuCallbacks.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_GnuCallbacks__
-#define __gnu_javax_security_auth_callback_GnuCallbacks__
-
-#pragma interface
-
-#include <java/security/Provider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class GnuCallbacks;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::GnuCallbacks : public ::java::security::Provider
-{
-
-public:
-  GnuCallbacks();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_GnuCallbacks__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$1.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$1.h
deleted file mode 100644
index f9f09f2..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$1.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$1__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$1;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$1(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::ChoiceCallback *, jint, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::security::auth::callback::ChoiceCallback * val$callback;
-  jint val$defaultChoice;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$1__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$2.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$2.h
deleted file mode 100644
index 174040e..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$2__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$2;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JList;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$2(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::ChoiceCallback *, ::javax::swing::JList *, jint, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::security::auth::callback::ChoiceCallback * val$callback;
-  ::javax::swing::JList * val$choicesList;
-  jint val$defaultChoice;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$2__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$3.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$3.h
deleted file mode 100644
index 7f26a51..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$3.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$3__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$3;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ConfirmationCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$3(::gnu::javax::security::auth::callback::SwingCallbackHandler *, JArray< ::java::lang::String * > *, ::javax::security::auth::callback::ConfirmationCallback *, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  JArray< ::java::lang::String * > * val$options;
-  ::javax::security::auth::callback::ConfirmationCallback * val$callback;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$3__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$4.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$4.h
deleted file mode 100644
index fcc46aa..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$4.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$4__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$4;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class NameCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JTextField;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$4(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::NameCallback *, ::javax::swing::JTextField *, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::security::auth::callback::NameCallback * val$callback;
-  ::javax::swing::JTextField * val$name;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$4__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$5.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$5.h
deleted file mode 100644
index 6975265..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$5.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$5__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$5;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class PasswordCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JPasswordField;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$5(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::PasswordCallback *, ::javax::swing::JPasswordField *, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::security::auth::callback::PasswordCallback * val$callback;
-  ::javax::swing::JPasswordField * val$password;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$5__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$6.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$6.h
deleted file mode 100644
index 8398e05..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$6.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$6__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$6__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$6;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextInputCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JTextArea;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$6 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$6(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::security::auth::callback::TextInputCallback *, ::javax::swing::JTextArea *, ::javax::swing::JDialog *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::security::auth::callback::TextInputCallback * val$callback;
-  ::javax::swing::JTextArea * val$text;
-  ::javax::swing::JDialog * val$dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$6__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$7.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$7.h
deleted file mode 100644
index 83252d5..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler$7.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler$7__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler$7__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-              class SwingCallbackHandler$7;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextOutputCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler$7 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SwingCallbackHandler$7(::gnu::javax::security::auth::callback::SwingCallbackHandler *, ::javax::swing::JDialog *, ::javax::security::auth::callback::TextOutputCallback *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::gnu::javax::security::auth::callback::SwingCallbackHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::swing::JDialog * val$dialog;
-  ::javax::security::auth::callback::TextOutputCallback * val$callback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler$7__
diff --git a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler.h b/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler.h
deleted file mode 100644
index 6d1f18c..0000000
--- a/libjava/gnu/javax/security/auth/callback/SwingCallbackHandler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_callback_SwingCallbackHandler__
-#define __gnu_javax_security_auth_callback_SwingCallbackHandler__
-
-#pragma interface
-
-#include <gnu/javax/security/auth/callback/AbstractCallbackHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace callback
-          {
-              class SwingCallbackHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class ChoiceCallback;
-            class ConfirmationCallback;
-            class LanguageCallback;
-            class NameCallback;
-            class PasswordCallback;
-            class TextInputCallback;
-            class TextOutputCallback;
-        }
-      }
-    }
-    namespace swing
-    {
-        class JDialog;
-    }
-  }
-}
-
-class gnu::javax::security::auth::callback::SwingCallbackHandler : public ::gnu::javax::security::auth::callback::AbstractCallbackHandler
-{
-
-public:
-  SwingCallbackHandler();
-public: // actually protected
-  virtual void handleChoice(::javax::security::auth::callback::ChoiceCallback *);
-  virtual void handleConfirmation(::javax::security::auth::callback::ConfirmationCallback *);
-  virtual void handleLanguage(::javax::security::auth::callback::LanguageCallback *);
-  virtual void handleName(::javax::security::auth::callback::NameCallback *);
-  virtual void handlePassword(::javax::security::auth::callback::PasswordCallback *);
-  virtual void handleTextInput(::javax::security::auth::callback::TextInputCallback *);
-  virtual void handleTextOutput(::javax::security::auth::callback::TextOutputCallback *);
-private:
-  void waitForInput(::javax::swing::JDialog *, ::javax::security::auth::callback::Callback *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_callback_SwingCallbackHandler__
diff --git a/libjava/gnu/javax/security/auth/login/ConfigFileParser.h b/libjava/gnu/javax/security/auth/login/ConfigFileParser.h
deleted file mode 100644
index 7daf71b..0000000
--- a/libjava/gnu/javax/security/auth/login/ConfigFileParser.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_login_ConfigFileParser__
-#define __gnu_javax_security_auth_login_ConfigFileParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace login
-          {
-              class ConfigFileParser;
-              class ConfigFileTokenizer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::login::ConfigFileParser : public ::java::lang::Object
-{
-
-public:
-  ConfigFileParser();
-  ::java::util::Map * getLoginModulesMap();
-  void parse(::java::io::Reader *);
-private:
-  void initParser(::java::io::Reader *);
-  jboolean parseAppOrOtherEntry();
-  jboolean parseACE(::java::util::List *);
-  void abort(::java::lang::String *);
-  ::java::lang::String * validateClassName(::java::lang::String *);
-  ::java::lang::String * expandParamValue(::java::lang::String *);
-  static ::java::util::logging::Logger * log;
-  ::gnu::javax::security::auth::login::ConfigFileTokenizer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cft;
-  ::java::util::Map * map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_login_ConfigFileParser__
diff --git a/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h b/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h
deleted file mode 100644
index 28ac90d..0000000
--- a/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_login_ConfigFileTokenizer__
-#define __gnu_javax_security_auth_login_ConfigFileTokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace login
-          {
-              class ConfigFileTokenizer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::login::ConfigFileTokenizer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConfigFileTokenizer(::java::io::Reader *);
-public:
-  virtual jint nextToken();
-  virtual void pushBack();
-private:
-  void init();
-  void skipWhitespace();
-  void abort(::java::lang::String *);
-  static ::java::util::logging::Logger * log;
-public:
-  static const jint TT_EOF = -1;
-  static const jint TT_WORD = -3;
-private:
-  static const jint TT_NONE = -4;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sval;
-  jint ttype;
-private:
-  ::java::io::BufferedReader * br;
-public: // actually package-private
-  jboolean initialised;
-private:
-  ::gnu::java::lang::CPStringBuilder * sb;
-  jint sbNdx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_login_ConfigFileTokenizer__
diff --git a/libjava/gnu/javax/security/auth/login/GnuConfiguration.h b/libjava/gnu/javax/security/auth/login/GnuConfiguration.h
deleted file mode 100644
index 4217749..0000000
--- a/libjava/gnu/javax/security/auth/login/GnuConfiguration.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_security_auth_login_GnuConfiguration__
-#define __gnu_javax_security_auth_login_GnuConfiguration__
-
-#pragma interface
-
-#include <javax/security/auth/login/Configuration.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace security
-      {
-        namespace auth
-        {
-          namespace login
-          {
-              class ConfigFileParser;
-              class GnuConfiguration;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::security::auth::login::GnuConfiguration : public ::javax::security::auth::login::Configuration
-{
-
-public:
-  GnuConfiguration();
-  JArray< ::javax::security::auth::login::AppConfigurationEntry * > * getAppConfigurationEntry(::java::lang::String *);
-  void refresh();
-private:
-  void init();
-  jboolean processSecurityProperties();
-  ::java::io::InputStream * getInputStreamFromURL(::java::lang::String *);
-  jboolean processSystemProperty();
-  jboolean processUserHome();
-  void parseConfig(::java::io::InputStream *);
-  void mergeLoginModules(::java::util::Map *);
-  ::java::io::File * getUserHome();
-  ::java::io::File * getConfigFromUserHome(::java::io::File *, ::java::lang::String *);
-  static ::java::util::logging::Logger * log;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::javax::security::auth::login::Configuration)))) loginModulesMap;
-  ::gnu::javax::security::auth::login::ConfigFileParser * cp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_security_auth_login_GnuConfiguration__
diff --git a/libjava/gnu/javax/sound/AudioSecurityManager$Permission.h b/libjava/gnu/javax/sound/AudioSecurityManager$Permission.h
deleted file mode 100644
index d8f3536..0000000
--- a/libjava/gnu/javax/sound/AudioSecurityManager$Permission.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_AudioSecurityManager$Permission__
-#define __gnu_javax_sound_AudioSecurityManager$Permission__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-          class AudioSecurityManager$Permission;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::AudioSecurityManager$Permission : public ::java::lang::Enum
-{
-
-  AudioSecurityManager$Permission(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::sound::AudioSecurityManager$Permission * > * values();
-  static ::gnu::javax::sound::AudioSecurityManager$Permission * valueOf(::java::lang::String *);
-  static ::gnu::javax::sound::AudioSecurityManager$Permission * PLAY;
-  static ::gnu::javax::sound::AudioSecurityManager$Permission * RECORD;
-  static ::gnu::javax::sound::AudioSecurityManager$Permission * ALL;
-private:
-  static JArray< ::gnu::javax::sound::AudioSecurityManager$Permission * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_AudioSecurityManager$Permission__
diff --git a/libjava/gnu/javax/sound/AudioSecurityManager.h b/libjava/gnu/javax/sound/AudioSecurityManager.h
deleted file mode 100644
index 9d0ec83..0000000
--- a/libjava/gnu/javax/sound/AudioSecurityManager.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_AudioSecurityManager__
-#define __gnu_javax_sound_AudioSecurityManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-          class AudioSecurityManager;
-          class AudioSecurityManager$Permission;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::AudioSecurityManager : public ::java::lang::Object
-{
-
-public:
-  AudioSecurityManager();
-  static void checkPermissions();
-  static void checkPermissions(::gnu::javax::sound::AudioSecurityManager$Permission *);
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$AudioSecurityManager$Permission();
-private:
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$AudioSecurityManager$Permission__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_AudioSecurityManager__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.h b/libjava/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.h
deleted file mode 100644
index cb7291d..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaInputPortDevice__
-#define __gnu_javax_sound_midi_alsa_AlsaInputPortDevice__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaPortDevice.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaInputPortDevice;
-              class AlsaMidiDeviceProvider$AlsaPortInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaInputPortDevice : public ::gnu::javax::sound::midi::alsa::AlsaPortDevice
-{
-
-public: // actually package-private
-  AlsaInputPortDevice(::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo *);
-public:
-  virtual void open();
-  virtual void close();
-  virtual jboolean isOpen();
-  virtual jlong getMicrosecondPosition();
-  virtual jint getMaxReceivers();
-  virtual jint getMaxTransmitters();
-  virtual ::javax::sound::midi::Receiver * getReceiver();
-  virtual ::javax::sound::midi::Transmitter * getTransmitter();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaInputPortDevice__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.h
deleted file mode 100644
index fb7a223..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInfo__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInfo__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiDevice$Info.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo : public ::javax::sound::midi::MidiDevice$Info
-{
-
-public:
-  AlsaMidiDeviceProvider$AlsaInfo(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::javax::sound::midi::MidiDevice * getDevice() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInfo__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.h
deleted file mode 100644
index 51bab4a..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInputPortInfo__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInputPortInfo__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaInputPortInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInputPortInfo : public ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo
-{
-
-public:
-  AlsaMidiDeviceProvider$AlsaInputPortInfo(::java::lang::String *, ::java::lang::String *, jlong, jlong);
-public: // actually package-private
-  virtual ::javax::sound::midi::MidiDevice * getDevice();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaInputPortInfo__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.h
deleted file mode 100644
index c37627b..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaOutputPortInfo__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaOutputPortInfo__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaOutputPortInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaOutputPortInfo : public ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo
-{
-
-public:
-  AlsaMidiDeviceProvider$AlsaOutputPortInfo(::java::lang::String *, ::java::lang::String *, jlong, jlong);
-public: // actually package-private
-  virtual ::javax::sound::midi::MidiDevice * getDevice();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaOutputPortInfo__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.h
deleted file mode 100644
index b7c2f64..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaPortInfo__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaPortInfo__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaPortInfo;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo : public ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo
-{
-
-public:
-  AlsaMidiDeviceProvider$AlsaPortInfo(::java::lang::String *, ::java::lang::String *, jlong, jlong);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo)))) client;
-  jlong port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaPortInfo__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.h
deleted file mode 100644
index f1586df..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaSequencerInfo__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaSequencerInfo__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaSequencerInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaSequencerInfo : public ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo
-{
-
-public:
-  AlsaMidiDeviceProvider$AlsaSequencerInfo(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::javax::sound::midi::MidiDevice * getDevice();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider$AlsaSequencerInfo__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.h
deleted file mode 100644
index a1d2884..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider__
-
-#pragma interface
-
-#include <javax/sound/midi/spi/MidiDeviceProvider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider;
-              class AlsaMidiDeviceProvider$AlsaInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider : public ::javax::sound::midi::spi::MidiDeviceProvider
-{
-
-  static JArray< ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo * > * getInputDeviceInfo_();
-  static JArray< ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo * > * getOutputDeviceInfo_();
-  static void init_();
-public:
-  AlsaMidiDeviceProvider();
-  virtual JArray< ::javax::sound::midi::MidiDevice$Info * > * getDeviceInfo();
-  virtual ::javax::sound::midi::MidiDevice * getDevice(::javax::sound::midi::MidiDevice$Info *);
-private:
-  static JArray< ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaInfo * > * infos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.h b/libjava/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.h
deleted file mode 100644
index 5317a99..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice__
-#define __gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiSequencerDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ControllerEventListener;
-          class MetaEventListener;
-          class MidiDevice$Info;
-          class Receiver;
-          class Sequence;
-          class Sequencer$SyncMode;
-          class Track;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaMidiSequencerDevice : public ::java::lang::Object
-{
-
-  AlsaMidiSequencerDevice();
-public:
-  static ::gnu::javax::sound::midi::alsa::AlsaMidiSequencerDevice * getInstance();
-  virtual void setSequence(::javax::sound::midi::Sequence *);
-  virtual void setSequence(::java::io::InputStream *);
-  virtual ::javax::sound::midi::Sequence * getSequence();
-  virtual void start();
-  virtual void stop();
-  virtual jboolean isRunning();
-  virtual void startRecording();
-  virtual void stopRecording();
-  virtual jboolean isRecording();
-  virtual void recordEnable(::javax::sound::midi::Track *, jint);
-  virtual void recordDisable(::javax::sound::midi::Track *);
-  virtual jfloat getTempoInBPM();
-  virtual void setTempoInBPM(jfloat);
-  virtual jfloat getTempoInMPQ();
-  virtual void setTempoInMPQ(jfloat);
-  virtual void setTempoFactor(jfloat);
-  virtual jfloat getTempoFactor();
-  virtual jlong getTickLength();
-  virtual jlong getTickPosition();
-  virtual void setTickPosition(jlong);
-  virtual jlong getMicrosecondLength();
-  virtual jlong getMicrosecondPosition();
-  virtual void setMicrosecondPosition(jlong);
-  virtual void setMasterSyncMode(::javax::sound::midi::Sequencer$SyncMode *);
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getMasterSyncMode();
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getMasterSyncModes();
-  virtual void setSlaveSyncMode(::javax::sound::midi::Sequencer$SyncMode *);
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getSlaveSyncMode();
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getSlaveSyncModes();
-  virtual void setTrackMute(jint, jboolean);
-  virtual jboolean getTrackMute(jint);
-  virtual void setTrackSolo(jint, jboolean);
-  virtual jboolean getTrackSolo(jint);
-  virtual jboolean addMetaEventListener(::javax::sound::midi::MetaEventListener *);
-  virtual void removeMetaEventListener(::javax::sound::midi::MetaEventListener *);
-  virtual JArray< jint > * addControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *);
-  virtual JArray< jint > * removeControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *);
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo();
-  virtual void open();
-private:
-  jlong open_();
-  void close_(jlong);
-public:
-  virtual void close();
-  virtual jboolean isOpen();
-  virtual jint getMaxReceivers();
-  virtual jint getMaxTransmitters();
-  virtual ::javax::sound::midi::Receiver * getReceiver();
-  virtual ::javax::sound::midi::Transmitter * getTransmitter();
-  static ::gnu::javax::sound::midi::alsa::AlsaMidiSequencerDevice * instance;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) nativeState;
-  ::javax::sound::midi::Sequence * sequence;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.h b/libjava/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.h
deleted file mode 100644
index 0f7718d..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaOutputPortDevice__
-#define __gnu_javax_sound_midi_alsa_AlsaOutputPortDevice__
-
-#pragma interface
-
-#include <gnu/javax/sound/midi/alsa/AlsaPortDevice.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaPortInfo;
-              class AlsaOutputPortDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaOutputPortDevice : public ::gnu::javax::sound::midi::alsa::AlsaPortDevice
-{
-
-public: // actually package-private
-  AlsaOutputPortDevice(::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo *);
-public:
-  virtual void open();
-  virtual void close();
-  virtual jboolean isOpen();
-  virtual jlong getMicrosecondPosition();
-  virtual jint getMaxReceivers();
-  virtual jint getMaxTransmitters();
-  virtual ::javax::sound::midi::Receiver * getReceiver();
-  virtual ::javax::sound::midi::Transmitter * getTransmitter();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaOutputPortDevice__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.h b/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.h
deleted file mode 100644
index 8e23df8..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaReceiver__
-#define __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaReceiver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaPortDevice;
-              class AlsaPortDevice$AlsaReceiver;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaPortDevice$AlsaReceiver : public ::java::lang::Object
-{
-
-public:
-  AlsaPortDevice$AlsaReceiver(::gnu::javax::sound::midi::alsa::AlsaPortDevice *);
-  virtual void send(::javax::sound::midi::MidiMessage *, jlong);
-  virtual void close();
-public: // actually package-private
-  ::gnu::javax::sound::midi::alsa::AlsaPortDevice * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaReceiver__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.h b/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.h
deleted file mode 100644
index f88cadc..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaTransmitter__
-#define __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaTransmitter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaPortDevice;
-              class AlsaPortDevice$AlsaTransmitter;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Receiver;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaPortDevice$AlsaTransmitter : public ::java::lang::Object
-{
-
-public: // actually protected
-  AlsaPortDevice$AlsaTransmitter(::gnu::javax::sound::midi::alsa::AlsaPortDevice *);
-public:
-  virtual void run();
-  virtual void setReceiver(::javax::sound::midi::Receiver *);
-  virtual ::javax::sound::midi::Receiver * getReceiver();
-  virtual void close();
-private:
-  ::javax::sound::midi::Receiver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) receiver;
-public: // actually package-private
-  ::gnu::javax::sound::midi::alsa::AlsaPortDevice * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaPortDevice$AlsaTransmitter__
diff --git a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice.h b/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice.h
deleted file mode 100644
index 351bd70..0000000
--- a/libjava/gnu/javax/sound/midi/alsa/AlsaPortDevice.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_alsa_AlsaPortDevice__
-#define __gnu_javax_sound_midi_alsa_AlsaPortDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace alsa
-          {
-              class AlsaMidiDeviceProvider$AlsaPortInfo;
-              class AlsaPortDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice$Info;
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::alsa::AlsaPortDevice : public ::java::lang::Object
-{
-
-public:
-  AlsaPortDevice(::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo *);
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo();
-public: // actually package-private
-  virtual void run_receiver_thread_(jlong, jlong, ::javax::sound::midi::Receiver *);
-public:
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jint getMaxReceivers() = 0;
-  virtual jint getMaxTransmitters() = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual ::javax::sound::midi::Transmitter * getTransmitter() = 0;
-public: // actually package-private
-  ::gnu::javax::sound::midi::alsa::AlsaMidiDeviceProvider$AlsaPortInfo * __attribute__((aligned(__alignof__( ::java::lang::Object)))) info;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_alsa_AlsaPortDevice__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h b/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h
deleted file mode 100644
index e6613c3..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$1__
-#define __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSIMidiDeviceProvider$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSIMidiDeviceProvider$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DSSIMidiDeviceProvider$1();
-public:
-  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$1__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.h b/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.h
deleted file mode 100644
index 3477cae..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$DSSIInfo__
-#define __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$DSSIInfo__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiDevice$Info.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSIMidiDeviceProvider$DSSIInfo;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSIMidiDeviceProvider$DSSIInfo : public ::javax::sound::midi::MidiDevice$Info
-{
-
-public:
-  DSSIMidiDeviceProvider$DSSIInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jlong);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::sound::midi::MidiDevice$Info)))) copyright;
-  ::java::lang::String * soname;
-  jlong index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider$DSSIInfo__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.h b/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.h
deleted file mode 100644
index 3cf346a..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider__
-#define __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider__
-
-#pragma interface
-
-#include <javax/sound/midi/spi/MidiDeviceProvider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSIMidiDeviceProvider;
-              class DSSIMidiDeviceProvider$DSSIInfo;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSIMidiDeviceProvider : public ::javax::sound::midi::spi::MidiDeviceProvider
-{
-
-public: // actually package-private
-  static jlong dlopen_(::java::lang::String *);
-  static void dlclose_(jlong);
-  static jlong getDSSIHandle_(jlong, jlong);
-  static ::java::lang::String * getDSSIName_(jlong);
-  static ::java::lang::String * getDSSICopyright_(jlong);
-  static ::java::lang::String * getDSSIVendor_(jlong);
-  static ::java::lang::String * getDSSILabel_(jlong);
-private:
-  static ::java::util::List * examineLibrary(::java::lang::String *);
-public:
-  DSSIMidiDeviceProvider();
-  virtual JArray< ::javax::sound::midi::MidiDevice$Info * > * getDeviceInfo();
-  virtual ::javax::sound::midi::MidiDevice * getDevice(::javax::sound::midi::MidiDevice$Info *);
-private:
-  static JArray< ::gnu::javax::sound::midi::dssi::DSSIMidiDeviceProvider$DSSIInfo * > * infos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.h b/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.h
deleted file mode 100644
index 4816735..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIInstrument__
-#define __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIInstrument__
-
-#pragma interface
-
-#include <javax/sound/midi/Instrument.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSISynthesizer;
-              class DSSISynthesizer$DSSIInstrument;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Patch;
-          class Soundbank;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSISynthesizer$DSSIInstrument : public ::javax::sound::midi::Instrument
-{
-
-public: // actually package-private
-  DSSISynthesizer$DSSIInstrument(::gnu::javax::sound::midi::dssi::DSSISynthesizer *, ::javax::sound::midi::Soundbank *, ::javax::sound::midi::Patch *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getData();
-public: // actually package-private
-  ::gnu::javax::sound::midi::dssi::DSSISynthesizer * __attribute__((aligned(__alignof__( ::javax::sound::midi::Instrument)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIInstrument__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.h b/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.h
deleted file mode 100644
index 733eb38..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIMidiChannel__
-#define __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIMidiChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSISynthesizer;
-              class DSSISynthesizer$DSSIMidiChannel;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSISynthesizer$DSSIMidiChannel : public ::java::lang::Object
-{
-
-public:
-  DSSISynthesizer$DSSIMidiChannel(::gnu::javax::sound::midi::dssi::DSSISynthesizer *, jint);
-  virtual void noteOn(jint, jint);
-  virtual void noteOff(jint, jint);
-  virtual void noteOff(jint);
-  virtual void setPolyPressure(jint, jint);
-  virtual jint getPolyPressure(jint);
-  virtual void setChannelPressure(jint);
-  virtual jint getChannelPressure();
-  virtual void controlChange(jint, jint);
-  virtual jint getController(jint);
-  virtual void programChange(jint);
-  virtual void programChange(jint, jint);
-  virtual jint getProgram();
-  virtual void setPitchBend(jint);
-  virtual jint getPitchBend();
-  virtual void resetAllControllers();
-  virtual void allNotesOff();
-  virtual void allSoundOff();
-  virtual jboolean localControl(jboolean);
-  virtual void setMono(jboolean);
-  virtual jboolean getMono();
-  virtual void setOmni(jboolean);
-  virtual jboolean getOmni();
-  virtual void setMute(jboolean);
-  virtual jboolean getMute();
-  virtual void setSolo(jboolean);
-  virtual jboolean getSolo();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) channel;
-  ::gnu::javax::sound::midi::dssi::DSSISynthesizer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIMidiChannel__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.h b/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.h
deleted file mode 100644
index dbdd328..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIReceiver__
-#define __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIReceiver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSISynthesizer;
-              class DSSISynthesizer$DSSIReceiver;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSISynthesizer$DSSIReceiver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DSSISynthesizer$DSSIReceiver(::gnu::javax::sound::midi::dssi::DSSISynthesizer *);
-public:
-  virtual void send(::javax::sound::midi::MidiMessage *, jlong);
-  virtual void close();
-public: // actually package-private
-  ::gnu::javax::sound::midi::dssi::DSSISynthesizer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSIReceiver__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.h b/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.h
deleted file mode 100644
index 4ebaffb..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSISoundbank__
-#define __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSISoundbank__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSISynthesizer;
-              class DSSISynthesizer$DSSISoundbank;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class Patch;
-          class SoundbankResource;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSISynthesizer$DSSISoundbank : public ::java::lang::Object
-{
-
-public:
-  DSSISynthesizer$DSSISoundbank(::gnu::javax::sound::midi::dssi::DSSISynthesizer *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual void add(::javax::sound::midi::Instrument *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * getVendor();
-  virtual ::java::lang::String * getDescription();
-  virtual JArray< ::javax::sound::midi::SoundbankResource * > * getResources();
-  virtual JArray< ::javax::sound::midi::Instrument * > * getInstruments();
-  virtual ::javax::sound::midi::Instrument * getInstrument(::javax::sound::midi::Patch *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * description;
-  ::java::util::List * instruments;
-  ::java::util::List * resources;
-  ::java::lang::String * vendor;
-  ::java::lang::String * version;
-public: // actually package-private
-  ::gnu::javax::sound::midi::dssi::DSSISynthesizer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSISynthesizer$DSSISoundbank__
diff --git a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer.h b/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer.h
deleted file mode 100644
index c4d4a61..0000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSISynthesizer.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_dssi_DSSISynthesizer__
-#define __gnu_javax_sound_midi_dssi_DSSISynthesizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace dssi
-          {
-              class DSSISynthesizer;
-              class DSSISynthesizer$DSSISoundbank;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class MidiChannel;
-          class MidiDevice$Info;
-          class Patch;
-          class Receiver;
-          class Soundbank;
-          class Transmitter;
-          class VoiceStatus;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::dssi::DSSISynthesizer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static void noteOn_(jlong, jint, jint, jint);
-  static void noteOff_(jlong, jint, jint, jint);
-  static void setPolyPressure_(jlong, jint, jint, jint);
-  static jint getPolyPressure_(jlong, jint, jint);
-  static void controlChange_(jlong, jint, jint, jint);
-  static void open_(jlong);
-  static void close_(jlong);
-  static ::java::lang::String * getProgramName_(jlong, jint);
-  static jint getProgramBank_(jlong, jint);
-  static jint getProgramProgram_(jlong, jint);
-  static void selectProgram_(jlong, jint, jint);
-public:
-  DSSISynthesizer(::javax::sound::midi::MidiDevice$Info *, ::java::lang::String *, jlong);
-  virtual jint getMaxPolyphony();
-  virtual jlong getLatency();
-  virtual JArray< ::javax::sound::midi::MidiChannel * > * getChannels();
-  virtual JArray< ::javax::sound::midi::VoiceStatus * > * getVoiceStatus();
-  virtual jboolean isSoundbankSupported(::javax::sound::midi::Soundbank *);
-  virtual jboolean loadInstrument(::javax::sound::midi::Instrument *);
-  virtual void unloadInstrument(::javax::sound::midi::Instrument *);
-  virtual jboolean remapInstrument(::javax::sound::midi::Instrument *, ::javax::sound::midi::Instrument *);
-  virtual ::javax::sound::midi::Soundbank * getDefaultSoundbank();
-  virtual JArray< ::javax::sound::midi::Instrument * > * getAvailableInstruments();
-  virtual JArray< ::javax::sound::midi::Instrument * > * getLoadedInstruments();
-  virtual jboolean loadAllInstruments(::javax::sound::midi::Soundbank *);
-  virtual void unloadAllInstruments(::javax::sound::midi::Soundbank *);
-  virtual jboolean loadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *);
-  virtual void unloadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *);
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo();
-  virtual void open();
-  virtual void close();
-  virtual jboolean isOpen();
-  virtual jlong getMicrosecondPosition();
-  virtual jint getMaxReceivers();
-  virtual jint getMaxTransmitters();
-  virtual ::javax::sound::midi::Receiver * getReceiver();
-  virtual ::javax::sound::midi::Transmitter * getTransmitter();
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) sohandle;
-  jlong handle;
-private:
-  ::javax::sound::midi::MidiDevice$Info * info;
-public: // actually package-private
-  JArray< ::javax::sound::midi::MidiChannel * > * channels;
-  ::java::util::List * soundbanks;
-  ::gnu::javax::sound::midi::dssi::DSSISynthesizer$DSSISoundbank * defaultSoundbank;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_dssi_DSSISynthesizer__
diff --git a/libjava/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.h b/libjava/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.h
deleted file mode 100644
index 70a8a4c..0000000
--- a/libjava/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_file_ExtendedMidiFileFormat__
-#define __gnu_javax_sound_midi_file_ExtendedMidiFileFormat__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiFileFormat.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace file
-          {
-              class ExtendedMidiFileFormat;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::file::ExtendedMidiFileFormat : public ::javax::sound::midi::MidiFileFormat
-{
-
-public:
-  virtual jint getNumberTracks();
-  ExtendedMidiFileFormat(jint, jfloat, jint, jint, jlong, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::sound::midi::MidiFileFormat)))) ntracks;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_file_ExtendedMidiFileFormat__
diff --git a/libjava/gnu/javax/sound/midi/file/MidiDataInputStream.h b/libjava/gnu/javax/sound/midi/file/MidiDataInputStream.h
deleted file mode 100644
index 00d2472..0000000
--- a/libjava/gnu/javax/sound/midi/file/MidiDataInputStream.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_file_MidiDataInputStream__
-#define __gnu_javax_sound_midi_file_MidiDataInputStream__
-
-#pragma interface
-
-#include <java/io/DataInputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace file
-          {
-              class MidiDataInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::file::MidiDataInputStream : public ::java::io::DataInputStream
-{
-
-public:
-  MidiDataInputStream(::java::io::InputStream *);
-  virtual jint readVariableLengthInt();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_file_MidiDataInputStream__
diff --git a/libjava/gnu/javax/sound/midi/file/MidiDataOutputStream.h b/libjava/gnu/javax/sound/midi/file/MidiDataOutputStream.h
deleted file mode 100644
index 70718fc..0000000
--- a/libjava/gnu/javax/sound/midi/file/MidiDataOutputStream.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_file_MidiDataOutputStream__
-#define __gnu_javax_sound_midi_file_MidiDataOutputStream__
-
-#pragma interface
-
-#include <java/io/DataOutputStream.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace file
-          {
-              class MidiDataOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::file::MidiDataOutputStream : public ::java::io::DataOutputStream
-{
-
-public:
-  MidiDataOutputStream(::java::io::OutputStream *);
-  virtual jint variableLengthIntLength(jint);
-  virtual void writeVariableLengthInt(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_file_MidiDataOutputStream__
diff --git a/libjava/gnu/javax/sound/midi/file/MidiFileReader.h b/libjava/gnu/javax/sound/midi/file/MidiFileReader.h
deleted file mode 100644
index 823ead6..0000000
--- a/libjava/gnu/javax/sound/midi/file/MidiFileReader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_file_MidiFileReader__
-#define __gnu_javax_sound_midi_file_MidiFileReader__
-
-#pragma interface
-
-#include <javax/sound/midi/spi/MidiFileReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace file
-          {
-              class MidiFileReader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiFileFormat;
-          class Sequence;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::file::MidiFileReader : public ::javax::sound::midi::spi::MidiFileReader
-{
-
-public:
-  MidiFileReader();
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::InputStream *);
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::net::URL *);
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::File *);
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::InputStream *);
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::net::URL *);
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_file_MidiFileReader__
diff --git a/libjava/gnu/javax/sound/midi/file/MidiFileWriter.h b/libjava/gnu/javax/sound/midi/file/MidiFileWriter.h
deleted file mode 100644
index 15518ac..0000000
--- a/libjava/gnu/javax/sound/midi/file/MidiFileWriter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_midi_file_MidiFileWriter__
-#define __gnu_javax_sound_midi_file_MidiFileWriter__
-
-#pragma interface
-
-#include <javax/sound/midi/spi/MidiFileWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace midi
-        {
-          namespace file
-          {
-              class MidiDataOutputStream;
-              class MidiFileWriter;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Sequence;
-          class Track;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::midi::file::MidiFileWriter : public ::javax::sound::midi::spi::MidiFileWriter
-{
-
-public:
-  MidiFileWriter();
-  virtual JArray< jint > * getMidiFileTypes();
-  virtual JArray< jint > * getMidiFileTypes(::javax::sound::midi::Sequence *);
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::OutputStream *);
-private:
-  jint computeTrackLength(::javax::sound::midi::Track *, ::gnu::javax::sound::midi::file::MidiDataOutputStream *);
-  jint writeTrack(::javax::sound::midi::Track *, ::gnu::javax::sound::midi::file::MidiDataOutputStream *);
-public:
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_midi_file_MidiFileWriter__
diff --git a/libjava/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.h b/libjava/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.h
deleted file mode 100644
index d88744f..0000000
--- a/libjava/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_AU_AUReader$AUFormatType__
-#define __gnu_javax_sound_sampled_AU_AUReader$AUFormatType__
-
-#pragma interface
-
-#include <javax/sound/sampled/AudioFileFormat$Type.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace AU
-          {
-              class AUReader$AUFormatType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::AU::AUReader$AUFormatType : public ::javax::sound::sampled::AudioFileFormat$Type
-{
-
-public:
-  AUReader$AUFormatType();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_AU_AUReader$AUFormatType__
diff --git a/libjava/gnu/javax/sound/sampled/AU/AUReader$AUHeader.h b/libjava/gnu/javax/sound/sampled/AU/AUReader$AUHeader.h
deleted file mode 100644
index 94f2101..0000000
--- a/libjava/gnu/javax/sound/sampled/AU/AUReader$AUHeader.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_AU_AUReader$AUHeader__
-#define __gnu_javax_sound_sampled_AU_AUReader$AUHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace AU
-          {
-              class AUReader$AUHeader;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioFormat;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::AU::AUReader$AUHeader : public ::java::lang::Object
-{
-
-public:
-  AUReader$AUHeader(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioFormat * getAudioFormat();
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat();
-private:
-  static const jint MAGIC = 779316836;
-public:
-  static const jint SIZE = 24;
-  static const jint ULAW = 1;
-  static const jint PCM8 = 2;
-  static const jint PCM16 = 3;
-  static const jint PCM24 = 4;
-  static const jint PCM32 = 5;
-  static const jint IEEE32 = 6;
-  static const jint IEEE64 = 7;
-  static const jint G721 = 23;
-  static const jint G722 = 24;
-  static const jint G723 = 25;
-  static const jint G723_5BIT = 26;
-  static const jint ALAW = 27;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) headerSize;
-  jint fileSize;
-  jint encoding;
-  jint sampleRate;
-  jint channels;
-  jint sampleSizeInBits;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_AU_AUReader$AUHeader__
diff --git a/libjava/gnu/javax/sound/sampled/AU/AUReader.h b/libjava/gnu/javax/sound/sampled/AU/AUReader.h
deleted file mode 100644
index d269e76..0000000
--- a/libjava/gnu/javax/sound/sampled/AU/AUReader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_AU_AUReader__
-#define __gnu_javax_sound_sampled_AU_AUReader__
-
-#pragma interface
-
-#include <javax/sound/sampled/spi/AudioFileReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace AU
-          {
-              class AUReader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::AU::AUReader : public ::javax::sound::sampled::spi::AudioFileReader
-{
-
-public:
-  AUReader();
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_AU_AUReader__
diff --git a/libjava/gnu/javax/sound/sampled/WAV/WAVReader.h b/libjava/gnu/javax/sound/sampled/WAV/WAVReader.h
deleted file mode 100644
index 3756d5d..0000000
--- a/libjava/gnu/javax/sound/sampled/WAV/WAVReader.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_WAV_WAVReader__
-#define __gnu_javax_sound_sampled_WAV_WAVReader__
-
-#pragma interface
-
-#include <javax/sound/sampled/spi/AudioFileReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace WAV
-          {
-              class WAVReader;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::WAV::WAVReader : public ::javax::sound::sampled::spi::AudioFileReader
-{
-
-public:
-  WAVReader();
-private:
-  static jlong readUnsignedIntLE(::java::io::DataInputStream *);
-  static jshort readUnsignedShortLE(::java::io::DataInputStream *);
-public:
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_WAV_WAVReader__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer$GstInfo.h b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer$GstInfo.h
deleted file mode 100644
index 502ec94..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer$GstInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_GStreamerMixer$GstInfo__
-#define __gnu_javax_sound_sampled_gstreamer_GStreamerMixer$GstInfo__
-
-#pragma interface
-
-#include <javax/sound/sampled/Mixer$Info.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-              class GStreamerMixer$GstInfo;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::GStreamerMixer$GstInfo : public ::javax::sound::sampled::Mixer$Info
-{
-
-public: // actually protected
-  GStreamerMixer$GstInfo();
-private:
-  static ::java::lang::String * name;
-  static ::java::lang::String * vendor;
-  static ::java::lang::String * desc;
-  static ::java::lang::String * vers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_GStreamerMixer$GstInfo__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h
deleted file mode 100644
index f716854..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_GStreamerMixer__
-#define __gnu_javax_sound_sampled_gstreamer_GStreamerMixer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-              class GStreamerMixer;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line;
-          class Line$Info;
-          class LineListener;
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::GStreamerMixer : public ::java::lang::Object
-{
-
-public:
-  GStreamerMixer();
-  virtual ::javax::sound::sampled::Line * getLine(::javax::sound::sampled::Line$Info *);
-  virtual jint getMaxLines(::javax::sound::sampled::Line$Info *);
-  virtual ::javax::sound::sampled::Mixer$Info * getMixerInfo();
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo();
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo(::javax::sound::sampled::Line$Info *);
-  virtual JArray< ::javax::sound::sampled::Line * > * getSourceLines();
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo();
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo(::javax::sound::sampled::Line$Info *);
-  virtual JArray< ::javax::sound::sampled::Line * > * getTargetLines();
-  virtual jboolean isLineSupported(::javax::sound::sampled::Line$Info *);
-  virtual jboolean isSynchronizationSupported(JArray< ::javax::sound::sampled::Line * > *, jboolean);
-  virtual void synchronize(JArray< ::javax::sound::sampled::Line * > *, jboolean);
-  virtual void unsynchronize(JArray< ::javax::sound::sampled::Line * > *);
-  virtual void addLineListener(::javax::sound::sampled::LineListener *);
-  virtual void close();
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *);
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls();
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo();
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *);
-  virtual jboolean isOpen();
-  virtual void open();
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *);
-  static ::java::lang::String * GST_BACKEND;
-  static ::java::lang::String * GST_DECODER;
-  static ::java::lang::String * GST_TYPE_NAME;
-  static ::java::lang::String * GST_FILE_EXTENSION;
-private:
-  static ::javax::sound::sampled::Mixer$Info * INFO;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_GStreamerMixer__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.h b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.h
deleted file mode 100644
index 00976f8..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_GStreamerMixerProvider__
-#define __gnu_javax_sound_sampled_gstreamer_GStreamerMixerProvider__
-
-#pragma interface
-
-#include <javax/sound/sampled/spi/MixerProvider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-              class GStreamerMixer;
-              class GStreamerMixerProvider;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Mixer;
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::GStreamerMixerProvider : public ::javax::sound::sampled::spi::MixerProvider
-{
-
-public:
-  GStreamerMixerProvider();
-  virtual ::javax::sound::sampled::Mixer * getMixer(::javax::sound::sampled::Mixer$Info *);
-  virtual JArray< ::javax::sound::sampled::Mixer$Info * > * getMixerInfo();
-private:
-  static ::gnu::javax::sound::sampled::gstreamer::GStreamerMixer * mixer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_GStreamerMixerProvider__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h
deleted file mode 100644
index a6dc8fa..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReader__
-#define __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReader__
-
-#pragma interface
-
-#include <javax/sound/sampled/spi/AudioFileReader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace io
-            {
-                class GstAudioFileReader;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReader : public ::javax::sound::sampled::spi::AudioFileReader
-{
-
-public:
-  GstAudioFileReader();
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
-private:
-  ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *, ::java::lang::String *);
-public:
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReader__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer$GstHeader.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer$GstHeader.h
deleted file mode 100644
index 5d70c40..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer$GstHeader.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer$GstHeader__
-#define __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer$GstHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace io
-            {
-                class GstAudioFileReaderNativePeer$GstHeader;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader : public ::java::lang::Object
-{
-
-  GstAudioFileReaderNativePeer$GstHeader();
-public: // actually package-private
-  GstAudioFileReaderNativePeer$GstHeader(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) file;
-  ::java::lang::String * suffix;
-  ::java::lang::String * name;
-  ::java::lang::String * mimetype;
-  ::java::lang::String * endianness;
-  ::java::lang::String * channels;
-  ::java::lang::String * rate;
-  ::java::lang::String * width;
-  ::java::lang::String * depth;
-  ::java::lang::String * isSigned;
-  ::java::lang::String * layer;
-  ::java::lang::String * bitrate;
-  ::java::lang::String * framed;
-  ::java::lang::String * type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer$GstHeader__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h
deleted file mode 100644
index 82878f1..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer__
-#define __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace io
-            {
-                class GstAudioFileReaderNativePeer;
-                class GstAudioFileReaderNativePeer$GstHeader;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioFormat$Encoding;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GstAudioFileReaderNativePeer();
-public:
-  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::File *);
-  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *);
-  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::net::URL *);
-private:
-  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *, ::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
-  static ::javax::sound::sampled::AudioFormat$Encoding * getEncoding(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
-  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
-public: // actually protected
-  static jboolean gstreamer_get_audio_format_stream(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *, ::gnu::classpath::Pointer *);
-  static jboolean gstreamer_get_audio_format_file(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
-private:
-  static void init_id_cache();
-  static ::java::lang::String * GST_ENCODING;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.h
deleted file mode 100644
index 450ab17..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileWriter__
-#define __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileWriter__
-
-#pragma interface
-
-#include <javax/sound/sampled/spi/AudioFileWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace io
-            {
-                class GstAudioFileWriter;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat$Type;
-          class AudioInputStream;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::io::GstAudioFileWriter : public ::javax::sound::sampled::spi::AudioFileWriter
-{
-
-public:
-  GstAudioFileWriter();
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes();
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes(::javax::sound::sampled::AudioInputStream *);
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::File *);
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::OutputStream *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_io_GstAudioFileWriter__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h
deleted file mode 100644
index 8ffb113..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
-#define __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace io
-            {
-                class GstInputStream;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::io::GstInputStream : public ::java::lang::Object
-{
-
-public:
-  GstInputStream(::java::io::InputStream *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual ::gnu::classpath::Pointer * getNativeClass();
-private:
-  void init_instance();
-  static void init_id_cache();
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) istream;
-  ::gnu::classpath::Pointer * gstInputStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h
deleted file mode 100644
index 20ef7de..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstDataLine;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstDataLine : public ::java::lang::Object
-{
-
-public:
-  GstDataLine(::javax::sound::sampled::AudioFormat *);
-  GstDataLine(::javax::sound::sampled::AudioFormat *, jint);
-  virtual jint getBufferSize();
-  virtual ::javax::sound::sampled::AudioFormat * getFormat();
-  virtual jfloat getLevel();
-  virtual void addLineListener(::javax::sound::sampled::LineListener *);
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *);
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls();
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo();
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *);
-  virtual jboolean isOpen();
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *);
-public: // actually protected
-  virtual void setOpen(::java::lang::Boolean *);
-  virtual void setBufferSize(jint);
-  virtual void setFormat(::javax::sound::sampled::AudioFormat *);
-public:
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jlong getLongFramePosition() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jboolean isActive() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual void close() = 0;
-  virtual void open() = 0;
-  static const jint DEFAULT_BUFFER_SIZE = 1024;
-public: // actually protected
-  ::java::lang::Boolean * __attribute__((aligned(__alignof__( ::java::lang::Object)))) open;
-private:
-  ::javax::sound::sampled::AudioFormat * format;
-  jint bufferSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h
deleted file mode 100644
index e382f3e..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstNativeDataLine;
-                class GstPipeline;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstNativeDataLine : public ::java::lang::Object
-{
-
-public:
-  GstNativeDataLine();
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * createSourcePipeline(jint);
-private:
-  static void init_id_cache();
-  static jboolean setup_sink_pipeline(::gnu::classpath::Pointer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h
deleted file mode 100644
index a0de53f..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstPipeline;
-                class GstPipeline$CleanPipeline;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline : public ::java::lang::Thread
-{
-
-  GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *);
-public:
-  virtual void run();
-public: // actually package-private
-  GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *, ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline *);
-  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h
deleted file mode 100644
index 5966084..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstPipeline$State;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State : public ::java::lang::Enum
-{
-
-  GstPipeline$State(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * values();
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * valueOf(::java::lang::String *);
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PLAY;
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PAUSE;
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * STOP;
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * CLOSE;
-private:
-  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h
deleted file mode 100644
index 56afb46..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstPipeline;
-                class GstPipeline$State;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline : public ::java::lang::Object
-{
-
-public:
-  GstPipeline();
-  GstPipeline(jint);
-  virtual void createForWrite();
-  virtual ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * getState();
-  virtual void close();
-  virtual void setState(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State *);
-  virtual ::gnu::classpath::Pointer * getNativeClass();
-  virtual jint write(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual void drain();
-  virtual void flush();
-private:
-  void closePipe();
-  void prepareWrite();
-  static void init_id_cache();
-  static jboolean set_state(::gnu::classpath::Pointer *, jint);
-  static jint available(::gnu::classpath::Pointer *, jint);
-  static void open_native_pipe(::gnu::classpath::Pointer *, jint);
-  static void close_native_pipe(::gnu::classpath::Pointer *);
-  void init_instance();
-  jboolean create_named_pipe(::gnu::classpath::Pointer *);
-  jlong detect_pipe_size();
-public: // actually package-private
-  static ::gnu::classpath::Pointer * access$0(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *);
-  static void access$1(::gnu::classpath::Pointer *);
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State();
-private:
-  static const jint READ = 0;
-  static const jint WRITE = 1;
-  static const jint QUEUED = 1;
-  static ::java::lang::String * CAPACITY_KEY;
-  static JArray< ::java::lang::Object * > * lock;
-public: // actually protected
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
-private:
-  jlong capacity;
-  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * state;
-  ::java::lang::String * name;
-  ::java::io::FileOutputStream * output;
-  jboolean source;
-  jboolean ready;
-  ::gnu::classpath::Pointer * pipeline;
-  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h
deleted file mode 100644
index 4120a2b..0000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstSourceDataLine__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstSourceDataLine__
-
-#pragma interface
-
-#include <gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstPipeline;
-                class GstSourceDataLine;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstSourceDataLine : public ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine
-{
-
-public:
-  GstSourceDataLine(::javax::sound::sampled::AudioFormat *);
-  virtual void open();
-  virtual void open(::javax::sound::sampled::AudioFormat *);
-  virtual void open(::javax::sound::sampled::AudioFormat *, jint);
-  virtual jint write(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual void drain();
-  virtual void flush();
-  virtual jint getFramePosition();
-  virtual jlong getLongFramePosition();
-  virtual jlong getMicrosecondPosition();
-  virtual jboolean isActive();
-  virtual void start();
-  virtual void stop();
-  virtual void close();
-  virtual jboolean isRunning();
-private:
-  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine)))) pipeline;
-  jboolean open__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstSourceDataLine__
diff --git a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.h b/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.h
deleted file mode 100644
index cb81ed0..0000000
--- a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_plaf_gnu_GNULookAndFeel$CheckBoxIcon__
-#define __gnu_javax_swing_plaf_gnu_GNULookAndFeel$CheckBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace plaf
-        {
-          namespace gnu
-          {
-              class GNULookAndFeel$CheckBoxIcon;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-}
-
-class gnu::javax::swing::plaf::gnu::GNULookAndFeel$CheckBoxIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GNULookAndFeel$CheckBoxIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_plaf_gnu_GNULookAndFeel$CheckBoxIcon__
diff --git a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.h b/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.h
deleted file mode 100644
index 7bf88f4..0000000
--- a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_plaf_gnu_GNULookAndFeel$RadioButtonIcon__
-#define __gnu_javax_swing_plaf_gnu_GNULookAndFeel$RadioButtonIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace plaf
-        {
-          namespace gnu
-          {
-              class GNULookAndFeel$RadioButtonIcon;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-}
-
-class gnu::javax::swing::plaf::gnu::GNULookAndFeel$RadioButtonIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GNULookAndFeel$RadioButtonIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_plaf_gnu_GNULookAndFeel$RadioButtonIcon__
diff --git a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel.h b/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel.h
deleted file mode 100644
index 5aacc5f..0000000
--- a/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_plaf_gnu_GNULookAndFeel__
-#define __gnu_javax_swing_plaf_gnu_GNULookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace plaf
-        {
-          namespace gnu
-          {
-              class GNULookAndFeel;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-    }
-  }
-}
-
-class gnu::javax::swing::plaf::gnu::GNULookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
-{
-
-public:
-  GNULookAndFeel();
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-public: // actually package-private
-  static ::java::awt::Color * blueGray;
-  static ::javax::swing::UIDefaults * LAF_defaults;
-private:
-  static ::java::lang::String * iconspath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_plaf_gnu_GNULookAndFeel__
diff --git a/libjava/gnu/javax/swing/plaf/metal/CustomizableTheme.h b/libjava/gnu/javax/swing/plaf/metal/CustomizableTheme.h
deleted file mode 100644
index 86f273a..0000000
--- a/libjava/gnu/javax/swing/plaf/metal/CustomizableTheme.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_plaf_metal_CustomizableTheme__
-#define __gnu_javax_swing_plaf_metal_CustomizableTheme__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/DefaultMetalTheme.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace plaf
-        {
-          namespace metal
-          {
-              class CustomizableTheme;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorUIResource;
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::plaf::metal::CustomizableTheme : public ::javax::swing::plaf::metal::DefaultMetalTheme
-{
-
-public:
-  CustomizableTheme();
-  virtual void setPrimary1(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
-  virtual void setPrimary2(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
-  virtual void setPrimary3(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
-  virtual void setSecondary1(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
-  virtual void setSecondary2(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
-  virtual void setSecondary3(::java::awt::Color *);
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
-  virtual ::java::lang::Object * clone();
-private:
-  ::javax::swing::plaf::ColorUIResource * __attribute__((aligned(__alignof__( ::javax::swing::plaf::metal::DefaultMetalTheme)))) primary1;
-  ::javax::swing::plaf::ColorUIResource * primary2;
-  ::javax::swing::plaf::ColorUIResource * primary3;
-  ::javax::swing::plaf::ColorUIResource * secondary1;
-  ::javax::swing::plaf::ColorUIResource * secondary2;
-  ::javax::swing::plaf::ColorUIResource * secondary3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_plaf_metal_CustomizableTheme__
diff --git a/libjava/gnu/javax/swing/text/html/CharacterAttributeTranslator.h b/libjava/gnu/javax/swing/text/html/CharacterAttributeTranslator.h
deleted file mode 100644
index 72939f5..0000000
--- a/libjava/gnu/javax/swing/text/html/CharacterAttributeTranslator.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_CharacterAttributeTranslator__
-#define __gnu_javax_swing_text_html_CharacterAttributeTranslator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class CharacterAttributeTranslator;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::CharacterAttributeTranslator : public ::java::lang::Object
-{
-
-public:
-  CharacterAttributeTranslator();
-  static ::java::awt::Color * getColor(::java::lang::String *);
-  static jboolean translateTag(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-private:
-  static ::java::util::HashMap * colorMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_CharacterAttributeTranslator__
diff --git a/libjava/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.h b/libjava/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.h
deleted file mode 100644
index 26a3386..0000000
--- a/libjava/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_CombinedAttributes$CombinedEnumeration__
-#define __gnu_javax_swing_text_html_CombinedAttributes$CombinedEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class CombinedAttributes;
-              class CombinedAttributes$CombinedEnumeration;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::CombinedAttributes$CombinedEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CombinedAttributes$CombinedEnumeration(::gnu::javax::swing::text::html::CombinedAttributes *, ::java::util::Enumeration *, ::java::util::Enumeration *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) a;
-  ::java::util::Enumeration * b;
-  ::gnu::javax::swing::text::html::CombinedAttributes * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_CombinedAttributes$CombinedEnumeration__
diff --git a/libjava/gnu/javax/swing/text/html/CombinedAttributes.h b/libjava/gnu/javax/swing/text/html/CombinedAttributes.h
deleted file mode 100644
index 69ed229..0000000
--- a/libjava/gnu/javax/swing/text/html/CombinedAttributes.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_CombinedAttributes__
-#define __gnu_javax_swing_text_html_CombinedAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class CombinedAttributes;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::CombinedAttributes : public ::java::lang::Object
-{
-
-public:
-  static ::javax::swing::text::AttributeSet * combine(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-private:
-  CombinedAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-public:
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) a;
-  ::javax::swing::text::AttributeSet * b;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_CombinedAttributes__
diff --git a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.h b/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.h
deleted file mode 100644
index b0f39eb..0000000
--- a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_ImageViewIconFactory$LoadingImageIcon__
-#define __gnu_javax_swing_text_html_ImageViewIconFactory$LoadingImageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class ImageViewIconFactory$LoadingImageIcon;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::ImageViewIconFactory$LoadingImageIcon : public ::java::lang::Object
-{
-
-public:
-  ImageViewIconFactory$LoadingImageIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_ImageViewIconFactory$LoadingImageIcon__
diff --git a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.h b/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.h
deleted file mode 100644
index d25a5fe..0000000
--- a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_ImageViewIconFactory$NoImageIcon__
-#define __gnu_javax_swing_text_html_ImageViewIconFactory$NoImageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class ImageViewIconFactory$NoImageIcon;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::ImageViewIconFactory$NoImageIcon : public ::java::lang::Object
-{
-
-public:
-  ImageViewIconFactory$NoImageIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_ImageViewIconFactory$NoImageIcon__
diff --git a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory.h b/libjava/gnu/javax/swing/text/html/ImageViewIconFactory.h
deleted file mode 100644
index 3357a92..0000000
--- a/libjava/gnu/javax/swing/text/html/ImageViewIconFactory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_ImageViewIconFactory__
-#define __gnu_javax_swing_text_html_ImageViewIconFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-              class ImageViewIconFactory;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::ImageViewIconFactory : public ::java::lang::Object
-{
-
-public:
-  ImageViewIconFactory();
-  static ::javax::swing::Icon * getNoImageIcon();
-  static ::javax::swing::Icon * getLoadingImageIcon();
-private:
-  static ::javax::swing::Icon * noImageIcon;
-  static ::javax::swing::Icon * loadingImageIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_ImageViewIconFactory__
diff --git a/libjava/gnu/javax/swing/text/html/css/BorderStyle.h b/libjava/gnu/javax/swing/text/html/css/BorderStyle.h
deleted file mode 100644
index e8efa10..0000000
--- a/libjava/gnu/javax/swing/text/html/css/BorderStyle.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_BorderStyle__
-#define __gnu_javax_swing_text_html_css_BorderStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class BorderStyle;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::BorderStyle : public ::java::lang::Object
-{
-
-public:
-  BorderStyle();
-  static jboolean isValidStyle(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_BorderStyle__
diff --git a/libjava/gnu/javax/swing/text/html/css/BorderWidth.h b/libjava/gnu/javax/swing/text/html/css/BorderWidth.h
deleted file mode 100644
index ce28787..0000000
--- a/libjava/gnu/javax/swing/text/html/css/BorderWidth.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_BorderWidth__
-#define __gnu_javax_swing_text_html_css_BorderWidth__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/css/Length.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class BorderWidth;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::BorderWidth : public ::gnu::javax::swing::text::html::css::Length
-{
-
-public:
-  BorderWidth(::java::lang::String *);
-  static jboolean isValid(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_BorderWidth__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSColor.h b/libjava/gnu/javax/swing/text/html/css/CSSColor.h
deleted file mode 100644
index 6896930..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSColor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSColor__
-#define __gnu_javax_swing_text_html_css_CSSColor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSColor;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSColor : public ::java::lang::Object
-{
-
-public:
-  CSSColor(::java::lang::String *);
-  static ::java::awt::Color * convertValue(::java::lang::String *);
-  virtual ::java::awt::Color * getValue();
-  virtual ::java::lang::String * toString();
-  static jboolean isValidColor(::java::lang::String *);
-private:
-  static ::java::util::HashMap * COLOR_MAP;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::java::awt::Color * color;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSColor__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSLexicalException.h b/libjava/gnu/javax/swing/text/html/css/CSSLexicalException.h
deleted file mode 100644
index bcacf32..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSLexicalException.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSLexicalException__
-#define __gnu_javax_swing_text_html_css_CSSLexicalException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSLexicalException;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSLexicalException : public ::java::io::IOException
-{
-
-public:
-  CSSLexicalException();
-  CSSLexicalException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSLexicalException__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSParser$1.h b/libjava/gnu/javax/swing/text/html/css/CSSParser$1.h
deleted file mode 100644
index b4f0adc..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSParser$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSParser$1__
-#define __gnu_javax_swing_text_html_css_CSSParser$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSParser$1;
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSParser$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSParser$1();
-public:
-  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
-  virtual void endStatement();
-  virtual void declaration(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSParser$1__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSParser.h b/libjava/gnu/javax/swing/text/html/css/CSSParser.h
deleted file mode 100644
index f7cb014..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSParser.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSParser__
-#define __gnu_javax_swing_text_html_css_CSSParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSParser;
-                class CSSParserCallback;
-                class CSSScanner;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSParser : public ::java::lang::Object
-{
-
-public:
-  CSSParser(::java::io::Reader *, ::gnu::javax::swing::text::html::css::CSSParserCallback *);
-  virtual void parse();
-private:
-  jboolean parseStylesheet();
-  jboolean parseStatement();
-  jboolean parseRuleset();
-  jboolean parseDeclaration();
-  jboolean parseValue(::java::lang::StringBuilder *);
-  jboolean parseSelector(::java::lang::StringBuilder *);
-  jboolean parseAny(::java::lang::StringBuilder *);
-  jboolean parseAtRule();
-  jint readToken();
-  jint peekToken();
-public:
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  ::gnu::javax::swing::text::html::css::CSSScanner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scanner;
-  ::gnu::javax::swing::text::html::css::CSSParserCallback * callback;
-  jint lookahead;
-  ::java::lang::String * error;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSParser__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSParserCallback.h b/libjava/gnu/javax/swing/text/html/css/CSSParserCallback.h
deleted file mode 100644
index ce07b41..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSParserCallback.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSParserCallback__
-#define __gnu_javax_swing_text_html_css_CSSParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSParserCallback;
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSParserCallback : public ::java::lang::Object
-{
-
-public:
-  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *) = 0;
-  virtual void endStatement() = 0;
-  virtual void declaration(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_swing_text_html_css_CSSParserCallback__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSParserException.h b/libjava/gnu/javax/swing/text/html/css/CSSParserException.h
deleted file mode 100644
index 9be56d4..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSParserException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSParserException__
-#define __gnu_javax_swing_text_html_css_CSSParserException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSParserException;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSParserException : public ::java::io::IOException
-{
-
-public:
-  CSSParserException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSParserException__
diff --git a/libjava/gnu/javax/swing/text/html/css/CSSScanner.h b/libjava/gnu/javax/swing/text/html/css/CSSScanner.h
deleted file mode 100644
index 0e6d7c5..0000000
--- a/libjava/gnu/javax/swing/text/html/css/CSSScanner.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_CSSScanner__
-#define __gnu_javax_swing_text_html_css_CSSScanner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class CSSScanner;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::CSSScanner : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSScanner(::java::io::Reader *);
-  virtual jint nextToken();
-  virtual ::java::lang::String * currentTokenString();
-private:
-  jint read();
-  void readIdent();
-  void readEscape();
-  void readName();
-  void readString();
-  void readWhitespace();
-  void readURI();
-  void readComment();
-  void readNum();
-public:
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  static const jint IDENT = 1;
-  static const jint ATKEYWORD = 2;
-  static const jint STRING = 3;
-  static const jint INVALID = 4;
-  static const jint HASH = 5;
-  static const jint NUMBER = 6;
-  static const jint PERCENTAGE = 7;
-  static const jint DIMENSION = 8;
-  static const jint URI = 9;
-  static const jint UNICODE_RANGE = 10;
-  static const jint CDO = 11;
-  static const jint CDC = 12;
-  static const jint SEMICOLON = 13;
-  static const jint CURLY_LEFT = 14;
-  static const jint CURLY_RIGHT = 15;
-  static const jint PAREN_LEFT = 16;
-  static const jint PAREN_RIGHT = 17;
-  static const jint BRACE_LEFT = 16;
-  static const jint BRACE_RIGHT = 17;
-  static const jint S = 18;
-  static const jint COMMENT = 19;
-  static const jint FUNCTION = 20;
-  static const jint INCLUDES = 21;
-  static const jint DASHMATCH = 22;
-  static const jint DELIM = 23;
-  static const jint EOF = -1;
-private:
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-public: // actually package-private
-  JArray< jchar > * parseBuffer;
-  jint tokenEnd;
-private:
-  JArray< jint > * lookahead;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_CSSScanner__
diff --git a/libjava/gnu/javax/swing/text/html/css/FontSize.h b/libjava/gnu/javax/swing/text/html/css/FontSize.h
deleted file mode 100644
index 52c4087..0000000
--- a/libjava/gnu/javax/swing/text/html/css/FontSize.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_FontSize__
-#define __gnu_javax_swing_text_html_css_FontSize__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class FontSize;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::FontSize : public ::java::lang::Object
-{
-
-public:
-  FontSize(::java::lang::String *);
-  virtual jint getValue(jint);
-  virtual jint getValue();
-private:
-  jint mapValue();
-  jint mapPoints();
-  jint mapPixels();
-  jint mapPercent(jint);
-  jint mapEM(jint);
-  jint mapSmaller(jint);
-  jint mapLarger(jint);
-  jint mapAbsolute();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  jint mapRelative(jint);
-public:
-  virtual jboolean isRelative();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  jint size;
-  jint sizeIndex;
-  jboolean isRelative__;
-public:
-  static const jint DEFAULT_FONT_SIZE = 12;
-private:
-  static JArray< jdouble > * SCALE;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_FontSize__
diff --git a/libjava/gnu/javax/swing/text/html/css/FontStyle.h b/libjava/gnu/javax/swing/text/html/css/FontStyle.h
deleted file mode 100644
index b25be5b..0000000
--- a/libjava/gnu/javax/swing/text/html/css/FontStyle.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_FontStyle__
-#define __gnu_javax_swing_text_html_css_FontStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class FontStyle;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::FontStyle : public ::java::lang::Object
-{
-
-public:
-  FontStyle(::java::lang::String *);
-  virtual jint getValue();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_FontStyle__
diff --git a/libjava/gnu/javax/swing/text/html/css/FontWeight.h b/libjava/gnu/javax/swing/text/html/css/FontWeight.h
deleted file mode 100644
index 17adbbe..0000000
--- a/libjava/gnu/javax/swing/text/html/css/FontWeight.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_FontWeight__
-#define __gnu_javax_swing_text_html_css_FontWeight__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class FontWeight;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::FontWeight : public ::java::lang::Object
-{
-
-public:
-  FontWeight(::java::lang::String *);
-  virtual jint getValue();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_FontWeight__
diff --git a/libjava/gnu/javax/swing/text/html/css/Length.h b/libjava/gnu/javax/swing/text/html/css/Length.h
deleted file mode 100644
index 0eb88bf..0000000
--- a/libjava/gnu/javax/swing/text/html/css/Length.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_Length__
-#define __gnu_javax_swing_text_html_css_Length__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::Length : public ::java::lang::Object
-{
-
-public:
-  Length(::java::lang::String *);
-  virtual jfloat getValue();
-  virtual jfloat getValue(jfloat);
-  virtual void setEMBase(jfloat);
-  virtual void setEXBase(jfloat);
-  virtual void setFontBases(jfloat, jfloat);
-  virtual jboolean isFontEMRelative();
-  virtual jboolean isFontEXRelative();
-  virtual jboolean isPercentage();
-  static jboolean isValid(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public: // actually protected
-  jfloat floatValue;
-private:
-  jboolean isPercentage__;
-  jboolean isFontEMRelative__;
-  jboolean isFontEXRelative__;
-  jfloat emBase;
-  jfloat exBase;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_Length__
diff --git a/libjava/gnu/javax/swing/text/html/css/Selector.h b/libjava/gnu/javax/swing/text/html/css/Selector.h
deleted file mode 100644
index ba2ba7b..0000000
--- a/libjava/gnu/javax/swing/text/html/css/Selector.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_css_Selector__
-#define __gnu_javax_swing_text_html_css_Selector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::css::Selector : public ::java::lang::Object
-{
-
-public:
-  Selector(::java::lang::String *);
-  virtual jboolean matches(JArray< ::java::lang::String * > *, ::java::util::List *);
-  virtual jint getSpecificity();
-  virtual ::java::lang::String * toString();
-private:
-  void calculateSpecificity();
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selector;
-  JArray< ::java::lang::String * > * elements;
-  JArray< ::java::lang::String * > * ids;
-  JArray< ::java::lang::String * > * classes;
-  jint specificity;
-  jboolean implicit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_css_Selector__
diff --git a/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.h b/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.h
deleted file mode 100644
index 27fa3d0..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_GnuParserDelegator$gnuParser__
-#define __gnu_javax_swing_text_html_parser_GnuParserDelegator$gnuParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class GnuParserDelegator;
-                class GnuParserDelegator$gnuParser;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::GnuParserDelegator$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-public: // actually package-private
-  GnuParserDelegator$gnuParser(::gnu::javax::swing::text::html::parser::GnuParserDelegator *, ::javax::swing::text::html::parser::DTD *);
-public: // actually protected
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-public: // actually package-private
-  virtual ::javax::swing::text::html::parser::DTD * getDTD();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::GnuParserDelegator * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_GnuParserDelegator$gnuParser__
diff --git a/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator.h b/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator.h
deleted file mode 100644
index 1eda52a..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/GnuParserDelegator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_GnuParserDelegator__
-#define __gnu_javax_swing_text_html_parser_GnuParserDelegator__
-
-#pragma interface
-
-#include <javax/swing/text/html/parser/ParserDelegator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class GnuParserDelegator;
-                class GnuParserDelegator$gnuParser;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$ParserCallback;
-          namespace parser
-          {
-              class DTD;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::GnuParserDelegator : public ::javax::swing::text::html::parser::ParserDelegator
-{
-
-public:
-  GnuParserDelegator(::javax::swing::text::html::parser::DTD *);
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
-private:
-  static const jlong serialVersionUID = -1276686502624777206LL;
-  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::javax::swing::text::html::parser::ParserDelegator)))) theDtd;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * callBack;
-  ::gnu::javax::swing::text::html::parser::GnuParserDelegator$gnuParser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_GnuParserDelegator__
diff --git a/libjava/gnu/javax/swing/text/html/parser/HTML_401F.h b/libjava/gnu/javax/swing/text/html/parser/HTML_401F.h
deleted file mode 100644
index d613328..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/HTML_401F.h
+++ /dev/null
@@ -1,338 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_HTML_401F__
-#define __gnu_javax_swing_text_html_parser_HTML_401F__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/gnuDTD.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class HTML_401F;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class ContentModel;
-              class DTD;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::HTML_401F : public ::gnu::javax::swing::text::html::parser::gnuDTD
-{
-
-public: // actually protected
-  HTML_401F();
-public:
-  static ::javax::swing::text::html::parser::DTD * getInstance();
-public: // actually protected
-  virtual void defineElements();
-private:
-  void defineElements1();
-  void defineElements2();
-  void defineElements3();
-  void defineElements4();
-  void defineElements5();
-  void defineElements6();
-public: // actually protected
-  virtual void defineEntities();
-  virtual ::javax::swing::text::html::parser::ContentModel * model(::java::lang::String *);
-private:
-  ::javax::swing::text::html::parser::ContentModel * model(::java::lang::String *, jint);
-public: // actually protected
-  virtual ::javax::swing::text::html::parser::ContentModel * createHtmlContentModel();
-  virtual ::javax::swing::text::html::parser::ContentModel * createTableContentModel();
-  virtual ::javax::swing::text::html::parser::ContentModel * createDefListModel();
-  virtual ::javax::swing::text::html::parser::ContentModel * createListModel();
-  virtual JArray< ::java::lang::String * > * getBodyElements();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::String * DTD_NAME;
-public: // actually package-private
-  static const jint PIXELS = 12;
-  static JArray< ::java::lang::String * > * NONE;
-  static ::java::lang::String * PCDATA;
-  static ::java::lang::String * A;
-  static ::java::lang::String * ABBR;
-  static ::java::lang::String * ACRONYM;
-  static ::java::lang::String * ADDRESS;
-  static ::java::lang::String * APPLET;
-  static ::java::lang::String * AREA;
-  static ::java::lang::String * B;
-  static ::java::lang::String * BASE;
-  static ::java::lang::String * BASEFONT;
-  static ::java::lang::String * BDO;
-  static ::java::lang::String * BIG;
-  static ::java::lang::String * BLOCKQUOTE;
-  static ::java::lang::String * BODY;
-  static ::java::lang::String * BR;
-  static ::java::lang::String * BUTTON;
-  static ::java::lang::String * CAPTION;
-  static ::java::lang::String * CENTER;
-  static ::java::lang::String * CITE;
-  static ::java::lang::String * CODE;
-  static ::java::lang::String * COL;
-  static ::java::lang::String * COLGROUP;
-  static ::java::lang::String * DEFAULTS;
-  static ::java::lang::String * DD;
-  static ::java::lang::String * DEL;
-  static ::java::lang::String * DFN;
-  static ::java::lang::String * DIR;
-  static ::java::lang::String * DIV;
-  static ::java::lang::String * DL;
-  static ::java::lang::String * DT;
-  static ::java::lang::String * EM;
-  static ::java::lang::String * FIELDSET;
-  static ::java::lang::String * FONT;
-  static ::java::lang::String * FORM;
-  static ::java::lang::String * FRAME;
-  static ::java::lang::String * FRAMESET;
-  static ::java::lang::String * H1;
-  static ::java::lang::String * H2;
-  static ::java::lang::String * H3;
-  static ::java::lang::String * H4;
-  static ::java::lang::String * H5;
-  static ::java::lang::String * H6;
-  static ::java::lang::String * HEAD;
-  static ::java::lang::String * HR;
-  static ::java::lang::String * HTML;
-  static ::java::lang::String * I;
-  static ::java::lang::String * IFRAME;
-  static ::java::lang::String * IMG;
-  static ::java::lang::String * INPUT;
-  static ::java::lang::String * INS;
-  static ::java::lang::String * ISINDEX;
-  static ::java::lang::String * KBD;
-  static ::java::lang::String * LABEL;
-  static ::java::lang::String * LEGEND;
-  static ::java::lang::String * LI;
-  static ::java::lang::String * LINK;
-  static ::java::lang::String * MAP;
-  static ::java::lang::String * MENU;
-  static ::java::lang::String * META;
-  static ::java::lang::String * NOFRAMES;
-  static ::java::lang::String * NOSCRIPT;
-  static ::java::lang::String * NONES;
-  static ::java::lang::String * sNAME;
-  static ::java::lang::String * OBJECT;
-  static ::java::lang::String * OL;
-  static ::java::lang::String * OPTGROUP;
-  static ::java::lang::String * OPTION;
-  static ::java::lang::String * P;
-  static ::java::lang::String * PARAM;
-  static ::java::lang::String * PRE;
-  static ::java::lang::String * Q;
-  static ::java::lang::String * S;
-  static ::java::lang::String * SAMP;
-  static ::java::lang::String * SCRIPT;
-  static ::java::lang::String * SELECT;
-  static ::java::lang::String * SMALL;
-  static ::java::lang::String * SPAN;
-  static ::java::lang::String * STRIKE;
-  static ::java::lang::String * STRONG;
-  static ::java::lang::String * STYLE;
-  static ::java::lang::String * SUB;
-  static ::java::lang::String * SUP;
-  static ::java::lang::String * TABLE;
-  static ::java::lang::String * TBODY;
-  static ::java::lang::String * TD;
-  static ::java::lang::String * TEXTAREA;
-  static ::java::lang::String * TFOOT;
-  static ::java::lang::String * TH;
-  static ::java::lang::String * THEAD;
-  static ::java::lang::String * TITLE;
-  static ::java::lang::String * TR;
-  static ::java::lang::String * TT;
-  static ::java::lang::String * U;
-  static ::java::lang::String * UL;
-  static ::java::lang::String * VAR;
-  static ::java::lang::String * C_0;
-  static ::java::lang::String * C_1;
-  static ::java::lang::String * CHECKBOX;
-  static ::java::lang::String * DATA;
-  static ::java::lang::String * FILE;
-  static ::java::lang::String * GET;
-  static ::java::lang::String * HIDDEN;
-  static ::java::lang::String * IMAGE;
-  static ::java::lang::String * PASSWORD;
-  static ::java::lang::String * POST;
-  static ::java::lang::String * RADIO;
-  static ::java::lang::String * REF;
-  static ::java::lang::String * RESET;
-  static ::java::lang::String * SUBMIT;
-  static ::java::lang::String * TEXT;
-  static ::java::lang::String * ABOVE;
-  static ::java::lang::String * ACCEPT;
-  static ::java::lang::String * ACCEPTCHARSET;
-  static ::java::lang::String * ACCESSKEY;
-  static ::java::lang::String * ACTION;
-  static ::java::lang::String * ALIGN;
-  static ::java::lang::String * ALINK;
-  static ::java::lang::String * ALL;
-  static ::java::lang::String * ALT;
-  static ::java::lang::String * APPLICATION_X_WWW_FORM_URLENCODED;
-  static ::java::lang::String * ARCHIVE;
-  static ::java::lang::String * AUTO;
-  static ::java::lang::String * AXIS;
-  static ::java::lang::String * BACKGROUND;
-  static ::java::lang::String * BASELINE;
-  static ::java::lang::String * BELOW;
-  static ::java::lang::String * BGCOLOR;
-  static ::java::lang::String * BORDER;
-  static ::java::lang::String * BOTTOM;
-  static ::java::lang::String * BOX;
-  static ::java::lang::String * CELLPADDING;
-  static ::java::lang::String * CELLSPACING;
-  static ::java::lang::String * CHAR;
-  static ::java::lang::String * CHAROFF;
-  static ::java::lang::String * CHARSET;
-  static ::java::lang::String * CHECKED;
-  static ::java::lang::String * CIRCLE;
-  static ::java::lang::String * CLASS;
-  static ::java::lang::String * CLASSID;
-  static ::java::lang::String * CLEAR;
-  static ::java::lang::String * CODEBASE;
-  static ::java::lang::String * CODETYPE;
-  static ::java::lang::String * COLOR;
-  static ::java::lang::String * COLS;
-  static ::java::lang::String * COLSPAN;
-  static ::java::lang::String * COMPACT;
-  static ::java::lang::String * CONTENT;
-  static ::java::lang::String * COORDS;
-  static ::java::lang::String * DATAPAGESIZE;
-  static ::java::lang::String * DATETIME;
-  static ::java::lang::String * DECLARE;
-  static ::java::lang::String * DEFER;
-  static ::java::lang::String * DISABLED;
-  static ::java::lang::String * DISC;
-  static ::java::lang::String * ENCTYPE;
-  static ::java::lang::String * EVENT;
-  static ::java::lang::String * FACE;
-  static ::java::lang::String * FOR;
-  static ::java::lang::String * FRAMEBORDER;
-  static ::java::lang::String * GROUPS;
-  static ::java::lang::String * HEADERS;
-  static ::java::lang::String * HEIGHT;
-  static ::java::lang::String * HREF;
-  static ::java::lang::String * HREFLANG;
-  static ::java::lang::String * HSIDES;
-  static ::java::lang::String * HSPACE;
-  static ::java::lang::String * HTTPEQUIV;
-  static ::java::lang::String * sID;
-  static ::java::lang::String * ISMAP;
-  static ::java::lang::String * JUSTIFY;
-  static ::java::lang::String * LANG;
-  static ::java::lang::String * LANGUAGE;
-  static ::java::lang::String * LEFT;
-  static ::java::lang::String * LHS;
-  static ::java::lang::String * LONGDESC;
-  static ::java::lang::String * LTR;
-  static ::java::lang::String * MARGINHEIGHT;
-  static ::java::lang::String * MARGINWIDTH;
-  static ::java::lang::String * MAXLENGTH;
-  static ::java::lang::String * MEDIA;
-  static ::java::lang::String * METHOD;
-  static ::java::lang::String * MIDDLE;
-  static ::java::lang::String * MULTIPLE;
-  static ::java::lang::String * NO;
-  static ::java::lang::String * NOHREF;
-  static ::java::lang::String * NORESIZE;
-  static ::java::lang::String * NOSHADE;
-  static ::java::lang::String * NOWRAP;
-  static ::java::lang::String * ONBLUR;
-  static ::java::lang::String * ONCHANGE;
-  static ::java::lang::String * ONCLICK;
-  static ::java::lang::String * ONDBLCLICK;
-  static ::java::lang::String * ONFOCUS;
-  static ::java::lang::String * ONKEYDOWN;
-  static ::java::lang::String * ONKEYPRESS;
-  static ::java::lang::String * ONKEYUP;
-  static ::java::lang::String * ONLOAD;
-  static ::java::lang::String * ONMOUSEDOWN;
-  static ::java::lang::String * ONMOUSEMOVE;
-  static ::java::lang::String * ONMOUSEOUT;
-  static ::java::lang::String * ONMOUSEOVER;
-  static ::java::lang::String * ONMOUSEUP;
-  static ::java::lang::String * ONRESET;
-  static ::java::lang::String * ONSELECT;
-  static ::java::lang::String * ONSUBMIT;
-  static ::java::lang::String * ONUNLOAD;
-  static ::java::lang::String * POLY;
-  static ::java::lang::String * PROFILE;
-  static ::java::lang::String * PROMPT;
-  static ::java::lang::String * READONLY;
-  static ::java::lang::String * RECT;
-  static ::java::lang::String * REL;
-  static ::java::lang::String * REV;
-  static ::java::lang::String * RHS;
-  static ::java::lang::String * RIGHT;
-  static ::java::lang::String * ROW;
-  static ::java::lang::String * ROWGROUP;
-  static ::java::lang::String * ROWS;
-  static ::java::lang::String * ROWSPAN;
-  static ::java::lang::String * RTL;
-  static ::java::lang::String * RULES;
-  static ::java::lang::String * SCHEME;
-  static ::java::lang::String * SCOPE;
-  static ::java::lang::String * SCROLLING;
-  static ::java::lang::String * SELECTED;
-  static ::java::lang::String * SHAPE;
-  static ::java::lang::String * SIZE;
-  static ::java::lang::String * SQUARE;
-  static ::java::lang::String * SRC;
-  static ::java::lang::String * STANDBY;
-  static ::java::lang::String * START;
-  static ::java::lang::String * SUMMARY;
-  static ::java::lang::String * TABINDEX;
-  static ::java::lang::String * TARGET;
-  static ::java::lang::String * TOP;
-  static ::java::lang::String * TYPE;
-  static ::java::lang::String * USEMAP;
-  static ::java::lang::String * VALIGN;
-  static ::java::lang::String * VALUE;
-  static ::java::lang::String * VALUETYPE;
-  static ::java::lang::String * VERSION;
-  static ::java::lang::String * VLINK;
-  static ::java::lang::String * VOID;
-  static ::java::lang::String * VSIDES;
-  static ::java::lang::String * VSPACE;
-  static ::java::lang::String * WIDTH;
-  static ::java::lang::String * YES;
-  static JArray< ::java::lang::String * > * BLOCK;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_HTML_401F__
diff --git a/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h b/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h
deleted file mode 100644
index 949d16d..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet$1__
-#define __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class SmallHtmlAttributeSet;
-                class SmallHtmlAttributeSet$1;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SmallHtmlAttributeSet$1(::gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  ::gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet$1__
diff --git a/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.h b/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.h
deleted file mode 100644
index c1aedde..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet__
-#define __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class SmallHtmlAttributeSet;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::SmallHtmlAttributeSet : public ::java::lang::Object
-{
-
-public:
-  SmallHtmlAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keys;
-  JArray< ::java::lang::Object * > * values;
-  ::javax::swing::text::AttributeSet * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_SmallHtmlAttributeSet__
diff --git a/libjava/gnu/javax/swing/text/html/parser/gnuDTD.h b/libjava/gnu/javax/swing/text/html/parser/gnuDTD.h
deleted file mode 100644
index 33642e3..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/gnuDTD.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_gnuDTD__
-#define __gnu_javax_swing_text_html_parser_gnuDTD__
-
-#pragma interface
-
-#include <javax/swing/text/html/parser/DTD.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class gnuDTD;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class ContentModel;
-              class Element;
-              class Entity;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::gnuDTD : public ::javax::swing::text::html::parser::DTD
-{
-
-public:
-  gnuDTD(::java::lang::String *);
-  virtual ::javax::swing::text::html::parser::AttributeList * defAttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual void defAttrsFor(::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::ContentModel * defContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
-  virtual ::javax::swing::text::html::parser::Element * defElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Element * defElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, ::java::util::Collection *, ::java::util::Collection *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Element * defElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::javax::swing::text::html::parser::AttributeList * > *);
-  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, ::java::lang::String *);
-  virtual void dump(::java::io::PrintStream *);
-  virtual void dump(::java::util::BitSet *);
-public: // actually protected
-  virtual ::javax::swing::text::html::parser::AttributeList * attr(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, jint, jint);
-  virtual void defineEntity(::java::lang::String *, jint);
-private:
-  JArray< ::java::lang::String * > * toStringArray(::java::util::Collection *);
-public:
-  static const jint URI = 512;
-  static const jint Length = 513;
-  static const jint Char = 514;
-  static const jint Color = 515;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_gnuDTD__
diff --git a/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h b/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h
deleted file mode 100644
index 901ad5c..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_htmlAttributeSet$1__
-#define __gnu_javax_swing_text_html_parser_htmlAttributeSet$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlAttributeSet;
-                class htmlAttributeSet$1;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::htmlAttributeSet$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  htmlAttributeSet$1(::gnu::javax::swing::text::html::parser::htmlAttributeSet *, ::java::util::Enumeration *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::htmlAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::Enumeration * val$enumeration;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_htmlAttributeSet$1__
diff --git a/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet.h b/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet.h
deleted file mode 100644
index e981c4f..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/htmlAttributeSet.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_htmlAttributeSet__
-#define __gnu_javax_swing_text_html_parser_htmlAttributeSet__
-
-#pragma interface
-
-#include <javax/swing/text/SimpleAttributeSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlAttributeSet;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::htmlAttributeSet : public ::javax::swing::text::SimpleAttributeSet
-{
-
-public:
-  htmlAttributeSet();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * clone();
-  static ::gnu::javax::swing::text::html::parser::htmlAttributeSet * EMPTY_HTML_ATTRIBUTE_SET;
-public: // actually package-private
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::SimpleAttributeSet)))) parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_htmlAttributeSet__
diff --git a/libjava/gnu/javax/swing/text/html/parser/htmlValidator$hTag.h b/libjava/gnu/javax/swing/text/html/parser/htmlValidator$hTag.h
deleted file mode 100644
index eff505b..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/htmlValidator$hTag.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_htmlValidator$hTag__
-#define __gnu_javax_swing_text_html_parser_htmlValidator$hTag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlValidator;
-                class htmlValidator$hTag;
-              namespace models
-              {
-                  class node;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-          namespace parser
-          {
-              class Element;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::htmlValidator$hTag : public ::java::lang::Object
-{
-
-public: // actually protected
-  htmlValidator$hTag(::gnu::javax::swing::text::html::parser::htmlValidator *, ::javax::swing::text::html::parser::TagElement *);
-  virtual void forciblyCloseDueContext();
-  virtual void forciblyCloseDueEndOfStream();
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  ::javax::swing::text::html::HTML$Tag * tag;
-  ::javax::swing::text::html::parser::TagElement * tgElement;
-  jboolean forcibly_closed;
-  ::gnu::javax::swing::text::html::parser::models::node * validationTrace;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::htmlValidator * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_htmlValidator$hTag__
diff --git a/libjava/gnu/javax/swing/text/html/parser/htmlValidator.h b/libjava/gnu/javax/swing/text/html/parser/htmlValidator.h
deleted file mode 100644
index 9236c14..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/htmlValidator.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_htmlValidator__
-#define __gnu_javax_swing_text_html_parser_htmlValidator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlAttributeSet;
-                class htmlValidator;
-              namespace models
-              {
-                  class node;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class DTD;
-              class Element;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::htmlValidator : public ::java::lang::Object
-{
-
-public:
-  htmlValidator(::javax::swing::text::html::parser::DTD *);
-  virtual void closeAll();
-  virtual jboolean closeTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void openTag(::javax::swing::text::html::parser::TagElement *, ::gnu::javax::swing::text::html::parser::htmlAttributeSet *);
-  virtual void restart();
-  virtual ::java::lang::Object * tagIsValidForContext(::javax::swing::text::html::parser::TagElement *);
-  virtual void validateTag(::javax::swing::text::html::parser::TagElement *, ::gnu::javax::swing::text::html::parser::htmlAttributeSet *);
-public: // actually protected
-  virtual void checkContentModel(::javax::swing::text::html::parser::TagElement *, jboolean);
-  virtual void handleSupposedEndTag(::javax::swing::text::html::parser::Element *) = 0;
-  virtual void handleSupposedStartTag(::javax::swing::text::html::parser::Element *) = 0;
-  virtual void s_error(::java::lang::String *) = 0;
-  virtual void validateParameters(::javax::swing::text::html::parser::TagElement *, ::gnu::javax::swing::text::html::parser::htmlAttributeSet *);
-private:
-  ::gnu::javax::swing::text::html::parser::models::node * getCurrentContentModel();
-  void closeLast();
-  void openFictionalTag(::javax::swing::text::html::parser::Element *);
-  void validateAttribute(::javax::swing::text::html::parser::TagElement *, ::gnu::javax::swing::text::html::parser::htmlAttributeSet *, ::java::util::Enumeration *);
-  void validateAttributeWithValueList(::javax::swing::text::html::parser::TagElement *, ::java::lang::Object *, ::javax::swing::text::html::parser::AttributeList *, ::java::lang::String *);
-  void validateNameOrIdAttribute(::javax::swing::text::html::parser::TagElement *, ::java::lang::Object *, ::java::lang::String *);
-  void validateNumberAttribute(::javax::swing::text::html::parser::TagElement *, ::java::lang::Object *, ::java::lang::String *);
-public: // actually protected
-  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dtd;
-  ::java::util::LinkedList * stack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_htmlValidator__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.h b/libjava/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.h
deleted file mode 100644
index b830790..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_PCDATAonly_model__
-#define __gnu_javax_swing_text_html_parser_models_PCDATAonly_model__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/models/node.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class PCDATAonly_model;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::PCDATAonly_model : public ::gnu::javax::swing::text::html::parser::models::node
-{
-
-public:
-  PCDATAonly_model();
-  virtual ::java::lang::Object * show(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_PCDATAonly_model__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/TableRowContentModel.h b/libjava/gnu/javax/swing/text/html/parser/models/TableRowContentModel.h
deleted file mode 100644
index 6be57a0..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/TableRowContentModel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_TableRowContentModel__
-#define __gnu_javax_swing_text_html_parser_models_TableRowContentModel__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/models/node.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class TableRowContentModel;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::TableRowContentModel : public ::gnu::javax::swing::text::html::parser::models::node
-{
-
-public:
-  TableRowContentModel(::javax::swing::text::html::parser::DTD *);
-  virtual ::java::lang::Object * show(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::models::node)))) TD;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_TableRowContentModel__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/list.h b/libjava/gnu/javax/swing/text/html/parser/models/list.h
deleted file mode 100644
index 6ddb166..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/list.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_list__
-#define __gnu_javax_swing_text_html_parser_models_list__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/models/node.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class list;
-                  class node;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::list : public ::gnu::javax::swing::text::html::parser::models::node
-{
-
-public:
-  list(jchar, jchar, JArray< ::gnu::javax::swing::text::html::parser::models::node * > *);
-  list(JArray< ::gnu::javax::swing::text::html::parser::models::node * > *);
-  virtual jboolean isClosed();
-  virtual ::java::lang::Object * findFreeNode();
-  virtual jboolean matches(JArray< ::java::lang::Object * > *);
-  virtual jboolean mustClose();
-  virtual jboolean performMatch(::java::lang::Object *);
-  virtual void reset();
-  virtual ::java::lang::Object * show(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual jboolean valid();
-  virtual jboolean validPreliminary();
-public: // actually protected
-  virtual void close();
-  virtual jboolean compare(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static jboolean CLEAR;
-  JArray< ::gnu::javax::swing::text::html::parser::models::node * > * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::models::node)))) nodes;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_list__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/noTagModel.h b/libjava/gnu/javax/swing/text/html/parser/models/noTagModel.h
deleted file mode 100644
index 85320f4..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/noTagModel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_noTagModel__
-#define __gnu_javax_swing_text_html_parser_models_noTagModel__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/models/node.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class noTagModel;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::noTagModel : public ::gnu::javax::swing::text::html::parser::models::node
-{
-
-public:
-  noTagModel(JArray< ::java::lang::String * > *);
-  noTagModel(::java::lang::String *);
-  virtual ::java::lang::Object * show(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::models::node)))) no;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_noTagModel__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/node.h b/libjava/gnu/javax/swing/text/html/parser/models/node.h
deleted file mode 100644
index a0b135c..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/node.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_node__
-#define __gnu_javax_swing_text_html_parser_models_node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class node;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::node : public ::java::lang::Object
-{
-
-public:
-  node(jchar, jchar, ::java::lang::Object *);
-  virtual jboolean isClosed();
-  virtual jboolean closePrevious();
-  virtual ::java::lang::Object * findFreeNode();
-  virtual jboolean mustClose();
-  virtual jboolean performMatch(::java::lang::Object *);
-  virtual void reset();
-  virtual ::java::lang::Object * show(::java::lang::Object *);
-  virtual jboolean silenceAllowed();
-  virtual ::java::lang::String * toString();
-  virtual jboolean valid();
-  virtual jboolean validPreliminary();
-public: // actually protected
-  virtual void close();
-  virtual jboolean compare(::java::lang::Object *);
-  virtual void matches();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) token;
-  jboolean _closed;
-  jchar binary;
-  jchar unary;
-  jint visits;
-  ::gnu::javax::swing::text::html::parser::models::node * previous;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_node__
diff --git a/libjava/gnu/javax/swing/text/html/parser/models/transformer.h b/libjava/gnu/javax/swing/text/html/parser/models/transformer.h
deleted file mode 100644
index 6f6470d..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/models/transformer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_models_transformer__
-#define __gnu_javax_swing_text_html_parser_models_transformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace models
-              {
-                  class node;
-                  class transformer;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class ContentModel;
-              class DTD;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::models::transformer : public ::java::lang::Object
-{
-
-public:
-  transformer();
-  static jint measureChainLength(::javax::swing::text::html::parser::ContentModel *);
-  static ::gnu::javax::swing::text::html::parser::models::node * transform(::javax::swing::text::html::parser::ContentModel *);
-  static ::gnu::javax::swing::text::html::parser::models::node * transform(::javax::swing::text::html::parser::ContentModel *, ::javax::swing::text::html::parser::DTD *);
-private:
-  static jboolean isBinary(jint);
-  static jboolean isUnary(jint);
-  static void addtype(::gnu::javax::swing::text::html::parser::models::node *, jchar);
-  static ::gnu::javax::swing::text::html::parser::models::node * optionalTransform(::javax::swing::text::html::parser::ContentModel *, ::javax::swing::text::html::parser::DTD *);
-  static const jlong serialVersionUID = 1LL;
-public: // actually protected
-  static ::java::lang::String * binary;
-  static ::java::lang::String * unary;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_models_transformer__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/Parser$1.h b/libjava/gnu/javax/swing/text/html/parser/support/Parser$1.h
deleted file mode 100644
index 72b503a..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/Parser$1.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_Parser$1__
-#define __gnu_javax_swing_text_html_parser_support_Parser$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class Parser;
-                  class Parser$1;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::Parser$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Parser$1(::gnu::javax::swing::text::html::parser::support::Parser *);
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::support::Parser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_Parser$1__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/Parser$2.h b/libjava/gnu/javax/swing/text/html/parser/support/Parser$2.h
deleted file mode 100644
index 9e1f642..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/Parser$2.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_Parser$2__
-#define __gnu_javax_swing_text_html_parser_support_Parser$2__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/htmlValidator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class Parser;
-                  class Parser$2;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::Parser$2 : public ::gnu::javax::swing::text::html::parser::htmlValidator
-{
-
-public: // actually package-private
-  Parser$2(::gnu::javax::swing::text::html::parser::support::Parser *, ::javax::swing::text::html::parser::DTD *);
-public: // actually protected
-  virtual void s_error(::java::lang::String *);
-  virtual void handleSupposedEndTag(::javax::swing::text::html::parser::Element *);
-  virtual void handleSupposedStartTag(::javax::swing::text::html::parser::Element *);
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::support::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::htmlValidator)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_Parser$2__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/Parser.h b/libjava/gnu/javax/swing/text/html/parser/support/Parser.h
deleted file mode 100644
index 3bdc172..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/Parser.h
+++ /dev/null
@@ -1,154 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_Parser__
-#define __gnu_javax_swing_text_html_parser_support_Parser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlAttributeSet;
-                class htmlValidator;
-              namespace support
-              {
-                  class Parser;
-                namespace low
-                {
-                    class Token;
-                    class pattern;
-                }
-                  class parameterDefaulter;
-                  class textPreProcessor;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class SimpleAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-          namespace parser
-          {
-              class DTD;
-              class Element;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::Parser : public ::gnu::javax::swing::text::html::parser::support::low::ReaderTokenizer
-{
-
-public:
-  Parser(::javax::swing::text::html::parser::DTD *);
-  virtual ::javax::swing::text::SimpleAttributeSet * getAttributes();
-  virtual void error(::java::lang::String *);
-  virtual void error(::java::lang::String *, ::gnu::javax::swing::text::html::parser::support::low::Token *);
-  virtual void error(::java::lang::String *, ::java::lang::String *);
-  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void flushAttributes();
-  virtual void parse(::java::io::Reader *);
-  virtual ::java::lang::String * parseDTDMarkup();
-  virtual jboolean parseMarkupDeclarations(::java::lang::StringBuffer *);
-public: // actually protected
-  virtual jint getCurrentLine();
-  virtual void CDATA(jboolean);
-  virtual void Comment();
-  virtual void Script();
-  virtual void Sgml();
-  virtual void Style();
-  virtual void Tag();
-  virtual void _handleText();
-  virtual void append(::gnu::javax::swing::text::html::parser::support::low::Token *);
-  virtual void consume(::gnu::javax::swing::text::html::parser::support::low::pattern *);
-  virtual void endTag(jboolean);
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEOFInComment();
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-  virtual void handleTitle(JArray< jchar > *);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
-  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * mustBe(jint);
-  virtual void noValueAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * optional(jint);
-  virtual void parseDocument();
-  virtual void readAttributes(::java::lang::String *);
-  virtual ::java::lang::String * resolveNamedEntity(::java::lang::String *);
-  virtual jchar resolveNumericEntity(::java::lang::String *);
-  virtual void restart();
-  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
-private:
-  void _handleCompleteElement(::javax::swing::text::html::parser::TagElement *);
-  void _handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  void _handleEndTag(::javax::swing::text::html::parser::TagElement *);
-public: // actually package-private
-  virtual void _handleEndTag_remaining(::javax::swing::text::html::parser::TagElement *);
-  virtual void _handleStartTag(::javax::swing::text::html::parser::TagElement *);
-private:
-  void forciblyCloseTheTag();
-  void handleComment();
-  ::javax::swing::text::html::parser::TagElement * makeTagElement(::java::lang::String *, jboolean);
-  void readTillTokenE(jint);
-  void resolveAndAppendEntity(::gnu::javax::swing::text::html::parser::support::low::Token *);
-  void restOfTag(jboolean, ::gnu::javax::swing::text::html::parser::support::low::Token *, ::gnu::javax::swing::text::html::parser::support::low::Token *);
-  void startingTag(::javax::swing::text::html::parser::TagElement *);
-  void ws_error();
-  jboolean isBlock(::javax::swing::text::html::HTML$Tag *);
-public:
-  ::gnu::javax::swing::text::html::parser::support::low::Token * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::low::ReaderTokenizer)))) hTag;
-public: // actually protected
-  ::javax::swing::text::html::parser::DTD * dtd;
-  jboolean strict;
-  jint preformatted;
-private:
-  ::java::util::Set * documentTags;
-  ::java::lang::StringBuffer * buffer;
-  ::java::lang::StringBuffer * title;
-  ::gnu::javax::swing::text::html::parser::support::low::Token * t;
-  jboolean titleHandled;
-  jboolean titleOpen;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::htmlAttributeSet * attributes;
-private:
-  ::gnu::javax::swing::text::html::parser::htmlValidator * validator;
-  ::gnu::javax::swing::text::html::parser::support::parameterDefaulter * defaulter;
-  ::gnu::javax::swing::text::html::parser::support::textPreProcessor * textProcessor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_Parser__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h b/libjava/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h
deleted file mode 100644
index f442305..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_gnuStringIntMapper__
-#define __gnu_javax_swing_text_html_parser_support_gnuStringIntMapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class gnuStringIntMapper;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::gnuStringIntMapper : public ::java::lang::Object
-{
-
-public:
-  gnuStringIntMapper();
-  virtual ::java::lang::String * get(jint);
-  virtual jint get(::java::lang::String *);
-public: // actually protected
-  virtual void create() = 0;
-  virtual void add(::java::lang::String *, jint);
-private:
-  void createTheMap();
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) is_Map;
-  ::java::util::Map * si_Map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_gnuStringIntMapper__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/Buffer.h b/libjava/gnu/javax/swing/text/html/parser/support/low/Buffer.h
deleted file mode 100644
index 98ccff8..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/Buffer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_Buffer__
-#define __gnu_javax_swing_text_html_parser_support_low_Buffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Buffer;
-                    class Location;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::Buffer : public ::java::lang::Object
-{
-
-public:
-  Buffer();
-  Buffer(::java::lang::String *);
-  virtual void getChars(jint, jint, JArray< jchar > *, jint);
-  virtual ::java::lang::String * getEndOfLineSequence();
-  virtual void setLength(jint);
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Location * getLocation(jint, jint);
-  virtual void append(jchar, jint);
-  virtual jchar charAt(jint);
-  virtual void delete$(jint, jint);
-  virtual void expand();
-  virtual jint length();
-  virtual void reset();
-  virtual ::java::lang::String * toString();
-  static jint INITIAL_SIZE;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) n_seen;
-  jboolean r_seen;
-public: // actually package-private
-  JArray< jchar > * chr;
-  JArray< jint > * line;
-  JArray< jint > * position;
-  jint current_line;
-  jint length__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_Buffer__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/Constants.h b/libjava/gnu/javax/swing/text/html/parser/support/low/Constants.h
deleted file mode 100644
index 3c21390..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/Constants.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_Constants__
-#define __gnu_javax_swing_text_html_parser_support_low_Constants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Buffer;
-                    class Constants;
-                    class Token;
-                    class pattern;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::Constants : public ::java::lang::Object
-{
-
-public:
-  Constants();
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * endMatches(::gnu::javax::swing::text::html::parser::support::low::Buffer *);
-  static const jint BEGIN = 60;
-  static const jint END = 62;
-  static const jint EXCLAMATION = 33;
-  static const jint SLASH = 47;
-  static const jint EQ = 61;
-  static const jint AP = 39;
-  static const jint QUOT = 34;
-  static const jint DOUBLE_DASH = 1000;
-  static const jint STYLE = 1001;
-  static const jint SCRIPT = 1002;
-  static const jint WS = 1003;
-  static const jint ENTITY = 1004;
-  static const jint NUMTOKEN = 1005;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * COMMENT_OPEN;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * COMMENT_END;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * COMMENT_TRIPLEDASH_END;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * STYLE_OPEN;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * SCRIPT_OPEN;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * SGML;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * SCRIPT_CLOSE;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * STYLE_CLOSE;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * TAG;
-  static ::gnu::javax::swing::text::html::parser::support::low::pattern * TAG_CLOSE;
-  static const jint OTHER = 1999;
-public: // actually package-private
-  static const jchar ETX = 3;
-public:
-  static const jint EOF = 3;
-  static ::java::util::BitSet * bSINGLE_CHAR_TOKEN;
-  static ::java::util::BitSet * bSPECIAL;
-  static ::java::util::BitSet * bLETTER;
-  static ::java::util::BitSet * bDIGIT;
-  static ::java::util::BitSet * bLINEBREAK;
-  static ::java::util::BitSet * bWHITESPACE;
-  static ::java::util::BitSet * bQUOTING;
-  static ::java::util::BitSet * bNAME;
-  static const jint ENTITY_NAMED = 1;
-  static const jint ENTITY_NUMERIC = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_Constants__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/Location.h b/libjava/gnu/javax/swing/text/html/parser/support/low/Location.h
deleted file mode 100644
index 4903ffe..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/Location.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_Location__
-#define __gnu_javax_swing_text_html_parser_support_low_Location__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Location;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::Location : public ::java::lang::Object
-{
-
-public:
-  Location();
-  Location(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) beginLine;
-  jint endLine;
-  jint endPosition;
-  jint startPosition;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_Location__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/ParseException.h b/libjava/gnu/javax/swing/text/html/parser/support/low/ParseException.h
deleted file mode 100644
index ee0c9fc..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/ParseException.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_ParseException__
-#define __gnu_javax_swing_text_html_parser_support_low_ParseException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class ParseException;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::ParseException : public ::java::lang::RuntimeException
-{
-
-public:
-  ParseException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_ParseException__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/Queue.h b/libjava/gnu/javax/swing/text/html/parser/support/low/Queue.h
deleted file mode 100644
index 615dd9c..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/Queue.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_Queue__
-#define __gnu_javax_swing_text_html_parser_support_low_Queue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Queue;
-                    class Token;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::Queue : public ::java::lang::Object
-{
-
-public:
-  Queue();
-  virtual jboolean isEmpty();
-  virtual void add(::gnu::javax::swing::text::html::parser::support::low::Token *);
-  virtual void clear();
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * get(jint);
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * next();
-  virtual jint size();
-public: // actually package-private
-  JArray< ::gnu::javax::swing::text::html::parser::support::low::Token * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m;
-  jint a;
-  jint b;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_Queue__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.h b/libjava/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.h
deleted file mode 100644
index 189d356..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_ReaderTokenizer__
-#define __gnu_javax_swing_text_html_parser_support_low_ReaderTokenizer__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/low/Constants.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Buffer;
-                    class Queue;
-                    class ReaderTokenizer;
-                    class Token;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::ReaderTokenizer : public ::gnu::javax::swing::text::html::parser::support::low::Constants
-{
-
-public:
-  ReaderTokenizer();
-  virtual ::java::lang::String * getEndOfLineSequence();
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * getNextToken();
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * getTokenAhead(jint);
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * getTokenAhead();
-  virtual void error(::java::lang::String *, ::gnu::javax::swing::text::html::parser::support::low::Token *);
-  virtual void mark(jboolean);
-  virtual void reset(::java::io::Reader *);
-  virtual void reset();
-public: // actually package-private
-  virtual void read(jint);
-  virtual void readToken();
-  virtual ::gnu::javax::swing::text::html::parser::support::low::Token * tokenMatches();
-private:
-  void consumeBuffer(::gnu::javax::swing::text::html::parser::support::low::Token *);
-  ::gnu::javax::swing::text::html::parser::support::low::Token * eofToken();
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::low::Constants)))) advanced;
-  jboolean backupMode;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::support::low::Buffer * buffer;
-  ::gnu::javax::swing::text::html::parser::support::low::Queue * backup;
-  ::gnu::javax::swing::text::html::parser::support::low::Queue * queue;
-  ::java::io::Reader * reader;
-  JArray< jchar > * charTokens;
-  JArray< ::java::lang::String * > * stringTokens;
-  jint readerPosition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_ReaderTokenizer__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/Token.h b/libjava/gnu/javax/swing/text/html/parser/support/low/Token.h
deleted file mode 100644
index f237ae4..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/Token.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_Token__
-#define __gnu_javax_swing_text_html_parser_support_low_Token__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class Location;
-                    class Token;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::Token : public ::java::lang::Object
-{
-
-public:
-  Token();
-  Token(jint, ::gnu::javax::swing::text::html::parser::support::low::Location *);
-  Token(jint, jchar, ::gnu::javax::swing::text::html::parser::support::low::Location *);
-  Token(jint, ::java::lang::String *, ::gnu::javax::swing::text::html::parser::support::low::Location *);
-  Token(jint, jint, ::java::lang::String *, ::gnu::javax::swing::text::html::parser::support::low::Location *);
-  Token(::gnu::javax::swing::text::html::parser::support::low::Token *, ::gnu::javax::swing::text::html::parser::support::low::Token *);
-  virtual ::java::lang::String * getImage();
-  virtual void appendTo(::java::lang::StringBuffer *);
-  virtual ::java::lang::String * toString();
-  ::gnu::javax::swing::text::html::parser::support::low::Location * __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  jint category;
-  jint kind;
-private:
-  ::java::lang::String * stringImage;
-  jchar charImage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_Token__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/node.h b/libjava/gnu/javax/swing/text/html/parser/support/low/node.h
deleted file mode 100644
index f113e7b..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/node.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_node__
-#define __gnu_javax_swing_text_html_parser_support_low_node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class node;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::node : public ::java::lang::Object
-{
-
-public:
-  node(jint, jboolean);
-  node(jint);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) optional;
-  jint kind;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_node__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/low/pattern.h b/libjava/gnu/javax/swing/text/html/parser/support/low/pattern.h
deleted file mode 100644
index 3010b52..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/low/pattern.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_low_pattern__
-#define __gnu_javax_swing_text_html_parser_support_low_pattern__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                namespace low
-                {
-                    class ReaderTokenizer;
-                    class node;
-                    class pattern;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::low::pattern : public ::java::lang::Object
-{
-
-public:
-  pattern(JArray< ::gnu::javax::swing::text::html::parser::support::low::node * > *);
-  virtual jboolean matches(::gnu::javax::swing::text::html::parser::support::low::ReaderTokenizer *);
-  JArray< ::gnu::javax::swing::text::html::parser::support::low::node * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_low_pattern__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/parameterDefaulter.h b/libjava/gnu/javax/swing/text/html/parser/support/parameterDefaulter.h
deleted file mode 100644
index 664baec..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/parameterDefaulter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_parameterDefaulter__
-#define __gnu_javax_swing_text_html_parser_support_parameterDefaulter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class htmlAttributeSet;
-              namespace support
-              {
-                  class parameterDefaulter;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::parameterDefaulter : public ::java::lang::Object
-{
-
-public:
-  parameterDefaulter(::javax::swing::text::html::parser::DTD *);
-  virtual ::gnu::javax::swing::text::html::parser::htmlAttributeSet * getDefaultParameters(::java::lang::String *);
-  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dtd;
-public: // actually package-private
-  ::java::util::Hashtable * sets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_parameterDefaulter__
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/textPreProcessor.h b/libjava/gnu/javax/swing/text/html/parser/support/textPreProcessor.h
deleted file mode 100644
index cf5117b..0000000
--- a/libjava/gnu/javax/swing/text/html/parser/support/textPreProcessor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_support_textPreProcessor__
-#define __gnu_javax_swing_text_html_parser_support_textPreProcessor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class textPreProcessor;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::support::textPreProcessor : public ::java::lang::Object
-{
-
-public:
-  textPreProcessor();
-  virtual JArray< jchar > * preprocess(::java::lang::StringBuffer *);
-  virtual JArray< jchar > * preprocessPreformatted(::java::lang::StringBuffer *);
-private:
-  static JArray< jchar > * toCharArray(::java::lang::StringBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_support_textPreProcessor__
diff --git a/libjava/gnu/javax/swing/tree/GnuPath.h b/libjava/gnu/javax/swing/tree/GnuPath.h
deleted file mode 100644
index 3d36eda..0000000
--- a/libjava/gnu/javax/swing/tree/GnuPath.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_tree_GnuPath__
-#define __gnu_javax_swing_tree_GnuPath__
-
-#pragma interface
-
-#include <javax/swing/tree/TreePath.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace tree
-        {
-            class GnuPath;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::tree::GnuPath : public ::javax::swing::tree::TreePath
-{
-
-public:
-  GnuPath(JArray< ::java::lang::Object * > *, jboolean);
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::tree::TreePath)))) isLastChild;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_tree_GnuPath__
diff --git a/libjava/gnu/xml/aelfred2/JAXPFactory$JaxpParser.h b/libjava/gnu/xml/aelfred2/JAXPFactory$JaxpParser.h
deleted file mode 100644
index 42e8e0b..0000000
--- a/libjava/gnu/xml/aelfred2/JAXPFactory$JaxpParser.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_JAXPFactory$JaxpParser__
-#define __gnu_xml_aelfred2_JAXPFactory$JaxpParser__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParser.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class JAXPFactory$JaxpParser;
-          class XmlReader;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Parser;
-          class XMLReader;
-        namespace helpers
-        {
-            class XMLReaderAdapter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::JAXPFactory$JaxpParser : public ::javax::xml::parsers::SAXParser
-{
-
-public: // actually package-private
-  JAXPFactory$JaxpParser();
-public:
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::org::xml::sax::Parser * getParser();
-  virtual ::org::xml::sax::XMLReader * getXMLReader();
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-private:
-  ::gnu::xml::aelfred2::XmlReader * __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParser)))) ae2;
-  ::org::xml::sax::helpers::XMLReaderAdapter * parser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_JAXPFactory$JaxpParser__
diff --git a/libjava/gnu/xml/aelfred2/JAXPFactory.h b/libjava/gnu/xml/aelfred2/JAXPFactory.h
deleted file mode 100644
index 8bffce6..0000000
--- a/libjava/gnu/xml/aelfred2/JAXPFactory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_JAXPFactory__
-#define __gnu_xml_aelfred2_JAXPFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParserFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class JAXPFactory;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::JAXPFactory : public ::javax::xml::parsers::SAXParserFactory
-{
-
-public:
-  JAXPFactory();
-  ::javax::xml::parsers::SAXParser * newSAXParser();
-  void setFeature(::java::lang::String *, jboolean);
-  jboolean getFeature(::java::lang::String *);
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParserFactory)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_JAXPFactory__
diff --git a/libjava/gnu/xml/aelfred2/SAXDriver$Adapter.h b/libjava/gnu/xml/aelfred2/SAXDriver$Adapter.h
deleted file mode 100644
index ac3cbea..0000000
--- a/libjava/gnu/xml/aelfred2/SAXDriver$Adapter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_SAXDriver$Adapter__
-#define __gnu_xml_aelfred2_SAXDriver$Adapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class SAXDriver$Adapter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class DocumentHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::SAXDriver$Adapter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SAXDriver$Adapter(::org::xml::sax::DocumentHandler *);
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void skippedEntity(::java::lang::String *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void endDocument();
-private:
-  ::org::xml::sax::DocumentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) docHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_SAXDriver$Adapter__
diff --git a/libjava/gnu/xml/aelfred2/SAXDriver$Attribute.h b/libjava/gnu/xml/aelfred2/SAXDriver$Attribute.h
deleted file mode 100644
index 3aca390..0000000
--- a/libjava/gnu/xml/aelfred2/SAXDriver$Attribute.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_SAXDriver$Attribute__
-#define __gnu_xml_aelfred2_SAXDriver$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class SAXDriver$Attribute;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::SAXDriver$Attribute : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SAXDriver$Attribute(::java::lang::String *, ::java::lang::String *, jboolean);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-  ::java::lang::String * nameSpace;
-  ::java::lang::String * localName;
-  jboolean specified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_SAXDriver$Attribute__
diff --git a/libjava/gnu/xml/aelfred2/SAXDriver.h b/libjava/gnu/xml/aelfred2/SAXDriver.h
deleted file mode 100644
index aca07f7..0000000
--- a/libjava/gnu/xml/aelfred2/SAXDriver.h
+++ /dev/null
@@ -1,167 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_SAXDriver__
-#define __gnu_xml_aelfred2_SAXDriver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class SAXDriver;
-          class XmlParser;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class DocumentHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-        namespace ext
-        {
-            class DeclHandler;
-            class DefaultHandler2;
-            class EntityResolver2;
-            class LexicalHandler;
-        }
-        namespace helpers
-        {
-            class NamespaceSupport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::SAXDriver : public ::java::lang::Object
-{
-
-public:
-  SAXDriver();
-private:
-  void reset();
-public:
-  void setLocale(::java::util::Locale *);
-  ::org::xml::sax::EntityResolver * getEntityResolver();
-  void setEntityResolver(::org::xml::sax::EntityResolver *);
-  ::org::xml::sax::DTDHandler * getDTDHandler();
-  void setDTDHandler(::org::xml::sax::DTDHandler *);
-  void setDocumentHandler(::org::xml::sax::DocumentHandler *);
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  void setContentHandler(::org::xml::sax::ContentHandler *);
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  void parse(::org::xml::sax::InputSource *);
-  void parse(::java::lang::String *);
-  jboolean getFeature(::java::lang::String *);
-public: // actually package-private
-  ::org::xml::sax::ext::DeclHandler * getDeclHandler();
-  jboolean resolveURIs();
-public:
-  ::java::lang::Object * getProperty(::java::lang::String *);
-  void setFeature(::java::lang::String *, jboolean);
-  void setProperty(::java::lang::String *, ::java::lang::Object *);
-public: // actually package-private
-  void startDocument();
-  void skippedEntity(::java::lang::String *);
-  ::org::xml::sax::InputSource * getExternalSubset(::java::lang::String *, ::java::lang::String *);
-  ::org::xml::sax::InputSource * resolveEntity(jboolean, ::java::lang::String *, ::org::xml::sax::InputSource *, ::java::lang::String *);
-  ::java::lang::String * absolutize(::java::lang::String *, ::java::lang::String *, jboolean);
-  void startExternalEntity(::java::lang::String *, ::java::lang::String *, jboolean);
-  void endExternalEntity(::java::lang::String *);
-  void startInternalEntity(::java::lang::String *);
-  void endInternalEntity(::java::lang::String *);
-  void doctypeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDoctype();
-private:
-  void declarePrefix(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  void attribute(::java::lang::String *, ::java::lang::String *, jboolean);
-  void startElement(::java::lang::String *);
-  void endElement(::java::lang::String *);
-  void startCDATA();
-  void charData(JArray< jchar > *, jint, jint);
-  void endCDATA();
-  void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  void comment(JArray< jchar > *, jint, jint);
-  void fatal(::java::lang::String *);
-  void verror(::java::lang::String *);
-  void warn(::java::lang::String *);
-public:
-  jint getLength();
-  ::java::lang::String * getURI(jint);
-  ::java::lang::String * getLocalName(jint);
-  ::java::lang::String * getQName(jint);
-  ::java::lang::String * getName(jint);
-  ::java::lang::String * getType(jint);
-  ::java::lang::String * getValue(jint);
-  jint getIndex(::java::lang::String *, ::java::lang::String *);
-  jint getIndex(::java::lang::String *);
-  ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getType(::java::lang::String *);
-  ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getValue(::java::lang::String *);
-  jboolean isDeclared(jint);
-  jboolean isDeclared(::java::lang::String *);
-  jboolean isDeclared(::java::lang::String *, ::java::lang::String *);
-  jboolean isSpecified(jint);
-  jboolean isSpecified(::java::lang::String *, ::java::lang::String *);
-  jboolean isSpecified(::java::lang::String *);
-  ::java::lang::String * getPublicId();
-  ::java::lang::String * getSystemId();
-  jint getLineNumber();
-  jint getColumnNumber();
-private:
-  ::org::xml::sax::ext::DefaultHandler2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) base;
-  ::gnu::xml::aelfred2::XmlParser * parser;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::ext::EntityResolver2 * resolver2;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::xml::sax::ext::DeclHandler * declHandler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  ::java::lang::String * elementName;
-  ::java::util::Stack * entityStack;
-  ::java::util::List * attributesList;
-  jboolean namespaces;
-  jboolean xmlNames;
-  jboolean extGE;
-  jboolean extPE;
-  jboolean resolveAll;
-  jboolean useResolver2;
-public: // actually package-private
-  jboolean stringInterning;
-private:
-  jint attributeCount;
-  jboolean attributes;
-  JArray< ::java::lang::String * > * nsTemp;
-  ::org::xml::sax::helpers::NamespaceSupport * prefixStack;
-public: // actually package-private
-  static ::java::lang::String * FEATURE;
-  static ::java::lang::String * PROPERTY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_SAXDriver__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser$AttributeDecl.h b/libjava/gnu/xml/aelfred2/XmlParser$AttributeDecl.h
deleted file mode 100644
index 4baac80..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser$AttributeDecl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser$AttributeDecl__
-#define __gnu_xml_aelfred2_XmlParser$AttributeDecl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlParser$AttributeDecl;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser$AttributeDecl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser$AttributeDecl();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * value;
-  jint valueType;
-  ::java::lang::String * enumeration;
-  ::java::lang::String * defaultValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser$AttributeDecl__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser$ElementDecl.h b/libjava/gnu/xml/aelfred2/XmlParser$ElementDecl.h
deleted file mode 100644
index 8e992e1..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser$ElementDecl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser$ElementDecl__
-#define __gnu_xml_aelfred2_XmlParser$ElementDecl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlParser$ElementDecl;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser$ElementDecl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser$ElementDecl();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) contentType;
-  ::java::lang::String * contentModel;
-  ::java::util::HashMap * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser$ElementDecl__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser$EntityInfo.h b/libjava/gnu/xml/aelfred2/XmlParser$EntityInfo.h
deleted file mode 100644
index 5c4701a..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser$EntityInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser$EntityInfo__
-#define __gnu_xml_aelfred2_XmlParser$EntityInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlParser$EntityInfo;
-          class XmlParser$ExternalIdentifiers;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser$EntityInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser$EntityInfo();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers * ids;
-  ::java::lang::String * value;
-  ::java::lang::String * notationName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser$EntityInfo__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.h b/libjava/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.h
deleted file mode 100644
index a91f649..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser$ExternalIdentifiers__
-#define __gnu_xml_aelfred2_XmlParser$ExternalIdentifiers__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlParser$ExternalIdentifiers;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser$ExternalIdentifiers : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser$ExternalIdentifiers();
-  XmlParser$ExternalIdentifiers(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::lang::String * baseUri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser$ExternalIdentifiers__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser$Input.h b/libjava/gnu/xml/aelfred2/XmlParser$Input.h
deleted file mode 100644
index feaf39e..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser$Input.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser$Input__
-#define __gnu_xml_aelfred2_XmlParser$Input__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlParser$Input;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URLConnection;
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser$Input : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser$Input();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) sourceType;
-  ::java::net::URLConnection * externalEntity;
-  JArray< jchar > * readBuffer;
-  jint readBufferPos;
-  jint readBufferLength;
-  jint line;
-  jint encoding;
-  jint readBufferOverflow;
-  ::java::io::InputStream * is;
-  jint currentByteCount;
-  jint column;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser$Input__
diff --git a/libjava/gnu/xml/aelfred2/XmlParser.h b/libjava/gnu/xml/aelfred2/XmlParser.h
deleted file mode 100644
index baf7319..0000000
--- a/libjava/gnu/xml/aelfred2/XmlParser.h
+++ /dev/null
@@ -1,274 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlParser__
-#define __gnu_xml_aelfred2_XmlParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class SAXDriver;
-          class XmlParser;
-          class XmlParser$AttributeDecl;
-          class XmlParser$ElementDecl;
-          class XmlParser$ExternalIdentifiers;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URLConnection;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XmlParser();
-  void setHandler(::gnu::xml::aelfred2::SAXDriver *);
-  void doParse(::java::lang::String *, ::java::lang::String *, ::java::io::Reader *, ::java::io::InputStream *, ::java::lang::String *);
-private:
-  void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void error(::java::lang::String *, jchar, ::java::lang::String *);
-  void error(::java::lang::String *);
-  void parseDocument();
-  void parseComment();
-  void parsePI();
-  void parseCDSect();
-  jboolean parseProlog();
-  void checkLegalVersion(::java::lang::String *);
-  ::java::lang::String * parseXMLDecl(jboolean);
-  ::java::lang::String * parseTextDecl(jboolean);
-  void setupDecoding(::java::lang::String *);
-  void parseMisc();
-  void parseDoctypedecl();
-  void parseMarkupdecl();
-  void parseElement(jboolean);
-  void parseAttribute(::java::lang::String *);
-  void parseEq();
-  void parseETag();
-  void parseContent();
-  void parseElementDecl();
-  void parseContentspec(::java::lang::String *);
-  void parseElements(JArray< jchar > *);
-  void parseCp();
-  void parseMixed(JArray< jchar > *);
-  void parseAttlistDecl();
-  void parseAttDef(::java::lang::String *);
-  ::java::lang::String * readAttType();
-  void parseEnumeration(jboolean);
-  void parseNotationType();
-  void parseDefault(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void parseConditionalSect(JArray< jchar > *);
-  void parseCharRef();
-  void tryReadCharRef();
-  void parseCharRef(jboolean);
-  void parseEntityRef(jboolean);
-  void parsePEReference();
-  void parseEntityDecl();
-  void parseNotationDecl();
-  void parseCharData();
-  void requireWhitespace();
-  void skipWhitespace();
-  ::java::lang::String * readNmtoken(jboolean);
-  static jboolean isExtender(jchar);
-  ::java::lang::String * readLiteral(jint);
-  ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers * readExternalIds(jboolean, jboolean);
-  jboolean isWhitespace(jchar);
-  void dataBufferAppend(jchar);
-  void dataBufferAppend(::java::lang::String *);
-  void dataBufferAppend(JArray< jchar > *, jint, jint);
-  void dataBufferNormalize();
-  ::java::lang::String * dataBufferToString();
-  void dataBufferFlush();
-  void require(::java::lang::String *);
-  void require(jchar);
-public:
-  ::java::lang::String * intern(JArray< jchar > *, jint, jint);
-private:
-  ::java::lang::Object * extendArray(::java::lang::Object *, jint, jint);
-public: // actually package-private
-  jboolean isStandalone();
-private:
-  jint getContentType(::gnu::xml::aelfred2::XmlParser$ElementDecl *, jint);
-public:
-  jint getElementContentType(::java::lang::String *);
-private:
-  void setElement(::java::lang::String *, jint, ::java::lang::String *, ::java::util::HashMap *);
-  ::java::util::HashMap * getElementAttributes(::java::lang::String *);
-  ::java::util::Iterator * declaredAttributes(::gnu::xml::aelfred2::XmlParser$ElementDecl *);
-public:
-  ::java::util::Iterator * declaredAttributes(::java::lang::String *);
-  ::java::lang::String * getAttributeType(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getAttributeEnumeration(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getAttributeDefaultValue(::java::lang::String *, ::java::lang::String *);
-  jint getAttributeDefaultValueType(::java::lang::String *, ::java::lang::String *);
-private:
-  void setAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint);
-  ::gnu::xml::aelfred2::XmlParser$AttributeDecl * getAttribute(::java::lang::String *, ::java::lang::String *);
-public:
-  jint getEntityType(::java::lang::String *);
-  ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers * getEntityIds(::java::lang::String *);
-  ::java::lang::String * getEntityValue(::java::lang::String *);
-private:
-  void setInternalEntity(::java::lang::String *, ::java::lang::String *);
-  void setExternalEntity(::java::lang::String *, jint, ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers *, ::java::lang::String *);
-  void setNotation(::java::lang::String *, ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers *);
-public:
-  jint getLineNumber();
-  jint getColumnNumber();
-private:
-  jchar readCh();
-  void unread(jchar);
-  void unread(JArray< jchar > *, jint);
-  void pushURL(jboolean, ::java::lang::String *, ::gnu::xml::aelfred2::XmlParser$ExternalIdentifiers *, ::java::io::Reader *, ::java::io::InputStream *, ::java::lang::String *, jboolean);
-  ::java::lang::String * tryEncodingDecl(jboolean);
-  void detectEncoding();
-  static jboolean tryEncoding(JArray< jbyte > *, jbyte, jbyte, jbyte, jbyte);
-  static jboolean tryEncoding(JArray< jbyte > *, jbyte, jbyte);
-  void pushString(::java::lang::String *, ::java::lang::String *);
-  void pushCharArray(::java::lang::String *, JArray< jchar > *, jint, jint);
-  void pushInput(::java::lang::String *);
-  void popInput();
-  jboolean tryRead(jchar);
-  jboolean tryRead(::java::lang::String *);
-  jboolean tryRead(JArray< jchar > *);
-  jboolean tryWhitespace();
-  void parseUntil(::java::lang::String *);
-  void parseUntil(JArray< jchar > *);
-  void prefetchASCIIEncodingDecl();
-  void readDataChunk();
-  void filterCR(jboolean);
-  void copyUtf8ReadBuffer(jint);
-  jint getNextUtf8Byte(jint, jint);
-  void copyIso8859_1ReadBuffer(jint, jchar);
-  void copyUcs2ReadBuffer(jint, jint, jint);
-  void copyUcs4ReadBuffer(jint, jint, jint, jint, jint);
-  void encodingError(::java::lang::String *, jint, jint);
-  void initializeVariables();
-  static const jboolean USE_CHEATS = 1;
-public:
-  static const jint CONTENT_UNDECLARED = 0;
-  static const jint CONTENT_ANY = 1;
-  static const jint CONTENT_EMPTY = 2;
-  static const jint CONTENT_MIXED = 3;
-  static const jint CONTENT_ELEMENTS = 4;
-  static const jint ENTITY_UNDECLARED = 0;
-  static const jint ENTITY_INTERNAL = 1;
-  static const jint ENTITY_NDATA = 2;
-  static const jint ENTITY_TEXT = 3;
-private:
-  static const jint ENCODING_EXTERNAL = 0;
-  static const jint ENCODING_UTF_8 = 1;
-  static const jint ENCODING_ISO_8859_1 = 2;
-  static const jint ENCODING_UCS_2_12 = 3;
-  static const jint ENCODING_UCS_2_21 = 4;
-  static const jint ENCODING_UCS_4_1234 = 5;
-  static const jint ENCODING_UCS_4_4321 = 6;
-  static const jint ENCODING_UCS_4_2143 = 7;
-  static const jint ENCODING_UCS_4_3412 = 8;
-  static const jint ENCODING_ASCII = 9;
-public:
-  static const jint ATTRIBUTE_DEFAULT_UNDECLARED = 30;
-  static const jint ATTRIBUTE_DEFAULT_SPECIFIED = 31;
-  static const jint ATTRIBUTE_DEFAULT_IMPLIED = 32;
-  static const jint ATTRIBUTE_DEFAULT_REQUIRED = 33;
-  static const jint ATTRIBUTE_DEFAULT_FIXED = 34;
-private:
-  static const jint INPUT_NONE = 0;
-  static const jint INPUT_INTERNAL = 1;
-  static const jint INPUT_STREAM = 3;
-  static const jint INPUT_READER = 5;
-  static const jint LIT_ENTITY_REF = 2;
-  static const jint LIT_NORMALIZE = 4;
-  static const jint LIT_ATTRIBUTE = 8;
-  static const jint LIT_DISABLE_PE = 16;
-  static const jint LIT_DISABLE_CREF = 32;
-  static const jint LIT_DISABLE_EREF = 64;
-  static const jint LIT_PUBID = 256;
-  static const jint CONTEXT_NORMAL = 0;
-  static const jint CONTEXT_LITERAL = 1;
-public: // actually package-private
-  static jboolean uriWarnings;
-private:
-  ::gnu::xml::aelfred2::SAXDriver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handler;
-  ::java::io::Reader * reader;
-  ::java::io::InputStream * is;
-  jint line;
-  jint column;
-  jint sourceType;
-  ::java::util::LinkedList * inputStack;
-  ::java::net::URLConnection * externalEntity;
-  jint encoding;
-  jint currentByteCount;
-  ::org::xml::sax::InputSource * scratch;
-  JArray< jchar > * readBuffer;
-  jint readBufferPos;
-  jint readBufferLength;
-  jint readBufferOverflow;
-  static const jint READ_BUFFER_MAX = 16384;
-  JArray< jbyte > * rawReadBuffer;
-  static jint DATA_BUFFER_INITIAL;
-  JArray< jchar > * dataBuffer;
-  jint dataBufferPos;
-  static jint NAME_BUFFER_INITIAL;
-  JArray< jchar > * nameBuffer;
-  jint nameBufferPos;
-  jboolean docIsStandalone;
-  ::java::util::HashMap * elementInfo;
-  ::java::util::HashMap * entityInfo;
-  ::java::util::HashMap * notationInfo;
-  jboolean skippedPE;
-  ::java::lang::String * currentElement;
-  jint currentElementContent;
-  ::java::util::LinkedList * entityStack;
-  jboolean inLiteral;
-  jboolean expandPE;
-  jboolean peIsError;
-  jboolean doReport;
-  static const jint SYMBOL_TABLE_LENGTH = 2039;
-  JArray< JArray< ::java::lang::Object * > * > * symbolTable;
-  JArray< ::java::lang::String * > * tagAttributes;
-  jint tagAttributePos;
-  jboolean sawCR;
-  jboolean inCDATA;
-  static const jint XML_10 = 0;
-  static const jint XML_11 = 1;
-  jint xmlVersion;
-public: // actually package-private
-  static JArray< jchar > * startDelimComment;
-  static JArray< jchar > * endDelimComment;
-  static JArray< jchar > * startDelimPI;
-  static JArray< jchar > * endDelimPI;
-  static JArray< jchar > * endDelimCDATA;
-private:
-  jboolean isDirtyCurrentElement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlParser__
diff --git a/libjava/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.h b/libjava/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.h
deleted file mode 100644
index 2e8de94..0000000
--- a/libjava/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlReader$FatalErrorHandler__
-#define __gnu_xml_aelfred2_XmlReader$FatalErrorHandler__
-
-#pragma interface
-
-#include <org/xml/sax/ext/DefaultHandler2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class XmlReader$FatalErrorHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlReader$FatalErrorHandler : public ::org::xml::sax::ext::DefaultHandler2
-{
-
-public: // actually package-private
-  XmlReader$FatalErrorHandler();
-public:
-  virtual void error(::org::xml::sax::SAXParseException *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlReader$FatalErrorHandler__
diff --git a/libjava/gnu/xml/aelfred2/XmlReader.h b/libjava/gnu/xml/aelfred2/XmlReader.h
deleted file mode 100644
index 3d0f5ed..0000000
--- a/libjava/gnu/xml/aelfred2/XmlReader.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_aelfred2_XmlReader__
-#define __gnu_xml_aelfred2_XmlReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace aelfred2
-      {
-          class SAXDriver;
-          class XmlReader;
-      }
-      namespace pipeline
-      {
-          class EventFilter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::aelfred2::XmlReader : public ::java::lang::Object
-{
-
-public:
-  XmlReader();
-  XmlReader(jboolean);
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  void setContentHandler(::org::xml::sax::ContentHandler *);
-  ::org::xml::sax::DTDHandler * getDTDHandler();
-  void setDTDHandler(::org::xml::sax::DTDHandler *);
-  ::org::xml::sax::EntityResolver * getEntityResolver();
-  void setEntityResolver(::org::xml::sax::EntityResolver *);
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  void setProperty(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::Object * getProperty(::java::lang::String *);
-private:
-  void forceValidating();
-public:
-  void setFeature(::java::lang::String *, jboolean);
-  jboolean getFeature(::java::lang::String *);
-  void setLocale(::java::util::Locale *);
-  void parse(::java::lang::String *);
-  void parse(::org::xml::sax::InputSource *);
-private:
-  ::gnu::xml::aelfred2::SAXDriver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) aelfred2;
-  ::gnu::xml::pipeline::EventFilter * filter;
-  jboolean isValidating;
-  jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_aelfred2_XmlReader__
diff --git a/libjava/gnu/xml/dom/Consumer$Backdoor.h b/libjava/gnu/xml/dom/Consumer$Backdoor.h
deleted file mode 100644
index fcfd53c..0000000
--- a/libjava/gnu/xml/dom/Consumer$Backdoor.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_Consumer$Backdoor__
-#define __gnu_xml_dom_Consumer$Backdoor__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/DomConsumer$Handler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class Consumer$Backdoor;
-          class DomDoctype;
-      }
-      namespace pipeline
-      {
-          class DomConsumer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Text;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::Consumer$Backdoor : public ::gnu::xml::pipeline::DomConsumer$Handler
-{
-
-public: // actually protected
-  Consumer$Backdoor(::gnu::xml::pipeline::DomConsumer *);
-private:
-  ::gnu::xml::dom::DomDoctype * getDoctype();
-public:
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  virtual ::org::w3c::dom::Text * createText(jboolean, JArray< jchar > *, jint, jint);
-public:
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual jboolean canPopulateEntityRefs();
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_Consumer$Backdoor__
diff --git a/libjava/gnu/xml/dom/Consumer.h b/libjava/gnu/xml/dom/Consumer.h
deleted file mode 100644
index fdcfafe..0000000
--- a/libjava/gnu/xml/dom/Consumer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_Consumer__
-#define __gnu_xml_dom_Consumer__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/DomConsumer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class Consumer;
-      }
-      namespace pipeline
-      {
-          class EventConsumer;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::Consumer : public ::gnu::xml::pipeline::DomConsumer
-{
-
-public:
-  Consumer();
-  Consumer(::gnu::xml::pipeline::EventConsumer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_Consumer__
diff --git a/libjava/gnu/xml/dom/DTDAttributeTypeInfo.h b/libjava/gnu/xml/dom/DTDAttributeTypeInfo.h
deleted file mode 100644
index 611a12b..0000000
--- a/libjava/gnu/xml/dom/DTDAttributeTypeInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DTDAttributeTypeInfo__
-#define __gnu_xml_dom_DTDAttributeTypeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DTDAttributeTypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DTDAttributeTypeInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DTDAttributeTypeInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getTypeName();
-  virtual ::java::lang::String * getTypeNamespace();
-  virtual jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elementName;
-  ::java::lang::String * name;
-  ::java::lang::String * type;
-  ::java::lang::String * mode;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DTDAttributeTypeInfo__
diff --git a/libjava/gnu/xml/dom/DTDElementTypeInfo.h b/libjava/gnu/xml/dom/DTDElementTypeInfo.h
deleted file mode 100644
index 35656bb..0000000
--- a/libjava/gnu/xml/dom/DTDElementTypeInfo.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DTDElementTypeInfo__
-#define __gnu_xml_dom_DTDElementTypeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DTDAttributeTypeInfo;
-          class DTDElementTypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DTDElementTypeInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DTDElementTypeInfo(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getTypeName();
-  virtual ::java::lang::String * getTypeNamespace();
-  virtual jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint);
-public: // actually package-private
-  virtual ::gnu::xml::dom::DTDAttributeTypeInfo * getAttributeTypeInfo(::java::lang::String *);
-  virtual void setAttributeTypeInfo(::java::lang::String *, ::gnu::xml::dom::DTDAttributeTypeInfo *);
-  virtual ::java::util::Iterator * attributes();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * model;
-  ::java::util::HashMap * attributes__;
-  ::java::lang::String * idAttrName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DTDElementTypeInfo__
diff --git a/libjava/gnu/xml/dom/DomAttr.h b/libjava/gnu/xml/dom/DomAttr.h
deleted file mode 100644
index db0e57d..0000000
--- a/libjava/gnu/xml/dom/DomAttr.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomAttr__
-#define __gnu_xml_dom_DomAttr__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNsNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomAttr;
-          class DomDocument;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class Node;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomAttr : public ::gnu::xml::dom::DomNsNode
-{
-
-public: // actually protected
-  DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
-  DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jboolean getSpecified();
-  virtual void setSpecified(jboolean);
-  virtual ::java::lang::String * getNodeValue();
-  virtual void setValue(::java::lang::String *);
-  virtual ::java::lang::String * getValue();
-  virtual void setNodeValue(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getFirstChild();
-  virtual ::org::w3c::dom::Node * getLastChild();
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual ::org::w3c::dom::Node * getPreviousSibling();
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual void setOwnerElement(::org::w3c::dom::Element *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual ::java::lang::Object * clone();
-private:
-  void mutating(::java::lang::String *, ::java::lang::String *, jshort);
-public:
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual jboolean isId();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNsNode)))) specified;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomAttr__
diff --git a/libjava/gnu/xml/dom/DomCDATASection.h b/libjava/gnu/xml/dom/DomCDATASection.h
deleted file mode 100644
index 9cfb8e6..0000000
--- a/libjava/gnu/xml/dom/DomCDATASection.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomCDATASection__
-#define __gnu_xml_dom_DomCDATASection__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomText.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomCDATASection;
-          class DomDocument;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomCDATASection : public ::gnu::xml::dom::DomText
-{
-
-public: // actually protected
-  DomCDATASection(::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-  DomCDATASection(::gnu::xml::dom::DomDocument *, JArray< jchar > *, jint, jint);
-public:
-  virtual ::java::lang::String * getNodeName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomCDATASection__
diff --git a/libjava/gnu/xml/dom/DomCharacterData$EmptyNodeList.h b/libjava/gnu/xml/dom/DomCharacterData$EmptyNodeList.h
deleted file mode 100644
index e9c2ea1..0000000
--- a/libjava/gnu/xml/dom/DomCharacterData$EmptyNodeList.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomCharacterData$EmptyNodeList__
-#define __gnu_xml_dom_DomCharacterData$EmptyNodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomCharacterData$EmptyNodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomCharacterData$EmptyNodeList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomCharacterData$EmptyNodeList();
-public:
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomCharacterData$EmptyNodeList__
diff --git a/libjava/gnu/xml/dom/DomCharacterData.h b/libjava/gnu/xml/dom/DomCharacterData.h
deleted file mode 100644
index 7ca5f2c..0000000
--- a/libjava/gnu/xml/dom/DomCharacterData.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomCharacterData__
-#define __gnu_xml_dom_DomCharacterData__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomCharacterData;
-          class DomDocument;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NodeList;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomCharacterData : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually package-private
-  DomCharacterData(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-  DomCharacterData(jshort, ::gnu::xml::dom::DomDocument *, JArray< jchar > *, jint, jint);
-public:
-  virtual void appendData(::java::lang::String *);
-  virtual void deleteData(jint, jint);
-  virtual ::java::lang::String * getNodeValue();
-  virtual ::java::lang::String * getData();
-  virtual jint getLength();
-  virtual void insertData(jint, ::java::lang::String *);
-  virtual void replaceData(jint, jint, ::java::lang::String *);
-  virtual void setNodeValue(::java::lang::String *);
-  virtual void setData(::java::lang::String *);
-  virtual ::java::lang::String * substringData(jint, jint);
-  virtual ::org::w3c::dom::NodeList * getChildNodes();
-  virtual ::java::lang::String * getBaseURI();
-private:
-  void mutating(::java::lang::String *);
-public: // actually package-private
-  static ::org::w3c::dom::NodeList * CHILD_NODES;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) text;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomCharacterData__
diff --git a/libjava/gnu/xml/dom/DomComment.h b/libjava/gnu/xml/dom/DomComment.h
deleted file mode 100644
index 99c4a70..0000000
--- a/libjava/gnu/xml/dom/DomComment.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomComment__
-#define __gnu_xml_dom_DomComment__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomCharacterData.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomComment;
-          class DomDocument;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomComment : public ::gnu::xml::dom::DomCharacterData
-{
-
-public: // actually protected
-  DomComment(::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getNodeName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomComment__
diff --git a/libjava/gnu/xml/dom/DomDOMException.h b/libjava/gnu/xml/dom/DomDOMException.h
deleted file mode 100644
index 5cb1e50..0000000
--- a/libjava/gnu/xml/dom/DomDOMException.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDOMException__
-#define __gnu_xml_dom_DomDOMException__
-
-#pragma interface
-
-#include <org/w3c/dom/DOMException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDOMException;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDOMException : public ::org::w3c::dom::DOMException
-{
-
-public:
-  DomDOMException(jshort);
-  DomDOMException(jshort, ::java::lang::String *, ::org::w3c::dom::Node *, jint);
-  virtual ::org::w3c::dom::Node * getNode();
-  virtual ::java::lang::String * getData();
-  virtual jint getValue();
-  virtual ::java::lang::String * getMessage();
-private:
-  static ::java::lang::String * diagnostic(jshort);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::org::w3c::dom::DOMException)))) data;
-  ::org::w3c::dom::Node * node;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDOMException__
diff --git a/libjava/gnu/xml/dom/DomDoctype.h b/libjava/gnu/xml/dom/DomDoctype.h
deleted file mode 100644
index c8ee662..0000000
--- a/libjava/gnu/xml/dom/DomDoctype.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDoctype__
-#define __gnu_xml_dom_DomDoctype__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomExtern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DTDAttributeTypeInfo;
-          class DTDElementTypeInfo;
-          class DomDoctype;
-          class DomDocument;
-          class DomNamedNodeMap;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Entity;
-          class NamedNodeMap;
-          class Node;
-          class Notation;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDoctype : public ::gnu::xml::dom::DomExtern
-{
-
-public: // actually protected
-  DomDoctype(::org::w3c::dom::DOMImplementation *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  DomDoctype(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::org::w3c::dom::NamedNodeMap * getEntities();
-  virtual ::org::w3c::dom::Entity * declareEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::NamedNodeMap * getNotations();
-  virtual ::org::w3c::dom::Notation * declareNotation(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getInternalSubset();
-  virtual ::java::lang::String * getBaseURI();
-  virtual void makeReadonly();
-public: // actually package-private
-  virtual void setOwner(::gnu::xml::dom::DomDocument *);
-public:
-  virtual jboolean supports(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::DOMImplementation * getImplementation();
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::gnu::xml::dom::DTDElementTypeInfo * getElementTypeInfo(::java::lang::String *);
-public:
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::gnu::xml::dom::DTDAttributeTypeInfo * getAttributeTypeInfo(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean hasIds();
-public:
-  virtual jboolean isSameNode(::org::w3c::dom::Node *);
-  virtual ::java::lang::Object * clone();
-private:
-  ::gnu::xml::dom::DomNamedNodeMap * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomExtern)))) notations;
-  ::gnu::xml::dom::DomNamedNodeMap * entities;
-  ::org::w3c::dom::DOMImplementation * implementation;
-  ::java::lang::String * subset;
-  ::java::util::HashMap * elements;
-  jboolean ids;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDoctype__
diff --git a/libjava/gnu/xml/dom/DomDocument.h b/libjava/gnu/xml/dom/DomDocument.h
deleted file mode 100644
index d634485..0000000
--- a/libjava/gnu/xml/dom/DomDocument.h
+++ /dev/null
@@ -1,158 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDocument__
-#define __gnu_xml_dom_DomDocument__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomDocumentConfiguration;
-          class DomNode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class CDATASection;
-          class Comment;
-          class DOMConfiguration;
-          class DOMImplementation;
-          class DocumentFragment;
-          class DocumentType;
-          class Element;
-          class EntityReference;
-          class Node;
-          class ProcessingInstruction;
-          class Text;
-        namespace traversal
-        {
-            class NodeFilter;
-            class NodeIterator;
-            class TreeWalker;
-        }
-        namespace xpath
-        {
-            class XPathExpression;
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDocument : public ::gnu::xml::dom::DomNode
-{
-
-public:
-  DomDocument();
-public: // actually protected
-  DomDocument(::org::w3c::dom::DOMImplementation *);
-public:
-  virtual void setBuilding(jboolean);
-  virtual void setCheckWellformedness(jboolean);
-  virtual void setCheckingCharacters(jboolean);
-  virtual void setDefaultAttributes(jboolean);
-  virtual ::java::lang::String * getNodeName();
-  virtual ::org::w3c::dom::Element * getDocumentElement();
-  virtual ::org::w3c::dom::DocumentType * getDoctype();
-  virtual ::org::w3c::dom::DOMImplementation * getImplementation();
-  virtual ::org::w3c::dom::Element * getElementById(::java::lang::String *);
-private:
-  void checkNewChild(::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  static void verifyXmlName(::java::lang::String *);
-public: // actually package-private
-  static void checkName(::java::lang::String *, jboolean);
-  static void checkNCName(::java::lang::String *, jboolean);
-  static void checkChar(::java::lang::String *, jboolean);
-  static void checkChar(JArray< jchar > *, jint, jint, jboolean);
-public:
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *);
-  virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *);
-private:
-  void setDefaultAttributes(::org::w3c::dom::Element *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::DocumentFragment * createDocumentFragment();
-  virtual ::org::w3c::dom::Text * createTextNode(::java::lang::String *);
-  virtual ::org::w3c::dom::Text * createTextNode(JArray< jchar > *, jint, jint);
-  virtual ::org::w3c::dom::Comment * createComment(::java::lang::String *);
-  virtual ::org::w3c::dom::CDATASection * createCDATASection(::java::lang::String *);
-  virtual ::org::w3c::dom::CDATASection * createCDATASection(JArray< jchar > *, jint, jint);
-  virtual ::org::w3c::dom::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * createAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * createAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::EntityReference * createEntityReference(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * importNode(::org::w3c::dom::Node *, jboolean);
-  virtual ::org::w3c::dom::traversal::NodeIterator * createNodeIterator(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean);
-  virtual ::org::w3c::dom::traversal::TreeWalker * createTreeWalker(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean);
-  virtual ::java::lang::String * getInputEncoding();
-  virtual void setInputEncoding(::java::lang::String *);
-  virtual ::java::lang::String * getXmlEncoding();
-  virtual void setXmlEncoding(::java::lang::String *);
-  virtual jboolean getXmlStandalone();
-  virtual void setXmlStandalone(jboolean);
-  virtual ::java::lang::String * getXmlVersion();
-  virtual void setXmlVersion(::java::lang::String *);
-  virtual jboolean getStrictErrorChecking();
-  virtual void setStrictErrorChecking(jboolean);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual ::java::lang::String * getDocumentURI();
-  virtual void setDocumentURI(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * adoptNode(::org::w3c::dom::Node *);
-public: // actually package-private
-  virtual void adoptChildren(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual void adoptAttributes(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig();
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-  virtual void normalizeDocument();
-public: // actually package-private
-  virtual void normalizeNode(::gnu::xml::dom::DomNode *);
-public:
-  virtual ::org::w3c::dom::Node * renameNode(::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::xpath::XPathExpression * createExpression(::java::lang::String *, ::org::w3c::dom::xpath::XPathNSResolver *);
-  virtual ::org::w3c::dom::xpath::XPathNSResolver * createNSResolver(::org::w3c::dom::Node *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::w3c::dom::Node *, ::org::w3c::dom::xpath::XPathNSResolver *, jshort, ::java::lang::Object *);
-private:
-  ::org::w3c::dom::DOMImplementation * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) implementation;
-  jboolean checkingCharacters;
-public: // actually package-private
-  jboolean checkingWellformedness;
-private:
-  jboolean defaultAttributes;
-public: // actually package-private
-  jboolean building;
-  ::gnu::xml::dom::DomDocumentConfiguration * config;
-  ::java::lang::String * inputEncoding;
-  ::java::lang::String * encoding;
-  ::java::lang::String * version;
-  jboolean standalone;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDocument__
diff --git a/libjava/gnu/xml/dom/DomDocumentBuilder.h b/libjava/gnu/xml/dom/DomDocumentBuilder.h
deleted file mode 100644
index f45207a..0000000
--- a/libjava/gnu/xml/dom/DomDocumentBuilder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDocumentBuilder__
-#define __gnu_xml_dom_DomDocumentBuilder__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocumentBuilder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-        namespace ls
-        {
-            class DOMImplementationLS;
-            class LSParser;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDocumentBuilder : public ::javax::xml::parsers::DocumentBuilder
-{
-
-public: // actually package-private
-  DomDocumentBuilder(::org::w3c::dom::DOMImplementation *, ::org::w3c::dom::ls::DOMImplementationLS *, ::org::w3c::dom::ls::LSParser *);
-public:
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual jboolean isXIncludeAware();
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *);
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation();
-  virtual ::org::w3c::dom::Document * newDocument();
-  virtual ::org::w3c::dom::Document * parse(::java::io::InputStream *);
-  virtual ::org::w3c::dom::Document * parse(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * parse(::java::lang::String *);
-  virtual ::org::w3c::dom::Document * parse(::org::xml::sax::InputSource *);
-public: // actually package-private
-  ::org::w3c::dom::DOMImplementation * __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilder)))) impl;
-  ::org::w3c::dom::ls::DOMImplementationLS * ls;
-  ::org::w3c::dom::ls::LSParser * parser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDocumentBuilder__
diff --git a/libjava/gnu/xml/dom/DomDocumentBuilderFactory.h b/libjava/gnu/xml/dom/DomDocumentBuilderFactory.h
deleted file mode 100644
index a0bb85f..0000000
--- a/libjava/gnu/xml/dom/DomDocumentBuilderFactory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDocumentBuilderFactory__
-#define __gnu_xml_dom_DomDocumentBuilderFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilderFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocumentBuilderFactory;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class DOMImplementation;
-        namespace ls
-        {
-            class DOMImplementationLS;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDocumentBuilderFactory : public ::javax::xml::parsers::DocumentBuilderFactory
-{
-
-public:
-  DomDocumentBuilderFactory();
-  virtual ::javax::xml::parsers::DocumentBuilder * newDocumentBuilder();
-public: // actually package-private
-  virtual void setParameter(::org::w3c::dom::DOMConfiguration *, ::java::lang::String *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-public: // actually package-private
-  ::org::w3c::dom::DOMImplementation * __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilderFactory)))) impl;
-  ::org::w3c::dom::ls::DOMImplementationLS * ls;
-private:
-  jboolean secureProcessing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDocumentBuilderFactory__
diff --git a/libjava/gnu/xml/dom/DomDocumentConfiguration.h b/libjava/gnu/xml/dom/DomDocumentConfiguration.h
deleted file mode 100644
index f628910..0000000
--- a/libjava/gnu/xml/dom/DomDocumentConfiguration.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDocumentConfiguration__
-#define __gnu_xml_dom_DomDocumentConfiguration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocumentConfiguration;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMErrorHandler;
-          class DOMStringList;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDocumentConfiguration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomDocumentConfiguration();
-public:
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual jboolean canSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::w3c::dom::DOMStringList * getParameterNames();
-  virtual ::java::lang::String * item(jint);
-  virtual jint getLength();
-  virtual jboolean contains(::java::lang::String *);
-private:
-  static ::java::util::List * SUPPORTED_PARAMETERS;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) cdataSections;
-  jboolean comments;
-  jboolean elementContentWhitespace;
-  jboolean entities;
-  ::org::w3c::dom::DOMErrorHandler * errorHandler;
-  jboolean namespaceDeclarations;
-  jboolean splitCdataSections;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDocumentConfiguration__
diff --git a/libjava/gnu/xml/dom/DomDocumentFragment.h b/libjava/gnu/xml/dom/DomDocumentFragment.h
deleted file mode 100644
index ab0b4b5..0000000
--- a/libjava/gnu/xml/dom/DomDocumentFragment.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomDocumentFragment__
-#define __gnu_xml_dom_DomDocumentFragment__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomDocumentFragment;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomDocumentFragment : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually protected
-  DomDocumentFragment(::gnu::xml::dom::DomDocument *);
-public:
-  virtual ::java::lang::String * getNodeName();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomDocumentFragment__
diff --git a/libjava/gnu/xml/dom/DomElement.h b/libjava/gnu/xml/dom/DomElement.h
deleted file mode 100644
index 32698e5..0000000
--- a/libjava/gnu/xml/dom/DomElement.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomElement__
-#define __gnu_xml_dom_DomElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNsNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomElement;
-          class DomNamedNodeMap;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class NamedNodeMap;
-          class Node;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomElement : public ::gnu::xml::dom::DomNsNode
-{
-
-public: // actually protected
-  DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
-  DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
-  virtual jboolean hasAttributes();
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void setOwner(::gnu::xml::dom::DomDocument *);
-public:
-  virtual void makeReadonly();
-  virtual ::java::lang::String * getTagName();
-  virtual ::java::lang::String * getAttribute(::java::lang::String *);
-  virtual jboolean hasAttribute(::java::lang::String *);
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *);
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *);
-  virtual void removeAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *);
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual void setIdAttribute(::java::lang::String *, jboolean);
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean);
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNsNode)))) userIdAttrs;
-private:
-  ::gnu::xml::dom::DomNamedNodeMap * attributes;
-public: // actually package-private
-  ::java::lang::String * xmlSpace;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomElement__
diff --git a/libjava/gnu/xml/dom/DomEntity.h b/libjava/gnu/xml/dom/DomEntity.h
deleted file mode 100644
index 914c2c5..0000000
--- a/libjava/gnu/xml/dom/DomEntity.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomEntity__
-#define __gnu_xml_dom_DomEntity__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomExtern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomEntity;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomEntity : public ::gnu::xml::dom::DomExtern
-{
-
-public: // actually protected
-  DomEntity(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getNotationName();
-  virtual ::java::lang::String * getInputEncoding();
-  virtual ::java::lang::String * getXmlEncoding();
-  virtual ::java::lang::String * getXmlVersion();
-  virtual ::java::lang::String * getBaseURI();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomExtern)))) notation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomEntity__
diff --git a/libjava/gnu/xml/dom/DomEntityReference.h b/libjava/gnu/xml/dom/DomEntityReference.h
deleted file mode 100644
index 22e2665..0000000
--- a/libjava/gnu/xml/dom/DomEntityReference.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomEntityReference__
-#define __gnu_xml_dom_DomEntityReference__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomEntityReference;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomEntityReference : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually protected
-  DomEntityReference(::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getNodeName();
-  virtual ::java::lang::String * getBaseURI();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomEntityReference__
diff --git a/libjava/gnu/xml/dom/DomEvent$DomMutationEvent.h b/libjava/gnu/xml/dom/DomEvent$DomMutationEvent.h
deleted file mode 100644
index 613938a..0000000
--- a/libjava/gnu/xml/dom/DomEvent$DomMutationEvent.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomEvent$DomMutationEvent__
-#define __gnu_xml_dom_DomEvent$DomMutationEvent__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomEvent$DomMutationEvent;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomEvent$DomMutationEvent : public ::gnu::xml::dom::DomEvent
-{
-
-public:
-  ::org::w3c::dom::Node * getRelatedNode();
-  ::java::lang::String * getPrevValue();
-  ::java::lang::String * getNewValue();
-  ::java::lang::String * getAttrName();
-  jshort getAttrChange();
-  void initMutationEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jshort);
-public: // actually package-private
-  void clear();
-public:
-  DomEvent$DomMutationEvent(::java::lang::String *);
-public: // actually package-private
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomEvent)))) relatedNode;
-private:
-  ::java::lang::String * prevValue;
-  ::java::lang::String * newValue;
-  ::java::lang::String * attrName;
-  jshort attrChange;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomEvent$DomMutationEvent__
diff --git a/libjava/gnu/xml/dom/DomEvent$DomUIEvent.h b/libjava/gnu/xml/dom/DomEvent$DomUIEvent.h
deleted file mode 100644
index 2c2921a..0000000
--- a/libjava/gnu/xml/dom/DomEvent$DomUIEvent.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomEvent$DomUIEvent__
-#define __gnu_xml_dom_DomEvent$DomUIEvent__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomEvent.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomEvent$DomUIEvent;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace views
-        {
-            class AbstractView;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomEvent$DomUIEvent : public ::gnu::xml::dom::DomEvent
-{
-
-public:
-  DomEvent$DomUIEvent(::java::lang::String *);
-  virtual ::org::w3c::dom::views::AbstractView * getView();
-  virtual jint getDetail();
-  virtual void initUIEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::views::AbstractView *, jint);
-private:
-  ::org::w3c::dom::views::AbstractView * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomEvent)))) view;
-  jint detail;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomEvent$DomUIEvent__
diff --git a/libjava/gnu/xml/dom/DomEvent.h b/libjava/gnu/xml/dom/DomEvent.h
deleted file mode 100644
index 83a2822..0000000
--- a/libjava/gnu/xml/dom/DomEvent.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomEvent__
-#define __gnu_xml_dom_DomEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomEvent;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventTarget;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::org::w3c::dom::events::EventTarget * getTarget();
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget();
-  virtual jshort getEventPhase();
-  virtual jboolean getBubbles();
-  virtual jboolean getCancelable();
-  virtual jlong getTimeStamp();
-  virtual void stopPropagation();
-  virtual void preventDefault();
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean);
-  DomEvent(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::org::w3c::dom::events::EventTarget * target;
-  ::org::w3c::dom::events::EventTarget * currentNode;
-  jshort eventPhase;
-  jboolean bubbles;
-  jboolean cancelable;
-  jlong timeStamp;
-  jboolean stop;
-  jboolean doDefault;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomEvent__
diff --git a/libjava/gnu/xml/dom/DomExtern.h b/libjava/gnu/xml/dom/DomExtern.h
deleted file mode 100644
index c2c8894..0000000
--- a/libjava/gnu/xml/dom/DomExtern.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomExtern__
-#define __gnu_xml_dom_DomExtern__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomExtern;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomExtern : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually package-private
-  DomExtern(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getNodeName();
-  virtual ::java::lang::String * getLocalName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) name;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomExtern__
diff --git a/libjava/gnu/xml/dom/DomImpl.h b/libjava/gnu/xml/dom/DomImpl.h
deleted file mode 100644
index f051586..0000000
--- a/libjava/gnu/xml/dom/DomImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomImpl__
-#define __gnu_xml_dom_DomImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomImpl;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class DocumentType;
-        namespace ls
-        {
-            class LSInput;
-            class LSOutput;
-            class LSParser;
-            class LSSerializer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomImpl : public ::java::lang::Object
-{
-
-public:
-  DomImpl();
-  virtual jboolean hasFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::DocumentType * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * createDocument(::java::lang::String *, ::java::lang::String *, ::org::w3c::dom::DocumentType *);
-public: // actually protected
-  virtual ::org::w3c::dom::Document * createDocument();
-public:
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::ls::LSParser * createLSParser(jshort, ::java::lang::String *);
-  virtual ::org::w3c::dom::ls::LSSerializer * createLSSerializer();
-  virtual ::org::w3c::dom::ls::LSInput * createLSInput();
-  virtual ::org::w3c::dom::ls::LSOutput * createLSOutput();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomImpl__
diff --git a/libjava/gnu/xml/dom/DomIterator.h b/libjava/gnu/xml/dom/DomIterator.h
deleted file mode 100644
index 7e15579..0000000
--- a/libjava/gnu/xml/dom/DomIterator.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomIterator__
-#define __gnu_xml_dom_DomIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomIterator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace events
-        {
-            class Event;
-        }
-        namespace traversal
-        {
-            class NodeFilter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomIterator : public ::java::lang::Object
-{
-
-public: // actually protected
-  DomIterator(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean);
-public:
-  void detach();
-  jboolean getExpandEntityReferences();
-  ::org::w3c::dom::traversal::NodeFilter * getFilter();
-  ::org::w3c::dom::Node * getRoot();
-  jint getWhatToShow();
-  ::org::w3c::dom::Node * nextNode();
-  ::org::w3c::dom::Node * previousNode();
-private:
-  jboolean shouldShow(::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * walk(jboolean);
-  jboolean isLeaf(::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * successor(::org::w3c::dom::Node *, jboolean);
-public:
-  void handleEvent(::org::w3c::dom::events::Event *);
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reference;
-  jboolean right;
-  jboolean done;
-  ::org::w3c::dom::Node * root;
-  jint whatToShow;
-  ::org::w3c::dom::traversal::NodeFilter * filter;
-  jboolean expandEntityReferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomIterator__
diff --git a/libjava/gnu/xml/dom/DomNSResolverContext.h b/libjava/gnu/xml/dom/DomNSResolverContext.h
deleted file mode 100644
index 9405c862..0000000
--- a/libjava/gnu/xml/dom/DomNSResolverContext.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNSResolverContext__
-#define __gnu_xml_dom_DomNSResolverContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNSResolverContext;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace xpath
-        {
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNSResolverContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomNSResolverContext(::org::w3c::dom::xpath::XPathNSResolver *);
-public:
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ::org::w3c::dom::xpath::XPathNSResolver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNSResolverContext__
diff --git a/libjava/gnu/xml/dom/DomNamedNodeMap.h b/libjava/gnu/xml/dom/DomNamedNodeMap.h
deleted file mode 100644
index 3d5f41b..0000000
--- a/libjava/gnu/xml/dom/DomNamedNodeMap.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNamedNodeMap__
-#define __gnu_xml_dom_DomNamedNodeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNamedNodeMap;
-          class DomNode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNamedNodeMap : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomNamedNodeMap(::gnu::xml::dom::DomNode *, jshort);
-public:
-  virtual jboolean isReadonly();
-  virtual void makeReadonly();
-  virtual ::org::w3c::dom::Node * getNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getNamedItemNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * setNamedItemNS(::org::w3c::dom::Node *);
-public: // actually package-private
-  virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *, jboolean, jboolean);
-  virtual void reparent(::gnu::xml::dom::DomNode *, ::java::lang::String *, jint);
-public:
-  virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * removeNamedItemNS(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getDefaultValue(::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-public: // actually package-private
-  ::gnu::xml::dom::DomNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) owner;
-  jshort type;
-  ::gnu::xml::dom::DomNode * first;
-  jint length;
-  jboolean readonly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNamedNodeMap__
diff --git a/libjava/gnu/xml/dom/DomNode$DomEventException.h b/libjava/gnu/xml/dom/DomNode$DomEventException.h
deleted file mode 100644
index 577a112..0000000
--- a/libjava/gnu/xml/dom/DomNode$DomEventException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNode$DomEventException__
-#define __gnu_xml_dom_DomNode$DomEventException__
-
-#pragma interface
-
-#include <org/w3c/dom/events/EventException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNode$DomEventException;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNode$DomEventException : public ::org::w3c::dom::events::EventException
-{
-
-public: // actually package-private
-  DomNode$DomEventException();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNode$DomEventException__
diff --git a/libjava/gnu/xml/dom/DomNode$ListenerRecord.h b/libjava/gnu/xml/dom/DomNode$ListenerRecord.h
deleted file mode 100644
index f24266f..0000000
--- a/libjava/gnu/xml/dom/DomNode$ListenerRecord.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNode$ListenerRecord__
-#define __gnu_xml_dom_DomNode$ListenerRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNode$ListenerRecord;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventListener;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNode$ListenerRecord : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomNode$ListenerRecord(::java::lang::String *, ::org::w3c::dom::events::EventListener *, jboolean);
-public:
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::org::w3c::dom::events::EventListener * listener;
-  jboolean useCapture;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNode$ListenerRecord__
diff --git a/libjava/gnu/xml/dom/DomNode$LiveNodeList.h b/libjava/gnu/xml/dom/DomNode$LiveNodeList.h
deleted file mode 100644
index 9755d8b..0000000
--- a/libjava/gnu/xml/dom/DomNode$LiveNodeList.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNode$LiveNodeList__
-#define __gnu_xml_dom_DomNode$LiveNodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomIterator;
-          class DomNode;
-          class DomNode$LiveNodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace events
-        {
-            class Event;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNode$LiveNodeList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomNode$LiveNodeList(::gnu::xml::dom::DomNode *, ::java::lang::String *, ::java::lang::String *);
-  void detach();
-public:
-  jshort acceptNode(::org::w3c::dom::Node *);
-private:
-  ::gnu::xml::dom::DomIterator * createIterator();
-public:
-  void handleEvent(::org::w3c::dom::events::Event *);
-  ::org::w3c::dom::Node * item(jint);
-  jint getLength();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) matchAnyURI;
-  jboolean matchAnyName;
-  ::java::lang::String * elementURI;
-  ::java::lang::String * elementName;
-  ::gnu::xml::dom::DomIterator * current;
-  jint lastIndex;
-public: // actually package-private
-  ::gnu::xml::dom::DomNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNode$LiveNodeList__
diff --git a/libjava/gnu/xml/dom/DomNode$ShadowList.h b/libjava/gnu/xml/dom/DomNode$ShadowList.h
deleted file mode 100644
index 1465afc..0000000
--- a/libjava/gnu/xml/dom/DomNode$ShadowList.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNode$ShadowList__
-#define __gnu_xml_dom_DomNode$ShadowList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNode;
-          class DomNode$LiveNodeList;
-          class DomNode$ShadowList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNode$ShadowList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomNode$ShadowList(::gnu::xml::dom::DomNode *, ::java::lang::String *, ::java::lang::String *);
-public:
-  void finalize();
-  ::org::w3c::dom::Node * item(jint);
-  jint getLength();
-private:
-  ::gnu::xml::dom::DomNode$LiveNodeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) liveList;
-public: // actually package-private
-  ::gnu::xml::dom::DomNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNode$ShadowList__
diff --git a/libjava/gnu/xml/dom/DomNode.h b/libjava/gnu/xml/dom/DomNode.h
deleted file mode 100644
index dca589a..0000000
--- a/libjava/gnu/xml/dom/DomNode.h
+++ /dev/null
@@ -1,176 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNode__
-#define __gnu_xml_dom_DomNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomEvent;
-          class DomEvent$DomMutationEvent;
-          class DomNode;
-          class DomNode$ListenerRecord;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-        namespace events
-        {
-            class Event;
-            class EventListener;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNode : public ::java::lang::Object
-{
-
-public:
-  virtual void compact();
-public: // actually protected
-  DomNode(jshort, ::gnu::xml::dom::DomDocument *);
-public:
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
-  virtual jboolean hasAttributes();
-  virtual ::org::w3c::dom::NodeList * getChildNodes();
-  virtual ::org::w3c::dom::Node * getFirstChild();
-  virtual ::org::w3c::dom::Node * getLastChild();
-  virtual jboolean hasChildNodes();
-  virtual jboolean isReadonly();
-  virtual void makeReadonly();
-public: // actually package-private
-  virtual void setOwner(::gnu::xml::dom::DomDocument *);
-private:
-  void checkMisc(::gnu::xml::dom::DomNode *);
-  void insertionEvent(::gnu::xml::dom::DomEvent$DomMutationEvent *, ::gnu::xml::dom::DomNode *);
-  void removalEvent(::gnu::xml::dom::DomEvent$DomMutationEvent *, ::gnu::xml::dom::DomNode *);
-  static ::gnu::xml::dom::DomEvent$DomMutationEvent * getMutationEvent();
-  static void freeMutationEvent();
-public: // actually package-private
-  virtual void setDepth(jint);
-public:
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-  virtual void trimToSize();
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual ::org::w3c::dom::Node * getPreviousSibling();
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * getOwnerDocument();
-  virtual void setNodeValue(::java::lang::String *);
-  virtual ::java::lang::String * getNodeValue();
-  virtual jshort getNodeType();
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual void setPrefix(::java::lang::String *);
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getLocalName();
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean);
-private:
-  ::gnu::xml::dom::DomNode * cloneNodeDeepInternal(jboolean, ::gnu::xml::dom::DomDocument *);
-public: // actually package-private
-  virtual void notifyUserDataHandlers(jshort, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::events::Event * createEvent(::java::lang::String *);
-  virtual void addEventListener(::java::lang::String *, ::org::w3c::dom::events::EventListener *, jboolean);
-  virtual jboolean dispatchEvent(::org::w3c::dom::events::Event *);
-private:
-  void notifyNode(::gnu::xml::dom::DomEvent *, ::gnu::xml::dom::DomNode *, jboolean, JArray< ::gnu::xml::dom::DomNode$ListenerRecord * > *);
-public:
-  virtual void removeEventListener(::java::lang::String *, ::org::w3c::dom::events::EventListener *, jboolean);
-  virtual void normalize();
-  virtual jboolean nameAndTypeEquals(::org::w3c::dom::Node *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  virtual jint compareTo2(::gnu::xml::dom::DomNode *, ::gnu::xml::dom::DomNode *);
-public:
-  virtual ::java::lang::String * getTextContent();
-public: // actually package-private
-  virtual ::java::lang::String * getTextContent(jboolean);
-public:
-  virtual void setTextContent(::java::lang::String *);
-  virtual jboolean isSameNode(::org::w3c::dom::Node *);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-public: // actually package-private
-  virtual jboolean equal(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *);
-  virtual ::java::lang::Object * getUserData(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual ::java::lang::String * encode(::java::lang::String *);
-  virtual ::java::lang::String * nodeTypeToString(jshort);
-public:
-  virtual void list(::java::io::PrintStream *, jint);
-private:
-  static const jint NKIDS_DELTA = 8;
-  static const jint ANCESTORS_INIT = 20;
-  static const jint NOTIFICATIONS_INIT = 10;
-public: // actually package-private
-  static const jboolean reportMutations = 1;
-private:
-  static ::java::lang::Object * lockNode;
-  static jboolean dispatchDataLock;
-  static JArray< ::gnu::xml::dom::DomNode * > * ancestors;
-  static JArray< ::gnu::xml::dom::DomNode$ListenerRecord * > * notificationSet;
-  static jboolean eventDataLock;
-  static ::gnu::xml::dom::DomEvent$DomMutationEvent * mutationEvent;
-public: // actually package-private
-  ::gnu::xml::dom::DomDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) owner;
-  ::gnu::xml::dom::DomNode * parent;
-  ::gnu::xml::dom::DomNode * previous;
-  ::gnu::xml::dom::DomNode * next;
-  ::gnu::xml::dom::DomNode * first;
-  ::gnu::xml::dom::DomNode * last;
-  jint index;
-  jint depth;
-  jint length;
-  jshort nodeType;
-  jboolean readonly;
-private:
-  ::java::util::HashSet * listeners;
-  jint nListeners;
-  ::java::util::HashMap * userData;
-  ::java::util::HashMap * userDataHandlers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNode__
diff --git a/libjava/gnu/xml/dom/DomNodeIterator.h b/libjava/gnu/xml/dom/DomNodeIterator.h
deleted file mode 100644
index 9ebe95e..0000000
--- a/libjava/gnu/xml/dom/DomNodeIterator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNodeIterator__
-#define __gnu_xml_dom_DomNodeIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomNodeIterator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace traversal
-        {
-            class NodeFilter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNodeIterator : public ::java::lang::Object
-{
-
-public:
-  DomNodeIterator(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean, jboolean);
-  virtual ::org::w3c::dom::Node * getRoot();
-  virtual jint getWhatToShow();
-  virtual ::org::w3c::dom::traversal::NodeFilter * getFilter();
-  virtual jboolean getExpandEntityReferences();
-  virtual ::org::w3c::dom::Node * nextNode();
-  virtual ::org::w3c::dom::Node * previousNode();
-  virtual ::org::w3c::dom::Node * getCurrentNode();
-  virtual void setCurrentNode(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * parentNode();
-  virtual ::org::w3c::dom::Node * firstChild();
-  virtual ::org::w3c::dom::Node * lastChild();
-  virtual ::org::w3c::dom::Node * previousSibling();
-  virtual ::org::w3c::dom::Node * nextSibling();
-  virtual void detach();
-public: // actually package-private
-  virtual jboolean accept(::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  jint whatToShow;
-  ::org::w3c::dom::traversal::NodeFilter * filter;
-  jboolean entityReferenceExpansion;
-  jboolean walk;
-  ::org::w3c::dom::Node * current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNodeIterator__
diff --git a/libjava/gnu/xml/dom/DomNotation.h b/libjava/gnu/xml/dom/DomNotation.h
deleted file mode 100644
index 0d26797..0000000
--- a/libjava/gnu/xml/dom/DomNotation.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNotation__
-#define __gnu_xml_dom_DomNotation__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomExtern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomNotation;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNotation : public ::gnu::xml::dom::DomExtern
-{
-
-public: // actually protected
-  DomNotation(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getBaseURI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNotation__
diff --git a/libjava/gnu/xml/dom/DomNsNode.h b/libjava/gnu/xml/dom/DomNsNode.h
deleted file mode 100644
index bd75d27..0000000
--- a/libjava/gnu/xml/dom/DomNsNode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomNsNode__
-#define __gnu_xml_dom_DomNsNode__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomNsNode;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomNsNode : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually package-private
-  DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
-  DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getNodeName();
-public: // actually package-private
-  virtual void setNodeName(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getNamespaceURI();
-public: // actually package-private
-  virtual void setNamespaceURI(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getPrefix();
-  virtual void setPrefix(::java::lang::String *);
-  virtual ::java::lang::String * getLocalName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) name;
-  ::java::lang::String * namespace$;
-  ::java::lang::String * prefix;
-  ::java::lang::String * localName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomNsNode__
diff --git a/libjava/gnu/xml/dom/DomProcessingInstruction.h b/libjava/gnu/xml/dom/DomProcessingInstruction.h
deleted file mode 100644
index ed636c2..0000000
--- a/libjava/gnu/xml/dom/DomProcessingInstruction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomProcessingInstruction__
-#define __gnu_xml_dom_DomProcessingInstruction__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomProcessingInstruction;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomProcessingInstruction : public ::gnu::xml::dom::DomNode
-{
-
-public: // actually protected
-  DomProcessingInstruction(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getTarget();
-  virtual ::java::lang::String * getNodeName();
-  virtual ::java::lang::String * getData();
-  virtual ::java::lang::String * getNodeValue();
-  virtual void setData(::java::lang::String *);
-  virtual void setNodeValue(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) target;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomProcessingInstruction__
diff --git a/libjava/gnu/xml/dom/DomText.h b/libjava/gnu/xml/dom/DomText.h
deleted file mode 100644
index c4f07da..0000000
--- a/libjava/gnu/xml/dom/DomText.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomText__
-#define __gnu_xml_dom_DomText__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomCharacterData.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomText;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Text;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomText : public ::gnu::xml::dom::DomCharacterData
-{
-
-public: // actually protected
-  DomText(::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-  DomText(::gnu::xml::dom::DomDocument *, JArray< jchar > *, jint, jint);
-public: // actually package-private
-  DomText(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *);
-  DomText(jshort, ::gnu::xml::dom::DomDocument *, JArray< jchar > *, jint, jint);
-public:
-  virtual ::java::lang::String * getNodeName();
-  virtual ::org::w3c::dom::Text * splitText(jint);
-  virtual jboolean isElementContentWhitespace();
-  virtual ::java::lang::String * getWholeText();
-  virtual ::org::w3c::dom::Text * replaceWholeText(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomText__
diff --git a/libjava/gnu/xml/dom/DomXPathExpression.h b/libjava/gnu/xml/dom/DomXPathExpression.h
deleted file mode 100644
index 000fe90..0000000
--- a/libjava/gnu/xml/dom/DomXPathExpression.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomXPathExpression__
-#define __gnu_xml_dom_DomXPathExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-          class DomXPathExpression;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathExpression;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace xpath
-        {
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomXPathExpression : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomXPathExpression(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::org::w3c::dom::xpath::XPathNSResolver *);
-public:
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jshort, ::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::dom::DomDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) doc;
-  ::javax::xml::xpath::XPathExpression * expression;
-  ::org::w3c::dom::xpath::XPathNSResolver * resolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomXPathExpression__
diff --git a/libjava/gnu/xml/dom/DomXPathNSResolver.h b/libjava/gnu/xml/dom/DomXPathNSResolver.h
deleted file mode 100644
index 40a4e97..0000000
--- a/libjava/gnu/xml/dom/DomXPathNSResolver.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomXPathNSResolver__
-#define __gnu_xml_dom_DomXPathNSResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomXPathNSResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomXPathNSResolver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomXPathNSResolver(::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-public: // actually package-private
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomXPathNSResolver__
diff --git a/libjava/gnu/xml/dom/DomXPathResult.h b/libjava/gnu/xml/dom/DomXPathResult.h
deleted file mode 100644
index 114d7ab..0000000
--- a/libjava/gnu/xml/dom/DomXPathResult.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_DomXPathResult__
-#define __gnu_xml_dom_DomXPathResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomXPathResult;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::DomXPathResult : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomXPathResult(::java::lang::Object *, jshort);
-public:
-  virtual jboolean getBooleanValue();
-  virtual jboolean getInvalidIteratorState();
-  virtual jdouble getNumberValue();
-  virtual jshort getResultType();
-  virtual ::org::w3c::dom::Node * getSingleNodeValue();
-  virtual jint getSnapshotLength();
-  virtual ::java::lang::String * getStringValue();
-  virtual ::org::w3c::dom::Node * iterateNext();
-  virtual ::org::w3c::dom::Node * snapshotItem(jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * typeName(jshort);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  jshort type;
-  ::java::util::Iterator * iterator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_DomXPathResult__
diff --git a/libjava/gnu/xml/dom/ImplementationList.h b/libjava/gnu/xml/dom/ImplementationList.h
deleted file mode 100644
index 68813a3..0000000
--- a/libjava/gnu/xml/dom/ImplementationList.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ImplementationList__
-#define __gnu_xml_dom_ImplementationList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class ImplementationList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ImplementationList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImplementationList(::java::util::List *);
-public:
-  virtual jint getLength();
-  virtual ::org::w3c::dom::DOMImplementation * item(jint);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ImplementationList__
diff --git a/libjava/gnu/xml/dom/ImplementationSource.h b/libjava/gnu/xml/dom/ImplementationSource.h
deleted file mode 100644
index c24a030..0000000
--- a/libjava/gnu/xml/dom/ImplementationSource.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ImplementationSource__
-#define __gnu_xml_dom_ImplementationSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class ImplementationSource;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class DOMImplementationList;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ImplementationSource : public ::java::lang::Object
-{
-
-public:
-  ImplementationSource();
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation(::java::lang::String *);
-  virtual ::org::w3c::dom::DOMImplementationList * getDOMImplementationList(::java::lang::String *);
-private:
-  ::java::util::List * getImplementations(::java::lang::String *);
-public: // actually package-private
-  virtual ::java::util::List * parseFeatures(::java::lang::String *);
-  virtual ::java::lang::String * getFeature(::java::lang::String *, jint, jint);
-private:
-  static ::java::lang::String * DIGITS;
-  static JArray< ::org::w3c::dom::DOMImplementation * > * implementations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ImplementationSource__
diff --git a/libjava/gnu/xml/dom/JAXPFactory$JAXPBuilder.h b/libjava/gnu/xml/dom/JAXPFactory$JAXPBuilder.h
deleted file mode 100644
index 464c465..0000000
--- a/libjava/gnu/xml/dom/JAXPFactory$JAXPBuilder.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_JAXPFactory$JAXPBuilder__
-#define __gnu_xml_dom_JAXPFactory$JAXPBuilder__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class Consumer;
-          class DomImpl;
-          class JAXPFactory;
-          class JAXPFactory$JAXPBuilder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class SAXParseException;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::JAXPFactory$JAXPBuilder : public ::javax::xml::parsers::DocumentBuilder
-{
-
-public: // actually package-private
-  JAXPFactory$JAXPBuilder(::org::xml::sax::XMLReader *, ::gnu::xml::dom::JAXPFactory *);
-public:
-  ::org::w3c::dom::Document * parse(::org::xml::sax::InputSource *);
-  jboolean isNamespaceAware();
-  jboolean isValidating();
-  void setEntityResolver(::org::xml::sax::EntityResolver *);
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::org::w3c::dom::DOMImplementation * getDOMImplementation();
-  ::org::w3c::dom::Document * newDocument();
-  void fatalError(::org::xml::sax::SAXParseException *);
-  void error(::org::xml::sax::SAXParseException *);
-  void warning(::org::xml::sax::SAXParseException *);
-private:
-  ::gnu::xml::dom::Consumer * __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilder)))) consumer;
-  ::org::xml::sax::XMLReader * producer;
-  ::gnu::xml::dom::DomImpl * impl;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_JAXPFactory$JAXPBuilder__
diff --git a/libjava/gnu/xml/dom/JAXPFactory.h b/libjava/gnu/xml/dom/JAXPFactory.h
deleted file mode 100644
index 16b2468..0000000
--- a/libjava/gnu/xml/dom/JAXPFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_JAXPFactory__
-#define __gnu_xml_dom_JAXPFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilderFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class JAXPFactory;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-          class SAXParserFactory;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::JAXPFactory : public ::javax::xml::parsers::DocumentBuilderFactory
-{
-
-public:
-  JAXPFactory();
-  ::javax::xml::parsers::DocumentBuilder * newDocumentBuilder();
-  void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::Object * getAttribute(::java::lang::String *);
-  void setFeature(::java::lang::String *, jboolean);
-  jboolean getFeature(::java::lang::String *);
-private:
-  static ::java::lang::String * PROPERTY;
-  static ::java::lang::String * FEATURE;
-  ::javax::xml::parsers::SAXParserFactory * __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilderFactory)))) pf;
-  jboolean secureProcessing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_JAXPFactory__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLAnchorElement.h b/libjava/gnu/xml/dom/html2/DomHTMLAnchorElement.h
deleted file mode 100644
index 6df58a7..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLAnchorElement.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLAnchorElement__
-#define __gnu_xml_dom_html2_DomHTMLAnchorElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLAnchorElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLAnchorElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLAnchorElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual ::java::lang::String * getCharset();
-  virtual void setCharset(::java::lang::String *);
-  virtual ::java::lang::String * getCoords();
-  virtual void setCoords(::java::lang::String *);
-  virtual ::java::lang::String * getHref();
-  virtual void setHref(::java::lang::String *);
-  virtual ::java::lang::String * getHreflang();
-  virtual void setHreflang(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getRel();
-  virtual void setRel(::java::lang::String *);
-  virtual ::java::lang::String * getRev();
-  virtual void setRev(::java::lang::String *);
-  virtual ::java::lang::String * getShape();
-  virtual void setShape(::java::lang::String *);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getTarget();
-  virtual void setTarget(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  virtual void blur();
-  virtual void focus();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLAnchorElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLAppletElement.h b/libjava/gnu/xml/dom/html2/DomHTMLAppletElement.h
deleted file mode 100644
index 9976a0b..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLAppletElement.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLAppletElement__
-#define __gnu_xml_dom_html2_DomHTMLAppletElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLAppletElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLAppletElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLAppletElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getCls();
-  virtual void setCls(::java::lang::String *);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual ::java::lang::String * getAlt();
-  virtual void setAlt(::java::lang::String *);
-  virtual ::java::lang::String * getArchive();
-  virtual void setArchive(::java::lang::String *);
-  virtual ::java::lang::String * getCode();
-  virtual void setCode(::java::lang::String *);
-  virtual ::java::lang::String * getCodeBase();
-  virtual void setCodeBase(::java::lang::String *);
-  virtual ::java::lang::String * getHeight();
-  virtual void setHeight(::java::lang::String *);
-  virtual jint getHspace();
-  virtual void setHspace(jint);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getObject();
-  virtual void setObject(::java::lang::String *);
-  virtual jint getVspace();
-  virtual void setVspace(jint);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLAppletElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLAreaElement.h b/libjava/gnu/xml/dom/html2/DomHTMLAreaElement.h
deleted file mode 100644
index 2ac0c3c..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLAreaElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLAreaElement__
-#define __gnu_xml_dom_html2_DomHTMLAreaElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLAreaElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLAreaElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLAreaElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual ::java::lang::String * getAlt();
-  virtual void setAlt(::java::lang::String *);
-  virtual ::java::lang::String * getCoords();
-  virtual void setCoords(::java::lang::String *);
-  virtual ::java::lang::String * getHref();
-  virtual void setHref(::java::lang::String *);
-  virtual jboolean getNoHref();
-  virtual void setNoHref(jboolean);
-  virtual ::java::lang::String * getShape();
-  virtual void setShape(::java::lang::String *);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getTarget();
-  virtual void setTarget(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLAreaElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLBRElement.h b/libjava/gnu/xml/dom/html2/DomHTMLBRElement.h
deleted file mode 100644
index 555ff42..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLBRElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLBRElement__
-#define __gnu_xml_dom_html2_DomHTMLBRElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLBRElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLBRElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLBRElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getClear();
-  virtual void setClear(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLBRElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLBaseElement.h b/libjava/gnu/xml/dom/html2/DomHTMLBaseElement.h
deleted file mode 100644
index 523060a..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLBaseElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLBaseElement__
-#define __gnu_xml_dom_html2_DomHTMLBaseElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLBaseElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLBaseElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLBaseElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getHref();
-  virtual void setHref(::java::lang::String *);
-  virtual ::java::lang::String * getTarget();
-  virtual void setTarget(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLBaseElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLBaseFontElement.h b/libjava/gnu/xml/dom/html2/DomHTMLBaseFontElement.h
deleted file mode 100644
index b5586a3..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLBaseFontElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLBaseFontElement__
-#define __gnu_xml_dom_html2_DomHTMLBaseFontElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLBaseFontElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLBaseFontElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLBaseFontElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getColor();
-  virtual void setColor(::java::lang::String *);
-  virtual ::java::lang::String * getFace();
-  virtual void setFace(::java::lang::String *);
-  virtual jint getSize();
-  virtual void setSize(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLBaseFontElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLBodyElement.h b/libjava/gnu/xml/dom/html2/DomHTMLBodyElement.h
deleted file mode 100644
index 8e633ba..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLBodyElement.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLBodyElement__
-#define __gnu_xml_dom_html2_DomHTMLBodyElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLBodyElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLBodyElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLBodyElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getALink();
-  virtual void setALink(::java::lang::String *);
-  virtual ::java::lang::String * getBackground();
-  virtual void setBackground(::java::lang::String *);
-  virtual ::java::lang::String * getBgColor();
-  virtual void setBgColor(::java::lang::String *);
-  virtual ::java::lang::String * getLink();
-  virtual void setLink(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getVLink();
-  virtual void setVLink(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLBodyElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLButtonElement.h b/libjava/gnu/xml/dom/html2/DomHTMLButtonElement.h
deleted file mode 100644
index 50fd3b8..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLButtonElement.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLButtonElement__
-#define __gnu_xml_dom_html2_DomHTMLButtonElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLButtonElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLButtonElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLButtonElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLButtonElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLCollection.h b/libjava/gnu/xml/dom/html2/DomHTMLCollection.h
deleted file mode 100644
index bd116d8..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLCollection.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLCollection__
-#define __gnu_xml_dom_html2_DomHTMLCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLCollection;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NamedNodeMap;
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLCollection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DomHTMLCollection(::gnu::xml::dom::html2::DomHTMLDocument *, ::org::w3c::dom::Node *);
-  virtual void addNodeName(::java::lang::String *);
-  virtual void addAttributeName(::java::lang::String *);
-public:
-  virtual jshort acceptNode(::org::w3c::dom::Node *);
-private:
-  jboolean acceptName(::java::lang::String *);
-  jboolean acceptAttributes(::org::w3c::dom::NamedNodeMap *);
-  ::org::w3c::dom::Node * getNamedItem(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
-public: // actually package-private
-  virtual void evaluate();
-public:
-  virtual jint getLength();
-  virtual void setLength(jint);
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual ::org::w3c::dom::Node * namedItem(::java::lang::String *);
-public: // actually package-private
-  ::gnu::xml::dom::html2::DomHTMLDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) doc;
-  ::org::w3c::dom::Node * root;
-  ::java::util::List * nodeNames;
-  ::java::util::List * attributeNames;
-  ::java::util::List * results;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLCollection__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLDListElement.h b/libjava/gnu/xml/dom/html2/DomHTMLDListElement.h
deleted file mode 100644
index 2a95290..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLDListElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLDListElement__
-#define __gnu_xml_dom_html2_DomHTMLDListElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDListElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLDListElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLDListElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getCompact();
-  virtual void setCompact(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLDListElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLDirectoryElement.h b/libjava/gnu/xml/dom/html2/DomHTMLDirectoryElement.h
deleted file mode 100644
index 99ea1b5..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLDirectoryElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLDirectoryElement__
-#define __gnu_xml_dom_html2_DomHTMLDirectoryElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDirectoryElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLDirectoryElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLDirectoryElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getCompact();
-  virtual void setCompact(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLDirectoryElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLDivElement.h b/libjava/gnu/xml/dom/html2/DomHTMLDivElement.h
deleted file mode 100644
index f20a796..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLDivElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLDivElement__
-#define __gnu_xml_dom_html2_DomHTMLDivElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDivElement;
-            class DomHTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLDivElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLDivElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLDivElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLDocument.h b/libjava/gnu/xml/dom/html2/DomHTMLDocument.h
deleted file mode 100644
index 4602ede..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLDocument.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLDocument__
-#define __gnu_xml_dom_html2_DomHTMLDocument__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomDocument.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLImpl;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class Node;
-          class NodeList;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLDocument : public ::gnu::xml::dom::DomDocument
-{
-
-public:
-  DomHTMLDocument();
-  DomHTMLDocument(::gnu::xml::dom::html2::DomHTMLImpl *);
-private:
-  ::org::w3c::dom::Node * getChildNodeByName(::org::w3c::dom::Node *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::java::lang::String * getReferrer();
-  virtual ::java::lang::String * getDomain();
-  virtual ::java::lang::String * getURL();
-  virtual ::org::w3c::dom::html2::HTMLElement * getBody();
-  virtual void setBody(::org::w3c::dom::html2::HTMLElement *);
-  virtual ::org::w3c::dom::html2::HTMLCollection * getImages();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getApplets();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getLinks();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getForms();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getAnchors();
-  virtual ::java::lang::String * getCookie();
-  virtual void setCookie(::java::lang::String *);
-  virtual void open();
-  virtual void close();
-  virtual void write(::java::lang::String *);
-  virtual void writeln(::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByName(::java::lang::String *);
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *);
-  virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *);
-private:
-  static JArray< ::java::lang::Class * > * ELEMENT_PT;
-  static ::java::util::Map * ELEMENT_CLASSES;
-  static ::java::util::Set * HTML_NS_URIS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLDocument__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLElement.h b/libjava/gnu/xml/dom/html2/DomHTMLElement.h
deleted file mode 100644
index 38dd789..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLElement.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLElement__
-#define __gnu_xml_dom_html2_DomHTMLElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLElement : public ::gnu::xml::dom::DomElement
-{
-
-public: // actually protected
-  DomHTMLElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getHTMLAttribute(::java::lang::String *);
-  virtual jint getIntHTMLAttribute(::java::lang::String *);
-  virtual jboolean getBooleanHTMLAttribute(::java::lang::String *);
-  virtual void setHTMLAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void setIntHTMLAttribute(::java::lang::String *, jint);
-  virtual void setBooleanHTMLAttribute(::java::lang::String *, jboolean);
-  virtual ::org::w3c::dom::Node * getParentElement(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getChildElement(::java::lang::String *);
-  virtual jint getIndex();
-  virtual void dispatchUIEvent(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getId();
-  virtual void setId(::java::lang::String *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::java::lang::String * getLang();
-  virtual void setLang(::java::lang::String *);
-  virtual ::java::lang::String * getDir();
-  virtual void setDir(::java::lang::String *);
-  virtual ::java::lang::String * getClassName();
-  virtual void setClassName(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLEmbedElement.h b/libjava/gnu/xml/dom/html2/DomHTMLEmbedElement.h
deleted file mode 100644
index 4ad0d54..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLEmbedElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLEmbedElement__
-#define __gnu_xml_dom_html2_DomHTMLEmbedElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLAppletElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLEmbedElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLEmbedElement : public ::gnu::xml::dom::html2::DomHTMLAppletElement
-{
-
-public: // actually protected
-  DomHTMLEmbedElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getJavaObject();
-  virtual void setJavaObject(::java::lang::String *);
-  virtual ::java::lang::String * getJavaCodeBase();
-  virtual void setJavaCodeBase(::java::lang::String *);
-  virtual ::java::lang::String * getJavaArchive();
-  virtual void setJavaArchive(::java::lang::String *);
-  virtual void setJavaCode(::java::lang::String *);
-  virtual ::java::lang::String * getJavaCode();
-  virtual void setJavaType(::java::lang::String *);
-  virtual ::java::lang::String * getJavaType();
-  virtual void setType(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::String * getPluginsPage();
-  virtual void setPluginsPage(::java::lang::String *);
-  virtual ::java::lang::String * getMayscript();
-  virtual void setMayscript(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLEmbedElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLFieldSetElement.h b/libjava/gnu/xml/dom/html2/DomHTMLFieldSetElement.h
deleted file mode 100644
index 7eeb5b9..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLFieldSetElement.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLFieldSetElement__
-#define __gnu_xml_dom_html2_DomHTMLFieldSetElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLFieldSetElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLFieldSetElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLFieldSetElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLFieldSetElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLFontElement.h b/libjava/gnu/xml/dom/html2/DomHTMLFontElement.h
deleted file mode 100644
index ee3dfcd..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLFontElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLFontElement__
-#define __gnu_xml_dom_html2_DomHTMLFontElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLFontElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLFontElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLFontElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getColor();
-  virtual void setColor(::java::lang::String *);
-  virtual ::java::lang::String * getFace();
-  virtual void setFace(::java::lang::String *);
-  virtual ::java::lang::String * getSize();
-  virtual void setSize(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLFontElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLFormElement.h b/libjava/gnu/xml/dom/html2/DomHTMLFormElement.h
deleted file mode 100644
index a349505..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLFormElement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLFormElement__
-#define __gnu_xml_dom_html2_DomHTMLFormElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLFormElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLCollection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLFormElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLFormElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLCollection * getElements();
-  virtual jint getLength();
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getAcceptCharset();
-  virtual void setAcceptCharset(::java::lang::String *);
-  virtual ::java::lang::String * getAction();
-  virtual void setAction(::java::lang::String *);
-  virtual ::java::lang::String * getEnctype();
-  virtual void setEnctype(::java::lang::String *);
-  virtual ::java::lang::String * getMethod();
-  virtual void setMethod(::java::lang::String *);
-  virtual ::java::lang::String * getTarget();
-  virtual void setTarget(::java::lang::String *);
-  virtual void submit();
-  virtual void reset();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLFormElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLFrameElement.h b/libjava/gnu/xml/dom/html2/DomHTMLFrameElement.h
deleted file mode 100644
index 683185b..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLFrameElement.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLFrameElement__
-#define __gnu_xml_dom_html2_DomHTMLFrameElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLFrameElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLFrameElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLFrameElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getFrameBorder();
-  virtual void setFrameBorder(::java::lang::String *);
-  virtual ::java::lang::String * getLongDesc();
-  virtual void setLongDesc(::java::lang::String *);
-  virtual ::java::lang::String * getMarginHeight();
-  virtual void setMarginHeight(::java::lang::String *);
-  virtual ::java::lang::String * getMarginWidth();
-  virtual void setMarginWidth(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual jboolean getNoResize();
-  virtual void setNoResize(jboolean);
-  virtual ::java::lang::String * getScrolling();
-  virtual void setScrolling(::java::lang::String *);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual ::org::w3c::dom::Document * getContentDocument();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLFrameElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLFrameSetElement.h b/libjava/gnu/xml/dom/html2/DomHTMLFrameSetElement.h
deleted file mode 100644
index 1a410a6..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLFrameSetElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLFrameSetElement__
-#define __gnu_xml_dom_html2_DomHTMLFrameSetElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLFrameSetElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLFrameSetElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLFrameSetElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getCols();
-  virtual void setCols(::java::lang::String *);
-  virtual ::java::lang::String * getRows();
-  virtual void setRows(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLFrameSetElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLHRElement.h b/libjava/gnu/xml/dom/html2/DomHTMLHRElement.h
deleted file mode 100644
index acea978..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLHRElement.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLHRElement__
-#define __gnu_xml_dom_html2_DomHTMLHRElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLHRElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLHRElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLHRElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual jboolean getNoShade();
-  virtual void setNoShade(jboolean);
-  virtual ::java::lang::String * getSize();
-  virtual void setSize(::java::lang::String *);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLHRElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLHeadElement.h b/libjava/gnu/xml/dom/html2/DomHTMLHeadElement.h
deleted file mode 100644
index fc83fd3..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLHeadElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLHeadElement__
-#define __gnu_xml_dom_html2_DomHTMLHeadElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLHeadElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLHeadElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLHeadElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getProfile();
-  virtual void setProfile(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLHeadElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLHeadingElement.h b/libjava/gnu/xml/dom/html2/DomHTMLHeadingElement.h
deleted file mode 100644
index 5610db5..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLHeadingElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLHeadingElement__
-#define __gnu_xml_dom_html2_DomHTMLHeadingElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLHeadingElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLHeadingElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLHeadingElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLHeadingElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLHtmlElement.h b/libjava/gnu/xml/dom/html2/DomHTMLHtmlElement.h
deleted file mode 100644
index 34cf12d..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLHtmlElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLHtmlElement__
-#define __gnu_xml_dom_html2_DomHTMLHtmlElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLHtmlElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLHtmlElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLHtmlElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getVersion();
-  virtual void setVersion(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLHtmlElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLIFrameElement.h b/libjava/gnu/xml/dom/html2/DomHTMLIFrameElement.h
deleted file mode 100644
index 71661b9..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLIFrameElement.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLIFrameElement__
-#define __gnu_xml_dom_html2_DomHTMLIFrameElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLIFrameElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLIFrameElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLIFrameElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getFrameBorder();
-  virtual void setFrameBorder(::java::lang::String *);
-  virtual ::java::lang::String * getHeight();
-  virtual void setHeight(::java::lang::String *);
-  virtual ::java::lang::String * getLongDesc();
-  virtual void setLongDesc(::java::lang::String *);
-  virtual ::java::lang::String * getMarginHeight();
-  virtual void setMarginHeight(::java::lang::String *);
-  virtual ::java::lang::String * getMarginWidth();
-  virtual void setMarginWidth(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getScrolling();
-  virtual void setScrolling(::java::lang::String *);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  virtual ::org::w3c::dom::Document * getContentDocument();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLIFrameElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLImageElement.h b/libjava/gnu/xml/dom/html2/DomHTMLImageElement.h
deleted file mode 100644
index dd2b429..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLImageElement.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLImageElement__
-#define __gnu_xml_dom_html2_DomHTMLImageElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLImageElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLImageElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLImageElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getAlt();
-  virtual void setAlt(::java::lang::String *);
-  virtual ::java::lang::String * getBorder();
-  virtual void setBorder(::java::lang::String *);
-  virtual jint getHeight();
-  virtual void setHeight(jint);
-  virtual jint getHspace();
-  virtual void setHspace(jint);
-  virtual jboolean getIsMap();
-  virtual void setIsMap(jboolean);
-  virtual ::java::lang::String * getLongDesc();
-  virtual void setLongDesc(::java::lang::String *);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual ::java::lang::String * getUseMap();
-  virtual void setUseMap(::java::lang::String *);
-  virtual jint getVspace();
-  virtual void setVspace(jint);
-  virtual jint getWidth();
-  virtual void setWidth(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLImageElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLImpl.h b/libjava/gnu/xml/dom/html2/DomHTMLImpl.h
deleted file mode 100644
index c2d322c..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLImpl__
-#define __gnu_xml_dom_html2_DomHTMLImpl__
-
-#pragma interface
-
-#include <gnu/xml/dom/DomImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLImpl;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLImpl : public ::gnu::xml::dom::DomImpl
-{
-
-public:
-  DomHTMLImpl();
-public: // actually protected
-  virtual ::org::w3c::dom::Document * createDocument();
-public:
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLImpl__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLInputElement.h b/libjava/gnu/xml/dom/html2/DomHTMLInputElement.h
deleted file mode 100644
index 85f7060..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLInputElement.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLInputElement__
-#define __gnu_xml_dom_html2_DomHTMLInputElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLInputElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLInputElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLInputElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getDefaultValue();
-  virtual void setDefaultValue(::java::lang::String *);
-  virtual jboolean getDefaultChecked();
-  virtual void setDefaultChecked(jboolean);
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getAccept();
-  virtual void setAccept(::java::lang::String *);
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getAlt();
-  virtual void setAlt(::java::lang::String *);
-  virtual jboolean getChecked();
-  virtual void setChecked(jboolean);
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual jint getMaxLength();
-  virtual void setMaxLength(jint);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual jboolean getReadOnly();
-  virtual void setReadOnly(jboolean);
-  virtual jint getSize();
-  virtual void setSize(jint);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  virtual ::java::lang::String * getUseMap();
-  virtual void setUseMap(::java::lang::String *);
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  virtual void blur();
-  virtual void focus();
-  virtual void select();
-  virtual void click();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::html2::DomHTMLElement)))) value;
-  ::java::lang::Boolean * checked;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLInputElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLIsIndexElement.h b/libjava/gnu/xml/dom/html2/DomHTMLIsIndexElement.h
deleted file mode 100644
index 3b67d34..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLIsIndexElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLIsIndexElement__
-#define __gnu_xml_dom_html2_DomHTMLIsIndexElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLIsIndexElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLIsIndexElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLIsIndexElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getPrompt();
-  virtual void setPrompt(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLIsIndexElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLLIElement.h b/libjava/gnu/xml/dom/html2/DomHTMLLIElement.h
deleted file mode 100644
index 6c98890..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLLIElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLLIElement__
-#define __gnu_xml_dom_html2_DomHTMLLIElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLLIElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLLIElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLLIElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  virtual jint getValue();
-  virtual void setValue(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLLIElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLLabelElement.h b/libjava/gnu/xml/dom/html2/DomHTMLLabelElement.h
deleted file mode 100644
index 0ca04dc..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLLabelElement.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLLabelElement__
-#define __gnu_xml_dom_html2_DomHTMLLabelElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLLabelElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLLabelElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLLabelElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual ::java::lang::String * getHtmlFor();
-  virtual void setHtmlFor(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLLabelElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLLegendElement.h b/libjava/gnu/xml/dom/html2/DomHTMLLegendElement.h
deleted file mode 100644
index dfcfd08..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLLegendElement.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLLegendElement__
-#define __gnu_xml_dom_html2_DomHTMLLegendElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLLegendElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLLegendElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLLegendElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLLegendElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLLinkElement.h b/libjava/gnu/xml/dom/html2/DomHTMLLinkElement.h
deleted file mode 100644
index 7f396e0..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLLinkElement.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLLinkElement__
-#define __gnu_xml_dom_html2_DomHTMLLinkElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLLinkElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLLinkElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLLinkElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getCharset();
-  virtual void setCharset(::java::lang::String *);
-  virtual ::java::lang::String * getHref();
-  virtual void setHref(::java::lang::String *);
-  virtual ::java::lang::String * getHreflang();
-  virtual void setHreflang(::java::lang::String *);
-  virtual ::java::lang::String * getMedia();
-  virtual void setMedia(::java::lang::String *);
-  virtual ::java::lang::String * getRel();
-  virtual void setRel(::java::lang::String *);
-  virtual ::java::lang::String * getRev();
-  virtual void setRev(::java::lang::String *);
-  virtual ::java::lang::String * getTarget();
-  virtual void setTarget(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLLinkElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLMapElement.h b/libjava/gnu/xml/dom/html2/DomHTMLMapElement.h
deleted file mode 100644
index 17eb574..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLMapElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLMapElement__
-#define __gnu_xml_dom_html2_DomHTMLMapElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLMapElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLCollection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLMapElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLMapElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLCollection * getAreas();
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLMapElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLMenuElement.h b/libjava/gnu/xml/dom/html2/DomHTMLMenuElement.h
deleted file mode 100644
index d0ae687..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLMenuElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLMenuElement__
-#define __gnu_xml_dom_html2_DomHTMLMenuElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLMenuElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLMenuElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLMenuElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getCompact();
-  virtual void setCompact(jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLMenuElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLMetaElement.h b/libjava/gnu/xml/dom/html2/DomHTMLMetaElement.h
deleted file mode 100644
index e2dc569..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLMetaElement.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLMetaElement__
-#define __gnu_xml_dom_html2_DomHTMLMetaElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLMetaElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLMetaElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLMetaElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getContent();
-  virtual void setContent(::java::lang::String *);
-  virtual ::java::lang::String * getHttpEquiv();
-  virtual void setHttpEquiv(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getScheme();
-  virtual void setScheme(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLMetaElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLModElement.h b/libjava/gnu/xml/dom/html2/DomHTMLModElement.h
deleted file mode 100644
index 1947ba8..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLModElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLModElement__
-#define __gnu_xml_dom_html2_DomHTMLModElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLModElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLModElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLModElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getCite();
-  virtual void setCite(::java::lang::String *);
-  virtual ::java::lang::String * getDateTime();
-  virtual void setDateTime(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLModElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLOListElement.h b/libjava/gnu/xml/dom/html2/DomHTMLOListElement.h
deleted file mode 100644
index 173e3d0..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLOListElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLOListElement__
-#define __gnu_xml_dom_html2_DomHTMLOListElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLOListElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLOListElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLOListElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getCompact();
-  virtual void setCompact(jboolean);
-  virtual jint getStart();
-  virtual void setStart(jint);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLOListElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLObjectElement.h b/libjava/gnu/xml/dom/html2/DomHTMLObjectElement.h
deleted file mode 100644
index 8ab137b..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLObjectElement.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLObjectElement__
-#define __gnu_xml_dom_html2_DomHTMLObjectElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLObjectElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLObjectElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLObjectElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getCode();
-  virtual void setCode(::java::lang::String *);
-  virtual ::java::lang::String * getJavaCode();
-  virtual void setJavaCode(::java::lang::String *);
-  virtual ::java::lang::String * getObject();
-  virtual void setObject(::java::lang::String *);
-  virtual ::java::lang::String * getJavaObject();
-  virtual void setJavaObject(::java::lang::String *);
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getArchive();
-  virtual void setArchive(::java::lang::String *);
-  virtual ::java::lang::String * getJavaArchive();
-  virtual void setJavaArchive(::java::lang::String *);
-  virtual ::java::lang::String * getBorder();
-  virtual void setBorder(::java::lang::String *);
-  virtual ::java::lang::String * getCodeBase();
-  virtual void setCodeBase(::java::lang::String *);
-  virtual ::java::lang::String * getJavaCodeBase();
-  virtual void setJavaCodeBase(::java::lang::String *);
-  virtual ::java::lang::String * getCodeType();
-  virtual void setCodeType(::java::lang::String *);
-  virtual ::java::lang::String * getData();
-  virtual void setData(::java::lang::String *);
-  virtual jboolean getDeclare();
-  virtual void setDeclare(jboolean);
-  virtual ::java::lang::String * getHeight();
-  virtual void setHeight(::java::lang::String *);
-  virtual jint getHspace();
-  virtual void setHspace(jint);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getStandby();
-  virtual void setStandby(::java::lang::String *);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  virtual ::java::lang::String * getJavaType();
-  virtual void setJavaType(::java::lang::String *);
-  virtual ::java::lang::String * getUseMap();
-  virtual void setUseMap(::java::lang::String *);
-  virtual jint getVspace();
-  virtual void setVspace(jint);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  virtual ::org::w3c::dom::Document * getContentDocument();
-  virtual void setMayscript(::java::lang::String *);
-  virtual ::java::lang::String * getMayscript();
-  virtual void setScriptable(::java::lang::String *);
-  virtual ::java::lang::String * getScriptable();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLObjectElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLOptGroupElement.h b/libjava/gnu/xml/dom/html2/DomHTMLOptGroupElement.h
deleted file mode 100644
index 3a81ae1..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLOptGroupElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLOptGroupElement__
-#define __gnu_xml_dom_html2_DomHTMLOptGroupElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLOptGroupElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLOptGroupElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLOptGroupElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLOptGroupElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLOptionElement.h b/libjava/gnu/xml/dom/html2/DomHTMLOptionElement.h
deleted file mode 100644
index d681c07..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLOptionElement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLOptionElement__
-#define __gnu_xml_dom_html2_DomHTMLOptionElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLOptionElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLOptionElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLOptionElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual jboolean getDefaultSelected();
-  virtual void setDefaultSelected(jboolean);
-  virtual ::java::lang::String * getText();
-  virtual jint getIndex();
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual jboolean getSelected();
-  virtual void setSelected(jboolean);
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-public: // actually protected
-  ::java::lang::Boolean * __attribute__((aligned(__alignof__( ::gnu::xml::dom::html2::DomHTMLElement)))) selected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLOptionElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLParagraphElement.h b/libjava/gnu/xml/dom/html2/DomHTMLParagraphElement.h
deleted file mode 100644
index 8dc30e5..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLParagraphElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLParagraphElement__
-#define __gnu_xml_dom_html2_DomHTMLParagraphElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLParagraphElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLParagraphElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLParagraphElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLParagraphElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLParamElement.h b/libjava/gnu/xml/dom/html2/DomHTMLParamElement.h
deleted file mode 100644
index a0acd7d..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLParamElement.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLParamElement__
-#define __gnu_xml_dom_html2_DomHTMLParamElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLParamElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLParamElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLParamElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  virtual ::java::lang::String * getValueType();
-  virtual void setValueType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLParamElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLParser.h b/libjava/gnu/xml/dom/html2/DomHTMLParser.h
deleted file mode 100644
index 3e01fdc..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLParser.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLParser__
-#define __gnu_xml_dom_html2_DomHTMLParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLParser;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-public:
-  DomHTMLParser(::javax::swing::text::html::parser::DTD *);
-  virtual jboolean parseMarkupDeclarations(::java::lang::StringBuffer *);
-  virtual ::org::w3c::dom::html2::HTMLDocument * parseDocument(::java::io::Reader *);
-public: // actually protected
-  virtual ::org::w3c::dom::Node * createNode(::java::lang::String *);
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-  ::gnu::xml::dom::html2::DomHTMLDocument * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) document;
-  ::org::w3c::dom::Node * cursor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLParser__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLPreElement.h b/libjava/gnu/xml/dom/html2/DomHTMLPreElement.h
deleted file mode 100644
index e74965e..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLPreElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLPreElement__
-#define __gnu_xml_dom_html2_DomHTMLPreElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLPreElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLPreElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLPreElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getWidth();
-  virtual void setWidth(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLPreElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLQuoteElement.h b/libjava/gnu/xml/dom/html2/DomHTMLQuoteElement.h
deleted file mode 100644
index 3555201..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLQuoteElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLQuoteElement__
-#define __gnu_xml_dom_html2_DomHTMLQuoteElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLQuoteElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLQuoteElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLQuoteElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getCite();
-  virtual void setCite(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLQuoteElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLScriptElement.h b/libjava/gnu/xml/dom/html2/DomHTMLScriptElement.h
deleted file mode 100644
index cc03a8f..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLScriptElement.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLScriptElement__
-#define __gnu_xml_dom_html2_DomHTMLScriptElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLScriptElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLScriptElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLScriptElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getHtmlFor();
-  virtual void setHtmlFor(::java::lang::String *);
-  virtual ::java::lang::String * getEvent();
-  virtual void setEvent(::java::lang::String *);
-  virtual ::java::lang::String * getCharset();
-  virtual void setCharset(::java::lang::String *);
-  virtual jboolean getDefer();
-  virtual void setDefer(jboolean);
-  virtual ::java::lang::String * getSrc();
-  virtual void setSrc(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLScriptElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLSelectElement.h b/libjava/gnu/xml/dom/html2/DomHTMLSelectElement.h
deleted file mode 100644
index 51ea54c..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLSelectElement.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLSelectElement__
-#define __gnu_xml_dom_html2_DomHTMLSelectElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLSelectElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLElement;
-            class HTMLFormElement;
-            class HTMLOptionsCollection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLSelectElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLSelectElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual jint getSelectedIndex();
-  virtual void setSelectedIndex(jint);
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  virtual jint getLength();
-  virtual void setLength(jint);
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::org::w3c::dom::html2::HTMLOptionsCollection * getOptions();
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual jboolean getMultiple();
-  virtual void setMultiple(jboolean);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual jint getSize();
-  virtual void setSize(jint);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual void add(::org::w3c::dom::html2::HTMLElement *, ::org::w3c::dom::html2::HTMLElement *);
-  virtual void remove(jint);
-  virtual void blur();
-  virtual void focus();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLSelectElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLStyleElement.h b/libjava/gnu/xml/dom/html2/DomHTMLStyleElement.h
deleted file mode 100644
index 206539f..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLStyleElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLStyleElement__
-#define __gnu_xml_dom_html2_DomHTMLStyleElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLStyleElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLStyleElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLStyleElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getMedia();
-  virtual void setMedia(::java::lang::String *);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLStyleElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableCaptionElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableCaptionElement.h
deleted file mode 100644
index e907649..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableCaptionElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableCaptionElement__
-#define __gnu_xml_dom_html2_DomHTMLTableCaptionElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableCaptionElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableCaptionElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableCaptionElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableCaptionElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableCellElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableCellElement.h
deleted file mode 100644
index 7d31e54..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableCellElement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableCellElement__
-#define __gnu_xml_dom_html2_DomHTMLTableCellElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableCellElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableCellElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableCellElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getCellIndex();
-  virtual ::java::lang::String * getAbbr();
-  virtual void setAbbr(::java::lang::String *);
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getAxis();
-  virtual void setAxis(::java::lang::String *);
-  virtual ::java::lang::String * getBgColor();
-  virtual void setBgColor(::java::lang::String *);
-  virtual ::java::lang::String * getCh();
-  virtual void setCh(::java::lang::String *);
-  virtual ::java::lang::String * getChOff();
-  virtual void setChOff(::java::lang::String *);
-  virtual jint getColSpan();
-  virtual void setColSpan(jint);
-  virtual ::java::lang::String * getHeaders();
-  virtual void setHeaders(::java::lang::String *);
-  virtual ::java::lang::String * getHeight();
-  virtual void setHeight(::java::lang::String *);
-  virtual jboolean getNoWrap();
-  virtual void setNoWrap(jboolean);
-  virtual jint getRowSpan();
-  virtual void setRowSpan(jint);
-  virtual ::java::lang::String * getScope();
-  virtual void setScope(::java::lang::String *);
-  virtual ::java::lang::String * getVAlign();
-  virtual void setVAlign(::java::lang::String *);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableCellElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableColElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableColElement.h
deleted file mode 100644
index ff55d97..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableColElement.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableColElement__
-#define __gnu_xml_dom_html2_DomHTMLTableColElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableColElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableColElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableColElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getCh();
-  virtual void setCh(::java::lang::String *);
-  virtual ::java::lang::String * getChOff();
-  virtual void setChOff(::java::lang::String *);
-  virtual jint getSpan();
-  virtual void setSpan(jint);
-  virtual ::java::lang::String * getVAlign();
-  virtual void setVAlign(::java::lang::String *);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableColElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableElement.h
deleted file mode 100644
index 0bc78f7..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableElement.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableElement__
-#define __gnu_xml_dom_html2_DomHTMLTableElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-            class HTMLTableCaptionElement;
-            class HTMLTableSectionElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::html2::HTMLTableCaptionElement * getCaption();
-  virtual void setCaption(::org::w3c::dom::html2::HTMLTableCaptionElement *);
-  virtual ::org::w3c::dom::html2::HTMLTableSectionElement * getTHead();
-  virtual void setTHead(::org::w3c::dom::html2::HTMLTableSectionElement *);
-  virtual ::org::w3c::dom::html2::HTMLTableSectionElement * getTFoot();
-  virtual void setTFoot(::org::w3c::dom::html2::HTMLTableSectionElement *);
-  virtual ::org::w3c::dom::html2::HTMLCollection * getRows();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getTBodies();
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getBgColor();
-  virtual void setBgColor(::java::lang::String *);
-  virtual ::java::lang::String * getBorder();
-  virtual void setBorder(::java::lang::String *);
-  virtual ::java::lang::String * getCellPadding();
-  virtual void setCellPadding(::java::lang::String *);
-  virtual ::java::lang::String * getCellSpacing();
-  virtual void setCellSpacing(::java::lang::String *);
-  virtual ::java::lang::String * getFrame();
-  virtual void setFrame(::java::lang::String *);
-  virtual ::java::lang::String * getRules();
-  virtual void setRules(::java::lang::String *);
-  virtual ::java::lang::String * getSummary();
-  virtual void setSummary(::java::lang::String *);
-  virtual ::java::lang::String * getWidth();
-  virtual void setWidth(::java::lang::String *);
-  virtual ::org::w3c::dom::html2::HTMLElement * createTHead();
-  virtual void deleteTHead();
-  virtual ::org::w3c::dom::html2::HTMLElement * createTFoot();
-  virtual void deleteTFoot();
-  virtual ::org::w3c::dom::html2::HTMLElement * createCaption();
-  virtual void deleteCaption();
-  virtual ::org::w3c::dom::html2::HTMLElement * insertRow(jint);
-  virtual void deleteRow(jint);
-public: // actually package-private
-  virtual ::org::w3c::dom::Node * getRow(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableRowElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableRowElement.h
deleted file mode 100644
index 61684a4..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableRowElement.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableRowElement__
-#define __gnu_xml_dom_html2_DomHTMLTableRowElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableRowElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableRowElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableRowElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getRowIndex();
-  virtual jint getSectionRowIndex();
-  virtual ::org::w3c::dom::html2::HTMLCollection * getCells();
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getBgColor();
-  virtual void setBgColor(::java::lang::String *);
-  virtual ::java::lang::String * getCh();
-  virtual void setCh(::java::lang::String *);
-  virtual ::java::lang::String * getChOff();
-  virtual void setChOff(::java::lang::String *);
-  virtual ::java::lang::String * getVAlign();
-  virtual void setVAlign(::java::lang::String *);
-  virtual ::org::w3c::dom::html2::HTMLElement * insertCell(jint);
-  virtual void deleteCell(jint);
-public: // actually package-private
-  virtual ::org::w3c::dom::Node * getCell(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableRowElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTableSectionElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTableSectionElement.h
deleted file mode 100644
index 9abf670..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTableSectionElement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTableSectionElement__
-#define __gnu_xml_dom_html2_DomHTMLTableSectionElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTableSectionElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTableSectionElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTableSectionElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlign();
-  virtual void setAlign(::java::lang::String *);
-  virtual ::java::lang::String * getCh();
-  virtual void setCh(::java::lang::String *);
-  virtual ::java::lang::String * getChOff();
-  virtual void setChOff(::java::lang::String *);
-  virtual ::java::lang::String * getVAlign();
-  virtual void setVAlign(::java::lang::String *);
-  virtual ::org::w3c::dom::html2::HTMLCollection * getRows();
-  virtual ::org::w3c::dom::html2::HTMLElement * insertRow(jint);
-  virtual void deleteRow(jint);
-public: // actually package-private
-  virtual ::org::w3c::dom::Node * getRow(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTableSectionElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTextAreaElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTextAreaElement.h
deleted file mode 100644
index c141217..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTextAreaElement.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTextAreaElement__
-#define __gnu_xml_dom_html2_DomHTMLTextAreaElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTextAreaElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTextAreaElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTextAreaElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getDefaultValue();
-  virtual void setDefaultValue(::java::lang::String *);
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm();
-  virtual ::java::lang::String * getAccessKey();
-  virtual void setAccessKey(::java::lang::String *);
-  virtual jint getCols();
-  virtual void setCols(jint);
-  virtual jboolean getDisabled();
-  virtual void setDisabled(jboolean);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual jboolean getReadOnly();
-  virtual void setReadOnly(jboolean);
-  virtual jint getRows();
-  virtual void setRows(jint);
-  virtual jint getTabIndex();
-  virtual void setTabIndex(jint);
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  virtual void blur();
-  virtual void focus();
-  virtual void select();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::html2::DomHTMLElement)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTextAreaElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLTitleElement.h b/libjava/gnu/xml/dom/html2/DomHTMLTitleElement.h
deleted file mode 100644
index d660525..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLTitleElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLTitleElement__
-#define __gnu_xml_dom_html2_DomHTMLTitleElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLTitleElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLTitleElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLTitleElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLTitleElement__
diff --git a/libjava/gnu/xml/dom/html2/DomHTMLUListElement.h b/libjava/gnu/xml/dom/html2/DomHTMLUListElement.h
deleted file mode 100644
index 21ca1ad..0000000
--- a/libjava/gnu/xml/dom/html2/DomHTMLUListElement.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_html2_DomHTMLUListElement__
-#define __gnu_xml_dom_html2_DomHTMLUListElement__
-
-#pragma interface
-
-#include <gnu/xml/dom/html2/DomHTMLElement.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace html2
-        {
-            class DomHTMLDocument;
-            class DomHTMLUListElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::html2::DomHTMLUListElement : public ::gnu::xml::dom::html2::DomHTMLElement
-{
-
-public: // actually protected
-  DomHTMLUListElement(::gnu::xml::dom::html2::DomHTMLDocument *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean getCompact();
-  virtual void setCompact(jboolean);
-  virtual ::java::lang::String * getType();
-  virtual void setType(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_html2_DomHTMLUListElement__
diff --git a/libjava/gnu/xml/dom/ls/DomLSException.h b/libjava/gnu/xml/dom/ls/DomLSException.h
deleted file mode 100644
index 3fa6778..0000000
--- a/libjava/gnu/xml/dom/ls/DomLSException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_DomLSException__
-#define __gnu_xml_dom_ls_DomLSException__
-
-#pragma interface
-
-#include <org/w3c/dom/ls/LSException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DomLSException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::DomLSException : public ::org::w3c::dom::ls::LSException
-{
-
-public:
-  DomLSException(jshort, ::java::lang::Exception *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_DomLSException__
diff --git a/libjava/gnu/xml/dom/ls/DomLSInput.h b/libjava/gnu/xml/dom/ls/DomLSInput.h
deleted file mode 100644
index f47de97..0000000
--- a/libjava/gnu/xml/dom/ls/DomLSInput.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_DomLSInput__
-#define __gnu_xml_dom_ls_DomLSInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DomLSInput;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::DomLSInput : public ::java::lang::Object
-{
-
-public:
-  DomLSInput();
-  virtual ::java::io::Reader * getCharacterStream();
-  virtual void setCharacterStream(::java::io::Reader *);
-  virtual ::java::io::InputStream * getByteStream();
-  virtual void setByteStream(::java::io::InputStream *);
-  virtual ::java::lang::String * getStringData();
-  virtual void setStringData(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getPublicId();
-  virtual void setPublicId(::java::lang::String *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual void setBaseURI(::java::lang::String *);
-  virtual ::java::lang::String * getEncoding();
-  virtual void setEncoding(::java::lang::String *);
-  virtual jboolean getCertifiedText();
-  virtual void setCertifiedText(jboolean);
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::java::lang::String * systemId;
-  ::java::lang::String * publicId;
-  ::java::lang::String * baseURI;
-  ::java::lang::String * encoding;
-  jboolean certifiedText;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_DomLSInput__
diff --git a/libjava/gnu/xml/dom/ls/DomLSOutput.h b/libjava/gnu/xml/dom/ls/DomLSOutput.h
deleted file mode 100644
index e6ba100..0000000
--- a/libjava/gnu/xml/dom/ls/DomLSOutput.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_DomLSOutput__
-#define __gnu_xml_dom_ls_DomLSOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DomLSOutput;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::DomLSOutput : public ::java::lang::Object
-{
-
-public:
-  DomLSOutput();
-  virtual ::java::io::Writer * getCharacterStream();
-  virtual void setCharacterStream(::java::io::Writer *);
-  virtual ::java::io::OutputStream * getByteStream();
-  virtual void setByteStream(::java::io::OutputStream *);
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getEncoding();
-  virtual void setEncoding(::java::lang::String *);
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
-  ::java::lang::String * systemId;
-  ::java::lang::String * encoding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_DomLSOutput__
diff --git a/libjava/gnu/xml/dom/ls/DomLSParser.h b/libjava/gnu/xml/dom/ls/DomLSParser.h
deleted file mode 100644
index dd38f2b..0000000
--- a/libjava/gnu/xml/dom/ls/DomLSParser.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_DomLSParser__
-#define __gnu_xml_dom_ls_DomLSParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DomLSParser;
-            class SAXEventSink;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParserFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class DOMStringList;
-          class Document;
-          class Node;
-        namespace ls
-        {
-            class LSInput;
-            class LSParserFilter;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class SAXParseException;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::DomLSParser : public ::java::lang::Object
-{
-
-public:
-  DomLSParser(jshort, ::java::lang::String *);
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig();
-  virtual ::org::w3c::dom::ls::LSParserFilter * getFilter();
-  virtual void setFilter(::org::w3c::dom::ls::LSParserFilter *);
-  virtual jboolean getAsync();
-  virtual jboolean getBusy();
-  virtual ::org::w3c::dom::Document * parse(::org::w3c::dom::ls::LSInput *);
-  virtual ::org::w3c::dom::Document * parseURI(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * parseWithContext(::org::w3c::dom::ls::LSInput *, ::org::w3c::dom::Node *, jshort);
-  virtual void abort();
-private:
-  ::org::w3c::dom::Document * doParse(::org::w3c::dom::ls::LSInput *);
-  ::org::xml::sax::XMLReader * getXMLReader();
-  ::org::xml::sax::InputSource * getInputSource(::org::w3c::dom::ls::LSInput *);
-public:
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual jboolean canSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::w3c::dom::DOMStringList * getParameterNames();
-  virtual ::java::lang::String * item(jint);
-  virtual jint getLength();
-  virtual jboolean contains(::java::lang::String *);
-  virtual void warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-private:
-  static ::java::util::List * SUPPORTED_PARAMETERS;
-  ::org::w3c::dom::ls::LSParserFilter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) filter;
-  jboolean async;
-  ::java::lang::String * schemaType;
-  ::gnu::xml::dom::ls::SAXEventSink * eventSink;
-  ::javax::xml::parsers::SAXParserFactory * factory;
-  ::org::xml::sax::XMLReader * reader;
-  jboolean namespaceAware;
-  jboolean ignoreWhitespace;
-  jboolean expandEntityReferences;
-  jboolean ignoreComments;
-  jboolean coalescing;
-  jboolean validating;
-  jboolean xIncludeAware;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_DomLSParser__
diff --git a/libjava/gnu/xml/dom/ls/DomLSSerializer.h b/libjava/gnu/xml/dom/ls/DomLSSerializer.h
deleted file mode 100644
index 90cc865..0000000
--- a/libjava/gnu/xml/dom/ls/DomLSSerializer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_DomLSSerializer__
-#define __gnu_xml_dom_ls_DomLSSerializer__
-
-#pragma interface
-
-#include <gnu/xml/transform/StreamSerializer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DomLSSerializer;
-        }
-      }
-      namespace transform
-      {
-          class StreamSerializer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class DOMStringList;
-          class Node;
-        namespace ls
-        {
-            class LSOutput;
-            class LSSerializerFilter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::DomLSSerializer : public ::gnu::xml::transform::StreamSerializer
-{
-
-public:
-  DomLSSerializer();
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig();
-  virtual ::java::lang::String * getNewLine();
-  virtual void setNewLine(::java::lang::String *);
-  virtual ::org::w3c::dom::ls::LSSerializerFilter * getFilter();
-  virtual void setFilter(::org::w3c::dom::ls::LSSerializerFilter *);
-  virtual jboolean write(::org::w3c::dom::Node *, ::org::w3c::dom::ls::LSOutput *);
-  virtual jboolean writeToURI(::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual ::java::lang::String * writeToString(::org::w3c::dom::Node *);
-  virtual void serialize(::org::w3c::dom::Node *, ::java::io::OutputStream *);
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual jboolean canSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::w3c::dom::DOMStringList * getParameterNames();
-  virtual ::java::lang::String * item(jint);
-  virtual jint getLength();
-  virtual jboolean contains(::java::lang::String *);
-private:
-  static ::java::util::List * SUPPORTED_PARAMETERS;
-  ::org::w3c::dom::ls::LSSerializerFilter * __attribute__((aligned(__alignof__( ::gnu::xml::transform::StreamSerializer)))) filter;
-  ::gnu::xml::transform::StreamSerializer * serializer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_DomLSSerializer__
diff --git a/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.h b/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.h
deleted file mode 100644
index 2fb8670..0000000
--- a/libjava/gnu/xml/dom/ls/FilteredSAXEventSink.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_FilteredSAXEventSink__
-#define __gnu_xml_dom_ls_FilteredSAXEventSink__
-
-#pragma interface
-
-#include <gnu/xml/dom/ls/SAXEventSink.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class FilteredSAXEventSink;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Node;
-        namespace ls
-        {
-            class LSParserFilter;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::FilteredSAXEventSink : public ::gnu::xml::dom::ls::SAXEventSink
-{
-
-public: // actually package-private
-  FilteredSAXEventSink(::org::w3c::dom::ls::LSParserFilter *);
-public:
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-public: // actually protected
-  virtual ::org::w3c::dom::Attr * createAttr(::org::xml::sax::Attributes *, jint);
-public:
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void comment(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  virtual jshort getDecision(::org::w3c::dom::Node *, jboolean);
-  ::org::w3c::dom::ls::LSParserFilter * __attribute__((aligned(__alignof__( ::gnu::xml::dom::ls::SAXEventSink)))) filter;
-  jint whatToShow;
-  ::java::util::LinkedList * nodes;
-  ::java::util::LinkedList * decisions;
-  jboolean rejecting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_FilteredSAXEventSink__
diff --git a/libjava/gnu/xml/dom/ls/ReaderInputStream.h b/libjava/gnu/xml/dom/ls/ReaderInputStream.h
deleted file mode 100644
index 7fa7d93..0000000
--- a/libjava/gnu/xml/dom/ls/ReaderInputStream.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_ReaderInputStream__
-#define __gnu_xml_dom_ls_ReaderInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class ReaderInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::ReaderInputStream : public ::java::io::InputStream
-{
-
-public:
-  ReaderInputStream(::java::io::Reader *);
-public: // actually package-private
-  virtual void setEncoding(::java::lang::String *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void close();
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-  virtual jint available();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) reader;
-  ::java::lang::String * encoding;
-  JArray< jbyte > * extra;
-  jint pos;
-  JArray< jbyte > * extra_marked;
-  jint pos_marked;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_ReaderInputStream__
diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.h b/libjava/gnu/xml/dom/ls/SAXEventSink.h
deleted file mode 100644
index fc726b7..0000000
--- a/libjava/gnu/xml/dom/ls/SAXEventSink.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_SAXEventSink__
-#define __gnu_xml_dom_ls_SAXEventSink__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-          class DomDocument;
-        namespace ls
-        {
-            class SAXEventSink;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class Element;
-          class Node;
-          class Text;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::SAXEventSink : public ::java::lang::Object
-{
-
-public:
-  SAXEventSink();
-public: // actually package-private
-  virtual void interrupt();
-public:
-  virtual ::org::w3c::dom::Document * getDocument();
-  virtual void setReader(::org::xml::sax::XMLReader *);
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void setNamespaceAware(jboolean);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-public: // actually protected
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual ::org::w3c::dom::Attr * createAttr(::org::xml::sax::Attributes *, jint);
-public:
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-public: // actually protected
-  virtual ::org::w3c::dom::Text * createText(JArray< jchar > *, jint, jint);
-public:
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  virtual ::org::w3c::dom::Node * createProcessingInstruction(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void skippedEntity(::java::lang::String *);
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  virtual ::org::w3c::dom::Node * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void endDTD();
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void startCDATA();
-  virtual void endCDATA();
-  virtual void comment(JArray< jchar > *, jint, jint);
-public: // actually protected
-  virtual ::org::w3c::dom::Node * createComment(JArray< jchar > *, jint, jint);
-public:
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  static ::java::lang::String * XMLNS_URI;
-  static ::java::lang::String * XMLNS_PREFIX;
-  static ::java::util::HashSet * PREDEFINED_ENTITIES;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware;
-public: // actually package-private
-  jboolean ignoreWhitespace;
-  jboolean expandEntityReferences;
-  jboolean ignoreComments;
-  jboolean coalescing;
-  ::org::xml::sax::XMLReader * reader;
-  ::gnu::xml::dom::DomDocument * doc;
-  ::org::w3c::dom::Node * ctx;
-  ::java::util::LinkedList * entityCtx;
-  ::java::util::List * pending;
-  ::org::xml::sax::Locator * locator;
-  jboolean inCDATA;
-  jboolean inDTD;
-  jboolean interrupted;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_SAXEventSink__
diff --git a/libjava/gnu/xml/dom/ls/WriterOutputStream.h b/libjava/gnu/xml/dom/ls/WriterOutputStream.h
deleted file mode 100644
index 5663844d..0000000
--- a/libjava/gnu/xml/dom/ls/WriterOutputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_dom_ls_WriterOutputStream__
-#define __gnu_xml_dom_ls_WriterOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class WriterOutputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::dom::ls::WriterOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  WriterOutputStream(::java::io::Writer *);
-public: // actually package-private
-  virtual void setEncoding(::java::lang::String *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void close();
-  virtual void flush();
-private:
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) writer;
-  ::java::lang::String * encoding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_dom_ls_WriterOutputStream__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeAttr.h b/libjava/gnu/xml/libxmlj/dom/GnomeAttr.h
deleted file mode 100644
index 9619be9..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeAttr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeAttr__
-#define __gnu_xml_libxmlj_dom_GnomeAttr__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeAttr;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class Node;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeAttr : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeAttr(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jboolean getSpecified();
-  virtual ::java::lang::String * getValue();
-  virtual void setValue(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual jboolean isId();
-private:
-  jboolean xmljIsId();
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeAttr__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeCDATASection.h b/libjava/gnu/xml/libxmlj/dom/GnomeCDATASection.h
deleted file mode 100644
index b8c3083..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeCDATASection.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeCDATASection__
-#define __gnu_xml_libxmlj_dom_GnomeCDATASection__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeText.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeCDATASection;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeCDATASection : public ::gnu::xml::libxmlj::dom::GnomeText
-{
-
-public: // actually package-private
-  GnomeCDATASection(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeCDATASection__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeCharacterData.h b/libjava/gnu/xml/libxmlj/dom/GnomeCharacterData.h
deleted file mode 100644
index 93c6b31..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeCharacterData.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeCharacterData__
-#define __gnu_xml_libxmlj_dom_GnomeCharacterData__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeCharacterData;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeCharacterData : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeCharacterData(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getData();
-  virtual void setData(::java::lang::String *);
-  virtual jint getLength();
-  virtual ::java::lang::String * substringData(jint, jint);
-  virtual void appendData(::java::lang::String *);
-  virtual void insertData(jint, ::java::lang::String *);
-  virtual void deleteData(jint, jint);
-  virtual void replaceData(jint, jint, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeCharacterData__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeComment.h b/libjava/gnu/xml/libxmlj/dom/GnomeComment.h
deleted file mode 100644
index 211d938..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeComment.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeComment__
-#define __gnu_xml_libxmlj_dom_GnomeComment__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeCharacterData.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeComment;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeComment : public ::gnu::xml::libxmlj::dom::GnomeCharacterData
-{
-
-public: // actually package-private
-  GnomeComment(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeComment__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDOMException.h b/libjava/gnu/xml/libxmlj/dom/GnomeDOMException.h
deleted file mode 100644
index 1a331eb..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDOMException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDOMException__
-#define __gnu_xml_libxmlj_dom_GnomeDOMException__
-
-#pragma interface
-
-#include <org/w3c/dom/DOMException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDOMException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDOMException : public ::org::w3c::dom::DOMException
-{
-
-public: // actually package-private
-  GnomeDOMException(jshort, ::java::lang::String *);
-private:
-  static ::java::lang::String * createMessage(jint, ::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDOMException__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDOMStringList.h b/libjava/gnu/xml/libxmlj/dom/GnomeDOMStringList.h
deleted file mode 100644
index ba58526..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDOMStringList.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDOMStringList__
-#define __gnu_xml_libxmlj_dom_GnomeDOMStringList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDOMStringList;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDOMStringList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeDOMStringList(JArray< ::java::lang::String * > *);
-public:
-  virtual jint getLength();
-  virtual ::java::lang::String * item(jint);
-  virtual jboolean contains(::java::lang::String *);
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDOMStringList__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDocument.h b/libjava/gnu/xml/libxmlj/dom/GnomeDocument.h
deleted file mode 100644
index 8f49b25..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDocument.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDocument__
-#define __gnu_xml_libxmlj_dom_GnomeDocument__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocument;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class CDATASection;
-          class Comment;
-          class DOMConfiguration;
-          class DOMErrorHandler;
-          class DOMImplementation;
-          class DOMStringList;
-          class DocumentFragment;
-          class DocumentType;
-          class Element;
-          class EntityReference;
-          class Node;
-          class NodeList;
-          class ProcessingInstruction;
-          class Text;
-        namespace traversal
-        {
-            class NodeFilter;
-            class NodeIterator;
-            class TreeWalker;
-        }
-        namespace xpath
-        {
-            class XPathExpression;
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDocument : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeDocument(::java::lang::Object *);
-public: // actually protected
-  virtual void finalize();
-private:
-  void free(::java::lang::Object *);
-public:
-  virtual ::org::w3c::dom::DocumentType * getDoctype();
-  virtual ::org::w3c::dom::DOMImplementation * getImplementation();
-  virtual ::org::w3c::dom::Element * getDocumentElement();
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *);
-  virtual ::org::w3c::dom::DocumentType * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::DocumentFragment * createDocumentFragment();
-  virtual ::org::w3c::dom::Text * createTextNode(::java::lang::String *);
-  virtual ::org::w3c::dom::Comment * createComment(::java::lang::String *);
-  virtual ::org::w3c::dom::CDATASection * createCDATASection(::java::lang::String *);
-  virtual ::org::w3c::dom::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * createAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::EntityReference * createEntityReference(::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * importNode(::org::w3c::dom::Node *, jboolean);
-private:
-  ::org::w3c::dom::Node * xmljImportNode(::org::w3c::dom::Node *, jboolean);
-public:
-  virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * createAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Element * getElementById(::java::lang::String *);
-private:
-  ::org::w3c::dom::Element * xmljGetElementById(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getInputEncoding();
-  virtual ::java::lang::String * getXmlEncoding();
-  virtual jboolean getXmlStandalone();
-  virtual void setXmlStandalone(jboolean);
-  virtual ::java::lang::String * getXmlVersion();
-  virtual void setXmlVersion(::java::lang::String *);
-  virtual jboolean getStrictErrorChecking();
-  virtual void setStrictErrorChecking(jboolean);
-  virtual ::java::lang::String * getDocumentURI();
-  virtual void setDocumentURI(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * adoptNode(::org::w3c::dom::Node *);
-private:
-  ::org::w3c::dom::Node * xmljAdoptNode(::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig();
-  virtual void normalizeDocument();
-  virtual ::org::w3c::dom::Node * renameNode(::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *);
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual jboolean canSetParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::w3c::dom::DOMStringList * getParameterNames();
-private:
-  jboolean getBooleanValue(::java::lang::Object *);
-public:
-  virtual ::org::w3c::dom::xpath::XPathExpression * createExpression(::java::lang::String *, ::org::w3c::dom::xpath::XPathNSResolver *);
-  virtual ::org::w3c::dom::xpath::XPathNSResolver * createNSResolver(::org::w3c::dom::Node *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::w3c::dom::Node *, ::org::w3c::dom::xpath::XPathNSResolver *, jshort, ::java::lang::Object *);
-  virtual ::org::w3c::dom::traversal::NodeIterator * createNodeIterator(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean);
-  virtual ::org::w3c::dom::traversal::TreeWalker * createTreeWalker(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::org::w3c::dom::DOMImplementation * __attribute__((aligned(__alignof__( ::gnu::xml::libxmlj::dom::GnomeNode)))) dom;
-  jboolean strictErrorChecking;
-  jboolean canonicalForm;
-  jboolean cdataSections;
-  jboolean checkCharacterNormalization;
-  jboolean comments;
-  jboolean datatypeNormalization;
-  jboolean elementContentWhitespace;
-  jboolean entities;
-  ::org::w3c::dom::DOMErrorHandler * errorHandler;
-  jboolean namespaces;
-  jboolean namespaceDeclarations;
-  jboolean normalizeCharacters;
-  jboolean splitCdataSections;
-  jboolean validate;
-  jboolean validateIfSchema;
-  jboolean wellFormed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDocument__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.h b/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.h
deleted file mode 100644
index b71081d..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDocumentBuilder__
-#define __gnu_xml_libxmlj_dom_GnomeDocumentBuilder__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilder.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocumentBuilder;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-          class DocumentType;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDocumentBuilder : public ::javax::xml::parsers::DocumentBuilder
-{
-
-public:
-  GnomeDocumentBuilder();
-  GnomeDocumentBuilder(jboolean, jboolean, jboolean);
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation();
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual ::org::w3c::dom::Document * newDocument();
-  virtual ::org::w3c::dom::Document * parse(::org::xml::sax::InputSource *);
-private:
-  ::org::w3c::dom::Document * parseStream(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, jboolean, jboolean, jboolean);
-public:
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *);
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual jboolean hasFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * createDocument(::java::lang::String *, ::java::lang::String *, ::org::w3c::dom::DocumentType *);
-  virtual ::org::w3c::dom::DocumentType * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  void setDocumentLocator(::java::lang::Object *, ::java::lang::Object *);
-  ::java::io::InputStream * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void warning(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void error(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void fatalError(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  jboolean __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilder)))) validate;
-  jboolean coalesce;
-  jboolean expandEntities;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  jboolean seenFatalError;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDocumentBuilder__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.h b/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.h
deleted file mode 100644
index 465a17f..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDocumentBuilderFactory__
-#define __gnu_xml_libxmlj_dom_GnomeDocumentBuilderFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/DocumentBuilderFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocumentBuilderFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDocumentBuilderFactory : public ::javax::xml::parsers::DocumentBuilderFactory
-{
-
-public:
-  GnomeDocumentBuilderFactory();
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual ::javax::xml::parsers::DocumentBuilder * newDocumentBuilder();
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::xml::parsers::DocumentBuilderFactory)))) secureProcessing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDocumentBuilderFactory__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentFragment.h b/libjava/gnu/xml/libxmlj/dom/GnomeDocumentFragment.h
deleted file mode 100644
index bac97ad..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentFragment.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDocumentFragment__
-#define __gnu_xml_libxmlj_dom_GnomeDocumentFragment__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocumentFragment;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDocumentFragment : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeDocumentFragment(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDocumentFragment__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentType.h b/libjava/gnu/xml/libxmlj/dom/GnomeDocumentType.h
deleted file mode 100644
index d0eff62..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeDocumentType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeDocumentType__
-#define __gnu_xml_libxmlj_dom_GnomeDocumentType__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocumentType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NamedNodeMap;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeDocumentType : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeDocumentType(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual ::org::w3c::dom::NamedNodeMap * getEntities();
-  virtual ::org::w3c::dom::NamedNodeMap * getNotations();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getInternalSubset();
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeDocumentType__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeElement.h b/libjava/gnu/xml/libxmlj/dom/GnomeElement.h
deleted file mode 100644
index b023991..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeElement.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeElement__
-#define __gnu_xml_libxmlj_dom_GnomeElement__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeElement;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class NodeList;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeElement : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeElement(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getTagName();
-  virtual ::java::lang::String * getAttribute(::java::lang::String *);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *);
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *);
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean hasAttribute(::java::lang::String *);
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual void setIdAttribute(::java::lang::String *, jboolean);
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean);
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::gnu::xml::libxmlj::dom::GnomeNode)))) userIdAttrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeElement__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeEntity.h b/libjava/gnu/xml/libxmlj/dom/GnomeEntity.h
deleted file mode 100644
index f0611ff..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeEntity.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeEntity__
-#define __gnu_xml_libxmlj_dom_GnomeEntity__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeEntity;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeEntity : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeEntity(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getNotationName();
-  virtual ::java::lang::String * getInputEncoding();
-  virtual ::java::lang::String * getXmlEncoding();
-  virtual ::java::lang::String * getXmlVersion();
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeEntity__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeEntityReference.h b/libjava/gnu/xml/libxmlj/dom/GnomeEntityReference.h
deleted file mode 100644
index 22cc5c7..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeEntityReference.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeEntityReference__
-#define __gnu_xml_libxmlj_dom_GnomeEntityReference__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeEntityReference;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeEntityReference : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeEntityReference(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeEntityReference__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.h b/libjava/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.h
deleted file mode 100644
index 7dfd2ae..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeNamedNodeMap__
-#define __gnu_xml_libxmlj_dom_GnomeNamedNodeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeNamedNodeMap;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeNamedNodeMap : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeNamedNodeMap(::java::lang::Object *, jint);
-public:
-  virtual ::org::w3c::dom::Node * getNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * getNamedItemNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Node * setNamedItemNS(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * removeNamedItemNS(::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeNamedNodeMap__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeNode.h b/libjava/gnu/xml/libxmlj/dom/GnomeNode.h
deleted file mode 100644
index 6f9ac92..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeNode.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeNode__
-#define __gnu_xml_libxmlj_dom_GnomeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeNode;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeNode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static ::gnu::xml::libxmlj::dom::GnomeNode * newInstance(::java::lang::Object *, ::java::lang::Object *, jint);
-  static void freeDocument(::java::lang::Object *);
-  GnomeNode(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getNodeName();
-  virtual ::java::lang::String * getNodeValue();
-  virtual void setNodeValue(::java::lang::String *);
-  virtual jshort getNodeType();
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual ::org::w3c::dom::NodeList * getChildNodes();
-  virtual ::org::w3c::dom::Node * getFirstChild();
-  virtual ::org::w3c::dom::Node * getLastChild();
-  virtual ::org::w3c::dom::Node * getPreviousSibling();
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
-  virtual ::org::w3c::dom::Document * getOwnerDocument();
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-private:
-  ::org::w3c::dom::Node * xmljInsertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-private:
-  ::org::w3c::dom::Node * xmljReplaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *);
-private:
-  ::org::w3c::dom::Node * xmljRemoveChild(::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-private:
-  ::org::w3c::dom::Node * xmljAppendChild(::org::w3c::dom::Node *);
-public:
-  virtual jboolean hasChildNodes();
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean);
-private:
-  ::org::w3c::dom::Node * xmljCloneNode(jboolean);
-public:
-  virtual void normalize();
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getPrefix();
-  virtual void setPrefix(::java::lang::String *);
-  virtual ::java::lang::String * getLocalName();
-  virtual jboolean hasAttributes();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getBaseURI();
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *);
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  jint xmljCompareTo(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getTextContent();
-  virtual void setTextContent(::java::lang::String *);
-  virtual jboolean isSameNode(::org::w3c::dom::Node *);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *);
-  virtual ::java::lang::Object * getUserData(::java::lang::String *);
-public: // actually package-private
-  virtual void notifyUserDataHandlers(jshort, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static ::java::util::Map * instances;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::util::Map * userData;
-  ::java::util::Map * userDataHandlers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeNode__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeNodeList.h b/libjava/gnu/xml/libxmlj/dom/GnomeNodeList.h
deleted file mode 100644
index 8ded813..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeNodeList.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeNodeList__
-#define __gnu_xml_libxmlj_dom_GnomeNodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeNodeList;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeNodeList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeNodeList(::java::lang::Object *);
-public:
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeNodeList__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeNotation.h b/libjava/gnu/xml/libxmlj/dom/GnomeNotation.h
deleted file mode 100644
index 627e09c..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeNotation.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeNotation__
-#define __gnu_xml_libxmlj_dom_GnomeNotation__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeNotation;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeNotation : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeNotation(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeNotation__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.h b/libjava/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.h
deleted file mode 100644
index c3097b9..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeProcessingInstruction__
-#define __gnu_xml_libxmlj_dom_GnomeProcessingInstruction__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeProcessingInstruction;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeProcessingInstruction : public ::gnu::xml::libxmlj::dom::GnomeNode
-{
-
-public: // actually package-private
-  GnomeProcessingInstruction(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getTarget();
-  virtual ::java::lang::String * getData();
-  virtual void setData(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeProcessingInstruction__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeText.h b/libjava/gnu/xml/libxmlj/dom/GnomeText.h
deleted file mode 100644
index 220052d..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeText.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeText__
-#define __gnu_xml_libxmlj_dom_GnomeText__
-
-#pragma interface
-
-#include <gnu/xml/libxmlj/dom/GnomeCharacterData.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeText;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Text;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeText : public ::gnu::xml::libxmlj::dom::GnomeCharacterData
-{
-
-public: // actually package-private
-  GnomeText(::java::lang::Object *);
-public:
-  virtual ::org::w3c::dom::Text * splitText(jint);
-  virtual jboolean isElementContentWhitespace();
-  virtual ::java::lang::String * getWholeText();
-  virtual ::org::w3c::dom::Text * replaceWholeText(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeText__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeTypeInfo.h b/libjava/gnu/xml/libxmlj/dom/GnomeTypeInfo.h
deleted file mode 100644
index d775bc7..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeTypeInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeTypeInfo__
-#define __gnu_xml_libxmlj_dom_GnomeTypeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeTypeInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeTypeInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeTypeInfo(::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getTypeName();
-  virtual ::java::lang::String * getTypeNamespace();
-  virtual jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeTypeInfo__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeXPathExpression.h b/libjava/gnu/xml/libxmlj/dom/GnomeXPathExpression.h
deleted file mode 100644
index ca88b77..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeXPathExpression.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeXPathExpression__
-#define __gnu_xml_libxmlj_dom_GnomeXPathExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocument;
-            class GnomeXPathExpression;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace xpath
-        {
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeXPathExpression : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeXPathExpression(::gnu::xml::libxmlj::dom::GnomeDocument *, ::java::lang::String *, ::org::w3c::dom::xpath::XPathNSResolver *);
-public: // actually protected
-  virtual void finalize();
-private:
-  ::java::lang::Object * init(::java::lang::String *);
-  void free(::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jshort, ::java::lang::Object *);
-private:
-  ::java::lang::Object * doEvaluate(::java::lang::Object *, ::org::w3c::dom::Node *, jshort, ::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeXPathExpression__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.h b/libjava/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.h
deleted file mode 100644
index 5728efb..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeXPathNSResolver__
-#define __gnu_xml_libxmlj_dom_GnomeXPathNSResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeXPathNSResolver;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeXPathNSResolver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeXPathNSResolver(::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-public: // actually package-private
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeXPathNSResolver__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeXPathNodeList.h b/libjava/gnu/xml/libxmlj/dom/GnomeXPathNodeList.h
deleted file mode 100644
index cc2a757..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeXPathNodeList.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeXPathNodeList__
-#define __gnu_xml_libxmlj_dom_GnomeXPathNodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeXPathNodeList;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeXPathNodeList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeXPathNodeList(::java::lang::Object *);
-public: // actually protected
-  virtual void finalize();
-private:
-  void free(::java::lang::Object *);
-public:
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeXPathNodeList__
diff --git a/libjava/gnu/xml/libxmlj/dom/GnomeXPathResult.h b/libjava/gnu/xml/libxmlj/dom/GnomeXPathResult.h
deleted file mode 100644
index 5616ce3..0000000
--- a/libjava/gnu/xml/libxmlj/dom/GnomeXPathResult.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_dom_GnomeXPathResult__
-#define __gnu_xml_libxmlj_dom_GnomeXPathResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeXPathResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::dom::GnomeXPathResult : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeXPathResult(::java::lang::Object *);
-public: // actually protected
-  virtual void finalize();
-private:
-  void free(::java::lang::Object *);
-public:
-  virtual jshort getResultType();
-  virtual jdouble getNumberValue();
-  virtual ::java::lang::String * getStringValue();
-  virtual jboolean getBooleanValue();
-  virtual ::org::w3c::dom::Node * getSingleNodeValue();
-  virtual jboolean getInvalidIteratorState();
-  virtual jint getSnapshotLength();
-  virtual ::org::w3c::dom::Node * iterateNext();
-  virtual ::org::w3c::dom::Node * snapshotItem(jint);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_dom_GnomeXPathResult__
diff --git a/libjava/gnu/xml/libxmlj/sax/GnomeLocator.h b/libjava/gnu/xml/libxmlj/sax/GnomeLocator.h
deleted file mode 100644
index 8697c20..0000000
--- a/libjava/gnu/xml/libxmlj/sax/GnomeLocator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_GnomeLocator__
-#define __gnu_xml_libxmlj_sax_GnomeLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeLocator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::GnomeLocator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GnomeLocator(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getPublicId();
-private:
-  ::java::lang::String * publicId(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::String * getSystemId();
-private:
-  ::java::lang::String * systemId(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual jint getLineNumber();
-private:
-  jint lineNumber(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual jint getColumnNumber();
-private:
-  jint columnNumber(::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ctx;
-  ::java::lang::Object * loc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_GnomeLocator__
diff --git a/libjava/gnu/xml/libxmlj/sax/GnomeSAXParser.h b/libjava/gnu/xml/libxmlj/sax/GnomeSAXParser.h
deleted file mode 100644
index 0aae0b1..0000000
--- a/libjava/gnu/xml/libxmlj/sax/GnomeSAXParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_GnomeSAXParser__
-#define __gnu_xml_libxmlj_sax_GnomeSAXParser__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParser.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeSAXParser;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Parser;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::GnomeSAXParser : public ::javax::xml::parsers::SAXParser
-{
-
-public: // actually package-private
-  GnomeSAXParser(jboolean, jboolean);
-public:
-  virtual ::org::xml::sax::Parser * getParser();
-  virtual ::org::xml::sax::XMLReader * getXMLReader();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParser)))) namespaceAware;
-  jboolean validating;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_GnomeSAXParser__
diff --git a/libjava/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.h b/libjava/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.h
deleted file mode 100644
index 3c791c1..0000000
--- a/libjava/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_GnomeSAXParserFactory__
-#define __gnu_xml_libxmlj_sax_GnomeSAXParserFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParserFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeSAXParserFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::GnomeSAXParserFactory : public ::javax::xml::parsers::SAXParserFactory
-{
-
-public:
-  GnomeSAXParserFactory();
-  virtual ::javax::xml::parsers::SAXParser * newSAXParser();
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParserFactory)))) features;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_GnomeSAXParserFactory__
diff --git a/libjava/gnu/xml/libxmlj/sax/GnomeXMLReader.h b/libjava/gnu/xml/libxmlj/sax/GnomeXMLReader.h
deleted file mode 100644
index e27238f..0000000
--- a/libjava/gnu/xml/libxmlj/sax/GnomeXMLReader.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_GnomeXMLReader__
-#define __gnu_xml_libxmlj_sax_GnomeXMLReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeLocator;
-            class GnomeXMLReader;
-            class Namespaces;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-        namespace ext
-        {
-            class DeclHandler;
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::GnomeXMLReader : public ::java::lang::Object
-{
-
-public:
-  GnomeXMLReader();
-  GnomeXMLReader(jboolean, jboolean);
-  virtual ::org::xml::sax::ContentHandler * getContentHandler();
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *);
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler();
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *);
-  virtual ::org::xml::sax::EntityResolver * getEntityResolver();
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-public: // actually package-private
-  static void checkFeatureName(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::xml::sax::ext::DeclHandler * getDeclarationHandler();
-  virtual void setDeclarationHandler(::org::xml::sax::ext::DeclHandler *);
-  virtual ::org::xml::sax::ext::LexicalHandler * getLexicalHandler();
-  virtual void setLexicalHandler(::org::xml::sax::ext::LexicalHandler *);
-public: // actually package-private
-  static void checkPropertyName(::java::lang::String *);
-public:
-  virtual void parse(::java::lang::String *);
-  virtual void parse(::org::xml::sax::InputSource *);
-public: // actually package-private
-  virtual void parseStream(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
-  virtual ::java::lang::String * getURI(::java::lang::String *);
-private:
-  void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  ::java::io::InputStream * resolveEntity(::java::lang::String *, ::java::lang::String *);
-  void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void elementDecl(::java::lang::String *, ::java::lang::String *);
-  void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void setDocumentLocator(::java::lang::Object *, ::java::lang::Object *);
-  void startDocument(jboolean);
-  void endDocument();
-  void startElement(::java::lang::String *, JArray< ::java::lang::String * > *);
-  void endElement(::java::lang::String *);
-  void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  void endPrefixMapping(::java::lang::String *);
-  void characters(::java::lang::String *);
-  void ignorableWhitespace(::java::lang::String *);
-  void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  void comment(::java::lang::String *);
-  void cdataBlock(::java::lang::String *);
-  void warning(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void error(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void fatalError(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * FEATURES_PREFIX;
-  static ::java::util::List * RECOGNIZED_FEATURES;
-  static ::java::lang::String * PROPERTIES_PREFIX;
-  static ::java::util::List * RECOGNIZED_PROPERTIES;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) standalone;
-  jboolean namespaces;
-  jboolean namespacePrefixes;
-  jboolean validation;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::xml::sax::ext::DeclHandler * declarationHandler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  ::gnu::xml::libxmlj::sax::GnomeLocator * locator;
-  ::gnu::xml::libxmlj::sax::Namespaces * ns;
-  jboolean seenFatalError;
-  jboolean seenStartDocument;
-  ::java::lang::String * base;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_GnomeXMLReader__
diff --git a/libjava/gnu/xml/libxmlj/sax/Namespaces.h b/libjava/gnu/xml/libxmlj/sax/Namespaces.h
deleted file mode 100644
index bc4e872..0000000
--- a/libjava/gnu/xml/libxmlj/sax/Namespaces.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_Namespaces__
-#define __gnu_xml_libxmlj_sax_Namespaces__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class Namespaces;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::Namespaces : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Namespaces();
-  virtual void push();
-  virtual void pop();
-  virtual ::java::lang::String * getURI(::java::lang::String *);
-  virtual void define(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::Iterator * currentPrefixes();
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_Namespaces__
diff --git a/libjava/gnu/xml/libxmlj/sax/StringArrayAttributes.h b/libjava/gnu/xml/libxmlj/sax/StringArrayAttributes.h
deleted file mode 100644
index d015c9d..0000000
--- a/libjava/gnu/xml/libxmlj/sax/StringArrayAttributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_StringArrayAttributes__
-#define __gnu_xml_libxmlj_sax_StringArrayAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeXMLReader;
-            class StringArrayAttributes;
-            class XMLName;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::StringArrayAttributes : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StringArrayAttributes(::gnu::xml::libxmlj::sax::GnomeXMLReader *, JArray< ::java::lang::String * > *);
-public:
-  virtual jint getLength();
-  virtual ::java::lang::String * getURI(jint);
-  virtual ::java::lang::String * getLocalName(jint);
-  virtual ::java::lang::String * getQName(jint);
-  virtual ::java::lang::String * getType(jint);
-  virtual ::java::lang::String * getValue(jint);
-  virtual jint getIndex(::java::lang::String *, ::java::lang::String *);
-  virtual jint getIndex(::java::lang::String *);
-  virtual ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getType(::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) len;
-  JArray< ::gnu::xml::libxmlj::sax::XMLName * > * keys;
-  JArray< ::java::lang::String * > * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_StringArrayAttributes__
diff --git a/libjava/gnu/xml/libxmlj/sax/XMLName.h b/libjava/gnu/xml/libxmlj/sax/XMLName.h
deleted file mode 100644
index d76438a..0000000
--- a/libjava/gnu/xml/libxmlj/sax/XMLName.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_sax_XMLName__
-#define __gnu_xml_libxmlj_sax_XMLName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace sax
-        {
-            class GnomeXMLReader;
-            class XMLName;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::sax::XMLName : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLName(::gnu::xml::libxmlj::sax::GnomeXMLReader *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static ::java::lang::String * XML_URI;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-  ::java::lang::String * localName;
-  ::java::lang::String * qName;
-  ::java::lang::String * prefix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_sax_XMLName__
diff --git a/libjava/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.h b/libjava/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.h
deleted file mode 100644
index 823265f..0000000
--- a/libjava/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_transform_ErrorListenerErrorHandler__
-#define __gnu_xml_libxmlj_transform_ErrorListenerErrorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace transform
-        {
-            class ErrorListenerErrorHandler;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class TransformerException;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXException;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::transform::ErrorListenerErrorHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ErrorListenerErrorHandler(::javax::xml::transform::ErrorListener *);
-public:
-  virtual void warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-private:
-  ::org::xml::sax::SAXException * getSAXException(::javax::xml::transform::TransformerException *);
-  ::javax::xml::transform::ErrorListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_transform_ErrorListenerErrorHandler__
diff --git a/libjava/gnu/xml/libxmlj/transform/GnomeTransformer.h b/libjava/gnu/xml/libxmlj/transform/GnomeTransformer.h
deleted file mode 100644
index 0b197fa..0000000
--- a/libjava/gnu/xml/libxmlj/transform/GnomeTransformer.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_transform_GnomeTransformer__
-#define __gnu_xml_libxmlj_transform_GnomeTransformer__
-
-#pragma interface
-
-#include <javax/xml/transform/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace dom
-        {
-            class GnomeDocument;
-        }
-        namespace sax
-        {
-            class GnomeXMLReader;
-        }
-        namespace transform
-        {
-            class GnomeTransformer;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Result;
-          class Source;
-          class Transformer;
-          class URIResolver;
-        namespace sax
-        {
-            class SAXResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::transform::GnomeTransformer : public ::javax::xml::transform::Transformer
-{
-
-public: // actually package-private
-  GnomeTransformer(::javax::xml::transform::Source *, ::javax::xml::transform::URIResolver *, ::javax::xml::transform::ErrorListener *);
-private:
-  GnomeTransformer(::java::lang::Object *, ::javax::xml::transform::URIResolver *, ::javax::xml::transform::ErrorListener *, ::java::util::Map *, ::java::util::Properties *);
-  ::java::lang::Object * newStylesheet();
-  ::java::lang::Object * newStylesheetFromStream(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  ::java::lang::Object * newStylesheetFromDoc(::gnu::xml::libxmlj::dom::GnomeDocument *);
-public:
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual void clearParameters();
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual void setOutputProperties(::java::util::Properties *);
-  virtual void setOutputProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::Properties * getOutputProperties();
-  virtual ::java::lang::String * getOutputProperty(::java::lang::String *);
-  virtual ::javax::xml::transform::Transformer * newTransformer();
-  virtual void transform(::javax::xml::transform::Source *, ::javax::xml::transform::Result *);
-private:
-  ::gnu::xml::libxmlj::sax::GnomeXMLReader * getSAXContext(::javax::xml::transform::sax::SAXResult *);
-  void transformStreamToStream(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, ::java::io::OutputStream *);
-  ::gnu::xml::libxmlj::dom::GnomeDocument * transformStreamToDoc(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  void transformStreamToSAX(::java::io::InputStream *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, ::gnu::xml::libxmlj::sax::GnomeXMLReader *);
-  void transformDocToStream(::gnu::xml::libxmlj::dom::GnomeDocument *, ::java::io::OutputStream *);
-  ::gnu::xml::libxmlj::dom::GnomeDocument * transformDocToDoc(::gnu::xml::libxmlj::dom::GnomeDocument *);
-  void transformDocToSAX(::gnu::xml::libxmlj::dom::GnomeDocument *, ::gnu::xml::libxmlj::sax::GnomeXMLReader *);
-  JArray< ::java::lang::String * > * getParameterArray();
-public:
-  virtual void finalize();
-private:
-  void free();
-  ::java::io::InputStream * resolveEntity(::java::lang::String *, ::java::lang::String *);
-  void setDocumentLocator(::java::lang::Object *, ::java::lang::Object *);
-  void warning(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void error(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  void fatalError(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *);
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) parameters;
-  ::java::util::Properties * outputProperties;
-  ::javax::xml::transform::URIResolver * resolver;
-  ::javax::xml::transform::ErrorListener * errorListener;
-  ::java::lang::Object * stylesheet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_transform_GnomeTransformer__
diff --git a/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.h b/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.h
deleted file mode 100644
index 6afbf3f..0000000
--- a/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_transform_GnomeTransformerFactory$AssociatedStylesheetHandler__
-#define __gnu_xml_libxmlj_transform_GnomeTransformerFactory$AssociatedStylesheetHandler__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/DefaultHandler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace transform
-        {
-            class GnomeTransformerFactory;
-            class GnomeTransformerFactory$AssociatedStylesheetHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::transform::GnomeTransformerFactory$AssociatedStylesheetHandler : public ::org::xml::sax::helpers::DefaultHandler
-{
-
-public: // actually package-private
-  GnomeTransformerFactory$AssociatedStylesheetHandler(::gnu::xml::libxmlj::transform::GnomeTransformerFactory *);
-public:
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::DefaultHandler)))) media;
-  ::java::lang::String * title;
-  ::java::lang::String * href;
-  ::gnu::xml::libxmlj::transform::GnomeTransformerFactory * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_transform_GnomeTransformerFactory$AssociatedStylesheetHandler__
diff --git a/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory.h b/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory.h
deleted file mode 100644
index b34706e..0000000
--- a/libjava/gnu/xml/libxmlj/transform/GnomeTransformerFactory.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_transform_GnomeTransformerFactory__
-#define __gnu_xml_libxmlj_transform_GnomeTransformerFactory__
-
-#pragma interface
-
-#include <javax/xml/transform/TransformerFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace transform
-        {
-            class GnomeTransformerFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class Templates;
-          class Transformer;
-          class URIResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::transform::GnomeTransformerFactory : public ::javax::xml::transform::TransformerFactory
-{
-
-public:
-  GnomeTransformerFactory();
-  virtual ::javax::xml::transform::Source * getAssociatedStylesheet(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  ::org::xml::sax::XMLReader * createXMLReader();
-public: // actually package-private
-  virtual ::java::lang::String * parseParameter(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::javax::xml::transform::Transformer * newTransformer();
-  virtual ::javax::xml::transform::Transformer * newTransformer(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::Templates * newTemplates(::javax::xml::transform::Source *);
-  static void freeLibxsltGlobal();
-private:
-  ::javax::xml::transform::URIResolver * __attribute__((aligned(__alignof__( ::javax::xml::transform::TransformerFactory)))) uriResolver;
-  ::javax::xml::transform::ErrorListener * errorListener;
-  ::java::util::Map * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_transform_GnomeTransformerFactory__
diff --git a/libjava/gnu/xml/libxmlj/transform/URIResolverEntityResolver.h b/libjava/gnu/xml/libxmlj/transform/URIResolverEntityResolver.h
deleted file mode 100644
index 88df983..0000000
--- a/libjava/gnu/xml/libxmlj/transform/URIResolverEntityResolver.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_transform_URIResolverEntityResolver__
-#define __gnu_xml_libxmlj_transform_URIResolverEntityResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace transform
-        {
-            class URIResolverEntityResolver;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class URIResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::transform::URIResolverEntityResolver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URIResolverEntityResolver(::javax::xml::transform::URIResolver *);
-public:
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *);
-private:
-  ::javax::xml::transform::URIResolver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_transform_URIResolverEntityResolver__
diff --git a/libjava/gnu/xml/libxmlj/util/EmptyNodeList.h b/libjava/gnu/xml/libxmlj/util/EmptyNodeList.h
deleted file mode 100644
index 2bde43e..0000000
--- a/libjava/gnu/xml/libxmlj/util/EmptyNodeList.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_EmptyNodeList__
-#define __gnu_xml_libxmlj_util_EmptyNodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class EmptyNodeList;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::EmptyNodeList : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EmptyNodeList();
-public:
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_EmptyNodeList__
diff --git a/libjava/gnu/xml/libxmlj/util/NamedInputStream.h b/libjava/gnu/xml/libxmlj/util/NamedInputStream.h
deleted file mode 100644
index f0b3a6280..0000000
--- a/libjava/gnu/xml/libxmlj/util/NamedInputStream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_NamedInputStream__
-#define __gnu_xml_libxmlj_util_NamedInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class NamedInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::NamedInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  NamedInputStream(::java::lang::String *, ::java::io::InputStream *, jint);
-public:
-  virtual ::java::lang::String * getName();
-  virtual JArray< jbyte > * getDetectBuffer();
-private:
-  static jint DETECT_BUFFER_SIZE;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_NamedInputStream__
diff --git a/libjava/gnu/xml/libxmlj/util/StandaloneDocumentType.h b/libjava/gnu/xml/libxmlj/util/StandaloneDocumentType.h
deleted file mode 100644
index 1ac77d3..0000000
--- a/libjava/gnu/xml/libxmlj/util/StandaloneDocumentType.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_StandaloneDocumentType__
-#define __gnu_xml_libxmlj_util_StandaloneDocumentType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class StandaloneDocumentType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::StandaloneDocumentType : public ::java::lang::Object
-{
-
-public:
-  StandaloneDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getName();
-  ::org::w3c::dom::NamedNodeMap * getEntities();
-  ::org::w3c::dom::NamedNodeMap * getNotations();
-  ::java::lang::String * getPublicId();
-  ::java::lang::String * getSystemId();
-  ::java::lang::String * getInternalSubset();
-  ::java::lang::String * getNodeName();
-  ::java::lang::String * getNodeValue();
-  void setNodeValue(::java::lang::String *);
-  jshort getNodeType();
-  ::org::w3c::dom::Node * getParentNode();
-  ::org::w3c::dom::NodeList * getChildNodes();
-  ::org::w3c::dom::Node * getFirstChild();
-  ::org::w3c::dom::Node * getLastChild();
-  ::org::w3c::dom::Node * getPreviousSibling();
-  ::org::w3c::dom::Node * getNextSibling();
-  ::org::w3c::dom::NamedNodeMap * getAttributes();
-  ::org::w3c::dom::Document * getOwnerDocument();
-  ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *);
-  ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-  jboolean hasChildNodes();
-  ::org::w3c::dom::Node * cloneNode(jboolean);
-  void normalize();
-  jboolean isSupported(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getNamespaceURI();
-  ::java::lang::String * getPrefix();
-  void setPrefix(::java::lang::String *);
-  ::java::lang::String * getLocalName();
-  jboolean hasAttributes();
-  ::java::lang::String * getBaseURI();
-  jshort compareDocumentPosition(::org::w3c::dom::Node *);
-  ::java::lang::String * getTextContent();
-  void setTextContent(::java::lang::String *);
-  jboolean isSameNode(::org::w3c::dom::Node *);
-  ::java::lang::String * lookupPrefix(::java::lang::String *);
-  jboolean isDefaultNamespace(::java::lang::String *);
-  ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  jboolean isEqualNode(::org::w3c::dom::Node *);
-  ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *);
-  ::java::lang::Object * getUserData(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_StandaloneDocumentType__
diff --git a/libjava/gnu/xml/libxmlj/util/StandaloneLocator.h b/libjava/gnu/xml/libxmlj/util/StandaloneLocator.h
deleted file mode 100644
index 77f3028..0000000
--- a/libjava/gnu/xml/libxmlj/util/StandaloneLocator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_StandaloneLocator__
-#define __gnu_xml_libxmlj_util_StandaloneLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class StandaloneLocator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::StandaloneLocator : public ::java::lang::Object
-{
-
-public:
-  StandaloneLocator(jint, jint, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getPublicId();
-  ::java::lang::String * getSystemId();
-  jint getLineNumber();
-  jint getColumnNumber();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) lineNumber;
-  jint columnNumber;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_StandaloneLocator__
diff --git a/libjava/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.h b/libjava/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.h
deleted file mode 100644
index c0ea02f..0000000
--- a/libjava/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_XMLJ$XMLJShutdownHook__
-#define __gnu_xml_libxmlj_util_XMLJ$XMLJShutdownHook__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class XMLJ$XMLJShutdownHook;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::XMLJ$XMLJShutdownHook : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLJ$XMLJShutdownHook();
-public:
-  virtual void run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_XMLJ$XMLJShutdownHook__
diff --git a/libjava/gnu/xml/libxmlj/util/XMLJ.h b/libjava/gnu/xml/libxmlj/util/XMLJ.h
deleted file mode 100644
index d12e7aa..0000000
--- a/libjava/gnu/xml/libxmlj/util/XMLJ.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_libxmlj_util_XMLJ__
-#define __gnu_xml_libxmlj_util_XMLJ__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace libxmlj
-      {
-        namespace util
-        {
-            class NamedInputStream;
-            class XMLJ;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Source;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::libxmlj::util::XMLJ : public ::java::lang::Object
-{
-
-public:
-  XMLJ();
-  static void init();
-  static ::gnu::xml::libxmlj::util::NamedInputStream * getInputStream(::org::xml::sax::InputSource *);
-  static ::gnu::xml::libxmlj::util::NamedInputStream * getInputStream(::javax::xml::transform::Source *);
-private:
-  static ::java::io::InputStream * getInputStream(::java::lang::String *);
-public:
-  static ::gnu::xml::libxmlj::util::NamedInputStream * getInputStream(::java::net::URL *);
-public: // actually package-private
-  static ::gnu::xml::libxmlj::util::NamedInputStream * xmljGetInputStream(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::io::OutputStream * getOutputStream(::javax::xml::transform::Result *);
-  static ::java::lang::String * getAbsoluteURI(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * getBaseURI(::java::lang::String *);
-private:
-  static jboolean initialised;
-  static const jint LOOKAHEAD = 50;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_libxmlj_util_XMLJ__
diff --git a/libjava/gnu/xml/pipeline/CallFilter$Requestor.h b/libjava/gnu/xml/pipeline/CallFilter$Requestor.h
deleted file mode 100644
index 131c1cc..0000000
--- a/libjava/gnu/xml/pipeline/CallFilter$Requestor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_CallFilter$Requestor__
-#define __gnu_xml_pipeline_CallFilter$Requestor__
-
-#pragma interface
-
-#include <gnu/xml/util/XMLWriter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class CallFilter;
-          class CallFilter$Requestor;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::CallFilter$Requestor : public ::gnu::xml::util::XMLWriter
-{
-
-public: // actually package-private
-  CallFilter$Requestor(::gnu::xml::pipeline::CallFilter *);
-public:
-  void startDocument();
-  void endDocument();
-public: // actually package-private
-  ::gnu::xml::pipeline::CallFilter * __attribute__((aligned(__alignof__( ::gnu::xml::util::XMLWriter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_CallFilter$Requestor__
diff --git a/libjava/gnu/xml/pipeline/CallFilter.h b/libjava/gnu/xml/pipeline/CallFilter.h
deleted file mode 100644
index 71ab028..0000000
--- a/libjava/gnu/xml/pipeline/CallFilter.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_CallFilter__
-#define __gnu_xml_pipeline_CallFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class CallFilter;
-          class CallFilter$Requestor;
-          class EventConsumer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::CallFilter : public ::java::lang::Object
-{
-
-public:
-  CallFilter(::java::lang::String *, ::gnu::xml::pipeline::EventConsumer *);
-  void setCallTarget(::java::lang::String *);
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::java::lang::String * getCallTarget();
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  ::org::xml::sax::DTDHandler * getDTDHandler();
-  ::java::lang::Object * getProperty(::java::lang::String *);
-public: // actually package-private
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  static ::java::net::URLConnection * access$0(::gnu::xml::pipeline::CallFilter *);
-  static ::java::net::URL * access$1(::gnu::xml::pipeline::CallFilter *);
-  static void access$2(::gnu::xml::pipeline::CallFilter *, ::java::net::URLConnection *);
-  static ::gnu::xml::pipeline::EventConsumer * access$3(::gnu::xml::pipeline::CallFilter *);
-private:
-  ::gnu::xml::pipeline::CallFilter$Requestor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) req;
-  ::gnu::xml::pipeline::EventConsumer * next;
-  ::java::net::URL * target;
-  ::java::net::URLConnection * conn;
-  ::org::xml::sax::ErrorHandler * errHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_CallFilter__
diff --git a/libjava/gnu/xml/pipeline/DomConsumer$Handler.h b/libjava/gnu/xml/pipeline/DomConsumer$Handler.h
deleted file mode 100644
index 4ba4fc6..0000000
--- a/libjava/gnu/xml/pipeline/DomConsumer$Handler.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_DomConsumer$Handler__
-#define __gnu_xml_pipeline_DomConsumer$Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class DomConsumer;
-          class DomConsumer$Handler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-          class Element;
-          class Node;
-          class Text;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-        namespace helpers
-        {
-            class AttributesImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::DomConsumer$Handler : public ::java::lang::Object
-{
-
-public: // actually protected
-  DomConsumer$Handler(::gnu::xml::pipeline::DomConsumer *);
-private:
-  void fatal(::java::lang::String *, ::java::lang::Exception *);
-public: // actually package-private
-  virtual ::org::w3c::dom::Document * clearDocument();
-public: // actually protected
-  virtual ::org::w3c::dom::Document * getDocument();
-  virtual ::org::w3c::dom::Node * getTop();
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  virtual ::org::w3c::dom::Text * createText(jboolean, JArray< jchar > *, jint, jint);
-public:
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void skippedEntity(::java::lang::String *);
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-private:
-  void populateAttributes(::org::w3c::dom::Element *, ::org::xml::sax::Attributes *);
-  ::java::lang::String * getPrefix(::java::lang::String *);
-  ::java::lang::String * getNamespace(::java::lang::String *, ::org::xml::sax::Attributes *);
-public:
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void startCDATA();
-  virtual void endCDATA();
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void comment(JArray< jchar > *, jint, jint);
-  virtual jboolean canPopulateEntityRefs();
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  void namespaceError(::java::lang::String *);
-public: // actually protected
-  ::gnu::xml::pipeline::DomConsumer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumer;
-private:
-  ::org::w3c::dom::DOMImplementation * impl;
-  ::org::w3c::dom::Document * document;
-  jboolean isL2;
-  ::org::xml::sax::Locator * locator;
-  ::org::w3c::dom::Node * top;
-  jboolean inCDATA;
-  jboolean mergeCDATA;
-  jboolean inDTD;
-  ::java::lang::String * currentEntity;
-  jboolean recreatedAttrs;
-  ::org::xml::sax::helpers::AttributesImpl * attributes;
-public: // actually package-private
-  static ::java::lang::String * xmlnsURI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_DomConsumer$Handler__
diff --git a/libjava/gnu/xml/pipeline/DomConsumer.h b/libjava/gnu/xml/pipeline/DomConsumer.h
deleted file mode 100644
index b70ca18..0000000
--- a/libjava/gnu/xml/pipeline/DomConsumer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_DomConsumer__
-#define __gnu_xml_pipeline_DomConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class DomConsumer;
-          class DomConsumer$Handler;
-          class EventConsumer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::DomConsumer : public ::java::lang::Object
-{
-
-public:
-  DomConsumer(::java::lang::Class *);
-public: // actually protected
-  virtual void setHandler(::gnu::xml::pipeline::DomConsumer$Handler *);
-private:
-  ::org::w3c::dom::Document * emptyDocument();
-public:
-  DomConsumer(::java::lang::Class *, ::gnu::xml::pipeline::EventConsumer *);
-  virtual ::org::w3c::dom::Document * getDocument();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual jboolean isHidingReferences();
-  virtual void setHidingReferences(jboolean);
-  virtual jboolean isHidingComments();
-  virtual void setHidingComments(jboolean);
-  virtual jboolean isHidingWhitespace();
-  virtual void setHidingWhitespace(jboolean);
-  virtual jboolean isHidingCDATA();
-  virtual void setHidingCDATA(jboolean);
-  virtual ::org::xml::sax::ContentHandler * getContentHandler();
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-public: // actually package-private
-  virtual ::gnu::xml::pipeline::EventConsumer * getNext();
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  static ::org::w3c::dom::Document * access$0(::gnu::xml::pipeline::DomConsumer *);
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) domImpl;
-  jboolean hidingCDATA;
-  jboolean hidingComments;
-  jboolean hidingWhitespace;
-  jboolean hidingReferences;
-  ::gnu::xml::pipeline::DomConsumer$Handler * handler;
-  ::org::xml::sax::ErrorHandler * errHandler;
-  ::gnu::xml::pipeline::EventConsumer * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_DomConsumer__
diff --git a/libjava/gnu/xml/pipeline/EventConsumer.h b/libjava/gnu/xml/pipeline/EventConsumer.h
deleted file mode 100644
index ad9d15a..0000000
--- a/libjava/gnu/xml/pipeline/EventConsumer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_EventConsumer__
-#define __gnu_xml_pipeline_EventConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::EventConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::xml::sax::ContentHandler * getContentHandler() = 0;
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_xml_pipeline_EventConsumer__
diff --git a/libjava/gnu/xml/pipeline/EventFilter.h b/libjava/gnu/xml/pipeline/EventFilter.h
deleted file mode 100644
index 8895017..0000000
--- a/libjava/gnu/xml/pipeline/EventFilter.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_EventFilter__
-#define __gnu_xml_pipeline_EventFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class EventFilter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class DTDHandler;
-          class ErrorHandler;
-          class Locator;
-          class XMLReader;
-        namespace ext
-        {
-            class DeclHandler;
-            class LexicalHandler;
-        }
-        namespace helpers
-        {
-            class XMLFilterImpl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::EventFilter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static ::java::lang::ClassLoader * getClassLoader();
-  static ::java::lang::Class * loadClass(::java::lang::ClassLoader *, ::java::lang::String *);
-private:
-  static void loadClasses();
-public:
-  static void bind(::org::xml::sax::XMLReader *, ::gnu::xml::pipeline::EventConsumer *);
-  EventFilter();
-  EventFilter(::gnu::xml::pipeline::EventConsumer *);
-  virtual void chainTo(::org::xml::sax::helpers::XMLFilterImpl *);
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual ::gnu::xml::pipeline::EventConsumer * getNext();
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *);
-  virtual ::org::xml::sax::ContentHandler * getContentHandler();
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *);
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler();
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::org::xml::sax::Locator * getDocumentLocator();
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void skippedEntity(::java::lang::String *);
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void endDocument();
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void comment(JArray< jchar > *, jint, jint);
-  virtual void startCDATA();
-  virtual void endCDATA();
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-private:
-  ::org::xml::sax::ContentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) docHandler;
-  ::org::xml::sax::ContentHandler * docNext;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::DTDHandler * dtdNext;
-  ::org::xml::sax::ext::LexicalHandler * lexHandler;
-  ::org::xml::sax::ext::LexicalHandler * lexNext;
-  ::org::xml::sax::ext::DeclHandler * declHandler;
-  ::org::xml::sax::ext::DeclHandler * declNext;
-  ::org::xml::sax::Locator * locator;
-  ::gnu::xml::pipeline::EventConsumer * next;
-  ::org::xml::sax::ErrorHandler * errHandler;
-public:
-  static ::java::lang::String * FEATURE_URI;
-  static ::java::lang::String * PROPERTY_URI;
-  static ::java::lang::String * DECL_HANDLER;
-  static ::java::lang::String * LEXICAL_HANDLER;
-private:
-  static jboolean loaded;
-  static ::java::lang::Class * nsClass;
-  static ::java::lang::Class * validClass;
-  static ::java::lang::Class * wfClass;
-  static ::java::lang::Class * xincClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_EventFilter__
diff --git a/libjava/gnu/xml/pipeline/LinkFilter.h b/libjava/gnu/xml/pipeline/LinkFilter.h
deleted file mode 100644
index 8de1d85..0000000
--- a/libjava/gnu/xml/pipeline/LinkFilter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_LinkFilter__
-#define __gnu_xml_pipeline_LinkFilter__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class LinkFilter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::LinkFilter : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  LinkFilter();
-  LinkFilter(::gnu::xml::pipeline::EventConsumer *);
-  virtual ::java::util::Enumeration * getLinks();
-  virtual void removeAllLinks();
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-private:
-  ::java::lang::String * maybeAddLink(::java::lang::String *);
-public:
-  virtual void startDocument();
-  virtual void endDocument();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) vector;
-  ::java::lang::String * baseURI;
-  jboolean siteRestricted;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_LinkFilter__
diff --git a/libjava/gnu/xml/pipeline/NSFilter.h b/libjava/gnu/xml/pipeline/NSFilter.h
deleted file mode 100644
index f38a80d..0000000
--- a/libjava/gnu/xml/pipeline/NSFilter.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_NSFilter__
-#define __gnu_xml_pipeline_NSFilter__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class NSFilter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-        namespace helpers
-        {
-            class AttributesImpl;
-            class NamespaceSupport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::NSFilter : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  NSFilter(::gnu::xml::pipeline::EventConsumer *);
-private:
-  void fatalError(::java::lang::String *);
-public:
-  virtual void startDocument();
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::lang::String * fixName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void endDocument();
-private:
-  ::org::xml::sax::helpers::NamespaceSupport * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) nsStack;
-  ::java::util::Stack * elementStack;
-  jboolean pushedContext;
-  JArray< ::java::lang::String * > * nsTemp;
-  ::org::xml::sax::helpers::AttributesImpl * attributes;
-  jboolean usedDefault;
-  static ::java::lang::String * prefixRoot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_NSFilter__
diff --git a/libjava/gnu/xml/pipeline/PipelineFactory$Pipeline.h b/libjava/gnu/xml/pipeline/PipelineFactory$Pipeline.h
deleted file mode 100644
index 13d9995..0000000
--- a/libjava/gnu/xml/pipeline/PipelineFactory$Pipeline.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_PipelineFactory$Pipeline__
-#define __gnu_xml_pipeline_PipelineFactory$Pipeline__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class PipelineFactory$Pipeline;
-          class PipelineFactory$Stage;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::PipelineFactory$Pipeline : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PipelineFactory$Pipeline(::gnu::xml::pipeline::PipelineFactory$Stage *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual ::gnu::xml::pipeline::EventConsumer * createPipeline();
-  ::gnu::xml::pipeline::PipelineFactory$Stage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stage;
-  ::gnu::xml::pipeline::PipelineFactory$Pipeline * rest;
-  ::gnu::xml::pipeline::EventConsumer * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_PipelineFactory$Pipeline__
diff --git a/libjava/gnu/xml/pipeline/PipelineFactory$Stage.h b/libjava/gnu/xml/pipeline/PipelineFactory$Stage.h
deleted file mode 100644
index 07a8787..0000000
--- a/libjava/gnu/xml/pipeline/PipelineFactory$Stage.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_PipelineFactory$Stage__
-#define __gnu_xml_pipeline_PipelineFactory$Stage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class PipelineFactory$Pipeline;
-          class PipelineFactory$Stage;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::PipelineFactory$Stage : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PipelineFactory$Stage(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  void fail(::java::lang::String *);
-public: // actually package-private
-  virtual ::gnu::xml::pipeline::EventConsumer * createStage(::gnu::xml::pipeline::EventConsumer *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::gnu::xml::pipeline::PipelineFactory$Pipeline * param;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_PipelineFactory$Stage__
diff --git a/libjava/gnu/xml/pipeline/PipelineFactory.h b/libjava/gnu/xml/pipeline/PipelineFactory.h
deleted file mode 100644
index 57feff2..0000000
--- a/libjava/gnu/xml/pipeline/PipelineFactory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_PipelineFactory__
-#define __gnu_xml_pipeline_PipelineFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class PipelineFactory;
-          class PipelineFactory$Pipeline;
-          class PipelineFactory$Stage;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::PipelineFactory : public ::java::lang::Object
-{
-
-public:
-  static ::gnu::xml::pipeline::EventConsumer * createPipeline(::java::lang::String *);
-  static ::gnu::xml::pipeline::EventConsumer * createPipeline(::java::lang::String *, ::gnu::xml::pipeline::EventConsumer *);
-private:
-  PipelineFactory();
-public:
-  static ::gnu::xml::pipeline::EventConsumer * createPipeline(JArray< ::java::lang::String * > *, ::gnu::xml::pipeline::EventConsumer *);
-private:
-  ::gnu::xml::pipeline::PipelineFactory$Pipeline * parsePipeline(JArray< ::java::lang::String * > *, ::gnu::xml::pipeline::EventConsumer *);
-  ::gnu::xml::pipeline::PipelineFactory$Pipeline * parsePipeline(::gnu::xml::pipeline::EventConsumer *);
-  ::gnu::xml::pipeline::PipelineFactory$Stage * parseStage();
-public: // actually package-private
-  static JArray< JArray< ::java::lang::String * > * > * access$0();
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tokens;
-  jint index;
-  static JArray< JArray< ::java::lang::String * > * > * builtinStages;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_PipelineFactory__
diff --git a/libjava/gnu/xml/pipeline/TeeConsumer.h b/libjava/gnu/xml/pipeline/TeeConsumer.h
deleted file mode 100644
index 685c360..0000000
--- a/libjava/gnu/xml/pipeline/TeeConsumer.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_TeeConsumer__
-#define __gnu_xml_pipeline_TeeConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class TeeConsumer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class DTDHandler;
-          class ErrorHandler;
-          class Locator;
-        namespace ext
-        {
-            class DeclHandler;
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::TeeConsumer : public ::java::lang::Object
-{
-
-public:
-  TeeConsumer(::gnu::xml::pipeline::EventConsumer *, ::gnu::xml::pipeline::EventConsumer *);
-  ::gnu::xml::pipeline::EventConsumer * getFirst();
-  ::gnu::xml::pipeline::EventConsumer * getRest();
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  ::org::xml::sax::DTDHandler * getDTDHandler();
-  ::java::lang::Object * getProperty(::java::lang::String *);
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  void setDocumentLocator(::org::xml::sax::Locator *);
-  void startDocument();
-  void endDocument();
-  void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  void endPrefixMapping(::java::lang::String *);
-  void skippedEntity(::java::lang::String *);
-  void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  void characters(JArray< jchar > *, jint, jint);
-  void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void elementDecl(::java::lang::String *, ::java::lang::String *);
-  void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  void comment(JArray< jchar > *, jint, jint);
-  void startCDATA();
-  void endCDATA();
-  void startEntity(::java::lang::String *);
-  void endEntity(::java::lang::String *);
-  void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDTD();
-private:
-  ::gnu::xml::pipeline::EventConsumer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) first;
-  ::gnu::xml::pipeline::EventConsumer * rest;
-  ::org::xml::sax::ContentHandler * docFirst;
-  ::org::xml::sax::ContentHandler * docRest;
-  ::org::xml::sax::ext::DeclHandler * declFirst;
-  ::org::xml::sax::ext::DeclHandler * declRest;
-  ::org::xml::sax::ext::LexicalHandler * lexFirst;
-  ::org::xml::sax::ext::LexicalHandler * lexRest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_TeeConsumer__
diff --git a/libjava/gnu/xml/pipeline/TextConsumer.h b/libjava/gnu/xml/pipeline/TextConsumer.h
deleted file mode 100644
index 650e751..0000000
--- a/libjava/gnu/xml/pipeline/TextConsumer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_TextConsumer__
-#define __gnu_xml_pipeline_TextConsumer__
-
-#pragma interface
-
-#include <gnu/xml/util/XMLWriter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class TextConsumer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::TextConsumer : public ::gnu::xml::util::XMLWriter
-{
-
-public:
-  TextConsumer(::java::io::Writer *, jboolean);
-  TextConsumer(::java::io::Writer *);
-  TextConsumer(::java::io::OutputStream *);
-  virtual ::org::xml::sax::ContentHandler * getContentHandler();
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_TextConsumer__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.h b/libjava/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.h
deleted file mode 100644
index 6c69d31..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$AttributeInfo__
-#define __gnu_xml_pipeline_ValidationConsumer$AttributeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer$AttributeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$AttributeInfo : public ::java::lang::Object
-{
-
-  ValidationConsumer$AttributeInfo();
-public: // actually package-private
-  ValidationConsumer$AttributeInfo(::gnu::xml::pipeline::ValidationConsumer$AttributeInfo *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * mode;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$AttributeInfo__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.h b/libjava/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.h
deleted file mode 100644
index 711b528..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$ChildrenRecognizer__
-#define __gnu_xml_pipeline_ValidationConsumer$ChildrenRecognizer__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/ValidationConsumer$Recognizer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer;
-          class ValidationConsumer$ChildrenRecognizer;
-          class ValidationConsumer$ElementInfo;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$ChildrenRecognizer : public ::gnu::xml::pipeline::ValidationConsumer$Recognizer
-{
-
-  void copyIn(::gnu::xml::pipeline::ValidationConsumer$ChildrenRecognizer *);
-public:
-  ValidationConsumer$ChildrenRecognizer(::gnu::xml::pipeline::ValidationConsumer$ElementInfo *, ::gnu::xml::pipeline::ValidationConsumer *);
-private:
-  ValidationConsumer$ChildrenRecognizer(::gnu::xml::pipeline::ValidationConsumer *, ::gnu::xml::pipeline::ValidationConsumer$ElementInfo *);
-  ::gnu::xml::pipeline::ValidationConsumer$ChildrenRecognizer * shallowClone();
-  ::gnu::xml::pipeline::ValidationConsumer$ChildrenRecognizer * deepClone();
-  ::gnu::xml::pipeline::ValidationConsumer$ChildrenRecognizer * deepClone(::java::util::Hashtable *);
-  void patchNext(::gnu::xml::pipeline::ValidationConsumer$Recognizer *, ::java::util::Hashtable *);
-  jint populate(JArray< jchar > *, jint);
-public: // actually package-private
-  jboolean acceptCharacters();
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * acceptElement(::java::lang::String *);
-  jboolean completed();
-private:
-  ::gnu::xml::pipeline::ValidationConsumer * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::ValidationConsumer$Recognizer)))) consumer;
-  JArray< ::gnu::xml::pipeline::ValidationConsumer$Recognizer * > * components;
-  ::java::lang::String * name;
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * next;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$ChildrenRecognizer__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$ElementInfo.h b/libjava/gnu/xml/pipeline/ValidationConsumer$ElementInfo.h
deleted file mode 100644
index d15097f..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$ElementInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$ElementInfo__
-#define __gnu_xml_pipeline_ValidationConsumer$ElementInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer;
-          class ValidationConsumer$ElementInfo;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$ElementInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ValidationConsumer$ElementInfo(::java::lang::String *);
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * getRecognizer(::gnu::xml::pipeline::ValidationConsumer *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * model;
-  ::java::util::Hashtable * attributes;
-private:
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * recognizer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$ElementInfo__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.h b/libjava/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.h
deleted file mode 100644
index eaabd00..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$EmptyRecognizer__
-#define __gnu_xml_pipeline_ValidationConsumer$EmptyRecognizer__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/ValidationConsumer$Recognizer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer$ElementInfo;
-          class ValidationConsumer$EmptyRecognizer;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$EmptyRecognizer : public ::gnu::xml::pipeline::ValidationConsumer$Recognizer
-{
-
-public:
-  ValidationConsumer$EmptyRecognizer(::gnu::xml::pipeline::ValidationConsumer$ElementInfo *);
-public: // actually package-private
-  jboolean acceptCharacters();
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * acceptElement(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$EmptyRecognizer__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.h b/libjava/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.h
deleted file mode 100644
index b628740..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$MixedRecognizer__
-#define __gnu_xml_pipeline_ValidationConsumer$MixedRecognizer__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/ValidationConsumer$Recognizer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer;
-          class ValidationConsumer$ElementInfo;
-          class ValidationConsumer$MixedRecognizer;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$MixedRecognizer : public ::gnu::xml::pipeline::ValidationConsumer$Recognizer
-{
-
-public:
-  ValidationConsumer$MixedRecognizer(::gnu::xml::pipeline::ValidationConsumer$ElementInfo *, ::gnu::xml::pipeline::ValidationConsumer *);
-public: // actually package-private
-  ::gnu::xml::pipeline::ValidationConsumer$Recognizer * acceptElement(::java::lang::String *);
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::ValidationConsumer$Recognizer)))) permitted;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$MixedRecognizer__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer$Recognizer.h b/libjava/gnu/xml/pipeline/ValidationConsumer$Recognizer.h
deleted file mode 100644
index 087576c..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer$Recognizer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer$Recognizer__
-#define __gnu_xml_pipeline_ValidationConsumer$Recognizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class ValidationConsumer$ElementInfo;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer$Recognizer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ValidationConsumer$Recognizer(::gnu::xml::pipeline::ValidationConsumer$ElementInfo *);
-  virtual jboolean acceptCharacters();
-  virtual ::gnu::xml::pipeline::ValidationConsumer$Recognizer * acceptElement(::java::lang::String *);
-  virtual jboolean completed();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::pipeline::ValidationConsumer$ElementInfo * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer$Recognizer__
diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer.h b/libjava/gnu/xml/pipeline/ValidationConsumer.h
deleted file mode 100644
index b08d025..0000000
--- a/libjava/gnu/xml/pipeline/ValidationConsumer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_ValidationConsumer__
-#define __gnu_xml_pipeline_ValidationConsumer__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class ValidationConsumer;
-          class ValidationConsumer$Recognizer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class EntityResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::ValidationConsumer : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  ValidationConsumer();
-  ValidationConsumer(::gnu::xml::pipeline::EventConsumer *);
-  ValidationConsumer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::EntityResolver *, ::java::lang::String *);
-private:
-  void resetState();
-  void warning(::java::lang::String *);
-  void error(::java::lang::String *);
-  void fatalError(::java::lang::String *);
-  static jboolean isExtender(jchar);
-  jboolean isName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  jboolean isNmtoken(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void checkEnumeration(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static jboolean hasMatch(::java::lang::String *, ::java::lang::String *);
-public:
-  void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDTD();
-  void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void elementDecl(::java::lang::String *, ::java::lang::String *);
-  void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-  void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void startDocument();
-private:
-  static jboolean isAsciiLetter(jchar);
-public:
-  void skippedEntity(::java::lang::String *);
-private:
-  ::java::lang::String * expandDefaultRefs(::java::lang::String *);
-public:
-  void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  void characters(JArray< jchar > *, jint, jint);
-  void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDocument();
-public: // actually package-private
-  static ::gnu::xml::pipeline::ValidationConsumer$Recognizer * access$0();
-  static void access$1(::gnu::xml::pipeline::ValidationConsumer *, ::java::lang::String *);
-private:
-  static const jboolean warnNonDeterministic = 0;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) rootName;
-  ::java::util::Stack * contentStack;
-  jboolean disableDeclarations;
-  jboolean disableReset;
-  ::java::util::Hashtable * elements;
-  ::java::util::Hashtable * ids;
-  ::java::util::Vector * notations;
-  ::java::util::Vector * nDeferred;
-  ::java::util::Vector * unparsed;
-  ::java::util::Vector * uDeferred;
-  static ::java::lang::String * fakeRootName;
-public: // actually package-private
-  static JArray< ::java::lang::String * > * types;
-private:
-  static ::gnu::xml::pipeline::ValidationConsumer$Recognizer * ANY;
-  static const jint F_LOOPHEAD = 1;
-  static const jint F_LOOPNEXT = 2;
-  static jint nodeCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_ValidationConsumer__
diff --git a/libjava/gnu/xml/pipeline/WellFormednessFilter.h b/libjava/gnu/xml/pipeline/WellFormednessFilter.h
deleted file mode 100644
index 2b97d47..0000000
--- a/libjava/gnu/xml/pipeline/WellFormednessFilter.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_WellFormednessFilter__
-#define __gnu_xml_pipeline_WellFormednessFilter__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class WellFormednessFilter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::WellFormednessFilter : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  WellFormednessFilter();
-  WellFormednessFilter(::gnu::xml::pipeline::EventConsumer *);
-  void reset();
-private:
-  ::org::xml::sax::SAXParseException * getException(::java::lang::String *);
-  void fatalError(::java::lang::String *);
-public:
-  void setDocumentLocator(::org::xml::sax::Locator *);
-  void startDocument();
-  void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDocument();
-  void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void endDTD();
-  void characters(JArray< jchar > *, jint, jint);
-  void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  void comment(JArray< jchar > *, jint, jint);
-  void startCDATA();
-  void endCDATA();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) startedDoc;
-  ::java::util::Stack * elementStack;
-  jboolean startedCDATA;
-  ::java::lang::String * dtdState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_WellFormednessFilter__
diff --git a/libjava/gnu/xml/pipeline/XIncludeFilter$Scrubber.h b/libjava/gnu/xml/pipeline/XIncludeFilter$Scrubber.h
deleted file mode 100644
index 114756e..0000000
--- a/libjava/gnu/xml/pipeline/XIncludeFilter$Scrubber.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_XIncludeFilter$Scrubber__
-#define __gnu_xml_pipeline_XIncludeFilter$Scrubber__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventFilter;
-          class XIncludeFilter;
-          class XIncludeFilter$Scrubber;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::XIncludeFilter$Scrubber : public ::gnu::xml::pipeline::EventFilter
-{
-
-public: // actually package-private
-  XIncludeFilter$Scrubber(::gnu::xml::pipeline::XIncludeFilter *, ::gnu::xml::pipeline::EventFilter *);
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-private:
-  void reject(::java::lang::String *);
-public:
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void skippedEntity(::java::lang::String *);
-public: // actually package-private
-  ::gnu::xml::pipeline::XIncludeFilter * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_XIncludeFilter$Scrubber__
diff --git a/libjava/gnu/xml/pipeline/XIncludeFilter.h b/libjava/gnu/xml/pipeline/XIncludeFilter.h
deleted file mode 100644
index 21321af..0000000
--- a/libjava/gnu/xml/pipeline/XIncludeFilter.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_XIncludeFilter__
-#define __gnu_xml_pipeline_XIncludeFilter__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class XIncludeFilter;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::XIncludeFilter : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  XIncludeFilter(::gnu::xml::pipeline::EventConsumer *);
-private:
-  void fatal(::org::xml::sax::SAXParseException *);
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getPublicId();
-  virtual jint getLineNumber();
-  virtual jint getColumnNumber();
-  virtual void setSavingPrefixes(jboolean);
-  virtual jboolean isSavingPrefixes();
-private:
-  ::java::lang::String * addMarker(::java::lang::String *);
-  void pop(::java::lang::String *);
-public:
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void comment(JArray< jchar > *, jint, jint);
-  virtual void startCDATA();
-  virtual void endCDATA();
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-  virtual void skippedEntity(::java::lang::String *);
-public: // actually package-private
-  virtual void setLocator(::org::xml::sax::Locator *);
-  virtual ::org::xml::sax::Locator * getLocator();
-private:
-  ::org::xml::sax::SAXParseException * xinclude(::java::net::URL *, ::java::lang::String *);
-  ::org::xml::sax::SAXParseException * readText(::java::net::URL *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static void access$0(::gnu::xml::pipeline::XIncludeFilter *, ::org::xml::sax::SAXParseException *);
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) extEntities;
-  jint ignoreCount;
-  ::java::util::Stack * uris;
-  ::org::xml::sax::Locator * locator;
-  ::java::util::Vector * inclusions;
-  jboolean savingPrefixes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_XIncludeFilter__
diff --git a/libjava/gnu/xml/pipeline/XsltFilter.h b/libjava/gnu/xml/pipeline/XsltFilter.h
deleted file mode 100644
index 988735c..0000000
--- a/libjava/gnu/xml/pipeline/XsltFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_pipeline_XsltFilter__
-#define __gnu_xml_pipeline_XsltFilter__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-          class XsltFilter;
-      }
-    }
-  }
-}
-
-class gnu::xml::pipeline::XsltFilter : public ::gnu::xml::pipeline::EventFilter
-{
-
-public:
-  XsltFilter(::java::lang::String *, ::gnu::xml::pipeline::EventConsumer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_pipeline_XsltFilter__
diff --git a/libjava/gnu/xml/stream/AttributeImpl.h b/libjava/gnu/xml/stream/AttributeImpl.h
deleted file mode 100644
index dac7c27..0000000
--- a/libjava/gnu/xml/stream/AttributeImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_AttributeImpl__
-#define __gnu_xml_stream_AttributeImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class AttributeImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::AttributeImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  virtual jint getEventType();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::lang::String * getValue();
-  virtual ::java::lang::String * getDTDType();
-  virtual jboolean isSpecified();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
-  ::java::lang::String * value;
-  ::java::lang::String * type;
-  jboolean specified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_AttributeImpl__
diff --git a/libjava/gnu/xml/stream/BufferedReader.h b/libjava/gnu/xml/stream/BufferedReader.h
deleted file mode 100644
index 0ee4018..0000000
--- a/libjava/gnu/xml/stream/BufferedReader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_BufferedReader__
-#define __gnu_xml_stream_BufferedReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class BufferedReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::BufferedReader : public ::java::io::Reader
-{
-
-public: // actually package-private
-  BufferedReader(::java::io::Reader *);
-  BufferedReader(::java::io::Reader *, jint);
-public:
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jchar > *);
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-private:
-  jboolean refill();
-public: // actually package-private
-  static const jint DEFAULT_BUFFER_SIZE = 4096;
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::io::Reader)))) in;
-  JArray< jchar > * buf;
-  jint pos;
-  jint count;
-  jint markpos;
-  jint marklimit;
-  jint bufferSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_BufferedReader__
diff --git a/libjava/gnu/xml/stream/CRLFReader.h b/libjava/gnu/xml/stream/CRLFReader.h
deleted file mode 100644
index 977dd1e..0000000
--- a/libjava/gnu/xml/stream/CRLFReader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_CRLFReader__
-#define __gnu_xml_stream_CRLFReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class CRLFReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::CRLFReader : public ::java::io::Reader
-{
-
-public: // actually protected
-  CRLFReader(::java::io::Reader *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jchar > *);
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-  virtual void close();
-private:
-  jint indexOfCRLF(JArray< jchar > *, jint, jint);
-public:
-  static const jint CR = 13;
-  static const jint LF = 10;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::Reader)))) doReset;
-public: // actually protected
-  ::java::io::Reader * in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_CRLFReader__
diff --git a/libjava/gnu/xml/stream/CharactersImpl.h b/libjava/gnu/xml/stream/CharactersImpl.h
deleted file mode 100644
index 9a828cd..0000000
--- a/libjava/gnu/xml/stream/CharactersImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_CharactersImpl__
-#define __gnu_xml_stream_CharactersImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class CharactersImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::CharactersImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  CharactersImpl(::javax::xml::stream::Location *, ::java::lang::String *, jboolean, jboolean, jboolean);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getData();
-  virtual jboolean isWhiteSpace();
-  virtual jboolean isCData();
-  virtual jboolean isIgnorableWhiteSpace();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) data;
-  jboolean whitespace;
-  jboolean cdata;
-  jboolean ignorableWhitespace;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_CharactersImpl__
diff --git a/libjava/gnu/xml/stream/CommentImpl.h b/libjava/gnu/xml/stream/CommentImpl.h
deleted file mode 100644
index 7e1d951..0000000
--- a/libjava/gnu/xml/stream/CommentImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_CommentImpl__
-#define __gnu_xml_stream_CommentImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class CommentImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::CommentImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  CommentImpl(::javax::xml::stream::Location *, ::java::lang::String *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getText();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) text;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_CommentImpl__
diff --git a/libjava/gnu/xml/stream/DTDImpl.h b/libjava/gnu/xml/stream/DTDImpl.h
deleted file mode 100644
index e111823..0000000
--- a/libjava/gnu/xml/stream/DTDImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_DTDImpl__
-#define __gnu_xml_stream_DTDImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class DTDImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::DTDImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  DTDImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::Object *, ::java::util::List *, ::java::util::List *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getDocumentTypeDeclaration();
-  virtual ::java::lang::Object * getProcessedDTD();
-  virtual ::java::util::List * getNotations();
-  virtual ::java::util::List * getEntities();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) body;
-  ::java::lang::Object * impl;
-  ::java::util::List * notations;
-  ::java::util::List * entities;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_DTDImpl__
diff --git a/libjava/gnu/xml/stream/EndDocumentImpl.h b/libjava/gnu/xml/stream/EndDocumentImpl.h
deleted file mode 100644
index a7bbf05..0000000
--- a/libjava/gnu/xml/stream/EndDocumentImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_EndDocumentImpl__
-#define __gnu_xml_stream_EndDocumentImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EndDocumentImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::EndDocumentImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  EndDocumentImpl(::javax::xml::stream::Location *);
-public:
-  virtual jint getEventType();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_EndDocumentImpl__
diff --git a/libjava/gnu/xml/stream/EndElementImpl.h b/libjava/gnu/xml/stream/EndElementImpl.h
deleted file mode 100644
index 2461d21..0000000
--- a/libjava/gnu/xml/stream/EndElementImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_EndElementImpl__
-#define __gnu_xml_stream_EndElementImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EndElementImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::EndElementImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  EndElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *);
-public:
-  virtual jint getEventType();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::util::Iterator * getNamespaces();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
-  ::java::util::List * namespaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_EndElementImpl__
diff --git a/libjava/gnu/xml/stream/EntityDeclarationImpl.h b/libjava/gnu/xml/stream/EntityDeclarationImpl.h
deleted file mode 100644
index 8c41808..0000000
--- a/libjava/gnu/xml/stream/EntityDeclarationImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_EntityDeclarationImpl__
-#define __gnu_xml_stream_EntityDeclarationImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EntityDeclarationImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::EntityDeclarationImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  EntityDeclarationImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getNotationName();
-  virtual ::java::lang::String * getReplacementText();
-  virtual ::java::lang::String * getBaseURI();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::lang::String * name;
-  ::java::lang::String * notationName;
-  ::java::lang::String * replacementText;
-  ::java::lang::String * baseUri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_EntityDeclarationImpl__
diff --git a/libjava/gnu/xml/stream/EntityReferenceImpl.h b/libjava/gnu/xml/stream/EntityReferenceImpl.h
deleted file mode 100644
index 0f30dc8..0000000
--- a/libjava/gnu/xml/stream/EntityReferenceImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_EntityReferenceImpl__
-#define __gnu_xml_stream_EntityReferenceImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EntityReferenceImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class EntityDeclaration;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::EntityReferenceImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  EntityReferenceImpl(::javax::xml::stream::Location *, ::javax::xml::stream::events::EntityDeclaration *, ::java::lang::String *);
-public:
-  virtual jint getEventType();
-  virtual ::javax::xml::stream::events::EntityDeclaration * getDeclaration();
-  virtual ::java::lang::String * getName();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::javax::xml::stream::events::EntityDeclaration * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) decl;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_EntityReferenceImpl__
diff --git a/libjava/gnu/xml/stream/FilteredEventReader.h b/libjava/gnu/xml/stream/FilteredEventReader.h
deleted file mode 100644
index ae4da2f..0000000
--- a/libjava/gnu/xml/stream/FilteredEventReader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_FilteredEventReader__
-#define __gnu_xml_stream_FilteredEventReader__
-
-#pragma interface
-
-#include <javax/xml/stream/util/EventReaderDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class FilteredEventReader;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-          class XMLEventReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::FilteredEventReader : public ::javax::xml::stream::util::EventReaderDelegate
-{
-
-public: // actually package-private
-  FilteredEventReader(::javax::xml::stream::XMLEventReader *, ::javax::xml::stream::EventFilter *);
-public:
-  virtual jboolean hasNext();
-  virtual ::javax::xml::stream::events::XMLEvent * nextEvent();
-  virtual ::java::lang::Object * next();
-  virtual ::javax::xml::stream::events::XMLEvent * peek();
-  virtual ::javax::xml::stream::events::XMLEvent * nextTag();
-public: // actually package-private
-  ::javax::xml::stream::EventFilter * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::EventReaderDelegate)))) filter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_FilteredEventReader__
diff --git a/libjava/gnu/xml/stream/FilteredStreamReader.h b/libjava/gnu/xml/stream/FilteredStreamReader.h
deleted file mode 100644
index c762fb3..0000000
--- a/libjava/gnu/xml/stream/FilteredStreamReader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_FilteredStreamReader__
-#define __gnu_xml_stream_FilteredStreamReader__
-
-#pragma interface
-
-#include <javax/xml/stream/util/StreamReaderDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class FilteredStreamReader;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class StreamFilter;
-          class XMLStreamReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::FilteredStreamReader : public ::javax::xml::stream::util::StreamReaderDelegate
-{
-
-public: // actually package-private
-  FilteredStreamReader(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::StreamFilter *);
-public:
-  virtual jboolean hasNext();
-  virtual jint next();
-  virtual jint nextTag();
-public: // actually package-private
-  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) reader;
-  ::javax::xml::stream::StreamFilter * filter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_FilteredStreamReader__
diff --git a/libjava/gnu/xml/stream/NamespaceImpl.h b/libjava/gnu/xml/stream/NamespaceImpl.h
deleted file mode 100644
index a90777a..0000000
--- a/libjava/gnu/xml/stream/NamespaceImpl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_NamespaceImpl__
-#define __gnu_xml_stream_NamespaceImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class NamespaceImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::NamespaceImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  NamespaceImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual jboolean isSpecified();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::lang::String * getDTDType();
-  virtual ::java::lang::String * getValue();
-  virtual jboolean isDefaultNamespaceDeclaration();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) prefix;
-  ::java::lang::String * uri;
-  jboolean specified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_NamespaceImpl__
diff --git a/libjava/gnu/xml/stream/NotationDeclarationImpl.h b/libjava/gnu/xml/stream/NotationDeclarationImpl.h
deleted file mode 100644
index c994018..0000000
--- a/libjava/gnu/xml/stream/NotationDeclarationImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_NotationDeclarationImpl__
-#define __gnu_xml_stream_NotationDeclarationImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class NotationDeclarationImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::NotationDeclarationImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  NotationDeclarationImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_NotationDeclarationImpl__
diff --git a/libjava/gnu/xml/stream/ProcessingInstructionImpl.h b/libjava/gnu/xml/stream/ProcessingInstructionImpl.h
deleted file mode 100644
index f743902..0000000
--- a/libjava/gnu/xml/stream/ProcessingInstructionImpl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_ProcessingInstructionImpl__
-#define __gnu_xml_stream_ProcessingInstructionImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class ProcessingInstructionImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::ProcessingInstructionImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  ProcessingInstructionImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getTarget();
-  virtual ::java::lang::String * getData();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) target;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_ProcessingInstructionImpl__
diff --git a/libjava/gnu/xml/stream/SAXParser.h b/libjava/gnu/xml/stream/SAXParser.h
deleted file mode 100644
index 5624f86..0000000
--- a/libjava/gnu/xml/stream/SAXParser.h
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_SAXParser__
-#define __gnu_xml_stream_SAXParser__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class SAXParser;
-          class XMLParser;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-          class XMLEventReader;
-          class XMLStreamReader;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class Parser;
-          class XMLReader;
-        namespace ext
-        {
-            class DeclHandler;
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::SAXParser : public ::javax::xml::parsers::SAXParser
-{
-
-public:
-  SAXParser();
-public: // actually package-private
-  SAXParser(jboolean, jboolean, jboolean);
-public:
-  virtual ::org::xml::sax::Parser * getParser();
-  virtual ::org::xml::sax::XMLReader * getXMLReader();
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual jboolean isXIncludeAware();
-  virtual void reset();
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *);
-  virtual ::org::xml::sax::EntityResolver * getEntityResolver();
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *);
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler();
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *);
-  virtual ::org::xml::sax::ContentHandler * getContentHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void parse(::org::xml::sax::InputSource *);
-private:
-  jboolean isIgnorableWhitespace(::gnu::xml::stream::XMLParser *, JArray< jchar > *, jboolean);
-public:
-  virtual void parse(::java::lang::String *);
-  virtual jint getIndex(::java::lang::String *);
-  virtual jint getIndex(::java::lang::String *, ::java::lang::String *);
-  virtual jint getLength();
-  virtual ::java::lang::String * getLocalName(jint);
-  virtual ::java::lang::String * getQName(jint);
-  virtual ::java::lang::String * getType(jint);
-  virtual ::java::lang::String * getType(::java::lang::String *);
-  virtual ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getURI(jint);
-  virtual ::java::lang::String * getValue(jint);
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isDeclared(jint);
-  virtual jboolean isDeclared(::java::lang::String *);
-  virtual jboolean isDeclared(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isSpecified(jint);
-  virtual jboolean isSpecified(::java::lang::String *);
-  virtual jboolean isSpecified(::java::lang::String *, ::java::lang::String *);
-  virtual jint getColumnNumber();
-  virtual jint getLineNumber();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getEncoding();
-  virtual ::java::lang::String * getXMLVersion();
-  virtual ::java::lang::Object * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::XMLEventReader * resolveAsXMLEventReader(::java::lang::String *);
-  virtual ::javax::xml::stream::XMLStreamReader * resolveAsXMLStreamReader(::java::lang::String *);
-  virtual void report(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::xml::stream::Location *);
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  ::org::xml::sax::ContentHandler * __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParser)))) contentHandler;
-  ::org::xml::sax::ext::DeclHandler * declHandler;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  jboolean validating;
-  jboolean namespaceAware;
-  jboolean xIncludeAware;
-  jboolean stringInterning;
-  jboolean coalescing;
-  jboolean replaceERefs;
-  jboolean externalEntities;
-  jboolean supportDTD;
-  jboolean baseAware;
-  ::gnu::xml::stream::XMLParser * parser;
-  ::javax::xml::stream::XMLStreamReader * reader;
-  ::java::lang::String * encoding;
-  ::java::lang::String * xmlVersion;
-  jboolean xmlStandalone;
-  ::java::lang::String * xmlEncoding;
-  ::java::lang::String * baseURI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_SAXParser__
diff --git a/libjava/gnu/xml/stream/SAXParserFactory.h b/libjava/gnu/xml/stream/SAXParserFactory.h
deleted file mode 100644
index c3d0c01..0000000
--- a/libjava/gnu/xml/stream/SAXParserFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_SAXParserFactory__
-#define __gnu_xml_stream_SAXParserFactory__
-
-#pragma interface
-
-#include <javax/xml/parsers/SAXParserFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class SAXParserFactory;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::SAXParserFactory : public ::javax::xml::parsers::SAXParserFactory
-{
-
-public:
-  SAXParserFactory();
-  virtual ::javax::xml::parsers::SAXParser * newSAXParser();
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-public: // actually package-private
-  static ::java::util::Set * FEATURE_NAMES;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::javax::xml::parsers::SAXParserFactory)))) features;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_SAXParserFactory__
diff --git a/libjava/gnu/xml/stream/StartDocumentImpl.h b/libjava/gnu/xml/stream/StartDocumentImpl.h
deleted file mode 100644
index adb51a5..0000000
--- a/libjava/gnu/xml/stream/StartDocumentImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_StartDocumentImpl__
-#define __gnu_xml_stream_StartDocumentImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class StartDocumentImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::StartDocumentImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  StartDocumentImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, jboolean);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getSystemId();
-  virtual ::java::lang::String * getCharacterEncodingScheme();
-  virtual jboolean encodingSet();
-  virtual jboolean isStandalone();
-  virtual jboolean standaloneSet();
-  virtual ::java::lang::String * getVersion();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) systemId;
-  ::java::lang::String * encoding;
-  ::java::lang::String * xmlVersion;
-  jboolean xmlStandalone;
-  jboolean standaloneDeclared;
-  jboolean encodingDeclared;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_StartDocumentImpl__
diff --git a/libjava/gnu/xml/stream/StartElementImpl.h b/libjava/gnu/xml/stream/StartElementImpl.h
deleted file mode 100644
index 1cd062b..0000000
--- a/libjava/gnu/xml/stream/StartElementImpl.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_StartElementImpl__
-#define __gnu_xml_stream_StartElementImpl__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLEventImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class StartElementImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::StartElementImpl : public ::gnu::xml::stream::XMLEventImpl
-{
-
-public: // actually protected
-  StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace$::NamespaceContext *);
-public:
-  virtual jint getEventType();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::util::Iterator * getAttributes();
-  virtual ::java::util::Iterator * getNamespaces();
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual void writeAsEncodedUnicode(::java::io::Writer *);
-public: // actually protected
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name;
-  ::java::util::List * attributes;
-  ::java::util::List * namespaces;
-  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_StartElementImpl__
diff --git a/libjava/gnu/xml/stream/UnicodeReader.h b/libjava/gnu/xml/stream/UnicodeReader.h
deleted file mode 100644
index 4567006..0000000
--- a/libjava/gnu/xml/stream/UnicodeReader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_UnicodeReader__
-#define __gnu_xml_stream_UnicodeReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class UnicodeReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::UnicodeReader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnicodeReader(::java::io::Reader *);
-public:
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jint read();
-  virtual jint read(JArray< jint > *, jint, jint);
-  virtual void close();
-  static JArray< jint > * toCodePointArray(::java::lang::String *);
-public: // actually package-private
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_UnicodeReader__
diff --git a/libjava/gnu/xml/stream/XIncludeFilter.h b/libjava/gnu/xml/stream/XIncludeFilter.h
deleted file mode 100644
index e920ac6..0000000
--- a/libjava/gnu/xml/stream/XIncludeFilter.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XIncludeFilter__
-#define __gnu_xml_stream_XIncludeFilter__
-
-#pragma interface
-
-#include <javax/xml/stream/util/StreamReaderDelegate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XIncludeFilter;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URLConnection;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-      namespace stream
-      {
-          class XMLStreamReader;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class Node;
-        namespace traversal
-        {
-            class DocumentTraversal;
-            class TreeWalker;
-        }
-        namespace xpath
-        {
-            class XPathEvaluator;
-            class XPathResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XIncludeFilter : public ::javax::xml::stream::util::StreamReaderDelegate
-{
-
-public: // actually package-private
-  XIncludeFilter(::javax::xml::stream::XMLStreamReader *, ::java::lang::String *, jboolean, jboolean, jboolean);
-public:
-  virtual jint getAttributeCount();
-  virtual ::java::lang::String * getAttributeLocalName(jint);
-  virtual ::java::lang::String * getAttributeNamespace(jint);
-  virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
-  virtual ::java::lang::String * getAttributeType(jint);
-  virtual jboolean isAttributeSpecified(jint);
-  virtual ::java::lang::String * getAttributeValue(jint);
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getElementText();
-  virtual jint getEventType();
-  virtual ::java::lang::String * getLocalName();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getPIData();
-  virtual ::java::lang::String * getPITarget();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getText();
-  virtual JArray< jchar > * getTextCharacters();
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint);
-  virtual jint getTextLength();
-  virtual jint getTextStart();
-  virtual jboolean hasNext();
-  virtual jint next();
-public: // actually package-private
-  virtual jboolean isSpace(JArray< jchar > *, jint);
-  virtual ::java::lang::String * getBaseURI();
-  virtual jboolean includeResource(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::net::URLConnection * getURLConnection(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * getDocument(::org::w3c::dom::Node *);
-  virtual ::javax::xml::parsers::DocumentBuilder * getDocumentBuilder();
-  virtual ::org::w3c::dom::traversal::DocumentTraversal * getDocumentTraversal(::org::w3c::dom::Document *);
-  virtual ::org::w3c::dom::xpath::XPathEvaluator * getXPathEvaluator(::org::w3c::dom::Document *);
-  static ::java::lang::String * getParameter(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * XINCLUDE_NS_URI;
-  static const jint SHOW_FLAGS = 221;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) systemId;
-  jboolean namespaceAware;
-  jboolean validating;
-  jboolean expandERefs;
-  ::java::lang::String * href;
-  jint event;
-  jboolean included;
-  ::org::w3c::dom::xpath::XPathResult * result;
-  jint snapshotIndex;
-  ::org::w3c::dom::Node * current;
-  ::org::w3c::dom::traversal::TreeWalker * walker;
-  ::java::util::HashSet * seen;
-  jboolean backtracking;
-  jboolean lookahead;
-  ::java::io::Reader * includedText;
-  JArray< jchar > * buf;
-  jint len;
-  jboolean inInclude;
-  jboolean inFallback;
-  jboolean seenFallback;
-  ::javax::xml::parsers::DocumentBuilder * builder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XIncludeFilter__
diff --git a/libjava/gnu/xml/stream/XMLEventAllocatorImpl.h b/libjava/gnu/xml/stream/XMLEventAllocatorImpl.h
deleted file mode 100644
index 374c125..0000000
--- a/libjava/gnu/xml/stream/XMLEventAllocatorImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLEventAllocatorImpl__
-#define __gnu_xml_stream_XMLEventAllocatorImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventAllocatorImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventAllocator;
-            class XMLEventConsumer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLEventAllocatorImpl : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventAllocatorImpl();
-public:
-  virtual ::javax::xml::stream::events::XMLEvent * allocate(::javax::xml::stream::XMLStreamReader *);
-  virtual void allocate(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::util::XMLEventConsumer *);
-  virtual ::javax::xml::stream::util::XMLEventAllocator * newInstance();
-public: // actually protected
-  virtual jboolean isWhitespace(::java::lang::String *);
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entityDeclarations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLEventAllocatorImpl__
diff --git a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h b/libjava/gnu/xml/stream/XMLEventFactoryImpl.h
deleted file mode 100644
index 714dbc1..0000000
--- a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLEventFactoryImpl__
-#define __gnu_xml_stream_XMLEventFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/stream/XMLEventFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class Comment;
-            class DTD;
-            class EndDocument;
-            class EndElement;
-            class EntityDeclaration;
-            class EntityReference;
-            class Namespace;
-            class ProcessingInstruction;
-            class StartDocument;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLEventFactoryImpl : public ::javax::xml::stream::XMLEventFactory
-{
-
-public:
-  XMLEventFactoryImpl();
-  virtual void setLocation(::javax::xml::stream::Location *);
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *);
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *);
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *);
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *);
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *);
-  virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *);
-  virtual ::javax::xml::stream::events::Characters * createCData(::java::lang::String *);
-  virtual ::javax::xml::stream::events::Characters * createSpace(::java::lang::String *);
-  virtual ::javax::xml::stream::events::Characters * createIgnorableSpace(::java::lang::String *);
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument();
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *);
-  virtual ::javax::xml::stream::events::EndDocument * createEndDocument();
-  virtual ::javax::xml::stream::events::EntityReference * createEntityReference(::java::lang::String *, ::javax::xml::stream::events::EntityDeclaration *);
-  virtual ::javax::xml::stream::events::Comment * createComment(::java::lang::String *);
-  virtual ::javax::xml::stream::events::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::stream::events::DTD * createDTD(::java::lang::String *);
-public: // actually package-private
-  virtual ::java::util::LinkedList * createLinkedList(::java::util::Iterator *);
-public: // actually protected
-  ::javax::xml::stream::Location * __attribute__((aligned(__alignof__( ::javax::xml::stream::XMLEventFactory)))) location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLEventFactoryImpl__
diff --git a/libjava/gnu/xml/stream/XMLEventImpl.h b/libjava/gnu/xml/stream/XMLEventImpl.h
deleted file mode 100644
index 13b793e..0000000
--- a/libjava/gnu/xml/stream/XMLEventImpl.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLEventImpl__
-#define __gnu_xml_stream_XMLEventImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLEventImpl : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventImpl(::javax::xml::stream::Location *);
-public:
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation();
-  virtual jboolean isStartElement();
-  virtual jboolean isAttribute();
-  virtual jboolean isNamespace();
-  virtual jboolean isEndElement();
-  virtual jboolean isEntityReference();
-  virtual jboolean isProcessingInstruction();
-  virtual jboolean isCharacters();
-  virtual jboolean isStartDocument();
-  virtual jboolean isEndDocument();
-  virtual ::javax::xml::stream::events::StartElement * asStartElement();
-  virtual ::javax::xml::stream::events::EndElement * asEndElement();
-  virtual ::javax::xml::stream::events::Characters * asCharacters();
-  virtual ::javax::xml::namespace$::QName * getSchemaType();
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-public: // actually protected
-  virtual ::java::lang::String * encode(::java::lang::String *, jboolean);
-  ::javax::xml::stream::Location * __attribute__((aligned(__alignof__( ::java::lang::Object)))) location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLEventImpl__
diff --git a/libjava/gnu/xml/stream/XMLEventReaderImpl.h b/libjava/gnu/xml/stream/XMLEventReaderImpl.h
deleted file mode 100644
index e3ce492..0000000
--- a/libjava/gnu/xml/stream/XMLEventReaderImpl.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLEventReaderImpl__
-#define __gnu_xml_stream_XMLEventReaderImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventReaderImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventAllocator;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLEventReaderImpl : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventReaderImpl(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::util::XMLEventAllocator *, ::java::lang::String *);
-public:
-  virtual ::javax::xml::stream::events::XMLEvent * nextEvent();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasNext();
-  virtual ::javax::xml::stream::events::XMLEvent * peek();
-  virtual ::java::lang::String * getElementText();
-  virtual ::javax::xml::stream::events::XMLEvent * nextTag();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void close();
-  virtual void remove();
-public: // actually protected
-  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reader;
-  ::javax::xml::stream::util::XMLEventAllocator * allocator;
-  ::java::lang::String * systemId;
-  ::javax::xml::stream::events::XMLEvent * peekEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLEventReaderImpl__
diff --git a/libjava/gnu/xml/stream/XMLEventWriterImpl.h b/libjava/gnu/xml/stream/XMLEventWriterImpl.h
deleted file mode 100644
index e81d089..0000000
--- a/libjava/gnu/xml/stream/XMLEventWriterImpl.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLEventWriterImpl__
-#define __gnu_xml_stream_XMLEventWriterImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventWriterImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-      }
-      namespace stream
-      {
-          class XMLEventReader;
-          class XMLStreamWriter;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLEventWriterImpl : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventWriterImpl(::javax::xml::stream::XMLStreamWriter *);
-public:
-  virtual void flush();
-  virtual void close();
-  virtual void add(::javax::xml::stream::events::XMLEvent *);
-  virtual void add(::javax::xml::stream::XMLEventReader *);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *);
-  virtual void setDefaultNamespace(::java::lang::String *);
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-public: // actually protected
-  ::javax::xml::stream::XMLStreamWriter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLEventWriterImpl__
diff --git a/libjava/gnu/xml/stream/XMLInputFactoryImpl.h b/libjava/gnu/xml/stream/XMLInputFactoryImpl.h
deleted file mode 100644
index 43a2197..0000000
--- a/libjava/gnu/xml/stream/XMLInputFactoryImpl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLInputFactoryImpl__
-#define __gnu_xml_stream_XMLInputFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/stream/XMLInputFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLInputFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-          class StreamFilter;
-          class XMLEventReader;
-          class XMLReporter;
-          class XMLResolver;
-          class XMLStreamReader;
-        namespace util
-        {
-            class XMLEventAllocator;
-        }
-      }
-      namespace transform
-      {
-          class Source;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLInputFactoryImpl : public ::javax::xml::stream::XMLInputFactory
-{
-
-public:
-  XMLInputFactoryImpl();
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::Reader *);
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::javax::xml::transform::Source *);
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *);
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::InputStream *);
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::Reader *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::Reader *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::Reader *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::stream::XMLStreamReader *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::transform::Source *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::InputStream *);
-  virtual ::javax::xml::stream::XMLStreamReader * createFilteredReader(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::StreamFilter *);
-  virtual ::javax::xml::stream::XMLEventReader * createFilteredReader(::javax::xml::stream::XMLEventReader *, ::javax::xml::stream::EventFilter *);
-  virtual ::javax::xml::stream::XMLResolver * getXMLResolver();
-  virtual void setXMLResolver(::javax::xml::stream::XMLResolver *);
-  virtual ::javax::xml::stream::XMLReporter * getXMLReporter();
-  virtual void setXMLReporter(::javax::xml::stream::XMLReporter *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual jboolean isPropertySupported(::java::lang::String *);
-  virtual void setEventAllocator(::javax::xml::stream::util::XMLEventAllocator *);
-  virtual ::javax::xml::stream::util::XMLEventAllocator * getEventAllocator();
-  virtual void setCoalescing(jboolean);
-  virtual jboolean isCoalescing();
-public: // actually protected
-  virtual ::java::io::InputStream * getInputStream(::javax::xml::transform::Source *);
-  ::javax::xml::stream::XMLResolver * __attribute__((aligned(__alignof__( ::javax::xml::stream::XMLInputFactory)))) resolver;
-  ::javax::xml::stream::XMLReporter * reporter;
-  ::javax::xml::stream::util::XMLEventAllocator * allocator;
-  jboolean validating;
-  jboolean namespaceAware;
-  jboolean coalescing;
-  jboolean replacingEntityReferences;
-  jboolean externalEntities;
-  jboolean supportDTD;
-  jboolean xIncludeAware;
-  jboolean baseAware;
-  jboolean stringInterning;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLInputFactoryImpl__
diff --git a/libjava/gnu/xml/stream/XMLOutputFactoryImpl.h b/libjava/gnu/xml/stream/XMLOutputFactoryImpl.h
deleted file mode 100644
index c5cd038..0000000
--- a/libjava/gnu/xml/stream/XMLOutputFactoryImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLOutputFactoryImpl__
-#define __gnu_xml_stream_XMLOutputFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/stream/XMLOutputFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLOutputFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventWriter;
-          class XMLStreamWriter;
-      }
-      namespace transform
-      {
-          class Result;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLOutputFactoryImpl : public ::javax::xml::stream::XMLOutputFactory
-{
-
-public:
-  XMLOutputFactoryImpl();
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::Writer *);
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *);
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *, ::java::lang::String *);
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::javax::xml::transform::Result *);
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *);
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *, ::java::lang::String *);
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::Writer *);
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::javax::xml::transform::Result *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual jboolean isPropertySupported(::java::lang::String *);
-  virtual jboolean isPrefixDefaulting();
-  virtual void setPrefixDefaulting(jboolean);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::xml::stream::XMLOutputFactory)))) prefixDefaulting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLOutputFactoryImpl__
diff --git a/libjava/gnu/xml/stream/XMLParser$AnyContentModel.h b/libjava/gnu/xml/stream/XMLParser$AnyContentModel.h
deleted file mode 100644
index c5b4ea3..0000000
--- a/libjava/gnu/xml/stream/XMLParser$AnyContentModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$AnyContentModel__
-#define __gnu_xml_stream_XMLParser$AnyContentModel__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLParser$ContentModel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$AnyContentModel;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$AnyContentModel : public ::gnu::xml::stream::XMLParser$ContentModel
-{
-
-public: // actually package-private
-  XMLParser$AnyContentModel(::gnu::xml::stream::XMLParser *);
-  ::gnu::xml::stream::XMLParser * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLParser$ContentModel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$AnyContentModel__
diff --git a/libjava/gnu/xml/stream/XMLParser$Attribute.h b/libjava/gnu/xml/stream/XMLParser$Attribute.h
deleted file mode 100644
index 3601ebe..0000000
--- a/libjava/gnu/xml/stream/XMLParser$Attribute.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$Attribute__
-#define __gnu_xml_stream_XMLParser$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$Attribute;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$Attribute : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$Attribute(::gnu::xml::stream::XMLParser *, ::java::lang::String *, ::java::lang::String *, jboolean, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * type;
-  jboolean specified;
-  ::java::lang::String * value;
-  ::java::lang::String * prefix;
-  ::java::lang::String * localName;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$Attribute__
diff --git a/libjava/gnu/xml/stream/XMLParser$AttributeDecl.h b/libjava/gnu/xml/stream/XMLParser$AttributeDecl.h
deleted file mode 100644
index 27da8e2..0000000
--- a/libjava/gnu/xml/stream/XMLParser$AttributeDecl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$AttributeDecl__
-#define __gnu_xml_stream_XMLParser$AttributeDecl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$AttributeDecl;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$AttributeDecl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$AttributeDecl(::gnu::xml::stream::XMLParser *, ::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::util::HashSet *, jboolean);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * value;
-  jint valueType;
-  ::java::lang::String * enumeration;
-  ::java::util::HashSet * values;
-  jboolean external;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$AttributeDecl__
diff --git a/libjava/gnu/xml/stream/XMLParser$ContentModel.h b/libjava/gnu/xml/stream/XMLParser$ContentModel.h
deleted file mode 100644
index 26d9b82..0000000
--- a/libjava/gnu/xml/stream/XMLParser$ContentModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$ContentModel__
-#define __gnu_xml_stream_XMLParser$ContentModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$ContentModel;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$ContentModel : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$ContentModel(::gnu::xml::stream::XMLParser *, jint);
-  static const jint EMPTY = 0;
-  static const jint ANY = 1;
-  static const jint ELEMENT = 2;
-  static const jint MIXED = 3;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) min;
-  jint max;
-  jint type;
-  ::java::lang::String * text;
-  jboolean external;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$ContentModel__
diff --git a/libjava/gnu/xml/stream/XMLParser$ContentParticle.h b/libjava/gnu/xml/stream/XMLParser$ContentParticle.h
deleted file mode 100644
index 3ac0ad1..0000000
--- a/libjava/gnu/xml/stream/XMLParser$ContentParticle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$ContentParticle__
-#define __gnu_xml_stream_XMLParser$ContentParticle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$ContentParticle;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$ContentParticle : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$ContentParticle(::gnu::xml::stream::XMLParser *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) min;
-  jint max;
-  ::java::lang::Object * content;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$ContentParticle__
diff --git a/libjava/gnu/xml/stream/XMLParser$Doctype.h b/libjava/gnu/xml/stream/XMLParser$Doctype.h
deleted file mode 100644
index 06ba9ec..0000000
--- a/libjava/gnu/xml/stream/XMLParser$Doctype.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$Doctype__
-#define __gnu_xml_stream_XMLParser$Doctype__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$AttributeDecl;
-          class XMLParser$ContentModel;
-          class XMLParser$Doctype;
-          class XMLParser$ExternalIds;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$Doctype : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$Doctype(::gnu::xml::stream::XMLParser *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void addElementDecl(::java::lang::String *, ::java::lang::String *, ::gnu::xml::stream::XMLParser$ContentModel *);
-  virtual void addAttributeDecl(::java::lang::String *, ::java::lang::String *, ::gnu::xml::stream::XMLParser$AttributeDecl *);
-  virtual void addEntityDecl(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual void addEntityDecl(::java::lang::String *, ::gnu::xml::stream::XMLParser$ExternalIds *, jboolean);
-  virtual void addNotationDecl(::java::lang::String *, ::gnu::xml::stream::XMLParser$ExternalIds *, jboolean);
-  virtual void addComment(::java::lang::String *);
-  virtual void addPI(::java::lang::String *, ::java::lang::String *);
-  virtual ::gnu::xml::stream::XMLParser$ContentModel * getElementModel(::java::lang::String *);
-  virtual ::gnu::xml::stream::XMLParser$AttributeDecl * getAttributeDecl(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isAttributeDeclared(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::Iterator * attlistIterator(::java::lang::String *);
-  virtual ::java::lang::Object * getEntity(::java::lang::String *);
-  virtual jboolean isEntityExternal(::java::lang::String *);
-  virtual ::java::util::Iterator * entityIterator();
-  virtual ::gnu::xml::stream::XMLParser$ExternalIds * getNotation(::java::lang::String *);
-  virtual jboolean isNotationExternal(::java::lang::String *);
-  virtual ::java::lang::String * getComment(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getPI(::java::lang::String *);
-  virtual ::java::util::Iterator * entryIterator();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rootName;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-private:
-  ::java::util::LinkedHashMap * elements;
-  ::java::util::LinkedHashMap * attlists;
-  ::java::util::LinkedHashMap * entities;
-  ::java::util::LinkedHashMap * notations;
-  ::java::util::LinkedHashMap * comments;
-  ::java::util::LinkedHashMap * pis;
-  ::java::util::LinkedList * entries;
-  ::java::util::HashSet * externalEntities;
-  ::java::util::HashSet * externalNotations;
-  jint anon;
-public: // actually package-private
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$Doctype__
diff --git a/libjava/gnu/xml/stream/XMLParser$ElementContentModel.h b/libjava/gnu/xml/stream/XMLParser$ElementContentModel.h
deleted file mode 100644
index a1c745c..0000000
--- a/libjava/gnu/xml/stream/XMLParser$ElementContentModel.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$ElementContentModel__
-#define __gnu_xml_stream_XMLParser$ElementContentModel__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLParser$ContentModel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$ContentParticle;
-          class XMLParser$ElementContentModel;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$ElementContentModel : public ::gnu::xml::stream::XMLParser$ContentModel
-{
-
-public: // actually package-private
-  XMLParser$ElementContentModel(::gnu::xml::stream::XMLParser *);
-  virtual void addContentParticle(::gnu::xml::stream::XMLParser$ContentParticle *);
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLParser$ContentModel)))) contentParticles;
-  jboolean or$;
-  ::java::lang::String * regex;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$ElementContentModel__
diff --git a/libjava/gnu/xml/stream/XMLParser$EmptyContentModel.h b/libjava/gnu/xml/stream/XMLParser$EmptyContentModel.h
deleted file mode 100644
index 08ec016..0000000
--- a/libjava/gnu/xml/stream/XMLParser$EmptyContentModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$EmptyContentModel__
-#define __gnu_xml_stream_XMLParser$EmptyContentModel__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLParser$ContentModel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$EmptyContentModel;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$EmptyContentModel : public ::gnu::xml::stream::XMLParser$ContentModel
-{
-
-public: // actually package-private
-  XMLParser$EmptyContentModel(::gnu::xml::stream::XMLParser *);
-  ::gnu::xml::stream::XMLParser * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLParser$ContentModel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$EmptyContentModel__
diff --git a/libjava/gnu/xml/stream/XMLParser$ExternalIds.h b/libjava/gnu/xml/stream/XMLParser$ExternalIds.h
deleted file mode 100644
index 037fb61..0000000
--- a/libjava/gnu/xml/stream/XMLParser$ExternalIds.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$ExternalIds__
-#define __gnu_xml_stream_XMLParser$ExternalIds__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$ExternalIds;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$ExternalIds : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$ExternalIds(::gnu::xml::stream::XMLParser *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::lang::String * notationName;
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$ExternalIds__
diff --git a/libjava/gnu/xml/stream/XMLParser$Input.h b/libjava/gnu/xml/stream/XMLParser$Input.h
deleted file mode 100644
index 60ae69b..0000000
--- a/libjava/gnu/xml/stream/XMLParser$Input.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$Input__
-#define __gnu_xml_stream_XMLParser$Input__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class UnicodeReader;
-          class XMLParser$Input;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$Input : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLParser$Input(::java::io::InputStream *, ::java::io::Reader *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-public:
-  virtual jint getCharacterOffset();
-  virtual jint getColumnNumber();
-  virtual jint getLineNumber();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-public: // actually package-private
-  virtual void init();
-  virtual void mark(jint);
-  virtual jint read();
-  virtual jint read(JArray< jint > *, jint, jint);
-  virtual void reset();
-private:
-  void detectEncoding();
-  static jboolean equals(JArray< jint > *, JArray< jint > *);
-public: // actually package-private
-  virtual void setInputEncoding(::java::lang::String *);
-  virtual void finalizeEncoding();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) line;
-  jint markLine;
-  jint column;
-  jint markColumn;
-  jint offset;
-  jint markOffset;
-  ::java::lang::String * publicId;
-  ::java::lang::String * systemId;
-  ::java::lang::String * name;
-  jboolean report;
-  jboolean normalize;
-  ::java::io::InputStream * in;
-  ::java::io::Reader * reader;
-  ::gnu::xml::stream::UnicodeReader * unicodeReader;
-  jboolean initialized;
-  jboolean encodingDetected;
-  ::java::lang::String * inputEncoding;
-  jboolean xml11;
-private:
-  static JArray< jint > * SIGNATURE_UCS_4_1234;
-  static JArray< jint > * SIGNATURE_UCS_4_4321;
-  static JArray< jint > * SIGNATURE_UCS_4_2143;
-  static JArray< jint > * SIGNATURE_UCS_4_3412;
-  static JArray< jint > * SIGNATURE_UCS_2_12;
-  static JArray< jint > * SIGNATURE_UCS_2_21;
-  static JArray< jint > * SIGNATURE_UCS_2_12_NOBOM;
-  static JArray< jint > * SIGNATURE_UCS_2_21_NOBOM;
-  static JArray< jint > * SIGNATURE_UTF_8;
-  static JArray< jint > * SIGNATURE_UTF_8_BOM;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$Input__
diff --git a/libjava/gnu/xml/stream/XMLParser$MixedContentModel.h b/libjava/gnu/xml/stream/XMLParser$MixedContentModel.h
deleted file mode 100644
index e7f244a..0000000
--- a/libjava/gnu/xml/stream/XMLParser$MixedContentModel.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser$MixedContentModel__
-#define __gnu_xml_stream_XMLParser$MixedContentModel__
-
-#pragma interface
-
-#include <gnu/xml/stream/XMLParser$ContentModel.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$MixedContentModel;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser$MixedContentModel : public ::gnu::xml::stream::XMLParser$ContentModel
-{
-
-public: // actually package-private
-  XMLParser$MixedContentModel(::gnu::xml::stream::XMLParser *);
-  virtual void addName(::java::lang::String *);
-  virtual jboolean containsName(::java::lang::String *);
-private:
-  ::java::util::HashSet * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLParser$ContentModel)))) names;
-public: // actually package-private
-  ::gnu::xml::stream::XMLParser * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser$MixedContentModel__
diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h
deleted file mode 100644
index 319c2c4..0000000
--- a/libjava/gnu/xml/stream/XMLParser.h
+++ /dev/null
@@ -1,304 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLParser__
-#define __gnu_xml_stream_XMLParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLParser;
-          class XMLParser$Attribute;
-          class XMLParser$ContentModel;
-          class XMLParser$ContentParticle;
-          class XMLParser$Doctype;
-          class XMLParser$ElementContentModel;
-          class XMLParser$ExternalIds;
-          class XMLParser$Input;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLReporter;
-          class XMLResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLParser : public ::java::lang::Object
-{
-
-public:
-  XMLParser(::java::io::InputStream *, ::java::lang::String *, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, ::javax::xml::stream::XMLReporter *, ::javax::xml::stream::XMLResolver *);
-  XMLParser(::java::io::Reader *, ::java::lang::String *, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, ::javax::xml::stream::XMLReporter *, ::javax::xml::stream::XMLResolver *);
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
-  virtual void close();
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual jint getAttributeCount();
-  virtual ::java::lang::String * getAttributeLocalName(jint);
-  virtual ::java::lang::String * getAttributeNamespace(jint);
-  virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
-  virtual ::java::lang::String * getAttributeType(jint);
-private:
-  ::java::lang::String * getAttributeType(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAttributeValue(jint);
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual jboolean isAttributeDeclared(jint);
-public:
-  virtual ::java::lang::String * getCharacterEncodingScheme();
-  virtual ::java::lang::String * getElementText();
-  virtual ::java::lang::String * getEncoding();
-  virtual jint getEventType();
-  virtual ::java::lang::String * getLocalName();
-  virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual jint getNamespaceCount();
-  virtual ::java::lang::String * getNamespacePrefix(jint);
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getNamespaceURI(jint);
-  virtual ::java::lang::String * getPIData();
-  virtual ::java::lang::String * getPITarget();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-  virtual JArray< jchar > * getTextCharacters();
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint);
-  virtual jint getTextLength();
-  virtual jint getTextStart();
-  virtual ::java::lang::String * getVersion();
-  virtual jboolean hasName();
-  virtual jboolean hasText();
-  virtual jboolean isAttributeSpecified(jint);
-  virtual jboolean isCharacters();
-  virtual jboolean isEndElement();
-  virtual jboolean isStandalone();
-  virtual jboolean isStartElement();
-  virtual jboolean isWhiteSpace();
-  virtual jint nextTag();
-  virtual void require(jint, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean standaloneSet();
-  virtual jboolean hasNext();
-  virtual jint next();
-public: // actually package-private
-  virtual ::java::lang::String * getCurrentElement();
-private:
-  void mark(jint);
-  void reset();
-  jint read();
-  jint read(JArray< jint > *, jint, jint);
-  jint readCh();
-  void require(jchar);
-  void require(::java::lang::String *);
-  jboolean tryRead(jchar);
-  jboolean tryRead(::java::lang::String *);
-  void readUntil(::java::lang::String *);
-  jboolean tryWhitespace();
-  void skipWhitespace();
-  void requireWhitespace();
-public: // actually package-private
-  virtual ::java::lang::String * getXMLBase();
-private:
-  void pushInput(::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  void pushInput(::java::lang::String *, ::gnu::xml::stream::XMLParser$ExternalIds *, jboolean, jboolean);
-  void pushInput(::gnu::xml::stream::XMLParser$Input *);
-public: // actually package-private
-  static ::java::lang::String * canonicalize(::java::lang::String *);
-public:
-  static ::java::lang::String * absolutize(::java::lang::String *, ::java::lang::String *);
-private:
-  static jboolean isURLScheme(::java::lang::String *);
-public: // actually package-private
-  static ::java::io::InputStream * resolve(::java::lang::String *);
-private:
-  void popInput();
-  void readTextDecl();
-  void readXMLDecl();
-  void readDoctypeDecl();
-  void checkDoctype();
-  void readMarkupdecl(jboolean);
-  void readElementDecl();
-  void readContentspec(::java::lang::String *);
-  ::gnu::xml::stream::XMLParser$ElementContentModel * readElements(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::gnu::java::lang::CPStringBuilder *);
-  void readAttlistDecl();
-  void readAttDef(::java::lang::String *);
-  ::java::lang::String * readAttType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
-  void readEnumeration(jboolean, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
-  void readNotationType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
-  void readDefault(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::HashSet *);
-  void readEntityDecl(jboolean);
-  void readNotationDecl(jboolean);
-  ::gnu::xml::stream::XMLParser$ExternalIds * readExternalIds(jboolean, jboolean);
-  jint readStartElement();
-  jboolean attributeSpecified(::java::lang::String *);
-  void readAttribute(::java::lang::String *);
-  jboolean addNamespace(::gnu::xml::stream::XMLParser$Attribute *);
-  void readEndElement();
-  void endElementValidationHook();
-  void readComment(jboolean);
-  void readPI(jboolean);
-  void readReference();
-  void readCDSect();
-  jint readCharData(::java::lang::String *);
-  void expandEntity(::java::lang::String *, jboolean, jboolean);
-  jboolean isUnparsedEntity(::java::lang::String *);
-  void readEq();
-  jint literalReadCh(jboolean);
-  ::java::lang::String * readLiteral(jint, jboolean);
-  ::java::lang::StringBuffer * normalize(::java::lang::StringBuffer *);
-  void normalizeCRLF(::java::lang::StringBuffer *);
-  void expandPEReference();
-  JArray< jchar > * readCharacterRef(jint);
-  ::java::lang::String * readNmtoken(jboolean);
-  ::java::lang::String * readNmtoken(jboolean, ::java::lang::StringBuffer *);
-public:
-  static jboolean isXML11Char(jint);
-  static jboolean isXML11RestrictedChar(jint);
-private:
-  jboolean isNmtoken(::java::lang::String *, jboolean);
-public:
-  static jboolean isNameStartCharacter(jint, jboolean);
-  static jboolean isNameCharacter(jint, jboolean);
-  static jboolean isLetter(jint);
-  static jboolean isDigit(jint);
-  static jboolean isCombiningChar(jint);
-  static jboolean isExtender(jint);
-  static jboolean isChar(jint);
-private:
-  ::java::lang::String * intern(::java::lang::String *);
-  void error(::java::lang::String *);
-  void error(::java::lang::String *, ::java::lang::Object *);
-  void validateStartElement(::java::lang::String *);
-  void validateEndElement();
-  void validatePCData(::java::lang::String *);
-  void validateElementContent(::gnu::xml::stream::XMLParser$ElementContentModel *, ::java::util::LinkedList *);
-  ::java::lang::String * createRegularExpression(::gnu::xml::stream::XMLParser$ElementContentModel *);
-public: // actually package-private
-  virtual void validateDoctype();
-public:
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  static ::java::lang::String * encodeText(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::String * access$0(::gnu::xml::stream::XMLParser *, ::java::lang::String *);
-  static jboolean access$1(::gnu::xml::stream::XMLParser *);
-  static ::gnu::xml::stream::XMLParser$Input * access$2(::gnu::xml::stream::XMLParser *);
-  static ::java::util::LinkedList * access$3(::gnu::xml::stream::XMLParser *);
-private:
-  static const jint INIT = 0;
-  static const jint PROLOG = 1;
-  static const jint CONTENT = 2;
-  static const jint EMPTY_ELEMENT = 3;
-  static const jint MISC = 4;
-  static const jint LIT_ENTITY_REF = 2;
-  static const jint LIT_NORMALIZE = 4;
-  static const jint LIT_ATTRIBUTE = 8;
-  static const jint LIT_DISABLE_PE = 16;
-  static const jint LIT_DISABLE_CREF = 32;
-  static const jint LIT_DISABLE_EREF = 64;
-  static const jint LIT_PUBID = 256;
-public: // actually package-private
-  static const jint ATTRIBUTE_DEFAULT_UNDECLARED = 30;
-  static const jint ATTRIBUTE_DEFAULT_SPECIFIED = 31;
-  static const jint ATTRIBUTE_DEFAULT_IMPLIED = 32;
-  static const jint ATTRIBUTE_DEFAULT_REQUIRED = 33;
-  static const jint ATTRIBUTE_DEFAULT_FIXED = 34;
-  static const jint START_ENTITY = 50;
-  static const jint END_ENTITY = 51;
-private:
-  ::gnu::xml::stream::XMLParser$Input * __attribute__((aligned(__alignof__( ::java::lang::Object)))) input;
-  ::java::util::LinkedList * inputStack;
-  ::java::util::LinkedList * startEntityStack;
-  ::java::util::LinkedList * endEntityStack;
-  jint state;
-  jint event;
-  ::java::util::LinkedList * stack;
-  ::java::util::LinkedList * namespaces;
-  ::java::util::LinkedList * bases;
-  ::java::util::ArrayList * attrs;
-  ::java::lang::StringBuffer * buf;
-  ::java::lang::StringBuffer * nmtokenBuf;
-  ::java::lang::StringBuffer * literalBuf;
-  JArray< jint > * tmpBuf;
-  ::gnu::xml::stream::XMLParser$ContentModel * currentContentModel;
-  ::java::util::LinkedList * validationStack;
-  ::java::util::HashSet * ids;
-  ::java::util::HashSet * idrefs;
-  ::java::lang::String * piTarget;
-  ::java::lang::String * piData;
-  ::java::lang::String * xmlVersion;
-  ::java::lang::String * xmlEncoding;
-  ::java::lang::Boolean * xmlStandalone;
-public: // actually package-private
-  ::gnu::xml::stream::XMLParser$Doctype * doctype;
-private:
-  jboolean expandPE;
-  jboolean peIsError;
-  jboolean validating;
-  jboolean stringInterning;
-  jboolean coalescing;
-  jboolean replaceERefs;
-  jboolean externalEntities;
-  jboolean supportDTD;
-  jboolean namespaceAware;
-  jboolean baseAware;
-  jboolean extendedEventTypes;
-public: // actually package-private
-  ::javax::xml::stream::XMLReporter * reporter;
-  ::javax::xml::stream::XMLResolver * resolver;
-private:
-  static ::java::lang::String * TEST_START_ELEMENT;
-  static ::java::lang::String * TEST_END_ELEMENT;
-  static ::java::lang::String * TEST_COMMENT;
-  static ::java::lang::String * TEST_PI;
-  static ::java::lang::String * TEST_CDATA;
-  static ::java::lang::String * TEST_XML_DECL;
-  static ::java::lang::String * TEST_DOCTYPE_DECL;
-  static ::java::lang::String * TEST_ELEMENT_DECL;
-  static ::java::lang::String * TEST_ATTLIST_DECL;
-  static ::java::lang::String * TEST_ENTITY_DECL;
-  static ::java::lang::String * TEST_NOTATION_DECL;
-  static ::java::lang::String * TEST_KET;
-  static ::java::lang::String * TEST_END_COMMENT;
-  static ::java::lang::String * TEST_END_PI;
-  static ::java::lang::String * TEST_END_CDATA;
-  static ::java::util::LinkedHashMap * PREDEFINED_ENTITIES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLParser__
diff --git a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
deleted file mode 100644
index 245332e..0000000
--- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_stream_XMLStreamWriterImpl__
-#define __gnu_xml_stream_XMLStreamWriterImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamWriterImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace helpers
-        {
-            class NamespaceSupport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::stream::XMLStreamWriterImpl : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLStreamWriterImpl(::java::io::Writer *, ::java::lang::String *, jboolean);
-private:
-  void endStartElement();
-public:
-  virtual void writeStartElement(::java::lang::String *);
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::String * createPrefix(::java::lang::String *);
-public:
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *);
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void writeEmptyElement(::java::lang::String *);
-  virtual void writeEndElement();
-  virtual void writeEndDocument();
-  virtual void close();
-  virtual void flush();
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void writeNamespace(::java::lang::String *, ::java::lang::String *);
-private:
-  void writeNamespaceImpl(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual void writeDefaultNamespace(::java::lang::String *);
-  virtual void writeComment(::java::lang::String *);
-  virtual void writeProcessingInstruction(::java::lang::String *);
-  virtual void writeProcessingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void writeCData(::java::lang::String *);
-  virtual void writeDTD(::java::lang::String *);
-  virtual void writeEntityRef(::java::lang::String *);
-  virtual void writeStartDocument();
-  virtual void writeStartDocument(::java::lang::String *);
-  virtual void writeStartDocument(::java::lang::String *, ::java::lang::String *);
-  virtual void writeCharacters(::java::lang::String *);
-  virtual void writeCharacters(JArray< jchar > *, jint, jint);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *);
-  virtual void setDefaultNamespace(::java::lang::String *);
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-private:
-  void writeEncoded(::java::lang::String *, jboolean);
-  void writeEncodedWithRestrictedChars(::java::lang::String *, jboolean);
-  jboolean isName(::java::lang::String *);
-  jboolean isPrefix(::java::lang::String *);
-  jboolean isNCName(::java::lang::String *);
-  jboolean isChars(::java::lang::String *);
-  jboolean isURI(::java::lang::String *);
-public: // actually protected
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-  ::java::lang::String * encoding;
-  jboolean prefixDefaulting;
-  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
-private:
-  ::java::util::LinkedList * elements;
-  jboolean inStartElement;
-  jboolean emptyElement;
-  ::org::xml::sax::helpers::NamespaceSupport * namespaces;
-  jint count;
-  jboolean xml11;
-  jboolean hasXML11RestrictedChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_stream_XMLStreamWriterImpl__
diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h
deleted file mode 100644
index d82794d..0000000
--- a/libjava/gnu/xml/transform/AbstractNumberNode.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_AbstractNumberNode__
-#define __gnu_xml_transform_AbstractNumberNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-    namespace xml
-    {
-      namespace transform
-      {
-          class AbstractNumberNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::AbstractNumberNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *);
-  virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *);
-  static jboolean isAlphanumeric(jchar);
-  static ::java::lang::String * alphabetic(jchar, jint);
-  static ::java::lang::String * roman(jboolean, jint);
-  virtual JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint) = 0;
-public:
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint ALPHABETIC = 0;
-  static const jint TRADITIONAL = 1;
-  ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) format__;
-  ::java::lang::String * lang;
-  jint letterValue;
-  ::java::lang::String * groupingSeparator;
-  jint groupingSize;
-  static JArray< jint > * roman_numbers;
-  static JArray< jchar > * roman_chars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_AbstractNumberNode__
diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.h b/libjava/gnu/xml/transform/ApplyImportsNode.h
deleted file mode 100644
index 53f45e9..0000000
--- a/libjava/gnu/xml/transform/ApplyImportsNode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ApplyImportsNode__
-#define __gnu_xml_transform_ApplyImportsNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ApplyImportsNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ApplyImportsNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ApplyImportsNode();
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ApplyImportsNode__
diff --git a/libjava/gnu/xml/transform/ApplyTemplatesNode.h b/libjava/gnu/xml/transform/ApplyTemplatesNode.h
deleted file mode 100644
index c25d2f5..0000000
--- a/libjava/gnu/xml/transform/ApplyTemplatesNode.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ApplyTemplatesNode__
-#define __gnu_xml_transform_ApplyTemplatesNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ApplyTemplatesNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ApplyTemplatesNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, jboolean);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
-  ::javax::xml::namespace$::QName * mode;
-  ::java::util::List * sortKeys;
-  ::java::util::List * withParams;
-  jboolean isDefault;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ApplyTemplatesNode__
diff --git a/libjava/gnu/xml/transform/AttributeNode.h b/libjava/gnu/xml/transform/AttributeNode.h
deleted file mode 100644
index b83f7c8..0000000
--- a/libjava/gnu/xml/transform/AttributeNode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_AttributeNode__
-#define __gnu_xml_transform_AttributeNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class AttributeNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::AttributeNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  AttributeNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::org::w3c::dom::Node *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::String * getPrefix(::java::lang::String *);
-  ::java::lang::String * inventPrefix(::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
-  ::gnu::xml::transform::TemplateNode * namespace$;
-  ::org::w3c::dom::Node * source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_AttributeNode__
diff --git a/libjava/gnu/xml/transform/AttributeSet.h b/libjava/gnu/xml/transform/AttributeSet.h
deleted file mode 100644
index 2c92e12..0000000
--- a/libjava/gnu/xml/transform/AttributeSet.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_AttributeSet__
-#define __gnu_xml_transform_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class AttributeSet;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::AttributeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributeSet(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, ::java::lang::String *);
-  ::gnu::xml::transform::AttributeSet * clone(::gnu::xml::transform::Stylesheet *);
-  ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::java::lang::String * name;
-  ::java::lang::String * uas;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_AttributeSet__
diff --git a/libjava/gnu/xml/transform/Bindings.h b/libjava/gnu/xml/transform/Bindings.h
deleted file mode 100644
index abbc8f0..0000000
--- a/libjava/gnu/xml/transform/Bindings.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_Bindings__
-#define __gnu_xml_transform_Bindings__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Bindings;
-          class Stylesheet;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::Bindings : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Bindings(::gnu::xml::transform::Stylesheet *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void push(jint);
-  virtual void pop(jint);
-public:
-  virtual jboolean containsKey(::javax::xml::namespace$::QName *, jint);
-  virtual ::java::lang::Object * get(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  virtual void set(::javax::xml::namespace$::QName *, ::java::lang::Object *, jint);
-public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jint VARIABLE = 0;
-  static const jint PARAM = 1;
-  static const jint WITH_PARAM = 2;
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stylesheet;
-  ::java::util::LinkedList * variables;
-  ::java::util::LinkedList * parameters;
-  ::java::util::LinkedList * withParameters;
-  jboolean global;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_Bindings__
diff --git a/libjava/gnu/xml/transform/CallTemplateNode.h b/libjava/gnu/xml/transform/CallTemplateNode.h
deleted file mode 100644
index 03b2d17..0000000
--- a/libjava/gnu/xml/transform/CallTemplateNode.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_CallTemplateNode__
-#define __gnu_xml_transform_CallTemplateNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class CallTemplateNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::CallTemplateNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  CallTemplateNode(::javax::xml::namespace$::QName *, ::java::util::List *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
-  ::java::util::List * withParams;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_CallTemplateNode__
diff --git a/libjava/gnu/xml/transform/ChooseNode.h b/libjava/gnu/xml/transform/ChooseNode.h
deleted file mode 100644
index 3351945..0000000
--- a/libjava/gnu/xml/transform/ChooseNode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ChooseNode__
-#define __gnu_xml_transform_ChooseNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ChooseNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ChooseNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ChooseNode();
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ChooseNode__
diff --git a/libjava/gnu/xml/transform/CommentNode.h b/libjava/gnu/xml/transform/CommentNode.h
deleted file mode 100644
index 78b6d18..0000000
--- a/libjava/gnu/xml/transform/CommentNode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_CommentNode__
-#define __gnu_xml_transform_CommentNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class CommentNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::CommentNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  CommentNode();
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_CommentNode__
diff --git a/libjava/gnu/xml/transform/CopyNode.h b/libjava/gnu/xml/transform/CopyNode.h
deleted file mode 100644
index e724dbb..0000000
--- a/libjava/gnu/xml/transform/CopyNode.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_CopyNode__
-#define __gnu_xml_transform_CopyNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class CopyNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::CopyNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  CopyNode(::java::lang::String *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) uas;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_CopyNode__
diff --git a/libjava/gnu/xml/transform/CopyOfNode.h b/libjava/gnu/xml/transform/CopyOfNode.h
deleted file mode 100644
index 4bf6607..0000000
--- a/libjava/gnu/xml/transform/CopyOfNode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_CopyOfNode__
-#define __gnu_xml_transform_CopyOfNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class CopyOfNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::CopyOfNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  CopyOfNode(::gnu::xml::xpath::Expr *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_CopyOfNode__
diff --git a/libjava/gnu/xml/transform/CurrentFunction.h b/libjava/gnu/xml/transform/CurrentFunction.h
deleted file mode 100644
index 118bfe5..0000000
--- a/libjava/gnu/xml/transform/CurrentFunction.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_CurrentFunction__
-#define __gnu_xml_transform_CurrentFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class CurrentFunction;
-          class Stylesheet;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::CurrentFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  CurrentFunction(::gnu::xml::transform::Stylesheet *);
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_CurrentFunction__
diff --git a/libjava/gnu/xml/transform/DOMSourceLocator.h b/libjava/gnu/xml/transform/DOMSourceLocator.h
deleted file mode 100644
index 974654e..0000000
--- a/libjava/gnu/xml/transform/DOMSourceLocator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_DOMSourceLocator__
-#define __gnu_xml_transform_DOMSourceLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class DOMSourceLocator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::DOMSourceLocator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DOMSourceLocator(::org::w3c::dom::Node *);
-public:
-  virtual ::org::w3c::dom::Node * getOriginatingNode();
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual jint getLineNumber();
-  virtual jint getColumnNumber();
-public: // actually package-private
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_DOMSourceLocator__
diff --git a/libjava/gnu/xml/transform/DocumentFunction.h b/libjava/gnu/xml/transform/DocumentFunction.h
deleted file mode 100644
index 88c31dc..0000000
--- a/libjava/gnu/xml/transform/DocumentFunction.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_DocumentFunction__
-#define __gnu_xml_transform_DocumentFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class DocumentFunction;
-          class Stylesheet;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::DocumentFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  DocumentFunction(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * document(::java::lang::String *, ::java::lang::String *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
-  ::org::w3c::dom::Node * base;
-  ::java::util::List * args;
-  ::java::util::List * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_DocumentFunction__
diff --git a/libjava/gnu/xml/transform/ElementAvailableFunction.h b/libjava/gnu/xml/transform/ElementAvailableFunction.h
deleted file mode 100644
index 21a828a..0000000
--- a/libjava/gnu/xml/transform/ElementAvailableFunction.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ElementAvailableFunction__
-#define __gnu_xml_transform_ElementAvailableFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ElementAvailableFunction;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ElementAvailableFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ElementAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
-public:
-  virtual ::java::lang::Object * evaluate(::java::util::List *);
-  virtual void setArguments(::java::util::List *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static ::java::util::Collection * elements;
-  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ElementAvailableFunction__
diff --git a/libjava/gnu/xml/transform/ElementNode.h b/libjava/gnu/xml/transform/ElementNode.h
deleted file mode 100644
index b086d2a..0000000
--- a/libjava/gnu/xml/transform/ElementNode.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ElementNode__
-#define __gnu_xml_transform_ElementNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ElementNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ElementNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ElementNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, ::org::w3c::dom::Node *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::String * getPrefix(::java::lang::String *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
-  ::gnu::xml::transform::TemplateNode * namespace$;
-  ::java::lang::String * uas;
-  ::org::w3c::dom::Node * source;
-  ::java::util::Collection * elementExcludeResultPrefixes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ElementNode__
diff --git a/libjava/gnu/xml/transform/ErrorListenerErrorHandler.h b/libjava/gnu/xml/transform/ErrorListenerErrorHandler.h
deleted file mode 100644
index e7a4e36..0000000
--- a/libjava/gnu/xml/transform/ErrorListenerErrorHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ErrorListenerErrorHandler__
-#define __gnu_xml_transform_ErrorListenerErrorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListenerErrorHandler;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ErrorListenerErrorHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ErrorListenerErrorHandler(::javax::xml::transform::ErrorListener *);
-public:
-  virtual void warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-public: // actually package-private
-  ::javax::xml::transform::ErrorListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ErrorListenerErrorHandler__
diff --git a/libjava/gnu/xml/transform/ForEachNode.h b/libjava/gnu/xml/transform/ForEachNode.h
deleted file mode 100644
index 7b251d3..0000000
--- a/libjava/gnu/xml/transform/ForEachNode.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ForEachNode__
-#define __gnu_xml_transform_ForEachNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ForEachNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ForEachNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ForEachNode(::gnu::xml::xpath::Expr *, ::java::util::List *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
-  ::java::util::List * sortKeys;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ForEachNode__
diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.h b/libjava/gnu/xml/transform/FormatNumberFunction.h
deleted file mode 100644
index 634dc64..0000000
--- a/libjava/gnu/xml/transform/FormatNumberFunction.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_FormatNumberFunction__
-#define __gnu_xml_transform_FormatNumberFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class FormatNumberFunction;
-          class Stylesheet;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::FormatNumberFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FormatNumberFunction(::gnu::xml::transform::Stylesheet *);
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_FormatNumberFunction__
diff --git a/libjava/gnu/xml/transform/FunctionAvailableFunction.h b/libjava/gnu/xml/transform/FunctionAvailableFunction.h
deleted file mode 100644
index b34bfb0..0000000
--- a/libjava/gnu/xml/transform/FunctionAvailableFunction.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_FunctionAvailableFunction__
-#define __gnu_xml_transform_FunctionAvailableFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class FunctionAvailableFunction;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::FunctionAvailableFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FunctionAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
-public:
-  virtual ::java::lang::Object * evaluate(::java::util::List *);
-  virtual void setArguments(::java::util::List *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static ::java::util::Collection * xsltFunctions;
-  static ::java::util::Collection * xpathFunctions;
-  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_FunctionAvailableFunction__
diff --git a/libjava/gnu/xml/transform/GenerateIdFunction.h b/libjava/gnu/xml/transform/GenerateIdFunction.h
deleted file mode 100644
index fe43452..0000000
--- a/libjava/gnu/xml/transform/GenerateIdFunction.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_GenerateIdFunction__
-#define __gnu_xml_transform_GenerateIdFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class GenerateIdFunction;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::GenerateIdFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  GenerateIdFunction();
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_GenerateIdFunction__
diff --git a/libjava/gnu/xml/transform/IfNode.h b/libjava/gnu/xml/transform/IfNode.h
deleted file mode 100644
index 357da0d..0000000
--- a/libjava/gnu/xml/transform/IfNode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_IfNode__
-#define __gnu_xml_transform_IfNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class IfNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::IfNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  IfNode(::gnu::xml::xpath::Expr *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_IfNode__
diff --git a/libjava/gnu/xml/transform/Key.h b/libjava/gnu/xml/transform/Key.h
deleted file mode 100644
index 08ff987..0000000
--- a/libjava/gnu/xml/transform/Key.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_Key__
-#define __gnu_xml_transform_Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Key;
-          class Stylesheet;
-      }
-      namespace xpath
-      {
-          class Expr;
-          class Pattern;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::Key : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Key(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *);
-  virtual ::gnu::xml::transform::Key * clone(::gnu::xml::transform::Stylesheet *);
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::gnu::xml::xpath::Pattern * match;
-  ::gnu::xml::xpath::Expr * use;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_Key__
diff --git a/libjava/gnu/xml/transform/KeyFunction.h b/libjava/gnu/xml/transform/KeyFunction.h
deleted file mode 100644
index 7da94b1..0000000
--- a/libjava/gnu/xml/transform/KeyFunction.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_KeyFunction__
-#define __gnu_xml_transform_KeyFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class KeyFunction;
-          class Stylesheet;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::KeyFunction : public ::gnu::xml::xpath::Pattern
-{
-
-public: // actually package-private
-  KeyFunction(::gnu::xml::transform::Stylesheet *);
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  void addKeyNodes(::org::w3c::dom::Node *, ::java::util::Collection *, ::java::lang::String *, ::java::util::Collection *);
-  void addKeyNodeIfMatch(::org::w3c::dom::Node *, ::java::util::Collection *, ::java::lang::String *, ::java::util::Collection *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) stylesheet;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_KeyFunction__
diff --git a/libjava/gnu/xml/transform/LiteralNode.h b/libjava/gnu/xml/transform/LiteralNode.h
deleted file mode 100644
index c314eae..0000000
--- a/libjava/gnu/xml/transform/LiteralNode.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_LiteralNode__
-#define __gnu_xml_transform_LiteralNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class LiteralNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::LiteralNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  LiteralNode(::org::w3c::dom::Node *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) source;
-  ::java::util::Collection * elementExcludeResultPrefixes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_LiteralNode__
diff --git a/libjava/gnu/xml/transform/MessageNode.h b/libjava/gnu/xml/transform/MessageNode.h
deleted file mode 100644
index ebffd3d..0000000
--- a/libjava/gnu/xml/transform/MessageNode.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_MessageNode__
-#define __gnu_xml_transform_MessageNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class MessageNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::MessageNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  MessageNode(jboolean);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  static ::java::util::logging::Logger * logger;
-  jboolean __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) terminate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_MessageNode__
diff --git a/libjava/gnu/xml/transform/NamespaceProxy.h b/libjava/gnu/xml/transform/NamespaceProxy.h
deleted file mode 100644
index c92a7c5..0000000
--- a/libjava/gnu/xml/transform/NamespaceProxy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_NamespaceProxy__
-#define __gnu_xml_transform_NamespaceProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class NamespaceProxy;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::NamespaceProxy : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NamespaceProxy(::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_NamespaceProxy__
diff --git a/libjava/gnu/xml/transform/NodeNumberNode.h b/libjava/gnu/xml/transform/NodeNumberNode.h
deleted file mode 100644
index 770387e..0000000
--- a/libjava/gnu/xml/transform/NodeNumberNode.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_NodeNumberNode__
-#define __gnu_xml_transform_NodeNumberNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/AbstractNumberNode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class NodeNumberNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Pattern;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::NodeNumberNode : public ::gnu::xml::transform::AbstractNumberNode
-{
-
-public: // actually package-private
-  NodeNumberNode(jint, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint);
-  jboolean countMatches(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  jboolean fromMatches(::org::w3c::dom::Node *);
-  jint getIndex(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  static const jint SINGLE = 0;
-  static const jint MULTIPLE = 1;
-  static const jint ANY = 2;
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::transform::AbstractNumberNode)))) level;
-  ::gnu::xml::xpath::Pattern * count;
-  ::gnu::xml::xpath::Pattern * from;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_NodeNumberNode__
diff --git a/libjava/gnu/xml/transform/NumberNode.h b/libjava/gnu/xml/transform/NumberNode.h
deleted file mode 100644
index c8da966..0000000
--- a/libjava/gnu/xml/transform/NumberNode.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_NumberNode__
-#define __gnu_xml_transform_NumberNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/AbstractNumberNode.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class NumberNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::NumberNode : public ::gnu::xml::transform::AbstractNumberNode
-{
-
-public: // actually package-private
-  NumberNode(::gnu::xml::xpath::Expr *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::AbstractNumberNode)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_NumberNode__
diff --git a/libjava/gnu/xml/transform/OtherwiseNode.h b/libjava/gnu/xml/transform/OtherwiseNode.h
deleted file mode 100644
index 2a067a5..0000000
--- a/libjava/gnu/xml/transform/OtherwiseNode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_OtherwiseNode__
-#define __gnu_xml_transform_OtherwiseNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class OtherwiseNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::OtherwiseNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  OtherwiseNode();
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_OtherwiseNode__
diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h
deleted file mode 100644
index 786be5a..0000000
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ParameterNode__
-#define __gnu_xml_transform_ParameterNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ParameterNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ParameterNode(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *, jint);
-  ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
-  ::gnu::xml::xpath::Expr * select;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ParameterNode__
diff --git a/libjava/gnu/xml/transform/ProcessingInstructionNode.h b/libjava/gnu/xml/transform/ProcessingInstructionNode.h
deleted file mode 100644
index 35bae5f..0000000
--- a/libjava/gnu/xml/transform/ProcessingInstructionNode.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ProcessingInstructionNode__
-#define __gnu_xml_transform_ProcessingInstructionNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ProcessingInstructionNode;
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ProcessingInstructionNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ProcessingInstructionNode(::java::lang::String *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ProcessingInstructionNode__
diff --git a/libjava/gnu/xml/transform/SAXSerializer.h b/libjava/gnu/xml/transform/SAXSerializer.h
deleted file mode 100644
index 29b1f55..0000000
--- a/libjava/gnu/xml/transform/SAXSerializer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_SAXSerializer__
-#define __gnu_xml_transform_SAXSerializer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SAXSerializer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NamedNodeMap;
-          class Node;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-        namespace ext
-        {
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::SAXSerializer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SAXSerializer();
-  virtual jboolean isDefined(::java::lang::String *, ::java::lang::String *);
-  virtual void define(::java::lang::String *, ::java::lang::String *);
-  virtual void undefine(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jint getLength();
-  virtual ::java::lang::String * getURI(jint);
-  virtual ::java::lang::String * getLocalName(jint);
-  virtual ::java::lang::String * getQName(jint);
-  virtual ::java::lang::String * getType(jint);
-  virtual ::java::lang::String * getValue(jint);
-  virtual jint getIndex(::java::lang::String *, ::java::lang::String *);
-  virtual jint getIndex(::java::lang::String *);
-  virtual ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getType(::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-public: // actually package-private
-  virtual void serialize(::org::w3c::dom::Node *, ::org::xml::sax::ContentHandler *, ::org::xml::sax::ext::LexicalHandler *);
-  ::org::w3c::dom::NamedNodeMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
-  ::java::util::LinkedList * namespaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_SAXSerializer__
diff --git a/libjava/gnu/xml/transform/SAXTemplatesHandler.h b/libjava/gnu/xml/transform/SAXTemplatesHandler.h
deleted file mode 100644
index 4bd3a41..0000000
--- a/libjava/gnu/xml/transform/SAXTemplatesHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_SAXTemplatesHandler__
-#define __gnu_xml_transform_SAXTemplatesHandler__
-
-#pragma interface
-
-#include <gnu/xml/dom/ls/SAXEventSink.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SAXTemplatesHandler;
-          class TransformerFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Templates;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::SAXTemplatesHandler : public ::gnu::xml::dom::ls::SAXEventSink
-{
-
-public: // actually package-private
-  SAXTemplatesHandler(::gnu::xml::transform::TransformerFactoryImpl *);
-public:
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::javax::xml::transform::Templates * getTemplates();
-public: // actually package-private
-  ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::gnu::xml::dom::ls::SAXEventSink)))) factory;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_SAXTemplatesHandler__
diff --git a/libjava/gnu/xml/transform/SAXTransformerHandler.h b/libjava/gnu/xml/transform/SAXTransformerHandler.h
deleted file mode 100644
index b269ac89..0000000
--- a/libjava/gnu/xml/transform/SAXTransformerHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_SAXTransformerHandler__
-#define __gnu_xml_transform_SAXTransformerHandler__
-
-#pragma interface
-
-#include <gnu/xml/dom/ls/SAXEventSink.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SAXTransformerHandler;
-          class TransformerFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Transformer;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::SAXTransformerHandler : public ::gnu::xml::dom::ls::SAXEventSink
-{
-
-public: // actually package-private
-  SAXTransformerHandler(::gnu::xml::transform::TransformerFactoryImpl *, ::javax::xml::transform::Transformer *);
-public:
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::javax::xml::transform::Transformer * getTransformer();
-  virtual void setResult(::javax::xml::transform::Result *);
-  virtual void endDocument();
-public: // actually package-private
-  ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::gnu::xml::dom::ls::SAXEventSink)))) factory;
-  ::javax::xml::transform::Transformer * transformer;
-  ::java::lang::String * systemId;
-  ::javax::xml::transform::Result * result;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_SAXTransformerHandler__
diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h
deleted file mode 100644
index a8e0a29..0000000
--- a/libjava/gnu/xml/transform/SortKey.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_SortKey__
-#define __gnu_xml_transform_SortKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SortKey;
-          class Stylesheet;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::SortKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SortKey(::gnu::xml::xpath::Expr *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *);
-  ::java::lang::String * key(::org::w3c::dom::Node *);
-  void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *);
-private:
-  ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *);
-public: // actually package-private
-  static const jint DEFAULT = 0;
-  static const jint UPPER_FIRST = 1;
-  static const jint LOWER_FIRST = 2;
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::java::lang::Object)))) select;
-  ::gnu::xml::transform::TemplateNode * langTemplate;
-  ::gnu::xml::transform::TemplateNode * dataTypeTemplate;
-  ::gnu::xml::transform::TemplateNode * orderTemplate;
-  ::gnu::xml::transform::TemplateNode * caseOrderTemplate;
-  ::java::lang::String * lang;
-  ::java::lang::String * dataType;
-  jboolean descending;
-  jint caseOrder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_SortKey__
diff --git a/libjava/gnu/xml/transform/StreamSerializer.h b/libjava/gnu/xml/transform/StreamSerializer.h
deleted file mode 100644
index 9c10a44..0000000
--- a/libjava/gnu/xml/transform/StreamSerializer.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_StreamSerializer__
-#define __gnu_xml_transform_StreamSerializer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class StreamSerializer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetEncoder;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::StreamSerializer : public ::java::lang::Object
-{
-
-public:
-  StreamSerializer();
-  StreamSerializer(::java::lang::String *);
-  StreamSerializer(jint, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual void setCdataSectionElements(::java::util::Collection *);
-public:
-  virtual void serialize(::org::w3c::dom::Node *, ::java::io::OutputStream *);
-public: // actually package-private
-  virtual void serialize(::org::w3c::dom::Node *, ::java::io::OutputStream *, jboolean);
-private:
-  void doSerialize(::org::w3c::dom::Node *, ::java::io::OutputStream *, jboolean);
-public: // actually package-private
-  virtual jboolean isHTMLElement(::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual jboolean isDefined(::java::lang::String *, ::java::lang::String *);
-  virtual void pushNamespaceContext();
-  virtual ::java::lang::String * define(::java::lang::String *, ::java::lang::String *);
-  virtual void popNamespaceContext();
-  virtual JArray< jbyte > * encodeText(::java::lang::String *);
-  virtual ::java::lang::String * encode(::java::lang::String *, jboolean, jboolean);
-  virtual ::java::lang::String * toString(::org::w3c::dom::Node *);
-  virtual jboolean isHTMLBoolean(::org::w3c::dom::Attr *, ::java::lang::String *);
-  static ::java::lang::String * getHTMLCharacterEntity(jchar);
-  static const jint SPACE = 32;
-  static const jint BANG = 33;
-  static const jint APOS = 39;
-  static const jint SLASH = 47;
-  static const jint BRA = 60;
-  static const jint KET = 62;
-  static const jint EQ = 61;
-  static ::java::util::Map * HTML_BOOLEAN_ATTRIBUTES;
-  static ::java::util::HashSet * HTML_URIS;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encoding;
-public: // actually package-private
-  ::java::nio::charset::Charset * charset;
-  ::java::nio::charset::CharsetEncoder * encoder;
-  jint mode;
-  ::java::util::LinkedList * namespaces;
-public: // actually protected
-  ::java::lang::String * eol;
-public: // actually package-private
-  ::java::util::Collection * cdataSectionElements;
-public: // actually protected
-  jboolean discardDefaultContent;
-  jboolean xmlDeclaration;
-private:
-  jboolean htmlEncoded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_StreamSerializer__
diff --git a/libjava/gnu/xml/transform/StrippingInstruction.h b/libjava/gnu/xml/transform/StrippingInstruction.h
deleted file mode 100644
index 6afdfa0..0000000
--- a/libjava/gnu/xml/transform/StrippingInstruction.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_StrippingInstruction__
-#define __gnu_xml_transform_StrippingInstruction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class StrippingInstruction;
-      }
-      namespace xpath
-      {
-          class NameTest;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::StrippingInstruction : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StrippingInstruction(::gnu::xml::xpath::NameTest *, jint);
-  virtual jfloat getPriority();
-  ::gnu::xml::xpath::NameTest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  jint precedence;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_StrippingInstruction__
diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h
deleted file mode 100644
index 69ceaa8..0000000
--- a/libjava/gnu/xml/transform/Stylesheet.h
+++ /dev/null
@@ -1,171 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_Stylesheet__
-#define __gnu_xml_transform_Stylesheet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Bindings;
-          class Stylesheet;
-          class Template;
-          class TemplateNode;
-          class TransformerFactoryImpl;
-          class TransformerImpl;
-      }
-      namespace xpath
-      {
-          class NameTest;
-          class XPathImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunction;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class Text;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::Stylesheet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Stylesheet(::gnu::xml::transform::TransformerFactoryImpl *, ::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Document *, ::java::lang::String *, jint);
-  virtual ::gnu::xml::transform::Stylesheet * getRootStylesheet();
-  virtual void initDefaultDecimalFormat();
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void initTopLevelVariables(::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
-public: // actually package-private
-  virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jboolean);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::javax::xml::namespace$::QName *);
-  virtual ::gnu::xml::transform::Template * parseTemplate(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-  virtual void parseOutput(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-  virtual void parseKey(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-  virtual void parseDecimalFormat(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-private:
-  jchar parseDFChar(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *, jchar);
-  ::java::lang::String * parseDFString(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual void parseNamespaceAlias(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-  virtual void parseAttributeSet(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
-  virtual void parse(::org::w3c::dom::Node *, jboolean);
-  virtual void doParse(::org::w3c::dom::Node *, jboolean);
-  virtual ::gnu::xml::xpath::NameTest * parseNameTest(::java::lang::String *);
-  virtual ::gnu::xml::transform::TemplateNode * parseAttributeValueTemplate(::java::lang::String *, ::org::w3c::dom::Node *);
-  virtual jboolean isPreserved(::org::w3c::dom::Text *, jboolean);
-public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint);
-public: // actually package-private
-  virtual ::gnu::xml::transform::TemplateNode * parseApplyTemplates(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseCallTemplate(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseValueOf(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseForEach(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseIf(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseWhen(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseElement(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseAttribute(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseText(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseCopy(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseProcessingInstruction(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseNumber(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseCopyOf(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parseMessage(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::transform::TemplateNode * parse(::org::w3c::dom::Node *);
-private:
-  ::gnu::xml::transform::TemplateNode * doParse(::org::w3c::dom::Node *);
-public: // actually package-private
-  virtual ::java::util::List * parseSortKeys(::org::w3c::dom::Node *);
-  virtual ::java::util::List * parseWithParams(::org::w3c::dom::Node *);
-  virtual void addNamespaceNodes(::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::org::w3c::dom::Document *, ::java::util::Collection *);
-  static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
-  static ::java::lang::String * getRequiredAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *, ::org::w3c::dom::Node *);
-public:
-  virtual void handle(jshort, ::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static ::java::lang::String * XSL_NS;
-private:
-  static ::gnu::xml::xpath::NameTest * STYLESHEET_PRESERVE_TEXT;
-public: // actually package-private
-  static const jint OUTPUT_XML = 0;
-  static const jint OUTPUT_HTML = 1;
-  static const jint OUTPUT_TEXT = 2;
-  ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) factory;
-  ::gnu::xml::transform::TransformerImpl * transformer;
-  ::gnu::xml::transform::Stylesheet * parent;
-  ::gnu::xml::xpath::XPathImpl * xpath;
-  ::java::lang::String * systemId;
-  jint precedence;
-  jboolean debug;
-  ::java::lang::String * version;
-  ::java::util::Collection * extensionElementPrefixes;
-  ::java::util::Collection * excludeResultPrefixes;
-  ::java::util::Set * stripSpace;
-  ::java::util::Set * preserveSpace;
-  ::org::w3c::dom::Node * output;
-  jint outputMethod;
-  ::java::lang::String * outputVersion;
-  ::java::lang::String * outputEncoding;
-  jboolean outputOmitXmlDeclaration;
-  jboolean outputStandalone;
-  ::java::lang::String * outputPublicId;
-  ::java::lang::String * outputSystemId;
-  ::java::util::Collection * outputCdataSectionElements;
-  jboolean outputIndent;
-  ::java::lang::String * outputMediaType;
-  ::java::util::Collection * keys;
-  ::java::util::Map * decimalFormats;
-  ::java::util::Map * namespaceAliases;
-  ::java::util::List * attributeSets;
-  ::java::util::List * variables;
-  ::gnu::xml::transform::Bindings * bindings;
-  ::java::util::LinkedList * templates;
-  ::gnu::xml::transform::TemplateNode * builtInNodeTemplate;
-  ::gnu::xml::transform::TemplateNode * builtInTextTemplate;
-  ::org::w3c::dom::Node * current;
-  jboolean terminated;
-  ::gnu::xml::transform::Template * currentTemplate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_Stylesheet__
diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.h b/libjava/gnu/xml/transform/SystemPropertyFunction.h
deleted file mode 100644
index e1f16d9..0000000
--- a/libjava/gnu/xml/transform/SystemPropertyFunction.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_SystemPropertyFunction__
-#define __gnu_xml_transform_SystemPropertyFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SystemPropertyFunction;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::SystemPropertyFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SystemPropertyFunction();
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::lang::Object * systemProperty(::javax::xml::namespace$::QName *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_SystemPropertyFunction__
diff --git a/libjava/gnu/xml/transform/Template.h b/libjava/gnu/xml/transform/Template.h
deleted file mode 100644
index 018beac..0000000
--- a/libjava/gnu/xml/transform/Template.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_Template__
-#define __gnu_xml_transform_Template__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class Template;
-          class TemplateNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-          class Pattern;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::Template : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *);
-private:
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace$::QName *, jboolean);
-public: // actually package-private
-  virtual ::gnu::xml::transform::Template * clone(::gnu::xml::transform::Stylesheet *);
-public:
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  virtual ::gnu::xml::xpath::Test * getNodeTest(::gnu::xml::xpath::Expr *);
-  virtual jboolean matches(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
-  virtual jboolean matches(::javax::xml::namespace$::QName *);
-  virtual jboolean imports(::gnu::xml::transform::Template *);
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual void list(::java::io::PrintStream *);
-  static jdouble DEFAULT_PRIORITY;
-  ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stylesheet;
-  ::javax::xml::namespace$::QName * name;
-  ::gnu::xml::xpath::Pattern * match;
-  ::gnu::xml::transform::TemplateNode * node;
-  jdouble priority;
-  jint precedence;
-  ::javax::xml::namespace$::QName * mode;
-  jboolean isAnyNode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_Template__
diff --git a/libjava/gnu/xml/transform/TemplateNode.h b/libjava/gnu/xml/transform/TemplateNode.h
deleted file mode 100644
index 354ff78..0000000
--- a/libjava/gnu/xml/transform/TemplateNode.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TemplateNode__
-#define __gnu_xml_transform_TemplateNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplateNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TemplateNode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TemplateNode();
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *) = 0;
-public:
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  virtual void list(jint, ::java::io::PrintStream *, jboolean);
-  virtual jboolean hasParam(::javax::xml::namespace$::QName *);
-  static ::java::util::Comparator * documentOrderComparator;
-  ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::gnu::xml::transform::TemplateNode * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TemplateNode__
diff --git a/libjava/gnu/xml/transform/TemplatesImpl.h b/libjava/gnu/xml/transform/TemplatesImpl.h
deleted file mode 100644
index d9cc67b..0000000
--- a/libjava/gnu/xml/transform/TemplatesImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TemplatesImpl__
-#define __gnu_xml_transform_TemplatesImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplatesImpl;
-          class TransformerFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Transformer;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TemplatesImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TemplatesImpl(::gnu::xml::transform::TransformerFactoryImpl *, ::gnu::xml::transform::Stylesheet *);
-public:
-  virtual ::javax::xml::transform::Transformer * newTransformer();
-  virtual ::java::util::Properties * getOutputProperties();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) factory;
-  ::gnu::xml::transform::Stylesheet * stylesheet;
-  ::java::util::Properties * outputProperties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TemplatesImpl__
diff --git a/libjava/gnu/xml/transform/TextNode.h b/libjava/gnu/xml/transform/TextNode.h
deleted file mode 100644
index 9a832d1..0000000
--- a/libjava/gnu/xml/transform/TextNode.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TextNode__
-#define __gnu_xml_transform_TextNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplateNode;
-          class TextNode;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TextNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  TextNode(jboolean);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) disableOutputEscaping;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TextNode__
diff --git a/libjava/gnu/xml/transform/TransformerFactoryImpl.h b/libjava/gnu/xml/transform/TransformerFactoryImpl.h
deleted file mode 100644
index ecdb46f..0000000
--- a/libjava/gnu/xml/transform/TransformerFactoryImpl.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TransformerFactoryImpl__
-#define __gnu_xml_transform_TransformerFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/transform/sax/SAXTransformerFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TransformerFactoryImpl;
-          class XSLURIResolver;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class Templates;
-          class Transformer;
-          class URIResolver;
-        namespace sax
-        {
-            class TemplatesHandler;
-            class TransformerHandler;
-        }
-      }
-      namespace xpath
-      {
-          class XPathFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLFilter;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TransformerFactoryImpl : public ::javax::xml::transform::sax::SAXTransformerFactory
-{
-
-public:
-  TransformerFactoryImpl();
-  virtual ::javax::xml::transform::Transformer * newTransformer(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::Transformer * newTransformer();
-  virtual ::javax::xml::transform::Templates * newTemplates(::javax::xml::transform::Source *);
-public: // actually package-private
-  virtual ::gnu::xml::transform::Stylesheet * newStylesheet(::javax::xml::transform::Source *, jint, ::gnu::xml::transform::Stylesheet *);
-public:
-  virtual ::javax::xml::transform::Source * getAssociatedStylesheet(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::java::util::Map * parseParameters(::java::lang::String *);
-  virtual ::java::lang::String * unquote(::java::lang::String *);
-public:
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-  virtual ::javax::xml::transform::sax::TemplatesHandler * newTemplatesHandler();
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler();
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Templates *);
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Source *);
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Templates *);
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  ::javax::xml::xpath::XPathFactory * __attribute__((aligned(__alignof__( ::javax::xml::transform::sax::SAXTransformerFactory)))) xpathFactory;
-  ::gnu::xml::transform::XSLURIResolver * resolver;
-  ::javax::xml::transform::ErrorListener * userListener;
-  ::javax::xml::transform::URIResolver * userResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TransformerFactoryImpl__
diff --git a/libjava/gnu/xml/transform/TransformerImpl.h b/libjava/gnu/xml/transform/TransformerImpl.h
deleted file mode 100644
index 9d10bd2..0000000
--- a/libjava/gnu/xml/transform/TransformerImpl.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TransformerImpl__
-#define __gnu_xml_transform_TransformerImpl__
-
-#pragma interface
-
-#include <javax/xml/transform/Transformer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TransformerFactoryImpl;
-          class TransformerImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace transform
-      {
-          class ErrorListener;
-          class Result;
-          class Source;
-          class URIResolver;
-        namespace stream
-        {
-            class StreamResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TransformerImpl : public ::javax::xml::transform::Transformer
-{
-
-public: // actually package-private
-  TransformerImpl(::gnu::xml::transform::TransformerFactoryImpl *, ::gnu::xml::transform::Stylesheet *, ::java::util::Properties *);
-public:
-  virtual void transform(::javax::xml::transform::Source *, ::javax::xml::transform::Result *);
-public: // actually package-private
-  static jboolean strip(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *);
-private:
-  static JArray< ::java::lang::String * > * tokenizeWhitespace(::java::lang::String *);
-public: // actually package-private
-  virtual void writeStreamResult(::org::w3c::dom::Node *, ::javax::xml::transform::stream::StreamResult *, jint, ::java::lang::String *);
-  virtual void copyChildren(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual void clearParameters();
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual void setOutputProperties(::java::util::Properties *);
-  virtual ::java::util::Properties * getOutputProperties();
-  virtual void setOutputProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getOutputProperty(::java::lang::String *);
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-public: // actually package-private
-  virtual void reindent(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, jint);
-  virtual void convertCdataSectionElements(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, ::java::util::List *);
-  virtual jboolean match(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
-  ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) factory;
-  ::gnu::xml::transform::Stylesheet * stylesheet;
-  ::javax::xml::transform::URIResolver * uriResolver;
-  ::javax::xml::transform::ErrorListener * errorListener;
-  ::java::util::Properties * outputProperties;
-  static ::java::lang::String * INDENT_WHITESPACE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TransformerImpl__
diff --git a/libjava/gnu/xml/transform/TransformerOutputProperties.h b/libjava/gnu/xml/transform/TransformerOutputProperties.h
deleted file mode 100644
index e5fd927..0000000
--- a/libjava/gnu/xml/transform/TransformerOutputProperties.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_TransformerOutputProperties__
-#define __gnu_xml_transform_TransformerOutputProperties__
-
-#pragma interface
-
-#include <java/util/Properties.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TransformerOutputProperties;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::TransformerOutputProperties : public ::java::util::Properties
-{
-
-public: // actually package-private
-  TransformerOutputProperties(::gnu::xml::transform::Stylesheet *);
-public:
-  virtual ::java::lang::String * getProperty(::java::lang::String *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void clear();
-public: // actually package-private
-  virtual void apply();
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::util::Properties)))) defaultProperties;
-  ::gnu::xml::transform::Stylesheet * stylesheet;
-  jboolean dirty;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_TransformerOutputProperties__
diff --git a/libjava/gnu/xml/transform/URIResolverEntityResolver.h b/libjava/gnu/xml/transform/URIResolverEntityResolver.h
deleted file mode 100644
index f7cd288..0000000
--- a/libjava/gnu/xml/transform/URIResolverEntityResolver.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_URIResolverEntityResolver__
-#define __gnu_xml_transform_URIResolverEntityResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class URIResolverEntityResolver;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class URIResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::URIResolverEntityResolver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URIResolverEntityResolver(::javax::xml::transform::URIResolver *);
-public:
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  ::javax::xml::transform::URIResolver * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_URIResolverEntityResolver__
diff --git a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
deleted file mode 100644
index 646bb3b..0000000
--- a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_UnparsedEntityUriFunction__
-#define __gnu_xml_transform_UnparsedEntityUriFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class UnparsedEntityUriFunction;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::UnparsedEntityUriFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  UnparsedEntityUriFunction();
-public:
-  ::java::lang::Object * evaluate(::java::util::List *);
-  void setArguments(::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_UnparsedEntityUriFunction__
diff --git a/libjava/gnu/xml/transform/ValueOfNode.h b/libjava/gnu/xml/transform/ValueOfNode.h
deleted file mode 100644
index 30ed40d..0000000
--- a/libjava/gnu/xml/transform/ValueOfNode.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_ValueOfNode__
-#define __gnu_xml_transform_ValueOfNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplateNode;
-          class ValueOfNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::ValueOfNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  ValueOfNode(::gnu::xml::xpath::Expr *, jboolean);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
-  jboolean disableOutputEscaping;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_ValueOfNode__
diff --git a/libjava/gnu/xml/transform/WhenNode.h b/libjava/gnu/xml/transform/WhenNode.h
deleted file mode 100644
index 835b382..0000000
--- a/libjava/gnu/xml/transform/WhenNode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_WhenNode__
-#define __gnu_xml_transform_WhenNode__
-
-#pragma interface
-
-#include <gnu/xml/transform/TemplateNode.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplateNode;
-          class WhenNode;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::WhenNode : public ::gnu::xml::transform::TemplateNode
-{
-
-public: // actually package-private
-  WhenNode(::gnu::xml::xpath::Expr *);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-public:
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_WhenNode__
diff --git a/libjava/gnu/xml/transform/WithParam.h b/libjava/gnu/xml/transform/WithParam.h
deleted file mode 100644
index 1d50e25..0000000
--- a/libjava/gnu/xml/transform/WithParam.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_WithParam__
-#define __gnu_xml_transform_WithParam__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Stylesheet;
-          class TemplateNode;
-          class WithParam;
-      }
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::WithParam : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *);
-  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::transform::TemplateNode *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::transform::WithParam * clone(::gnu::xml::transform::Stylesheet *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::gnu::xml::xpath::Expr * select;
-  ::gnu::xml::transform::TemplateNode * content;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_WithParam__
diff --git a/libjava/gnu/xml/transform/XSLComparator.h b/libjava/gnu/xml/transform/XSLComparator.h
deleted file mode 100644
index 0bde3e8..0000000
--- a/libjava/gnu/xml/transform/XSLComparator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_XSLComparator__
-#define __gnu_xml_transform_XSLComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class XSLComparator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::XSLComparator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XSLComparator(::java::util::List *);
-public:
-  virtual jint XSLComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sortKeys;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_XSLComparator__
diff --git a/libjava/gnu/xml/transform/XSLURIResolver.h b/libjava/gnu/xml/transform/XSLURIResolver.h
deleted file mode 100644
index 394c4c7..0000000
--- a/libjava/gnu/xml/transform/XSLURIResolver.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_transform_XSLURIResolver__
-#define __gnu_xml_transform_XSLURIResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class XSLURIResolver;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class URIResolver;
-        namespace dom
-        {
-            class DOMSource;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::XSLURIResolver : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XSLURIResolver();
-  virtual void setUserResolver(::javax::xml::transform::URIResolver *);
-  virtual void setUserListener(::javax::xml::transform::ErrorListener *);
-  virtual void flush();
-public:
-  virtual ::javax::xml::transform::Source * resolve(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  virtual ::javax::xml::transform::dom::DOMSource * resolveDOM(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::net::URL * resolveURL(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::parsers::DocumentBuilder * getDocumentBuilder();
-  virtual ::javax::xml::transform::dom::DOMSource * parse(::org::xml::sax::InputSource *, ::org::xml::sax::XMLReader *);
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastModifiedCache;
-  ::java::util::Map * nodeCache;
-  ::javax::xml::parsers::DocumentBuilder * builder;
-  ::javax::xml::transform::URIResolver * userResolver;
-  ::javax::xml::transform::ErrorListener * userListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_transform_XSLURIResolver__
diff --git a/libjava/gnu/xml/util/DoParse$MyErrorHandler.h b/libjava/gnu/xml/util/DoParse$MyErrorHandler.h
deleted file mode 100644
index 3c61367..0000000
--- a/libjava/gnu/xml/util/DoParse$MyErrorHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_DoParse$MyErrorHandler__
-#define __gnu_xml_util_DoParse$MyErrorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class DoParse$MyErrorHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::DoParse$MyErrorHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DoParse$MyErrorHandler();
-public:
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void warning(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_DoParse$MyErrorHandler__
diff --git a/libjava/gnu/xml/util/DoParse.h b/libjava/gnu/xml/util/DoParse.h
deleted file mode 100644
index b775f00..0000000
--- a/libjava/gnu/xml/util/DoParse.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_DoParse__
-#define __gnu_xml_util_DoParse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class EventConsumer;
-      }
-      namespace util
-      {
-          class DoParse;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::DoParse : public ::java::lang::Object
-{
-
-  DoParse();
-public:
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  static jboolean hasValidator(::gnu::xml::pipeline::EventConsumer *);
-  static ::java::lang::String * printParseException(::java::lang::String *, ::org::xml::sax::SAXParseException *);
-public: // actually package-private
-  static jint access$0();
-  static void access$1(jint);
-  static ::java::lang::String * access$2(::java::lang::String *, ::org::xml::sax::SAXParseException *);
-  static jint access$3();
-  static void access$4(jint);
-  static ::org::xml::sax::SAXParseException * access$5();
-  static void access$6(::org::xml::sax::SAXParseException *);
-private:
-  static ::org::xml::sax::SAXParseException * fatal;
-  static jint errorCount;
-  static jint fatalCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_DoParse__
diff --git a/libjava/gnu/xml/util/DomParser.h b/libjava/gnu/xml/util/DomParser.h
deleted file mode 100644
index f64b729..0000000
--- a/libjava/gnu/xml/util/DomParser.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_DomParser__
-#define __gnu_xml_util_DomParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class DomParser;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-        namespace ext
-        {
-            class DeclHandler;
-            class DefaultHandler2;
-            class LexicalHandler;
-        }
-        namespace helpers
-        {
-            class NamespaceSupport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::util::DomParser : public ::java::lang::Object
-{
-
-public:
-  DomParser();
-  DomParser(::org::w3c::dom::Node *);
-  ::org::xml::sax::EntityResolver * getEntityResolver();
-  void setEntityResolver(::org::xml::sax::EntityResolver *);
-  void setLocale(::java::util::Locale *);
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  void setContentHandler(::org::xml::sax::ContentHandler *);
-  ::org::xml::sax::DTDHandler * getDTDHandler();
-  void setDTDHandler(::org::xml::sax::DTDHandler *);
-  void parse(::java::lang::String *);
-  void parse(::org::xml::sax::InputSource *);
-private:
-  void parse();
-  jboolean getIsL2(::org::w3c::dom::Node *);
-public:
-  jboolean getFeature(::java::lang::String *);
-  ::java::lang::Object * getProperty(::java::lang::String *);
-  void setFeature(::java::lang::String *, jboolean);
-  void setProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  void setStart(::org::w3c::dom::Node *);
-  void walk();
-  void callEnd(::org::w3c::dom::Node *);
-  ::org::xml::sax::ext::DefaultHandler2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultHandler;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::ext::DeclHandler * declHandler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  ::org::xml::sax::ErrorHandler * errHandler;
-  ::org::xml::sax::EntityResolver * resolver;
-  ::java::util::Locale * locale;
-  ::org::w3c::dom::Node * start;
-  ::org::w3c::dom::Node * current;
-  jboolean isL2;
-  jboolean showNamespaces;
-  jboolean showXML1_0;
-  ::org::xml::sax::helpers::NamespaceSupport * prefixStack;
-  jboolean isDocument;
-  static ::java::lang::String * FEATURES;
-  static ::java::lang::String * HANDLERS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_DomParser__
diff --git a/libjava/gnu/xml/util/Resolver.h b/libjava/gnu/xml/util/Resolver.h
deleted file mode 100644
index ccafe1f..0000000
--- a/libjava/gnu/xml/util/Resolver.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_Resolver__
-#define __gnu_xml_util_Resolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class Resolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::Resolver : public ::java::lang::Object
-{
-
-public:
-  static void addDirectoryMapping(::java::util::Dictionary *, JArray< JArray< ::java::lang::String * > * > *, ::java::io::File *);
-  static ::java::lang::String * fileNameToURL(::java::lang::String *);
-  static ::java::lang::String * fileToURL(::java::io::File *);
-  static ::java::lang::String * getURL(::java::lang::String *);
-  Resolver(::java::util::Dictionary *);
-  static ::java::lang::String * getEncoding(::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::util::Dictionary * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pubidMapping;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_Resolver__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$DomHandler.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$DomHandler.h
deleted file mode 100644
index 62e4aba..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$DomHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$DomHandler__
-#define __gnu_xml_util_SAXNullTransformerFactory$DomHandler__
-
-#pragma interface
-
-#include <gnu/xml/dom/Consumer$Backdoor.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace pipeline
-      {
-          class DomConsumer;
-      }
-      namespace util
-      {
-          class SAXNullTransformerFactory$DomHandler;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$DomHandler : public ::gnu::xml::dom::Consumer$Backdoor
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$DomHandler(::gnu::xml::pipeline::DomConsumer *, ::javax::xml::transform::dom::DOMResult *);
-public:
-  virtual void endDocument();
-private:
-  ::javax::xml::transform::dom::DOMResult * __attribute__((aligned(__alignof__( ::gnu::xml::dom::Consumer$Backdoor)))) result;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$DomHandler__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.h
deleted file mode 100644
index b1c1bb1..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$DomTerminus__
-#define __gnu_xml_util_SAXNullTransformerFactory$DomTerminus__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/DomConsumer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory$DomTerminus;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$DomTerminus : public ::gnu::xml::pipeline::DomConsumer
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$DomTerminus(::javax::xml::transform::dom::DOMResult *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$DomTerminus__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.h
deleted file mode 100644
index 3764fb6..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$ListenerAdapter__
-#define __gnu_xml_util_SAXNullTransformerFactory$ListenerAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory$ListenerAdapter;
-          class SAXNullTransformerFactory$NullTransformer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class TransformerException;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$ListenerAdapter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$ListenerAdapter(::gnu::xml::util::SAXNullTransformerFactory$NullTransformer *);
-private:
-  ::javax::xml::transform::TransformerException * map(::org::xml::sax::SAXParseException *);
-public:
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-  virtual void warning(::org::xml::sax::SAXParseException *);
-public: // actually package-private
-  ::gnu::xml::util::SAXNullTransformerFactory$NullTransformer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) transformer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$ListenerAdapter__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.h
deleted file mode 100644
index 0bf4b46..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$LocatorAdapter__
-#define __gnu_xml_util_SAXNullTransformerFactory$LocatorAdapter__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/LocatorImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory$LocatorAdapter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$LocatorAdapter : public ::org::xml::sax::helpers::LocatorImpl
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$LocatorAdapter(::org::xml::sax::SAXParseException *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$LocatorAdapter__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$NullHandler.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$NullHandler.h
deleted file mode 100644
index 784a723..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$NullHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$NullHandler__
-#define __gnu_xml_util_SAXNullTransformerFactory$NullHandler__
-
-#pragma interface
-
-#include <gnu/xml/pipeline/EventFilter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory$NullHandler;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Transformer;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$NullHandler : public ::gnu::xml::pipeline::EventFilter
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$NullHandler(::javax::xml::transform::Transformer *);
-public:
-  virtual ::javax::xml::transform::Transformer * getTransformer();
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual void setResult(::javax::xml::transform::Result *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::pipeline::EventFilter)))) systemId;
-  ::javax::xml::transform::Transformer * transformer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$NullHandler__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.h b/libjava/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.h
deleted file mode 100644
index 78fdb8c..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory$NullTransformer__
-#define __gnu_xml_util_SAXNullTransformerFactory$NullTransformer__
-
-#pragma interface
-
-#include <javax/xml/transform/Transformer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory$NullHandler;
-          class SAXNullTransformerFactory$NullTransformer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Result;
-          class Source;
-          class TransformerException;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory$NullTransformer : public ::javax::xml::transform::Transformer
-{
-
-public: // actually package-private
-  SAXNullTransformerFactory$NullTransformer();
-public:
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-  virtual void setOutputProperties(::java::util::Properties *);
-  virtual ::java::util::Properties * getOutputProperties();
-  virtual void setOutputProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getOutputProperty(::java::lang::String *);
-  virtual void clearParameters();
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual void transform(::javax::xml::transform::Source *, ::javax::xml::transform::Result *);
-private:
-  ::javax::xml::transform::URIResolver * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) uriResolver;
-  ::java::util::Properties * props;
-  ::java::util::Hashtable * params;
-public: // actually package-private
-  ::javax::xml::transform::ErrorListener * errListener;
-  ::javax::xml::transform::TransformerException * ex;
-  ::gnu::xml::util::SAXNullTransformerFactory$NullHandler * handler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory$NullTransformer__
diff --git a/libjava/gnu/xml/util/SAXNullTransformerFactory.h b/libjava/gnu/xml/util/SAXNullTransformerFactory.h
deleted file mode 100644
index f941502..0000000
--- a/libjava/gnu/xml/util/SAXNullTransformerFactory.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_SAXNullTransformerFactory__
-#define __gnu_xml_util_SAXNullTransformerFactory__
-
-#pragma interface
-
-#include <javax/xml/transform/sax/SAXTransformerFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class SAXNullTransformerFactory;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class Templates;
-          class Transformer;
-          class URIResolver;
-        namespace sax
-        {
-            class TemplatesHandler;
-            class TransformerHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLFilter;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::SAXNullTransformerFactory : public ::javax::xml::transform::sax::SAXTransformerFactory
-{
-
-public:
-  SAXNullTransformerFactory();
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual ::javax::xml::transform::Source * getAssociatedStylesheet(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::xml::transform::Transformer * newTransformer();
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler();
-  virtual ::javax::xml::transform::Transformer * newTransformer(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::Templates * newTemplates(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::sax::TemplatesHandler * newTemplatesHandler();
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Source *);
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Templates *);
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Source *);
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Templates *);
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener();
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *);
-  virtual ::javax::xml::transform::URIResolver * getURIResolver();
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *);
-private:
-  static ::java::io::OutputStream * getOutputStream(::java::lang::String *);
-public: // actually package-private
-  static ::java::io::OutputStream * access$0(::java::lang::String *);
-private:
-  ::javax::xml::transform::ErrorListener * __attribute__((aligned(__alignof__( ::javax::xml::transform::sax::SAXTransformerFactory)))) errListener;
-  ::javax::xml::transform::URIResolver * uriResolver;
-  static ::java::lang::String * noXSLT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_SAXNullTransformerFactory__
diff --git a/libjava/gnu/xml/util/XCat$Catalog.h b/libjava/gnu/xml/util/XCat$Catalog.h
deleted file mode 100644
index 4b727ce..0000000
--- a/libjava/gnu/xml/util/XCat$Catalog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XCat$Catalog__
-#define __gnu_xml_util_XCat$Catalog__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class XCat$Catalog;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XCat$Catalog : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XCat$Catalog();
-private:
-  ::org::xml::sax::InputSource * locatePublicId(::java::lang::String *);
-  ::org::xml::sax::InputSource * mapURI(::java::lang::String *, ::java::util::Hashtable *, ::java::util::Hashtable *, ::java::util::Hashtable *);
-public:
-  virtual ::org::xml::sax::InputSource * resolve(jboolean, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveURI(::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * getExternalSubset(::java::lang::String *);
-private:
-  ::gnu::xml::util::XCat$Catalog * getNext(jint);
-  ::org::xml::sax::InputSource * checkDelegations(::java::util::Hashtable *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) catalogURI;
-  ::org::xml::sax::ErrorHandler * eh;
-  jboolean unified;
-  ::java::lang::String * parserClass;
-  jboolean hasPreference;
-  jboolean usingPublic;
-  ::java::util::Hashtable * publicIds;
-  ::java::util::Hashtable * publicDelegations;
-  ::java::util::Hashtable * systemIds;
-  ::java::util::Hashtable * systemRewrites;
-  ::java::util::Hashtable * systemDelegations;
-  ::java::util::Hashtable * uris;
-  ::java::util::Hashtable * uriRewrites;
-  ::java::util::Hashtable * uriDelegations;
-  ::java::util::Hashtable * doctypes;
-  ::java::util::Vector * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XCat$Catalog__
diff --git a/libjava/gnu/xml/util/XCat$DoneDelegation.h b/libjava/gnu/xml/util/XCat$DoneDelegation.h
deleted file mode 100644
index 34e146a..0000000
--- a/libjava/gnu/xml/util/XCat$DoneDelegation.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XCat$DoneDelegation__
-#define __gnu_xml_util_XCat$DoneDelegation__
-
-#pragma interface
-
-#include <org/xml/sax/SAXException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class XCat$DoneDelegation;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XCat$DoneDelegation : public ::org::xml::sax::SAXException
-{
-
-public: // actually package-private
-  XCat$DoneDelegation();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XCat$DoneDelegation__
diff --git a/libjava/gnu/xml/util/XCat$Loader.h b/libjava/gnu/xml/util/XCat$Loader.h
deleted file mode 100644
index 846c85b..0000000
--- a/libjava/gnu/xml/util/XCat$Loader.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XCat$Loader__
-#define __gnu_xml_util_XCat$Loader__
-
-#pragma interface
-
-#include <org/xml/sax/ext/DefaultHandler2.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class XCat$Catalog;
-          class XCat$Loader;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ErrorHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XCat$Loader : public ::org::xml::sax::ext::DefaultHandler2
-{
-
-public: // actually package-private
-  XCat$Loader(jboolean, ::org::xml::sax::ErrorHandler *, jboolean);
-private:
-  ::java::lang::String * nofrag(::java::lang::String *);
-  ::java::lang::String * absolutize(::java::lang::String *);
-  void error(::java::lang::String *);
-  void fatal(::java::lang::String *);
-  void warn(::java::lang::String *);
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::org::xml::sax::ext::DefaultHandler2)))) preInterned;
-  ::org::xml::sax::ErrorHandler * handler;
-  jboolean unified;
-  jint ignoreDepth;
-  ::org::xml::sax::Locator * locator;
-  jboolean started;
-  ::java::util::Hashtable * externals;
-  ::java::util::Stack * bases;
-public: // actually package-private
-  ::gnu::xml::util::XCat$Catalog * cat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XCat$Loader__
diff --git a/libjava/gnu/xml/util/XCat.h b/libjava/gnu/xml/util/XCat.h
deleted file mode 100644
index a0b9327..0000000
--- a/libjava/gnu/xml/util/XCat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XCat__
-#define __gnu_xml_util_XCat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class XCat;
-          class XCat$Catalog;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XCat : public ::java::lang::Object
-{
-
-public:
-  XCat();
-  XCat(::java::lang::String *);
-  virtual void loadCatalog(::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * getExternalSubset(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveURI(::java::lang::String *, ::java::lang::String *);
-  virtual void disableLoading();
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual ::java::lang::String * getParserClass();
-  virtual void setParserClass(::java::lang::String *);
-  virtual jboolean isUnified();
-  virtual void setUnified(jboolean);
-  virtual jboolean isUsingPublic();
-  virtual void setUsingPublic(jboolean);
-private:
-  static ::gnu::xml::util::XCat$Catalog * loadCatalog(::java::lang::String *, ::org::xml::sax::ErrorHandler *, ::java::lang::String *, jboolean);
-  static ::java::lang::String * normalizePublicId(jboolean, ::java::lang::String *);
-  static jboolean isUriExcluded(jint);
-  static jint hexNibble(jint);
-  static ::java::lang::String * normalizeURI(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::String * access$0(jboolean, ::java::lang::String *);
-  static ::java::lang::String * access$1(::java::lang::String *);
-  static ::gnu::xml::util::XCat$Catalog * access$2(::java::lang::String *, ::org::xml::sax::ErrorHandler *, ::java::lang::String *, jboolean);
-private:
-  JArray< ::gnu::xml::util::XCat$Catalog * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) catalogs;
-  jboolean usingPublic;
-  jboolean loadingPermitted;
-  jboolean unified;
-  ::java::lang::String * parserClass;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  static ::java::lang::String * catalogNamespace;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XCat__
diff --git a/libjava/gnu/xml/util/XHTMLWriter.h b/libjava/gnu/xml/util/XHTMLWriter.h
deleted file mode 100644
index 6fd702d..0000000
--- a/libjava/gnu/xml/util/XHTMLWriter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XHTMLWriter__
-#define __gnu_xml_util_XHTMLWriter__
-
-#pragma interface
-
-#include <gnu/xml/util/XMLWriter.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace util
-      {
-          class XHTMLWriter;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XHTMLWriter : public ::gnu::xml::util::XMLWriter
-{
-
-public:
-  XHTMLWriter();
-  XHTMLWriter(::java::io::OutputStream *);
-  XHTMLWriter(::java::io::Writer *);
-  XHTMLWriter(::java::io::Writer *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XHTMLWriter__
diff --git a/libjava/gnu/xml/util/XMLWriter.h b/libjava/gnu/xml/util/XMLWriter.h
deleted file mode 100644
index 56252a5..0000000
--- a/libjava/gnu/xml/util/XMLWriter.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_util_XMLWriter__
-#define __gnu_xml_util_XMLWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-    }
-    namespace xml
-    {
-      namespace util
-      {
-          class XMLWriter;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ErrorHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class gnu::xml::util::XMLWriter : public ::java::lang::Object
-{
-
-  static jboolean isLineEnd(::java::lang::String *);
-public:
-  XMLWriter();
-  XMLWriter(::java::io::OutputStream *);
-  XMLWriter(::java::io::Writer *);
-  XMLWriter(::java::io::Writer *, ::java::lang::String *);
-private:
-  void setEncoding(::java::lang::String *);
-public:
-  virtual void setWriter(::java::io::Writer *, ::java::lang::String *);
-  virtual void setEOL(::java::lang::String *);
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-public: // actually protected
-  virtual void fatal(::java::lang::String *, ::java::lang::Exception *);
-public:
-  virtual void setXhtml(jboolean);
-  virtual jboolean isXhtml();
-  virtual void setExpandingEntities(jboolean);
-  virtual jboolean isExpandingEntities();
-  virtual void setPrettyPrinting(jboolean);
-  virtual jboolean isPrettyPrinting();
-  virtual void setCanonical(jboolean);
-  virtual jboolean isCanonical();
-  virtual void flush();
-  virtual void write(::java::lang::String *);
-  virtual void writeElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *, ::java::lang::String *);
-  virtual void writeElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *, jint);
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-private:
-  static jboolean isEmptyElementTag(::java::lang::String *);
-  static jboolean indentBefore(::java::lang::String *);
-  static jboolean spaceBefore(::java::lang::String *);
-  static jboolean spacePreserve(::java::lang::String *);
-public:
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  virtual void endPrefixMapping(::java::lang::String *);
-private:
-  void writeStartTag(::java::lang::String *, ::org::xml::sax::Attributes *, jboolean);
-public:
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void characters(JArray< jchar > *, jint, jint);
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  virtual void skippedEntity(::java::lang::String *);
-  virtual void startCDATA();
-  virtual void endCDATA();
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void endDTD();
-  virtual void startEntity(::java::lang::String *);
-  virtual void endEntity(::java::lang::String *);
-  virtual void comment(JArray< jchar > *, jint, jint);
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *);
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *);
-private:
-  void writeQuotedValue(::java::lang::String *, jint);
-  void escapeChars(JArray< jchar > *, jint, jint, jint);
-  void newline();
-  void doIndent();
-  void rawWrite(jchar);
-  void rawWrite(::java::lang::String *);
-  void rawWrite(JArray< jchar > *, jint, jint);
-  static const jint CTX_ENTITY = 1;
-  static const jint CTX_ATTRIBUTE = 2;
-  static const jint CTX_CONTENT = 3;
-  static const jint CTX_UNPARSED = 4;
-  static const jint CTX_NAME = 5;
-  static ::java::lang::String * sysEOL;
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
-  jboolean inCDATA;
-  jint elementNestLevel;
-  ::java::lang::String * eol;
-  jshort dangerMask;
-  ::gnu::java::lang::CPStringBuilder * stringBuf;
-  ::org::xml::sax::Locator * locator;
-  ::org::xml::sax::ErrorHandler * errHandler;
-  jboolean expandingEntities;
-  jint entityNestLevel;
-  jboolean xhtml;
-  jboolean startedDoctype;
-  ::java::lang::String * encoding;
-  jboolean canonical;
-  jboolean inDoctype;
-  jboolean inEpilogue;
-  jboolean prettyPrinting;
-  jint column;
-  jboolean noWrap;
-  ::java::util::Stack * space;
-  static const jint lineLength = 75;
-  static ::java::lang::String * xhtmlFullDTD;
-  static JArray< ::java::lang::String * > * HTMLlat1x;
-  static JArray< ::java::lang::String * > * HTMLsymbolx_GR;
-  static JArray< ::java::lang::String * > * HTMLsymbolx_gr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_util_XMLWriter__
diff --git a/libjava/gnu/xml/validation/datatype/Annotation.h b/libjava/gnu/xml/validation/datatype/Annotation.h
deleted file mode 100644
index b6dffa6..0000000
--- a/libjava/gnu/xml/validation/datatype/Annotation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_Annotation__
-#define __gnu_xml_validation_datatype_Annotation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::Annotation : public ::java::lang::Object
-{
-
-public:
-  Annotation(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) documentation;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_Annotation__
diff --git a/libjava/gnu/xml/validation/datatype/AnySimpleType.h b/libjava/gnu/xml/validation/datatype/AnySimpleType.h
deleted file mode 100644
index 41c1927..0000000
--- a/libjava/gnu/xml/validation/datatype/AnySimpleType.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_AnySimpleType__
-#define __gnu_xml_validation_datatype_AnySimpleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/SimpleType.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class AnySimpleType;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::AnySimpleType : public ::gnu::xml::validation::datatype::SimpleType
-{
-
-public: // actually package-private
-  AnySimpleType();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_AnySimpleType__
diff --git a/libjava/gnu/xml/validation/datatype/AnyType.h b/libjava/gnu/xml/validation/datatype/AnyType.h
deleted file mode 100644
index 2f9ec8d..0000000
--- a/libjava/gnu/xml/validation/datatype/AnyType.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_AnyType__
-#define __gnu_xml_validation_datatype_AnyType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/SimpleType.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class AnyType;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::AnyType : public ::gnu::xml::validation::datatype::SimpleType
-{
-
-public: // actually package-private
-  AnyType();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_AnyType__
diff --git a/libjava/gnu/xml/validation/datatype/AnyURIType.h b/libjava/gnu/xml/validation/datatype/AnyURIType.h
deleted file mode 100644
index 1b5b225..0000000
--- a/libjava/gnu/xml/validation/datatype/AnyURIType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_AnyURIType__
-#define __gnu_xml_validation_datatype_AnyURIType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class AnyURIType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::AnyURIType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  AnyURIType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_AnyURIType__
diff --git a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h b/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
deleted file mode 100644
index 29b46ef..0000000
--- a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_AtomicSimpleType__
-#define __gnu_xml_validation_datatype_AtomicSimpleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/SimpleType.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class AtomicSimpleType;
-            class SimpleType;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::AtomicSimpleType : public ::gnu::xml::validation::datatype::SimpleType
-{
-
-public:
-  AtomicSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
-public: // actually package-private
-  AtomicSimpleType(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *);
-public:
-  virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_AtomicSimpleType__
diff --git a/libjava/gnu/xml/validation/datatype/Base64BinaryType.h b/libjava/gnu/xml/validation/datatype/Base64BinaryType.h
deleted file mode 100644
index 5aaec9c..0000000
--- a/libjava/gnu/xml/validation/datatype/Base64BinaryType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_Base64BinaryType__
-#define __gnu_xml_validation_datatype_Base64BinaryType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Base64BinaryType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::Base64BinaryType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  Base64BinaryType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static ::java::lang::String * B64;
-  static ::java::lang::String * B16;
-  static ::java::lang::String * B04;
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_Base64BinaryType__
diff --git a/libjava/gnu/xml/validation/datatype/BooleanType.h b/libjava/gnu/xml/validation/datatype/BooleanType.h
deleted file mode 100644
index 7f63b39..0000000
--- a/libjava/gnu/xml/validation/datatype/BooleanType.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_BooleanType__
-#define __gnu_xml_validation_datatype_BooleanType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class BooleanType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::BooleanType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  BooleanType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::util::Set * VALUE_SPACE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_BooleanType__
diff --git a/libjava/gnu/xml/validation/datatype/ByteType.h b/libjava/gnu/xml/validation/datatype/ByteType.h
deleted file mode 100644
index 6b814e9..0000000
--- a/libjava/gnu/xml/validation/datatype/ByteType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_ByteType__
-#define __gnu_xml_validation_datatype_ByteType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class ByteType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::ByteType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  ByteType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static ::java::lang::String * MIN_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_ByteType__
diff --git a/libjava/gnu/xml/validation/datatype/DateTimeType.h b/libjava/gnu/xml/validation/datatype/DateTimeType.h
deleted file mode 100644
index 35f83ec..0000000
--- a/libjava/gnu/xml/validation/datatype/DateTimeType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DateTimeType__
-#define __gnu_xml_validation_datatype_DateTimeType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DateTimeType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DateTimeType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  DateTimeType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DateTimeType__
diff --git a/libjava/gnu/xml/validation/datatype/DateType.h b/libjava/gnu/xml/validation/datatype/DateType.h
deleted file mode 100644
index bca1354..0000000
--- a/libjava/gnu/xml/validation/datatype/DateType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DateType__
-#define __gnu_xml_validation_datatype_DateType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DateType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DateType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  DateType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DateType__
diff --git a/libjava/gnu/xml/validation/datatype/DecimalType.h b/libjava/gnu/xml/validation/datatype/DecimalType.h
deleted file mode 100644
index 4f9b8be..0000000
--- a/libjava/gnu/xml/validation/datatype/DecimalType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DecimalType__
-#define __gnu_xml_validation_datatype_DecimalType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DecimalType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DecimalType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  DecimalType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DecimalType__
diff --git a/libjava/gnu/xml/validation/datatype/DoubleType.h b/libjava/gnu/xml/validation/datatype/DoubleType.h
deleted file mode 100644
index 75bad58..0000000
--- a/libjava/gnu/xml/validation/datatype/DoubleType.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DoubleType__
-#define __gnu_xml_validation_datatype_DoubleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DoubleType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DoubleType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  DoubleType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::util::Set * SPECIAL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DoubleType__
diff --git a/libjava/gnu/xml/validation/datatype/DurationType$Duration.h b/libjava/gnu/xml/validation/datatype/DurationType$Duration.h
deleted file mode 100644
index 17216d7..0000000
--- a/libjava/gnu/xml/validation/datatype/DurationType$Duration.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DurationType$Duration__
-#define __gnu_xml_validation_datatype_DurationType$Duration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DurationType$Duration;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DurationType$Duration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DurationType$Duration();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) years;
-  jint months;
-  jint days;
-  jint minutes;
-  jfloat seconds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DurationType$Duration__
diff --git a/libjava/gnu/xml/validation/datatype/DurationType.h b/libjava/gnu/xml/validation/datatype/DurationType.h
deleted file mode 100644
index d6c984d..0000000
--- a/libjava/gnu/xml/validation/datatype/DurationType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_DurationType__
-#define __gnu_xml_validation_datatype_DurationType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class DurationType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::DurationType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  DurationType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_DurationType__
diff --git a/libjava/gnu/xml/validation/datatype/EntitiesType.h b/libjava/gnu/xml/validation/datatype/EntitiesType.h
deleted file mode 100644
index 2c1e523..0000000
--- a/libjava/gnu/xml/validation/datatype/EntitiesType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_EntitiesType__
-#define __gnu_xml_validation_datatype_EntitiesType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class EntitiesType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::EntitiesType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  EntitiesType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jboolean isContextDependent();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_EntitiesType__
diff --git a/libjava/gnu/xml/validation/datatype/EntityType.h b/libjava/gnu/xml/validation/datatype/EntityType.h
deleted file mode 100644
index c10bbfc..0000000
--- a/libjava/gnu/xml/validation/datatype/EntityType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_EntityType__
-#define __gnu_xml_validation_datatype_EntityType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class EntityType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::EntityType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  EntityType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jboolean isContextDependent();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_EntityType__
diff --git a/libjava/gnu/xml/validation/datatype/EnumerationFacet.h b/libjava/gnu/xml/validation/datatype/EnumerationFacet.h
deleted file mode 100644
index c3bcc2b..0000000
--- a/libjava/gnu/xml/validation/datatype/EnumerationFacet.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_EnumerationFacet__
-#define __gnu_xml_validation_datatype_EnumerationFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class EnumerationFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::EnumerationFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  EnumerationFacet(::java::lang::String *, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_EnumerationFacet__
diff --git a/libjava/gnu/xml/validation/datatype/Facet.h b/libjava/gnu/xml/validation/datatype/Facet.h
deleted file mode 100644
index 76ebe4c..0000000
--- a/libjava/gnu/xml/validation/datatype/Facet.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_Facet__
-#define __gnu_xml_validation_datatype_Facet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class Facet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::Facet : public ::java::lang::Object
-{
-
-public: // actually protected
-  Facet(jint, ::gnu::xml::validation::datatype::Annotation *);
-public:
-  static const jint LENGTH = 1;
-  static const jint MIN_LENGTH = 2;
-  static const jint MAX_LENGTH = 3;
-  static const jint PATTERN = 4;
-  static const jint ENUMERATION = 5;
-  static const jint WHITESPACE = 6;
-  static const jint MAX_INCLUSIVE = 7;
-  static const jint MAX_EXCLUSIVE = 8;
-  static const jint MIN_EXCLUSIVE = 9;
-  static const jint MIN_INCLUSIVE = 10;
-  static const jint TOTAL_DIGITS = 11;
-  static const jint FRACTION_DIGITS = 12;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::gnu::xml::validation::datatype::Annotation * annotation;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_Facet__
diff --git a/libjava/gnu/xml/validation/datatype/FloatType.h b/libjava/gnu/xml/validation/datatype/FloatType.h
deleted file mode 100644
index af22a2f..0000000
--- a/libjava/gnu/xml/validation/datatype/FloatType.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_FloatType__
-#define __gnu_xml_validation_datatype_FloatType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class FloatType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::FloatType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  FloatType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::util::Set * SPECIAL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_FloatType__
diff --git a/libjava/gnu/xml/validation/datatype/FractionDigitsFacet.h b/libjava/gnu/xml/validation/datatype/FractionDigitsFacet.h
deleted file mode 100644
index 9ed33c4..0000000
--- a/libjava/gnu/xml/validation/datatype/FractionDigitsFacet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_FractionDigitsFacet__
-#define __gnu_xml_validation_datatype_FractionDigitsFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class FractionDigitsFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::FractionDigitsFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  FractionDigitsFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_FractionDigitsFacet__
diff --git a/libjava/gnu/xml/validation/datatype/GDayType$GDay.h b/libjava/gnu/xml/validation/datatype/GDayType$GDay.h
deleted file mode 100644
index 29128fc..0000000
--- a/libjava/gnu/xml/validation/datatype/GDayType$GDay.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GDayType$GDay__
-#define __gnu_xml_validation_datatype_GDayType$GDay__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GDayType$GDay;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GDayType$GDay : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GDayType$GDay();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) day;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GDayType$GDay__
diff --git a/libjava/gnu/xml/validation/datatype/GDayType.h b/libjava/gnu/xml/validation/datatype/GDayType.h
deleted file mode 100644
index 4e1e3c5..0000000
--- a/libjava/gnu/xml/validation/datatype/GDayType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GDayType__
-#define __gnu_xml_validation_datatype_GDayType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GDayType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GDayType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  GDayType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GDayType__
diff --git a/libjava/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.h b/libjava/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.h
deleted file mode 100644
index d3cb5e0..0000000
--- a/libjava/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GMonthDayType$GMonthDay__
-#define __gnu_xml_validation_datatype_GMonthDayType$GMonthDay__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GMonthDayType$GMonthDay;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GMonthDayType$GMonthDay : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GMonthDayType$GMonthDay();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) month;
-  jint day;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GMonthDayType$GMonthDay__
diff --git a/libjava/gnu/xml/validation/datatype/GMonthDayType.h b/libjava/gnu/xml/validation/datatype/GMonthDayType.h
deleted file mode 100644
index 40f7db1..0000000
--- a/libjava/gnu/xml/validation/datatype/GMonthDayType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GMonthDayType__
-#define __gnu_xml_validation_datatype_GMonthDayType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GMonthDayType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GMonthDayType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  GMonthDayType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GMonthDayType__
diff --git a/libjava/gnu/xml/validation/datatype/GMonthType$GMonth.h b/libjava/gnu/xml/validation/datatype/GMonthType$GMonth.h
deleted file mode 100644
index af79163..0000000
--- a/libjava/gnu/xml/validation/datatype/GMonthType$GMonth.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GMonthType$GMonth__
-#define __gnu_xml_validation_datatype_GMonthType$GMonth__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GMonthType$GMonth;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GMonthType$GMonth : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GMonthType$GMonth();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) month;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GMonthType$GMonth__
diff --git a/libjava/gnu/xml/validation/datatype/GMonthType.h b/libjava/gnu/xml/validation/datatype/GMonthType.h
deleted file mode 100644
index cd1e7f9..0000000
--- a/libjava/gnu/xml/validation/datatype/GMonthType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GMonthType__
-#define __gnu_xml_validation_datatype_GMonthType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GMonthType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GMonthType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  GMonthType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GMonthType__
diff --git a/libjava/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.h b/libjava/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.h
deleted file mode 100644
index 8af7484..0000000
--- a/libjava/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GYearMonthType$GYearMonth__
-#define __gnu_xml_validation_datatype_GYearMonthType$GYearMonth__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GYearMonthType$GYearMonth;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GYearMonthType$GYearMonth : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GYearMonthType$GYearMonth();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) year;
-  jint month;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GYearMonthType$GYearMonth__
diff --git a/libjava/gnu/xml/validation/datatype/GYearMonthType.h b/libjava/gnu/xml/validation/datatype/GYearMonthType.h
deleted file mode 100644
index eb6d450..0000000
--- a/libjava/gnu/xml/validation/datatype/GYearMonthType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GYearMonthType__
-#define __gnu_xml_validation_datatype_GYearMonthType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GYearMonthType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GYearMonthType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  GYearMonthType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GYearMonthType__
diff --git a/libjava/gnu/xml/validation/datatype/GYearType$GYear.h b/libjava/gnu/xml/validation/datatype/GYearType$GYear.h
deleted file mode 100644
index 1cadf8b..0000000
--- a/libjava/gnu/xml/validation/datatype/GYearType$GYear.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GYearType$GYear__
-#define __gnu_xml_validation_datatype_GYearType$GYear__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GYearType$GYear;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GYearType$GYear : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GYearType$GYear();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) year;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GYearType$GYear__
diff --git a/libjava/gnu/xml/validation/datatype/GYearType.h b/libjava/gnu/xml/validation/datatype/GYearType.h
deleted file mode 100644
index b5c4a76..0000000
--- a/libjava/gnu/xml/validation/datatype/GYearType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_GYearType__
-#define __gnu_xml_validation_datatype_GYearType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class GYearType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::GYearType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  GYearType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_GYearType__
diff --git a/libjava/gnu/xml/validation/datatype/HexBinaryType.h b/libjava/gnu/xml/validation/datatype/HexBinaryType.h
deleted file mode 100644
index da717be..0000000
--- a/libjava/gnu/xml/validation/datatype/HexBinaryType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_HexBinaryType__
-#define __gnu_xml_validation_datatype_HexBinaryType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class HexBinaryType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::HexBinaryType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  HexBinaryType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static ::java::lang::String * HEX;
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_HexBinaryType__
diff --git a/libjava/gnu/xml/validation/datatype/IDRefType.h b/libjava/gnu/xml/validation/datatype/IDRefType.h
deleted file mode 100644
index f61451f..0000000
--- a/libjava/gnu/xml/validation/datatype/IDRefType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_IDRefType__
-#define __gnu_xml_validation_datatype_IDRefType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class IDRefType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::IDRefType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  IDRefType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jint getIdType();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_IDRefType__
diff --git a/libjava/gnu/xml/validation/datatype/IDRefsType.h b/libjava/gnu/xml/validation/datatype/IDRefsType.h
deleted file mode 100644
index 861602b..0000000
--- a/libjava/gnu/xml/validation/datatype/IDRefsType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_IDRefsType__
-#define __gnu_xml_validation_datatype_IDRefsType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class IDRefsType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::IDRefsType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  IDRefsType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jint getIdType();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_IDRefsType__
diff --git a/libjava/gnu/xml/validation/datatype/IDType.h b/libjava/gnu/xml/validation/datatype/IDType.h
deleted file mode 100644
index 34184818..0000000
--- a/libjava/gnu/xml/validation/datatype/IDType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_IDType__
-#define __gnu_xml_validation_datatype_IDType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class IDType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::IDType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  IDType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jint getIdType();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_IDType__
diff --git a/libjava/gnu/xml/validation/datatype/IntType.h b/libjava/gnu/xml/validation/datatype/IntType.h
deleted file mode 100644
index bb1567f..0000000
--- a/libjava/gnu/xml/validation/datatype/IntType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_IntType__
-#define __gnu_xml_validation_datatype_IntType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class IntType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::IntType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  IntType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static ::java::lang::String * MIN_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_IntType__
diff --git a/libjava/gnu/xml/validation/datatype/IntegerType.h b/libjava/gnu/xml/validation/datatype/IntegerType.h
deleted file mode 100644
index 04bb274..0000000
--- a/libjava/gnu/xml/validation/datatype/IntegerType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_IntegerType__
-#define __gnu_xml_validation_datatype_IntegerType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class IntegerType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::IntegerType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  IntegerType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_IntegerType__
diff --git a/libjava/gnu/xml/validation/datatype/LanguageType.h b/libjava/gnu/xml/validation/datatype/LanguageType.h
deleted file mode 100644
index 9c06c96..0000000
--- a/libjava/gnu/xml/validation/datatype/LanguageType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_LanguageType__
-#define __gnu_xml_validation_datatype_LanguageType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class LanguageType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::LanguageType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  LanguageType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::util::regex::Pattern * PATTERN;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_LanguageType__
diff --git a/libjava/gnu/xml/validation/datatype/LengthFacet.h b/libjava/gnu/xml/validation/datatype/LengthFacet.h
deleted file mode 100644
index 5d97f0d..0000000
--- a/libjava/gnu/xml/validation/datatype/LengthFacet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_LengthFacet__
-#define __gnu_xml_validation_datatype_LengthFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class LengthFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::LengthFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  LengthFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_LengthFacet__
diff --git a/libjava/gnu/xml/validation/datatype/ListSimpleType.h b/libjava/gnu/xml/validation/datatype/ListSimpleType.h
deleted file mode 100644
index 965b8643..0000000
--- a/libjava/gnu/xml/validation/datatype/ListSimpleType.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_ListSimpleType__
-#define __gnu_xml_validation_datatype_ListSimpleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/SimpleType.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class ListSimpleType;
-            class SimpleType;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::ListSimpleType : public ::gnu::xml::validation::datatype::SimpleType
-{
-
-public:
-  ListSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *);
-  virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::gnu::xml::validation::datatype::SimpleType * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) itemType;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_ListSimpleType__
diff --git a/libjava/gnu/xml/validation/datatype/LongType.h b/libjava/gnu/xml/validation/datatype/LongType.h
deleted file mode 100644
index 34a4c95..0000000
--- a/libjava/gnu/xml/validation/datatype/LongType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_LongType__
-#define __gnu_xml_validation_datatype_LongType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class LongType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::LongType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  LongType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static ::java::lang::String * MIN_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_LongType__
diff --git a/libjava/gnu/xml/validation/datatype/MaxExclusiveFacet.h b/libjava/gnu/xml/validation/datatype/MaxExclusiveFacet.h
deleted file mode 100644
index 6335472..0000000
--- a/libjava/gnu/xml/validation/datatype/MaxExclusiveFacet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MaxExclusiveFacet__
-#define __gnu_xml_validation_datatype_MaxExclusiveFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MaxExclusiveFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MaxExclusiveFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MaxExclusiveFacet(::java::lang::Object *, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  jboolean matches(::java::lang::Object *);
-public:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MaxExclusiveFacet__
diff --git a/libjava/gnu/xml/validation/datatype/MaxInclusiveFacet.h b/libjava/gnu/xml/validation/datatype/MaxInclusiveFacet.h
deleted file mode 100644
index f167e92..0000000
--- a/libjava/gnu/xml/validation/datatype/MaxInclusiveFacet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MaxInclusiveFacet__
-#define __gnu_xml_validation_datatype_MaxInclusiveFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MaxInclusiveFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MaxInclusiveFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MaxInclusiveFacet(::java::lang::Object *, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  jboolean matches(::java::lang::Object *);
-public:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MaxInclusiveFacet__
diff --git a/libjava/gnu/xml/validation/datatype/MaxLengthFacet.h b/libjava/gnu/xml/validation/datatype/MaxLengthFacet.h
deleted file mode 100644
index c6e35cd..0000000
--- a/libjava/gnu/xml/validation/datatype/MaxLengthFacet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MaxLengthFacet__
-#define __gnu_xml_validation_datatype_MaxLengthFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MaxLengthFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MaxLengthFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MaxLengthFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MaxLengthFacet__
diff --git a/libjava/gnu/xml/validation/datatype/MinExclusiveFacet.h b/libjava/gnu/xml/validation/datatype/MinExclusiveFacet.h
deleted file mode 100644
index 5e36467..0000000
--- a/libjava/gnu/xml/validation/datatype/MinExclusiveFacet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MinExclusiveFacet__
-#define __gnu_xml_validation_datatype_MinExclusiveFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MinExclusiveFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MinExclusiveFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MinExclusiveFacet(::java::lang::Object *, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  jboolean matches(::java::lang::Object *);
-public:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MinExclusiveFacet__
diff --git a/libjava/gnu/xml/validation/datatype/MinInclusiveFacet.h b/libjava/gnu/xml/validation/datatype/MinInclusiveFacet.h
deleted file mode 100644
index 65b614b..0000000
--- a/libjava/gnu/xml/validation/datatype/MinInclusiveFacet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MinInclusiveFacet__
-#define __gnu_xml_validation_datatype_MinInclusiveFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MinInclusiveFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MinInclusiveFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MinInclusiveFacet(::java::lang::Object *, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  jboolean matches(::java::lang::Object *);
-public:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MinInclusiveFacet__
diff --git a/libjava/gnu/xml/validation/datatype/MinLengthFacet.h b/libjava/gnu/xml/validation/datatype/MinLengthFacet.h
deleted file mode 100644
index 57419a3..0000000
--- a/libjava/gnu/xml/validation/datatype/MinLengthFacet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_MinLengthFacet__
-#define __gnu_xml_validation_datatype_MinLengthFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class MinLengthFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::MinLengthFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  MinLengthFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_MinLengthFacet__
diff --git a/libjava/gnu/xml/validation/datatype/NCNameType.h b/libjava/gnu/xml/validation/datatype/NCNameType.h
deleted file mode 100644
index 61859f0..0000000
--- a/libjava/gnu/xml/validation/datatype/NCNameType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NCNameType__
-#define __gnu_xml_validation_datatype_NCNameType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NCNameType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NCNameType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NCNameType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NCNameType__
diff --git a/libjava/gnu/xml/validation/datatype/NMTokenType.h b/libjava/gnu/xml/validation/datatype/NMTokenType.h
deleted file mode 100644
index e6066e4..0000000
--- a/libjava/gnu/xml/validation/datatype/NMTokenType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NMTokenType__
-#define __gnu_xml_validation_datatype_NMTokenType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NMTokenType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NMTokenType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NMTokenType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NMTokenType__
diff --git a/libjava/gnu/xml/validation/datatype/NMTokensType.h b/libjava/gnu/xml/validation/datatype/NMTokensType.h
deleted file mode 100644
index 39b376b..0000000
--- a/libjava/gnu/xml/validation/datatype/NMTokensType.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NMTokensType__
-#define __gnu_xml_validation_datatype_NMTokensType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NMTokensType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NMTokensType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NMTokensType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-private:
-  void checkNmtoken(::java::lang::String *, jint);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NMTokensType__
diff --git a/libjava/gnu/xml/validation/datatype/NameType.h b/libjava/gnu/xml/validation/datatype/NameType.h
deleted file mode 100644
index b3a0ccf..0000000
--- a/libjava/gnu/xml/validation/datatype/NameType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NameType__
-#define __gnu_xml_validation_datatype_NameType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NameType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NameType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NameType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NameType__
diff --git a/libjava/gnu/xml/validation/datatype/NegativeIntegerType.h b/libjava/gnu/xml/validation/datatype/NegativeIntegerType.h
deleted file mode 100644
index 9b78049..0000000
--- a/libjava/gnu/xml/validation/datatype/NegativeIntegerType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NegativeIntegerType__
-#define __gnu_xml_validation_datatype_NegativeIntegerType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NegativeIntegerType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NegativeIntegerType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NegativeIntegerType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NegativeIntegerType__
diff --git a/libjava/gnu/xml/validation/datatype/NonNegativeIntegerType.h b/libjava/gnu/xml/validation/datatype/NonNegativeIntegerType.h
deleted file mode 100644
index 06f5d5e..0000000
--- a/libjava/gnu/xml/validation/datatype/NonNegativeIntegerType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NonNegativeIntegerType__
-#define __gnu_xml_validation_datatype_NonNegativeIntegerType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NonNegativeIntegerType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NonNegativeIntegerType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NonNegativeIntegerType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NonNegativeIntegerType__
diff --git a/libjava/gnu/xml/validation/datatype/NonPositiveIntegerType.h b/libjava/gnu/xml/validation/datatype/NonPositiveIntegerType.h
deleted file mode 100644
index ca41fc3..0000000
--- a/libjava/gnu/xml/validation/datatype/NonPositiveIntegerType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NonPositiveIntegerType__
-#define __gnu_xml_validation_datatype_NonPositiveIntegerType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NonPositiveIntegerType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NonPositiveIntegerType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NonPositiveIntegerType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NonPositiveIntegerType__
diff --git a/libjava/gnu/xml/validation/datatype/NormalizedStringType.h b/libjava/gnu/xml/validation/datatype/NormalizedStringType.h
deleted file mode 100644
index d2a41c1..0000000
--- a/libjava/gnu/xml/validation/datatype/NormalizedStringType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NormalizedStringType__
-#define __gnu_xml_validation_datatype_NormalizedStringType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NormalizedStringType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NormalizedStringType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NormalizedStringType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NormalizedStringType__
diff --git a/libjava/gnu/xml/validation/datatype/NotationType.h b/libjava/gnu/xml/validation/datatype/NotationType.h
deleted file mode 100644
index 21c5974..0000000
--- a/libjava/gnu/xml/validation/datatype/NotationType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_NotationType__
-#define __gnu_xml_validation_datatype_NotationType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class NotationType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::NotationType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  NotationType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jboolean isContextDependent();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_NotationType__
diff --git a/libjava/gnu/xml/validation/datatype/PatternFacet.h b/libjava/gnu/xml/validation/datatype/PatternFacet.h
deleted file mode 100644
index 78ea57b..0000000
--- a/libjava/gnu/xml/validation/datatype/PatternFacet.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_PatternFacet__
-#define __gnu_xml_validation_datatype_PatternFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class PatternFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::PatternFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  PatternFacet(::java::util::regex::Pattern *, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_PatternFacet__
diff --git a/libjava/gnu/xml/validation/datatype/PositiveIntegerType.h b/libjava/gnu/xml/validation/datatype/PositiveIntegerType.h
deleted file mode 100644
index 217d0ef..0000000
--- a/libjava/gnu/xml/validation/datatype/PositiveIntegerType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_PositiveIntegerType__
-#define __gnu_xml_validation_datatype_PositiveIntegerType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class PositiveIntegerType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::PositiveIntegerType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  PositiveIntegerType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_PositiveIntegerType__
diff --git a/libjava/gnu/xml/validation/datatype/QNameType.h b/libjava/gnu/xml/validation/datatype/QNameType.h
deleted file mode 100644
index cba07a3..0000000
--- a/libjava/gnu/xml/validation/datatype/QNameType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_QNameType__
-#define __gnu_xml_validation_datatype_QNameType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class QNameType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::QNameType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  QNameType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  jboolean isContextDependent();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_QNameType__
diff --git a/libjava/gnu/xml/validation/datatype/ShortType.h b/libjava/gnu/xml/validation/datatype/ShortType.h
deleted file mode 100644
index 9c12b82..0000000
--- a/libjava/gnu/xml/validation/datatype/ShortType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_ShortType__
-#define __gnu_xml_validation_datatype_ShortType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class ShortType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::ShortType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  ShortType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static ::java::lang::String * MIN_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_ShortType__
diff --git a/libjava/gnu/xml/validation/datatype/SimpleType.h b/libjava/gnu/xml/validation/datatype/SimpleType.h
deleted file mode 100644
index 2827d89..0000000
--- a/libjava/gnu/xml/validation/datatype/SimpleType.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_SimpleType__
-#define __gnu_xml_validation_datatype_SimpleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Type.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class SimpleType;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeStreamingValidator;
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::SimpleType : public ::gnu::xml::validation::datatype::Type
-{
-
-public:
-  SimpleType(::javax::xml::namespace$::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
-  virtual jboolean isValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-private:
-  static jint countDigits(::java::lang::String *, jboolean);
-public:
-  virtual ::org::relaxng::datatype::DatatypeStreamingValidator * createStreamingValidator(::org::relaxng::datatype::ValidationContext *);
-  virtual ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual jboolean sameValue(::java::lang::Object *, ::java::lang::Object *);
-  virtual jint valueHashCode(::java::lang::Object *);
-  virtual jint getIdType();
-  virtual jboolean isContextDependent();
-  static const jint ANY = 0;
-  static const jint ATOMIC = 1;
-  static const jint LIST = 2;
-  static const jint UNION = 3;
-  static const jint ID_TYPE_NULL = 0;
-  static const jint ID_TYPE_ID = 1;
-  static const jint ID_TYPE_IDREF = 2;
-  static const jint ID_TYPE_IDREFS = 3;
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) variety;
-  ::java::util::Set * facets;
-  jint fundamentalFacets;
-  ::gnu::xml::validation::datatype::SimpleType * baseType;
-  ::gnu::xml::validation::datatype::Annotation * annotation;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_SimpleType__
diff --git a/libjava/gnu/xml/validation/datatype/StringType.h b/libjava/gnu/xml/validation/datatype/StringType.h
deleted file mode 100644
index 1626166..0000000
--- a/libjava/gnu/xml/validation/datatype/StringType.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_StringType__
-#define __gnu_xml_validation_datatype_StringType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class StringType;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::StringType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  StringType();
-public:
-  JArray< jint > * getConstrainingFacets();
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_StringType__
diff --git a/libjava/gnu/xml/validation/datatype/TimeType$Time.h b/libjava/gnu/xml/validation/datatype/TimeType$Time.h
deleted file mode 100644
index f43d75c..0000000
--- a/libjava/gnu/xml/validation/datatype/TimeType$Time.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TimeType$Time__
-#define __gnu_xml_validation_datatype_TimeType$Time__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class TimeType$Time;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TimeType$Time : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TimeType$Time();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) minutes;
-  jfloat seconds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TimeType$Time__
diff --git a/libjava/gnu/xml/validation/datatype/TimeType.h b/libjava/gnu/xml/validation/datatype/TimeType.h
deleted file mode 100644
index 8e5f365..0000000
--- a/libjava/gnu/xml/validation/datatype/TimeType.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TimeType__
-#define __gnu_xml_validation_datatype_TimeType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class TimeType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TimeType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  TimeType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TimeType__
diff --git a/libjava/gnu/xml/validation/datatype/TokenType.h b/libjava/gnu/xml/validation/datatype/TokenType.h
deleted file mode 100644
index 0876117..0000000
--- a/libjava/gnu/xml/validation/datatype/TokenType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TokenType__
-#define __gnu_xml_validation_datatype_TokenType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class TokenType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TokenType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  TokenType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TokenType__
diff --git a/libjava/gnu/xml/validation/datatype/TotalDigitsFacet.h b/libjava/gnu/xml/validation/datatype/TotalDigitsFacet.h
deleted file mode 100644
index 4335a24..0000000
--- a/libjava/gnu/xml/validation/datatype/TotalDigitsFacet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TotalDigitsFacet__
-#define __gnu_xml_validation_datatype_TotalDigitsFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class TotalDigitsFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TotalDigitsFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  TotalDigitsFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TotalDigitsFacet__
diff --git a/libjava/gnu/xml/validation/datatype/Type.h b/libjava/gnu/xml/validation/datatype/Type.h
deleted file mode 100644
index 7cf557b..0000000
--- a/libjava/gnu/xml/validation/datatype/Type.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_Type__
-#define __gnu_xml_validation_datatype_Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Type;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::Type : public ::java::lang::Object
-{
-
-public:
-  Type(::javax::xml::namespace$::QName *);
-  static ::gnu::xml::validation::datatype::Type * ANY_TYPE;
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_Type__
diff --git a/libjava/gnu/xml/validation/datatype/TypeBuilder.h b/libjava/gnu/xml/validation/datatype/TypeBuilder.h
deleted file mode 100644
index 05f66fa..0000000
--- a/libjava/gnu/xml/validation/datatype/TypeBuilder.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TypeBuilder__
-#define __gnu_xml_validation_datatype_TypeBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class EnumerationFacet;
-            class FractionDigitsFacet;
-            class LengthFacet;
-            class MaxExclusiveFacet;
-            class MaxInclusiveFacet;
-            class MaxLengthFacet;
-            class MinExclusiveFacet;
-            class MinInclusiveFacet;
-            class MinLengthFacet;
-            class PatternFacet;
-            class SimpleType;
-            class TotalDigitsFacet;
-            class TypeBuilder;
-            class WhiteSpaceFacet;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TypeBuilder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TypeBuilder(::gnu::xml::validation::datatype::SimpleType *);
-public:
-  virtual void addParameter(::java::lang::String *, ::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  virtual ::gnu::xml::validation::datatype::LengthFacet * parseLengthFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::MinLengthFacet * parseMinLengthFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::MaxLengthFacet * parseMaxLengthFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::PatternFacet * parsePatternFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::EnumerationFacet * parseEnumerationFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::WhiteSpaceFacet * parseWhiteSpaceFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::MaxInclusiveFacet * parseMaxInclusiveFacet(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual ::gnu::xml::validation::datatype::MaxExclusiveFacet * parseMaxExclusiveFacet(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual ::gnu::xml::validation::datatype::MinExclusiveFacet * parseMinExclusiveFacet(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual ::gnu::xml::validation::datatype::MinInclusiveFacet * parseMinInclusiveFacet(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  virtual ::gnu::xml::validation::datatype::TotalDigitsFacet * parseTotalDigitsFacet(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::FractionDigitsFacet * parseFractionDigitsFacet(::java::lang::String *);
-public:
-  virtual ::org::relaxng::datatype::Datatype * createDatatype();
-public: // actually package-private
-  ::gnu::xml::validation::datatype::SimpleType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TypeBuilder__
diff --git a/libjava/gnu/xml/validation/datatype/TypeLibrary.h b/libjava/gnu/xml/validation/datatype/TypeLibrary.h
deleted file mode 100644
index 83aaa46..0000000
--- a/libjava/gnu/xml/validation/datatype/TypeLibrary.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TypeLibrary__
-#define __gnu_xml_validation_datatype_TypeLibrary__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class SimpleType;
-            class TypeLibrary;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeBuilder;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TypeLibrary : public ::java::lang::Object
-{
-
-public:
-  TypeLibrary();
-  virtual ::org::relaxng::datatype::DatatypeBuilder * createDatatypeBuilder(::java::lang::String *);
-  virtual ::org::relaxng::datatype::Datatype * createDatatype(::java::lang::String *);
-  static ::gnu::xml::validation::datatype::SimpleType * ANY_SIMPLE_TYPE;
-  static ::gnu::xml::validation::datatype::SimpleType * STRING;
-  static ::gnu::xml::validation::datatype::SimpleType * BOOLEAN;
-  static ::gnu::xml::validation::datatype::SimpleType * DECIMAL;
-  static ::gnu::xml::validation::datatype::SimpleType * FLOAT;
-  static ::gnu::xml::validation::datatype::SimpleType * DOUBLE;
-  static ::gnu::xml::validation::datatype::SimpleType * DURATION;
-  static ::gnu::xml::validation::datatype::SimpleType * DATE_TIME;
-  static ::gnu::xml::validation::datatype::SimpleType * TIME;
-  static ::gnu::xml::validation::datatype::SimpleType * DATE;
-  static ::gnu::xml::validation::datatype::SimpleType * G_YEAR_MONTH;
-  static ::gnu::xml::validation::datatype::SimpleType * G_YEAR;
-  static ::gnu::xml::validation::datatype::SimpleType * G_MONTH_DAY;
-  static ::gnu::xml::validation::datatype::SimpleType * G_DAY;
-  static ::gnu::xml::validation::datatype::SimpleType * G_MONTH;
-  static ::gnu::xml::validation::datatype::SimpleType * HEX_BINARY;
-  static ::gnu::xml::validation::datatype::SimpleType * BASE64_BINARY;
-  static ::gnu::xml::validation::datatype::SimpleType * ANY_URI;
-  static ::gnu::xml::validation::datatype::SimpleType * QNAME;
-  static ::gnu::xml::validation::datatype::SimpleType * NOTATION;
-  static ::gnu::xml::validation::datatype::SimpleType * NORMALIZED_STRING;
-  static ::gnu::xml::validation::datatype::SimpleType * TOKEN;
-  static ::gnu::xml::validation::datatype::SimpleType * LANGUAGE;
-  static ::gnu::xml::validation::datatype::SimpleType * NMTOKEN;
-  static ::gnu::xml::validation::datatype::SimpleType * NMTOKENS;
-  static ::gnu::xml::validation::datatype::SimpleType * NAME;
-  static ::gnu::xml::validation::datatype::SimpleType * NCNAME;
-  static ::gnu::xml::validation::datatype::SimpleType * ID;
-  static ::gnu::xml::validation::datatype::SimpleType * IDREF;
-  static ::gnu::xml::validation::datatype::SimpleType * IDREFS;
-  static ::gnu::xml::validation::datatype::SimpleType * ENTITY;
-  static ::gnu::xml::validation::datatype::SimpleType * ENTITIES;
-  static ::gnu::xml::validation::datatype::SimpleType * INTEGER;
-  static ::gnu::xml::validation::datatype::SimpleType * NON_POSITIVE_INTEGER;
-  static ::gnu::xml::validation::datatype::SimpleType * NEGATIVE_INTEGER;
-  static ::gnu::xml::validation::datatype::SimpleType * LONG;
-  static ::gnu::xml::validation::datatype::SimpleType * INT;
-  static ::gnu::xml::validation::datatype::SimpleType * SHORT;
-  static ::gnu::xml::validation::datatype::SimpleType * BYTE;
-  static ::gnu::xml::validation::datatype::SimpleType * NON_NEGATIVE_INTEGER;
-  static ::gnu::xml::validation::datatype::SimpleType * UNSIGNED_LONG;
-  static ::gnu::xml::validation::datatype::SimpleType * UNSIGNED_INT;
-  static ::gnu::xml::validation::datatype::SimpleType * UNSIGNED_SHORT;
-  static ::gnu::xml::validation::datatype::SimpleType * UNSIGNED_BYTE;
-  static ::gnu::xml::validation::datatype::SimpleType * POSITIVE_INTEGER;
-private:
-  static ::java::util::Map * byName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TypeLibrary__
diff --git a/libjava/gnu/xml/validation/datatype/TypeLibraryFactory.h b/libjava/gnu/xml/validation/datatype/TypeLibraryFactory.h
deleted file mode 100644
index baeba00..0000000
--- a/libjava/gnu/xml/validation/datatype/TypeLibraryFactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_TypeLibraryFactory__
-#define __gnu_xml_validation_datatype_TypeLibraryFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class TypeLibraryFactory;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::TypeLibraryFactory : public ::java::lang::Object
-{
-
-public:
-  TypeLibraryFactory();
-  virtual ::org::relaxng::datatype::DatatypeLibrary * createDatatypeLibrary(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_TypeLibraryFactory__
diff --git a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h b/libjava/gnu/xml/validation/datatype/UnionSimpleType.h
deleted file mode 100644
index db8c265..0000000
--- a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_UnionSimpleType__
-#define __gnu_xml_validation_datatype_UnionSimpleType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/SimpleType.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class SimpleType;
-            class UnionSimpleType;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::UnionSimpleType : public ::gnu::xml::validation::datatype::SimpleType
-{
-
-public:
-  UnionSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *);
-  virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) memberTypes;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_UnionSimpleType__
diff --git a/libjava/gnu/xml/validation/datatype/UnsignedByteType.h b/libjava/gnu/xml/validation/datatype/UnsignedByteType.h
deleted file mode 100644
index 7eb207f..0000000
--- a/libjava/gnu/xml/validation/datatype/UnsignedByteType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_UnsignedByteType__
-#define __gnu_xml_validation_datatype_UnsignedByteType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class UnsignedByteType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::UnsignedByteType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  UnsignedByteType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_UnsignedByteType__
diff --git a/libjava/gnu/xml/validation/datatype/UnsignedIntType.h b/libjava/gnu/xml/validation/datatype/UnsignedIntType.h
deleted file mode 100644
index f338b56..0000000
--- a/libjava/gnu/xml/validation/datatype/UnsignedIntType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_UnsignedIntType__
-#define __gnu_xml_validation_datatype_UnsignedIntType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class UnsignedIntType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::UnsignedIntType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  UnsignedIntType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_UnsignedIntType__
diff --git a/libjava/gnu/xml/validation/datatype/UnsignedLongType.h b/libjava/gnu/xml/validation/datatype/UnsignedLongType.h
deleted file mode 100644
index bb0c947..0000000
--- a/libjava/gnu/xml/validation/datatype/UnsignedLongType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_UnsignedLongType__
-#define __gnu_xml_validation_datatype_UnsignedLongType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class UnsignedLongType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::UnsignedLongType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  UnsignedLongType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_UnsignedLongType__
diff --git a/libjava/gnu/xml/validation/datatype/UnsignedShortType.h b/libjava/gnu/xml/validation/datatype/UnsignedShortType.h
deleted file mode 100644
index 99eb7cc..0000000
--- a/libjava/gnu/xml/validation/datatype/UnsignedShortType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_UnsignedShortType__
-#define __gnu_xml_validation_datatype_UnsignedShortType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/AtomicSimpleType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class UnsignedShortType;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::UnsignedShortType : public ::gnu::xml::validation::datatype::AtomicSimpleType
-{
-
-public: // actually package-private
-  UnsignedShortType();
-public:
-  JArray< jint > * getConstrainingFacets();
-  void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-public: // actually package-private
-  static JArray< jint > * CONSTRAINING_FACETS;
-  static ::java::lang::String * MAX_VALUE;
-  static jint LENGTH;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_UnsignedShortType__
diff --git a/libjava/gnu/xml/validation/datatype/WhiteSpaceFacet.h b/libjava/gnu/xml/validation/datatype/WhiteSpaceFacet.h
deleted file mode 100644
index 3cc38a6..0000000
--- a/libjava/gnu/xml/validation/datatype/WhiteSpaceFacet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_datatype_WhiteSpaceFacet__
-#define __gnu_xml_validation_datatype_WhiteSpaceFacet__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Facet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class WhiteSpaceFacet;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::datatype::WhiteSpaceFacet : public ::gnu::xml::validation::datatype::Facet
-{
-
-public:
-  WhiteSpaceFacet(jint, jboolean, ::gnu::xml::validation::datatype::Annotation *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static const jint PRESERVE = 0;
-  static const jint REPLACE = 1;
-  static const jint COLLAPSE = 2;
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Facet)))) value;
-  jboolean fixed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_datatype_WhiteSpaceFacet__
diff --git a/libjava/gnu/xml/validation/relaxng/AnyNameNameClass.h b/libjava/gnu/xml/validation/relaxng/AnyNameNameClass.h
deleted file mode 100644
index 312a48f..0000000
--- a/libjava/gnu/xml/validation/relaxng/AnyNameNameClass.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_AnyNameNameClass__
-#define __gnu_xml_validation_relaxng_AnyNameNameClass__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/NameClass.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class AnyNameNameClass;
-            class NameClass;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::AnyNameNameClass : public ::gnu::xml::validation::relaxng::NameClass
-{
-
-public: // actually package-private
-  AnyNameNameClass();
-  virtual jboolean matchesName(::java::lang::String *, ::java::lang::String *);
-  ::gnu::xml::validation::relaxng::NameClass * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::NameClass)))) exceptNameClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_AnyNameNameClass__
diff --git a/libjava/gnu/xml/validation/relaxng/AttributePattern.h b/libjava/gnu/xml/validation/relaxng/AttributePattern.h
deleted file mode 100644
index 42b3801..0000000
--- a/libjava/gnu/xml/validation/relaxng/AttributePattern.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_AttributePattern__
-#define __gnu_xml_validation_relaxng_AttributePattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class AttributePattern;
-            class NameClass;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::AttributePattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  AttributePattern();
-  ::gnu::xml::validation::relaxng::NameClass * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) nameClass;
-  ::gnu::xml::validation::relaxng::Pattern * pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_AttributePattern__
diff --git a/libjava/gnu/xml/validation/relaxng/ChoiceNameClass.h b/libjava/gnu/xml/validation/relaxng/ChoiceNameClass.h
deleted file mode 100644
index dc82756..0000000
--- a/libjava/gnu/xml/validation/relaxng/ChoiceNameClass.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_ChoiceNameClass__
-#define __gnu_xml_validation_relaxng_ChoiceNameClass__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/NameClass.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class ChoiceNameClass;
-            class NameClass;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::ChoiceNameClass : public ::gnu::xml::validation::relaxng::NameClass
-{
-
-public: // actually package-private
-  ChoiceNameClass();
-  virtual jboolean matchesName(::java::lang::String *, ::java::lang::String *);
-  ::gnu::xml::validation::relaxng::NameClass * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::NameClass)))) name1;
-  ::gnu::xml::validation::relaxng::NameClass * name2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_ChoiceNameClass__
diff --git a/libjava/gnu/xml/validation/relaxng/ChoicePattern.h b/libjava/gnu/xml/validation/relaxng/ChoicePattern.h
deleted file mode 100644
index 85c4a2f..0000000
--- a/libjava/gnu/xml/validation/relaxng/ChoicePattern.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_ChoicePattern__
-#define __gnu_xml_validation_relaxng_ChoicePattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class ChoicePattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::ChoicePattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  ChoicePattern();
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) pattern1;
-  ::gnu::xml::validation::relaxng::Pattern * pattern2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_ChoicePattern__
diff --git a/libjava/gnu/xml/validation/relaxng/DataPattern.h b/libjava/gnu/xml/validation/relaxng/DataPattern.h
deleted file mode 100644
index 00bb5b5..0000000
--- a/libjava/gnu/xml/validation/relaxng/DataPattern.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_DataPattern__
-#define __gnu_xml_validation_relaxng_DataPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class DataPattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeLibrary;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::DataPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  DataPattern();
-  ::org::relaxng::datatype::Datatype * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) type;
-  ::org::relaxng::datatype::DatatypeLibrary * datatypeLibrary;
-  ::java::util::List * params;
-  ::gnu::xml::validation::relaxng::Pattern * exceptPattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_DataPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/Define.h b/libjava/gnu/xml/validation/relaxng/Define.h
deleted file mode 100644
index 85fa679..0000000
--- a/libjava/gnu/xml/validation/relaxng/Define.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_Define__
-#define __gnu_xml_validation_relaxng_Define__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class Define;
-            class ElementPattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::Define : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Define();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::gnu::xml::validation::relaxng::ElementPattern * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_Define__
diff --git a/libjava/gnu/xml/validation/relaxng/ElementPattern.h b/libjava/gnu/xml/validation/relaxng/ElementPattern.h
deleted file mode 100644
index 844132f..0000000
--- a/libjava/gnu/xml/validation/relaxng/ElementPattern.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_ElementPattern__
-#define __gnu_xml_validation_relaxng_ElementPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class ElementPattern;
-            class NameClass;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::ElementPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  ElementPattern();
-  ::gnu::xml::validation::relaxng::NameClass * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) nameClass;
-  ::gnu::xml::validation::relaxng::Pattern * pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_ElementPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/EmptyPattern.h b/libjava/gnu/xml/validation/relaxng/EmptyPattern.h
deleted file mode 100644
index ecd499b..0000000
--- a/libjava/gnu/xml/validation/relaxng/EmptyPattern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_EmptyPattern__
-#define __gnu_xml_validation_relaxng_EmptyPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class EmptyPattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::EmptyPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  EmptyPattern();
-  static ::gnu::xml::validation::relaxng::EmptyPattern * INSTANCE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_EmptyPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/FullSyntaxBuilder.h b/libjava/gnu/xml/validation/relaxng/FullSyntaxBuilder.h
deleted file mode 100644
index bf53fba..0000000
--- a/libjava/gnu/xml/validation/relaxng/FullSyntaxBuilder.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_FullSyntaxBuilder__
-#define __gnu_xml_validation_relaxng_FullSyntaxBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class AnyNameNameClass;
-            class AttributePattern;
-            class ChoiceNameClass;
-            class ChoicePattern;
-            class DataPattern;
-            class Define;
-            class ElementPattern;
-            class EmptyPattern;
-            class FullSyntaxBuilder;
-            class Grammar;
-            class GroupPattern;
-            class InterleavePattern;
-            class ListPattern;
-            class NSNameNameClass;
-            class NameClass;
-            class NameNameClass;
-            class NotAllowedPattern;
-            class OneOrMorePattern;
-            class Param;
-            class Pattern;
-            class RefPattern;
-            class TextPattern;
-            class ValuePattern;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-      }
-    }
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class Element;
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::FullSyntaxBuilder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FullSyntaxBuilder();
-  virtual ::gnu::xml::validation::relaxng::Grammar * parse(::org::w3c::dom::Document *);
-private:
-  void getDefines(::java::util::Set *, ::org::w3c::dom::Element *, ::org::w3c::dom::Element *, jboolean);
-  void getElements(::java::util::Set *, ::org::w3c::dom::Element *, ::org::w3c::dom::Element *);
-  void expandRefs(::java::util::Set *, ::org::w3c::dom::Element *);
-  void forbidRefs(::org::w3c::dom::Element *, ::java::lang::String *);
-  void transform(::org::w3c::dom::Node *);
-  void transformGrammar(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  void handleRefs(::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::String * createRefName();
-  void transform2(::org::w3c::dom::Node *);
-  static jboolean isWhitespace(::java::lang::String *);
-  static ::java::lang::String * escapeURL(::java::lang::String *);
-  static ::org::w3c::dom::Element * resolve(::java::lang::String *);
-  ::java::util::List * getComponents(::org::w3c::dom::Node *);
-  static void transformToOneChildElement(::org::w3c::dom::Node *, ::java::lang::String *);
-  static ::org::w3c::dom::Element * getFirstChildElement(::org::w3c::dom::Node *);
-  static ::org::w3c::dom::Element * getNextSiblingElement(::org::w3c::dom::Node *);
-  static void forbidDescendants(::org::w3c::dom::Node *, ::java::util::Set *);
-  static jboolean isDescendantOfFirstChildOfAttribute(::org::w3c::dom::Node *);
-  static void combineNodes(::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *, ::java::util::List *);
-public: // actually package-private
-  virtual ::gnu::xml::validation::relaxng::Grammar * parseGrammar(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::Define * parseDefine(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::Pattern * parseTop(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::Pattern * parsePattern(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::Pattern * parseNonEmptyPattern(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::ElementPattern * parseElement(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::NotAllowedPattern * parseNotAllowed(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::EmptyPattern * parseEmpty(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::TextPattern * parseText(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::DataPattern * parseData(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::Param * parseParam(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::ValuePattern * parseValue(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::ListPattern * parseList(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::AttributePattern * parseAttribute(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::RefPattern * parseRef(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::OneOrMorePattern * parseOneOrMore(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::ChoicePattern * parseChoice(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::GroupPattern * parseGroup(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::InterleavePattern * parseInterleave(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::NameClass * parseNameClass(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::AnyNameNameClass * parseAnyName(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::NameNameClass * parseName(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::NSNameNameClass * parseNsName(::org::w3c::dom::Element *);
-  virtual ::gnu::xml::validation::relaxng::ChoiceNameClass * parseChoiceNameClass(::org::w3c::dom::Element *);
-  virtual void checkName(::org::w3c::dom::Element *, ::java::lang::String *);
-  virtual ::org::relaxng::datatype::DatatypeLibrary * getDatatypeLibrary(::java::lang::String *);
-  static ::java::util::Map * VOCABULARY;
-  static ::java::util::Set * STRIPPED_ATTRIBUTES;
-  static ::java::util::Set * PATTERN_ELEMENTS;
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) urls;
-  jint refCount;
-  ::java::util::Map * datatypeLibraries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_FullSyntaxBuilder__
diff --git a/libjava/gnu/xml/validation/relaxng/Grammar.h b/libjava/gnu/xml/validation/relaxng/Grammar.h
deleted file mode 100644
index a813efc..0000000
--- a/libjava/gnu/xml/validation/relaxng/Grammar.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_Grammar__
-#define __gnu_xml_validation_relaxng_Grammar__
-
-#pragma interface
-
-#include <javax/xml/validation/Schema.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class Grammar;
-            class Pattern;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class Validator;
-          class ValidatorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::Grammar : public ::javax::xml::validation::Schema
-{
-
-public: // actually package-private
-  Grammar();
-public:
-  virtual ::javax::xml::validation::Validator * newValidator();
-  virtual ::javax::xml::validation::ValidatorHandler * newValidatorHandler();
-public: // actually package-private
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::javax::xml::validation::Schema)))) start;
-  ::java::util::List * defines;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_Grammar__
diff --git a/libjava/gnu/xml/validation/relaxng/GrammarException.h b/libjava/gnu/xml/validation/relaxng/GrammarException.h
deleted file mode 100644
index 45ddffe..0000000
--- a/libjava/gnu/xml/validation/relaxng/GrammarException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_GrammarException__
-#define __gnu_xml_validation_relaxng_GrammarException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class GrammarException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::GrammarException : public ::java::io::IOException
-{
-
-public: // actually package-private
-  GrammarException(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_GrammarException__
diff --git a/libjava/gnu/xml/validation/relaxng/GrammarValidator.h b/libjava/gnu/xml/validation/relaxng/GrammarValidator.h
deleted file mode 100644
index 37b0d01..0000000
--- a/libjava/gnu/xml/validation/relaxng/GrammarValidator.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_GrammarValidator__
-#define __gnu_xml_validation_relaxng_GrammarValidator__
-
-#pragma interface
-
-#include <javax/xml/validation/Validator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class Grammar;
-            class GrammarValidator;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Source;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::GrammarValidator : public ::javax::xml::validation::Validator
-{
-
-public: // actually package-private
-  GrammarValidator(::gnu::xml::validation::relaxng::Grammar *);
-public:
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver();
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *);
-  virtual void reset();
-  virtual void validate(::javax::xml::transform::Source *, ::javax::xml::transform::Result *);
-public: // actually package-private
-  ::gnu::xml::validation::relaxng::Grammar * __attribute__((aligned(__alignof__( ::javax::xml::validation::Validator)))) grammar;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::w3c::dom::ls::LSResourceResolver * resourceResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_GrammarValidator__
diff --git a/libjava/gnu/xml/validation/relaxng/GroupPattern.h b/libjava/gnu/xml/validation/relaxng/GroupPattern.h
deleted file mode 100644
index bd52ac7..0000000
--- a/libjava/gnu/xml/validation/relaxng/GroupPattern.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_GroupPattern__
-#define __gnu_xml_validation_relaxng_GroupPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class GroupPattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::GroupPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  GroupPattern();
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) pattern1;
-  ::gnu::xml::validation::relaxng::Pattern * pattern2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_GroupPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/InterleavePattern.h b/libjava/gnu/xml/validation/relaxng/InterleavePattern.h
deleted file mode 100644
index 02716e8..0000000
--- a/libjava/gnu/xml/validation/relaxng/InterleavePattern.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_InterleavePattern__
-#define __gnu_xml_validation_relaxng_InterleavePattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class InterleavePattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::InterleavePattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  InterleavePattern();
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) pattern1;
-  ::gnu::xml::validation::relaxng::Pattern * pattern2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_InterleavePattern__
diff --git a/libjava/gnu/xml/validation/relaxng/ListPattern.h b/libjava/gnu/xml/validation/relaxng/ListPattern.h
deleted file mode 100644
index 78351cf..0000000
--- a/libjava/gnu/xml/validation/relaxng/ListPattern.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_ListPattern__
-#define __gnu_xml_validation_relaxng_ListPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class ListPattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::ListPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  ListPattern();
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_ListPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/NSNameNameClass.h b/libjava/gnu/xml/validation/relaxng/NSNameNameClass.h
deleted file mode 100644
index 8fcdb4f..0000000
--- a/libjava/gnu/xml/validation/relaxng/NSNameNameClass.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_NSNameNameClass__
-#define __gnu_xml_validation_relaxng_NSNameNameClass__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/NameClass.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class NSNameNameClass;
-            class NameClass;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::NSNameNameClass : public ::gnu::xml::validation::relaxng::NameClass
-{
-
-public: // actually package-private
-  NSNameNameClass();
-  virtual jboolean matchesName(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::NameClass)))) ns;
-  ::gnu::xml::validation::relaxng::NameClass * exceptNameClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_NSNameNameClass__
diff --git a/libjava/gnu/xml/validation/relaxng/NameClass.h b/libjava/gnu/xml/validation/relaxng/NameClass.h
deleted file mode 100644
index ffa1dfb..0000000
--- a/libjava/gnu/xml/validation/relaxng/NameClass.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_NameClass__
-#define __gnu_xml_validation_relaxng_NameClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class NameClass;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::NameClass : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NameClass();
-  virtual jboolean matchesName(::java::lang::String *, ::java::lang::String *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_NameClass__
diff --git a/libjava/gnu/xml/validation/relaxng/NameNameClass.h b/libjava/gnu/xml/validation/relaxng/NameNameClass.h
deleted file mode 100644
index 334bf94..0000000
--- a/libjava/gnu/xml/validation/relaxng/NameNameClass.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_NameNameClass__
-#define __gnu_xml_validation_relaxng_NameNameClass__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/NameClass.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class NameNameClass;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::NameNameClass : public ::gnu::xml::validation::relaxng::NameClass
-{
-
-public: // actually package-private
-  NameNameClass();
-  virtual jboolean matchesName(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::NameClass)))) ns;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_NameNameClass__
diff --git a/libjava/gnu/xml/validation/relaxng/NotAllowedPattern.h b/libjava/gnu/xml/validation/relaxng/NotAllowedPattern.h
deleted file mode 100644
index a65d11b..0000000
--- a/libjava/gnu/xml/validation/relaxng/NotAllowedPattern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_NotAllowedPattern__
-#define __gnu_xml_validation_relaxng_NotAllowedPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class NotAllowedPattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::NotAllowedPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  NotAllowedPattern();
-  static ::gnu::xml::validation::relaxng::NotAllowedPattern * INSTANCE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_NotAllowedPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/OneOrMorePattern.h b/libjava/gnu/xml/validation/relaxng/OneOrMorePattern.h
deleted file mode 100644
index d59682b..0000000
--- a/libjava/gnu/xml/validation/relaxng/OneOrMorePattern.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_OneOrMorePattern__
-#define __gnu_xml_validation_relaxng_OneOrMorePattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class OneOrMorePattern;
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::OneOrMorePattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  OneOrMorePattern();
-  ::gnu::xml::validation::relaxng::Pattern * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_OneOrMorePattern__
diff --git a/libjava/gnu/xml/validation/relaxng/Param.h b/libjava/gnu/xml/validation/relaxng/Param.h
deleted file mode 100644
index 1624174..0000000
--- a/libjava/gnu/xml/validation/relaxng/Param.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_Param__
-#define __gnu_xml_validation_relaxng_Param__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class Param;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::Param : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Param();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_Param__
diff --git a/libjava/gnu/xml/validation/relaxng/Pattern.h b/libjava/gnu/xml/validation/relaxng/Pattern.h
deleted file mode 100644
index fd0f6d6..0000000
--- a/libjava/gnu/xml/validation/relaxng/Pattern.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_Pattern__
-#define __gnu_xml_validation_relaxng_Pattern__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class Pattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::Pattern : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Pattern();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_Pattern__
diff --git a/libjava/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.h b/libjava/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.h
deleted file mode 100644
index 65a8c0a..0000000
--- a/libjava/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_RELAXNGSchemaFactory__
-#define __gnu_xml_validation_relaxng_RELAXNGSchemaFactory__
-
-#pragma interface
-
-#include <javax/xml/validation/SchemaFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class RELAXNGSchemaFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::RELAXNGSchemaFactory : public ::javax::xml::validation::SchemaFactory
-{
-
-public:
-  RELAXNGSchemaFactory();
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver();
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual jboolean isSchemaLanguageSupported(::java::lang::String *);
-  virtual ::javax::xml::validation::Schema * newSchema();
-  virtual ::javax::xml::validation::Schema * newSchema(JArray< ::javax::xml::transform::Source * > *);
-private:
-  static ::org::w3c::dom::Document * getDocument(::javax::xml::transform::Source *);
-public: // actually package-private
-  ::org::w3c::dom::ls::LSResourceResolver * __attribute__((aligned(__alignof__( ::javax::xml::validation::SchemaFactory)))) resourceResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_RELAXNGSchemaFactory__
diff --git a/libjava/gnu/xml/validation/relaxng/RefPattern.h b/libjava/gnu/xml/validation/relaxng/RefPattern.h
deleted file mode 100644
index 7372868..0000000
--- a/libjava/gnu/xml/validation/relaxng/RefPattern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_RefPattern__
-#define __gnu_xml_validation_relaxng_RefPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class RefPattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::RefPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  RefPattern();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_RefPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/TextPattern.h b/libjava/gnu/xml/validation/relaxng/TextPattern.h
deleted file mode 100644
index b687c07..0000000
--- a/libjava/gnu/xml/validation/relaxng/TextPattern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_TextPattern__
-#define __gnu_xml_validation_relaxng_TextPattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class TextPattern;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::TextPattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  TextPattern();
-  static ::gnu::xml::validation::relaxng::TextPattern * INSTANCE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_TextPattern__
diff --git a/libjava/gnu/xml/validation/relaxng/ValuePattern.h b/libjava/gnu/xml/validation/relaxng/ValuePattern.h
deleted file mode 100644
index b1f69f6..0000000
--- a/libjava/gnu/xml/validation/relaxng/ValuePattern.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_relaxng_ValuePattern__
-#define __gnu_xml_validation_relaxng_ValuePattern__
-
-#pragma interface
-
-#include <gnu/xml/validation/relaxng/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace relaxng
-        {
-            class ValuePattern;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeLibrary;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::relaxng::ValuePattern : public ::gnu::xml::validation::relaxng::Pattern
-{
-
-public: // actually package-private
-  ValuePattern();
-  ::org::relaxng::datatype::DatatypeLibrary * __attribute__((aligned(__alignof__( ::gnu::xml::validation::relaxng::Pattern)))) datatypeLibrary;
-  ::org::relaxng::datatype::Datatype * type;
-  ::java::lang::String * ns;
-  ::java::lang::String * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_relaxng_ValuePattern__
diff --git a/libjava/gnu/xml/validation/xmlschema/AnyAttribute.h b/libjava/gnu/xml/validation/xmlschema/AnyAttribute.h
deleted file mode 100644
index 1056196..0000000
--- a/libjava/gnu/xml/validation/xmlschema/AnyAttribute.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_AnyAttribute__
-#define __gnu_xml_validation_xmlschema_AnyAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-        }
-        namespace xmlschema
-        {
-            class AnyAttribute;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::AnyAttribute : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AnyAttribute(::java::lang::String *, jint);
-  static const jint STRICT = 0;
-  static const jint LAX = 1;
-  static const jint SKIP = 2;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespace$;
-  jint processContents;
-  ::gnu::xml::validation::datatype::Annotation * annotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_AnyAttribute__
diff --git a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h b/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
deleted file mode 100644
index 5b7d1fc..0000000
--- a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_AttributeDeclaration__
-#define __gnu_xml_validation_xmlschema_AttributeDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class SimpleType;
-        }
-        namespace xmlschema
-        {
-            class AttributeDeclaration;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::AttributeDeclaration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
-  static const jint NONE = 0;
-  static const jint DEFAULT = 1;
-  static const jint FIXED = 2;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) scope;
-  jint type;
-  ::java::lang::String * value;
-  ::javax::xml::namespace$::QName * name;
-  ::gnu::xml::validation::datatype::SimpleType * datatype;
-  ::gnu::xml::validation::datatype::Annotation * annotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_AttributeDeclaration__
diff --git a/libjava/gnu/xml/validation/xmlschema/AttributeUse.h b/libjava/gnu/xml/validation/xmlschema/AttributeUse.h
deleted file mode 100644
index b5c008f..0000000
--- a/libjava/gnu/xml/validation/xmlschema/AttributeUse.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_AttributeUse__
-#define __gnu_xml_validation_xmlschema_AttributeUse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class AttributeDeclaration;
-            class AttributeUse;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::AttributeUse : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributeUse(jboolean, jint, ::java::lang::String *, ::gnu::xml::validation::xmlschema::AttributeDeclaration *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) required;
-  jint type;
-  ::java::lang::String * value;
-  ::gnu::xml::validation::xmlschema::AttributeDeclaration * declaration;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_AttributeUse__
diff --git a/libjava/gnu/xml/validation/xmlschema/ComplexType.h b/libjava/gnu/xml/validation/xmlschema/ComplexType.h
deleted file mode 100644
index 170ab9d..0000000
--- a/libjava/gnu/xml/validation/xmlschema/ComplexType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_ComplexType__
-#define __gnu_xml_validation_xmlschema_ComplexType__
-
-#pragma interface
-
-#include <gnu/xml/validation/datatype/Type.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class AnyAttribute;
-            class ComplexType;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::ComplexType : public ::gnu::xml::validation::datatype::Type
-{
-
-public: // actually package-private
-  ComplexType(::javax::xml::namespace$::QName *, jboolean, jint, jint);
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType;
-  jint derivationMethod;
-  jint finality;
-  jboolean isAbstract;
-  ::java::util::Set * attributeUses;
-  ::gnu::xml::validation::xmlschema::AnyAttribute * attributeWildcard;
-  jint contentType;
-  ::java::lang::Object * contentModel;
-  jint prohibitedSubstitutions;
-  ::java::util::Set * annotations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_ComplexType__
diff --git a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h b/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
deleted file mode 100644
index 67e7d86..0000000
--- a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_ElementDeclaration__
-#define __gnu_xml_validation_xmlschema_ElementDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class Type;
-        }
-        namespace xmlschema
-        {
-            class ElementDeclaration;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::ElementDeclaration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ElementDeclaration(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace$::QName *, jint, jint, jboolean);
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::gnu::xml::validation::datatype::Type * datatype;
-  jint scope;
-  ::gnu::xml::validation::xmlschema::ElementDeclaration * parent;
-  jint type;
-  ::java::lang::String * value;
-  jboolean nillable;
-  ::javax::xml::namespace$::QName * substitutionGroup;
-  jint substitutionGroupExclusions;
-  jint disallowedSubstitutions;
-  jboolean isAbstract;
-  ::gnu::xml::validation::datatype::Annotation * annotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_ElementDeclaration__
diff --git a/libjava/gnu/xml/validation/xmlschema/Particle.h b/libjava/gnu/xml/validation/xmlschema/Particle.h
deleted file mode 100644
index c8228ba..0000000
--- a/libjava/gnu/xml/validation/xmlschema/Particle.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_Particle__
-#define __gnu_xml_validation_xmlschema_Particle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class Particle;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::Particle : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Particle(::java::lang::Integer *, ::java::lang::Integer *, ::java::lang::Object *);
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) minOccurs;
-  ::java::lang::Integer * maxOccurs;
-  ::java::lang::Object * term;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_Particle__
diff --git a/libjava/gnu/xml/validation/xmlschema/ValidationException.h b/libjava/gnu/xml/validation/xmlschema/ValidationException.h
deleted file mode 100644
index cdea811..0000000
--- a/libjava/gnu/xml/validation/xmlschema/ValidationException.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_ValidationException__
-#define __gnu_xml_validation_xmlschema_ValidationException__
-
-#pragma interface
-
-#include <org/xml/sax/SAXParseException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class ValidationException;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::ValidationException : public ::org::xml::sax::SAXParseException
-{
-
-public: // actually package-private
-  ValidationException(::java::lang::String *, ::org::xml::sax::Locator *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_ValidationException__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchema.h b/libjava/gnu/xml/validation/xmlschema/XMLSchema.h
deleted file mode 100644
index 4fec76f..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchema.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchema__
-#define __gnu_xml_validation_xmlschema_XMLSchema__
-
-#pragma interface
-
-#include <javax/xml/validation/Schema.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class XMLSchema;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class Validator;
-          class ValidatorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchema : public ::javax::xml::validation::Schema
-{
-
-public: // actually package-private
-  XMLSchema(::java::lang::String *, ::java::lang::String *, jint, jint, jboolean, jboolean);
-public:
-  ::javax::xml::validation::Validator * newValidator();
-  ::javax::xml::validation::ValidatorHandler * newValidatorHandler();
-public: // actually package-private
-  static const jint FINAL_NONE = 0;
-  static const jint FINAL_EXTENSION = 1;
-  static const jint FINAL_RESTRICTION = 2;
-  static const jint FINAL_LIST = 4;
-  static const jint FINAL_UNION = 8;
-  static const jint FINAL_ALL = 15;
-  static const jint BLOCK_NONE = 0;
-  static const jint BLOCK_EXTENSION = 1;
-  static const jint BLOCK_RESTRICTION = 2;
-  static const jint BLOCK_SUBSTITUTION = 4;
-  static const jint BLOCK_ALL = 7;
-  static const jint GLOBAL = 0;
-  static const jint LOCAL = 1;
-  static const jint ABSENT = 2;
-  static const jint CONSTRAINT_NONE = 0;
-  static const jint CONSTRAINT_DEFAULT = 1;
-  static const jint CONSTRAINT_FIXED = 2;
-  static const jint CONTENT_EMPTY = 0;
-  static const jint CONTENT_SIMPLE = 1;
-  static const jint CONTENT_MIXED = 2;
-  static const jint CONTENT_ELEMENT_ONLY = 3;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::validation::Schema)))) targetNamespace;
-  ::java::lang::String * version;
-  jint finalDefault;
-  jint blockDefault;
-  jboolean attributeFormQualified;
-  jboolean elementFormQualified;
-  ::java::util::Map * elementDeclarations;
-  ::java::util::Map * attributeDeclarations;
-  ::java::util::Map * types;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchema__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.h
deleted file mode 100644
index 465720c..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaAttributeTypeInfo__
-#define __gnu_xml_validation_xmlschema_XMLSchemaAttributeTypeInfo__
-
-#pragma interface
-
-#include <gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class SimpleType;
-        }
-        namespace xmlschema
-        {
-            class AttributeDeclaration;
-            class XMLSchema;
-            class XMLSchemaAttributeTypeInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaAttributeTypeInfo : public ::gnu::xml::validation::xmlschema::XMLSchemaTypeInfo
-{
-
-public: // actually package-private
-  XMLSchemaAttributeTypeInfo(::gnu::xml::validation::xmlschema::XMLSchema *, ::gnu::xml::validation::xmlschema::AttributeDeclaration *, jboolean);
-public:
-  ::java::lang::String * getTypeName();
-  ::java::lang::String * getTypeNamespace();
-  jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint);
-public: // actually package-private
-  ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::gnu::xml::validation::xmlschema::XMLSchemaTypeInfo)))) schema;
-  ::gnu::xml::validation::xmlschema::AttributeDeclaration * decl;
-  ::gnu::xml::validation::datatype::SimpleType * type;
-  jboolean id;
-  jboolean specified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaAttributeTypeInfo__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
deleted file mode 100644
index ed1bc80..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaBuilder__
-#define __gnu_xml_validation_xmlschema_XMLSchemaBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Annotation;
-            class SimpleType;
-            class Type;
-        }
-        namespace xmlschema
-        {
-            class AnyAttribute;
-            class ComplexType;
-            class ElementDeclaration;
-            class XMLSchema;
-            class XMLSchemaBuilder;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-      }
-    }
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NamedNodeMap;
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaBuilder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLSchemaBuilder();
-  virtual void parseSchema(::org::w3c::dom::Node *);
-  virtual void parseTopLevelElement(::org::w3c::dom::Node *);
-  virtual ::java::lang::Object * parseAttribute(::org::w3c::dom::Node *, jboolean);
-  virtual jint parseFullDerivationSet(::java::lang::String *);
-  virtual jint parseSimpleTypeDerivationSet(::java::lang::String *);
-  virtual jint parseComplexTypeDerivationSet(::java::lang::String *);
-  virtual jint parseBlockSet(::java::lang::String *);
-  virtual jint parseComplexTypeBlockSet(::java::lang::String *);
-  virtual ::java::lang::Object * parseElement(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
-  virtual ::java::lang::Integer * getOccurrence(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace$::QName *);
-  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::validation::datatype::Type * parseComplexType(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
-  virtual void parseSimpleContent(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
-  virtual void parseRestriction(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
-  virtual void parseExtension(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
-  virtual ::gnu::xml::validation::xmlschema::AnyAttribute * parseAnyAttribute(::org::w3c::dom::Node *);
-  virtual ::gnu::xml::validation::datatype::Annotation * parseAnnotation(::org::w3c::dom::Node *);
-private:
-  static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
-  static ::javax::xml::namespace$::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
-public: // actually package-private
-  ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schema;
-  ::org::relaxng::datatype::DatatypeLibrary * typeLibrary;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaBuilder__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.h
deleted file mode 100644
index 23ff8b6..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaElementTypeInfo__
-#define __gnu_xml_validation_xmlschema_XMLSchemaElementTypeInfo__
-
-#pragma interface
-
-#include <gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Type;
-        }
-        namespace xmlschema
-        {
-            class ElementDeclaration;
-            class XMLSchema;
-            class XMLSchemaElementTypeInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaElementTypeInfo : public ::gnu::xml::validation::xmlschema::XMLSchemaTypeInfo
-{
-
-public: // actually package-private
-  XMLSchemaElementTypeInfo(::gnu::xml::validation::xmlschema::XMLSchema *, ::gnu::xml::validation::xmlschema::ElementDeclaration *, ::gnu::xml::validation::datatype::Type *);
-public:
-  ::java::lang::String * getTypeName();
-  ::java::lang::String * getTypeNamespace();
-  jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint);
-public: // actually package-private
-  ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::gnu::xml::validation::xmlschema::XMLSchemaTypeInfo)))) schema;
-  ::gnu::xml::validation::xmlschema::ElementDeclaration * decl;
-  ::gnu::xml::validation::datatype::Type * type;
-  jboolean nil;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaElementTypeInfo__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.h
deleted file mode 100644
index b4d45dd..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaSchemaFactory__
-#define __gnu_xml_validation_xmlschema_XMLSchemaSchemaFactory__
-
-#pragma interface
-
-#include <javax/xml/validation/SchemaFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class XMLSchemaSchemaFactory;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaSchemaFactory : public ::javax::xml::validation::SchemaFactory
-{
-
-public:
-  XMLSchemaSchemaFactory();
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver();
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler();
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual jboolean isSchemaLanguageSupported(::java::lang::String *);
-  virtual ::javax::xml::validation::Schema * newSchema();
-  virtual ::javax::xml::validation::Schema * newSchema(JArray< ::javax::xml::transform::Source * > *);
-private:
-  static ::org::w3c::dom::Document * getDocument(::javax::xml::transform::Source *);
-public: // actually package-private
-  ::org::w3c::dom::ls::LSResourceResolver * __attribute__((aligned(__alignof__( ::javax::xml::validation::SchemaFactory)))) resourceResolver;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaSchemaFactory__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.h
deleted file mode 100644
index d253235..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaTypeInfo__
-#define __gnu_xml_validation_xmlschema_XMLSchemaTypeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class SimpleType;
-        }
-        namespace xmlschema
-        {
-            class XMLSchemaTypeInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaTypeInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLSchemaTypeInfo();
-public: // actually protected
-  virtual jboolean simpleTypeIsDerivedFrom(::gnu::xml::validation::datatype::SimpleType *, ::java::lang::String *, ::java::lang::String *, jint);
-public:
-  virtual ::java::lang::String * getTypeName() = 0;
-  virtual ::java::lang::String * getTypeNamespace() = 0;
-  virtual jboolean isDerivedFrom(::java::lang::String *, ::java::lang::String *, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaTypeInfo__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.h
deleted file mode 100644
index 049b63a..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaTypeInfoProvider__
-#define __gnu_xml_validation_xmlschema_XMLSchemaTypeInfoProvider__
-
-#pragma interface
-
-#include <javax/xml/validation/TypeInfoProvider.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class XMLSchemaTypeInfoProvider;
-            class XMLSchemaValidatorHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaTypeInfoProvider : public ::javax::xml::validation::TypeInfoProvider
-{
-
-public: // actually package-private
-  XMLSchemaTypeInfoProvider(::gnu::xml::validation::xmlschema::XMLSchemaValidatorHandler *);
-public:
-  ::org::w3c::dom::TypeInfo * getElementTypeInfo();
-  ::org::w3c::dom::TypeInfo * getAttributeTypeInfo(jint);
-  jboolean isIdAttribute(jint);
-  jboolean isSpecified(jint);
-public: // actually package-private
-  ::gnu::xml::validation::xmlschema::XMLSchemaValidatorHandler * __attribute__((aligned(__alignof__( ::javax::xml::validation::TypeInfoProvider)))) handler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaTypeInfoProvider__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidator.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidator.h
deleted file mode 100644
index fbbb196..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidator.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaValidator__
-#define __gnu_xml_validation_xmlschema_XMLSchemaValidator__
-
-#pragma interface
-
-#include <javax/xml/validation/Validator.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace xmlschema
-        {
-            class XMLSchema;
-            class XMLSchemaValidator;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Source;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaValidator : public ::javax::xml::validation::Validator
-{
-
-public: // actually package-private
-  XMLSchemaValidator(::gnu::xml::validation::xmlschema::XMLSchema *);
-public:
-  void reset();
-  void validate(::javax::xml::transform::Source *, ::javax::xml::transform::Result *);
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver();
-  void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *);
-public: // actually package-private
-  ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::javax::xml::validation::Validator)))) schema;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::w3c::dom::ls::LSResourceResolver * resourceResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaValidator__
diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.h
deleted file mode 100644
index 94ebcc7..0000000
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_validation_xmlschema_XMLSchemaValidatorHandler__
-#define __gnu_xml_validation_xmlschema_XMLSchemaValidatorHandler__
-
-#pragma interface
-
-#include <javax/xml/validation/ValidatorHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-        namespace datatype
-        {
-            class Type;
-        }
-        namespace xmlschema
-        {
-            class XMLSchema;
-            class XMLSchemaValidatorHandler;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class TypeInfoProvider;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-      }
-    }
-    namespace w3c
-    {
-      namespace dom
-      {
-          class TypeInfo;
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class ErrorHandler;
-          class Locator;
-        namespace helpers
-        {
-            class NamespaceSupport;
-        }
-      }
-    }
-  }
-}
-
-class gnu::xml::validation::xmlschema::XMLSchemaValidatorHandler : public ::javax::xml::validation::ValidatorHandler
-{
-
-public: // actually package-private
-  XMLSchemaValidatorHandler(::gnu::xml::validation::xmlschema::XMLSchema *);
-public:
-  ::org::xml::sax::ContentHandler * getContentHandler();
-  void setContentHandler(::org::xml::sax::ContentHandler *);
-  ::org::xml::sax::ErrorHandler * getErrorHandler();
-  void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver();
-  void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *);
-  ::javax::xml::validation::TypeInfoProvider * getTypeInfoProvider();
-public: // actually package-private
-  ::org::w3c::dom::TypeInfo * getElementTypeInfo();
-  ::org::w3c::dom::TypeInfo * getAttributeTypeInfo(jint);
-  jboolean isIdAttribute(jint);
-  jboolean isSpecified(jint);
-public:
-  void setDocumentLocator(::org::xml::sax::Locator *);
-  void startDocument();
-  void endDocument();
-  void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
-  void endPrefixMapping(::java::lang::String *);
-  void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *);
-  void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  void characters(JArray< jchar > *, jint, jint);
-  void ignorableWhitespace(JArray< jchar > *, jint, jint);
-  void processingInstruction(::java::lang::String *, ::java::lang::String *);
-  void skippedEntity(::java::lang::String *);
-public: // actually package-private
-  ::gnu::xml::validation::datatype::Type * resolveType(::java::lang::String *);
-  ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::javax::xml::validation::ValidatorHandler)))) schema;
-  ::javax::xml::validation::TypeInfoProvider * typeInfoProvider;
-  ::org::xml::sax::helpers::NamespaceSupport * namespaceSupport;
-  ::org::relaxng::datatype::DatatypeLibrary * typeLibrary;
-  ::org::xml::sax::Locator * loc;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-  ::org::w3c::dom::ls::LSResourceResolver * resourceResolver;
-  ::java::util::LinkedList * context;
-  ::java::util::ArrayList * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_validation_xmlschema_XMLSchemaValidatorHandler__
diff --git a/libjava/gnu/xml/xpath/AndExpr.h b/libjava/gnu/xml/xpath/AndExpr.h
deleted file mode 100644
index dd57695..0000000
--- a/libjava/gnu/xml/xpath/AndExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_AndExpr__
-#define __gnu_xml_xpath_AndExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class AndExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::AndExpr : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  AndExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_AndExpr__
diff --git a/libjava/gnu/xml/xpath/ArithmeticExpr.h b/libjava/gnu/xml/xpath/ArithmeticExpr.h
deleted file mode 100644
index 586ff4a..0000000
--- a/libjava/gnu/xml/xpath/ArithmeticExpr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ArithmeticExpr__
-#define __gnu_xml_xpath_ArithmeticExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ArithmeticExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ArithmeticExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ArithmeticExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jint);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jint ADD = 0;
-  static const jint SUBTRACT = 1;
-  static const jint MULTIPLY = 2;
-  static const jint DIVIDE = 3;
-  static const jint MODULO = 4;
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jint op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ArithmeticExpr__
diff --git a/libjava/gnu/xml/xpath/BooleanFunction.h b/libjava/gnu/xml/xpath/BooleanFunction.h
deleted file mode 100644
index 7688d9e..0000000
--- a/libjava/gnu/xml/xpath/BooleanFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_BooleanFunction__
-#define __gnu_xml_xpath_BooleanFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class BooleanFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::BooleanFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  BooleanFunction(::java::util::List *);
-  BooleanFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_BooleanFunction__
diff --git a/libjava/gnu/xml/xpath/CeilingFunction.h b/libjava/gnu/xml/xpath/CeilingFunction.h
deleted file mode 100644
index 368ff4a..0000000
--- a/libjava/gnu/xml/xpath/CeilingFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_CeilingFunction__
-#define __gnu_xml_xpath_CeilingFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class CeilingFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::CeilingFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  CeilingFunction(::java::util::List *);
-  CeilingFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_CeilingFunction__
diff --git a/libjava/gnu/xml/xpath/ConcatFunction.h b/libjava/gnu/xml/xpath/ConcatFunction.h
deleted file mode 100644
index db11518..0000000
--- a/libjava/gnu/xml/xpath/ConcatFunction.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ConcatFunction__
-#define __gnu_xml_xpath_ConcatFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ConcatFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ConcatFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ConcatFunction(::java::util::List *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ConcatFunction__
diff --git a/libjava/gnu/xml/xpath/Constant.h b/libjava/gnu/xml/xpath/Constant.h
deleted file mode 100644
index c957b37..0000000
--- a/libjava/gnu/xml/xpath/Constant.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Constant__
-#define __gnu_xml_xpath_Constant__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Constant;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Constant : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  Constant(::java::lang::Object *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Constant__
diff --git a/libjava/gnu/xml/xpath/ContainsFunction.h b/libjava/gnu/xml/xpath/ContainsFunction.h
deleted file mode 100644
index a426db1..0000000
--- a/libjava/gnu/xml/xpath/ContainsFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ContainsFunction__
-#define __gnu_xml_xpath_ContainsFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class ContainsFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ContainsFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ContainsFunction(::java::util::List *);
-  ContainsFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ContainsFunction__
diff --git a/libjava/gnu/xml/xpath/CountFunction.h b/libjava/gnu/xml/xpath/CountFunction.h
deleted file mode 100644
index 353380e..0000000
--- a/libjava/gnu/xml/xpath/CountFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_CountFunction__
-#define __gnu_xml_xpath_CountFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class CountFunction;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::CountFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  CountFunction(::java::util::List *);
-  CountFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_CountFunction__
diff --git a/libjava/gnu/xml/xpath/DocumentOrderComparator.h b/libjava/gnu/xml/xpath/DocumentOrderComparator.h
deleted file mode 100644
index 26abc2c..0000000
--- a/libjava/gnu/xml/xpath/DocumentOrderComparator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_DocumentOrderComparator__
-#define __gnu_xml_xpath_DocumentOrderComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class DocumentOrderComparator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object
-{
-
-public:
-  DocumentOrderComparator();
-  virtual jint DocumentOrderComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_DocumentOrderComparator__
diff --git a/libjava/gnu/xml/xpath/EqualityExpr.h b/libjava/gnu/xml/xpath/EqualityExpr.h
deleted file mode 100644
index dbf51f7..0000000
--- a/libjava/gnu/xml/xpath/EqualityExpr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_EqualityExpr__
-#define __gnu_xml_xpath_EqualityExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class EqualityExpr;
-          class Expr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::EqualityExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  EqualityExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jboolean);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-private:
-  jboolean evaluateImpl(::org::w3c::dom::Node *, jint, jint);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jboolean invert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_EqualityExpr__
diff --git a/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h b/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h
deleted file mode 100644
index e806531..0000000
--- a/libjava/gnu/xml/xpath/Expr$ExprNodeSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Expr$ExprNodeSet__
-#define __gnu_xml_xpath_Expr$ExprNodeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr$ExprNodeSet;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Expr$ExprNodeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Expr$ExprNodeSet(::java::util::Collection *);
-public:
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Expr$ExprNodeSet__
diff --git a/libjava/gnu/xml/xpath/Expr.h b/libjava/gnu/xml/xpath/Expr.h
deleted file mode 100644
index ee88cc0..0000000
--- a/libjava/gnu/xml/xpath/Expr.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Expr__
-#define __gnu_xml_xpath_Expr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class DecimalFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Expr : public ::java::lang::Object
-{
-
-public:
-  Expr();
-  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::Object *);
-  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint) = 0;
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *) = 0;
-  virtual jboolean references(::javax::xml::namespace$::QName *) = 0;
-  static ::java::util::Collection * _id(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static ::java::lang::String * _local_name(::org::w3c::dom::Node *, ::java::util::Collection *);
-  static ::java::lang::String * _namespace_uri(::org::w3c::dom::Node *, ::java::util::Collection *);
-  static ::java::lang::String * _name(::org::w3c::dom::Node *, ::java::util::Collection *);
-public: // actually package-private
-  static ::org::w3c::dom::Node * firstNode(::java::util::Collection *);
-public:
-  static ::java::lang::String * _string(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static jboolean _boolean(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static jdouble _number(::org::w3c::dom::Node *, ::java::lang::Object *);
-  static ::java::lang::String * stringValue(::java::util::Collection *);
-  static ::java::lang::String * stringValue(::org::w3c::dom::Node *);
-public: // actually package-private
-  static ::java::lang::String * stringValue(::org::w3c::dom::Node *, jboolean);
-  static jint intValue(::java::lang::Object *);
-public: // actually protected
-  static ::java::util::Comparator * documentOrderComparator;
-  static ::java::text::DecimalFormat * decimalFormat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Expr__
diff --git a/libjava/gnu/xml/xpath/FalseFunction.h b/libjava/gnu/xml/xpath/FalseFunction.h
deleted file mode 100644
index 22447e5..0000000
--- a/libjava/gnu/xml/xpath/FalseFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FalseFunction__
-#define __gnu_xml_xpath_FalseFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FalseFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FalseFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FalseFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FalseFunction__
diff --git a/libjava/gnu/xml/xpath/FloorFunction.h b/libjava/gnu/xml/xpath/FloorFunction.h
deleted file mode 100644
index a3634d6..0000000
--- a/libjava/gnu/xml/xpath/FloorFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FloorFunction__
-#define __gnu_xml_xpath_FloorFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FloorFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FloorFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  FloorFunction(::java::util::List *);
-  FloorFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FloorFunction__
diff --git a/libjava/gnu/xml/xpath/Function.h b/libjava/gnu/xml/xpath/Function.h
deleted file mode 100644
index e4d457c..0000000
--- a/libjava/gnu/xml/xpath/Function.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Function__
-#define __gnu_xml_xpath_Function__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Function;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Function : public ::java::lang::Object
-{
-
-public:
-  virtual void setArguments(::java::util::List *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_xml_xpath_Function__
diff --git a/libjava/gnu/xml/xpath/FunctionCall.h b/libjava/gnu/xml/xpath/FunctionCall.h
deleted file mode 100644
index 6039022..0000000
--- a/libjava/gnu/xml/xpath/FunctionCall.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_FunctionCall__
-#define __gnu_xml_xpath_FunctionCall__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class FunctionCall;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunctionResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::FunctionCall : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  FunctionCall(::javax::xml::xpath::XPathFunctionResolver *, ::java::lang::String *);
-  FunctionCall(::javax::xml::xpath::XPathFunctionResolver *, ::java::lang::String *, ::java::util::List *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::xpath::XPathFunctionResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver;
-  ::java::lang::String * name;
-  ::java::util::List * args;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_FunctionCall__
diff --git a/libjava/gnu/xml/xpath/IdFunction.h b/libjava/gnu/xml/xpath/IdFunction.h
deleted file mode 100644
index a5fbc14..0000000
--- a/libjava/gnu/xml/xpath/IdFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_IdFunction__
-#define __gnu_xml_xpath_IdFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class IdFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::IdFunction : public ::gnu::xml::xpath::Pattern
-{
-
-public: // actually package-private
-  IdFunction(::java::util::List *);
-public:
-  IdFunction(::gnu::xml::xpath::Expr *);
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_IdFunction__
diff --git a/libjava/gnu/xml/xpath/LangFunction.h b/libjava/gnu/xml/xpath/LangFunction.h
deleted file mode 100644
index cf7bd65..0000000
--- a/libjava/gnu/xml/xpath/LangFunction.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LangFunction__
-#define __gnu_xml_xpath_LangFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LangFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LangFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LangFunction(::java::util::List *);
-  LangFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::lang::String * getLang(::org::w3c::dom::Node *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LangFunction__
diff --git a/libjava/gnu/xml/xpath/LastFunction.h b/libjava/gnu/xml/xpath/LastFunction.h
deleted file mode 100644
index f20cf55..0000000
--- a/libjava/gnu/xml/xpath/LastFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LastFunction__
-#define __gnu_xml_xpath_LastFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LastFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LastFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LastFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LastFunction__
diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.h b/libjava/gnu/xml/xpath/LocalNameFunction.h
deleted file mode 100644
index 2743e17..0000000
--- a/libjava/gnu/xml/xpath/LocalNameFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_LocalNameFunction__
-#define __gnu_xml_xpath_LocalNameFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class LocalNameFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::LocalNameFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  LocalNameFunction(::java::util::List *);
-  LocalNameFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_LocalNameFunction__
diff --git a/libjava/gnu/xml/xpath/NameFunction.h b/libjava/gnu/xml/xpath/NameFunction.h
deleted file mode 100644
index 4e9db9a..0000000
--- a/libjava/gnu/xml/xpath/NameFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NameFunction__
-#define __gnu_xml_xpath_NameFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NameFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NameFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NameFunction(::java::util::List *);
-  NameFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NameFunction__
diff --git a/libjava/gnu/xml/xpath/NameTest.h b/libjava/gnu/xml/xpath/NameTest.h
deleted file mode 100644
index 823ea6b..0000000
--- a/libjava/gnu/xml/xpath/NameTest.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NameTest__
-#define __gnu_xml_xpath_NameTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NameTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NameTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NameTest(::javax::xml::namespace$::QName *, jboolean, jboolean);
-  jboolean matchesAny();
-  jboolean matchesAnyLocalName();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  static ::java::lang::String * getLocalName(::org::w3c::dom::Node *);
-  static jboolean equal(::java::lang::String *, ::java::lang::String *);
-public:
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
-  jboolean anyLocalName;
-  jboolean any;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NameTest__
diff --git a/libjava/gnu/xml/xpath/NamespaceTest.h b/libjava/gnu/xml/xpath/NamespaceTest.h
deleted file mode 100644
index 5509519..0000000
--- a/libjava/gnu/xml/xpath/NamespaceTest.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NamespaceTest__
-#define __gnu_xml_xpath_NamespaceTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NamespaceTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NamespaceTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NamespaceTest(::javax::xml::namespace$::QName *, jboolean, jboolean);
-  jboolean matchesAny();
-  jboolean matchesAnyLocalName();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName;
-  jboolean anyLocalName;
-  jboolean any;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NamespaceTest__
diff --git a/libjava/gnu/xml/xpath/NamespaceUriFunction.h b/libjava/gnu/xml/xpath/NamespaceUriFunction.h
deleted file mode 100644
index 76e0460..0000000
--- a/libjava/gnu/xml/xpath/NamespaceUriFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NamespaceUriFunction__
-#define __gnu_xml_xpath_NamespaceUriFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NamespaceUriFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NamespaceUriFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NamespaceUriFunction(::java::util::List *);
-  NamespaceUriFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NamespaceUriFunction__
diff --git a/libjava/gnu/xml/xpath/NegativeExpr.h b/libjava/gnu/xml/xpath/NegativeExpr.h
deleted file mode 100644
index 21b9322..0000000
--- a/libjava/gnu/xml/xpath/NegativeExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NegativeExpr__
-#define __gnu_xml_xpath_NegativeExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NegativeExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NegativeExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NegativeExpr(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NegativeExpr__
diff --git a/libjava/gnu/xml/xpath/NodeTypeTest.h b/libjava/gnu/xml/xpath/NodeTypeTest.h
deleted file mode 100644
index da631d9..0000000
--- a/libjava/gnu/xml/xpath/NodeTypeTest.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NodeTypeTest__
-#define __gnu_xml_xpath_NodeTypeTest__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class NodeTypeTest;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NodeTypeTest : public ::gnu::xml::xpath::Test
-{
-
-public:
-  NodeTypeTest(jshort);
-  NodeTypeTest(jshort, ::java::lang::String *);
-  jshort getNodeType();
-  ::java::lang::String * getData();
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) type;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NodeTypeTest__
diff --git a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
deleted file mode 100644
index ade9d2ca..0000000
--- a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NormalizeSpaceFunction__
-#define __gnu_xml_xpath_NormalizeSpaceFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NormalizeSpaceFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NormalizeSpaceFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NormalizeSpaceFunction(::java::util::List *);
-  NormalizeSpaceFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NormalizeSpaceFunction__
diff --git a/libjava/gnu/xml/xpath/NotFunction.h b/libjava/gnu/xml/xpath/NotFunction.h
deleted file mode 100644
index c2f7499..0000000
--- a/libjava/gnu/xml/xpath/NotFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NotFunction__
-#define __gnu_xml_xpath_NotFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NotFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NotFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NotFunction(::java::util::List *);
-  NotFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NotFunction__
diff --git a/libjava/gnu/xml/xpath/NumberFunction.h b/libjava/gnu/xml/xpath/NumberFunction.h
deleted file mode 100644
index 92937fd..0000000
--- a/libjava/gnu/xml/xpath/NumberFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_NumberFunction__
-#define __gnu_xml_xpath_NumberFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class NumberFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::NumberFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  NumberFunction(::java::util::List *);
-  NumberFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_NumberFunction__
diff --git a/libjava/gnu/xml/xpath/OrExpr.h b/libjava/gnu/xml/xpath/OrExpr.h
deleted file mode 100644
index 9cd5f95..0000000
--- a/libjava/gnu/xml/xpath/OrExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_OrExpr__
-#define __gnu_xml_xpath_OrExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class OrExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::OrExpr : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  OrExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_OrExpr__
diff --git a/libjava/gnu/xml/xpath/ParenthesizedExpr.h b/libjava/gnu/xml/xpath/ParenthesizedExpr.h
deleted file mode 100644
index 3a228ad..0000000
--- a/libjava/gnu/xml/xpath/ParenthesizedExpr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_ParenthesizedExpr__
-#define __gnu_xml_xpath_ParenthesizedExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class ParenthesizedExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::ParenthesizedExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  ParenthesizedExpr(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_ParenthesizedExpr__
diff --git a/libjava/gnu/xml/xpath/Path.h b/libjava/gnu/xml/xpath/Path.h
deleted file mode 100644
index f36b5cef..0000000
--- a/libjava/gnu/xml/xpath/Path.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Path__
-#define __gnu_xml_xpath_Path__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Path;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Path : public ::gnu::xml::xpath::Pattern
-{
-
-public: // actually package-private
-  Path();
-  virtual ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Path__
diff --git a/libjava/gnu/xml/xpath/Pattern.h b/libjava/gnu/xml/xpath/Pattern.h
deleted file mode 100644
index 917835e..0000000
--- a/libjava/gnu/xml/xpath/Pattern.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Pattern__
-#define __gnu_xml_xpath_Pattern__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Pattern;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Pattern : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  Pattern();
-  virtual jboolean matches(::org::w3c::dom::Node *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Pattern__
diff --git a/libjava/gnu/xml/xpath/PositionFunction.h b/libjava/gnu/xml/xpath/PositionFunction.h
deleted file mode 100644
index 849f9c7..0000000
--- a/libjava/gnu/xml/xpath/PositionFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_PositionFunction__
-#define __gnu_xml_xpath_PositionFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class PositionFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::PositionFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  PositionFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_PositionFunction__
diff --git a/libjava/gnu/xml/xpath/Predicate.h b/libjava/gnu/xml/xpath/Predicate.h
deleted file mode 100644
index d51d059..0000000
--- a/libjava/gnu/xml/xpath/Predicate.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Predicate__
-#define __gnu_xml_xpath_Predicate__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Test.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Predicate;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Predicate : public ::gnu::xml::xpath::Test
-{
-
-public: // actually package-private
-  Predicate(::gnu::xml::xpath::Expr *);
-public:
-  virtual jboolean matches(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) expr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Predicate__
diff --git a/libjava/gnu/xml/xpath/RelationalExpr.h b/libjava/gnu/xml/xpath/RelationalExpr.h
deleted file mode 100644
index 3decec0..0000000
--- a/libjava/gnu/xml/xpath/RelationalExpr.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_RelationalExpr__
-#define __gnu_xml_xpath_RelationalExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class RelationalExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::RelationalExpr : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  RelationalExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, jboolean, jboolean);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-  jboolean lt;
-  jboolean eq;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_RelationalExpr__
diff --git a/libjava/gnu/xml/xpath/Root.h b/libjava/gnu/xml/xpath/Root.h
deleted file mode 100644
index 37ce921..0000000
--- a/libjava/gnu/xml/xpath/Root.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Root__
-#define __gnu_xml_xpath_Root__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Root;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Root : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Root();
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Root__
diff --git a/libjava/gnu/xml/xpath/RoundFunction.h b/libjava/gnu/xml/xpath/RoundFunction.h
deleted file mode 100644
index 97dbf14..0000000
--- a/libjava/gnu/xml/xpath/RoundFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_RoundFunction__
-#define __gnu_xml_xpath_RoundFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class RoundFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::RoundFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  RoundFunction(::java::util::List *);
-  RoundFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_RoundFunction__
diff --git a/libjava/gnu/xml/xpath/Selector.h b/libjava/gnu/xml/xpath/Selector.h
deleted file mode 100644
index 9dcd37a..0000000
--- a/libjava/gnu/xml/xpath/Selector.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Selector__
-#define __gnu_xml_xpath_Selector__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Selector;
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Selector : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Selector(jint, ::java::util::List *);
-  JArray< ::gnu::xml::xpath::Test * > * getTests();
-  jboolean matches(::org::w3c::dom::Node *);
-public: // actually package-private
-  jboolean matches(::org::w3c::dom::Node *, jint, jint);
-private:
-  jint getContextPosition(::org::w3c::dom::Node *);
-  jint getContextSize(::org::w3c::dom::Node *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-  ::java::util::List * filterCandidates(::java::util::List *, jboolean);
-  void addCandidates(::org::w3c::dom::Node *, ::java::util::Collection *);
-  void addChildNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addParentNode(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addFollowingNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addPrecedingNodes(::org::w3c::dom::Node *, ::java::util::Collection *, jboolean);
-  void addAttributes(::org::w3c::dom::Node *, ::java::util::Collection *);
-  void addNamespaceAttributes(::org::w3c::dom::Node *, ::java::util::Collection *);
-  jboolean isNamespaceAttribute(::org::w3c::dom::Node *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static const jint ANCESTOR = 0;
-  static const jint ANCESTOR_OR_SELF = 1;
-  static const jint ATTRIBUTE = 2;
-  static const jint CHILD = 3;
-  static const jint DESCENDANT = 4;
-  static const jint DESCENDANT_OR_SELF = 5;
-  static const jint FOLLOWING = 6;
-  static const jint FOLLOWING_SIBLING = 7;
-  static const jint NAMESPACE = 8;
-  static const jint PARENT = 9;
-  static const jint PRECEDING = 10;
-  static const jint PRECEDING_SIBLING = 11;
-  static const jint SELF = 12;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Path)))) axis;
-  JArray< ::gnu::xml::xpath::Test * > * tests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Selector__
diff --git a/libjava/gnu/xml/xpath/StartsWithFunction.h b/libjava/gnu/xml/xpath/StartsWithFunction.h
deleted file mode 100644
index c3900e4..0000000
--- a/libjava/gnu/xml/xpath/StartsWithFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StartsWithFunction__
-#define __gnu_xml_xpath_StartsWithFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StartsWithFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StartsWithFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StartsWithFunction(::java::util::List *);
-  StartsWithFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StartsWithFunction__
diff --git a/libjava/gnu/xml/xpath/Steps.h b/libjava/gnu/xml/xpath/Steps.h
deleted file mode 100644
index db42605..0000000
--- a/libjava/gnu/xml/xpath/Steps.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Steps__
-#define __gnu_xml_xpath_Steps__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Path.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class Pattern;
-          class Steps;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Steps : public ::gnu::xml::xpath::Path
-{
-
-public:
-  Steps();
-public: // actually package-private
-  Steps(::java::util::LinkedList *);
-public:
-  jboolean matches(::org::w3c::dom::Node *);
-public: // actually package-private
-  jboolean matches(::org::w3c::dom::Node *, jint);
-  ::java::util::Collection * possibleContexts(::gnu::xml::xpath::Pattern *, ::org::w3c::dom::Node *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-public: // actually package-private
-  ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *);
-public:
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Path)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Steps__
diff --git a/libjava/gnu/xml/xpath/StringFunction.h b/libjava/gnu/xml/xpath/StringFunction.h
deleted file mode 100644
index 0f96aa2..0000000
--- a/libjava/gnu/xml/xpath/StringFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StringFunction__
-#define __gnu_xml_xpath_StringFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StringFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StringFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StringFunction(::java::util::List *);
-  StringFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StringFunction__
diff --git a/libjava/gnu/xml/xpath/StringLengthFunction.h b/libjava/gnu/xml/xpath/StringLengthFunction.h
deleted file mode 100644
index 92f7ce1..0000000
--- a/libjava/gnu/xml/xpath/StringLengthFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_StringLengthFunction__
-#define __gnu_xml_xpath_StringLengthFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class StringLengthFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::StringLengthFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  StringLengthFunction(::java::util::List *);
-  StringLengthFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_StringLengthFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringAfterFunction.h b/libjava/gnu/xml/xpath/SubstringAfterFunction.h
deleted file mode 100644
index fa9fed3..0000000
--- a/libjava/gnu/xml/xpath/SubstringAfterFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringAfterFunction__
-#define __gnu_xml_xpath_SubstringAfterFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringAfterFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringAfterFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringAfterFunction(::java::util::List *);
-  SubstringAfterFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringAfterFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
deleted file mode 100644
index f8056be..0000000
--- a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringBeforeFunction__
-#define __gnu_xml_xpath_SubstringBeforeFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringBeforeFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringBeforeFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringBeforeFunction(::java::util::List *);
-  SubstringBeforeFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringBeforeFunction__
diff --git a/libjava/gnu/xml/xpath/SubstringFunction.h b/libjava/gnu/xml/xpath/SubstringFunction.h
deleted file mode 100644
index d56e1b9..0000000
--- a/libjava/gnu/xml/xpath/SubstringFunction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SubstringFunction__
-#define __gnu_xml_xpath_SubstringFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SubstringFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SubstringFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SubstringFunction(::java::util::List *);
-  SubstringFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-  ::gnu::xml::xpath::Expr * arg3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SubstringFunction__
diff --git a/libjava/gnu/xml/xpath/SumFunction.h b/libjava/gnu/xml/xpath/SumFunction.h
deleted file mode 100644
index 3a7b6e0..0000000
--- a/libjava/gnu/xml/xpath/SumFunction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_SumFunction__
-#define __gnu_xml_xpath_SumFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class SumFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::SumFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  SumFunction(::java::util::List *);
-  SumFunction(::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_SumFunction__
diff --git a/libjava/gnu/xml/xpath/Test.h b/libjava/gnu/xml/xpath/Test.h
deleted file mode 100644
index 64510e8..0000000
--- a/libjava/gnu/xml/xpath/Test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_Test__
-#define __gnu_xml_xpath_Test__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Test;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::Test : public ::java::lang::Object
-{
-
-public:
-  Test();
-  virtual jboolean matches(::org::w3c::dom::Node *, jint, jint) = 0;
-  virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *) = 0;
-  virtual jboolean references(::javax::xml::namespace$::QName *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_Test__
diff --git a/libjava/gnu/xml/xpath/TranslateFunction.h b/libjava/gnu/xml/xpath/TranslateFunction.h
deleted file mode 100644
index b1e1680..0000000
--- a/libjava/gnu/xml/xpath/TranslateFunction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_TranslateFunction__
-#define __gnu_xml_xpath_TranslateFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class TranslateFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::TranslateFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  TranslateFunction(::java::util::List *);
-  TranslateFunction(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1;
-  ::gnu::xml::xpath::Expr * arg2;
-  ::gnu::xml::xpath::Expr * arg3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_TranslateFunction__
diff --git a/libjava/gnu/xml/xpath/TrueFunction.h b/libjava/gnu/xml/xpath/TrueFunction.h
deleted file mode 100644
index 27e42dd..0000000
--- a/libjava/gnu/xml/xpath/TrueFunction.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_TrueFunction__
-#define __gnu_xml_xpath_TrueFunction__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class TrueFunction;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::TrueFunction : public ::gnu::xml::xpath::Expr
-{
-
-public: // actually package-private
-  TrueFunction();
-public:
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_TrueFunction__
diff --git a/libjava/gnu/xml/xpath/UnionExpr.h b/libjava/gnu/xml/xpath/UnionExpr.h
deleted file mode 100644
index bbac92a..0000000
--- a/libjava/gnu/xml/xpath/UnionExpr.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_UnionExpr__
-#define __gnu_xml_xpath_UnionExpr__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Pattern.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class UnionExpr;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::UnionExpr : public ::gnu::xml::xpath::Pattern
-{
-
-public:
-  UnionExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *);
-  jboolean matches(::org::w3c::dom::Node *);
-  ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace$::QName *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) lhs;
-  ::gnu::xml::xpath::Expr * rhs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_UnionExpr__
diff --git a/libjava/gnu/xml/xpath/VariableReference.h b/libjava/gnu/xml/xpath/VariableReference.h
deleted file mode 100644
index ea5c1a6..0000000
--- a/libjava/gnu/xml/xpath/VariableReference.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_VariableReference__
-#define __gnu_xml_xpath_VariableReference__
-
-#pragma interface
-
-#include <gnu/xml/xpath/Expr.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class VariableReference;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::VariableReference : public ::gnu::xml::xpath::Expr
-{
-
-public:
-  VariableReference(::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
-  virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::javax::xml::xpath::XPathVariableResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver;
-  ::javax::xml::namespace$::QName * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_VariableReference__
diff --git a/libjava/gnu/xml/xpath/XPathFactoryImpl.h b/libjava/gnu/xml/xpath/XPathFactoryImpl.h
deleted file mode 100644
index 41349bf..0000000
--- a/libjava/gnu/xml/xpath/XPathFactoryImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathFactoryImpl__
-#define __gnu_xml_xpath_XPathFactoryImpl__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathFactory.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFactoryImpl;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPath;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathFactoryImpl : public ::javax::xml::xpath::XPathFactory
-{
-
-public:
-  XPathFactoryImpl();
-  virtual jboolean isObjectModelSupported(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *);
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *);
-  virtual ::javax::xml::xpath::XPath * newXPath();
-public: // actually package-private
-  ::javax::xml::xpath::XPathVariableResolver * __attribute__((aligned(__alignof__( ::javax::xml::xpath::XPathFactory)))) variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathFactoryImpl__
diff --git a/libjava/gnu/xml/xpath/XPathImpl.h b/libjava/gnu/xml/xpath/XPathImpl.h
deleted file mode 100644
index f1bc5a3..0000000
--- a/libjava/gnu/xml/xpath/XPathImpl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathImpl__
-#define __gnu_xml_xpath_XPathImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathImpl;
-          class XPathParser;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathExpression;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathImpl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XPathImpl(::javax::xml::namespace$::NamespaceContext *, ::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::xpath::XPathFunctionResolver *);
-public:
-  virtual void reset();
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *);
-  virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver();
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *);
-  virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver();
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *);
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *);
-public: // actually package-private
-  ::gnu::xml::xpath::XPathParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parser;
-  ::javax::xml::namespace$::NamespaceContext * namespaceContext;
-  ::javax::xml::xpath::XPathVariableResolver * variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathImpl__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h b/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h
deleted file mode 100644
index f364f4a..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyCheckClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyCheckClass__
-#define __gnu_xml_xpath_XPathParser$YyCheckClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyCheckClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyCheckClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyCheckClass();
-public:
-  static JArray< jshort > * yyCheck;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyCheckClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h b/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h
deleted file mode 100644
index 23cd340..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyDefRedClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyDefRedClass__
-#define __gnu_xml_xpath_XPathParser$YyDefRedClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyDefRedClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyDefRedClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyDefRedClass();
-public:
-  static JArray< jshort > * yyDefRed;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyDefRedClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h b/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h
deleted file mode 100644
index 97d0f1b..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyDgotoClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyDgotoClass__
-#define __gnu_xml_xpath_XPathParser$YyDgotoClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyDgotoClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyDgotoClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyDgotoClass();
-public:
-  static JArray< jshort > * yyDgoto;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyDgotoClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h
deleted file mode 100644
index 1a2e31f..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyGindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyGindexClass__
-#define __gnu_xml_xpath_XPathParser$YyGindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyGindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyGindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyGindexClass();
-public:
-  static JArray< jshort > * yyGindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyGindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h b/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h
deleted file mode 100644
index 4e95f9d..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyLenClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyLenClass__
-#define __gnu_xml_xpath_XPathParser$YyLenClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyLenClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyLenClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyLenClass();
-public:
-  static JArray< jshort > * yyLen;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyLenClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h b/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h
deleted file mode 100644
index c9c0ea4..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyLhsClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyLhsClass__
-#define __gnu_xml_xpath_XPathParser$YyLhsClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyLhsClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyLhsClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyLhsClass();
-public:
-  static JArray< jshort > * yyLhs;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyLhsClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h b/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h
deleted file mode 100644
index 216fcff..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyNameClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyNameClass__
-#define __gnu_xml_xpath_XPathParser$YyNameClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyNameClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyNameClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyNameClass();
-public:
-  static JArray< ::java::lang::String * > * yyName;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyNameClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h
deleted file mode 100644
index d1a439e..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyRindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyRindexClass__
-#define __gnu_xml_xpath_XPathParser$YyRindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyRindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyRindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyRindexClass();
-public:
-  static JArray< jshort > * yyRindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyRindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h b/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h
deleted file mode 100644
index 2a129b2..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YySindexClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YySindexClass__
-#define __gnu_xml_xpath_XPathParser$YySindexClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YySindexClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YySindexClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YySindexClass();
-public:
-  static JArray< jshort > * yySindex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YySindexClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h b/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h
deleted file mode 100644
index 2408d36..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$YyTableClass.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$YyTableClass__
-#define __gnu_xml_xpath_XPathParser$YyTableClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$YyTableClass;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$YyTableClass : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathParser$YyTableClass();
-public:
-  static JArray< jshort > * yyTable;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$YyTableClass__
diff --git a/libjava/gnu/xml/xpath/XPathParser$yyException.h b/libjava/gnu/xml/xpath/XPathParser$yyException.h
deleted file mode 100644
index bf25adb..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$yyException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$yyException__
-#define __gnu_xml_xpath_XPathParser$yyException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$yyException;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$yyException : public ::java::lang::Exception
-{
-
-public:
-  XPathParser$yyException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser$yyException__
diff --git a/libjava/gnu/xml/xpath/XPathParser$yyInput.h b/libjava/gnu/xml/xpath/XPathParser$yyInput.h
deleted file mode 100644
index 4383ddf..0000000
--- a/libjava/gnu/xml/xpath/XPathParser$yyInput.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser$yyInput__
-#define __gnu_xml_xpath_XPathParser$yyInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathParser$yyInput;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser$yyInput : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean advance() = 0;
-  virtual jint token() = 0;
-  virtual ::java::lang::Object * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_xml_xpath_XPathParser$yyInput__
diff --git a/libjava/gnu/xml/xpath/XPathParser.h b/libjava/gnu/xml/xpath/XPathParser.h
deleted file mode 100644
index 0133a04..0000000
--- a/libjava/gnu/xml/xpath/XPathParser.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathParser__
-#define __gnu_xml_xpath_XPathParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class Expr;
-          class XPathParser;
-          class XPathParser$yyInput;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathParser : public ::java::lang::Object
-{
-
-public:
-  XPathParser();
-public: // actually package-private
-  virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *);
-  virtual ::gnu::xml::xpath::Expr * lookupFunction(::java::lang::String *, ::java::util::List *);
-public:
-  virtual void yyerror(::java::lang::String *);
-  virtual void yyerror(::java::lang::String *, JArray< ::java::lang::String * > *);
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * yyExpecting(jint);
-public:
-  virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *, ::java::lang::Object *);
-public: // actually protected
-  virtual ::java::lang::Object * yyDefault(::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *);
-public: // actually package-private
-  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext;
-  ::javax::xml::xpath::XPathVariableResolver * variableResolver;
-  ::javax::xml::xpath::XPathFunctionResolver * functionResolver;
-public:
-  static const jint LITERAL = 257;
-  static const jint DIGITS = 258;
-  static const jint NAME = 259;
-  static const jint LP = 260;
-  static const jint RP = 261;
-  static const jint LB = 262;
-  static const jint RB = 263;
-  static const jint COMMA = 264;
-  static const jint PIPE = 265;
-  static const jint SLASH = 266;
-  static const jint DOUBLE_SLASH = 267;
-  static const jint EQ = 268;
-  static const jint NE = 269;
-  static const jint GT = 270;
-  static const jint LT = 271;
-  static const jint GTE = 272;
-  static const jint LTE = 273;
-  static const jint PLUS = 274;
-  static const jint MINUS = 275;
-  static const jint AT = 276;
-  static const jint STAR = 277;
-  static const jint DOLLAR = 278;
-  static const jint COLON = 279;
-  static const jint DOUBLE_COLON = 280;
-  static const jint DOT = 281;
-  static const jint DOUBLE_DOT = 282;
-  static const jint ANCESTOR = 283;
-  static const jint ANCESTOR_OR_SELF = 284;
-  static const jint ATTRIBUTE = 285;
-  static const jint CHILD = 286;
-  static const jint DESCENDANT = 287;
-  static const jint DESCENDANT_OR_SELF = 288;
-  static const jint FOLLOWING = 289;
-  static const jint FOLLOWING_SIBLING = 290;
-  static const jint NAMESPACE = 291;
-  static const jint PARENT = 292;
-  static const jint PRECEDING = 293;
-  static const jint PRECEDING_SIBLING = 294;
-  static const jint SELF = 295;
-  static const jint DIV = 296;
-  static const jint MOD = 297;
-  static const jint OR = 298;
-  static const jint AND = 299;
-  static const jint COMMENT = 300;
-  static const jint PROCESSING_INSTRUCTION = 301;
-  static const jint TEXT = 302;
-  static const jint NODE = 303;
-  static const jint UNARY = 304;
-  static const jint yyErrorCode = 256;
-public: // actually protected
-  static const jint yyFinal = 30;
-  jint yyMax;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathParser__
diff --git a/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h b/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h
deleted file mode 100644
index ae01890..0000000
--- a/libjava/gnu/xml/xpath/XPathTokenizer$XPathToken.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathTokenizer$XPathToken__
-#define __gnu_xml_xpath_XPathTokenizer$XPathToken__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathTokenizer$XPathToken;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathTokenizer$XPathToken : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XPathTokenizer$XPathToken(jint);
-  XPathTokenizer$XPathToken(jint, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathTokenizer$XPathToken__
diff --git a/libjava/gnu/xml/xpath/XPathTokenizer.h b/libjava/gnu/xml/xpath/XPathTokenizer.h
deleted file mode 100644
index 4cbf9ec..0000000
--- a/libjava/gnu/xml/xpath/XPathTokenizer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_xml_xpath_XPathTokenizer__
-#define __gnu_xml_xpath_XPathTokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathTokenizer;
-          class XPathTokenizer$XPathToken;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::XPathTokenizer : public ::java::lang::Object
-{
-
-public:
-  XPathTokenizer(::java::lang::String *);
-public: // actually package-private
-  XPathTokenizer(::java::io::Reader *);
-public:
-  virtual jboolean advance();
-  virtual jint token();
-  virtual ::java::lang::Object * value();
-public: // actually package-private
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_literal(jint);
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_digits(jint);
-  virtual ::gnu::xml::xpath::XPathTokenizer$XPathToken * consume_name(jint);
-  virtual jboolean isNameChar(jint);
-  static ::java::util::Map * keywords;
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::gnu::xml::xpath::XPathTokenizer$XPathToken * token__;
-  ::gnu::xml::xpath::XPathTokenizer$XPathToken * lastToken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_xml_xpath_XPathTokenizer__